Skip to content

Commit e19e256

Browse files
authored
Merge pull request #104 from VIDA-NYU/reduce_search_space
2 parents 2dfc602 + 3265a9f commit e19e256

File tree

3 files changed

+4
-35
lines changed

3 files changed

+4
-35
lines changed

alpha_automl/pipeline_synthesis/pipeline_builder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def change_default_hyperparams(primitive_object):
3434
elif isinstance(primitive_object, SimpleImputer):
3535
primitive_object.set_params(strategy='most_frequent', keep_empty_features=True)
3636
elif isinstance(primitive_object, AdaBoostClassifier):
37-
primitive_object.set_params(algorithm='SAMME')
37+
primitive_object.set_params(algorithm='SAMME.R')
3838

3939

4040
def extract_estimators(pipeline_primitives, all_primitives):

alpha_automl/resource/primitives_hierarchy.json

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -52,48 +52,15 @@
5252
"sklearn.ensemble.VotingRegressor"
5353
],
5454
"CLASSIFIER": [
55-
"sklearn.discriminant_analysis.LinearDiscriminantAnalysis",
56-
"sklearn.discriminant_analysis.QuadraticDiscriminantAnalysis",
5755
"sklearn.ensemble.ExtraTreesClassifier",
58-
"sklearn.ensemble.GradientBoostingClassifier",
5956
"sklearn.ensemble.RandomForestClassifier",
60-
"sklearn.naive_bayes.BernoulliNB",
61-
"sklearn.naive_bayes.GaussianNB",
62-
"sklearn.naive_bayes.MultinomialNB",
63-
"sklearn.neighbors.KNeighborsClassifier",
64-
"sklearn.linear_model.LogisticRegression",
65-
"sklearn.linear_model.PassiveAggressiveClassifier",
66-
"sklearn.linear_model.SGDClassifier",
67-
"sklearn.svm.LinearSVC",
68-
"sklearn.svm.SVC",
69-
"sklearn.tree.DecisionTreeClassifier",
7057
"xgboost.XGBClassifier",
7158
"lightgbm.LGBMClassifier",
7259
"catboost.CatBoostClassifier"
7360
],
7461
"REGRESSOR": [
75-
"sklearn.linear_model.ARDRegression",
76-
"sklearn.tree.DecisionTreeRegressor",
7762
"sklearn.ensemble.ExtraTreesRegressor",
78-
"sklearn.gaussian_process.GaussianProcessRegressor",
79-
"sklearn.ensemble.GradientBoostingRegressor",
80-
"sklearn.neighbors.KNeighborsRegressor",
81-
"sklearn.linear_model.Lars",
82-
"sklearn.linear_model.Lasso",
83-
"sklearn.linear_model.LassoCV",
84-
"sklearn.svm.LinearSVR",
85-
"sklearn.linear_model.PassiveAggressiveRegressor",
8663
"sklearn.ensemble.RandomForestRegressor",
87-
"sklearn.linear_model.Ridge",
88-
"sklearn.linear_model.SGDRegressor",
89-
"sklearn.svm.SVR",
90-
"sklearn.linear_model.BayesianRidge",
91-
"sklearn.linear_model.ElasticNet",
92-
"sklearn.linear_model.HuberRegressor",
93-
"sklearn.linear_model.LinearRegression",
94-
"sklearn.linear_model.RANSACRegressor",
95-
"sklearn.linear_model.RidgeCV",
96-
"sklearn.linear_model.TheilSenRegressor",
9764
"xgboost.XGBRegressor",
9865
"lightgbm.LGBMRegressor",
9966
"catboost.CatBoostRegressor"

alpha_automl/scorer.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from alpha_automl.utils import RANDOM_SEED, hide_logs
88
from sklearn.metrics import accuracy_score, f1_score, jaccard_score, precision_score, recall_score,\
99
max_error, mean_absolute_error, mean_squared_error, mean_squared_log_error, median_absolute_error, r2_score,\
10-
adjusted_mutual_info_score, rand_score, mutual_info_score, normalized_mutual_info_score
10+
adjusted_mutual_info_score, rand_score, mutual_info_score, normalized_mutual_info_score, roc_auc_score
1111
from alpha_automl.pipeline import Pipeline
1212
from alpha_automl.primitive_loader import PRIMITIVE_TYPES
1313

@@ -19,6 +19,7 @@
1919
'f1_score': f1_score,
2020
'precision_score': precision_score,
2121
'recall_score': recall_score,
22+
'roc_auc_score': roc_auc_score,
2223
'jaccard_score': jaccard_score,
2324
# Regression metrics
2425
'max_error': max_error,
@@ -41,6 +42,7 @@
4142
f1_score: 'ascending',
4243
precision_score: 'ascending',
4344
recall_score: 'ascending',
45+
roc_auc_score: 'ascending',
4446
jaccard_score: 'ascending',
4547
# Regression metrics
4648
max_error: 'descending',

0 commit comments

Comments
 (0)