From 7ef88bd5c75826a9bea3aaf52db06b3ae48b3e39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Monta=C3=B1ana=20G=C3=B3mez?= Date: Sat, 14 Jan 2023 13:05:44 +0100 Subject: [PATCH] Update Models_tests --- benchmark/Datasets.py | 1 - benchmark/Models.py | 8 ++++---- benchmark/tests/Models_test.py | 6 +++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/benchmark/Datasets.py b/benchmark/Datasets.py index ed7356e..eac6ed7 100644 --- a/benchmark/Datasets.py +++ b/benchmark/Datasets.py @@ -193,7 +193,6 @@ class Datasets: } def load(self, name, dataframe=False): - try: class_name = self.class_names[self.data_sets.index(name)] X, y = self.dataset.load(name, class_name) diff --git a/benchmark/Models.py b/benchmark/Models.py index bf1ace1..2e06c5c 100644 --- a/benchmark/Models.py +++ b/benchmark/Models.py @@ -47,20 +47,20 @@ class Models: "Wodt": Wodt(random_state=random_state), "SVC": SVC(random_state=random_state), "ODTE": Odte( - base_estimator=Stree(random_state=random_state), + estimator=Stree(random_state=random_state), random_state=random_state, ), "BaggingStree": BaggingClassifier( - base_estimator=Stree(random_state=random_state), + estimator=Stree(random_state=random_state), random_state=random_state, ), "BaggingWodt": BaggingClassifier( - base_estimator=Wodt(random_state=random_state), + estimator=Wodt(random_state=random_state), random_state=random_state, ), "XGBoost": XGBClassifier(random_state=random_state), "AdaBoostStree": AdaBoostClassifier( - base_estimator=Stree( + estimator=Stree( random_state=random_state, ), algorithm="SAMME", diff --git a/benchmark/tests/Models_test.py b/benchmark/tests/Models_test.py index 911cc95..e804f95 100644 --- a/benchmark/tests/Models_test.py +++ b/benchmark/tests/Models_test.py @@ -70,19 +70,19 @@ class ModelTest(TestBase): def test_BaggingStree(self): clf = Models.get_model("BaggingStree") self.assertIsInstance(clf, BaggingClassifier) - clf_base = clf.base_estimator + clf_base = clf.estimator self.assertIsInstance(clf_base, Stree) def test_BaggingWodt(self): clf = Models.get_model("BaggingWodt") self.assertIsInstance(clf, BaggingClassifier) - clf_base = clf.base_estimator + clf_base = clf.estimator self.assertIsInstance(clf_base, Wodt) def test_AdaBoostStree(self): clf = Models.get_model("AdaBoostStree") self.assertIsInstance(clf, AdaBoostClassifier) - clf_base = clf.base_estimator + clf_base = clf.estimator self.assertIsInstance(clf_base, Stree) def test_unknown_classifier(self):