From 69dc2198ac3192f97eec64730c119cc657169dc5 Mon Sep 17 00:00:00 2001 From: Andreas Mueller Date: Tue, 13 Dec 2016 10:59:24 -0500 Subject: [PATCH 1/4] fix test for new default of SVC decision function --- sklearn/utils/estimator_checks.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sklearn/utils/estimator_checks.py b/sklearn/utils/estimator_checks.py index b5384900b4793..d11829992f376 100644 --- a/sklearn/utils/estimator_checks.py +++ b/sklearn/utils/estimator_checks.py @@ -1045,9 +1045,7 @@ def check_classifiers_train(name, Classifier): assert_equal(decision.shape, (n_samples,)) dec_pred = (decision.ravel() > 0).astype(np.int) assert_array_equal(dec_pred, y_pred) - if (n_classes is 3 - and not isinstance(classifier, BaseLibSVM)): - # 1on1 of LibSVM works differently + if n_classes is 3: assert_equal(decision.shape, (n_samples, n_classes)) assert_array_equal(np.argmax(decision, axis=1), y_pred) From aef6693f9374d89ef43fb22cb57d95f39f694157 Mon Sep 17 00:00:00 2001 From: Alexandre Gramfort Date: Thu, 8 Jun 2017 13:00:33 +0200 Subject: [PATCH 2/4] Create estimator_checks.py --- sklearn/utils/estimator_checks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sklearn/utils/estimator_checks.py b/sklearn/utils/estimator_checks.py index ea3820ab2d236..aceeaf61a9791 100644 --- a/sklearn/utils/estimator_checks.py +++ b/sklearn/utils/estimator_checks.py @@ -1113,7 +1113,7 @@ def check_classifiers_train(name, Classifier): assert_equal(decision.shape, (n_samples,)) dec_pred = (decision.ravel() > 0).astype(np.int) assert_array_equal(dec_pred, y_pred) - if n_classes is 3: + if n_classes == 3: assert_equal(decision.shape, (n_samples, n_classes)) assert_array_equal(np.argmax(decision, axis=1), y_pred) From aa9e7a4242b4f9d06bfd5a12c79586b3ac2816e7 Mon Sep 17 00:00:00 2001 From: Alexandre Gramfort Date: Thu, 8 Jun 2017 13:01:18 +0200 Subject: [PATCH 3/4] Create estimator_checks.py --- sklearn/utils/estimator_checks.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sklearn/utils/estimator_checks.py b/sklearn/utils/estimator_checks.py index aceeaf61a9791..5102bb72ed604 100644 --- a/sklearn/utils/estimator_checks.py +++ b/sklearn/utils/estimator_checks.py @@ -80,7 +80,8 @@ def _yield_non_meta_checks(name, Estimator): yield check_estimators_empty_data_messages if name not in CROSS_DECOMPOSITION + ['SpectralEmbedding']: - # SpectralEmbedding is non-deterministic, + # SpectralEmbedding + non-deterministic, # see issue #4236 # cross-decomposition's "transform" returns X and Y yield check_pipeline_consistency @@ -1109,7 +1110,7 @@ def check_classifiers_train(name, Classifier): try: # decision_function agrees with predict decision = classifier.decision_function(X) - if n_classes is 2: + if n_classes == 2: assert_equal(decision.shape, (n_samples,)) dec_pred = (decision.ravel() > 0).astype(np.int) assert_array_equal(dec_pred, y_pred) From 4152b211a7a77149d8dac99819b722b0907e5571 Mon Sep 17 00:00:00 2001 From: Alexandre Gramfort Date: Thu, 8 Jun 2017 13:02:10 +0200 Subject: [PATCH 4/4] Create estimator_checks.py --- sklearn/utils/estimator_checks.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sklearn/utils/estimator_checks.py b/sklearn/utils/estimator_checks.py index 5102bb72ed604..1d400eb6ce3a8 100644 --- a/sklearn/utils/estimator_checks.py +++ b/sklearn/utils/estimator_checks.py @@ -80,8 +80,7 @@ def _yield_non_meta_checks(name, Estimator): yield check_estimators_empty_data_messages if name not in CROSS_DECOMPOSITION + ['SpectralEmbedding']: - # SpectralEmbedding - non-deterministic, + # SpectralEmbedding non-deterministic, # see issue #4236 # cross-decomposition's "transform" returns X and Y yield check_pipeline_consistency