Commit Graph

96 Commits

Author SHA1 Message Date
Josh Warner (Mac) 45a91aa9c5 doc: deprecated string and docstring formatting fixes in is_local_maximum 2012-11-25 22:56:45 -06:00
Josh Warner (Mac) d2262227d9 BUG - rank_order now imported.
Also changed (peak.py):
  * Standardized documentation as requested.
  * Removed `threshold` as an optional kwarg.
  * Removed extra line break incorrect by PEP8 standards.

Also changed (watershed.py):
  * Added @deprecated decorator and import statement
2012-11-24 17:24:14 -06:00
Josh Warner (Mac) da5a2a8221 BUG - Now parsing all unique labels != 0 properly, and set threshold_rel=0 in is_local_maximum() wrapper. 2012-11-20 01:11:31 -06:00
Josh Warner (Mac) 226eaaff92 FEAT - Unified peak finder backend
Detailed changelist:
  * Fully documented new API for peak_local_max()
  * Removed commented-out old code for is_local_maximum()
  * Added "See also" and "Notes" to is_local_maximum() redirecting to peak_local_max()
2012-11-20 00:12:47 -06:00
Josh Warner (Mac) 63b5c5a4a0 FEAT - combined API from is_local_maximum() into peak_local_max()
is_local_maximum() is a wrapper function for peak_local_max()
is_local_maximum() runs much faster (~20% of prior runtime, nearly = to peak_local_max())
All tests in .feature and .morphology subpackages pass as written with these changes.

Todo:
  * Fully document API
  * remove commented-out old algorithm in is_local_maximum()
  * add new tests for full coverage of new, more complex peak_local_max()
2012-11-19 23:38:58 -06:00
Tony S Yu c17ffe6c32 Merge pull request #351 from ahojnnes/test-coverage
Test coverage
2012-10-09 14:51:23 -07:00
Johannes Schönberger 9b5cb1ca8a Merge pull request #360 from tonysyu/fix-doctest-imports
DOC: Add imports to doctests to fix errors
2012-10-08 22:50:38 -07:00
Tony S Yu ab2411cd19 DOC: Add imports to doctests to fix errors 2012-10-08 20:30:33 -04:00
Paul Ivanov b4b090271d complete singularization of scikit-image
I've updated references in the code and documentation to the new name.
2012-10-08 16:29:55 -07:00
Johannes Schönberger 0ab93bbf36 Remove redundant dtype conversion 2012-10-06 21:54:12 +02:00
Johannes Schönberger 48572fd0a3 Remove obsolete license note as code has been refactored 2012-10-06 21:52:15 +02:00
Andreas Mueller 6c59e04714 MISC remove unused imports, some pep8 corrections. 2012-09-27 20:01:45 +01:00
Tony S Yu 538ce329a5 DOC: fix numpy dtype print out.
This fix may be very dependent on numpy version since print out has change over time.
2012-09-11 23:47:18 -04:00
Johannes Schönberger 56b1476789 Add test case for non-square images 2012-09-11 20:27:18 +02:00
Johannes Schönberger f478b6a397 Fix bug in binary dilation and test case 2012-09-11 20:11:55 +02:00
Johannes Schönberger b1d99be735 Fix bug in grey erosion and dilation 2012-09-11 09:09:10 +02:00
Tony S Yu 84ac91927d DOC: Fix citation syntax 2012-09-02 18:03:55 -04:00
Tony S Yu 8b15656feb Change import to silence import errors in docs.
`import skimage` in submodules seems to cause issues with Sphinx autodocs. (Maybe some sort of circular import issue.) Note the `ImportErrors` fixed by this commit don't actually cause sphinx build errors; Sphinx seems to capture the errors, but it's annoyingly noisy, nonetheless.
2012-09-02 12:23:52 -04:00
Johannes Schönberger aa08e8a559 Fix for predefined output array 2012-09-02 13:41:25 +02:00
Johannes Schönberger 2c37c70ca3 Fix support for predefined output array 2012-09-02 13:35:12 +02:00
Johannes Schönberger 373b3293ee Use numpy testing functions 2012-09-02 13:28:07 +02:00
Johannes Schönberger de47332bd2 Add fast morphological operations for binary images 2012-09-02 13:25:52 +02:00
Johannes Schönberger 2842515dc3 Improve doc string layout 2012-09-02 10:34:09 +02:00
Johannes Schönberger 224fcb5d01 Convert selem to uint8 2012-09-02 09:58:02 +02:00
Johannes Schönberger a5fe574bd9 Remove unused imports and add missing types 2012-09-01 14:57:56 +02:00
Johannes Schönberger b05c062d24 Refactor erosion and dilation for better performance 2012-09-01 14:54:17 +02:00
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