wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-07-02 12:31:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1288 from pratapvardhan/morph-selem

Browse Source 
Minor cleanup for morphology/tests/test_selem.py
This commit is contained in:
Stefan van der Walt
2014-12-14 02:41:37 +02:00
parent a55a334efc 9d6516903d
commit dad2b18546
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/morphology/tests/test_selem.py
+19 -9
View File
@@ -1,12 +1,14 @@
# Author: Damian Eads
"""
Tests for Morphological structuring elements
(skimage.morphology.selem)
Author: Damian Eads
"""
import os.path
import numpy as np
from numpy.testing import *
from numpy.testing import assert_equal
from skimage import data_dir
from skimage.io import *
from skimage import data_dir
from skimage.morphology import selem
@@ -14,12 +16,14 @@ from skimage.morphology import selem
class TestSElem():
def test_square_selem(self):
"""Test square structuring elements"""
for k in range(0, 5):
actual_mask = selem.square(k)
expected_mask = np.ones((k, k), dtype='uint8')
assert_equal(expected_mask, actual_mask)
def test_rectangle_selem(self):
"""Test rectangle structuring elements"""
for i in range(0, 5):
for j in range(0, 5):
actual_mask = selem.rectangle(i, j)
@@ -32,7 +36,7 @@ class TestSElem():
for arrname in sorted(matlab_masks):
expected_mask = matlab_masks[arrname]
actual_mask = func(k)
if (expected_mask.shape == (1,)):
if expected_mask.shape == (1,):
expected_mask = expected_mask[:, np.newaxis]
assert_equal(expected_mask, actual_mask)
k = k + 1
@@ -43,30 +47,35 @@ class TestSElem():
for arrname in sorted(matlab_masks):
expected_mask = matlab_masks[arrname]
actual_mask = func(k)
if (expected_mask.shape == (1,)):
if expected_mask.shape == (1,):
expected_mask = expected_mask[:, np.newaxis]
# Test center slice for each dimension. This gives a good
# indication of validity without the need for a 3D reference
# mask.
c = int(expected_mask.shape[0]/2)
assert_equal(expected_mask, actual_mask[c,:,:])
assert_equal(expected_mask, actual_mask[:,c,:])
assert_equal(expected_mask, actual_mask[:,:,c])
assert_equal(expected_mask, actual_mask[c, :, :])
assert_equal(expected_mask, actual_mask[:, c, :])
assert_equal(expected_mask, actual_mask[:, :, c])
k = k + 1
def test_selem_disk(self):
"""Test disk structuring elements"""
self.strel_worker("disk-matlab-output.npz", selem.disk)
def test_selem_diamond(self):
"""Test diamond structuring elements"""
self.strel_worker("diamond-matlab-output.npz", selem.diamond)
def test_selem_ball(self):
"""Test ball structuring elements"""
self.strel_worker_3d("disk-matlab-output.npz", selem.ball)
def test_selem_octahedron(self):
"""Test octahedron structuring elements"""
self.strel_worker_3d("diamond-matlab-output.npz", selem.octahedron)
def test_selem_octagon(self):
"""Test octagon structuring elements"""
expected_mask1 = np.array([[0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0],
[0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0],
[0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0],
@@ -87,6 +96,7 @@ class TestSElem():
assert_equal(expected_mask2, actual_mask2)
def test_selem_star(self):
"""Test star structuring elements"""
expected_mask1 = np.array([[0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0],
[0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0],