From 0361b805330cbf72263af025a2267b196456f715 Mon Sep 17 00:00:00 2001 From: Gertjan van den Burg Date: Wed, 4 Dec 2019 13:08:42 +0000 Subject: Deal with changing behavior of check_is_fitted This is going to change in version 0.23, so we might as well inline it now. --- gensvm/sklearn_util.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gensvm/sklearn_util.py') diff --git a/gensvm/sklearn_util.py b/gensvm/sklearn_util.py index 182f257..e23921b 100644 --- a/gensvm/sklearn_util.py +++ b/gensvm/sklearn_util.py @@ -207,7 +207,12 @@ def _skl_check_is_fitted(estimator, method_name, refit): "attribute" % (type(estimator).__name__, method_name) ) else: - check_is_fitted(estimator, "best_estimator_") + if not hasattr(estimator, "best_estimator_"): + raise NotFittedError( + "This %s instance is not fitted yet. Call " + "'fit' with appropriate arguments before using this " + "estimator." % type(estimator).__name__ + ) def _skl_grid_score(X, y, scorer_, best_estimator_, refit, multimetric_): -- cgit v1.2.3 From 51fd39469920122f21fcb89f44f7977b2ac323cb Mon Sep 17 00:00:00 2001 From: Gertjan van den Burg Date: Wed, 4 Dec 2019 13:09:12 +0000 Subject: Formatting --- gensvm/sklearn_util.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gensvm/sklearn_util.py') diff --git a/gensvm/sklearn_util.py b/gensvm/sklearn_util.py index e23921b..eb8ceb6 100644 --- a/gensvm/sklearn_util.py +++ b/gensvm/sklearn_util.py @@ -89,7 +89,9 @@ def _skl_format_cv_results( score_time, ) = zip(*out) else: - (test_score_dicts, test_sample_counts, fit_time, score_time) = zip(*out) + (test_score_dicts, test_sample_counts, fit_time, score_time) = zip( + *out + ) # test_score_dicts and train_score dicts are lists of dictionaries and # we make them into dict of lists @@ -160,7 +162,9 @@ def _skl_format_cv_results( ) if return_train_score: _store( - "train_%s" % scorer_name, train_scores[scorer_name], splits=True + "train_%s" % scorer_name, + train_scores[scorer_name], + splits=True, ) return results -- cgit v1.2.3