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

3 files changed, 8 insertions, 32 deletions

diff --git a/SD-VBS/benchmarks/localization/data/cif/12345.txt b/SD-VBS/benchmarks/localization/data/cif/12345.txt
deleted file mode 100644
index 3db1af2..0000000
--- a/SD-VBS/benchmarks/localization/data/cif/12345.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-localization-cif none 9 none 5 48076352 12345 0 0 0
-localization-cif none 9 none 5 43361112 12345 1 0 0
-localization-cif none 9 none 5 43366440 12345 2 0 0
-localization-cif none 9 none 5 43370196 12345 3 0 0
-localization-cif none 9 none 5 43342796 12345 4 0 0
-localization-cif none 9 none 5 49304636 12345 0 0 0
-localization-cif none 9 none 5 43263656 12345 1 0 0
-localization-cif none 9 none 5 43311788 12345 2 0 0
-localization-cif none 9 none 5 45305660 12345 3 0 0
-localization-cif none 9 none 5 45991472 12345 4 0 0
-localization-cif none 13 none 5 50834232 12345 0 0 0
-localization-cif none 13 none 5 45950604 12345 1 0 0
-localization-cif none 13 none 5 45906792 12345 2 0 0
-localization-cif none 13 none 5 45996860 12345 3 0 0
-localization-cif none 13 none 5 52359620 12345 4 0 0
diff --git a/SD-VBS/benchmarks/localization/data/vga/12345.txt b/SD-VBS/benchmarks/localization/data/vga/12345.txt
deleted file mode 100644
index af25656..0000000
--- a/SD-VBS/benchmarks/localization/data/vga/12345.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-localization-vga none 29 none 5 162689456 12345 0 0 0
-localization-vga none 29 none 5 152758336 12345 1 0 0
-localization-vga none 29 none 5 152857504 12345 2 0 0
-localization-vga none 29 none 5 152713328 12345 3 0 0
-localization-vga none 29 none 5 152901152 12345 4 0 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
     {