From 2202a81782203d10b9f0f1d1a21b21a166ad60f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Monta=C3=B1ana=20G=C3=B3mez?= Date: Thu, 6 Jun 2024 18:33:01 +0200 Subject: [PATCH] Add discretization algo to result --- src/commands/b_main.cpp | 2 ++ src/main/Experiment.h | 5 +++++ src/results/Result.h | 1 + 3 files changed, 8 insertions(+) diff --git a/src/commands/b_main.cpp b/src/commands/b_main.cpp index 06c9784..ba5a945 100644 --- a/src/commands/b_main.cpp +++ b/src/commands/b_main.cpp @@ -177,7 +177,9 @@ int main(int argc, char** argv) */ auto env = platform::DotEnv(); auto experiment = platform::Experiment(); + std::string discretiz_algo = env.get("discretiz_algo"); experiment.setTitle(title).setLanguage("c++").setLanguageVersion("13.2.1"); + experiment.setDiscretizationAlgorithm(discretiz_algo); 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.h b/src/main/Experiment.h index 3892e82..ef85cc0 100644 --- a/src/main/Experiment.h +++ b/src/main/Experiment.h @@ -20,6 +20,10 @@ namespace platform { Experiment& setModelVersion(const std::string& model_version) { this->result.setModelVersion(model_version); return *this; } Experiment& setModel(const std::string& model) { this->result.setModel(model); return *this; } Experiment& setLanguage(const std::string& language) { this->result.setLanguage(language); return *this; } + Experiment& setDiscretizationAlgorithm(const std::string& discretization_algo) + { + this->discretization_algo = discretization_algo; this->result.setDiscretizationAlgorithm(discretization_algo); return *this; + } Experiment& setLanguageVersion(const std::string& language_version) { this->result.setLanguageVersion(language_version); return *this; } Experiment& setDiscretized(bool discretized) { this->discretized = discretized; result.setDiscretized(discretized); return *this; } Experiment& setStratified(bool stratified) { this->stratified = stratified; result.setStratified(stratified); return *this; } @@ -38,6 +42,7 @@ namespace platform { bool discretized{ false }, stratified{ false }; std::vector results; std::vector randomSeeds; + std::string discretization_algo; HyperParameters hyperparameters; int nfolds{ 0 }; int max_name{ 7 }; // max length of dataset name for formatting (default 7) diff --git a/src/results/Result.h b/src/results/Result.h index e7025b2..4a9f4f2 100644 --- a/src/results/Result.h +++ b/src/results/Result.h @@ -32,6 +32,7 @@ namespace platform { json getData() const { return data; } // Setters void setTitle(const std::string& title) { data["title"] = title; }; + void setDiscretizationAlgorithm(const std::string& discretization_algo) { data["discretization_algorithm"] = discretization_algo; }; void setLanguage(const std::string& language) { data["language"] = language; }; void setLanguageVersion(const std::string& language_version) { data["language_version"] = language_version; }; void setDuration(double duration) { data["duration"] = duration; };