From 1c589908a8aa6548f8a39f05aa03d737343e6955 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 23 Dec 2012 10:54:09 -0600 Subject: [PATCH 1/2] BUG: Not all plugins would pass the adapthist test --- skimage/exposure/tests/test_exposure.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/skimage/exposure/tests/test_exposure.py b/skimage/exposure/tests/test_exposure.py index 258b4224..e87bdeb4 100644 --- a/skimage/exposure/tests/test_exposure.py +++ b/skimage/exposure/tests/test_exposure.py @@ -12,6 +12,7 @@ from skimage.util.dtype import dtype_range # squeeze image intensities to lower image contrast test_img = exposure.rescale_intensity(data.camera() / 5. + 100) +test_img = skimage.img_as_float(test_img) def test_equalize_ubyte(): @@ -101,8 +102,8 @@ def test_adapthist_grayscale(): nbins=128) assert_almost_equal = np.testing.assert_almost_equal assert img.shape == adapted.shape - assert_almost_equal(peak_snr(img, adapted), 77.584, 3) - assert_almost_equal(norm_brightness_err(img, adapted), 0.038, 3) + assert_almost_equal(peak_snr(img, adapted), 97.949, 3) + assert_almost_equal(norm_brightness_err(img, adapted), 0.03077, 3) return data, adapted @@ -116,9 +117,9 @@ def test_adapthist_color(): assert adapted.max() == 1.0 assert img.shape == adapted.shape full_scale = skimage.exposure.rescale_intensity(img) - assert_almost_equal(peak_snr(full_scale, adapted), 64.717, 3) + assert_almost_equal(peak_snr(full_scale, adapted), 102.940, 3) assert_almost_equal(norm_brightness_err(full_scale, adapted), - 0.179, 3) + 0.0110, 3) return data, adapted From 6a0ab4e3fbe04b19b920e422a91746fe639d4150 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 23 Dec 2012 15:45:10 -0600 Subject: [PATCH 2/2] BUG: Fixed exposure test to cast data on load. --- skimage/exposure/tests/test_exposure.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skimage/exposure/tests/test_exposure.py b/skimage/exposure/tests/test_exposure.py index e87bdeb4..43e1017d 100644 --- a/skimage/exposure/tests/test_exposure.py +++ b/skimage/exposure/tests/test_exposure.py @@ -11,8 +11,8 @@ from skimage.util.dtype import dtype_range # =========================== # squeeze image intensities to lower image contrast -test_img = exposure.rescale_intensity(data.camera() / 5. + 100) -test_img = skimage.img_as_float(test_img) +test_img = skimage.img_as_float(data.camera()) +test_img = exposure.rescale_intensity(test_img / 5. + 100) def test_equalize_ubyte():