From e5e947779f25d6c515cfa09f8be5a2a1d152eac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Monta=C3=B1ana=20G=C3=B3mez?= Date: Mon, 15 Apr 2024 17:34:37 +0200 Subject: [PATCH] Add datasets hyperparameter to b_main --- src/commands/b_main.cpp | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/src/commands/b_main.cpp b/src/commands/b_main.cpp index 28cb34d..83dfb56 100644 --- a/src/commands/b_main.cpp +++ b/src/commands/b_main.cpp @@ -16,7 +16,8 @@ void manageArguments(argparse::ArgumentParser& program) { auto env = platform::DotEnv(); auto datasets = platform::Datasets(false, platform::Paths::datasets()); - program.add_argument("-d", "--dataset") + auto& group = program.add_mutually_exclusive_group(true); + group.add_argument("-d", "--dataset") .help("Dataset file name: " + datasets.toString()) .default_value("all") .action([](const std::string& value) { @@ -29,6 +30,7 @@ void manageArguments(argparse::ArgumentParser& program) throw std::runtime_error("Dataset must be one of: " + datasets.toString()); } ); + group.add_argument("--datasets").nargs(1, 50).help("Datasets file names").default_value(std::vector()); 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."); @@ -74,11 +76,13 @@ int main(int argc, char** argv) json hyperparameters_json; bool discretize_dataset, stratified, saveResults, quiet, no_train_score; std::vector seeds; + std::vector file_names; std::vector filesToTest; int n_folds; try { program.parse_args(argc, argv); file_name = program.get("dataset"); + file_names = program.get>("datasets"); model_name = program.get("model"); discretize_dataset = program.get("discretize"); stratified = program.get("stratified"); @@ -104,18 +108,26 @@ int main(int argc, char** argv) exit(1); } auto datasets = platform::Datasets(discretize_dataset, platform::Paths::datasets()); - if (file_name != "all") { - if (!datasets.isDataset(file_name)) { - cerr << "Dataset " << file_name << " not found" << std::endl; - exit(1); - } - if (title == "") { - title = "Test " + file_name + " " + model_name + " " + to_string(n_folds) + " folds"; - } - filesToTest.push_back(file_name); - } else { - filesToTest = datasets.getNames(); + if (file_names.size() > 0) { + filesToTest = file_names; saveResults = true; + if (title == "") { + title = "Test " + to_string(file_names.size()) + " datasets " + model_name + " " + to_string(n_folds) + " folds"; + } + } else { + if (file_name != "all") { + if (!datasets.isDataset(file_name)) { + cerr << "Dataset " << file_name << " not found" << std::endl; + exit(1); + } + if (title == "") { + title = "Test " + file_name + " " + model_name + " " + to_string(n_folds) + " folds"; + } + filesToTest.push_back(file_name); + } else { + filesToTest = datasets.getNames(); + saveResults = true; + } } platform::HyperParameters test_hyperparams; if (hyperparameters_file != "") {