Commit Graph

121 Commits

Author SHA1 Message Date
Fabian Pedregosa d36c2acfec scipy.lena() no longer works on scipy's dev version.
Use scipy.misc.lena() instead. This should also work with 0.8.x and
probably others.
2011-09-03 09:12:21 +02:00
Gael varoquaux 4d1dcd2e65 DOC: scikits.learn -> sklearn 2011-09-03 09:10:40 +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
Fabian Pedregosa f8ef06eea0 FIX some broken examples. 2011-09-01 11:20:05 +02:00
Mathieu Blondel 9039d1c29c Better title + authors. 2011-08-30 15:28:50 +09:00
Mathieu Blondel 975027d5e5 64 colors + random codebook comparison. 2011-08-30 15:25:17 +09:00
Mathieu Blondel 4a826cbd5b Use 256 colors and add title. 2011-08-29 20:47:42 +09:00
Mathieu Blondel 9c74fb2b85 More explanations and pep8. 2011-08-29 20:38:07 +09:00
Mathieu Blondel a8ea27a223 More informative name for color quantization example. 2011-08-29 20:11:50 +09:00
Alexandre Gramfort 60b2299021 FIX : in meanshift typos, style, example 2011-08-24 21:32:39 -04:00
Conrad Lee 378ad2268d Merge remote-tracking branch 'upstream/master'
Conflicts:
	scikits/learn/cluster/mean_shift_.py
	scikits/learn/cluster/tests/test_k_means.py
2011-08-24 14:30:45 -05:00
Olivier Grisel c21d8d053f update the documentation 2011-08-24 12:25:46 +02:00
Olivier Grisel 2a548ed131 cosmit 2011-08-24 11:41:52 +02:00
Olivier Grisel 3a1d5e2f8f fix the VQ example by switching to floats in range 0 - 1 2011-08-24 11:35:45 +02:00
Olivier Grisel 47458beb9a checkpointing work in progress on VQ example 2011-08-23 19:33:22 +02:00
Olivier Grisel 9ff1929342 time the main operations 2011-08-23 18:25:26 +02:00
Olivier Grisel c78908a3a3 checkpoint style improvements for the KMeans predict 2011-08-23 16:56:36 +02:00
Olivier Grisel 7a8df01f99 Merge remote-tracking branch 'robertlayton/kmeans_transform2' into robertlayton-kmeans_transform2 2011-08-23 11:51:40 +02:00
Robert Layton 1bc5e576e4 Fixed loader problems 2011-08-23 10:24:31 +10:00
X006 8811af010f Dataset loader moved to datasets.base, but not being installed 2011-08-23 09:30:18 +10:00
Robert Layton 1bc54d43bd VQ example. Not working yet - clusters aren't well formed I think.
Will work on it more tomorrow.
2011-08-21 22:17:26 +10:00
Conrad Lee 83b6af2c62 Brought my branch for mean shift modification up to date with current head on github 2011-08-21 11:37:16 +02:00
Emmanuelle Gouillart a0e0e3a1f3 In spectral clustering example, forced the solver to be arpack
(the amg solver is unstable for this example, and results are not
satisfying)
2011-08-20 18:02:20 +02:00
Conrad Lee 50bb1389ae Mean shift: removed my old test script due to merge with agramfort, changed num points in plot example to ten thousand to speed it up. 2011-08-19 13:59:35 +02:00
Conrad Lee b782f7e2f4 Merged agramfort's branch with my own 2011-08-19 13:45:38 +02:00
Conrad Lee f902930954 Mean shift: settled on term 'bin' and removed unnecessary references to 'bucketing' or 'discretization' from variable names and documentation 2011-08-18 19:03:50 +02:00
Mathieu Blondel 547e65bb2b Fix plot_kmeans_digits.py. 2011-08-12 18:15:46 +09:00
Mathieu Blondel 31bf0b3834 Merge branch 'kmeans_transform2' of https://github.com/robertlayton/scikit-learn into kmeans_transform2
Conflicts:
	scikits/learn/cluster/k_means_.py
	scikits/learn/datasets/twenty_newsgroups.py
2011-08-11 23:09:58 +09:00
Alexandre Gramfort 9f45c2366e ENH: speed up estimate_bandwidth with BallTree + use make_blobs in test_mean_shift.py 2011-08-07 11:02:14 -04:00
Gilles Louppe 36c18578ad Merge remote-tracking branch 'upstream/master' into samples_generator
Resolved conflicts in:
	scikits/learn/datasets/__init__.py
	scikits/learn/datasets/samples_generator.py
2011-08-06 17:01:48 +02:00
Conrad Lee 4b433a9254 Modified file scikits.examples.plot_mean_shift.py: updated reference. 2011-08-06 10:52:06 +02:00
Mathieu Blondel 7ccf836637 Fix DBSCAN example. 2011-08-06 17:11:57 +09:00
Mathieu Blondel f51b65296f Merge branch 'dbscan' of git://github.com/robertlayton/scikit-learn into dbscan
Conflicts:
	scikits/learn/metrics/pairwise.py
2011-08-06 16:13:09 +09:00
Conrad Lee 303a6d4bd2 Hard coded bandwidth to 1.30 because otherwise its calculation is too slow. 2011-08-05 22:58:12 +02:00
Conrad Lee 8310b0814e Changed scikits.learn.cluster.__init__.py and examples/cluster/plot_mean_shift.py: modified so that complies with pep8. 2011-08-05 18:39:03 +02:00
Conrad Lee 24b35fd7ea Changed plot_mean_shift.py example to use larger data set to show how bandwidth estimation dominates the runtime. 2011-08-05 16:32:29 +02:00
Gilles Louppe c595707551 Fixes for broken examples due to changes in samples_generator.py 2011-08-04 15:50:19 +02:00
Robert Layton 3670ea39dd Replace points with samples everywhere 2011-08-03 22:10:30 +10:00
Robert Layton e4ccc3d169 Small changes based on mblondel's comments. Nothing overly noticable 2011-08-03 21:34:32 +10:00
Robert Layton a913997e39 Extra example removed 2011-07-31 15:12:47 +10:00
Fabian Pedregosa 2fc4c96a90 Revert "Remove hardcoded n_jobs from examples."
This reverts commit 6887195563.
2011-07-30 07:49:56 +02:00
Robert Layton 295aa02801 Small changes, mostly to wording 2011-07-30 10:22:57 +10:00
Robert Layton a550d6cbdf Digits example has plot. 2011-07-29 22:56:10 +10:00
Fabian Pedregosa 6887195563 Remove hardcoded n_jobs from examples. 2011-07-29 14:49:45 +02:00
Robert Layton f7ee93fc20 kmeans example renamed 2011-07-29 22:46:52 +10:00
Robert Layton 480a380a0c Multiple small changes 2011-07-29 22:44:48 +10:00
Robert Layton d1c264c8e4 Example now much more likely to return 3 clusters. 2011-07-26 09:53:31 +10:00
Robert Layton cd198c1fd2 American spelling 2011-07-26 09:42:07 +10:00