Fix gridsearch discretize_algo mistake

README.md

@@ -24,7 +24,14 @@ The solution is to erase the libstdc++ library from the miniconda installation a
 
 ### MPI
 
-In Linux just install openmpi & openmpi-devel packages. Only if cmake can't find openmpi installation (like in Oracle Linux) set the following variable:
+In Linux just install openmpi & openmpi-devel packages.
+
+```bash
+source /etc/profile.d/modules.sh
+module load mpi/openmpi-x86_64
+```
+
+If cmake can't find openmpi installation (like in Oracle Linux) set the following variable:
 
 ```bash
 export MPI_HOME="/usr/lib64/openmpi"

src/common/Datasets.cpp

@@ -8,7 +8,7 @@ namespace platform {
     Datasets::Datasets(bool discretize, std::string sfileType, std::string discretizer_algorithm) :
         discretize(discretize), sfileType(sfileType), discretizer_algorithm(discretizer_algorithm)
     {
-        if (discretizer_algorithm == "none" && discretize) {
+        if ((discretizer_algorithm == "none" || discretizer_algorithm == "") && discretize) {
             throw std::runtime_error("Can't discretize without discretization algorithm");
         }
         load();

src/grid/GridSearch.cpp

@@ -108,6 +108,7 @@ namespace platform {
         // Generate the hyperparamters combinations
         auto& dataset = datasets.getDataset(dataset_name);
         auto combinations = grid.getGrid(dataset_name);
+        dataset.load();
         auto [X, y] = dataset.getTensors();
         auto features = dataset.getFeatures();
         auto className = dataset.getClassName();
@@ -353,7 +354,8 @@ namespace platform {
         tasks = json::parse(msg);
         delete[] msg;
         auto env = platform::DotEnv();
-        auto datasets = Datasets(config.discretize, Paths::datasets(), env.get("discretiz_algo"));
+        auto datasets = Datasets(config.discretize, Paths::datasets(), env.get("discretize_algo"));
+
         if (config_mpi.rank == config_mpi.manager) {
             //
             // 2a. Producer delivers the tasks to the consumers

src/reports/ReportConsole.cpp

@@ -24,8 +24,8 @@ namespace platform {
             + " random seeds. " + data["date"].get<std::string>() + " " + data["time"].get<std::string>()
         );
         sheader << headerLine(data["title"].get<std::string>());
-        std::string discretiz_algo = data.find("discretization_algorithm") != data.end() ? data["discretization_algorithm"].get<std::string>() : "ORIGINAL";
-        std::string algorithm = data["discretized"].get<bool>() ? " (" + discretiz_algo + ")" : "";
+        std::string discretize_algo = data.find("discretization_algorithm") != data.end() ? data["discretization_algorithm"].get<std::string>() : "ORIGINAL";
+        std::string algorithm = data["discretized"].get<bool>() ? " (" + discretize_algo + ")" : "";
         std::string smooth = data.find("smooth_strategy") != data.end() ? data["smooth_strategy"].get<std::string>() : "ORIGINAL";
         std::string stratified;
         try {

src/reports/ReportExcel.cpp

@@ -68,8 +68,8 @@ namespace platform {
         worksheet_merge_range(worksheet, 3, 10, 3, 11, oss.str().c_str(), styles["headerSmall"]);
         oss.str("");
         oss.clear();
-        std::string discretiz_algo = data.find("discretization_algorithm") != data.end() ? data["discretization_algorithm"].get<std::string>() : "mdlp";
-        std::string algorithm = data["discretized"].get<bool>() ? " (" + discretiz_algo + ")" : "";
+        std::string discretize_algo = data.find("discretization_algorithm") != data.end() ? data["discretization_algorithm"].get<std::string>() : "mdlp";
+        std::string algorithm = data["discretized"].get<bool>() ? " (" + discretize_algo + ")" : "";
         oss << "Discretized: " << (data["discretized"].get<bool>() ? "True" : "False") << algorithm;
         worksheet_write_string(worksheet, 3, 12, oss.str().c_str(), styles["headerSmall"]);
     }