Andreas Mueller
ccfb89b957
FIX Tried to address @stefanv's comments on the PR.
2012-08-03 11:37:11 +01:00
Andreas Mueller
05cc863f3f
First draft for numpy based km_segmentation
2012-08-03 11:37:11 +01:00
Andreas Mueller
d2e226fe59
ENH tests for Felzenszwalbs segmentation, fixed off-by-one error
2012-08-03 11:37:11 +01:00
Andreas Mueller
a7c98cb67a
Remove felzenszwalb_segmentation_gray again since it just complicates the interface.
2012-08-03 11:37:11 +01:00
Andreas Mueller
f0a7212c4f
ENH Rename parameters in quickshift, add "ratio"
2012-08-03 11:37:11 +01:00
Andreas Mueller
08df2a5103
enh: minor simplifications
2012-08-03 11:37:11 +01:00
Andreas Mueller
8fa5427afc
FIX build problem and cython problem resolved.
2012-08-03 11:37:11 +01:00
Andreas Mueller
ce26467ad4
ENH: make quickshift more tolerant to input type, just convert to float. Also keep track of random seed for reproducable tests.
...
Finally, do a unique on the output and add testing.
2012-08-03 11:37:11 +01:00
Andreas Mueller
4d10749a0e
DOC document and export felzenszwalb_segmentation_grey, prettify plots for the web.
2012-08-03 11:37:11 +01:00
Andreas Mueller
9a8cb483c4
misc remove profiling outputs from quickshift
2012-08-03 11:37:11 +01:00
Andreas Mueller
83616f0254
DOC more docs....
2012-08-03 11:37:10 +01:00
Andreas Mueller
80b439bb4a
ENH Polish examples.
2012-08-03 11:37:10 +01:00
Andreas Mueller
07fb8d0c03
ENH felzenszwalb for color images
2012-08-03 11:37:10 +01:00
Andreas Mueller
7a5e7e49ea
ENH reasonable speed for felzenszwalbs's segmentation
2012-08-03 11:37:10 +01:00
Andreas Mueller
0c19899825
enh cythonizing some arrays
2012-08-03 11:37:10 +01:00
Andreas Mueller
461d4be549
forgot a line :-/
2012-08-03 11:37:10 +01:00
Andreas Mueller
888d176034
ENH much faster.
2012-08-03 11:37:10 +01:00
Andreas Mueller
58237a558a
ENH dirty fix, works though. Starting profiling.
2012-08-03 11:37:10 +01:00
Andreas Mueller
cb3dba7847
Bigger example
2012-08-03 11:37:10 +01:00
Andreas Mueller
be4b44bc63
ENH CRAZY speedup
2012-08-03 11:37:10 +01:00
Andreas Mueller
b977d59c1b
Color example :)
2012-08-03 11:37:10 +01:00
Andreas Mueller
48fa3252be
ENH reasonable speed.
2012-08-03 11:37:10 +01:00
Andreas Mueller
de52692a9d
misc Uncomment Felzenszwalb as it is not messing with quickshift.
2012-08-03 11:37:10 +01:00
Andreas Mueller
8c735b6470
ENH start cythonizing quickshift, get rid of hstack.
2012-08-03 11:37:10 +01:00
Andreas Mueller
eb5c2fe5d4
ENH fixed stupid bug in quickshift, example
2012-08-03 11:37:10 +01:00
Andreas Mueller
40ecdd29db
ENH naive pure python implementation of quickshift
2012-08-03 11:37:10 +01:00
Andreas Mueller
b1b1c343b4
MISC remove debugging tracer, unnecessary variable.
2012-08-03 11:37:10 +01:00
Andreas Mueller
e2d60f0135
ENH using union find from morphology module
2012-08-03 11:37:10 +01:00
Andreas Mueller
967eb5b50d
ENH first draft of felzenszwalbs graph based image segmentation in Python
2012-08-03 11:36:42 +01:00
Andreas Mueller
b8c0663332
Add segmentation setup.py for felsenzwalb algorithm
2012-08-03 11:36:42 +01:00
tonysyu
8b544f2f69
Merge pull request #230 from dharhas/dharhas-lab-color-space
...
xyz <--> lab color space conversions
2012-08-01 07:02:38 -07:00
Dharhas Pothina
acde86ffb6
Merge pull request #2 from amueller/dharhas-lab-color-space
...
MISC minor cleanup in doctests / examples
2012-08-01 06:07:09 -07:00
Andreas Mueller
f74ca8685b
MISC minor cleanup in doctests / examples
2012-07-31 22:00:32 +01:00
Dharhas Pothina
b54817c5b3
minor cleanup of comments & move ref_white to global lab_ref_white
2012-07-30 10:07:33 -05:00
Andreas Mueller
3448e419b3
ENH slight cleanup, fixed *1000 bug, added test and rgb2lab convenience.
2012-07-26 22:44:02 +01:00
tonysyu
ab44219f0b
Merge pull request #234 from bdholt1/fix-hog
...
[MRG] Fix broadcasting error (revised PR)
2012-07-24 18:26:56 -07:00
Brian Holt
f3024fc4cd
simplified hog code + extra unit test
2012-07-24 10:52:55 +01:00
tonysyu
71a518c8cf
Merge pull request #226 from jni/jni-alphanumeric-sort
...
Sort files from a global pattern alphanumerically
2012-07-22 21:28:38 -07:00
Dharhas Pothina
8cd912a894
tests added for xyz2lab and lab2xyz
2012-07-21 09:10:05 -05:00
Stefan van der Walt
149ad7e7a6
Merge pull request #219 from wilsaj/remove-nose-message
...
BUG: Remove message about not being able to load nose; fixes #218 .
2012-07-20 23:32:21 -07:00
Juan Nunez-Iglesias
9cbf2ef369
Simplify alphanumeric_key logic
...
Thanks to Tony Yu for the suggestion.
2012-07-21 00:51:55 -05:00
Dharhas Pothina
fedad0d826
fixed array being modified in place. lab2xyz working
2012-07-20 18:45:56 -05:00
tonysyu
d615235f07
Merge pull request #227 from thewtex/thresholding_failures_2
...
BUG: Fix OTSU thresholding tests with matplotlib IO plugin.
2012-07-20 16:37:57 -07:00
Matt McCormick
67eb914ef6
TST: Add buffer for threshold tests.
...
In case conversion from float to integer is imprecise.
2012-07-20 19:09:05 -04:00
Stefan van der Walt
1b89ae8dbf
Merge pull request #228 from thewtex/color_numpy_warnings
...
BUG: Ignore division by zero where appropriate in colorconv.
2012-07-20 16:06:38 -07:00
Stefan van der Walt
37e0ce0fc8
Merge pull request #223 from jni/jni-concatenate-image-collection
...
ENH: Concatenate image collection.
2012-07-20 16:02:04 -07:00
Stefan van der Walt
05185288e6
Merge pull request #225 from lct123/ImageSegTut
...
DOC: Clean up image segmentation tutorial.
2012-07-20 15:54:43 -07:00
Juan Nunez-Iglesias
699b5d9269
Add test coverage for alphabetic sort
...
alphanumeric_key should sort filenames correctly when they differ in
text, not just numbers.
2012-07-20 17:50:04 -05:00
Matt McCormick
4b53c92c14
BUG: Fix OTSU thresholding tests with matplotlib IO plugin.
...
The matplotlib IO returns float arrays from [0, 1], which gives difference
results than a ubyte array. Explicitly convert to a ubyte array in the tests.
2012-07-20 18:49:44 -04:00
Juan Nunez-Iglesias
9006c1dab3
Sort files from a global pattern alphanumerically
...
Users usually expect an alphanumeric sort, not lexicographic sort, on
their filenames. This is now the behaviour of ImageCollection.
2012-07-20 17:38:06 -05:00