From 7e1e9f59cbcf2df9c8f57c09df91ffa11719782b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Baranger?= Date: Thu, 23 Mar 2023 19:12:19 +0100 Subject: [PATCH 1/2] add parameters validation for datasets.make_checkerboard --- sklearn/datasets/_samples_generator.py | 11 +++++++++++ sklearn/tests/test_public_functions.py | 1 + 2 files changed, 12 insertions(+) diff --git a/sklearn/datasets/_samples_generator.py b/sklearn/datasets/_samples_generator.py index 192f8e6759ddb..5c974ea6ce2c1 100644 --- a/sklearn/datasets/_samples_generator.py +++ b/sklearn/datasets/_samples_generator.py @@ -1882,6 +1882,17 @@ def make_biclusters( return result, rows, cols +@validate_params( + { + "shape": [tuple], + "n_clusters": [Interval(Integral, 1, None, closed="left"), "array-like"], + "noise": [Interval(Real, 0, None, closed="left")], + "minval": [Interval(Real, None, None, closed="neither")], + "maxval": [Interval(Real, None, None, closed="neither")], + "shuffle": ["boolean"], + "random_state": ["random_state"], + } +) def make_checkerboard( shape, n_clusters, diff --git a/sklearn/tests/test_public_functions.py b/sklearn/tests/test_public_functions.py index 4b1934c378fbf..0fde457868669 100644 --- a/sklearn/tests/test_public_functions.py +++ b/sklearn/tests/test_public_functions.py @@ -129,6 +129,7 @@ def _check_function_param_validation( "sklearn.datasets.fetch_olivetti_faces", "sklearn.datasets.load_svmlight_file", "sklearn.datasets.load_svmlight_files", + "sklearn.datasets.make_checkerboard", "sklearn.datasets.make_circles", "sklearn.datasets.make_classification", "sklearn.datasets.make_friedman1", From 873f0b3ce65acd2f73da937a6eada813ce0d0957 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Baranger?= Date: Mon, 27 Mar 2023 19:19:04 +0200 Subject: [PATCH 2/2] change minval and maxval type to float in docstring --- sklearn/datasets/_samples_generator.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sklearn/datasets/_samples_generator.py b/sklearn/datasets/_samples_generator.py index 5c974ea6ce2c1..127fb58ef3932 100644 --- a/sklearn/datasets/_samples_generator.py +++ b/sklearn/datasets/_samples_generator.py @@ -1918,10 +1918,10 @@ def make_checkerboard( noise : float, default=0.0 The standard deviation of the gaussian noise. - minval : int, default=10 + minval : float, default=10 Minimum value of a bicluster. - maxval : int, default=100 + maxval : float, default=100 Maximum value of a bicluster. shuffle : bool, default=True