Skip to content

Loosened to dist <= stop_thresh to converge in on 1D constant data #28951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
May 17, 2024
Merged

Loosened to dist <= stop_thresh to converge in on 1D constant data #28951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
797157e
Loosened to `dist <= stop_thresh` to converge in on 1D constant data …
akikuno May 5, 2024
2baa163
Linted using black
akikuno May 5, 2024
1495676
Add changelog of `MeanShift` enhancement #28951
akikuno May 6, 2024
20caeda
Add tests for `MeanShift` to ensure convergence with constant data.
akikuno May 6, 2024
6ed39ae
Update sklearn/cluster/tests/test_mean_shift.py
akikuno May 6, 2024
33892d3
Update sklearn/cluster/tests/test_mean_shift.py
akikuno May 6, 2024
28990a1
Merge branch 'main' into feature/meanshift-stop_thresh
akikuno May 7, 2024
edb19ee
Remove the 2d case to test the convergence of constant data
akikuno May 9, 2024
fb9dd4a
Apply the suggested change from @jeremiedbb
akikuno May 9, 2024
1ecc1f3
Move the changelog to the `sklearn.cluster` section
akikuno May 9, 2024
c82828e
Merge branch 'main' into feature/meanshift-stop_thresh
akikuno May 9, 2024
d8e3889
Merge branch 'main' into feature/meanshift-stop_thresh
akikuno May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions doc/whats_new/v1.5.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,9 @@ Changelog
:mod:`sklearn.cluster`
......................

- |Fix| The :class:`cluster.MeanShift` class now properly converges for constant data.
:pr:`28951` by :user:`Akihiro Kuno <akikuno>`.

- |FIX| Create copy of precomputed sparse matrix within the `fit` method of
:class:`~cluster.OPTICS` to avoid in-place modification of the sparse matrix.
:pr:`28491` by :user:`Thanh Lam Dang <lamdang2k>`.
Expand Down
2 changes: 1 addition & 1 deletion sklearn/cluster/_mean_shift.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def _mean_shift_single_seed(my_mean, X, nbrs, max_iter):
my_mean = np.mean(points_within, axis=0)
# If converged or at max_iter, adds the cluster
if (
np.linalg.norm(my_mean - my_old_mean) < stop_thresh
np.linalg.norm(my_mean - my_old_mean) <= stop_thresh
or completed_iterations == max_iter
):
break
Expand Down
9 changes: 9 additions & 0 deletions sklearn/cluster/tests/test_mean_shift.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@
)


def test_convergence_of_1d_constant_data():
# Test convergence using 1D constant data
# Non-regression test for:
# https://github.com/scikit-learn/scikit-learn/issues/28926
model = MeanShift()
n_iter = model.fit(np.ones(10).reshape(-1, 1)).n_iter_
assert n_iter < model.max_iter


def test_estimate_bandwidth():
# Test estimate_bandwidth
bandwidth = estimate_bandwidth(X, n_samples=200)
Expand Down
Loading