Skip to content

Commit f1f13c6

Browse files
author
Yam Peleg
committed
hunga bunga
1 parent 30bbd36 commit f1f13c6

10 files changed

Lines changed: 126 additions & 71 deletions

File tree

.idea/workspace.xml

Lines changed: 61 additions & 46 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Readme.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ Dependencies
6161
- SciPy (>= 0.17.0)
6262
- joblib (>= 0.11)
6363
- scikit-learn (>=0.20.0)
64+
- tabulate (>=0.8.2)
65+
- tqdm (>=4.28.1)
6466
6567
~~~~~~~~~~~~
6668

hunga_bunga/__init__.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88

99
class HungaBungaZeroKnowledge(BaseEstimator):
10-
def __init__(self, brain=False, test_size = 0.2, n_splits = 5, random_state=None, upsample=True, scoring=None, verbose=True, normalize_x = True, n_jobs =cpu_count() - 1):
10+
def __init__(self, brain=False, test_size = 0.2, n_splits = 5, random_state=None, upsample=True, scoring=None, verbose=True, normalize_x = True, n_jobs =cpu_count() - 1, grid_search=True):
1111
self.model = None
1212
self.brain = brain
1313
self.test_size = test_size
@@ -19,15 +19,16 @@ def __init__(self, brain=False, test_size = 0.2, n_splits = 5, random_state=None
1919
self.n_jobs = n_jobs
2020
self.normalize_x = normalize_x
2121
self.problem_type = 'Unknown'
22+
self.grid_search = grid_search
2223
super(HungaBungaZeroKnowledge, self).__init__()
2324

2425
def fit(self, X, y):
2526
try:
26-
self.model = HungaBungaClassifier(normalize_x=self.normalize_x, test_size=self.test_size, n_splits=self.n_splits, upsample=self.upsample, scoring=self.scoring, verbose=self.verbose, brain=self.brain, n_jobs=self.n_jobs)
27+
self.model = HungaBungaClassifier(normalize_x=self.normalize_x, test_size=self.test_size, n_splits=self.n_splits, upsample=self.upsample, scoring=self.scoring, verbose=self.verbose, brain=self.brain, n_jobs=self.n_jobs, grid_search=self.grid_search)
2728
self.model.fit(X, y)
2829
self.problem_type = 'Classification'
2930
except:
30-
self.model = HungaBungaRegressor(normalize_x=self.normalize_x, test_size=self.test_size, n_splits=self.n_splits, upsample=self.upsample, scoring=self.scoring, verbose=self.verbose, brain=self.brain, n_jobs=self.n_jobs)
31+
self.model = HungaBungaRegressor(normalize_x=self.normalize_x, test_size=self.test_size, n_splits=self.n_splits, upsample=self.upsample, scoring=self.scoring, verbose=self.verbose, brain=self.brain, n_jobs=self.n_jobs, grid_search=self.grid_search)
3132
self.model.fit(X, y)
3233
self.problem_type = 'Regression'
3334
return self

hunga_bunga/classification.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,13 +174,13 @@
174174
]
175175

176176

177-
def run_all_classifiers(x, y, small = True, normalize_x = True, n_jobs=cpu_count()-1, brain=False, test_size=0.2, n_splits=5, upsample=True, scoring=None, verbose=False):
177+
def run_all_classifiers(x, y, small = True, normalize_x = True, n_jobs=cpu_count()-1, brain=False, test_size=0.2, n_splits=5, upsample=True, scoring=None, verbose=False, grid_search=True):
178178
all_params = (linear_models_n_params_small if small else linear_models_n_params) + (nn_models_n_params_small if small else nn_models_n_params) + ([] if small else gaussianprocess_models_n_params) + neighbor_models_n_params + (svm_models_n_params_small if small else svm_models_n_params) + (tree_models_n_params_small if small else tree_models_n_params)
179-
return main_loop(all_params, StandardScaler().fit_transform(x) if normalize_x else x, y, isClassification=True, n_jobs=n_jobs, verbose=verbose, brain=brain, test_size=test_size, n_splits=n_splits, upsample=upsample, scoring=scoring)
179+
return main_loop(all_params, StandardScaler().fit_transform(x) if normalize_x else x, y, isClassification=True, n_jobs=n_jobs, verbose=verbose, brain=brain, test_size=test_size, n_splits=n_splits, upsample=upsample, scoring=scoring, grid_search=grid_search)
180180

181181

182182
class HungaBungaClassifier(ClassifierMixin):
183-
def __init__(self, brain=False, test_size = 0.2, n_splits = 5, random_state=None, upsample=True, scoring=None, verbose=False, normalize_x = True, n_jobs =cpu_count() - 1):
183+
def __init__(self, brain=False, test_size = 0.2, n_splits = 5, random_state=None, upsample=True, scoring=None, verbose=False, normalize_x = True, n_jobs =cpu_count() - 1, grid_search=True):
184184
self.model = None
185185
self.brain = brain
186186
self.test_size = test_size
@@ -191,10 +191,11 @@ def __init__(self, brain=False, test_size = 0.2, n_splits = 5, random_state=None
191191
self.verbose = verbose
192192
self.n_jobs = n_jobs
193193
self.normalize_x = normalize_x
194+
self.grid_search = grid_search
194195
super(HungaBungaClassifier, self).__init__()
195196

196197
def fit(self, x, y):
197-
self.model = run_all_classifiers(x, y, normalize_x=self.normalize_x, test_size=self.test_size, n_splits=self.n_splits, upsample=self.upsample, scoring=self.scoring, verbose=self.verbose, brain=self.brain, n_jobs=self.n_jobs)[0]
198+
self.model = run_all_classifiers(x, y, normalize_x=self.normalize_x, test_size=self.test_size, n_splits=self.n_splits, upsample=self.upsample, scoring=self.scoring, verbose=self.verbose, brain=self.brain, n_jobs=self.n_jobs, grid_search=self.grid_search)[0]
198199
return self
199200

200201
def predict(self, x):

hunga_bunga/classification.pyc

-15 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)