Refactor to accept new Library structure

src/main/Experiment.cc

@@ -1,8 +1,8 @@
-#include "Experiment.h"
-#include "Datasets.h"
+#include "common/Datasets.h"
+#include "reports/ReportConsole.h"
+#include "common/Paths.h"
 #include "Models.h"
-#include "ReportConsole.h"
-#include "Paths.h"
+#include "Experiment.h"
 namespace platform {
     using json = nlohmann::json;
 

src/main/Experiment.h

@@ -3,8 +3,8 @@
 #include <torch/torch.h>
 #include <nlohmann/json.hpp>
 #include <string>
-#include "folding.hpp"
-#include "BaseClassifier.h"
+#include <folding.hpp>
+#include "bayesnet/BaseClassifier.h"
 #include "HyperParameters.h"
 #include "Result.h"
 

src/main/HyperParameters.cc

@@ -1,7 +1,7 @@
-#include "HyperParameters.h"
 #include <fstream>
 #include <sstream>
 #include <iostream>
+#include "HyperParameters.h"
 
 namespace platform {
     HyperParameters::HyperParameters(const std::vector<std::string>& datasets, const json& hyperparameters_)

src/main/Models.h

@@ -1,21 +1,21 @@
 #ifndef MODELS_H
 #define MODELS_H
 #include <map>
-#include "BaseClassifier.h"
-#include "ensembles/AODE.h"
-#include "ensembles/AODELd.h"
-#include "ensembles/BoostAODE.h"
-#include "classifiers/TAN.h"
-#include "classifiers/KDB.h"
-#include "classifiers/SPODE.h"
-#include "classifiers/TANLd.h"
-#include "classifiers/KDBLd.h"
-#include "classifiers/SPODELd.h"
-#include "STree.h"
-#include "ODTE.h"
-#include "SVC.h"
-#include "XGBoost.h"
-#include "RandomForest.h"
+#include <bayesnet/BaseClassifier.h>
+#include <bayesnet/ensembles/AODE.h>
+#include <bayesnet/ensembles/AODELd.h>
+#include <bayesnet/ensembles/BoostAODE.h>
+#include <bayesnet/classifiers/TAN.h>
+#include <bayesnet/classifiers/KDB.h>
+#include <bayesnet/classifiers/SPODE.h>
+#include <bayesnet/classifiers/TANLd.h>
+#include <bayesnet/classifiers/KDBLd.h>
+#include <bayesnet/classifiers/SPODELd.h>
+#include <pyclassifiers/STree.h>
+#include <pyclassifiers/ODTE.h>
+#include <pyclassifiers/SVC.h>
+#include <pyclassifiers/XGBoost.h>
+#include <pyclassifiers/RandomForest.h>
 namespace platform {
     class Models {
     private:

src/main/Result.cc

@@ -1,12 +1,12 @@
-#include "Result.h"
 #include <filesystem>
 #include <fstream>
 #include <sstream>
-#include "BestScore.h"
-#include "Colors.h"
-#include "DotEnv.h"
-#include "CLocale.h"
-#include "Paths.h"
+#include "best/BestScore.h"
+#include "common/Colors.h"
+#include "common/DotEnv.h"
+#include "common/CLocale.h"
+#include "common/Paths.h"
+#include "Result.h"
 
 namespace platform {
     std::string get_actual_date()

src/main/Result.h

@@ -4,9 +4,9 @@
 #include <vector>
 #include <string>
 #include <nlohmann/json.hpp>
-#include "HyperParameters.h"
-#include "PartialResult.h"
-#include "Timer.h"
+#include "common/Timer.h"
+#include "main/HyperParameters.h"
+#include "main/PartialResult.h"
 
 namespace platform {
     using json = nlohmann::json;

src/main/b_main.cc

@@ -2,11 +2,11 @@
 #include <argparse/argparse.hpp>
 #include <nlohmann/json.hpp>
 #include "Experiment.h"
-#include "Datasets.h"
-#include "DotEnv.h"
+#include "common/Datasets.h"
+#include "common/DotEnv.h"
+#include "common/Paths.h"
 #include "Models.h"
 #include "modelRegister.h"
-#include "Paths.h"
 #include "config.h"
 
 
@@ -55,7 +55,7 @@ void manageArguments(argparse::ArgumentParser& program)
 
 int main(int argc, char** argv)
 {
-    argparse::ArgumentParser program("b_main", { project_version.begin(), project_version.end() });
+    argparse::ArgumentParser program("b_main", { platform_project_version.begin(), platform_project_version.end() });
     manageArguments(program);
     std::string file_name, model_name, title, hyperparameters_file;
     json hyperparameters_json;