From 6844d13973795bc7db55b121b573e82e02102162 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ricardo=20Montan=CC=83ana?= <rmontanana@gmail.com>
Date: Mon, 26 Jun 2023 11:07:12 +0200
Subject: [PATCH] Update format to report

---
 benchmark/scripts/app/main.py                 |   4 +-
 .../app/templates/partials/table_report.html  |  36 ++---
 .../partials/table_report_bootstrap.html      | 151 +++++++++--------
 .../partials/table_report_bulma.html          | 153 +++++++++---------
 4 files changed, 177 insertions(+), 167 deletions(-)

diff --git a/benchmark/scripts/app/main.py b/benchmark/scripts/app/main.py
index 9e7a3e3..446b9da 100755
--- a/benchmark/scripts/app/main.py
+++ b/benchmark/scripts/app/main.py
@@ -3,6 +3,7 @@ import os
 import json
 import shutil
 import xlsxwriter
+from dotenv import dotenv_values
 from benchmark.Utils import Files, Folders
 from benchmark.Arguments import EnvData
 from benchmark.ResultsBase import StubReport
@@ -99,7 +100,7 @@ def datasets(compare):
 def showfile(file_name, compare, back=None):
     compare = compare.capitalize() == "True"
     back = request.args["url"] if back is None else back
-    print(f"back [{back}]")
+    app_config = dotenv_values(".env")
     with open(os.path.join(Folders.results, file_name)) as f:
         data = json.load(f)
     try:
@@ -113,6 +114,7 @@ def showfile(file_name, compare, back=None):
         summary=summary,
         framework=current_app.config[FRAMEWORK],
         back=back,
+        app_config=app_config,
     )
 
 
diff --git a/benchmark/scripts/app/templates/partials/table_report.html b/benchmark/scripts/app/templates/partials/table_report.html
index 47855d9..e572dd0 100644
--- a/benchmark/scripts/app/templates/partials/table_report.html
+++ b/benchmark/scripts/app/templates/partials/table_report.html
@@ -1,28 +1,14 @@
 {% for item in data.results %}
   <tr>
-    <td>
-      {{item.dataset}}
-    </td>
-    <td class="{{ right }}">
-      {{'{:,}'.format(item.samples)}}
-    </td>
-    <td class="{{ right }}">
-      {{"%d" % item.features}}
-    </td>
-    <td class="{{ right }}">
-      {{"%d" % item.classes}}
-    </td>
-    <td class="{{ right }}">
-      {{'{:,.2f}'.format(item.nodes)}}
-    </td>
-    <td class="{{ right }}">
-      {{"%.6f±%.4f" % (item.score, item.score_std)}} {{ item.symbol|safe }}
-    </td>
-    <td class="{{ right }}">
-      {{"%.6f±%.4f" % (item.time, item.time_std)}}
-    </td>
-    <td class="{{ center }}">
-      {{item.hyperparameters}}
-    </td>
+    <td>{{ item.dataset }}</td>
+    <td class="{{ right }}">{{ '{:,}'.format(item.samples) }}</td>
+    <td class="{{ right }}">{{"%d" % item.features}}</td>
+    <td class="{{ right }}">{{"%d" % item.classes}}</td>
+    <td class="{{ right }}">{{ '{:,.2f}'.format(item.nodes|float) }}</td>
+    <td class="{{ right }}">{{ '{:,.2f}'.format(item.leaves|float) }}</td>
+    <td class="{{ right }}">{{ '{:,.2f}'.format(item.depth|float) }}</td>
+    <td class="{{ right }}">{{"%.6f±%.4f" % (item.score, item.score_std)}} {{ item.symbol|safe }}</td>
+    <td class="{{ right }}">{{"%.6f±%.4f" % (item.time, item.time_std)}}</td>
+    <td class="{{ center }}">{{ item.hyperparameters }}</td>
   </tr>
-{% endfor %}
\ No newline at end of file
+{% endfor %}
diff --git a/benchmark/scripts/app/templates/partials/table_report_bootstrap.html b/benchmark/scripts/app/templates/partials/table_report_bootstrap.html
index 9484a24..8be1437 100644
--- a/benchmark/scripts/app/templates/partials/table_report_bootstrap.html
+++ b/benchmark/scripts/app/templates/partials/table_report_bootstrap.html
@@ -1,69 +1,77 @@
 <div id="app">
