From 303143e976d2364f6ba7b27ac1b8697f81b06559 Mon Sep 17 00:00:00 2001 From: Jessica Xu Date: Sun, 9 Apr 2023 23:50:02 -0400 Subject: [PATCH 1/3] parameter validation add --- sklearn/metrics/cluster/_supervised.py | 7 +++++++ sklearn/tests/test_public_functions.py | 1 + 2 files changed, 8 insertions(+) diff --git a/sklearn/metrics/cluster/_supervised.py b/sklearn/metrics/cluster/_supervised.py index c3c378f36f666..63a20f28ff082 100644 --- a/sklearn/metrics/cluster/_supervised.py +++ b/sklearn/metrics/cluster/_supervised.py @@ -427,6 +427,13 @@ def adjusted_rand_score(labels_true, labels_pred): return 2.0 * (tp * tn - fn * fp) / ((tp + fn) * (fn + tn) + (tp + fp) * (fp + tn)) +@validate_params( + { + "labels_true": ["array-like"], + "labels_pred": ["array-like"], + "beta": [Interval(Real, None, None, closed="neither")], + } +) def homogeneity_completeness_v_measure(labels_true, labels_pred, *, beta=1.0): """Compute the homogeneity and completeness and V-Measure scores at once. diff --git a/sklearn/tests/test_public_functions.py b/sklearn/tests/test_public_functions.py index a4a9dbd9db739..d903df4f0ee95 100644 --- a/sklearn/tests/test_public_functions.py +++ b/sklearn/tests/test_public_functions.py @@ -188,6 +188,7 @@ def _check_function_param_validation( "sklearn.metrics.get_scorer", "sklearn.metrics.hamming_loss", "sklearn.metrics.hinge_loss", + "sklearn.metrics.homogeneity_completeness_v_measure", "sklearn.metrics.jaccard_score", "sklearn.metrics.label_ranking_average_precision_score", "sklearn.metrics.label_ranking_loss", From 760fab5ce53e47b1fda2dc9bf4c387f5b3cb3692 Mon Sep 17 00:00:00 2001 From: Jessica Xu Date: Sun, 9 Apr 2023 23:57:09 -0400 Subject: [PATCH 2/3] change the test_public_functions --- sklearn/tests/test_public_functions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sklearn/tests/test_public_functions.py b/sklearn/tests/test_public_functions.py index d903df4f0ee95..631daca3c7ceb 100644 --- a/sklearn/tests/test_public_functions.py +++ b/sklearn/tests/test_public_functions.py @@ -171,6 +171,7 @@ def _check_function_param_validation( "sklearn.metrics.cluster.adjusted_mutual_info_score", "sklearn.metrics.cluster.contingency_matrix", "sklearn.metrics.cluster.fowlkes_mallows_score", + "sklearn.metrics.cluster.homogeneity_completeness_v_measure", "sklearn.metrics.cluster.normalized_mutual_info_score", "sklearn.metrics.cluster.silhouette_samples", "sklearn.metrics.cluster.silhouette_score", @@ -188,7 +189,6 @@ def _check_function_param_validation( "sklearn.metrics.get_scorer", "sklearn.metrics.hamming_loss", "sklearn.metrics.hinge_loss", - "sklearn.metrics.homogeneity_completeness_v_measure", "sklearn.metrics.jaccard_score", "sklearn.metrics.label_ranking_average_precision_score", "sklearn.metrics.label_ranking_loss", From 087039c2b487b9883176685c8a8cd2204997c897 Mon Sep 17 00:00:00 2001 From: Jessicakk0711 <106110789+Jessicakk0711@users.noreply.github.com> Date: Wed, 12 Apr 2023 09:33:28 -0400 Subject: [PATCH 3/3] Update sklearn/metrics/cluster/_supervised.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jérémie du Boisberranger <34657725+jeremiedbb@users.noreply.github.com> --- sklearn/metrics/cluster/_supervised.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sklearn/metrics/cluster/_supervised.py b/sklearn/metrics/cluster/_supervised.py index 63a20f28ff082..d9b19cf3f83af 100644 --- a/sklearn/metrics/cluster/_supervised.py +++ b/sklearn/metrics/cluster/_supervised.py @@ -431,7 +431,7 @@ def adjusted_rand_score(labels_true, labels_pred): { "labels_true": ["array-like"], "labels_pred": ["array-like"], - "beta": [Interval(Real, None, None, closed="neither")], + "beta": [Interval(Real, 0, None, closed="left")], } ) def homogeneity_completeness_v_measure(labels_true, labels_pred, *, beta=1.0):