merged

9 files changed, 51 insertions, 80 deletions

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;
diff --git a/SD-VBS/benchmarks/localization/src/c/script_localization.c b/SD-VBS/benchmarks/localization/src/c/script_localization.c
index 3392320..ed37132 100644
--- a/SD-VBS/benchmarks/localization/src/c/script_localization.c
+++ b/SD-VBS/benchmarks/localization/src/c/script_localization.c
@@ -41,7 +41,6 @@ int main(int argc, char* argv[])
 
     char im1[100];
 
-    printf("Input txt File: ");
     scanf("%s", im1);
 
     fid = readFile(im1);
@@ -83,11 +82,10 @@ int main(int argc, char* argv[])
     F2D *randn;
 
     randn = randWrapper(n,3);
-    printf("start\n");
-    for_each_job{
-        fResetArray(pos,n, 3, 0);
-        fResetArray(vel,n, 3, 0);
-        fResetArray(ones,n,1,1);
+    for_each_job {
+        fResetArray(pos,n, 3, 0);
+        fResetArray(vel,n, 3, 0);
+        fResetArray(ones,n,1,1);
 
         {
             int j;
@@ -95,7 +93,7 @@ int main(int argc, char* argv[])
                 for(j=0; j<3; j++)
                     subsref(vel, i, j) += subsref(randn,i,j) * STDDEV_ODOVel;
 
-        }  
+        }
 
 
  
@@ -486,17 +484,15 @@ int main(int argc, char* argv[])
                 subsref(resultMat,1,icount) = velOut;
                 subsref(resultMat,2,icount) = posOut;
             }
-    
+
             fFreeHandle(sData);
-    
-        
+
             if (asubsref(isEOF,0) == 1)
                break;
         }
     }
-    printf("end..\n");
 
-#ifdef CHECK   
+#ifdef CHECK
     
     // Self checking - use expected.txt from data directory
     {
diff --git a/SD-VBS/benchmarks/mser/src/c/script_mser.c b/SD-VBS/benchmarks/mser/src/c/script_mser.c
index d4a98cd..3e98f86 100644
--- a/SD-VBS/benchmarks/mser/src/c/script_mser.c
+++ b/SD-VBS/benchmarks/mser/src/c/script_mser.c
@@ -33,7 +33,6 @@ int main(int argc, char* argv[])
 
     int ndims, nel, gdl, nmer;
 
-    printf("Input Image: ");
     scanf("%s", im1);
 
     I = readImage(im1);
@@ -74,19 +73,17 @@ int main(int argc, char* argv[])
 
 
     out = iMallocHandle(1, nmer);
-    printf("start\n");
-    for_each_job{
+    for_each_job {
         idx = mser(It, 2, subs_pt, nsubs_pt, strides_pt, visited_pt, dims, 
-                   joins_pt,
+                   joins_pt,
                    regions_pt,
-                   pairs_pt,
+                   pairs_pt,
                    forest_pt,
-                   acc_pt, ell_pt,
+                   acc_pt, ell_pt,
                    out);
     }
-    printf("end..\n");
-    
-#ifdef CHECK   
+
+#ifdef CHECK
     /** Self checking - use expected.txt from data directory  **/
     {
         int tol, ret=0;
diff --git a/SD-VBS/benchmarks/multi_ncut/src/c/script_multi_ncut.c b/SD-VBS/benchmarks/multi_ncut/src/c/script_multi_ncut.c
index e4f7912..77c6b71 100644
--- a/SD-VBS/benchmarks/multi_ncut/src/c/script_multi_ncut.c
+++ b/SD-VBS/benchmarks/multi_ncut/src/c/script_multi_ncut.c
@@ -28,7 +28,6 @@ int main(int argc, char* argv[])
 
     F2D *imageOut, *tempOut;
     F2D *edgeWeights, *in;
-    printf("Input image: ");
     scanf("%s", im1);
     im = readImage(im1);
 
@@ -50,13 +49,12 @@ int main(int argc, char* argv[])
     u->elts = (uni_elt*)malloc(sizeof(uni_elt)*num_vertices);
     output = iMallocHandle(height, width);
 
-    printf("start\n");
     for_each_job{
-        seg = segment_image(im, sigma, k, min_size, num_ccs, segments, edges, imageOut, tempOut, kernel, edgeWeights, in, ind, u, output);
+        seg = segment_image(im, sigma, k,