From c0e3dcc69f60045bec37eedf0469727f7b37c2b3 Mon Sep 17 00:00:00 2001 From: Jeremy Metz Date: Wed, 24 Feb 2016 00:02:41 +0000 Subject: [PATCH] Reverted tests to boolean exclude_border --- skimage/feature/peak.py | 2 +- skimage/feature/tests/test_peak.py | 33 +++++++++++++++--------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/skimage/feature/peak.py b/skimage/feature/peak.py index b4a0d44a..a27622f0 100644 --- a/skimage/feature/peak.py +++ b/skimage/feature/peak.py @@ -94,7 +94,7 @@ def peak_local_max(image, min_distance=1, threshold_abs=None, """ if type(exclude_border) == bool: - exclude_border = min_distance if exclude_border else 0 + exclude_border = min_distance if exclude_border else 0 out = np.zeros_like(image, dtype=np.bool) diff --git a/skimage/feature/tests/test_peak.py b/skimage/feature/tests/test_peak.py index 0c6ce754..6b94daf5 100644 --- a/skimage/feature/tests/test_peak.py +++ b/skimage/feature/tests/test_peak.py @@ -109,7 +109,7 @@ def test_reorder_labels(): expected = (expected == image) result = peak.peak_local_max(image, labels=labels, min_distance=1, threshold_rel=0, footprint=footprint, - indices=False, exclude_border=0) + indices=False, exclude_border=False) assert (result == expected).all() @@ -127,7 +127,7 @@ def test_indices_with_labels(): expected = (expected == image) result = peak.peak_local_max(image, labels=labels, min_distance=1, threshold_rel=0, footprint=footprint, - indices=True, exclude_border=0) + indices=True, exclude_border=False) assert (result == np.transpose(expected.nonzero())).all() @@ -145,7 +145,8 @@ def test_ndarray_exclude_border(): nd_image[2,2,2] = 1 expected = np.zeros_like(nd_image, dtype=np.bool) expected[2,2,2] = True - result = peak.peak_local_max(nd_image, exclude_border=2, indices=False) + result = peak.peak_local_max(nd_image, min_distance=2, + exclude_border=2, indices=False) assert (result == expected).all() @@ -155,7 +156,7 @@ def test_empty(): result = peak.peak_local_max(image, labels=labels, footprint=np.ones((3, 3), bool), min_distance=1, threshold_rel=0, - indices=False, exclude_border=0) + indices=False, exclude_border=False) assert np.all(~ result) @@ -167,7 +168,7 @@ def test_one_point(): result = peak.peak_local_max(image, labels=labels, footprint=np.ones((3, 3), bool), min_distance=1, threshold_rel=0, - indices=False, exclude_border=0) + indices=False, exclude_border=False) assert np.all(result == (labels == 1)) @@ -179,7 +180,7 @@ def test_adjacent_and_same(): result = peak.peak_local_max(image, labels=labels, footprint=np.ones((3, 3), bool), min_distance=1, threshold_rel=0, - indices=False, exclude_border=0) + indices=False, exclude_border=False) assert np.all(result == (labels == 1)) @@ -193,11 +194,11 @@ def test_adjacent_and_different(): result = peak.peak_local_max(image, labels=labels, footprint=np.ones((3, 3), bool), min_distance=1, threshold_rel=0, - indices=False, exclude_border=0) + indices=False, exclude_border=False) assert np.all(result == expected) result = peak.peak_local_max(image, labels=labels, min_distance=1, threshold_rel=0, - indices=False, exclude_border=0) + indices=False, exclude_border=False) assert np.all(result == expected) @@ -211,7 +212,7 @@ def test_not_adjacent_and_different(): result = peak.peak_local_max(image, labels=labels, footprint=np.ones((3, 3), bool), min_distance=1, threshold_rel=0, - indices=False, exclude_border=0) + indices=False, exclude_border=False) assert np.all(result == expected) @@ -226,7 +227,7 @@ def test_two_objects(): result = peak.peak_local_max(image, labels=labels, footprint=np.ones((3, 3), bool), min_distance=1, threshold_rel=0, - indices=False, exclude_border=0) + indices=False, exclude_border=False) assert np.all(result == expected) @@ -241,7 +242,7 @@ def test_adjacent_different_objects(): result = peak.peak_local_max(image, labels=labels, footprint=np.ones((3, 3), bool), min_distance=1, threshold_rel=0, - indices=False, exclude_border=0) + indices=False, exclude_border=False) assert np.all(result == expected) @@ -259,7 +260,7 @@ def test_four_quadrants(): expected = (expected == image) result = peak.peak_local_max(image, labels=labels, footprint=footprint, min_distance=1, threshold_rel=0, - indices=False, exclude_border=0) + indices=False, exclude_border=False) assert np.all(result == expected) @@ -273,10 +274,10 @@ def test_disk(): footprint=footprint, min_distance=1, threshold_rel=0, threshold_abs=-1, indices=False, - exclude_border=0) + exclude_border=False) assert np.all(result) result = peak.peak_local_max(image, footprint=footprint, threshold_abs=-1, - indices=False, exclude_border=0) + indices=False, exclude_border=False) assert np.all(result) @@ -289,7 +290,7 @@ def test_3D(): assert_equal(peak.peak_local_max(image, min_distance=6, threshold_rel=0), [[15, 15, 15]]) assert_equal(peak.peak_local_max(image, min_distance=10, threshold_rel=0, - exclude_border=0), + exclude_border=False), [[5, 5, 5], [15, 15, 15]]) assert_equal(peak.peak_local_max(image, min_distance=5, threshold_rel=0), [[5, 5, 5], [15, 15, 15]]) @@ -304,7 +305,7 @@ def test_4D(): assert_equal(peak.peak_local_max(image, min_distance=6, threshold_rel=0), [[15, 15, 15, 15]]) assert_equal(peak.peak_local_max(image, min_distance=10, threshold_rel=0, - exclude_border=0), + exclude_border=False), [[5, 5, 5, 5], [15, 15, 15, 15]]) assert_equal(peak.peak_local_max(image, min_distance=5, threshold_rel=0), [[5, 5, 5, 5], [15, 15, 15, 15]])