From 7254c1e7b23a848d894722cab3ff602c4a2fc17a Mon Sep 17 00:00:00 2001 From: Victor Escorcia Date: Sat, 3 Oct 2015 22:12:03 +0300 Subject: [PATCH] Fix output type of peak_local_max --- skimage/feature/peak.py | 2 +- skimage/feature/tests/test_peak.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/skimage/feature/peak.py b/skimage/feature/peak.py index 599a6e58..421abeec 100644 --- a/skimage/feature/peak.py +++ b/skimage/feature/peak.py @@ -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 diff --git a/skimage/feature/tests/test_peak.py b/skimage/feature/tests/test_peak.py index 90fe9b62..e6256208 100644 --- a/skimage/feature/tests/test_peak.py +++ b/skimage/feature/tests/test_peak.py @@ -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))