aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharlie Blake2018-09-20 21:54:39 +0100
committerGitHub2018-09-20 21:54:39 +0100
commitd491d6c3960921077287b572d8bd89ea50083213 (patch)
treeb1e735f778a64cd44ed719f5edda34043cfb0742
parentMerge pull request #90 from thecharlesblake/correct-fortunes-favor (diff)
parentFix comma bug with solvaibility percentage mode (diff)
downloadmetasol-d491d6c3960921077287b572d8bd89ea50083213.tar.gz
metasol-d491d6c3960921077287b572d8bd89ea50083213.zip

Merge pull request #91 from thecharlesblake/fix-comma-bug-sol-percent

Fix comma bug with solvaibility percentage mode

-rw-r--r--src/main/evaluation/solvability_calc.cpp18
-rw-r--r--src/main/solver/solver.cpp8
2 files changed, 13 insertions, 13 deletions
diff --git a/src/main/evaluation/solvability_calc.cpp b/src/main/evaluation/solvability_calc.cpp
index 85a8f34..60f44ff 100644
--- a/src/main/evaluation/solvability_calc.cpp
+++ b/src/main/evaluation/solvability_calc.cpp
@@ -44,10 +44,8 @@ void solvability_calc::print_general_info(const seed_results& seed_res) {
}
void solvability_calc::print_seed_info(seed_result seed_res) {
- int seed = seed_res.first;
auto& res = seed_res.second;
- cout << ", " << seed;
solver::print_result_csv(res);
}
@@ -127,15 +125,23 @@ void solvability_calc::solver_thread(solvability_calc* sc, uint core) {
sc->seeds_in_progress.erase(my_seed);
sc->seed_res.add_result(final_res->second.sol_type);
- print_general_info(sc->seed_res);
+ cout << my_seed;
+ //print_general_info(sc->seed_res);
if (sc->stream_opt == cmd_sos::SMART) {
print_seed_info(*stream_res);
- if (no_stream_res) print_seed_info(*no_stream_res);
- else solver::print_null_seed_info();
+ if (no_stream_res) {
+ print_seed_info(*no_stream_res);
+ cout << ", " << no_stream_res->second.sol_type;
+ } else {
+ solver::print_null_seed_info();
+ cout << ", " << stream_res->second.sol_type;
+ }
} else {
print_seed_info(*no_stream_res);
+ cout << ", " << no_stream_res->second.sol_type;
}
- print_seeds_in_prog(sc->seeds_in_progress);
+ //print_seeds_in_prog(sc->seeds_in_progress);
+ cout << "\n";
sc->results_mutex.unlock();
diff --git a/src/main/solver/solver.cpp b/src/main/solver/solver.cpp
index 3740a15..cf077f9 100644
--- a/src/main/solver/solver.cpp
+++ b/src/main/solver/solver.cpp
@@ -245,13 +245,7 @@ std::ostream& operator<< (std::ostream& out, const solver::result& r) {
}
void solver::print_header(long t, command_line_helper::streamliner_opt stream_opt) {
- cout << "Calculating solvability percentage...\n\n"
- "Lower Bound"
- ", Upper Bound"
- ", Solvable"
- ", Unsolvable"
- ", Timed-out"
- ", Memory Limited, ";
+ cout << "Calculating solvability percentage...\n\n";
if (stream_opt == command_line_helper::streamliner_opt::SMART) {
cout << ", (Streamliner Results:) "
"Attempted Seed"