wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-07-28 11:25:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1219 from jni/reconstruct-error

Browse Source 
Raise meaningful error when wrong "method" passed to `reconstruct`
This commit is contained in:
Steven Silvester
2014-11-05 20:42:35 -06:00
parent 66aaf71943 39d042e4ba
commit 2374b6a1ff
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/morphology/greyreconstruct.py
+3
View File
@@ -152,6 +152,9 @@ def reconstruction(seed, mask, method='dilation', selem=None, offset=None):
pad_value = np.min(seed)
elif method == 'erosion':
pad_value = np.max(seed)
else:
raise ValueError("Reconstruction method can be one of 'erosion' "
"or 'dilation'. Got '%s'." % method)
images = np.ones(dims) * pad_value
images[[0] + inside_slices] = seed
images[[1] + inside_slices] = mask
skimage/morphology/tests/test_reconstruction.py
+6
View File
@@ -97,6 +97,12 @@ def test_invalid_selem():
reconstruction(seed, mask, selem=np.ones((3, 3)))
def test_invalid_method():
seed = np.array([0, 8, 8, 8, 8, 8, 8, 8, 8, 0])
mask = np.array([0, 3, 6, 2, 1, 1, 1, 4, 2, 0])
assert_raises(ValueError, reconstruction, seed, mask, method='foo')
if __name__ == '__main__':
from numpy import testing
testing.run_module_suite()