From 94cb2a061715a6dc79a520edfe6fdf772f96b4a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ricardo=20Monta=C3=B1ana?= <rmontanana@gmail.com>
Date: Wed, 14 Jun 2023 20:32:34 +0200
Subject: [PATCH] Fix minor mistakes in experiment

---
 beflask/interactive/forms.py                 | 1 +
 beflask/interactive/main_interactive.py      | 7 +++++--
 beflask/results/main_results.py              | 6 +++---
 beflask/results/templates/_table_report.html | 2 ++
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/beflask/interactive/forms.py b/beflask/interactive/forms.py
index 53ec036..48629eb 100644
--- a/beflask/interactive/forms.py
+++ b/beflask/interactive/forms.py
@@ -17,6 +17,7 @@ class BenchmarkDatasetForm(FlaskForm):
     stratified = BooleanField("Stratified")
     ignore_nan = BooleanField("Ignore NaN")
     fit_features = BooleanField("Fit Features")
+    best_results = BooleanField("Compare to Best Results")
     n_folds = IntegerField("# Folds")
     hyperparameters = TextAreaField("Hyperparameters")
     submit = SubmitField("Do Experiment!")
diff --git a/beflask/interactive/main_interactive.py b/beflask/interactive/main_interactive.py
index 8cb218e..12f70be 100644
--- a/beflask/interactive/main_interactive.py
+++ b/beflask/interactive/main_interactive.py
@@ -43,6 +43,7 @@ def experiment():
         discretize = "1" if form.discretize.data else "0"
         ignore_nan = "1" if form.ignore_nan.data else "0"
         fit_features = "1" if form.fit_features.data else "0"
+        best_results = "1" if form.best_results.data else "0"
         hyperparameters = form.hyperparameters.data or "{}"
         back = url_for("interactive.experiment")
         try:
@@ -61,7 +62,7 @@ def experiment():
                 stratified=stratified,
                 datasets=Datasets(dataset_name=dataset, discretize=discretize),
                 hyperparams_dict=hyperparameters,
-                hyperparams_file=None,
+                hyperparams_file=best_results,
                 grid_paramfile=None,
                 progress_bar=False,
                 platform="BeFlask",
@@ -83,7 +84,7 @@ def experiment():
         else:
             file_name = str(Path(job.get_output_file()).name)
             try:
-                result = prepare_report(file_name)
+                result = prepare_report(file_name, form.best_results.data)
             except FileNotFoundError as e:
                 return render_template(
                     "error.html",
@@ -115,6 +116,8 @@ def experiment():
     form.n_folds.data = env.get("n_folds", 5)
     form.stratified.data = env.get("stratified", "0") == "1"
     form.discretize.data = env.get("discretize", "0") == "1"
+    form.fit_features.data = env.get("fit_features", "0") == "1"
+    form.best_results.data = current_app.config["COMPARE"]
     return render_template("experiment.html", form=form, title="Experiment")
 
 
diff --git a/beflask/results/main_results.py b/beflask/results/main_results.py
index d76ac7a..91a126f 100644
--- a/beflask/results/main_results.py
+++ b/beflask/results/main_results.py
@@ -100,11 +100,11 @@ def set_compare():
     return AjaxResponse(True, "Ok").to_string()
 
 
-def prepare_report(file_name):
+def prepare_report(file_name, compare):
     app_config = dotenv_values(".env")
     with open(os.path.join(Folders.results, file_name)) as f:
         data = json.load(f)
-        summary = process_data(file_name, current_app.config["COMPARE"], data)
+        summary = process_data(file_name, compare, data)
     return dict(app_config=app_config, data=data, summary=summary)
 
 
@@ -115,7 +115,7 @@ def report(file_name):
     back = request.args.get("url") or ""
     back_name = request.args.get("url_name") or ""
     try:
-        result = prepare_report(file_name)
+        result = prepare_report(file_name, current_app.config["COMPARE"])
     except FileNotFoundError as e:
         return render_template(
             "error.html",
diff --git a/beflask/results/templates/_table_report.html b/beflask/results/templates/_table_report.html
index a77dc96..1517f4b 100644
--- a/beflask/results/templates/_table_report.html
+++ b/beflask/results/templates/_table_report.html
@@ -1,6 +1,7 @@
 {% from "macros.html" import excel_button %}
 <div id="app">
     {% if back %}
+        <hr>
         <button type="button"
                 class="btn btn-primary position-relative"
                 onclick="location.href='{{ back }}'">
@@ -9,6 +10,7 @@
                 <span class="visually-hidden">Back to {{ back_name }}</span>
             </span>
         </button>
+        <hr>
     {% endif %}
     <section class="section">
         <div class="container-fluid">