Merge branch 'EpistasisLab:dev' into dev

EpistasisLab · Aug 1, 2023 · 9b5e4f4 · 9b5e4f4
2 parents 4ac71b6 + 22032bd
commit 9b5e4f4
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/tpot2/tests/test_estimators.py b/tpot2/tests/test_estimators.py
@@ -7,15 +7,15 @@
 #standard test
 @pytest.fixture
 def tpot_estimator():
-    return tpot2.TPOTEstimator(  population_size=2,
-                            generations=2,
+    return tpot2.TPOTEstimator(  population_size=50,
                             scorers=['roc_auc_ovr'],
                             scorers_weights=[1],
                             classification=True,
                             n_jobs=1, 
                             early_stop=5,
-                            other_objective_functions= [ tpot2.estimator_objective_functions.average_path_length_objective,  tpot2.estimator_objective_functions.number_of_nodes_objective],
-                            other_objective_functions_weights=[-1, -1],
+                            other_objective_functions= [],
+                            other_objective_functions_weights=[],
+                            max_time_seconds=90,
                             verbose=1)
 
 @pytest.fixture
@@ -81,15 +81,11 @@ def test_tpot_estimator_config_dict_type():
 
 @pytest.fixture
 def tpot_classifier():
-    return tpot2.tpot_estimator.templates.TPOTClassifier(population_size=5,
-                                                    generations=2,
-                                                    verbose=1)
+    return tpot2.tpot_estimator.templates.TPOTClassifier(max_time_seconds=90,verbose=1)
 
 @pytest.fixture
 def tpot_regressor():
-    return tpot2.tpot_estimator.templates.TPOTRegressor(population_size=5,
-                                                    generations=2,
-                                                    verbose=1)
+    return tpot2.tpot_estimator.templates.TPOTRegressor(max_time_seconds=90,verbose=1)
 
 def test_tpot_classifier_fit(tpot_classifier,sample_dataset):
     #load iris dataset