diff --git a/skimage/morphology/tests/data/cross.png b/skimage/morphology/tests/data/cross.png deleted file mode 100644 index bd6db21c..00000000 Binary files a/skimage/morphology/tests/data/cross.png and /dev/null differ 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 05fdc259..00000000 Binary files a/skimage/morphology/tests/data/loop.png and /dev/null differ 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 74e9b3e4..00000000 Binary files a/skimage/morphology/tests/data/strip.png and /dev/null differ diff --git a/skimage/morphology/tests/data/strip.txt b/skimage/morphology/tests/data/strip.txt deleted file mode 100644 index abc45a08..00000000 --- a/skimage/morphology/tests/data/strip.txt +++ /dev/null @@ -1,12 +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 255 255 255 0 0 0 0 -0 0 0 0 255 255 255 0 0 0 0 -0 0 0 0 255 255 255 0 0 0 0 -0 0 0 0 255 255 255 0 0 0 0 -0 0 0 0 255 255 255 0 0 0 0 -0 0 0 0 255 255 255 0 0 0 0 -0 0 0 0 255 255 255 0 0 0 0 -0 0 0 0 255 255 255 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 diff --git a/skimage/morphology/tests/data/strip_fiji.txt b/skimage/morphology/tests/data/strip_fiji.txt deleted file mode 100644 index 9ff3049c..00000000 --- a/skimage/morphology/tests/data/strip_fiji.txt +++ /dev/null @@ -1,12 +0,0 @@ -0 0 0 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 255 0 0 0 0 0 -0 0 0 0 0 255 0 0 0 0 0 -0 0 0 0 0 255 0 0 0 0 0 -0 0 0 0 0 255 0 0 0 0 0 -0 0 0 0 0 255 0 0 0 0 0 -0 0 0 0 0 255 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 diff --git a/skimage/morphology/tests/data/two-hole.png b/skimage/morphology/tests/data/two-hole.png deleted file mode 100644 index 8754e2be..00000000 Binary files a/skimage/morphology/tests/data/two-hole.png and /dev/null differ 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'))