From d83273930050a652f2087b2a42fbef51da680b3b Mon Sep 17 00:00:00 2001 From: Evgeni Burovski Date: Thu, 4 Feb 2016 13:38:47 +0000 Subject: [PATCH] TST: skel3d: remove 2D test images --- skimage/morphology/tests/data/cross.png | Bin 149 -> 0 bytes skimage/morphology/tests/data/cross.txt | 24 ------------------ skimage/morphology/tests/data/cross_fiji.txt | 24 ------------------ skimage/morphology/tests/data/loop.png | Bin 184 -> 0 bytes skimage/morphology/tests/data/loop.txt | 24 ------------------ skimage/morphology/tests/data/loop_fiji.txt | 24 ------------------ skimage/morphology/tests/data/strip.png | Bin 131 -> 0 bytes skimage/morphology/tests/data/strip.txt | 12 --------- skimage/morphology/tests/data/strip_fiji.txt | 12 --------- skimage/morphology/tests/data/two-hole.png | Bin 176 -> 0 bytes skimage/morphology/tests/data/two-hole.txt | 16 ------------ .../morphology/tests/data/two-hole_fiji.txt | 16 ------------ .../morphology/tests/test_skeletonize_3d.py | 23 ----------------- 13 files changed, 175 deletions(-) delete mode 100644 skimage/morphology/tests/data/cross.png delete mode 100644 skimage/morphology/tests/data/cross.txt delete mode 100644 skimage/morphology/tests/data/cross_fiji.txt delete mode 100644 skimage/morphology/tests/data/loop.png delete mode 100644 skimage/morphology/tests/data/loop.txt delete mode 100644 skimage/morphology/tests/data/loop_fiji.txt delete mode 100644 skimage/morphology/tests/data/strip.png delete mode 100644 skimage/morphology/tests/data/strip.txt delete mode 100644 skimage/morphology/tests/data/strip_fiji.txt delete mode 100644 skimage/morphology/tests/data/two-hole.png delete mode 100644 skimage/morphology/tests/data/two-hole.txt delete mode 100644 skimage/morphology/tests/data/two-hole_fiji.txt diff --git a/skimage/morphology/tests/data/cross.png b/skimage/morphology/tests/data/cross.png deleted file mode 100644 index bd6db21c7758dbaf59a9f8eb43ffaa591301b99f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaT3?y&uT)!JgF&8^|hH!9j+}(d(|4_WO0;q$*)78&qol`;+03>EBBLDyZ diff --git a/skimage/morphology/tests/data/cross.txt b/skimage/morphology/tests/data/cross.txt deleted file mode 100644 index 2118f7f1..00000000 --- a/skimage/morphology/tests/data/cross.txt +++ /dev/null @@ -1,24 +0,0 @@ -0 0 0 0 0 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 -0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 -0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 -0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 -0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 0 0 -0 0 0 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/skimage/morphology/tests/data/cross_fiji.txt b/skimage/morphology/tests/data/cross_fiji.txt deleted file mode 100644 index c4ea69a9..00000000 --- a/skimage/morphology/tests/data/cross_fiji.txt +++ /dev/null @@ -1,24 +0,0 @@ -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 255 255 255 255 0 255 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 -0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/skimage/morphology/tests/data/loop.png b/skimage/morphology/tests/data/loop.png deleted file mode 100644 index 05fdc25955801664638367107253540ee3885375..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^l0YoM$P6S+tB1s;*b3=DinK$vl=HlH+5(9_e!F@$4gaza9aMw$crH~xkr^#UKy zGkDZ62=(wcuzYUhcX;%mS&Hr0V_t{OYK5cq4KqIS_Z@W!H)#L> diff --git a/skimage/morphology/tests/data/loop.txt b/skimage/morphology/tests/data/loop.txt deleted file mode 100644 index 277e1b47..00000000 --- a/skimage/morphology/tests/data/loop.txt +++ /dev/null @@ -1,24 +0,0 @@ -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 0 255 255 0 0 0 0 0 -0 0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 255 255 0 0 0 0 0 -0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 255 255 0 0 0 0 0 -0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 -0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 -0 0 0 0 0 0 0 255 255 255 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 255 255 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 255 255 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 255 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/skimage/morphology/tests/data/loop_fiji.txt b/skimage/morphology/tests/data/loop_fiji.txt deleted file mode 100644 index 4d38bfac..00000000 --- a/skimage/morphology/tests/data/loop_fiji.txt +++ /dev/null @@ -1,24 +0,0 @@ -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 255 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 255 255 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 255 0 0 0 0 255 255 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 255 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 255 255 255 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/skimage/morphology/tests/data/strip.png b/skimage/morphology/tests/data/strip.png deleted file mode 100644 index 74e9b3e49c0730a12cbf27c91e9dd825acd61822..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 131 zcmeAS@N?(olHy`uVBq!ia0vp^+(693$P6U=(y!hHQq09po*^6@9Je3(KLB#s0(?ST z|Ns9FWQHEPTnD5$3p^r=85sDEfH31!Z9ZwBpopi7V+hC0|22Vm7w!=Se(5=Wj}+%v){v!G=Hi!Tzopr0FyU3r~m)} diff --git a/skimage/morphology/tests/data/two-hole.txt b/skimage/morphology/tests/data/two-hole.txt deleted file mode 100644 index 680e7beb..00000000 --- a/skimage/morphology/tests/data/two-hole.txt +++ /dev/null @@ -1,16 +0,0 @@ -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 255 255 255 255 255 0 0 0 0 0 -0 0 0 0 0 255 255 255 255 255 255 255 255 255 0 255 0 -0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 255 0 -0 0 255 255 255 255 0 0 255 255 255 0 0 255 255 255 0 -0 0 255 255 255 0 0 0 255 255 255 0 0 255 255 255 0 -0 0 0 255 255 0 0 0 255 255 255 0 0 255 255 255 0 -0 0 0 255 255 255 0 0 255 255 255 0 0 255 255 255 0 -0 0 0 0 255 255 0 0 255 255 255 0 0 255 255 255 0 -0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 255 0 -0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 -0 0 0 0 0 255 255 255 255 255 255 255 255 255 255 255 0 -0 0 0 0 0 0 0 255 255 255 255 255 255 255 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/skimage/morphology/tests/data/two-hole_fiji.txt b/skimage/morphology/tests/data/two-hole_fiji.txt deleted file mode 100644 index 6c16d3f7..00000000 --- a/skimage/morphology/tests/data/two-hole_fiji.txt +++ /dev/null @@ -1,16 +0,0 @@ -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 255 255 0 255 255 0 0 0 0 0 -0 0 0 0 0 255 255 0 0 255 0 0 255 0 0 0 0 -0 0 0 0 255 0 0 0 0 255 0 0 0 255 0 0 0 -0 0 0 255 0 0 0 0 0 255 0 0 0 0 255 0 0 -0 0 0 255 0 0 0 0 0 255 0 0 0 0 255 0 0 -0 0 0 0 255 0 0 0 0 255 0 0 0 0 255 0 0 -0 0 0 0 255 0 0 0 0 255 0 0 0 0 255 0 0 -0 0 0 0 0 255 0 0 0 255 0 0 0 0 255 0 0 -0 0 0 0 0 0 255 255 0 255 0 0 0 255 0 0 0 -0 0 0 0 0 0 0 0 255 0 255 255 255 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/skimage/morphology/tests/test_skeletonize_3d.py b/skimage/morphology/tests/test_skeletonize_3d.py index 10b7e923..08a60f46 100644 --- a/skimage/morphology/tests/test_skeletonize_3d.py +++ b/skimage/morphology/tests/test_skeletonize_3d.py @@ -162,13 +162,6 @@ def test_two_hole_image(): assert_equal(res, img_f) -# nose test generators: -# 2D images -def test_simple_2d_images(): - for fname in ("strip", "loop", "cross", "two-hole"): - yield check_skel, fname - - # trivial 3D images def test_simple_3d(): for fname in ['3/stack', '4/stack']: @@ -188,22 +181,6 @@ def get_data_path(): 'tests', 'data') - -def check_skel(fname): - # compute the thin image and compare the result to that of ImageJ - img = np.loadtxt(os.path.join(get_data_path(), fname + '.txt'), - dtype=np.uint8) - - # compute - img1_2d = skeletonize_3d(img) - - # and compare to FIJI - img_f = np.loadtxt(os.path.join(get_data_path(), fname + '_fiji.txt'), - dtype=np.uint8) - - assert_equal(img1_2d, img_f) - - def check_skel_3d(fname): img = io.imread(os.path.join(get_data_path(), fname + '.tif')) img_f = io.imread(os.path.join(get_data_path(), fname + '_fiji.tif'))