-    <section class="section">
-      <div class="container-fluid">
-        <div class="p-4 bg-primary text-white">
-          <button type="button" class="btn-close" aria-label="Close" onclick="location.href = '{{back}}'"></button>
-          <h1>{{ data.title }}</h1>
-        </div>
-        <div>
-          <table class="table table-bordered">
-            <thead>
-              <tr class="bg-info text-white">
-                <th class="text-center">Platform</th>
-                <th class="text-center">Model</th>
-                <th class="text-center">Date</th>
-                <th class="text-center">Time</th>
-                {% if data.duration > 7200 %}
+  <section class="section">
+    <div class="container-fluid">
+      <div class="p-4 bg-primary text-white">
+        <button type="button"
+                class="btn-close"
+                aria-label="Close"
+                onclick="location.href = '{{ back }}'"></button>
+        <h1>{{ data.title }}</h1>
+      </div>
+      <div>
+        <table class="table table-bordered">
+          <thead>
+            <tr class="bg-info text-white">
+              <th class="text-center">Platform</th>
+              <th class="text-center">Model</th>
+              <th class="text-center">Date</th>
+              <th class="text-center">Time</th>
+              {% if data.duration > 7200 %}
                 {% set unit = "h" %}
                 {% set divider = 3600 %}
-                {% else %}
+              {% else %}
                 {% set unit = "min" %}
                 {% set divider = 60 %}
-                {% endif %}
-                <th class="text-center">Duration ({{ unit }})</th>
-                <th class="text-center">Stratified</th>
-                <th class="text-center">Discretized</th>
-                <th class="text-center"># Folds</th>
-              </tr>
-              <tr>
-                <th class="text-center">{{ data.platform }}</th>
-                <th class="text-center">{{ data.model }} {{ data.version }}</th>
-                <th class="text-center">{{ data.date}}</th>
-                <th class="text-center">{{ data.time}}</th>
-                <th class="text-center">{{ "%.2f" % (data.duration/divider) }}</th>
-                <th class="text-center">{{ data.stratified }}</th>
-                <th class="text-center">{{ data.discretized }}</th>
-                <th class="text-center">{{ data.folds }}</th>
-              </tr>
-              <tr>
-                <th class="text-center bg-info text-white">Language</th>
-                <th class="text-center" colspan=3>{{ data.language }} {{ data.language_version }}</th>
-                <th class="text-center bg-info text-white">Seeds</th>
-                <th class="text-center" colspan=6>{{ data.seeds }}</th>
-              </tr>
-            </thead>
-          </table>
-          <div>
-            <button class="{{ button }}" onclick="excelFile()"><i class="mdi mdi-file-excel"></i> Excel</button>
-          </div>
-          <table id="report-table" class="table table-striped table-hover table-bordered">
-            <thead>
-              <tr class="bg-primary text-white">
-                <th class="text-center">Dataset</th>
-                <th class="text-center">Samples</th>
-                <th class="text-center">Features</th>
-                <th class="text-center">Classes</th>
-                <th class="text-center">Nodes</th>
-                <th class="text-center">{{data.score_name|capitalize}}</th>
-                <th class="text-center">Time</th>
-                <th class="text-center">hyperparameters</th>
-              </tr>
-            </thead>
-            <tbody>
+              {% endif %}
+              <th class="text-center">Duration ({{ unit }})</th>
+              <th class="text-center">Stratified</th>
+              <th class="text-center">Discretized</th>
+              <th class="text-center"># Folds</th>
+            </tr>
+            <tr>
+              <th class="text-center">{{ data.platform }}</th>
+              <th class="text-center">{{ data.model }} {{ data.version }}</th>
+              <th class="text-center">{{ data.date }}</th>
+              <th class="text-center">{{ data.time }}</th>
+              <th class="text-center">{{ "%.2f" % (data.duration/divider) }}</th>
+              <th class="text-center">{{ data.stratified }}</th>
+              <th class="text-center">{{ data.discretized }}</th>
+              <th class="text-center">{{ data.folds }}</th>
+            </tr>
+            <tr>
+              <th class="text-center bg-info text-white">Language</th>
+              <th class="text-center" colspan=3>{{ data.language }} {{ data.language_version }}</th>
+              <th class="text-center bg-info text-white">Seeds</th>
+              <th class="text-center" colspan=6>{{ data.seeds }}</th>
+            </tr>
+          </thead>
+        </table>
+        <div>
+          <button class="{{ button }}" onclick="excelFile()">
+            <i class="mdi mdi-file-excel"></i> Excel
+          </button>
+        </div>
+        <table id="report-table"
+               class="table table-striped table-hover table-bordered">
+          <thead>
+            <tr class="bg-primary text-white">
+              <th class="text-center">Dataset</th>
+              <th class="text-center">Samples</th>
+              <th class="text-center">Features</th>
+              <th class="text-center">Classes</th>
+              <th class="text-center">{{ app_config.nodes }}</th>
+              <th class="text-center">{{ app_config.leaves }}</th>
+              <th class="text-center">{{ app_config.depth }}</th>
+              <th class="text-center">{{ data.score_name|capitalize }}</th>
+              <th class="text-center">Time</th>
+              <th class="text-center">hyperparameters</th>
+            </tr>
+          </thead>
+          <tbody>
             {% include "partials/table_report.html" %}
