diff --git a/src/best/BestResults.cpp b/src/best/BestResults.cpp index 8bff53c..1bc05c4 100644 --- a/src/best/BestResults.cpp +++ b/src/best/BestResults.cpp @@ -226,7 +226,6 @@ namespace platform { } std::cout << std::endl; auto i = 0; - bool odd = true; std::map totals; int nDatasets = table.begin().value().size(); for (const auto& model : models) { @@ -234,7 +233,7 @@ namespace platform { } auto datasets = getDatasets(table.begin().value()); for (auto const& dataset_ : datasets) { - auto color = odd ? Colors::BLUE() : Colors::CYAN(); + auto color = (i % 2) ? Colors::BLUE() : Colors::CYAN(); std::cout << color << std::setw(3) << std::fixed << std::right << i++ << " "; std::cout << std::setw(maxDatasetName) << std::left << dataset_ << " "; double maxValue = 0; @@ -272,7 +271,6 @@ namespace platform { } } std::cout << std::endl; - odd = !odd; } std::cout << Colors::GREEN() << "=== " << std::string(maxDatasetName, '=') << " "; for (const auto& model : models) { diff --git a/src/grid/b_grid.cpp b/src/grid/b_grid.cpp index fb37c47..b478c64 100644 --- a/src/grid/b_grid.cpp +++ b/src/grid/b_grid.cpp @@ -100,14 +100,13 @@ void list_dump(std::string& model) std::cout << Colors::GREEN() << left << " # " << left << setw(max_dataset) << "Dataset" << " #Com. " << setw(max_hyper) << "Hyperparameters" << std::endl; std::cout << "=== " << string(max_dataset, '=') << " ===== " << string(max_hyper, '=') << std::endl; - bool odd = true; + int i = 0; for (auto const& item : combinations) { - auto color = odd ? Colors::CYAN() : Colors::BLUE(); + auto color = (i++ % 2) ? Colors::CYAN() : Colors::BLUE(); std::cout << color; auto num_combinations = data.getNumCombinations(item.first); std::cout << setw(3) << fixed << right << ++index << left << " " << setw(max_dataset) << item.first << " " << setw(5) << right << num_combinations << " " << setw(max_hyper) << left << item.second.dump() << std::endl; - odd = !odd; } std::cout << Colors::RESET() << std::endl; } @@ -141,17 +140,15 @@ void list_results(json& results, std::string& model) << "Duration " << setw(8) << "Score" << " " << "Hyperparameters" << std::endl; std::cout << "=== " << string(spaces, '=') << " " << string(19, '=') << " " << string(8, '=') << " " << string(8, '=') << " " << string(hyperparameters_spaces, '=') << std::endl; - bool odd = true; int index = 0; for (const auto& item : results["results"].items()) { - auto color = odd ? Colors::CYAN() : Colors::BLUE(); + auto color = (index % 2) ? Colors::CYAN() : Colors::BLUE(); auto value = item.value(); std::cout << color; std::cout << std::setw(3) << std::right << index++ << " "; std::cout << left << setw(spaces) << item.key() << " " << value["date"].get() << " " << setw(8) << right << value["duration"].get() << " " << setw(8) << setprecision(6) << fixed << right << value["score"].get() << " " << value["hyperparameters"].dump() << std::endl; - odd = !odd; } std::cout << Colors::RESET() << std::endl; } diff --git a/src/manage/ManageResults.cpp b/src/manage/ManageResults.cpp index 023c8e8..a1c9119 100644 --- a/src/manage/ManageResults.cpp +++ b/src/manage/ManageResults.cpp @@ -55,15 +55,13 @@ namespace platform { int maxTitle = results.maxTitleSize(); std::cout << Colors::GREEN() << " # Date " << std::setw(maxModel) << std::left << "Model" << " Score Name Score C/P Duration Title" << std::endl; std::cout << "=== ========== " << std::string(maxModel, '=') << " =========== =========== === ========= " << std::string(maxTitle, '=') << std::endl; - bool odd = true; for (auto& result : results) { - auto color = odd ? Colors::BLUE() : Colors::CYAN(); + auto color = (i % 2) ? Colors::BLUE() : Colors::CYAN(); std::cout << color << std::setw(3) << std::fixed << std::right << i++ << " "; std::cout << result.to_string(maxModel) << std::endl; if (i == numFiles) { break; } - odd = !odd; } } bool ManageResults::confirmAction(const std::string& intent, const std::string& fileName) const diff --git a/src/reports/ReportConsole.cpp b/src/reports/ReportConsole.cpp index 33398f6..8e6eda1 100644 --- a/src/reports/ReportConsole.cpp +++ b/src/reports/ReportConsole.cpp @@ -48,14 +48,13 @@ namespace platform { std::cout << "=== " << std::string(maxDataset, '=') << " ====== ===== === ========= ========= ========= =============== =================== " << std::string(maxHyper, '=') << std::endl; json lastResult; double totalScore = 0.0; - bool odd = true; int index = 0; for (const auto& r : data["results"]) { if (selectedIndex != -1 && index != selectedIndex) { index++; continue; } - auto color = odd ? Colors::CYAN() : Colors::BLUE(); + auto color = (index % 2) ? Colors::CYAN() : Colors::BLUE(); std::cout << color; std::string separator{ " " }; if (r.find("notes") != r.end()) { @@ -78,7 +77,6 @@ namespace platform { std::cout << std::flush; lastResult = r; totalScore += r["score"].get(); - odd = !odd; } if (data["results"].size() == 1 || selectedIndex != -1) { std::cout << std::string(MAXL, '*') << std::endl;