From 51ed0d2bca7a11591112a7cbca8b98343038df95 Mon Sep 17 00:00:00 2001 From: Gustavo Date: Thu, 31 Mar 2022 11:44:39 -0300 Subject: [PATCH 1/4] laplacian_kernel docstring correction on issue #21350 --- sklearn/metrics/pairwise.py | 6 ++++-- sklearn/tests/test_docstrings.py | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sklearn/metrics/pairwise.py b/sklearn/metrics/pairwise.py index f819079aa789e..175390749e047 100644 --- a/sklearn/metrics/pairwise.py +++ b/sklearn/metrics/pairwise.py @@ -1288,7 +1288,8 @@ def laplacian_kernel(X, Y=None, gamma=None): Parameters ---------- - X : ndarray of shape (n_samples_X, n_features) + X : ndarray + A ndarray of shape (n_samples_X, n_features). Y : ndarray of shape (n_samples_Y, n_features), default=None If `None`, uses `Y=X`. @@ -1298,7 +1299,8 @@ def laplacian_kernel(X, Y=None, gamma=None): Returns ------- - kernel_matrix : ndarray of shape (n_samples_X, n_samples_Y) + kernel_matrix : ndarray + A ndarray ndarray of shape (n_samples_X, n_samples_Y). """ X, Y = check_pairwise_arrays(X, Y) if gamma is None: diff --git a/sklearn/tests/test_docstrings.py b/sklearn/tests/test_docstrings.py index e4cb10429c4d2..f469976f80556 100644 --- a/sklearn/tests/test_docstrings.py +++ b/sklearn/tests/test_docstrings.py @@ -78,7 +78,6 @@ "sklearn.metrics.pairwise.distance_metrics", "sklearn.metrics.pairwise.haversine_distances", "sklearn.metrics.pairwise.kernel_metrics", - "sklearn.metrics.pairwise.laplacian_kernel", "sklearn.metrics.pairwise.paired_manhattan_distances", "sklearn.metrics.pairwise.pairwise_distances_argmin", "sklearn.metrics.pairwise.pairwise_distances_argmin_min", From ed4186ca455b53e99a20024ad091002feed89287 Mon Sep 17 00:00:00 2001 From: Gustavo Oliveira Date: Fri, 1 Apr 2022 08:42:28 -0300 Subject: [PATCH 2/4] Update sklearn/metrics/pairwise.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adding sugestiong by jeremiedbb Co-authored-by: Jérémie du Boisberranger <34657725+jeremiedbb@users.noreply.github.com> --- sklearn/metrics/pairwise.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sklearn/metrics/pairwise.py b/sklearn/metrics/pairwise.py index 175390749e047..8da3e4a6a59bf 100644 --- a/sklearn/metrics/pairwise.py +++ b/sklearn/metrics/pairwise.py @@ -1288,8 +1288,8 @@ def laplacian_kernel(X, Y=None, gamma=None): Parameters ---------- - X : ndarray - A ndarray of shape (n_samples_X, n_features). + X : ndarray of shape (n_samples_X, n_features) + A feature array. Y : ndarray of shape (n_samples_Y, n_features), default=None If `None`, uses `Y=X`. From 93d328119a614d86361ee1ce5cff52be8c26fcbe Mon Sep 17 00:00:00 2001 From: Gustavo Oliveira Date: Fri, 1 Apr 2022 08:42:55 -0300 Subject: [PATCH 3/4] Update sklearn/metrics/pairwise.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adding sugestiong by jeremiedbb Co-authored-by: Jérémie du Boisberranger <34657725+jeremiedbb@users.noreply.github.com> --- sklearn/metrics/pairwise.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sklearn/metrics/pairwise.py b/sklearn/metrics/pairwise.py index 8da3e4a6a59bf..16b855a05d917 100644 --- a/sklearn/metrics/pairwise.py +++ b/sklearn/metrics/pairwise.py @@ -1299,8 +1299,8 @@ def laplacian_kernel(X, Y=None, gamma=None): Returns ------- - kernel_matrix : ndarray - A ndarray ndarray of shape (n_samples_X, n_samples_Y). + kernel_matrix : ndarray of shape (n_samples_X, n_samples_Y) + The kernel matrix. """ X, Y = check_pairwise_arrays(X, Y) if gamma is None: From 09cd24ab43b9626cd218c3fab8fc556dfe359170 Mon Sep 17 00:00:00 2001 From: Gustavo Oliveira Date: Fri, 1 Apr 2022 09:02:53 -0300 Subject: [PATCH 4/4] Update sklearn/metrics/pairwise.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/pairwise.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sklearn/metrics/pairwise.py b/sklearn/metrics/pairwise.py index 16b855a05d917..dd5c4564b0b54 100644 --- a/sklearn/metrics/pairwise.py +++ b/sklearn/metrics/pairwise.py @@ -1292,7 +1292,7 @@ def laplacian_kernel(X, Y=None, gamma=None): A feature array. Y : ndarray of shape (n_samples_Y, n_features), default=None - If `None`, uses `Y=X`. + An optional second feature array. If `None`, uses `Y=X`. gamma : float, default=None If None, defaults to 1.0 / n_features.