Commit Graph

12 Commits

Author SHA1 Message Date
Fabian Pedregosa 2fc4c96a90 Revert "Remove hardcoded n_jobs from examples."
This reverts commit 6887195563.
2011-07-30 07:49:56 +02:00
Fabian Pedregosa 6887195563 Remove hardcoded n_jobs from examples. 2011-07-29 14:49:45 +02:00
Gael varoquaux 795757205c Cosmit 2011-07-15 17:45:57 +02: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 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 1cd924e404 better ward rst doc examples 2011-01-31 22:16:31 -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