From 962246d3fa50188f1933749c628a91e6e419f2bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Monta=C3=B1ana?= Date: Tue, 13 Jun 2023 16:33:18 +0200 Subject: [PATCH] continue experiment --- beflask/interactive/forms.py | 1 + beflask/interactive/main_interactive.py | 14 ++-- beflask/interactive/templates/experiment.html | 73 +++++++++++++++++++ beflask/interactive/templates/ranking.html | 8 -- 4 files changed, 80 insertions(+), 16 deletions(-) diff --git a/beflask/interactive/forms.py b/beflask/interactive/forms.py index 51efcc2..e25332e 100644 --- a/beflask/interactive/forms.py +++ b/beflask/interactive/forms.py @@ -18,6 +18,7 @@ class BenchmarkDatasetForm(FlaskForm): ignore_nan = BooleanField("Ignore NaN") n_folds = IntegerField("# Folds") hyperparameters = TextAreaField("Hyperparameters") + submit = SubmitField("Do Experiment!") # ----- NOT USED ----- # diff --git a/beflask/interactive/main_interactive.py b/beflask/interactive/main_interactive.py index 33672b3..9fd2d10 100644 --- a/beflask/interactive/main_interactive.py +++ b/beflask/interactive/main_interactive.py @@ -39,14 +39,12 @@ def experiment(): discretize = "1" if form.discretize.data else "0" ignore_nan = "1" if form.ignore_nan.data else "0" hyperparameters = form.hyperparameters.data - - return redirect(url_for("interactive.ranking")) - - form.model.data = env.get("model") - form.score.data = env.get("score") - 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" + else: + form.model.data = env.get("model") + form.score.data = env.get("score") + 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" return render_template("experiment.html", form=form, title="Experiment") diff --git a/beflask/interactive/templates/experiment.html b/beflask/interactive/templates/experiment.html index 0cc3938..4bd4be9 100644 --- a/beflask/interactive/templates/experiment.html +++ b/beflask/interactive/templates/experiment.html @@ -10,3 +10,76 @@ {% endblock %} +{% block jscript %} + {{ super() }} + +{% endblock %} diff --git a/beflask/interactive/templates/ranking.html b/beflask/interactive/templates/ranking.html index 815d823..b2c26e8 100644 --- a/beflask/interactive/templates/ranking.html +++ b/beflask/interactive/templates/ranking.html @@ -129,14 +129,6 @@ $("#go_back").removeAttr("hidden"); }); - function send() { - var data= {action: "ReadyToRock!", score: document.getElementById('score').value, excel: document.getElementById('excel').checked}; - socket.emit('client', data); - $("#status").removeAttr("hidden"); - $("#status-alert").removeAttr("hidden"); - $(".progress").removeAttr("hidden"); - $("#submit").attr("hidden", true); - } function send() { var data= { action: "ReadyToRock!",