From d5cc2b2dcfa477add2ad544b4a18e682d9b6220f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ricardo=20Monta=C3=B1ana?= <rmontanana@gmail.com>
Date: Sun, 5 Feb 2023 20:18:27 +0100
Subject: [PATCH] Add discretize to reports and experiments

---
 benchmark/Experiments.py     |  7 +++++++
 benchmark/Results.py         | 11 +++++++++--
 benchmark/scripts/be_main.py |  1 +
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/benchmark/Experiments.py b/benchmark/Experiments.py
index a6091f5..62bb79b 100644
--- a/benchmark/Experiments.py
+++ b/benchmark/Experiments.py
@@ -114,6 +114,7 @@ class Experiment:
         progress_bar=True,
         ignore_nan=True,
         fit_features=None,
+        discretize=None,
         folds=5,
     ):
         env_data = EnvData.load()
@@ -136,6 +137,11 @@ class Experiment:
         self.title = title
         self.ignore_nan = ignore_nan
         self.stratified = stratified == "1"
+        self.discretize = (
+            env_data["discretize"] == "1"
+            if discretize is None
+            else discretize == "1"
+        )
         self.fit_features = (
             env_data["fit_features"] == "1"
             if fit_features is None
@@ -276,6 +282,7 @@ class Experiment:
         output["model"] = self.model_name
         output["version"] = self.version
         output["stratified"] = self.stratified
+        output["discretized"] = self.discretize
         output["folds"] = self.folds
         output["date"] = self.date
         output["time"] = self.time
diff --git a/benchmark/Results.py b/benchmark/Results.py
index 97ee84d..db5e630 100644
--- a/benchmark/Results.py
+++ b/benchmark/Results.py
@@ -218,7 +218,8 @@ class Report(BaseReport):
         self.header_line(f" {self.data['title']}")
         self.header_line(
             f" Random seeds: {self.data['seeds']} Stratified: "
-            f"{self.data['stratified']}"
+            f"{self.data['stratified']}  Discretized: "
+            f"{self.data['discretized']}"
         )
         hours = self.data["duration"] / 3600
         self.header_line(
@@ -485,10 +486,16 @@ class Excel(BaseReport):
             3,
             9,
             3,
-            11,
+            10,
             f"Stratified: {self.data['stratified']}",
             merge_format_subheader_left,
         )
+        self.sheet.write(
+            3,
+            11,
+            f"Discretized: {self.data['discretized']}",
+            merge_format_subheader_left,
+        )
         header_cols = [
             ("Dataset", 30),
             ("Samples", 10),
diff --git a/benchmark/scripts/be_main.py b/benchmark/scripts/be_main.py
index d466c39..d900dfc 100755
--- a/benchmark/scripts/be_main.py
+++ b/benchmark/scripts/be_main.py
@@ -42,6 +42,7 @@ def main(args_test=None):
             title=args.title,
             folds=args.n_folds,
             fit_features=args.fit_features,
+            discretize=args.discretize,
         )
         job.do_experiment()
     except ValueError as e: