diff --git a/benchmark/Results.py b/benchmark/Results.py index b876b63..1124dec 100644 --- a/benchmark/Results.py +++ b/benchmark/Results.py @@ -1450,7 +1450,7 @@ class Summary: print(color1, end="") print( f" # {'Date':10s} {'File':{max_file}s} {'Score':8s} " - f" {'Time(h)':7s} {'Title':s}" + f"{'Time(h)':7s} {'Title':s}" ) print( "===", diff --git a/benchmark/tests/test_files/be_list_model.test b/benchmark/tests/test_files/be_list_model.test index 718c1b4..bcdaec8 100644 --- a/benchmark/tests/test_files/be_list_model.test +++ b/benchmark/tests/test_files/be_list_model.test @@ -1,4 +1,4 @@ - # Date File Score Time(h) Title + # 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 diff --git a/benchmark/tests/test_files/be_list_model_2.test b/benchmark/tests/test_files/be_list_model_2.test index ba84afa..74fb2cf 100644 --- a/benchmark/tests/test_files/be_list_model_2.test +++ b/benchmark/tests/test_files/be_list_model_2.test @@ -1,9 +1,9 @@ - # Date File Score Time(h) Title + # 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 -Which result do you want to report? (q to quit, r to list again, number to report):  # Date File Score Time(h) Title +Which result do you want to report? (q to quit, r to list again, number to report):  # 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 diff --git a/benchmark/tests/test_files/be_list_model_invalid.test b/benchmark/tests/test_files/be_list_model_invalid.test index df728c9..66d66b9 100644 --- a/benchmark/tests/test_files/be_list_model_invalid.test +++ b/benchmark/tests/test_files/be_list_model_invalid.test @@ -1,4 +1,4 @@ - # Date File Score Time(h) Title + # 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 diff --git a/benchmark/tests/test_files/be_list_nan.test b/benchmark/tests/test_files/be_list_nan.test index 58ed8bc..f6a799d 100644 --- a/benchmark/tests/test_files/be_list_nan.test +++ b/benchmark/tests/test_files/be_list_nan.test @@ -1,4 +1,4 @@ - # Date File Score Time(h) Title + # 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 @@ -8,6 +8,6 @@  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 + # 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 720b46c..ed99d08 100644 --- a/benchmark/tests/test_files/be_list_no_nan.test +++ b/benchmark/tests/test_files/be_list_no_nan.test @@ -1,4 +1,4 @@ - # Date File Score Time(h) Title + # 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 diff --git a/benchmark/tests/test_files/be_list_report.test b/benchmark/tests/test_files/be_list_report.test index 3b7fdff..f955490 100644 --- a/benchmark/tests/test_files/be_list_report.test +++ b/benchmark/tests/test_files/be_list_report.test @@ -1,4 +1,4 @@ - # Date File Score Time(h) Title + # 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 diff --git a/benchmark/tests/test_files/be_list_report_excel.test b/benchmark/tests/test_files/be_list_report_excel.test index e494061..1b64fe8 100644 --- a/benchmark/tests/test_files/be_list_report_excel.test +++ b/benchmark/tests/test_files/be_list_report_excel.test @@ -1,4 +1,4 @@ - # Date File Score Time(h) Title + # 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 diff --git a/benchmark/tests/test_files/be_list_report_excel_2.test b/benchmark/tests/test_files/be_list_report_excel_2.test index 15822a8..457df27 100644 --- a/benchmark/tests/test_files/be_list_report_excel_2.test +++ b/benchmark/tests/test_files/be_list_report_excel_2.test @@ -1,4 +1,4 @@ - # Date File Score Time(h) Title + # 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 diff --git a/benchmark/tests/test_files/be_summary_list_model.test b/benchmark/tests/test_files/be_summary_list_model.test index 05ed964..35d9894 100644 --- a/benchmark/tests/test_files/be_summary_list_model.test +++ b/benchmark/tests/test_files/be_summary_list_model.test @@ -26,7 +26,7 @@ * results_accuracy_STree_iMac27_2021-09-30_11:42:07_0.json * * * ********************************************************************************* - # Date File Score Time(h) Title + # 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 diff --git a/benchmark/tests/test_files/be_summary_list_score.test b/benchmark/tests/test_files/be_summary_list_score.test index 816cab0..8b655ad 100644 --- a/benchmark/tests/test_files/be_summary_list_score.test +++ b/benchmark/tests/test_files/be_summary_list_score.test @@ -26,7 +26,7 @@ * results_accuracy_STree_iMac27_2021-09-30_11:42:07_0.json * * * ********************************************************************************* - # Date File Score Time(h) Title + # 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 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 57d8260..23fd89c 100644 --- a/benchmark/tests/test_files/be_summary_list_score_all.test +++ b/benchmark/tests/test_files/be_summary_list_score_all.test @@ -26,7 +26,7 @@ * results_accuracy_STree_iMac27_2021-09-30_11:42:07_0.json * * * ********************************************************************************* - # Date File Score Time(h) Title + # 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 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 816cab0..8b655ad 100644 --- a/benchmark/tests/test_files/be_summary_list_score_model.test +++ b/benchmark/tests/test_files/be_summary_list_score_model.test @@ -26,7 +26,7 @@ * results_accuracy_STree_iMac27_2021-09-30_11:42:07_0.json * * * ********************************************************************************* - # Date File Score Time(h) Title + # 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 diff --git a/benchmark/tests/test_files/summary_list_hidden.test b/benchmark/tests/test_files/summary_list_hidden.test index b663821..f98eb9f 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 + # 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 636ebe7..2de8e68 100644 --- a/benchmark/tests/test_files/summary_list_model.test +++ b/benchmark/tests/test_files/summary_list_model.test @@ -1,4 +1,4 @@ - # Date File Score Time(h) Title + # 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 diff --git a/benchmark/tests/test_files/summary_list_n.test b/benchmark/tests/test_files/summary_list_n.test index d4453ec..754d36e 100644 --- a/benchmark/tests/test_files/summary_list_n.test +++ b/benchmark/tests/test_files/summary_list_n.test @@ -1,4 +1,4 @@ - # Date File Score Time(h) Title + # 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 diff --git a/benchmark/tests/test_files/summary_list_score.test b/benchmark/tests/test_files/summary_list_score.test index 720b46c..ed99d08 100644 --- a/benchmark/tests/test_files/summary_list_score.test +++ b/benchmark/tests/test_files/summary_list_score.test @@ -1,4 +1,4 @@ - # Date File Score Time(h) Title + # 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 diff --git a/benchmark/tests/test_files/summary_show_top.test b/benchmark/tests/test_files/summary_show_top.test index 5b42449..5fc9f82 100644 --- a/benchmark/tests/test_files/summary_show_top.test +++ b/benchmark/tests/test_files/summary_show_top.test @@ -1,4 +1,4 @@ - # Date File Score Time(h) Title + # 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