From 217b0aa6971f9b607857a860ddcb37b47c36dd3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Boulogne?= Date: Sat, 15 Mar 2014 07:39:06 -0400 Subject: [PATCH 1/8] MAINT: remove blank lines --- skimage/util/tests/test_shape.py | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/skimage/util/tests/test_shape.py b/skimage/util/tests/test_shape.py index b6975d0f..4aea849d 100644 --- a/skimage/util/tests/test_shape.py +++ b/skimage/util/tests/test_shape.py @@ -6,41 +6,35 @@ from skimage.util.shape import view_as_blocks, view_as_windows @raises(TypeError) def test_view_as_blocks_block_not_a_tuple(): - A = np.arange(10) view_as_blocks(A, [5]) @raises(ValueError) def test_view_as_blocks_negative_shape(): - A = np.arange(10) view_as_blocks(A, (-2,)) @raises(ValueError) def test_view_as_blocks_block_too_large(): - A = np.arange(10) view_as_blocks(A, (11,)) @raises(ValueError) def test_view_as_blocks_wrong_block_dimension(): - A = np.arange(10) view_as_blocks(A, (2, 2)) @raises(ValueError) def test_view_as_blocks_1D_array_wrong_block_shape(): - A = np.arange(10) view_as_blocks(A, (3,)) def test_view_as_blocks_1D_array(): - A = np.arange(10) B = view_as_blocks(A, (5,)) assert_equal(B, np.array([[0, 1, 2, 3, 4], @@ -48,7 +42,6 @@ def test_view_as_blocks_1D_array(): def test_view_as_blocks_2D_array(): - A = np.arange(4 * 4).reshape(4, 4) B = view_as_blocks(A, (2, 2)) assert_equal(B[0, 1], np.array([[2, 3], @@ -57,7 +50,6 @@ def test_view_as_blocks_2D_array(): def test_view_as_blocks_3D_array(): - A = np.arange(4 * 4 * 6).reshape(4, 4, 6) B = view_as_blocks(A, (1, 2, 2)) assert_equal(B.shape, (4, 2, 3, 1, 2, 2)) @@ -69,41 +61,35 @@ def test_view_as_blocks_3D_array(): @raises(TypeError) def test_view_as_windows_input_not_array(): - A = [1, 2, 3, 4, 5] view_as_windows(A, (2,)) @raises(TypeError) def test_view_as_windows_window_not_tuple(): - A = np.arange(10) view_as_windows(A, [2]) @raises(ValueError) def test_view_as_windows_wrong_window_dimension(): - A = np.arange(10) view_as_windows(A, (2, 2)) @raises(ValueError) def test_view_as_windows_negative_window_length(): - A = np.arange(10) view_as_windows(A, (-1,)) @raises(ValueError) def test_view_as_windows_window_too_large(): - A = np.arange(10) view_as_windows(A, (11,)) def test_view_as_windows_1D(): - A = np.arange(10) window_shape = (3,) B = view_as_windows(A, window_shape) @@ -118,7 +104,6 @@ def test_view_as_windows_1D(): def test_view_as_windows_2D(): - A = np.arange(5 * 4).reshape(5, 4) window_shape = (4, 3) B = view_as_windows(A, window_shape) From cf7a184ba768da7a6cf66ae40002f08179cb21c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Boulogne?= Date: Sat, 15 Mar 2014 07:40:39 -0400 Subject: [PATCH 2/8] TEST: add test on step --- skimage/util/tests/test_shape.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/skimage/util/tests/test_shape.py b/skimage/util/tests/test_shape.py index 4aea849d..b66ac2e2 100644 --- a/skimage/util/tests/test_shape.py +++ b/skimage/util/tests/test_shape.py @@ -89,6 +89,11 @@ def test_view_as_windows_window_too_large(): view_as_windows(A, (11,)) +@raises(ValueError) +def test_view_as_windows_step_below_one(): + A = np.arange(10) + view_as_windows(A, (11,), step=0.9) + def test_view_as_windows_1D(): A = np.arange(10) window_shape = (3,) From ced3f5656f942eaf6b1f0d08367da83f543ba7c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Boulogne?= Date: Sat, 15 Mar 2014 07:42:08 -0400 Subject: [PATCH 3/8] DOC: specify range for step --- skimage/util/shape.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/skimage/util/shape.py b/skimage/util/shape.py index f91286c3..95e0a42e 100644 --- a/skimage/util/shape.py +++ b/skimage/util/shape.py @@ -111,9 +111,10 @@ def view_as_windows(arr_in, window_shape, step=1): window_shape: tuple Defines the shape of the elementary n-dimensional orthotope (better know as hyperrectangle [1]_) of the rolling window view. - step : int + step : int, optional Number of elements to skip when moving the window forward (by - default, move forward by one). + default, move forward by one). The value must be equal or larger + than one. Returns ------- From ee12ccff260a360df3476ecf6db058f55b65a3a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Boulogne?= Date: Sat, 15 Mar 2014 07:47:05 -0400 Subject: [PATCH 4/8] TEST: add unittest about ValueError --- skimage/draw/tests/test_draw3d.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/skimage/draw/tests/test_draw3d.py b/skimage/draw/tests/test_draw3d.py index 2e1198eb..f529718a 100644 --- a/skimage/draw/tests/test_draw3d.py +++ b/skimage/draw/tests/test_draw3d.py @@ -1,9 +1,25 @@ import numpy as np from numpy.testing import assert_array_equal, assert_allclose +from nose.tools import raises from skimage.draw import ellipsoid, ellipsoid_stats +@raises('ValueError') +def test_ellipsoid_sign_paramters1(): + ellipsoid(-1, 2, 2) + + +@raises('ValueError') +def test_ellipsoid_sign_paramters2(): + ellipsoid(0, 2, 2) + + +@raises('ValueError') +def test_ellipsoid_sign_paramters3(): + ellipsoid(-3, -2, 2) + + def test_ellipsoid_bool(): test = ellipsoid(2, 2, 2)[1:-1, 1:-1, 1:-1] test_anisotropic = ellipsoid(2, 2, 4, spacing=(1., 1., 2.)) From a423bd15e6cdb416ee721bb9df1e31992dc37066 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Boulogne?= Date: Sat, 15 Mar 2014 07:58:01 -0400 Subject: [PATCH 5/8] MAINT: use asset_allclose instead of round --- skimage/draw/tests/test_draw3d.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/skimage/draw/tests/test_draw3d.py b/skimage/draw/tests/test_draw3d.py index f529718a..a455e947 100644 --- a/skimage/draw/tests/test_draw3d.py +++ b/skimage/draw/tests/test_draw3d.py @@ -102,18 +102,18 @@ def test_ellipsoid_levelset(): def test_ellipsoid_stats(): # Test comparison values generated by Wolfram Alpha vol, surf = ellipsoid_stats(6, 10, 16) - assert(round(1280 * np.pi, 4) == round(vol, 4)) - assert(1383.28 == round(surf, 2)) + assert_allclose(1280 * np.pi, vol, atol=1e-4) + assert_allclose(1383.28, surf, atol=1e-2) # Test when a <= b <= c does not hold vol, surf = ellipsoid_stats(16, 6, 10) - assert(round(1280 * np.pi, 4) == round(vol, 4)) - assert(1383.28 == round(surf, 2)) + assert_allclose(1280 * np.pi, vol, atol=1e-4)) + assert_allclose(1383.28, surf, atol=1e-2) # Larger test to ensure reliability over broad range vol, surf = ellipsoid_stats(17, 27, 169) - assert(round(103428 * np.pi, 4) == round(vol, 4)) - assert(37426.3 == round(surf, 1)) + assert_allclose(103428 * np.pi, vol, atol=1e-4)) + assert_allclose(37426.3, surf, atol=1e-1) if __name__ == "__main__": From c6e916d082d4606f4b9dd38bd328709e59fabfd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Boulogne?= Date: Sat, 15 Mar 2014 08:26:45 -0400 Subject: [PATCH 6/8] remove extra ) --- skimage/draw/tests/test_draw3d.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skimage/draw/tests/test_draw3d.py b/skimage/draw/tests/test_draw3d.py index a455e947..35925497 100644 --- a/skimage/draw/tests/test_draw3d.py +++ b/skimage/draw/tests/test_draw3d.py @@ -107,12 +107,12 @@ def test_ellipsoid_stats(): # Test when a <= b <= c does not hold vol, surf = ellipsoid_stats(16, 6, 10) - assert_allclose(1280 * np.pi, vol, atol=1e-4)) + assert_allclose(1280 * np.pi, vol, atol=1e-4) assert_allclose(1383.28, surf, atol=1e-2) # Larger test to ensure reliability over broad range vol, surf = ellipsoid_stats(17, 27, 169) - assert_allclose(103428 * np.pi, vol, atol=1e-4)) + assert_allclose(103428 * np.pi, vol, atol=1e-4) assert_allclose(37426.3, surf, atol=1e-1) From 67b1335c15c8c5012648eaadb1c277807139ba52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Boulogne?= Date: Sat, 15 Mar 2014 08:50:53 -0400 Subject: [PATCH 7/8] remove '' around ValueError --- skimage/draw/tests/test_draw3d.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/skimage/draw/tests/test_draw3d.py b/skimage/draw/tests/test_draw3d.py index 35925497..1d29e41e 100644 --- a/skimage/draw/tests/test_draw3d.py +++ b/skimage/draw/tests/test_draw3d.py @@ -5,17 +5,17 @@ from nose.tools import raises from skimage.draw import ellipsoid, ellipsoid_stats -@raises('ValueError') +@raises(ValueError) def test_ellipsoid_sign_paramters1(): ellipsoid(-1, 2, 2) -@raises('ValueError') +@raises(ValueError) def test_ellipsoid_sign_paramters2(): ellipsoid(0, 2, 2) -@raises('ValueError') +@raises(ValueError) def test_ellipsoid_sign_paramters3(): ellipsoid(-3, -2, 2) From 6093c55aa27a5c3ab105bb1f1b7b16de949a7dfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Boulogne?= Date: Sat, 15 Mar 2014 10:29:45 -0400 Subject: [PATCH 8/8] MIN: typo --- skimage/draw/tests/test_draw3d.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/skimage/draw/tests/test_draw3d.py b/skimage/draw/tests/test_draw3d.py index 1d29e41e..48caf1a0 100644 --- a/skimage/draw/tests/test_draw3d.py +++ b/skimage/draw/tests/test_draw3d.py @@ -6,17 +6,17 @@ from skimage.draw import ellipsoid, ellipsoid_stats @raises(ValueError) -def test_ellipsoid_sign_paramters1(): +def test_ellipsoid_sign_parameters1(): ellipsoid(-1, 2, 2) @raises(ValueError) -def test_ellipsoid_sign_paramters2(): +def test_ellipsoid_sign_parameters2(): ellipsoid(0, 2, 2) @raises(ValueError) -def test_ellipsoid_sign_paramters3(): +def test_ellipsoid_sign_parameters3(): ellipsoid(-3, -2, 2)