-            </tbody>
-          </table>
-          {% if summary|length > 0 %}
+          </tbody>
+        </table>
+        {% if summary|length > 0 %}
           <div class="col-4 col-lg-4">
             <table class="table table-bordered">
               <thead>
@@ -76,12 +84,19 @@
               {% include "partials/table_summary.html" %}
             </table>
           </div>
-          {% endif %}
-          <button type="button" class="btn-close" aria-label="Close" onclick="location.href = '/index/{{ compare }}'"></button>
-          <h7><b>
-              Total score: {{ "%.6f" % (data.results | sum(attribute="score")) }}
-            </b></h7>
-            <h7>Number of files: {{ data.results | length }}</h7>
-        </div>
+        {% endif %}
+        <button type="button"
+                class="btn-close"
+                aria-label="Close"
+                onclick="location.href = '/index/{{ compare }}'"></button>
+        <h7>
+        <b>
+          Total score: {{ "%.6f" % (data.results | sum(attribute="score") ) }}
+        </b>
+        </h7>
+        <h7>
+        Number of files: {{ data.results | length }}
+        </h7>
+      </div>
     </section>
-  </div>
\ No newline at end of file
+  </div>
diff --git a/benchmark/scripts/app/templates/partials/table_report_bulma.html b/benchmark/scripts/app/templates/partials/table_report_bulma.html
index 86859e7..07e87db 100644
--- a/benchmark/scripts/app/templates/partials/table_report_bulma.html
+++ b/benchmark/scripts/app/templates/partials/table_report_bulma.html
@@ -1,75 +1,80 @@
 <div id="app">
-    <header>
-      <div class="container is-fluid">
-        <div class="hero is-info is-bold">
-          <div class="hero-body">
-            <button class="delete is-large" onclick="location.href = '{{ back }}'"></button>
-            <h1 class="is-size-3">{{ data.title }}</h1>
-          </div>
+  <header>
+    <div class="container is-fluid">
+      <div class="hero is-info is-bold">
+        <div class="hero-body">
+          <button class="delete is-large" onclick="location.href = '{{ back }}'"></button>
+          <h1 class="is-size-3">{{ data.title }}</h1>
         </div>
       </div>
-    </header>
-    <section class="section">
-      <div class="container is-fluid">
-        <div>
-          <table class="table is-fullwidth is-striped is-bordered">
-            <thead>
-              <tr class="is-selected">
-                <th class="has-text-centered">Platform</th>
-                <th class="has-text-centered">Model</th>
-                <th class="has-text-centered">Date</th>
-                <th class="has-text-centered">Time</th>
-                {% if data.duration > 7200 %}
+    </div>
+  </header>
+  <section class="section">
+    <div class="container is-fluid">
+      <div>
+        <table class="table is-fullwidth is-striped is-bordered">
+          <thead>
+            <tr class="is-selected">
+              <th class="has-text-centered">Platform</th>
+              <th class="has-text-centered">Model</th>
+              <th class="has-text-centered">Date</th>
+              <th class="has-text-centered">Time</th>
+              {% if data.duration > 7200 %}
                 {% set unit = "h" %}
                 {% set divider = 3600 %}
-                {% else %}
+              {% else %}
                 {% set unit = "min" %}
                 {% set divider = 60 %}
