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

[MRG] FIX n_iter attribute for KMeans, algorithm=elkan #11353

Merged
merged 6 commits into from Jul 2, 2018

Conversation

Projects
None yet
4 participants
@jeremiedbb
Contributor

jeremiedbb commented Jun 25, 2018

This is a fix for #11340
added n_iter attribut to KMeans docstring, and fixed returned value of n_iter when algorithm=elkan.

@jeremiedbb jeremiedbb changed the title from FIX n_iter attribute for KMeans, algorithm=elkan to [MRG] FIX n_iter attribute for KMeans, algorithm=elkan Jun 25, 2018

@jnothman

Please add a non-regression test.

@amueller is this the right fix?

@amueller

This comment has been minimized.

Show comment
Hide comment
@amueller

amueller Jun 29, 2018

Member

lgtm. Actually kmeans has the +1 in the end, looks like I forgot it.

Member

amueller commented Jun 29, 2018

lgtm. Actually kmeans has the +1 in the end, looks like I forgot it.

@glemaitre

This comment has been minimized.

Show comment
Hide comment
@glemaitre

glemaitre Jun 29, 2018

Contributor

@jeremiedbb You are only missing an entry in the what's new.

Contributor

glemaitre commented Jun 29, 2018

@jeremiedbb You are only missing an entry in the what's new.

Show outdated Hide outdated doc/whats_new/v0.20.rst Outdated
Show outdated Hide outdated doc/whats_new/v0.20.rst Outdated

jeremiedbb added some commits Jul 2, 2018

Show outdated Hide outdated doc/whats_new/v0.20.rst Outdated

@jnothman jnothman merged commit dc7a685 into scikit-learn:master Jul 2, 2018

3 of 6 checks passed

LGTM analysis: Python Running analyses for revisions
Details
continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
ci/circleci: deploy Your tests passed on CircleCI!
Details
ci/circleci: python2 Your tests passed on CircleCI!
Details
ci/circleci: python3 Your tests passed on CircleCI!
Details
@jnothman

This comment has been minimized.

Show comment
Hide comment
@jnothman

jnothman Jul 2, 2018

Member

Thanks

Member

jnothman commented Jul 2, 2018

Thanks

@jeremiedbb jeremiedbb deleted the jeremiedbb:fix-kmeans-elkan-iter branch Jul 12, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment