From e3d969c5d71d5116fc372687e08c3b160b956ec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Monta=C3=B1ana?= Date: Tue, 9 May 2023 10:25:54 +0200 Subject: [PATCH] Add number of samples in report datasets balance --- benchmark/Datasets.py | 2 +- benchmark/Results.py | 10 ++++++---- benchmark/tests/Report_test.py | 1 - .../tests/test_files/exreport_excel_Datasets.test | 6 +++--- benchmark/tests/test_files/report_datasets.test | 8 ++++---- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/benchmark/Datasets.py b/benchmark/Datasets.py index eb11eb5..4f3cd7b 100644 --- a/benchmark/Datasets.py +++ b/benchmark/Datasets.py @@ -165,7 +165,7 @@ class Datasets: comp = "" sep = "" for count in counts: - comp += f"{sep}{count/sum(counts)*100:5.2f}%" + comp += f"{sep}{count/sum(counts)*100:5.2f}% ({count}) " sep = "/ " attr.balance = comp attr.classes = len(np.unique(y)) diff --git a/benchmark/Results.py b/benchmark/Results.py index 49f0a83..8eb5253 100644 --- a/benchmark/Results.py +++ b/benchmark/Results.py @@ -814,18 +814,20 @@ class ReportDatasets: def report(self): data_sets = Datasets() + max_len = max( + [len(data_sets.get_attributes(data).balance) for data in data_sets] + ) color_line = TextColor.LINE1 - if self.excel: - self.header() if self.output: print(color_line, end="") print(self.header_text) print("") print(f"{'Dataset':30s} Sampl. Feat. Cont Cls Balance") - print("=" * 30 + " ====== ===== ==== === " + "=" * 60) + print("=" * 30 + " ====== ===== ==== === " + "=" * max_len) + if self.excel: + self.header() for dataset in data_sets: attributes = data_sets.get_attributes(dataset) - if self.excel: self.print_line(attributes) color_line = ( diff --git a/benchmark/tests/Report_test.py b/benchmark/tests/Report_test.py index 6518b98..ff384ca 100644 --- a/benchmark/tests/Report_test.py +++ b/benchmark/tests/Report_test.py @@ -87,7 +87,6 @@ class ReportTest(TestBase): if self.stree_version in line: # replace STree version line = self.replace_STree_version(line, output_text, index) - self.assertEqual(line, output_text[index]) @patch("sys.stdout", new_callable=StringIO) diff --git a/benchmark/tests/test_files/exreport_excel_Datasets.test b/benchmark/tests/test_files/exreport_excel_Datasets.test index 054b981..b3cdca0 100644 --- a/benchmark/tests/test_files/exreport_excel_Datasets.test +++ b/benchmark/tests/test_files/exreport_excel_Datasets.test @@ -1,4 +1,4 @@ -1;1;"Datasets used in benchmark ver. 0.4.0" +1;1;"Datasets used in benchmark ver. 0.5.0" 2;1;" Default score accuracy" 2;2;"Cross validation" 2;6;"5 Folds" @@ -19,10 +19,10 @@ 7;3;"4" 7;4;"0" 7;5;"3" -7;6;" 7.84%/ 46.08%/ 46.08%" +7;6;" 7.84% (49) / 46.08% (288) / 46.08% (288) " 8;1;"balloons" 8;2;"16" 8;3;"4" 8;4;"0" 8;5;"2" -8;6;"56.25%/ 43.75%" +8;6;"56.25% (9) / 43.75% (7) " diff --git a/benchmark/tests/test_files/report_datasets.test b/benchmark/tests/test_files/report_datasets.test index 3fa0aeb..5e6d4c8 100644 --- a/benchmark/tests/test_files/report_datasets.test +++ b/benchmark/tests/test_files/report_datasets.test @@ -1,6 +1,6 @@ -Datasets used in benchmark ver. 0.2.0 +Datasets used in benchmark ver. 0.5.0 Dataset Sampl. Feat. Cont Cls Balance -============================== ====== ===== ==== === ============================================================ -balance-scale 625 4 0 3 7.84%/ 46.08%/ 46.08% -balloons 16 4 0 2 56.25%/ 43.75% +============================== ====== ===== ==== === ========================================== +balance-scale 625 4 0 3 7.84% (49) / 46.08% (288) / 46.08% (288) +balloons 16 4 0 2 56.25% (9) / 43.75% (7)