Skip to content
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.

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

FIX add max_iter, and func uses class #15120

Merged
merged 3 commits into from Oct 4, 2019
Merged

Conversation

@adrinjalali
Copy link
Member

adrinjalali commented Oct 2, 2019

Fixes #14995.

mean_shift uses MeanShift, and MeanShift has a max_iter now.

@adrinjalali adrinjalali requested a review from NicolasHug Oct 2, 2019
Copy link
Contributor

NicolasHug left a comment

Looks like you need to set a n_iter_ attribute now, but LGTM

Thanks Adrin

@adrinjalali

This comment has been minimized.

Copy link
Member Author

adrinjalali commented Oct 2, 2019

haha, I love our tests.

Copy link
Contributor

NicolasHug left a comment

LGTM if all goes green

@adrinjalali adrinjalali changed the title FIX add max_iter, and func uses class [MRG] FIX add max_iter, and func uses class Oct 2, 2019
sklearn/cluster/tests/test_mean_shift.py Show resolved Hide resolved
sklearn/cluster/mean_shift_.py Outdated Show resolved Hide resolved
sklearn/cluster/mean_shift_.py Outdated Show resolved Hide resolved
@adrinjalali

This comment has been minimized.

Copy link
Member Author

adrinjalali commented Oct 4, 2019

Thanks @thomasjpfan, all green.

@rth
rth approved these changes Oct 4, 2019
Copy link
Member

rth left a comment

LGTM. Thanks @adrinjalali !

@rth rth changed the title [MRG] FIX add max_iter, and func uses class FIX add max_iter, and func uses class Oct 4, 2019
@rth rth merged commit ac72a48 into scikit-learn:master Oct 4, 2019
19 checks passed
19 checks passed
LGTM analysis: C/C++ No code changes detected
Details
LGTM analysis: JavaScript No code changes detected
Details
LGTM analysis: Python No new or fixed alerts
Details
ci/circleci: deploy Your tests passed on CircleCI!
Details
ci/circleci: doc Your tests passed on CircleCI!
Details
ci/circleci: doc artifact Link to 0/doc/_changed.html
Details
ci/circleci: doc-min-dependencies Your tests passed on CircleCI!
Details
ci/circleci: lint Your tests passed on CircleCI!
Details
codecov/patch 98.07% of diff hit (target 96.77%)
Details
codecov/project Absolute coverage decreased by -0.03% but relative coverage increased by +1.3% compared to 7cb5daf
Details
scikit-learn.scikit-learn Build #20191004.2 succeeded
Details
scikit-learn.scikit-learn (Linux py35_conda_openblas) Linux py35_conda_openblas succeeded
Details
scikit-learn.scikit-learn (Linux py35_ubuntu_atlas) Linux py35_ubuntu_atlas succeeded
Details
scikit-learn.scikit-learn (Linux pylatest_conda_mkl) Linux pylatest_conda_mkl succeeded
Details
scikit-learn.scikit-learn (Linux pylatest_pip_openblas_pandas) Linux pylatest_pip_openblas_pandas succeeded
Details
scikit-learn.scikit-learn (Linux32 py35_ubuntu_atlas_32bit) Linux32 py35_ubuntu_atlas_32bit succeeded
Details
scikit-learn.scikit-learn (Windows py35_pip_openblas_32bit) Windows py35_pip_openblas_32bit succeeded
Details
scikit-learn.scikit-learn (Windows py37_conda_mkl) Windows py37_conda_mkl succeeded
Details
scikit-learn.scikit-learn (macOS pylatest_conda_mkl) macOS pylatest_conda_mkl succeeded
Details
@NicolasHug

This comment has been minimized.

Copy link
Contributor

NicolasHug commented Oct 4, 2019

Sorry didn't check before.. we can't change the commit message right? it doesn't mention mean_shift...

@rth

This comment has been minimized.

Copy link
Member

rth commented Oct 4, 2019

I should have checked. No we can't short of rewriting history. Anyway commit message is not that critical history on that file and git blame would still work...

@adrinjalali adrinjalali deleted the adrinjalali:mnt/meanshift branch Oct 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.