Commit Graph

270 Commits

Author SHA1 Message Date
Johannes Schönberger 4e87f3f54e Inline helper functions of label 2013-04-09 19:49:14 +02:00
Almar 644ab324dd Added test for ball and octahedton selems.
Note that only the center slice (in each dimension is tested)
since there is no reference data available for these selems.
I did visualize the 3D shapes to see whether they look right.
2013-03-28 10:03:02 +01:00
Almar 77192b6e9a Adding octahedron selem (3D equivalent of diamond). 2013-03-28 09:48:25 +01:00
Almar fa6a30198c Fix typo in docstring of disk(). 2013-03-27 21:54:49 +01:00
Almar 42c72ab106 Add ball selem. I verified in 2D that this usage of np.mgrid yields the exact same results as np.meshgrid (np.meshgrid is not available for 3D). 2013-03-27 21:52:07 +01:00
Almar cbf1657ee7 Add cube selem. 2013-03-27 21:50:08 +01:00
Juan Nunez-Iglesias b306f9b70f Revert remove_small_objects to raise TypeError 2013-03-10 19:23:04 +11:00
Christoph Gohlke 19e938a3de Fix ValueError: Buffer dtype mismatch on win-amd64 2013-03-04 17:29:44 -08:00
Stefan van der Walt f3924da90b DOC: Fix typo in remove_small_objects docstring. 2013-03-04 18:36:32 +02:00
Stefan van der Walt dae9b7adfd STY: Minor cleanup. 2013-03-04 11:30:19 +02:00
Juan Nunez-Iglesias 3249faf308 Add specific error messages and exceptions 2013-03-04 16:54:29 +11:00
Juan Nunez-Iglesias 6b9ecd80b9 Add raise and labeled image tests 2013-03-04 01:32:05 +11:00
Juan Nunez-Iglesias b07f7fd9bd Rename function to remove_small_objects 2013-03-04 01:32:05 +11:00
Juan Nunez-Iglesias d6c5ba38ef Improve docstring for remove_small_connected_components
- Explain behavior if input is of int type.
- Add `Raises` section for possible errors.
- Remove explicit numpy import from example.
2013-03-04 01:32:05 +11:00
Juan Nunez-Iglesias 5222fb5ff7 Add tests for remove_small_connected_components 2013-03-04 01:32:05 +11:00
Juan Nunez-Iglesias 24b14508c8 Add examples to docstring 2013-03-04 01:32:05 +11:00
Juan Nunez-Iglesias 5686e11c97 Add funct to remove small connected compononents 2013-03-04 01:32:04 +11:00
Stefan van der Walt 6e0112f449 BUG: Recast label output to satisfy ndimage on 32-bit platforms. 2013-03-03 15:34:09 +02:00
Johannes Schönberger 62d83ad42c Globally change np to cnp if cimported 2013-02-24 14:14:14 +01:00
Johannes Schönberger 614023b941 Replace ssize_t with Py_ssize_t globally 2013-02-22 17:05:38 +01:00
Johannes Schönberger 2c90aa70e5 Use np.intp rather than ssize_t for ndarrays 2013-02-22 17:05:11 +01:00
Johannes Schönberger c9f72e93d6 Change type to ssize_t for all index and size variables 2013-02-22 17:05:10 +01:00
Johannes Schönberger 11f32577ab Fix wrong include paths for shared subpackage 2013-01-23 14:54:33 +01:00
Tony S Yu a641ce6a0e BUG: Move import inside deprecated function
Fixes circular import
2012-12-15 15:59:14 -05:00
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