diff --git a/benchmark/tests/scripts/Be_List_test.py b/benchmark/tests/scripts/Be_List_test.py index c587622..cffff4c 100644 --- a/benchmark/tests/scripts/Be_List_test.py +++ b/benchmark/tests/scripts/Be_List_test.py @@ -27,30 +27,26 @@ class BeListTest(TestBase): self.assertEqual(stderr.getvalue(), "") self.check_output_file(stdout, "be_list_report") - @patch("benchmark.Results.get_input", side_effect=iter(["q"])) - def test_be_list_report_excel_none(self, input_data): - stdout, stderr = self.execute_script("be_list", ["-m", "STree", "-x"]) - self.assertEqual(stderr.getvalue(), "") - self.check_output_file(stdout, "be_list_model") - @patch("benchmark.Results.get_input", side_effect=iter(["r", "q"])) def test_be_list_twice(self, input_data): stdout, stderr = self.execute_script("be_list", ["-m", "STree"]) self.assertEqual(stderr.getvalue(), "") self.check_output_file(stdout, "be_list_model_2") - @patch("benchmark.Results.get_input", side_effect=iter(["2", "q"])) + @patch("benchmark.Results.get_input", side_effect=iter(["e 2", "q"])) def test_be_list_report_excel(self, input_data): - stdout, stderr = self.execute_script("be_list", ["-m", "STree", "-x"]) + stdout, stderr = self.execute_script("be_list", ["-m", "STree"]) self.assertEqual(stderr.getvalue(), "") self.check_output_file(stdout, "be_list_report_excel") book = load_workbook(Files.be_list_excel) sheet = book["STree"] self.check_excel_sheet(sheet, "excel") - @patch("benchmark.Results.get_input", side_effect=iter(["2", "1", "q"])) + @patch( + "benchmark.Results.get_input", side_effect=iter(["e 2", "e 1", "q"]) + ) def test_be_list_report_excel_twice(self, input_data): - stdout, stderr = self.execute_script("be_list", ["-m", "STree", "-x"]) + stdout, stderr = self.execute_script("be_list", ["-m", "STree"]) self.assertEqual(stderr.getvalue(), "") self.check_output_file(stdout, "be_list_report_excel_2") book = load_workbook(Files.be_list_excel) @@ -67,7 +63,8 @@ class BeListTest(TestBase): self.assertEqual(stderr.getvalue(), "") self.assertEqual(stdout.getvalue(), f"{NO_RESULTS}\n") - def test_be_list_nan(self): + @patch("benchmark.Results.get_input", side_effect=iter(["h 0", "y", "q"])) + def test_be_list_hide(self, input_data): def swap_files(source_folder, target_folder, file_name): source = os.path.join(source_folder, file_name) target = os.path.join(target_folder, file_name) @@ -80,14 +77,15 @@ class BeListTest(TestBase): # move nan result from hidden to results swap_files(Folders.hidden_results, Folders.results, file_name) try: - # list and move nan result to hidden - stdout, stderr = self.execute_script("be_list", ["--nan"]) + # list and move nan result to hidden again + stdout, stderr = self.execute_script("be_list", []) self.assertEqual(stderr.getvalue(), "") - self.check_output_file(stdout, "be_list_nan") + print(stdout.getvalue()) + # self.check_output_file(stdout, "be_list_nan") except Exception: # move back nan result file if be_list couldn't swap_files(Folders.results, Folders.hidden_results, file_name) - self.fail("test_be_list_nan() should not raise exception") + self.fail("test_be_list_hide() should not raise exception") @patch("benchmark.Results.get_input", return_value="q") def test_be_list_nan_no_nan(self, input_data): diff --git a/benchmark/tests/test_files/be_list_model.test b/benchmark/tests/test_files/be_list_model.test index bcdaec8..2de8e68 100644 --- a/benchmark/tests/test_files/be_list_model.test +++ b/benchmark/tests/test_files/be_list_model.test @@ -3,4 +3,3 @@  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): \ No newline at end of file diff --git a/benchmark/tests/test_files/be_list_model_2.test b/benchmark/tests/test_files/be_list_model_2.test index 74fb2cf..4223831 100644 --- a/benchmark/tests/test_files/be_list_model_2.test +++ b/benchmark/tests/test_files/be_list_model_2.test @@ -3,9 +3,8 @@  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 + # 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): \ No newline at end of file diff --git a/benchmark/tests/test_files/be_list_model_invalid.test b/benchmark/tests/test_files/be_list_model_invalid.test index 66d66b9..3add62f 100644 --- a/benchmark/tests/test_files/be_list_model_invalid.test +++ b/benchmark/tests/test_files/be_list_model_invalid.test @@ -3,5 +3,4 @@  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): Invalid option x. Try again! -Which result do you want to report? (q to quit, r to list again, number to report): \ No newline at end of file +Invalid option. Try again! diff --git a/benchmark/tests/test_files/be_list_report.test b/benchmark/tests/test_files/be_list_report.test index f955490..ba72218 100644 --- a/benchmark/tests/test_files/be_list_report.test +++ b/benchmark/tests/test_files/be_list_report.test @@ -3,7 +3,7 @@  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): ************************************************************************************************************************* +************************************************************************************************************************* * STree ver. 1.2.3 Python ver. 3.11x with 5 Folds cross validation and 10 random seeds. 2021-11-01 19:17:07 * * default B * * Random seeds: [57, 31, 1714, 17, 23, 79, 83, 97, 7, 1] Stratified: False * @@ -18,4 +18,3 @@ Dataset Sampl. Feat. Cls Nodes Leaves Depth Score ************************************************************************************************************************* * accuracy compared to STree_default (liblinear-ovr) .: 0.0379 * ************************************************************************************************************************* -Which result do you want to report? (q to quit, r to list again, number to report): \ No newline at end of file diff --git a/benchmark/tests/test_files/be_list_report_excel.test b/benchmark/tests/test_files/be_list_report_excel.test index 1b64fe8..269c52a 100644 --- a/benchmark/tests/test_files/be_list_report_excel.test +++ b/benchmark/tests/test_files/be_list_report_excel.test @@ -3,19 +3,5 @@  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): ************************************************************************************************************************* -* STree ver. 1.2.3 Python ver. 3.11x with 5 Folds cross validation and 10 random seeds. 2021-09-30 11:42:07 * -* With gridsearched hyperparameters * -* Random seeds: [57, 31, 1714, 17, 23, 79, 83, 97, 7, 1] Stratified: False * -* Execution took 624.25 seconds, 0.17 hours, on iMac27 * -* Score is accuracy * -************************************************************************************************************************* - -Dataset Sampl. Feat. Cls Nodes Leaves Depth Score Time Hyperparameters -============================== ====== ===== === ======= ======= ======= =============== ================= =============== -balance-scale 625 4 3 7.00 4.00 3.00 0.970560±0.0150 0.014049±0.0020 {'C': 10000.0, 'gamma': 0.1, 'kernel': 'rbf', 'max_iter': 10000.0, 'multiclass_strategy': 'ovr'} -balloons 16 4 2 3.00 2.00 2.00 0.860000±0.2850 0.000854±0.0000 {'C': 7, 'gamma': 0.1, 'kernel': 'rbf', 'max_iter': 10000.0, 'multiclass_strategy': 'ovr'} -************************************************************************************************************************* -* accuracy compared to STree_default (liblinear-ovr) .: 0.0454 * -************************************************************************************************************************* -Which result do you want to report? (q to quit, r to list again, number to report): Generated file: some_results.xlsx +Added results/results_accuracy_STree_iMac27_2021-09-30_11:42:07_0.json to some_results.xlsx +Generated file: some_results.xlsx 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 457df27..dedfc9d 100644 --- a/benchmark/tests/test_files/be_list_report_excel_2.test +++ b/benchmark/tests/test_files/be_list_report_excel_2.test @@ -3,34 +3,6 @@  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): ************************************************************************************************************************* -* STree ver. 1.2.3 Python ver. 3.11x with 5 Folds cross validation and 10 random seeds. 2021-09-30 11:42:07 * -* With gridsearched hyperparameters * -* Random seeds: [57, 31, 1714, 17, 23, 79, 83, 97, 7, 1] Stratified: False * -* Execution took 624.25 seconds, 0.17 hours, on iMac27 * -* Score is accuracy * -************************************************************************************************************************* - -Dataset Sampl. Feat. Cls Nodes Leaves Depth Score Time Hyperparameters -============================== ====== ===== === ======= ======= ======= =============== ================= =============== -balance-scale 625 4 3 7.00 4.00 3.00 0.970560±0.0150 0.014049±0.0020 {'C': 10000.0, 'gamma': 0.1, 'kernel': 'rbf', 'max_iter': 10000.0, 'multiclass_strategy': 'ovr'} -balloons 16 4 2 3.00 2.00 2.00 0.860000±0.2850 0.000854±0.0000 {'C': 7, 'gamma': 0.1, 'kernel': 'rbf', 'max_iter': 10000.0, 'multiclass_strategy': 'ovr'} -************************************************************************************************************************* -* accuracy compared to STree_default (liblinear-ovr) .: 0.0454 * -************************************************************************************************************************* -Which result do you want to report? (q to quit, r to list again, number to report): ************************************************************************************************************************* -* STree ver. 1.2.3 Python ver. 3.11x with 5 Folds cross validation and 10 random seeds. 2021-10-27 09:40:40 * -* default A * -* Random seeds: [57, 31, 1714, 17, 23, 79, 83, 97, 7, 1] Stratified: False * -* Execution took 3395.01 seconds, 0.94 hours, on iMac27 * -* Score is accuracy * -************************************************************************************************************************* - -Dataset Sampl. Feat. Cls Nodes Leaves Depth Score Time Hyperparameters -============================== ====== ===== === ======= ======= ======= =============== ================= =============== -balance-scale 625 4 3 11.08 5.90 5.90 0.980000±0.0010 0.285207±0.0603 {'splitter': 'best', 'max_features': 'auto'} -balloons 16 4 2 4.12 2.56 2.56 0.695000±0.2757 0.021201±0.0035 {'splitter': 'best', 'max_features': 'auto'} -************************************************************************************************************************* -* accuracy compared to STree_default (liblinear-ovr) .: 0.0416 * -************************************************************************************************************************* -Which result do you want to report? (q to quit, r to list again, number to report): Generated file: some_results.xlsx +Added results/results_accuracy_STree_iMac27_2021-09-30_11:42:07_0.json to some_results.xlsx +Added results/results_accuracy_STree_iMac27_2021-10-27_09:40:40_0.json to some_results.xlsx +Generated file: some_results.xlsx