Moved test data around

bwhite · Jun 6, 2010 · 4e3e930 · 4e3e930
1 parent d136e0f
commit 4e3e930
Show file tree

Hide file tree

Showing 15 changed files with 7 additions and 7 deletions.
diff --git a/bgsub/bgsub_test.py b/bgsub/bgsub_test.py
@@ -31,8 +31,8 @@
 
 from bgsub import Mapper, Reducer
 
-DATA_FN, SZ = 'pets2006-S1-T1-C-0-499.video_frame_data_small.pkl.gz', (45, 36)
-#DATA_FN, SZ = 'pets2006-S1-T1-C-0-499.video_frame_data.pkl.gz', (720, 576)
+DATA_FN, SZ = 'input/pets2006-S1-T1-C-0-499.video_frame_data_small.pkl.gz', (45, 36)
+#DATA_FN, SZ = 'input/pets2006-S1-T1-C-0-499.video_frame_data.pkl.gz', (720, 576)
 
 
 class Test(hadoopy.Test):

diff --git a/classtrain/classtrain_test.py b/classtrain/classtrain_test.py
@@ -44,13 +44,13 @@ def test_mapreduce(self):
         # Test data is white cat, black dog, and neither
         test_in = []
         all_data = {'cat': [], 'dog': [], 'misc': []}
-        for fn in sorted(glob.glob('test_data/cat*.jpg')):
+        for fn in sorted(glob.glob('input/classtrain/cat*.jpg')):
             image = self._load_image_as_np(fn)
             all_data['cat'].append(image)
-        for fn in sorted(glob.glob('test_data/dog*.jpg')):
+        for fn in sorted(glob.glob('input/classtrain/dog*.jpg')):
             image = self._load_image_as_np(fn)
             all_data['dog'].append(image)
-        for fn in sorted(glob.glob('test_data/misc*.jpg')):
+        for fn in sorted(glob.glob('input/classtrain/misc*.jpg')):
             image = self._load_image_as_np(fn)
             all_data['misc'].append(image)
         model_ids = ['cat', 'dog']

diff --git a/classtrain/test_data/cat0.jpg → input/classtrain/cat0.jpg b/classtrain/test_data/cat0.jpg → input/classtrain/cat0.jpg
diff --git a/classtrain/test_data/cat1.jpg → input/classtrain/cat1.jpg b/classtrain/test_data/cat1.jpg → input/classtrain/cat1.jpg
diff --git a/classtrain/test_data/cat2.jpg → input/classtrain/cat2.jpg b/classtrain/test_data/cat2.jpg → input/classtrain/cat2.jpg
diff --git a/classtrain/test_data/dog0.jpg → input/classtrain/dog0.jpg b/classtrain/test_data/dog0.jpg → input/classtrain/dog0.jpg
diff --git a/classtrain/test_data/dog1.jpg → input/classtrain/dog1.jpg b/classtrain/test_data/dog1.jpg → input/classtrain/dog1.jpg
diff --git a/classtrain/test_data/dog2.jpg → input/classtrain/dog2.jpg b/classtrain/test_data/dog2.jpg → input/classtrain/dog2.jpg
diff --git a/classtrain/test_data/misc0.jpg → input/classtrain/misc0.jpg b/classtrain/test_data/misc0.jpg → input/classtrain/misc0.jpg
diff --git a/classtrain/test_data/misc1.jpg → input/classtrain/misc1.jpg b/classtrain/test_data/misc1.jpg → input/classtrain/misc1.jpg
diff --git a/classtrain/test_data/misc2.jpg → input/classtrain/misc2.jpg b/classtrain/test_data/misc2.jpg → input/classtrain/misc2.jpg
diff --git a/...-T1-C-0-499.video_frame_data_small.pkl.gz → ...-T1-C-0-499.video_frame_data_small.pkl.gz b/...-T1-C-0-499.video_frame_data_small.pkl.gz → ...-T1-C-0-499.video_frame_data_small.pkl.gz
diff --git a/slidingwindow/test_data/test0.png → input/slidingwindow/test0.png b/slidingwindow/test_data/test0.png → input/slidingwindow/test0.png
diff --git a/slidingwindow/test_data/test1.png → input/slidingwindow/test1.png b/slidingwindow/test_data/test1.png → input/slidingwindow/test1.png
diff --git a/slidingwindow/slidingwindow_test.py b/slidingwindow/slidingwindow_test.py
@@ -33,7 +33,7 @@ def __init__(self, *args, **kw):
         super(Test, self).__init__(*args, **kw)
 
     def test_mapreduce0(self):
-        image = Image.open('test_data/test0.png')
+        image = Image.open('input/slidingwindow/test0.png')
         image_size = image.size
         image = np.fromstring(image.tostring(), dtype=np.uint8)
         image = image.reshape((image_size[1], image_size[0]))
@@ -47,7 +47,7 @@ def test_mapreduce0(self):
         self.assertEqual(result, test_out)
 
     def test_mapreduce1(self):
-        image = Image.open('test_data/test1.png')
+        image = Image.open('input/slidingwindow/test1.png')
         image_size = image.size
         image = np.fromstring(image.tostring(), dtype=np.uint8)
         image = image.reshape((image_size[1], image_size[0]))