Peter Prettenhofer 835af05624 Merge remote branch 'upstream/master' into gradient_boosting ... Conflicts: sklearn/tree/tree.py		2012-03-13 07:16:35 +01:00
..
index.rst	updated documentation: plots for gradient_boosting, new sample generator	2012-03-12 22:19:20 +01:00
labeled_faces.inc	DOCs change extension from txt to inc, add inc as doctest extension to makefile	2012-02-18 17:52:13 +01:00
labeled_faces_fixture.py	DOC: scikits.learn -> sklearn	2011-09-03 09:10:40 +02:00
mldata.inc	DOCs change extension from txt to inc, add inc as doctest extension to makefile	2012-02-18 17:52:13 +01:00
mldata_fixture.py	FIX This should fix the doctests in the datasets dir. They take quite long, I think it's because of the svmlight loaders. So I didn't include them in the standard make target	2011-12-18 19:35:22 +01:00
olivetti_faces.inc	DOCs change extension from txt to inc, add inc as doctest extension to makefile	2012-02-18 17:52:13 +01:00
twenty_newsgroups.inc	DOC: started section on text feature extraction	2012-03-04 18:56:03 +01:00
twenty_newsgroups_fixture.py	FIX: make the dataset doctest fixture modular	2011-06-15 00:55:35 +02:00