From 5c634b3b1f83f3261bfb9e266aa18e45b7c4cca3 Mon Sep 17 00:00:00 2001 From: perib Date: Wed, 15 May 2024 20:16:31 -0700 Subject: [PATCH] remove hardcoded wrappers that are no longer needed --- tpot2/builtin_modules/__init__.py | 1 - tpot2/builtin_modules/selector_wrappers.py | 109 --------------------- 2 files changed, 110 deletions(-) delete mode 100644 tpot2/builtin_modules/selector_wrappers.py diff --git a/tpot2/builtin_modules/__init__.py b/tpot2/builtin_modules/__init__.py index 32207798..4304576b 100644 --- a/tpot2/builtin_modules/__init__.py +++ b/tpot2/builtin_modules/__init__.py @@ -5,5 +5,4 @@ from .arithmetictransformer import AddTransformer, mul_neg_1_Transformer, MulTransformer, SafeReciprocalTransformer, EQTransformer, NETransformer, GETransformer, GTTransformer, LETransformer, LTTransformer, MinTransformer, MaxTransformer, ZeroTransformer, OneTransformer, NTransformer from .passthrough import Passthrough from .imputer import ColumnSimpleImputer -from .selector_wrappers import RFE_ExtraTreesClassifier, SelectFromModel_ExtraTreesClassifier, RFE_ExtraTreesRegressor, SelectFromModel_ExtraTreesRegressor from .estimatortransformer import EstimatorTransformer \ No newline at end of file diff --git a/tpot2/builtin_modules/selector_wrappers.py b/tpot2/builtin_modules/selector_wrappers.py deleted file mode 100644 index dd5c8718..00000000 --- a/tpot2/builtin_modules/selector_wrappers.py +++ /dev/null @@ -1,109 +0,0 @@ -import sklearn -from sklearn.ensemble import ExtraTreesClassifier, ExtraTreesRegressor -from sklearn.feature_selection import SelectFromModel -from sklearn.feature_selection import RFE - -class RFE_ExtraTreesClassifier(RFE): - def __init__(self, n_features_to_select=None, step=1, verbose=0, importance_getter='auto', n_estimators=100, *, criterion='gini', max_depth=None, min_samples_split=2, min_samples_leaf=1, min_weight_fraction_leaf=0.0, max_features='sqrt', max_leaf_nodes=None, min_impurity_decrease=0.0, bootstrap=False, oob_score=False, n_jobs=None, random_state=None, warm_start=False, class_weight=None, ccp_alpha=0.0, max_samples=None): - - self.n_estimators = n_estimators - self.criterion = criterion - self.max_depth = max_depth - self.min_samples_split = min_samples_split - self.min_samples_leaf = min_samples_leaf - self.min_weight_fraction_leaf = min_weight_fraction_leaf - self.max_features = max_features - self.max_leaf_nodes = max_leaf_nodes - self.min_impurity_decrease = min_impurity_decrease - self.bootstrap = bootstrap - self.oob_score = oob_score - self.n_jobs = n_jobs - self.random_state = random_state - self.verbose = verbose - self.warm_start = warm_start - self.class_weight = class_weight - self.ccp_alpha = ccp_alpha - self.max_samples = max_samples - - - estimator = ExtraTreesClassifier(n_estimators=n_estimators, criterion=criterion, max_depth=max_depth, min_samples_split=min_samples_split, min_samples_leaf=min_samples_leaf, min_weight_fraction_leaf=min_weight_fraction_leaf, max_features=max_features, max_leaf_nodes=max_leaf_nodes, min_impurity_decrease=min_impurity_decrease, bootstrap=bootstrap, oob_score=oob_score, n_jobs=n_jobs, random_state=random_state, verbose=verbose, warm_start=warm_start, class_weight=class_weight, ccp_alpha=ccp_alpha, max_samples=max_samples) - super().__init__(estimator=estimator, n_features_to_select=n_features_to_select, step=step, verbose=verbose, importance_getter=importance_getter) - - -class SelectFromModel_ExtraTreesClassifier(SelectFromModel): - def __init__(self, threshold=None, prefit=False, norm_order=1, SFM_max_features=None, importance_getter='auto', n_estimators=100, *, criterion='gini', max_depth=None, min_samples_split=2, min_samples_leaf=1, min_weight_fraction_leaf=0.0, max_features='sqrt', max_leaf_nodes=None, min_impurity_decrease=0.0, bootstrap=False, oob_score=False, n_jobs=None, random_state=None, verbose=0, warm_start=False, class_weight=None, ccp_alpha=0.0, max_samples=None): - - self.SFM_max_features = SFM_max_features - self.n_estimators = n_estimators - self.criterion = criterion - self.max_depth = max_depth - self.min_samples_split = min_samples_split - self.min_samples_leaf = min_samples_leaf - self.min_weight_fraction_leaf = min_weight_fraction_leaf - self.max_features = max_features - self.max_leaf_nodes = max_leaf_nodes - self.min_impurity_decrease = min_impurity_decrease - self.bootstrap = bootstrap - self.oob_score = oob_score - self.n_jobs = n_jobs - self.random_state = random_state - self.verbose = verbose - self.warm_start = warm_start - self.class_weight = class_weight - self.ccp_alpha = ccp_alpha - self.max_samples = max_samples - - estimator = ExtraTreesClassifier(n_estimators=n_estimators, criterion=criterion, max_depth=max_depth, min_samples_split=min_samples_split, min_samples_leaf=min_samples_leaf, min_weight_fraction_leaf=min_weight_fraction_leaf, max_features=max_features, max_leaf_nodes=max_leaf_nodes, min_impurity_decrease=min_impurity_decrease, bootstrap=bootstrap, oob_score=oob_score, n_jobs=n_jobs, random_state=random_state, verbose=verbose, warm_start=warm_start, class_weight=class_weight, ccp_alpha=ccp_alpha, max_samples=max_samples) - super().__init__(estimator=estimator, threshold=threshold, prefit=prefit, norm_order=norm_order, max_features=SFM_max_features, importance_getter=importance_getter) - - -class RFE_ExtraTreesRegressor(RFE): - def __init__(self, n_features_to_select=None, step=1, verbose=0, importance_getter='auto',n_estimators=100, *, criterion='squared_error', max_depth=None, min_samples_split=2, min_samples_leaf=1, min_weight_fraction_leaf=0.0, max_features=1.0, max_leaf_nodes=None, min_impurity_decrease=0.0, bootstrap=False, oob_score=False, n_jobs=None, random_state=None, warm_start=False, ccp_alpha=0.0, max_samples=None ) -> None: - - self.n_estimators = n_estimators - self.criterion = criterion - self.max_depth = max_depth - self.min_samples_split = min_samples_split - self.min_samples_leaf = min_samples_leaf - self.min_weight_fraction_leaf = min_weight_fraction_leaf - self.max_features = max_features - self.max_leaf_nodes = max_leaf_nodes - self.min_impurity_decrease = min_impurity_decrease - self.bootstrap = bootstrap - self.oob_score = oob_score - self.n_jobs = n_jobs - self.random_state = random_state - self.verbose = verbose - self.warm_start = warm_start - self.ccp_alpha = ccp_alpha - self.max_samples = max_samples - - - - estimator = ExtraTreesRegressor(n_estimators=n_estimators, criterion=criterion, max_depth=max_depth, min_samples_split=min_samples_split, min_samples_leaf=min_samples_leaf, min_weight_fraction_leaf=min_weight_fraction_leaf, max_features=max_features, max_leaf_nodes=max_leaf_nodes, min_impurity_decrease=min_impurity_decrease, bootstrap=bootstrap, oob_score=oob_score, n_jobs=n_jobs, random_state=random_state, verbose=verbose, warm_start=warm_start, ccp_alpha=ccp_alpha, max_samples=max_samples) - super().__init__(estimator=estimator, n_features_to_select=n_features_to_select, step=step, verbose=verbose, importance_getter=importance_getter) - -class SelectFromModel_ExtraTreesRegressor(SelectFromModel): - def __init__(self, threshold=None, prefit=False, norm_order=1, SFM_max_features=None, importance_getter='auto', n_estimators=100, *, criterion='squared_error', max_depth=None, min_samples_split=2, min_samples_leaf=1, min_weight_fraction_leaf=0.0, max_features=1.0, max_leaf_nodes=None, min_impurity_decrease=0.0, bootstrap=False, oob_score=False, n_jobs=None, random_state=None, verbose=0, warm_start=False, ccp_alpha=0.0, max_samples=None ): - - self.SFM_max_features = SFM_max_features - self.n_estimators = n_estimators - self.criterion = criterion - self.max_depth = max_depth - self.min_samples_split = min_samples_split - self.min_samples_leaf = min_samples_leaf - self.min_weight_fraction_leaf = min_weight_fraction_leaf - self.max_features = max_features - self.max_leaf_nodes = max_leaf_nodes - self.min_impurity_decrease = min_impurity_decrease - self.bootstrap = bootstrap - self.oob_score = oob_score - self.n_jobs = n_jobs - self.random_state = random_state - self.verbose = verbose - self.warm_start = warm_start - self.ccp_alpha = ccp_alpha - self.max_samples = max_samples - - estimator = ExtraTreesRegressor(n_estimators=n_estimators, criterion=criterion, max_depth=max_depth, min_samples_split=min_samples_split, min_samples_leaf=min_samples_leaf, min_weight_fraction_leaf=min_weight_fraction_leaf, max_features=max_features, max_leaf_nodes=max_leaf_nodes, min_impurity_decrease=min_impurity_decrease, bootstrap=bootstrap, oob_score=oob_score, n_jobs=n_jobs, random_state=random_state, verbose=verbose, warm_start=warm_start, ccp_alpha=ccp_alpha, max_samples=max_samples) - super().__init__(estimator=estimator, threshold=threshold, prefit=prefit, norm_order=norm_order, max_features=SFM_max_features, importance_getter=importance_getter)