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 pull request #223 from jni/jni-concatenate-image-collection

Browse Source 
ENH: Concatenate image collection.
This commit is contained in:
Stefan van der Walt
2012-07-20 16:02:04 -07:00
parent 05185288e6 a61ac37ff2
commit 37e0ce0fc8
2 changed files with 83 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/io/tests/test_collection.py
+15
View File
@@ -23,9 +23,12 @@ if sys.version_info[0] > 2:
class TestImageCollection():
pattern = [os.path.join(data_dir, pic) for pic in ['camera.png',
'color.png']]
pattern_matched = [os.path.join(data_dir, pic) for pic in
['camera.png', 'moon.png']]
def setUp(self):
self.collection = ImageCollection(self.pattern)
self.collection_matched = ImageCollection(self.pattern_matched)
def test_len(self):
assert len(self.collection) == 2
@@ -59,6 +62,12 @@ class TestImageCollection():
ic = ImageCollection(load_pattern, load_func=load_fn)
assert_equal(ic[1], (2, 'two'))
def test_concatenate(self):
ar = self.collection_matched.concatenate()
assert_equal(ar.shape, (len(self.collection_matched),) +
self.collection[0].shape)
assert_raises(ValueError, self.collection.concatenate)
class TestMultiImage():
@@ -102,6 +111,12 @@ class TestMultiImage():
self.img.conserve_memory = val
assert_raises(AttributeError, set_mem, True)
@skipif(not PIL_available)
def test_concatenate(self):
ar = self.img.concatenate()
assert_equal(ar.shape, (len(self.img),) +
self.img[0].shape)
if __name__ == "__main__":
run_module_suite()