Commit Graph

13 Commits

Author SHA1 Message Date
Satrajit Ghosh 9254379cf6 fix: added ensemble to setup. 2011-12-05 16:30:28 -05:00
Gael varoquaux 8dfe631489 Merge branch 'master' into tree
Conflicts:
	sklearn/setup.py
2011-10-07 00:30:19 +02:00
Brian Holt c9d142c032 Merge branch 'master' of github.com:scikit-learn/scikit-learn into enh/tree 2011-10-04 13:51:58 +01:00
Robert Layton 430fb43767 Merge remote-tracking branch 'upstream/master' into silhouette
Conflicts:
	doc/modules/clustering.rst
	sklearn/metrics/__init__.py
2011-10-04 10:33:42 +11:00
Robert Layton 1e9402cbc6 Restructured metrics/cluster into a folder with supervised and unsupervised modules 2011-09-30 22:48:01 +10:00
Gael varoquaux 2aaa1fe350 COSMIT 2011-09-24 11:17:38 +02:00
Brian Holt 6182960ac9 Merge branch 'master' of github.com:scikit-learn/scikit-learn into enh/tree 2011-09-21 20:26:40 +01:00
Jake Vanderplas 1583dbbbb4 move neighbors.py -> neighbors 2011-09-06 10:09:35 -07:00
Brian Holt b484aa4432 merged upstream-master into enh/tree 2011-09-03 13:04:27 +01:00
Gael varoquaux 42d6c566fe BUG: sklearn/setup.py : learn -> sklearn
Thanks Robert Layton for catching the bug
2011-09-03 13:01:17 +02:00
Fabian Pedregosa ddf4b72109 Move project directory from scikits.learn to sklearn 2011-09-02 12:06:57 +02:00
Fabian Pedregosa 68f27e3790 Revert "Move project directory from scikits.learn to sklearn"
This reverts commit fd0d3b879d.
2011-09-02 12:03:18 +02:00
Fabian Pedregosa fd0d3b879d Move project directory from scikits.learn to sklearn 2011-09-02 11:38:24 +02:00