Commit Graph

4 Commits

Author SHA1 Message Date
Alexandre Gramfort f10929e9a8 pep8 2011-05-16 21:52:06 -04:00
GaelVaroquaux 0c51a34242 Cosmit 2011-02-23 10:11:41 +01: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
Gael varoquaux e49cd50020 ENH: Reorganise the feature agglomeration 2011-01-23 11:36:07 +01:00