Skip to content

[MRG + 1] squash commits together for #4507#4531

Merged
amueller merged 2 commits intoscikit-learn:masterfrom
zhaipro:fix
Apr 8, 2015
Merged

[MRG + 1] squash commits together for #4507#4531
amueller merged 2 commits intoscikit-learn:masterfrom
zhaipro:fix

Conversation

@zhaipro
Copy link
Copy Markdown

@zhaipro zhaipro commented Apr 6, 2015

No description provided.

zhai_pro added 2 commits April 7, 2015 01:29
bad case:
X = np.asfortranarray([[0, 0], [0, 1], [0, 1]])
labels = np.array([0, 1, 1])
km = KMeans(n_init=1, init=centers, precompute_distances=False)
km.fit(X)
print km.cluster_centers_
print km.labels_
print km.n_iter_
@amueller
Copy link
Copy Markdown
Member

amueller commented Apr 6, 2015

You can push into the same PR, you don't need to create a new one.

@amueller
Copy link
Copy Markdown
Member

amueller commented Apr 6, 2015

👍 for merge. @ogrisel ?

@amueller amueller changed the title squash commits together for #4507 [MRG + 1] squash commits together for #4507 Apr 6, 2015
@amueller amueller changed the title [MRG + 1] squash commits together for #4507 [MRG] squash commits together for #4507 Apr 6, 2015
@amueller amueller changed the title [MRG] squash commits together for #4507 [MRG + 1] squash commits together for #4507 Apr 6, 2015
@ogrisel
Copy link
Copy Markdown
Member

ogrisel commented Apr 7, 2015

+1 as well. We need a what's new entry in a for a new 0.16.1 section and a backport to 0.16.X once merge to master.

amueller added a commit that referenced this pull request Apr 8, 2015
[MRG + 1] squash commits together for #4507
@amueller amueller merged commit 46aacd3 into scikit-learn:master Apr 8, 2015
@zhaipro zhaipro deleted the fix branch April 13, 2015 07:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants