Skip to content
Closed
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
a79079b
fix bug in config dict
Apr 28, 2017
fa1acfb
Update base.py
rhiever Apr 28, 2017
5fab09a
Merge pull request #431 from weixuanfu2016/config_dict_patch
rhiever Apr 28, 2017
ed3bdf7
Update version for minor release
rhiever Apr 28, 2017
5e32488
use stopit replace Interruptable_cross_val_score
May 1, 2017
39cff19
Update requirements.txt
rhiever May 1, 2017
eafc240
fix bugs and clean bugs
May 1, 2017
e50814c
clean test codes
May 1, 2017
c10ba2e
add unit test
May 1, 2017
6bc031c
try backend="threading"
May 1, 2017
3019275
dask works in macOS
May 1, 2017
0b3680c
clean codes
May 1, 2017
91caa55
num_worker added
May 1, 2017
6b00655
use client
May 1, 2017
d9c1863
threading
May 1, 2017
4517abb
clean codes
May 1, 2017
94b4a37
clean codes
May 1, 2017
3ce128b
clean codes
May 1, 2017
02fd277
clean codes
May 1, 2017
af98b96
clean codes
May 1, 2017
9cafac7
return to joblib
May 2, 2017
5447fe0
key works
May 2, 2017
1f97655
fix issue in large dataset
May 2, 2017
23ca6d3
Merge remote-tracking branch 'upstream/development' into joblib_timeout
May 2, 2017
3ce4a30
add doc
May 2, 2017
6515732
clean codes
May 2, 2017
633e9e8
min to sec
May 2, 2017
ac77725
manual dump memmap
May 2, 2017
dd7df4e
clean codes
May 2, 2017
a6ff510
dask array tet
May 2, 2017
dcf640e
jobs test
May 2, 2017
4d87038
add warning for large dataset
May 2, 2017
ec96ecd
add doc and installnation
May 2, 2017
7978f7d
instal in test
May 2, 2017
24c030f
pip install dask
May 2, 2017
0382753
pip install dask[complete]
May 2, 2017
ac3a086
clean codes
May 3, 2017
39ac993
better get
May 4, 2017
224a9bc
clean codes
May 4, 2017
c20d911
fix conflict
May 12, 2017
a4956d4
warning when verbosity > 2
May 12, 2017
7cea3bf
fix this compatibility issue
May 16, 2017
454f54a
add unit test
May 16, 2017
dc40489
fix ci
May 16, 2017
1fc2860
Merge pull request #451 from weixuanfu2016/mdr_dict_master_fix
rhiever May 18, 2017
18927b0
Version increment for hot patch release
rhiever May 18, 2017
568f55d
fix bug for ploynomialfeatures
May 19, 2017
37c1529
add unit test
May 19, 2017
179fdf1
Merge pull request #455 from weixuanfu2016/issue454
rhiever May 19, 2017
7b1eb27
Minor version increment for release
rhiever May 19, 2017
fd2f1c3
Update tests.py
rhiever May 19, 2017
c3b2167
Merge branch 'development' into joblib_timeout
rhiever May 23, 2017
cccf676
fix conflicts
May 23, 2017
211eed9
Merge branch 'development' into joblib_timeout
May 23, 2017
00fc6ff
add patch in master
May 23, 2017
1e0a8c4
add patch in tpot 0.7.5
May 23, 2017
d8e1904
clean codes
May 23, 2017
af01d55
add some small unit tests for increasing coverage
May 23, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ci/.travis_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ pip install tqdm
pip install toolz
pip install dask[complete]
pip install stopit
pip install scikit-mdr
pip install skrebate

if [[ "$COVERAGE" == "true" ]]; then
pip install coverage coveralls
Expand Down
17 changes: 14 additions & 3 deletions tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
import subprocess
import sys

from sklearn.datasets import load_digits, load_boston
from sklearn.datasets import load_digits, load_boston, make_classification
from sklearn.model_selection import train_test_split, cross_val_score
from sklearn.linear_model import LogisticRegression, Lasso
from sklearn.ensemble import RandomForestClassifier, RandomForestRegressor
Expand Down Expand Up @@ -675,6 +675,7 @@ def test_fit3():
assert not (tpot_obj._start_datetime is None)


<<<<<<< HEAD
def test_evaluated_individuals():
"""Assert that _evaluated_individuals stores corrent pipelines and their CV scores."""
tpot_obj = TPOTClassifier(
Expand Down Expand Up @@ -775,8 +776,18 @@ def test_imputer3():
assert_not_equal(imputed_features[0][0], float('nan'))


def test_tpot_operator_factory_class():
"""Assert that the TPOT operators class factory."""
def test_fit3():
"""Assert that the TPOT fit function provides an optimized pipeline when config_dict is \'TPOT MDR\'"""
X, y = make_classification(n_samples=50, n_features=10, random_state=42, n_classes=2) # binary classification problem
tpot_obj = TPOTClassifier(random_state=42, population_size=1, offspring_size=2, generations=1, verbosity=0, config_dict='TPOT MDR')
tpot_obj.fit(X, y)

assert isinstance(tpot_obj._optimized_pipeline, creator.Individual)
assert not (tpot_obj._start_datetime is None)


def testTPOTOperatorClassFactory():
"""Assert that the TPOT operators class factory"""
test_config_dict = {
'sklearn.svm.LinearSVC': {
'penalty': ["l1", "l2"],
Expand Down
2 changes: 1 addition & 1 deletion tpot/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@

"""

__version__ = '0.7.3'
__version__ = '0.7.4'
2 changes: 1 addition & 1 deletion tpot/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ def __init__(self, generations=100, population_size=100, offspring_size=None,
Random number generator seed for TPOT. Use this to make sure
that TPOT will give you the same results each time you run it
against the same data set with that seed.
config_dict: a Python dictionary or string (default: None)
config_dict: Python dictionary or string (default: None)
Python dictionary:
A dictionary customizing the operators and parameters that
TPOT uses in the optimization process.
Expand Down