From 974227166ca529742a762dfa6f6e31c0dbe0d169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Monta=C3=B1ana?= Date: Thu, 17 Nov 2022 01:36:19 +0100 Subject: [PATCH] Add excel to be_list --- benchmark/Results.py | 82 ++++++++++++++++--- benchmark/Utils.py | 1 + benchmark/scripts/be_list.py | 8 +- benchmark/tests/scripts/Be_List_test.py | 3 + benchmark/tests/test_files/be_list_nan.test | 22 ++--- .../tests/test_files/be_list_no_nan.test | 14 ++-- .../test_files/be_summary_list_model.test | 14 ++-- .../test_files/be_summary_list_score.test | 14 ++-- .../test_files/be_summary_list_score_all.test | 14 ++-- .../be_summary_list_score_model.test | 14 ++-- .../tests/test_files/summary_list_hidden.test | 8 +- .../tests/test_files/summary_list_model.test | 10 +-- .../tests/test_files/summary_list_n.test | 10 +-- .../tests/test_files/summary_list_score.test | 14 ++-- .../tests/test_files/summary_show_top.test | 14 ++-- 15 files changed, 154 insertions(+), 88 deletions(-) diff --git a/benchmark/Results.py b/benchmark/Results.py index ccf833c..655e709 100644 --- a/benchmark/Results.py +++ b/benchmark/Results.py @@ -7,6 +7,7 @@ import abc import shutil import subprocess import xlsxwriter +from xlsxwriter.exceptions import DuplicateWorksheetName import numpy as np from .Experiments import BestResults from .Datasets import Datasets @@ -21,6 +22,10 @@ from .Utils import ( from ._version import __version__ +def get_input(): + return input() + + class BestResultsEver: def __init__(self): self.data = {} @@ -328,7 +333,17 @@ class Excel(BaseReport): else: self.book = book self.close = False - self.sheet = self.book.add_worksheet(self.data["model"]) + suffix = "" + num = 1 + while True: + try: + self.sheet = self.book.add_worksheet( + self.data["model"] + suffix + ) + break + except DuplicateWorksheetName: + num += 1 + suffix = str(num) self.max_hyper_width = 0 self.col_hyperparams = 0 @@ -1341,6 +1356,7 @@ class Summary: def __init__(self, hidden=False) -> None: self.results = Files().get_all_results(hidden=hidden) self.data = [] + self.data_filtered = [] self.datasets = {} self.models = set() self.hidden = hidden @@ -1417,13 +1433,14 @@ class Summary: number=0, ) -> None: """Print the list of results""" - data = self.get_results_criteria( - score, model, input_data, sort_key, number - ) - if data == []: + if self.data_filtered == []: + self.data_filtered = self.get_results_criteria( + score, model, input_data, sort_key, number + ) + if self.data_filtered == []: raise ValueError(NO_RESULTS) - max_file = max(len(x["file"]) for x in data) - max_title = max(len(x["title"]) for x in data) + max_file = max(len(x["file"]) for x in self.data_filtered) + max_title = max(len(x["title"]) for x in self.data_filtered) if self.hidden: color1 = TextColor.GREEN color2 = TextColor.YELLOW @@ -1432,10 +1449,11 @@ class Summary: color2 = TextColor.LINE2 print(color1, end="") print( - f"{'Date':10s} {'File':{max_file}s} {'Score':8s} {'Time(h)':7s} " - f"{'Title':s}" + f" # {'Date':10s} {'File':{max_file}s} {'Score':8s} " + f" {'Time(h)':7s} {'Title':s}" ) print( + "===", "=" * 10 + " " + "=" * max_file @@ -1444,21 +1462,59 @@ class Summary: + " " + "=" * 7 + " " - + "=" * max_title + + "=" * max_title, ) print( "\n".join( [ - (color2 if n % 2 == 0 else color1) - + f"{x['date']} {x['file']:{max_file}s} " + (color2 if n % 2 == 0 else color1) + f"{n:3d} " + f"{x['date']} {x['file']:{max_file}s} " f"{x['metric']:8.5f} " f"{x['duration']/3600:7.3f} " f"{x['title']}" - for n, x in enumerate(data) + for n, x in enumerate(self.data_filtered) ] ) ) + def manage_results(self, excel, isTest): + num = "" + first = True + book = None + while True and not isTest: + if not first: + print(f"Invalid option {num}. Try again!") + first = False + print( + "Which result do you want to report? (q to quit, r to list " + "again, number to report): ", + end="", + ) + num = self.get_input() + if num == "n": + return + if num == "r": + self.list_results() + if num == "q": + if excel: + if book is not None: + book.close() + return + if num.isdigit() and int(num) < len(self.data) and int(num) >= 0: + rep = Report(self.data[int(num)]["file"], self.hidden) + rep.report() + if excel and not self.hidden: + if book is None: + file_name = Files.be_list_excel + book = xlsxwriter.Workbook( + file_name, {"nan_inf_to_errors": True} + ) + excel = Excel( + file_name=self.data[int(num)]["file"], + book=book, + ) + excel.report() + def show_result(self, data: dict, title: str = "") -> None: def whites(n: int) -> str: return " " * n + color1 + "*" diff --git a/benchmark/Utils.py b/benchmark/Utils.py index 9663086..fbf7102 100644 --- a/benchmark/Utils.py +++ b/benchmark/Utils.py @@ -28,6 +28,7 @@ class Files: benchmark_r = "benchmark.r" dot_env = ".env" datasets_report_excel = "ReportDatasets.xlsx" + be_list_excel = "some_results.xlsx" @staticmethod def exreport_output(score): diff --git a/benchmark/scripts/be_list.py b/benchmark/scripts/be_list.py index cb31cb0..740b3df 100755 --- a/benchmark/scripts/be_list.py +++ b/benchmark/scripts/be_list.py @@ -1,7 +1,7 @@ #! /usr/bin/env python import os from benchmark.Results import Summary -from benchmark.Utils import Folders +from benchmark.Utils import Folders, Files from benchmark.Arguments import Arguments """List experiments of a model @@ -12,6 +12,7 @@ def main(args_test=None): arguments = Arguments() arguments.xset("number").xset("model", required=False).xset("key") arguments.xset("hidden").xset("nan").xset("score", required=False) + arguments.xset("excel") args = arguments.parse(args_test) data = Summary(hidden=args.hidden) data.acquire() @@ -22,6 +23,10 @@ def main(args_test=None): sort_key=args.key, number=args.number, ) + is_test = args_test is not None + data.manage_results(args.excel, is_test) + if args.excel: + Files.open(Files.be_list_excel, is_test) except ValueError as e: print(e) else: @@ -44,6 +49,7 @@ def main(args_test=None): + " Results with nan moved to hidden " + "*" * 30 ) + data.data_filtered = [] data.list_results(input_data=results_nan) for result in results_nan: name = result["file"] diff --git a/benchmark/tests/scripts/Be_List_test.py b/benchmark/tests/scripts/Be_List_test.py index 25bed40..e23cda9 100644 --- a/benchmark/tests/scripts/Be_List_test.py +++ b/benchmark/tests/scripts/Be_List_test.py @@ -1,5 +1,7 @@ import os +from unittest.mock import patch from ...Utils import Folders, NO_RESULTS +from ...Results import Summary from ..TestBase import TestBase @@ -7,6 +9,7 @@ class BeListTest(TestBase): def setUp(self): self.prepare_scripts_env() + # @patch("...Results.get_input()", return_value="n") def test_be_list(self): stdout, stderr = self.execute_script("be_list", ["-m", "STree"]) self.assertEqual(stderr.getvalue(), "") diff --git a/benchmark/tests/test_files/be_list_nan.test b/benchmark/tests/test_files/be_list_nan.test index ed62daf..58ed8bc 100644 --- a/benchmark/tests/test_files/be_list_nan.test +++ b/benchmark/tests/test_files/be_list_nan.test @@ -1,13 +1,13 @@ -Date File Score Time(h) Title -========== ================================================================ ======== ======= ============================================ -2022-05-04 results_accuracy_XGBoost_MacBookpro16_2022-05-04_11:00:35_0.json nan 3.091 Default hyperparameters -2022-04-20 results_accuracy_ODTE_Galgo_2022-04-20_10:52:20_0.json 0.04341 6.275 Gridsearched hyperparams v022.1b random_init -2022-01-14 results_accuracy_RandomForest_iMac27_2022-01-14_12:39:30_0.json 0.03627 0.076 Test default paramters with RandomForest -2021-11-01 results_accuracy_STree_macbook-pro_2021-11-01_19:17:07_0.json 0.03790 1.143 default B -2021-10-27 results_accuracy_STree_iMac27_2021-10-27_09:40:40_0.json 0.04158 0.943 default A -2021-09-30 results_accuracy_STree_iMac27_2021-09-30_11:42:07_0.json 0.04544 0.173 With gridsearched hyperparameters + # Date File Score Time(h) Title +=== ========== ================================================================ ======== ======= ============================================ + 0 2022-05-04 results_accuracy_XGBoost_MacBookpro16_2022-05-04_11:00:35_0.json nan 3.091 Default hyperparameters + 1 2022-04-20 results_accuracy_ODTE_Galgo_2022-04-20_10:52:20_0.json 0.04341 6.275 Gridsearched hyperparams v022.1b random_init + 2 2022-01-14 results_accuracy_RandomForest_iMac27_2022-01-14_12:39:30_0.json 0.03627 0.076 Test default paramters with RandomForest + 3 2021-11-01 results_accuracy_STree_macbook-pro_2021-11-01_19:17:07_0.json 0.03790 1.143 default B + 4 2021-10-27 results_accuracy_STree_iMac27_2021-10-27_09:40:40_0.json 0.04158 0.943 default A + 5 2021-09-30 results_accuracy_STree_iMac27_2021-09-30_11:42:07_0.json 0.04544 0.173 With gridsearched hyperparameters ****************************** Results with nan moved to hidden ****************************** -Date File Score Time(h) Title -========== ================================================================ ======== ======= ======================= -2022-05-04 results_accuracy_XGBoost_MacBookpro16_2022-05-04_11:00:35_0.json nan 3.091 Default hyperparameters + # Date File Score Time(h) Title +=== ========== ================================================================ ======== ======= ======================= + 0 2022-05-04 results_accuracy_XGBoost_MacBookpro16_2022-05-04_11:00:35_0.json nan 3.091 Default hyperparameters diff --git a/benchmark/tests/test_files/be_list_no_nan.test b/benchmark/tests/test_files/be_list_no_nan.test index e1e5dd7..720b46c 100644 --- a/benchmark/tests/test_files/be_list_no_nan.test +++ b/benchmark/tests/test_files/be_list_no_nan.test @@ -1,7 +1,7 @@ -Date File Score Time(h) Title -========== =============================================================== ======== ======= ============================================ -2022-04-20 results_accuracy_ODTE_Galgo_2022-04-20_10:52:20_0.json 0.04341 6.275 Gridsearched hyperparams v022.1b random_init -2022-01-14 results_accuracy_RandomForest_iMac27_2022-01-14_12:39:30_0.json 0.03627 0.076 Test default paramters with RandomForest -2021-11-01 results_accuracy_STree_macbook-pro_2021-11-01_19:17:07_0.json 0.03790 1.143 default B -2021-10-27 results_accuracy_STree_iMac27_2021-10-27_09:40:40_0.json 0.04158 0.943 default A -2021-09-30 results_accuracy_STree_iMac27_2021-09-30_11:42:07_0.json 0.04544 0.173 With gridsearched hyperparameters + # Date File Score Time(h) Title +=== ========== =============================================================== ======== ======= ============================================ + 0 2022-04-20 results_accuracy_ODTE_Galgo_2022-04-20_10:52:20_0.json 0.04341 6.275 Gridsearched hyperparams v022.1b random_init + 1 2022-01-14 results_accuracy_RandomForest_iMac27_2022-01-14_12:39:30_0.json 0.03627 0.076 Test default paramters with RandomForest + 2 2021-11-01 results_accuracy_STree_macbook-pro_2021-11-01_19:17:07_0.json 0.03790 1.143 default B + 3 2021-10-27 results_accuracy_STree_iMac27_2021-10-27_09:40:40_0.json 0.04158 0.943 default A + 4 2021-09-30 results_accuracy_STree_iMac27_2021-09-30_11:42:07_0.json 0.04544 0.173 With gridsearched hyperparameters diff --git a/benchmark/tests/test_files/be_summary_list_model.test b/benchmark/tests/test_files/be_summary_list_model.test index 5cb731f..05ed964 100644 --- a/benchmark/tests/test_files/be_summary_list_model.test +++ b/benchmark/tests/test_files/be_summary_list_model.test @@ -26,10 +26,10 @@ * results_accuracy_STree_iMac27_2021-09-30_11:42:07_0.json * * * ********************************************************************************* -Date File Score Time(h) Title -========== =============================================================== ======== ======= ============================================ -2021-09-30 results_accuracy_STree_iMac27_2021-09-30_11:42:07_0.json 0.04544 0.173 With gridsearched hyperparameters -2022-04-20 results_accuracy_ODTE_Galgo_2022-04-20_10:52:20_0.json 0.04341 6.275 Gridsearched hyperparams v022.1b random_init -2021-10-27 results_accuracy_STree_iMac27_2021-10-27_09:40:40_0.json 0.04158 0.943 default A -2021-11-01 results_accuracy_STree_macbook-pro_2021-11-01_19:17:07_0.json 0.03790 1.143 default B -2022-01-14 results_accuracy_RandomForest_iMac27_2022-01-14_12:39:30_0.json 0.03627 0.076 Test default paramters with RandomForest + # Date File Score Time(h) Title +=== ========== =============================================================== ======== ======= ============================================ + 0 2021-09-30 results_accuracy_STree_iMac27_2021-09-30_11:42:07_0.json 0.04544 0.173 With gridsearched hyperparameters + 1 2022-04-20 results_accuracy_ODTE_Galgo_2022-04-20_10:52:20_0.json 0.04341 6.275 Gridsearched hyperparams v022.1b random_init + 2 2021-10-27 results_accuracy_STree_iMac27_2021-10-27_09:40:40_0.json 0.04158 0.943 default A + 3 2021-11-01 results_accuracy_STree_macbook-pro_2021-11-01_19:17:07_0.json 0.03790 1.143 default B + 4 2022-01-14 results_accuracy_RandomForest_iMac27_2022-01-14_12:39:30_0.json 0.03627 0.076 Test default paramters with RandomForest diff --git a/benchmark/tests/test_files/be_summary_list_score.test b/benchmark/tests/test_files/be_summary_list_score.test index e11fda5..816cab0 100644 --- a/benchmark/tests/test_files/be_summary_list_score.test +++ b/benchmark/tests/test_files/be_summary_list_score.test @@ -26,10 +26,10 @@ * results_accuracy_STree_iMac27_2021-09-30_11:42:07_0.json * * * ********************************************************************************* -Date File Score Time(h) Title -========== =============================================================== ======== ======= ============================================ -2021-09-30 results_accuracy_STree_iMac27_2021-09-30_11:42:07_0.json 0.04544 0.173 With gridsearched hyperparameters -2022-04-20 results_accuracy_ODTE_Galgo_2022-04-20_10:52:20_0.json 0.04341 6.275 Gridsearched hyperparams v022.1b random_init -2021-10-27 results_accuracy_STree_iMac27_2021-10-27_09:40:40_0.json 0.04158 0.943 default A -2021-11-01 results_accuracy_STree_macbook-pro_2021-11-01_19:17:07_0.json 0.03790 1.143 default B -2022-01-14 results_accuracy_RandomForest_iMac27_2022-01-14_12:39:30_0.json 0.03627 0.076 Test default paramters with RandomForest + # Date File Score Time(h) Title +=== ========== =============================================================== ======== ======= ============================================ + 0 2021-09-30 results_accuracy_STree_iMac27_2021-09-30_11:42:07_0.json 0.04544 0.173 With gridsearched hyperparameters + 1 2022-04-20 results_accuracy_ODTE_Galgo_2022-04-20_10:52:20_0.json 0.04341 6.275 Gridsearched hyperparams v022.1b random_init + 2 2021-10-27 results_accuracy_STree_iMac27_2021-10-27_09:40:40_0.json 0.04158 0.943 default A + 3 2021-11-01 results_accuracy_STree_macbook-pro_2021-11-01_19:17:07_0.json 0.03790 1.143 default B + 4 2022-01-14 results_accuracy_RandomForest_iMac27_2022-01-14_12:39:30_0.json 0.03627 0.076 Test default paramters with RandomForest diff --git a/benchmark/tests/test_files/be_summary_list_score_all.test b/benchmark/tests/test_files/be_summary_list_score_all.test index c425399..57d8260 100644 --- a/benchmark/tests/test_files/be_summary_list_score_all.test +++ b/benchmark/tests/test_files/be_summary_list_score_all.test @@ -26,13 +26,13 @@ * results_accuracy_STree_iMac27_2021-09-30_11:42:07_0.json * * * ********************************************************************************* -Date File Score Time(h) Title -========== =============================================================== ======== ======= ============================================ -2021-09-30 results_accuracy_STree_iMac27_2021-09-30_11:42:07_0.json 0.04544 0.173 With gridsearched hyperparameters -2022-04-20 results_accuracy_ODTE_Galgo_2022-04-20_10:52:20_0.json 0.04341 6.275 Gridsearched hyperparams v022.1b random_init -2021-10-27 results_accuracy_STree_iMac27_2021-10-27_09:40:40_0.json 0.04158 0.943 default A -2021-11-01 results_accuracy_STree_macbook-pro_2021-11-01_19:17:07_0.json 0.03790 1.143 default B -2022-01-14 results_accuracy_RandomForest_iMac27_2022-01-14_12:39:30_0.json 0.03627 0.076 Test default paramters with RandomForest + # Date File Score Time(h) Title +=== ========== =============================================================== ======== ======= ============================================ + 0 2021-09-30 results_accuracy_STree_iMac27_2021-09-30_11:42:07_0.json 0.04544 0.173 With gridsearched hyperparameters + 1 2022-04-20 results_accuracy_ODTE_Galgo_2022-04-20_10:52:20_0.json 0.04341 6.275 Gridsearched hyperparams v022.1b random_init + 2 2021-10-27 results_accuracy_STree_iMac27_2021-10-27_09:40:40_0.json 0.04158 0.943 default A + 3 2021-11-01 results_accuracy_STree_macbook-pro_2021-11-01_19:17:07_0.json 0.03790 1.143 default B + 4 2022-01-14 results_accuracy_RandomForest_iMac27_2022-01-14_12:39:30_0.json 0.03627 0.076 Test default paramters with RandomForest ** No results found ** ** No results found ** ** No results found ** diff --git a/benchmark/tests/test_files/be_summary_list_score_model.test b/benchmark/tests/test_files/be_summary_list_score_model.test index e11fda5..816cab0 100644 --- a/benchmark/tests/test_files/be_summary_list_score_model.test +++ b/benchmark/tests/test_files/be_summary_list_score_model.test @@ -26,10 +26,10 @@ * results_accuracy_STree_iMac27_2021-09-30_11:42:07_0.json * * * ********************************************************************************* -Date File Score Time(h) Title -========== =============================================================== ======== ======= ============================================ -2021-09-30 results_accuracy_STree_iMac27_2021-09-30_11:42:07_0.json 0.04544 0.173 With gridsearched hyperparameters -2022-04-20 results_accuracy_ODTE_Galgo_2022-04-20_10:52:20_0.json 0.04341 6.275 Gridsearched hyperparams v022.1b random_init -2021-10-27 results_accuracy_STree_iMac27_2021-10-27_09:40:40_0.json 0.04158 0.943 default A -2021-11-01 results_accuracy_STree_macbook-pro_2021-11-01_19:17:07_0.json 0.03790 1.143 default B -2022-01-14 results_accuracy_RandomForest_iMac27_2022-01-14_12:39:30_0.json 0.03627 0.076 Test default paramters with RandomForest + # Date File Score Time(h) Title +=== ========== =============================================================== ======== ======= ============================================ + 0 2021-09-30 results_accuracy_STree_iMac27_2021-09-30_11:42:07_0.json 0.04544 0.173 With gridsearched hyperparameters + 1 2022-04-20 results_accuracy_ODTE_Galgo_2022-04-20_10:52:20_0.json 0.04341 6.275 Gridsearched hyperparams v022.1b random_init + 2 2021-10-27 results_accuracy_STree_iMac27_2021-10-27_09:40:40_0.json 0.04158 0.943 default A + 3 2021-11-01 results_accuracy_STree_macbook-pro_2021-11-01_19:17:07_0.json 0.03790 1.143 default B + 4 2022-01-14 results_accuracy_RandomForest_iMac27_2022-01-14_12:39:30_0.json 0.03627 0.076 Test default paramters with RandomForest diff --git a/benchmark/tests/test_files/summary_list_hidden.test b/benchmark/tests/test_files/summary_list_hidden.test index d34b5bd..b663821 100644 --- a/benchmark/tests/test_files/summary_list_hidden.test +++ b/benchmark/tests/test_files/summary_list_hidden.test @@ -1,4 +1,4 @@ -Date File Score Time(h) Title -========== ================================================================ ======== ======= ======================= -2022-05-04 results_accuracy_XGBoost_MacBookpro16_2022-05-04_11:00:35_0.json nan 3.091 Default hyperparameters -2021-11-01 results_accuracy_STree_iMac27_2021-11-01_23:55:16_0.json 0.97446 0.098 default + # Date File Score Time(h) Title +=== ========== ================================================================ ======== ======= ======================= + 0 2022-05-04 results_accuracy_XGBoost_MacBookpro16_2022-05-04_11:00:35_0.json nan 3.091 Default hyperparameters + 1 2021-11-01 results_accuracy_STree_iMac27_2021-11-01_23:55:16_0.json 0.97446 0.098 default diff --git a/benchmark/tests/test_files/summary_list_model.test b/benchmark/tests/test_files/summary_list_model.test index 3a5b441..636ebe7 100644 --- a/benchmark/tests/test_files/summary_list_model.test +++ b/benchmark/tests/test_files/summary_list_model.test @@ -1,5 +1,5 @@ -Date File Score Time(h) Title -========== ============================================================= ======== ======= ================================= -2021-11-01 results_accuracy_STree_macbook-pro_2021-11-01_19:17:07_0.json 0.03790 1.143 default B -2021-10-27 results_accuracy_STree_iMac27_2021-10-27_09:40:40_0.json 0.04158 0.943 default A -2021-09-30 results_accuracy_STree_iMac27_2021-09-30_11:42:07_0.json 0.04544 0.173 With gridsearched hyperparameters + # Date File Score Time(h) Title +=== ========== ============================================================= ======== ======= ================================= + 0 2021-11-01 results_accuracy_STree_macbook-pro_2021-11-01_19:17:07_0.json 0.03790 1.143 default B + 1 2021-10-27 results_accuracy_STree_iMac27_2021-10-27_09:40:40_0.json 0.04158 0.943 default A + 2 2021-09-30 results_accuracy_STree_iMac27_2021-09-30_11:42:07_0.json 0.04544 0.173 With gridsearched hyperparameters diff --git a/benchmark/tests/test_files/summary_list_n.test b/benchmark/tests/test_files/summary_list_n.test index ac56095..d4453ec 100644 --- a/benchmark/tests/test_files/summary_list_n.test +++ b/benchmark/tests/test_files/summary_list_n.test @@ -1,5 +1,5 @@ -Date File Score Time(h) Title -========== =============================================================== ======== ======= ============================================ -2022-04-20 results_accuracy_ODTE_Galgo_2022-04-20_10:52:20_0.json 0.04341 6.275 Gridsearched hyperparams v022.1b random_init -2022-01-14 results_accuracy_RandomForest_iMac27_2022-01-14_12:39:30_0.json 0.03627 0.076 Test default paramters with RandomForest -2021-11-01 results_accuracy_STree_macbook-pro_2021-11-01_19:17:07_0.json 0.03790 1.143 default B + # Date File Score Time(h) Title +=== ========== =============================================================== ======== ======= ============================================ + 0 2022-04-20 results_accuracy_ODTE_Galgo_2022-04-20_10:52:20_0.json 0.04341 6.275 Gridsearched hyperparams v022.1b random_init + 1 2022-01-14 results_accuracy_RandomForest_iMac27_2022-01-14_12:39:30_0.json 0.03627 0.076 Test default paramters with RandomForest + 2 2021-11-01 results_accuracy_STree_macbook-pro_2021-11-01_19:17:07_0.json 0.03790 1.143 default B diff --git a/benchmark/tests/test_files/summary_list_score.test b/benchmark/tests/test_files/summary_list_score.test index e1e5dd7..720b46c 100644 --- a/benchmark/tests/test_files/summary_list_score.test +++ b/benchmark/tests/test_files/summary_list_score.test @@ -1,7 +1,7 @@ -Date File Score Time(h) Title -========== =============================================================== ======== ======= ============================================ -2022-04-20 results_accuracy_ODTE_Galgo_2022-04-20_10:52:20_0.json 0.04341 6.275 Gridsearched hyperparams v022.1b random_init -2022-01-14 results_accuracy_RandomForest_iMac27_2022-01-14_12:39:30_0.json 0.03627 0.076 Test default paramters with RandomForest -2021-11-01 results_accuracy_STree_macbook-pro_2021-11-01_19:17:07_0.json 0.03790 1.143 default B -2021-10-27 results_accuracy_STree_iMac27_2021-10-27_09:40:40_0.json 0.04158 0.943 default A -2021-09-30 results_accuracy_STree_iMac27_2021-09-30_11:42:07_0.json 0.04544 0.173 With gridsearched hyperparameters + # Date File Score Time(h) Title +=== ========== =============================================================== ======== ======= ============================================ + 0 2022-04-20 results_accuracy_ODTE_Galgo_2022-04-20_10:52:20_0.json 0.04341 6.275 Gridsearched hyperparams v022.1b random_init + 1 2022-01-14 results_accuracy_RandomForest_iMac27_2022-01-14_12:39:30_0.json 0.03627 0.076 Test default paramters with RandomForest + 2 2021-11-01 results_accuracy_STree_macbook-pro_2021-11-01_19:17:07_0.json 0.03790 1.143 default B + 3 2021-10-27 results_accuracy_STree_iMac27_2021-10-27_09:40:40_0.json 0.04158 0.943 default A + 4 2021-09-30 results_accuracy_STree_iMac27_2021-09-30_11:42:07_0.json 0.04544 0.173 With gridsearched hyperparameters diff --git a/benchmark/tests/test_files/summary_show_top.test b/benchmark/tests/test_files/summary_show_top.test index dc6a8e0..5b42449 100644 --- a/benchmark/tests/test_files/summary_show_top.test +++ b/benchmark/tests/test_files/summary_show_top.test @@ -1,7 +1,7 @@ -Date File Score Time(h) Title -========== =============================================================== ======== ======= ============================================ -2021-09-30 results_accuracy_STree_iMac27_2021-09-30_11:42:07_0.json 0.04544 0.173 With gridsearched hyperparameters -2022-04-20 results_accuracy_ODTE_Galgo_2022-04-20_10:52:20_0.json 0.04341 6.275 Gridsearched hyperparams v022.1b random_init -2021-10-27 results_accuracy_STree_iMac27_2021-10-27_09:40:40_0.json 0.04158 0.943 default A -2021-11-01 results_accuracy_STree_macbook-pro_2021-11-01_19:17:07_0.json 0.03790 1.143 default B -2022-01-14 results_accuracy_RandomForest_iMac27_2022-01-14_12:39:30_0.json 0.03627 0.076 Test default paramters with RandomForest + # Date File Score Time(h) Title +=== ========== =============================================================== ======== ======= ============================================ + 0 2021-09-30 results_accuracy_STree_iMac27_2021-09-30_11:42:07_0.json 0.04544 0.173 With gridsearched hyperparameters + 1 2022-04-20 results_accuracy_ODTE_Galgo_2022-04-20_10:52:20_0.json 0.04341 6.275 Gridsearched hyperparams v022.1b random_init + 2 2021-10-27 results_accuracy_STree_iMac27_2021-10-27_09:40:40_0.json 0.04158 0.943 default A + 3 2021-11-01 results_accuracy_STree_macbook-pro_2021-11-01_19:17:07_0.json 0.03790 1.143 default B + 4 2022-01-14 results_accuracy_RandomForest_iMac27_2022-01-14_12:39:30_0.json 0.03627 0.076 Test default paramters with RandomForest