-                {% endif %}
-                <th class="has-text-centered">Duration ({{ unit }})</th>
-                <th class="has-text-centered">Stratified</th>
-                <th class="has-text-centered">Discretized</th>
-                <th class="has-text-centered"># Folds</th>
-              </tr>
-              <tr>
-                <th class="has-text-centered">{{ data.platform }}</th>
-                <th class="has-text-centered">{{ data.model }} {{ data.version }}</th>
-                <th class="has-text-centered">{{ data.date}}</th>
-                <th class="has-text-centered">{{ data.time}}</th>
-                <th class="has-text-centered">{{ "%.2f" % (data.duration/divider) }}</th>
-                <th class="has-text-centered">{{ data.stratified }}</th>
-                <th class="has-text-centered">{{ data.discretized }}</th>
-                <th class="has-text-centered">{{ data.folds }}</th>
-              </tr>
-              <tr>
-                <th class="has-text-center is-selected">Language</th>
-                <th class="has-text-centered" colspan=3>{{ data.language }} {{ data.language_version }}</th>
-                <th class="has-text-centered is-selected">Seeds</th>
-                <th class="has-text-centered" colspan=6>{{ data.seeds }}</th>
-              </tr>
-            </thead>
-          </table>
-          <div>
-            <button class="{{ button }}" onclick="excelFile()"><i class="mdi mdi-file-excel"></i> Excel</button>
-          </div>
-          <table id="report-table" class="table is-fullwidth is-striped is-hoverable is-bordered">
-            <thead>
-              <tr class="is-selected">
-                <th class="has-text-centered">Dataset</th>
-                <th class="has-text-centered">Samples</th>
-                <th class="has-text-centered">Features</th>
-                <th class="has-text-centered">Classes</th>
-                <th class="has-text-centered">Nodes</th>
-                <th class="has-text-centered">{{data.score_name|capitalize}}</th>
-                <th class="has-text-centered">Time</th>
-                <th class="has-text-centered">hyperparameters</th>
-              </tr>
-            </thead>
-            <tbody>
-              {% include "partials/table_report.html" %}
-            </tbody>
-          </table>
-          {% if summary|length > 0 %}
+              {% endif %}
+              <th class="has-text-centered">Duration ({{ unit }})</th>
+              <th class="has-text-centered">Stratified</th>
+              <th class="has-text-centered">Discretized</th>
+              <th class="has-text-centered"># Folds</th>
+            </tr>
+            <tr>
+              <th class="has-text-centered">{{ data.platform }}</th>
+              <th class="has-text-centered">{{ data.model }} {{ data.version }}</th>
+              <th class="has-text-centered">{{ data.date }}</th>
+              <th class="has-text-centered">{{ data.time }}</th>
+              <th class="has-text-centered">{{ "%.2f" % (data.duration/divider) }}</th>
+              <th class="has-text-centered">{{ data.stratified }}</th>
+              <th class="has-text-centered">{{ data.discretized }}</th>
+              <th class="has-text-centered">{{ data.folds }}</th>
+            </tr>
+            <tr>
+              <th class="has-text-center is-selected">Language</th>
+              <th class="has-text-centered" colspan=3>{{ data.language }} {{ data.language_version }}</th>
+              <th class="has-text-centered is-selected">Seeds</th>
+              <th class="has-text-centered" colspan=6>{{ data.seeds }}</th>
+            </tr>
+          </thead>
+        </table>
+        <div>
+          <button class="{{ button }}" onclick="excelFile()">
+            <i class="mdi mdi-file-excel"></i> Excel
+          </button>
+        </div>
+        <table id="report-table"
+               class="table is-fullwidth is-striped is-hoverable is-bordered">
+          <thead>
+            <tr class="is-selected">
+              <th class="has-text-centered">Dataset</th>
+              <th class="has-text-centered">Samples</th>
+              <th class="has-text-centered">Features</th>
+              <th class="has-text-centered">Classes</th>
+              <th class="has-text-centered">{{ app_config.nodes }}</th>
+              <th class="has-text-centered">{{ app_config.leaves }}</th>
+              <th class="has-text-centered">{{ app_config.depth }}</th>
+              <th class="has-text-centered">{{ data.score_name|capitalize }}</th>
+              <th class="has-text-centered">Time</th>
+              <th class="has-text-centered">hyperparameters</th>
+            </tr>
+          </thead>
+          <tbody>
+            {% include "partials/table_report.html" %}
+          </tbody>
+        </table>
+        {% if summary|length > 0 %}
           <div class="col-2 col-lg-2">
             <table class="table is-bordered">
               <thead>
@@ -82,12 +87,14 @@
               {% include "partials/table_summary.html" %}
             </table>
           </div>
-          {% endif %}
-          <h2 class="has-text-white has-background-primary"><b>
-              <button class="delete" onclick="location.href = '/index/{{ compare }}'"></button>
-              Total score: {{ "%.6f" % (data.results | sum(attribute="score")) }}
-            </b></h2>
-            <h2>Number of files: {{ data.results | length }}</h2>
-        </div>
+        {% endif %}
+        <h2 class="has-text-white has-background-primary">
+          <b>
+            <button class="delete" onclick="location.href = '/index/{{ compare }}'"></button>
+            Total score: {{ "%.6f" % (data.results | sum(attribute="score") ) }}
+          </b>
+        </h2>
+        <h2>Number of files: {{ data.results | length }}</h2>
+      </div>
     </section>
-  </div>
\ No newline at end of file
+  </div>