From d7174e930b4a05c2ee4ff304c5a0182133f9aa2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Monta=C3=B1ana=20G=C3=B3mez?= Date: Thu, 1 Feb 2024 11:08:27 +0100 Subject: [PATCH] Remove build & report parameters from b_best --- src/Platform/b_best.cc | 30 +++++++---------------------- src/Platform/modules/BestResults.cc | 1 + 2 files changed, 8 insertions(+), 23 deletions(-) diff --git a/src/Platform/b_best.cc b/src/Platform/b_best.cc index f305ae5..c789c02 100644 --- a/src/Platform/b_best.cc +++ b/src/Platform/b_best.cc @@ -9,8 +9,6 @@ void manageArguments(argparse::ArgumentParser& program, int argc, char** argv) { program.add_argument("-m", "--model").default_value("").help("Filter results of the selected model) (any for all models)"); program.add_argument("-s", "--score").default_value("").help("Filter results of the score name supplied"); - program.add_argument("--build").help("build best score results file").default_value(false).implicit_value(true); - program.add_argument("--report").help("report of best score results file").default_value(false).implicit_value(true); program.add_argument("--friedman").help("Friedman test").default_value(false).implicit_value(true); program.add_argument("--excel").help("Output to excel").default_value(false).implicit_value(true); program.add_argument("--level").help("significance level").default_value(0.05).scan<'g', double>().action([](const std::string& value) { @@ -40,8 +38,6 @@ int main(int argc, char** argv) program.parse_args(argc, argv); model = program.get("model"); score = program.get("score"); - build = program.get("build"); - report = program.get("report"); friedman = program.get("friedman"); excel = program.get("excel"); level = program.get("level"); @@ -53,11 +49,6 @@ int main(int argc, char** argv) std::cerr << program; exit(1); } - if (!report && !build) { - std::cerr << "Either build, report or both, have to be selected to do anything!" << std::endl; - std::cerr << program; - exit(1); - } } catch (const std::exception& err) { std::cerr << err.what() << std::endl; @@ -66,20 +57,13 @@ int main(int argc, char** argv) } // Generate report auto results = platform::BestResults(platform::Paths::results(), score, model, friedman, level); - if (build) { - if (model == "any") { - results.buildAll(); - } else { - std::string fileName = results.build(); - std::cout << Colors::GREEN() << fileName << " created!" << Colors::RESET() << std::endl; - } - } - if (report) { - if (model == "any") { - results.reportAll(excel); - } else { - results.reportSingle(excel); - } + if (model == "any") { + results.buildAll(); + results.reportAll(excel); + } else { + std::string fileName = results.build(); + std::cout << Colors::GREEN() << fileName << " created!" << Colors::RESET() << std::endl; + results.reportSingle(excel); } return 0; } diff --git a/src/Platform/modules/BestResults.cc b/src/Platform/modules/BestResults.cc index c361955..35336a9 100644 --- a/src/Platform/modules/BestResults.cc +++ b/src/Platform/modules/BestResults.cc @@ -90,6 +90,7 @@ namespace platform { } } } + std::sort(files.begin(), files.end()); return files; } json BestResults::loadFile(const std::string& fileName)