✨ More things in templates.

crillab · Jun 30, 2022 · f7ae3e2 · f7ae3e2
1 parent 3ee1dfc
commit f7ae3e2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/metrics/templates/load_experiments.ipynb b/metrics/templates/load_experiments.ipynb
@@ -346,14 +346,17 @@
     "        return False\n",
     "\n",
     "    # Checking that at most one optimal value exists.\n",
-    "    # TODO use min() instead of max() for minimization problems.\n",
-    "    best_global_values = df_input['best_bound'].max()\n",
     "    best_values_for_complete_search = df_input[df_input['success']]['best_bound'].unique()\n",
     "\n",
-    "    # TODO Replace >= by <= for minimization problems.\n",
-    "    return best_global_values is None or \\\n",
+    "    # Checking that there is no better value than the optimal one.\n",
+    "    if df_input['objective'].unique()[0] == 'min':\n",
+    "        best_global_value = df_input['best_bound'].min()\n",
+    "    else:\n",
+    "        best_global_value = df_input['best_bound'].max()\n",
+    "\n",
+    "    return best_global_value is None or \\\n",
     "           len(best_values_for_complete_search) <= 1 and \\\n",
-    "           best_values_for_complete_search[0] >= best_global_values"
+    "           best_values_for_complete_search[0] != best_global_value"
    ]
   },
   {

diff --git a/metrics/templates/runtime_analysis.ipynb b/metrics/templates/runtime_analysis.ipynb
@@ -318,7 +318,7 @@
     "\n",
     "    title='CDF',\n",
     "    x_axis_name='Time (s)',\n",
-    "    y_axis_name='Number of solved inputs',\n",
+    "    y_axis_name='Percentage of solved inputs',\n",
     "\n",
     "    color_map={ 'VBS': '#000000' },\n",
     "    style_map={ 'VBS': LineType.DASH_DOT },\n",