Commit Graph

25 Commits

Author SHA1 Message Date
Alexandre Gramfort 632364c3ba cosmits with trailing spaces 2011-04-01 12:36:49 -04:00
bthirion 3c9113d0b2 always use scikits ward algo when no structure is provided 2011-04-01 12:18:29 +02:00
GaelVaroquaux 7d6b8b1dad BUG: fix grid_to_graph 2011-03-03 13:59:22 +01:00
Alexandre Gramfort a3bc7eafcf ENH : factorizing img_to_graph and grid_to_graph
there was no bug before but an obscure img_to_graph(mask, mask)
that is now replaced by grid_to_graph (makes a connectivity structure
for a grid of pixels/voxels)
2011-02-28 10:58:00 -05:00
Alexandre Gramfort 5c9df2cefc FIX: ugly bug in connectivity on grids and images 2011-02-25 15:37:41 -05:00
Alexandre Gramfort 8c6ece869b fix remaining n_comp 2011-02-24 16:59:49 -05:00
Alexandre Gramfort c5aa155621 Merge branch 'hcluster' into hcluster2 that matches master
- pipeline and GridSearchCV have been cleaned
- feat agglo inherits from TransformerMixin
- s / n_comp / n_components in hierarchical.py

Conflicts:
	scikits/learn/feature_selection/univariate_selection.py
	scikits/learn/pipeline.py
	scikits/learn/tests/test_pipeline.py
2011-02-21 21:28:34 -05:00
Alexandre Gramfort abd9a193c7 moving swiss_roll generator in samples generator
better 3D axes orientation for viz
2011-02-01 22:29:50 -05:00
Alexandre Gramfort 1cd924e404 better ward rst doc examples 2011-01-31 22:16:31 -05:00
Alexandre Gramfort f7eacfded0 remaining s/k/n_clusters 2011-01-25 13:16:14 -05:00
Alexandre Gramfort de06c23ba7 in hierarchical : s/adjacency_matrix/connectivity, s/k/n_clusters 2011-01-25 13:06:06 -05:00
Alexandre Gramfort 704ed7e83f ENH : improving ward for better joblib caching 2011-01-25 11:39:59 -05:00
Gael varoquaux e49cd50020 ENH: Reorganise the feature agglomeration 2011-01-23 11:36:07 +01:00
Alexandre Gramfort 5edd39ff7d first attempt to use caching in gridsearch with hierarchical clustering... WIP 2011-01-22 22:25:38 -05:00
Alexandre Gramfort 1ff5724cc8 ENH : refactoring Ward feature agglomeration to make it work with Pipeline 2011-01-22 17:37:20 -05:00
Vincent M 34cdc333e4 Add documentation on hierachical clustering.
Update examples + add example (plot_lena_feature_agglomeration)
Delete folder feature agglomeration and add it to cluster.
Changes in feature_agglomeration and hierarchical.
Add mixin structure to kmeans
2011-01-09 17:31:17 +01:00
Alexandre Gramfort 5f53629f90 reviewing hierarchical clustering code 2011-01-02 11:44:25 -05:00
Vincent Michel 9ab9d49e47 Add ward algorithm + feature agglomeration 2011-01-02 10:45:16 -05:00
Olivier Grisel d7609b38a7 consistently rename n_comp to n_components 2010-12-10 20:04:51 +01:00
Olivier Grisel 9d5e16b666 trailing spaces holocaust 2010-11-06 15:42:55 +01:00
Olivier Grisel 76f5b546cf New example to demonstrate the KMeans API with various init strategies 2010-11-04 01:47:18 +01:00
Alexandre Gramfort ec1514ac19 ENH : more love in examples (adding print __doc__ + some brief descriptions in headers + fixing Anova SVC Pipeline example) 2010-11-02 11:38:06 +01:00
Fabian Pedregosa 48af36792a FIX: fix imports in example for renamed modules. 2010-10-05 14:32:47 +02:00
Gael Varoquaux b32a9682d0 MISC: Cosmit based on comments from Olivier and Alex 2010-08-27 14:12:58 +02:00
Gael varoquaux 68ca67ef4f API: Change 'clustering' to 'cluster' 2010-08-27 09:29:29 +02:00