Commit Graph

270 Commits

Author SHA1 Message Date
Emmanuelle Gouillart 0644026250 Fixed two tests that were failing because of draw imports 2012-08-27 12:04:30 +02:00
Tony S Yu 7d8bc48378 ENH: Change assert statement for better error output 2012-08-26 16:36:28 -04:00
Tony S Yu 8084faf1f6 BUG: Fix division error for Python 3 2012-08-26 16:33:25 -04:00
Tony S Yu 69207c003b BUG: fix import of rank_order 2012-08-25 14:06:20 -04:00
Tony S Yu e350db23a2 Change reconstruction to support Cython 0.15.
This removes use of Cython's typed memoryviews.

This reverts commit b5d9106966: "ENH: Use Cython data types instead of Numpy dtypes."

Conflicts:

	skimage/morphology/_greyreconstruct.pyx
2012-08-25 14:04:48 -04:00
Stefan van der Walt ce423e169e Merge pull request #257 from ahojnnes/shared
ENH: Add shared package.
2012-08-25 10:35:29 -07:00
Stefan van der Walt 544fec7560 Merge pull request #215 from tonysyu/morph-reconstruction
ENH: Add morphological reconstruction.
2012-08-25 07:42:36 -07:00
Tony S Yu 945349f963 DOC: Improve description of reconstruction 2012-08-25 08:48:03 -04:00
Johannes Schönberger 878554ac35 Fix indentation 2012-08-21 15:45:18 +02:00
Johannes Schönberger c471d475eb Refactor pnpoly function in Cython and add to shared package 2012-08-21 15:43:26 +02:00
Stefan van der Walt 1c3aeec2a8 BUG: Remove uses of xrange for py3 compatibility. 2012-08-20 15:25:40 -07:00
Stefan van der Walt 39569e8f9e Merge pull request #256 from NeilYager/skeleton_fix
BUG: Fix skeletonize LUT.
2012-08-20 14:50:51 -07:00
Stefan van der Walt b4fa79d6dd Merge pull request #206 from amueller/felsenzwalb
ENH: MRG Segmentation algorithms.
2012-08-20 14:43:33 -07:00
Neil Yager d7d1faec46 Fix bug in skeletonize LUT 2012-08-20 21:56:10 +01:00
Tony S Yu 682f064f86 DOC: Fix docstring to match rank order. 2012-08-19 16:23:14 -04:00
Tony S Yu b5d9106966 ENH: Use Cython data types instead of Numpy dtypes.
Conversion to Memoryviews didn't improve performance, unfortunately. Minor slow-down of 5--10%.
2012-08-19 11:56:16 -04:00
Tony S Yu b614b34eab ENH: Add test of reconstruction by erosion. 2012-08-18 23:20:49 -04:00
Tony S Yu 79fca0e20d DOC: Reorder docstring sections. 2012-08-18 21:54:06 -04:00
Tony S Yu ab7626da3d STY: Rename variables for clarity.
In particular, it wasn't clear whether `image` was the seed image or the mask image rnd `values` was used to refer to both image intensity values and their rank-order.
2012-08-18 21:41:01 -04:00
Tony S Yu 7a56a7f35e DOC: Clarify code comments and docstring 2012-08-18 18:04:01 -04:00
Tony S Yu 969772c036 ENH: Add reconstruction by erosion. 2012-08-18 17:59:44 -04:00
Tony S Yu 29c84a8a7b STY: Rename returned image to distinguish input from output. 2012-08-17 23:02:08 -04:00
Tony S Yu 33a19a8c7b DOC: add comments to clarify algorithm 2012-08-17 22:48:02 -04:00
Stefan van der Walt 90e61e22ae Merge pull request #240 from tonysyu/rename-duplicates
BUG: Rename modules with duplicate function names.
2012-08-16 23:01:48 -07:00
Tony S Yu 1ea41173b8 BUG: Rename files with similar function, python module, and cython extension names. 2012-08-16 22:42:27 -04:00
Johannes Schönberger 6ead3097c2 cast input of image label function 2012-08-10 09:10:06 +02:00
Tony S Yu 9cea60d817 STY: minor PEP8 change 2012-08-09 09:49:22 -04:00
Tony S Yu e4dd658daf STY: PEP8 and other clean up. 2012-08-09 00:23:58 -04:00
Tony S Yu 70153abb83 BUG: fix import of Cython extension. 2012-08-09 00:15:42 -04:00
Andreas Mueller 8fa5427afc FIX build problem and cython problem resolved. 2012-08-03 11:37:11 +01:00
Andreas Mueller e2d60f0135 ENH using union find from morphology module 2012-08-03 11:37:10 +01:00
Tony S Yu 25efae8269 Add morphological reconstruction with test and example. 2012-07-13 00:53:51 -04:00
Andreas Mueller 46e959a9d9 COSMIT some manual pep8, removed unused imports, removed unused variables and fixed a bug in a ValueError statement. 2012-06-29 11:27:23 +02:00
Andreas Mueller f7c56202d0 COSMIT no spaces around power `**`. Fun: https://gist.github.com/1671995 2012-06-29 11:27:23 +02:00
Andreas Mueller f7b3d8062c COSMIT pep8 2012-06-29 11:27:23 +02:00
Stefan van der Walt 944f79cdce BUG: Fix background labelling for case when (0, 0) belongs to the background. 2012-06-12 09:51:16 -07:00
Tony S Yu dc6c3d0222 Rename test module to match module. 2012-05-03 17:45:36 -04:00
Tony S Yu 9358d785c3 Add __all__ to grey module. 2012-05-03 17:44:08 -04:00
Tony S Yu 136a020088 Remove unused variable. 2012-05-03 17:42:39 -04:00
Tony S Yu 0edefedc50 Replace import * with import grey. 2012-05-03 17:35:11 -04:00
Tony S Yu 8fb597b141 Fix dtype compatibility for functions in morphology.grey
Cast input images using ``img_as_ubyte``. Note, tests don't currently pass for integer arrays (test skipped).
2012-05-03 16:22:00 -04:00
Tony S Yu 284753a7a4 Make test module runnable. 2012-05-03 16:21:59 -04:00
Tony S Yu cfa9bbfc40 Rename greyscale morphology functions.
Remove "greyscale" prefix on functions in ``morphology.grey``. To avoid confusion (and name clashes), ``greyscale_open`` and ``greyscale_close`` were renamed ``opening`` and ``closing`` (instead of ``open`` and ``close``). As a bonus, these names match scipy.ndimage.
2012-05-03 16:21:59 -04:00
Tony S Yu 29a2fc3c22 Remove unused imports 2012-05-03 16:21:59 -04:00
Stefan van der Walt e99f18be5a BUG: Fix imports for Python 3.2. 2012-03-03 11:18:16 -08:00
Stefan van der Walt 5c9c8c1867 DOC: Fix Other Parameters section. 2012-02-08 13:07:37 -08:00
K.-Michael Aye 7efb0988b0 Fixed 2 typos and 2 wrong argument types in the docs. 2012-02-07 17:21:36 +01:00
tonysyu 118cd49c18 Merge pull request #105 from stefanv/label_cleanup
ENH: Allow choice between 4 and 8 neighbor mode.  Improve documentation.
2012-02-03 21:12:47 -08:00
Stefan van der Walt e18fb678ec ENH: Cleanups as suggested by Tony. 2012-02-03 20:31:02 -08:00
emmanuelle b9d6090c5e Cross-See also in watershed and random walker 2012-01-17 22:17:15 +01:00