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

3 files changed, 6 insertions, 34 deletions

diff --git a/SD-VBS/benchmarks/mser/data/cif/12345.txt b/SD-VBS/benchmarks/mser/data/cif/12345.txt
deleted file mode 100644
index 7b52a90..0000000
--- a/SD-VBS/benchmarks/mser/data/cif/12345.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-mser-cif none 23 none 5 12891520 12345 0 0 0
-mser-cif none 23 none 5 11434520 12345 1 0 0
-mser-cif none 23 none 5 11921369 12345 2 0 0
-mser-cif none 23 none 5 11482610 12345 3 0 0
-mser-cif none 23 none 5 11647417 12345 4 0 0
-mser-cif none 24 none 5 11807215 12345 0 0 0
-mser-cif none 24 none 5 10360304 12345 1 0 0
-mser-cif none 24 none 5 11100626 12345 2 0 0
-mser-cif none 24 none 5 11111977 12345 3 0 0
-mser-cif none 24 none 5 10997935 12345 4 0 0
-mser-cif none 7 none 5 10835612 12345 0 0 0
-mser-cif none 7 none 5 10002626 12345 1 0 0
-mser-cif none 7 none 5 9990102 12345 2 0 0
-mser-cif none 7 none 5 10055976 12345 3 0 0
-mser-cif none 7 none 5 10037691 12345 4 0 0
-mser-cif none 13 none 5 26715692 12345 0 0 0
-mser-cif none 13 none 5 21470796 12345 1 0 0
-mser-cif none 13 none 5 17807620 12345 2 0 0
-mser-cif none 13 none 5 12195560 12345 3 0 0
-mser-cif none 13 none 5 12070256 12345 4 0 0
diff --git a/SD-VBS/benchmarks/mser/data/fullhd/12345.txt b/SD-VBS/benchmarks/mser/data/fullhd/12345.txt
deleted file mode 100644
index b5b5ffc..0000000
--- a/SD-VBS/benchmarks/mser/data/fullhd/12345.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-mser-fullhd none 24 none 5 322513728 12345 0 0 0
-mser-fullhd none 24 none 5 314226400 12345 1 0 0
-mser-fullhd none 24 none 5 312716224 12345 2 0 0
-mser-fullhd none 24 none 5 314495680 12345 3 0 0
-mser-fullhd none 24 none 5 292962400 12345 4 0 0
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;