Merge branch 'sd-vbs' of ssh://rtsrv.cs.unc.edu/public/mc2-scripts-and-benchmarks into sd-vbs

3 files changed, 7 insertions, 61 deletions

diff --git a/SD-VBS/benchmarks/disparity/data/cif/12345.txt b/SD-VBS/benchmarks/disparity/data/cif/12345.txt
deleted file mode 100644
index 3dd9ffe..0000000
--- a/SD-VBS/benchmarks/disparity/data/cif/12345.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-disparity-cif none 20 none 20 35311220 12345 0 0 0
-disparity-cif none 20 none 20 35151832 12345 1 0 0
-disparity-cif none 20 none 20 34643104 12345 2 0 0
-disparity-cif none 20 none 20 34641288 12345 3 0 0
-disparity-cif none 20 none 20 34671336 12345 4 0 0
-disparity-cif none 20 none 20 34709616 12345 5 0 0
-disparity-cif none 20 none 20 34779264 12345 6 0 0
-disparity-cif none 20 none 20 35022352 12345 7 0 0
-disparity-cif none 20 none 20 34799464 12345 8 0 0
-disparity-cif none 20 none 20 34794384 12345 9 0 0
-disparity-cif none 20 none 20 34796992 12345 10 0 0
-disparity-cif none 20 none 20 34681564 12345 11 0 0
-disparity-cif none 20 none 20 34667428 12345 12 0 0
-disparity-cif none 20 none 20 34687324 12345 13 0 0
-disparity-cif none 20 none 20 34694040 12345 14 0 0
-disparity-cif none 20 none 20 34672856 12345 15 0 0
-disparity-cif none 20 none 20 34699520 12345 16 0 0
-disparity-cif none 20 none 20 34716672 12345 17 0 0
-disparity-cif none 20 none 20 34686432 12345 18 0 0
-disparity-cif none 20 none 20 34692112 12345 19 0 0
-disparity-cif none 21 none 5 34821504 12345 0 0 0
-disparity-cif none 21 none 5 34748320 12345 1 0 0
-disparity-cif none 21 none 5 34746756 12345 2 0 0
-disparity-cif none 21 none 5 34736224 12345 3 0 0
-disparity-cif none 21 none 5 34877768 12345 4 0 0
-disparity-cif none 16 none 5 34706256 12345 0 0 0
-disparity-cif none 16 none 5 33841040 12345 1 0 0
-disparity-cif none 16 none 5 33794244 12345 2 0 0
-disparity-cif none 16 none 5 34052544 12345 3 0 0
-disparity-cif none 16 none 5 34092180 12345 4 0 0
diff --git a/SD-VBS/benchmarks/disparity/data/fullhd/12345.txt b/SD-VBS/benchmarks/disparity/data/fullhd/12345.txt
deleted file mode 100644
index dd9af28..0000000
--- a/SD-VBS/benchmarks/disparity/data/fullhd/12345.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-disparity-fullhd none 7 none 20 963629056 12345 0 0 0
-disparity-fullhd none 7 none 20 967578880 12345 1 0 0
-disparity-fullhd none 7 none 20 968594368 12345 2 0 0
-disparity-fullhd none 7 none 20 964075264 12345 3 0 0
-disparity-fullhd none 7 none 20 966877696 12345 4 0 0
-disparity-fullhd none 7 none 20 968793728 12345 5 0 0
-disparity-fullhd none 7 none 20 968632064 12345 6 0 0
-disparity-fullhd none 7 none 20 964562432 12345 7 0 0
-disparity-fullhd none 7 none 20 968084800 12345 8 0 0
-disparity-fullhd none 7 none 20 964557120 12345 9 0 0
-disparity-fullhd none 7 none 20 967762496 12345 10 0 0
-disparity-fullhd none 7 none 20 967815040 12345 11 0 0
-disparity-fullhd none 7 none 20 967683328 12345 12 0 0
-disparity-fullhd none 7 none 20 967838912 12345 13 0 0
-disparity-fullhd none 7 none 20 964496384 12345 14 0 0
-disparity-fullhd none 7 none 20 967954432 12345 15 0 0
-disparity-fullhd none 7 none 20 965618496 12345 16 0 0
-disparity-fullhd none 7 none 20 968003008 12345 17 0 0
-disparity-fullhd none 7 none 20 967080000 12345 18 0 0
-disparity-fullhd none 7 none 20 965547456 12345 19 0 0
diff --git a/SD-VBS/benchmarks/disparity/src/c/script_disparity.c b/SD-VBS/benchmarks/disparity/src/c/script_disparity.c
index 431c02c..7d45ada 100644
--- a/SD-VBS/benchmarks/disparity/src/c/script_disparity.c
+++ b/SD-VBS/benchmarks/disparity/src/c/script_disparity.c
@@ -28,9 +28,7 @@ int main(int argc, char* argv[])
     int WIN_SZ=8, SHIFT=64;
     FILE* fp;
     
-    printf("Image 1: ");
     scanf("%s", im1);
-    printf("Image 2: ");
     scanf("%s", im2);
 #ifdef CHECK
     char checkFile[100] = "./expected_C.txt";
@@ -86,17 +84,15 @@ int main(int argc, char* argv[])
     Iright_moved = iSetArray(paddedRows, paddedCols, 0);
 
     range = iMallocHandle(1, 2);
-    printf("starting..\n");
-    for_each_job{
-    retDisparity = getDisparity(imleft, imright, WIN_SZ, SHIFT, 
-                   minSAD, retDisp, halfWin,
-                   IrightPadded, IleftPadded, Iright_moved,
-                   retSAD, SAD, integralImg,
-                   range);
+    for_each_job {
+        retDisparity = getDisparity(imleft, imright, WIN_SZ, SHIFT,
+               minSAD, retDisp, halfWin,
+               IrightPadded, IleftPadded, Iright_moved,
+               retSAD, SAD, integralImg,
+               range);
     }
-    printf("ending\n");
 
-#ifdef CHECK   
+#ifdef CHECK
     /** Self checking - use expected.txt from data directory  **/
     {
         int tol, ret=0;