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

Merge pull request #1741 from escorciav/peak-local-max-output-type

Browse Source 
Fix output type of `peak_local_max`
This commit is contained in:
Stefan van der Walt
2015-10-06 00:20:33 -07:00
parent 953fbfc539 7254c1e7b2
commit d66babe9bb
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/feature/peak.py
+1 -1
View File
@@ -119,7 +119,7 @@ def peak_local_max(image, min_distance=10, threshold_abs=0, threshold_rel=0.1,
if np.all(image == image.flat[0]):
if indices is True:
return []
return np.empty((0, 2), np.int)
else:
return out
skimage/feature/tests/test_peak.py
+2 -1
View File
@@ -11,6 +11,7 @@ np.random.seed(21)
def test_trivial_case():
trivial = np.zeros((25, 25))
peak_indices = peak.peak_local_max(trivial, min_distance=1, indices=True)
assert type(peak_indices) is np.ndarray
assert not peak_indices # inherent boolean-ness of empty list
peaks = peak.peak_local_max(trivial, min_distance=1, indices=False)
assert (peaks.astype(np.bool) == trivial).all()
@@ -89,7 +90,7 @@ def test_num_peaks3D():
image[5,5,::5] = np.arange(20)
peaks_limited = peak.peak_local_max(image, min_distance=1, num_peaks=2)
assert len(peaks_limited) == 2
def test_reorder_labels():
image = np.random.uniform(size=(40, 60))