diff --git a/benchmark/Experiments.py b/benchmark/Experiments.py index f2a8793..8cea570 100644 --- a/benchmark/Experiments.py +++ b/benchmark/Experiments.py @@ -450,7 +450,7 @@ class GridSearch: random_state=self.random_seeds[0], n_splits=self.folds, ) - clf = Models.get_model(self.model_name) + clf = Models.get_model(self.model_name, self.random_seeds[0]) self.version = clf.version() if hasattr(clf, "version") else "-" self._num_warnings = 0 warnings.warn = self._warn @@ -460,7 +460,7 @@ class GridSearch: estimator=clf, cv=kfold, param_grid=self.grid, - scoring=self.score_name, + scoring=self.score_name.replace("-", "_"), n_jobs=-1, ) grid.fit(X, y) diff --git a/benchmark/scripts/be_build_grid.py b/benchmark/scripts/be_build_grid.py index 6f9211d..d4ea653 100755 --- a/benchmark/scripts/be_build_grid.py +++ b/benchmark/scripts/be_build_grid.py @@ -111,7 +111,6 @@ def main(args_test=None): t2 = sorted([x for x in value if isinstance(x, str)]) results_tmp[new_key] = t1 + t2 output.append(results_tmp) - # save results file_name = Files.grid_input(args.score, args.model) file_output = os.path.join(Folders.results, file_name) diff --git a/benchmark/tests/scripts/Be_Grid_test.py b/benchmark/tests/scripts/Be_Grid_test.py index 39c388a..a68cbfd 100644 --- a/benchmark/tests/scripts/Be_Grid_test.py +++ b/benchmark/tests/scripts/Be_Grid_test.py @@ -21,7 +21,7 @@ class BeGridTest(TestBase): "Generated grid input file to results/grid_input_f1-macro_STree." "json\n", ) - name = stdout.getvalue().split("/")[1].replace("\n", "") + name = File.grid_input("f1-macro", "STree") file_name = os.path.join(Folders.results, name) self.check_file_file(file_name, "be_build_grid") @@ -31,3 +31,7 @@ class BeGridTest(TestBase): ["-m", "STree", "-s", "accuracy", "--n_folds", 2, "-q", "1"], ) self.assertEqual(stderr.getvalue(), "") + self.assertEqual(stdout.getvalue(), "") + name = File.grid_output("accuracy", "STree") + file_name = os.path.join(Folders.results, name) + self.check_file_file(file_name, "be_grid") diff --git a/benchmark/tests/test_files/be_grid.test b/benchmark/tests/test_files/be_grid.test new file mode 100644 index 0000000..6cb11fc --- /dev/null +++ b/benchmark/tests/test_files/be_grid.test @@ -0,0 +1,20 @@ +{ + "balance-scale": [ + 0.9119999999999999, + { + "C": 1.0, + "kernel": "liblinear", + "multiclass_strategy": "ovr" + }, + "v. 1.2.4, Computed on iMac27 on 2022-05-07 at 23:29:25 took 0.962s" + ], + "balloons": [ + 0.7, + { + "C": 1.0, + "kernel": "linear", + "multiclass_strategy": "ovr" + }, + "v. 1.2.4, Computed on iMac27 on 2022-05-07 at 23:29:25 took 1.232s" + ] +} \ No newline at end of file