From 6a54b60d00e2df4cf4e968bcdd8529005b893f2a Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Sat, 3 Dec 2022 11:54:57 +0100 Subject: [PATCH 1/5] MAINT fix import in test docstring parameter --- imblearn/tests/test_docstring_parameters.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/imblearn/tests/test_docstring_parameters.py b/imblearn/tests/test_docstring_parameters.py index acc06c8b2..c408bb468 100644 --- a/imblearn/tests/test_docstring_parameters.py +++ b/imblearn/tests/test_docstring_parameters.py @@ -17,7 +17,14 @@ from sklearn.utils._testing import _get_func_name from sklearn.utils._testing import ignore_warnings from sklearn.utils.estimator_checks import _enforce_estimator_tags_y -from sklearn.utils.estimator_checks import _enforce_estimator_tags_x + +try: + from sklearn.utils.estimator_checks import _enforce_estimator_tags_x +except ImportError: + # scikit-learn >= 1.2 + from sklearn.utils.estimator_checks import ( + _enforce_estimator_tags_y as _enforce_estimator_tags_x, + ) from sklearn.utils.estimator_checks import _construct_instance from sklearn.utils.deprecation import _is_deprecated From c8e3cfef39deb122ee8909ac72fd5a89851badc5 Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Sat, 3 Dec 2022 11:56:00 +0100 Subject: [PATCH 2/5] MAINT fix import in test docstring parameter --- imblearn/tests/test_docstring_parameters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/imblearn/tests/test_docstring_parameters.py b/imblearn/tests/test_docstring_parameters.py index c408bb468..98ee59f60 100644 --- a/imblearn/tests/test_docstring_parameters.py +++ b/imblearn/tests/test_docstring_parameters.py @@ -23,7 +23,7 @@ except ImportError: # scikit-learn >= 1.2 from sklearn.utils.estimator_checks import ( - _enforce_estimator_tags_y as _enforce_estimator_tags_x, + _enforce_estimator_tags_X as _enforce_estimator_tags_x, ) from sklearn.utils.estimator_checks import _construct_instance from sklearn.utils.deprecation import _is_deprecated From a8380ad12e7f6f6113005249fec85cffd4b7555f Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Sat, 3 Dec 2022 12:04:21 +0100 Subject: [PATCH 3/5] MAINT fix import in test docstring parameter --- imblearn/tests/test_docstring_parameters.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/imblearn/tests/test_docstring_parameters.py b/imblearn/tests/test_docstring_parameters.py index 98ee59f60..2636b4070 100644 --- a/imblearn/tests/test_docstring_parameters.py +++ b/imblearn/tests/test_docstring_parameters.py @@ -30,6 +30,7 @@ import imblearn from imblearn.base import is_sampler +from imblearn.utils.estimator_checks import _set_checking_parameters from imblearn.utils.testing import all_estimators @@ -190,6 +191,7 @@ def test_fit_docstring_attributes(name, Estimator): est = _construct_compose_pipeline_instance(Estimator) else: est = _construct_instance(Estimator) + _set_checking_parameters(est) X, y = make_classification( n_samples=20, From 04c39912404106ac055d20d71e4804e59591cce5 Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Sat, 3 Dec 2022 12:06:05 +0100 Subject: [PATCH 4/5] avoid warning --- imblearn/utils/estimator_checks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/imblearn/utils/estimator_checks.py b/imblearn/utils/estimator_checks.py index 086de2e74..532d227a9 100644 --- a/imblearn/utils/estimator_checks.py +++ b/imblearn/utils/estimator_checks.py @@ -45,7 +45,7 @@ def _set_checking_parameters(estimator): if name == "ClusterCentroids": estimator.set_params( voting="soft", - estimator=KMeans(random_state=0, algorithm="full", n_init=1), + estimator=KMeans(random_state=0, algorithm="lloyd", n_init=1), ) if name == "KMeansSMOTE": estimator.set_params(kmeans_estimator=12) From ce018f22ed132bf9b89fceb29c312201094855bd Mon Sep 17 00:00:00 2001 From: Guillaume Lemaitre Date: Sat, 3 Dec 2022 13:09:28 +0100 Subject: [PATCH 5/5] iter --- imblearn/metrics/pairwise.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/imblearn/metrics/pairwise.py b/imblearn/metrics/pairwise.py index 46bf52df1..2fa784fa2 100644 --- a/imblearn/metrics/pairwise.py +++ b/imblearn/metrics/pairwise.py @@ -205,3 +205,8 @@ def pairwise(self, X, Y=None): distance_matrix(proba_feature_X, proba_feature_Y, p=self.k) ** self.r ) return distance + + def _more_tags(self): + return { + "requires_positive_X": True, # X should be encoded with OrdinalEncoder + }