Skip to content

Commit 1601b27

Browse files
committed
Merge pull request scikit-learn#983 from GaelVaroquaux/faster_ward
MRG: Faster ward
2 parents f01907d + 6c4ca28 commit 1601b27

File tree

6 files changed

+704
-192
lines changed

6 files changed

+704
-192
lines changed

doc/tutorial/statistical_inference/unsupervised_learning.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ transposed data.
214214
>>> agglo = cluster.WardAgglomeration(connectivity=connectivity,
215215
... n_clusters=32)
216216
>>> agglo.fit(X) # doctest: +ELLIPSIS
217-
WardAgglomeration(connectivity=...
217+
WardAgglomeration(compute_full_tree='auto',...
218218
>>> X_reduced = agglo.transform(X)
219219

220220
>>> X_approx = agglo.inverse_transform(X_reduced)

doc/whats_new.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ Changelog
4040

4141
- A common testing framework for all estimators was added.
4242

43+
- Speedups in hierarchical clustering by `Gael Varoquaux`_. In
44+
particular building the tree now supports early stopping. This is
45+
useful when the number of clusters is not small compared to the
46+
number of samples.
47+
4348
API changes summary
4449
-------------------
4550

@@ -62,6 +67,10 @@ API changes summary
6267
- All ``Base`` classes are now abstract meta classes so that they can not be
6368
instantiated.
6469

70+
- :func:`cluster.ward_tree` now also returns the parent array. This is
71+
necessary for early-stopping in which case the tree is not
72+
completely built.
73+
6574
.. _changes_0_11:
6675

6776
0.11

0 commit comments

Comments
 (0)