From b9dd00c661797f68101c4b9d3dc838918e836c00 Mon Sep 17 00:00:00 2001 From: Oliver Sherouse Date: Fri, 23 Mar 2018 11:16:12 -0400 Subject: [PATCH 1/4] Add sklearn 0.17 compatibility Paper over library reorganization. --- quantgov/estimator/evaluation.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/quantgov/estimator/evaluation.py b/quantgov/estimator/evaluation.py index c264c74..e6a48a5 100644 --- a/quantgov/estimator/evaluation.py +++ b/quantgov/estimator/evaluation.py @@ -1,9 +1,14 @@ import configparser import logging -import sklearn.model_selection import pandas as pd +try: + from sklearn.model_selection import KFold, GridSearchCV +except Import Error: #sklearn 0.17 + from sklearn.cross_validation import KFold + from sklearn.grid_search import GridSearchCV + from . import utils as eutils log = logging.getLogger(name=__name__) @@ -25,13 +30,13 @@ def evaluate_model(model, X, y, folds, scoring): """ log.info('Evaluating {}'.format(model.name)) if hasattr(y[0], '__getitem__'): - cv = sklearn.model_selection.KFold(folds, shuffle=True) + cv = KFold(folds, shuffle=True) if '_' not in scoring: log.warning("No averaging method specified, assuming macro") scoring += '_macro' else: - cv = sklearn.model_selection.KFold(folds, shuffle=True) - gs = sklearn.model_selection.GridSearchCV( + cv = KFold(folds, shuffle=True) + gs = GridSearchCV( estimator=model.model, param_grid=model.parameters, cv=cv, From bf06ff67f137513826631a92da056ca4fc00cec4 Mon Sep 17 00:00:00 2001 From: Oliver Sherouse Date: Fri, 23 Mar 2018 11:18:38 -0400 Subject: [PATCH 2/4] typo this is why we don't edit files on the web. --- quantgov/estimator/evaluation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quantgov/estimator/evaluation.py b/quantgov/estimator/evaluation.py index e6a48a5..bcc7921 100644 --- a/quantgov/estimator/evaluation.py +++ b/quantgov/estimator/evaluation.py @@ -5,7 +5,7 @@ try: from sklearn.model_selection import KFold, GridSearchCV -except Import Error: #sklearn 0.17 +except ImportError: #sklearn 0.17 from sklearn.cross_validation import KFold from sklearn.grid_search import GridSearchCV From db75c93f84a47ea14a668fa66fcd1857f1dc4878 Mon Sep 17 00:00:00 2001 From: Oliver Sherouse Date: Fri, 23 Mar 2018 11:24:00 -0400 Subject: [PATCH 3/4] PEP8 --- quantgov/estimator/evaluation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quantgov/estimator/evaluation.py b/quantgov/estimator/evaluation.py index bcc7921..0f17eff 100644 --- a/quantgov/estimator/evaluation.py +++ b/quantgov/estimator/evaluation.py @@ -5,7 +5,7 @@ try: from sklearn.model_selection import KFold, GridSearchCV -except ImportError: #sklearn 0.17 +except ImportError: # sklearn 0.17 from sklearn.cross_validation import KFold from sklearn.grid_search import GridSearchCV From a592a685b4ceb1e1f84ddf9e450183c8ddf6b8ad Mon Sep 17 00:00:00 2001 From: Oliver Sherouse Date: Fri, 23 Mar 2018 11:42:08 -0400 Subject: [PATCH 4/4] PEP8 --- quantgov/estimator/evaluation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quantgov/estimator/evaluation.py b/quantgov/estimator/evaluation.py index 0f17eff..03b0914 100644 --- a/quantgov/estimator/evaluation.py +++ b/quantgov/estimator/evaluation.py @@ -5,7 +5,7 @@ try: from sklearn.model_selection import KFold, GridSearchCV -except ImportError: # sklearn 0.17 +except ImportError: # sklearn 0.17 from sklearn.cross_validation import KFold from sklearn.grid_search import GridSearchCV