From 5ec7fe8d00fff1b11d6c7784570f30dc2199f043 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Monta=C3=B1ana=20G=C3=B3mez?= Date: Tue, 9 Apr 2024 23:20:19 +0200 Subject: [PATCH] Show model version in b_main --- src/commands/b_main.cpp | 10 +++++----- src/main/Experiment.cpp | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/commands/b_main.cpp b/src/commands/b_main.cpp index 014a710..28cb34d 100644 --- a/src/commands/b_main.cpp +++ b/src/commands/b_main.cpp @@ -28,7 +28,7 @@ void manageArguments(argparse::ArgumentParser& program) } throw std::runtime_error("Dataset must be one of: " + datasets.toString()); } - ); + ); program.add_argument("--hyperparameters").default_value("{}").help("Hyperparameters passed to the model in Experiment"); program.add_argument("--hyper-file").default_value("").help("Hyperparameters file name." \ "Mutually exclusive with hyperparameters. This file should contain hyperparameters for each dataset in json format."); @@ -41,7 +41,7 @@ void manageArguments(argparse::ArgumentParser& program) } throw std::runtime_error("Model must be one of " + platform::Models::instance()->toString()); } - ); + ); program.add_argument("--title").default_value("").help("Experiment title"); program.add_argument("--discretize").help("Discretize input dataset").default_value((bool)stoi(env.get("discretize"))).implicit_value(true); program.add_argument("--no-train-score").help("Don't compute train score").default_value(false).implicit_value(true); @@ -62,8 +62,8 @@ void manageArguments(argparse::ArgumentParser& program) catch (...) { throw std::runtime_error("Number of folds must be an integer"); }}); - auto seed_values = env.getSeeds(); - program.add_argument("-s", "--seeds").nargs(1, 10).help("Random seeds. Set to -1 to have pseudo random").scan<'i', int>().default_value(seed_values); + auto seed_values = env.getSeeds(); + program.add_argument("-s", "--seeds").nargs(1, 10).help("Random seeds. Set to -1 to have pseudo random").scan<'i', int>().default_value(seed_values); } int main(int argc, char** argv) @@ -129,7 +129,7 @@ int main(int argc, char** argv) */ auto env = platform::DotEnv(); auto experiment = platform::Experiment(); - experiment.setTitle(title).setLanguage("cpp").setLanguageVersion("14.0.3"); + experiment.setTitle(title).setLanguage("c++").setLanguageVersion("13.2.1"); experiment.setDiscretized(discretize_dataset).setModel(model_name).setPlatform(env.get("platform")); experiment.setStratified(stratified).setNFolds(n_folds).setScoreName("accuracy"); experiment.setHyperparameters(test_hyperparams); diff --git a/src/main/Experiment.cpp b/src/main/Experiment.cpp index 63aa2cd..60a2401 100644 --- a/src/main/Experiment.cpp +++ b/src/main/Experiment.cpp @@ -26,6 +26,9 @@ namespace platform { max_name = fileName.size(); } std::cout << Colors::MAGENTA() << "*** Starting experiment: " << result.getTitle() << " ***" << Colors::RESET() << std::endl << std::endl; + auto clf = Models::instance()->create(result.getModel()); + auto version = clf->getVersion(); + std::cout << Colors::BLUE() << " Using " << result.getModel() << " ver. " << version << std::endl << std::endl; if (!quiet) { std::cout << Colors::GREEN() << " Status Meaning" << std::endl; std::cout << " ------ --------------------------------" << Colors::RESET() << std::endl;