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

Merge npz fixes from Christoph Gohlke.

Browse Source
This commit is contained in:
Stefan van der Walt
2011-10-11 19:03:35 -07:00
parent c60d490a99 b15e7df14b
commit 1aa7af64a9
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scikits/image/morphology/tests/test_morphology.py
+12 -11
View File
@@ -15,48 +15,49 @@ class TestMorphology():
def morph_worker(self, img, fn, morph_func, strel_func):
matlab_results = np.load(os.path.join(data_dir, fn))
k = 0
for expected_result in matlab_results:
for arrname in sorted(matlab_results):
expected_result = matlab_results[arrname]
mask = strel_func(k)
actual_result = morph_func(lena, mask)
assert_equal(expected_result, actual_result)
k = k + 1
def test_erode_diamond(self):
self.morph_worker(lena, "diamond-erode-matlab-output.npy",
self.morph_worker(lena, "diamond-erode-matlab-output.npz",
greyscale_erode, diamond)
def test_dilate_diamond(self):
self.morph_worker(lena, "diamond-dilate-matlab-output.npy",
self.morph_worker(lena, "diamond-dilate-matlab-output.npz",
greyscale_dilate, diamond)
def test_open_diamond(self):
self.morph_worker(lena, "diamond-open-matlab-output.npy",
self.morph_worker(lena, "diamond-open-matlab-output.npz",
greyscale_open, diamond)
def test_close_diamond(self):
self.morph_worker(lena, "diamond-close-matlab-output.npy",
self.morph_worker(lena, "diamond-close-matlab-output.npz",
greyscale_close, diamond)
def test_tophat_diamond(self):
self.morph_worker(lena, "diamond-tophat-matlab-output.npy",
self.morph_worker(lena, "diamond-tophat-matlab-output.npz",
greyscale_white_top_hat, diamond)
def test_bothat_diamond(self):
self.morph_worker(lena, "diamond-bothat-matlab-output.npy",
self.morph_worker(lena, "diamond-bothat-matlab-output.npz",
greyscale_black_top_hat, diamond)
def test_erode_disk(self):
self.morph_worker(lena, "disk-erode-matlab-output.npy",
self.morph_worker(lena, "disk-erode-matlab-output.npz",
greyscale_erode, disk)
def test_dilate_disk(self):
self.morph_worker(lena, "disk-dilate-matlab-output.npy",
self.morph_worker(lena, "disk-dilate-matlab-output.npz",
greyscale_dilate, disk)
def test_open_disk(self):
self.morph_worker(lena, "disk-open-matlab-output.npy",
self.morph_worker(lena, "disk-open-matlab-output.npz",
greyscale_open, disk)
def test_close_disk(self):
self.morph_worker(lena, "disk-close-matlab-output.npy",
self.morph_worker(lena, "disk-close-matlab-output.npz",
greyscale_close, disk)
scikits/image/morphology/tests/test_selem.py
+4 -3
View File
@@ -28,7 +28,8 @@ class TestSElem():
def strel_worker(self, fn, func):
matlab_masks = np.load(os.path.join(data_dir, fn))
k = 0
for expected_mask in matlab_masks:
for arrname in sorted(matlab_masks):
expected_mask = matlab_masks[arrname]
actual_mask = func(k)
if (expected_mask.shape == (1,)):
expected_mask = expected_mask[:,np.newaxis]
@@ -36,8 +37,8 @@ class TestSElem():
k = k + 1
def test_selem_disk(self):
self.strel_worker("disk-matlab-output.npy", selem.disk)
self.strel_worker("disk-matlab-output.npz", selem.disk)
def test_selem_diamond(self):
self.strel_worker("diamond-matlab-output.npy", selem.diamond)
self.strel_worker("diamond-matlab-output.npz", selem.diamond)