Commit Graph

5669 Commits

Author SHA1 Message Date
Nelson Brown eb4725826d Change test of ndimage equivalence to use uint8 test image 2014-07-16 19:57:25 -07:00
Nelson Brown 4449c77884 Fix calls to ndimage to use footprint argument 2014-07-15 08:39:34 -07:00
Nelson Brown 7976520e7a Add test that the 2D results correspond to scipy's
Remove trailing whitespace
2014-07-15 08:25:17 -07:00
Nelson Brown 8c2b9b1784 Updated docstrings 2014-07-15 08:07:30 -07:00
Nelson Brown 001a63bd21 Remove repeated comments 2014-07-15 08:03:31 -07:00
Nelson Brown a1519a015e Change binary morphology functions to output numpy.bool dtype 2014-07-13 19:59:43 -07:00
Nelson Brown b677c400df Add whitespace following comma 2014-07-13 16:55:06 -07:00
Nelson Brown 042d85ad43 Adjust hanging indentation whitespace in dict comprehension 2014-07-13 16:31:58 -07:00
Nelson Brown d9909c4db9 Add tests for ndimage fallback for 3D white_tophat & black_tophat 2014-07-13 12:36:05 -07:00
Nelson Brown f1a8132fbf Add doctrings and comments in response to reviewers 2014-07-13 11:28:27 -07:00
Nelson Brown ea3e65f25a Add 3d-fallback tests for binary functions 2014-07-12 16:54:35 -07:00
Nelson Brown 2b91c259d6 Add fallback decorator for 3D images
We don't support images greater than 2D, so fall back on ndimage
2014-07-12 15:22:48 -07:00
Juan Nunez-Iglesias 9cd276f754 Merge pull request #1058 from nlsn/default-selem
Default structuring element (selem)
2014-07-12 10:06:11 -05:00
Nelson Brown 3518e65ab4 Add newline at EOF of selem.py 2014-07-11 23:39:07 -07:00
Nelson Brown c2bbca6113 Add a newline at EOF 2014-07-11 23:32:36 -07:00
Stefan van der Walt 2c9d22c5e1 Merge pull request #1032 from tonysyu/better-rescale-intensity
Tweak range definition in `rescale_intensity`
2014-07-12 00:56:06 +02:00
Stefan van der Walt f587b5318b Merge pull request #1059 from nlsn/exclude-win-libs
Add gitignore for *.pyd Windows libraries
2014-07-12 00:53:00 +02:00
Nelson Brown 7c53880f06 Add gitignore for *.pyd Windows libraries 2014-07-11 15:26:31 -07:00
Nelson Brown 9cd9a1372a Address reviewer comments
Add newline at EOF of selem.py
Add "optional" to grey.py and binary.py
2014-07-11 15:19:33 -07:00
Tony S Yu 4c000c4d89 Use normal deprecation warning 2014-07-11 17:01:54 -05:00
Nelson Brown 1ef556b710 Remove unnecessary whitespace 2014-07-11 14:51:57 -07:00
Tony S Yu 879c2c7f36 Add tests for intensity_range and rename parameter 2014-07-11 16:30:18 -05:00
Nelson Brown 54aff88bd0 Add docstring for default structuring element 2014-07-11 14:10:18 -07:00
Nelson Brown bb732c9225 Add default structuring element to morphology 2014-07-11 13:50:55 -07:00
Juan Nunez-Iglesias 1c27a97d26 Merge pull request #1052 from charris/numpy-1.9.0-fix
BUG: Fix slicing error revealed by numpy 1.9.0.
2014-07-04 19:40:27 -07:00
Charles Harris 7a074d5dd1 BUG: Fix slicing error revealed by numpy 1.9.0.
Numpy 1.9.0 no longer allows oversize data to be assigned to a
boolean indexed 1-d array by discarding excess elements.

Closes #1050.
2014-07-04 20:12:46 -06:00
Juan Nunez-Iglesias 6887f2cb90 Merge pull request #1031 from vighneshbirodkar/rag
Add region adjacency graphs (RAGs)

This PR introduces a dependency to the NetworkX library.
2014-07-02 22:24:09 -07:00
Vighnesh Birodkar df1d61e461 Spelling correction. 2014-07-03 09:55:17 +05:30
Vighnesh Birodkar 351e769733 Docstring change 2014-07-03 09:54:34 +05:30
Vighnesh Birodkar fb706d12d5 made RAG public and hyperlinked networkx.Graph documentation 2014-07-03 01:55:09 +05:30
Vighnesh Birodkar a4bf278c5b Doctest Passing 2014-07-03 00:26:22 +05:30
Vighnesh Birodkar e558854dec docstring change 2014-07-02 23:28:14 +05:30
Vighnesh Birodkar c1cf8e6347 Got doctest to pass and docstring changes 2014-07-02 23:13:17 +05:30
Vighnesh Birodkar 6003ab2c7d Typos 2014-07-02 00:31:01 +05:30
Vighnesh Birodkar 99a45baca8 Changes to plot_rag.py 2014-07-02 00:21:47 +05:30
Vighnesh Birodkar 486f935db8 Rename methods and edit docstrings 2014-07-02 00:19:11 +05:30
Johannes Schönberger 600e3fd951 Merge pull request #1042 from stefanv/setup_numpy_dependence
Only import numpy after dependency check
2014-06-30 18:01:17 -04:00
Stefan van der Walt df706be6c5 Merge pull request #1039 from kdmurray91/fix_freeimage_segfault
Fix freeimage segfault with a broken/truncated JPEG
2014-06-30 15:22:29 +02:00
Kevin Murray 4160a67a42 [skimage.io.tests] add truncated jpg imread tests 2014-06-30 19:35:35 +10:00
Kevin Murray 83d0717986 [test_freeimage] Allow ValueError to be raised
With the truncated image, sometimes ValueError is raised. This allows
either RuntimeError (i.e. libfreeimage error) or ValueError to be
raised.
2014-06-30 18:47:31 +10:00
Kevin Murray 7d9f9c46d9 [test_freeimage.py] remove extraneous statements 2014-06-30 14:45:51 +10:00
Kevin Murray d69cdb951b [freeimage tests] Add a test w/ truncated image
This tests tests the fix in the previous commit b9a7445, covering the
issue noted in issue #1037.
2014-06-30 14:45:51 +10:00
Vighnesh Birodkar 6abf194dd6 Use sets instead of dictionaries in merge_nodes 2014-06-28 21:02:25 +05:30
Vighnesh Birodkar dd67b3fce7 Changed max_edge in example/plot_rag.py 2014-06-28 11:06:30 +05:30
Vighnesh Birodkar f71ad51f57 Got Py3 test to pass 2014-06-28 10:35:14 +05:30
Stefan van der Walt 992a12f968 Only import numpy after dependency check 2014-06-27 23:37:28 +02:00
Vighnesh Birodkar 87465d91d7 test_rag.py formatting 2014-06-28 01:39:28 +05:30
Vighnesh Birodkar e63ae9450a merge_nodes docstring change 2014-06-28 01:35:41 +05:30
Vighnesh Birodkar 1982a3246c Docstring changes. 2014-06-28 01:32:55 +05:30
Vighnesh Birodkar c8480d3f6d Change merge_nodes code and test case 2014-06-28 01:17:44 +05:30