fix distributed KMeans bugs and add javasingle version

[IRC.git] / Robust / src / Benchmarks / Prefetch / KMeans / KMeans.java

diff --git a/Robust/src/Benchmarks/Prefetch/KMeans/KMeans.java b/Robust/src/Benchmarks/Prefetch/KMeans/KMeans.java
index 3038bf00aead86c2dcc721b13158faa5f7ec420e..8baafbd4eeb970e9177c2630d53120e374493d70 100644 (file)
--- a/Robust/src/Benchmarks/Prefetch/KMeans/KMeans.java
+++ b/Robust/src/Benchmarks/Prefetch/KMeans/KMeans.java
@@ -178,11 +178,15 @@ public class KMeans extends Thread {
 
   public void run() {
     Barrier barr = new Barrier("128.195.136.162");
+    int id;
+    GlobalArgs tmp_g_args;
+    atomic {
+      id = threadid;
+      tmp_g_args = g_args;
+    }
     while(true) {
       Barrier.enterBarrier(barr);
-      atomic {
-        Normal.work(threadid, g_args);
-      }
+      Normal.work(id, tmp_g_args);
       Barrier.enterBarrier(barr);
     }
   }
@@ -391,7 +395,8 @@ public class KMeans extends Thread {
         }
       } else if(arg.equals("-t")) {
         if(i < args.length) {
-          km.threshold = new Integer(args[i++]).intValue();
+          //km.threshold = new Integer(args[i++]).intValue();
+          km.threshold = (float) Double.parseDouble(args[i++]);
         }
       } else if(arg.equals("-i")) {
         if(i < args.length) {
@@ -402,9 +407,7 @@ public class KMeans extends Thread {
           km.isBinaryFile = new Integer(args[i++]).intValue();
         }
       } else if(arg.equals("-z")) {
-        if(i < args.length) {
-
-        }
+        km.use_zscore_transform=0;
       } else if(arg.equals("-nthreads")) {
         if(i < args.length) {
           km.nthreads = new Integer(args[i++]).intValue();
@@ -450,38 +453,60 @@ public class KMeans extends Thread {
       // transaction will never abort because it is only executed
       // on master machine and therefore the fileread native call is
       //allowed as a warning
+      j = -1;
       while ((n = inputFile.read(b)) != 0) {
-        j = -1;
         int x=0;
 
         if (oldbytes!=null) {
           //find space
+          boolean cr=false;
           for (;x < n; x++) {
             if (b[x] == ' ')
               break;
+            if(b[x] =='\n') {
+              cr=true;
+              break;
+            }
           }
           byte newbytes[]= new byte[x+oldbytes.length];
-          for(int ii=0;ii<oldbytes.length;ii++)
+          boolean isnumber=false;
+          for(int ii=0;ii<oldbytes.length;ii++) {
+            if (oldbytes[ii]>='0'&&oldbytes[ii]<='9')
+              isnumber=true;
             newbytes[ii]=oldbytes[ii];
-          for(int ii=0;ii<x;ii++)
+          }
+          for(int ii=0;ii<x;ii++) {
+            if (b[ii]>='0'&&b[ii]<='9')
+              isnumber=true;
             newbytes[ii+oldbytes.length]=b[ii];
-          x++; //skip past space
-          if (j>=0) {
-            buf[i][j]=(float)Double.parseDouble(new String(newbytes, 0, newbytes.length));
           }
-          j++;
+          if(x!=n)
+            x++; //skip past space
+          if(isnumber) {
+            if (j>=0) {
+              buf[i][j]=(float)Double.parseDouble(new String(newbytes, 0, newbytes.length));
+            }
+            j++;
+          }
+          if(cr) {
+            j=-1;
+            i++;
+          }
           oldbytes=null;
         }
 
         while (x < n) {
           int y=x;
+          boolean cr=false;
+          boolean isnumber=false;
           for(y=x;y<n;y++) {
+            if ((b[y]>='0')&&(b[y]<='9'))
+              isnumber=true;
             if (b[y]==' ')
               break;
             if (b[y]=='\n') {
-              i++;
-              j = -1;
-              x=y;//push end to current character
+              cr=true;
+              break;
             }
           }
           if (y==n) {
@@ -491,14 +516,22 @@ public class KMeans extends Thread {
               oldbytes[ii]=b[ii+x];
             break;
           }
-
           //otherwise x is beginning of character string, y is end
-          if (j>=0) {
-            buf[i][j]=(float)Double.parseDouble(new String(b,x,y-x));
+          if (isnumber) {
+            if (j>=0) {
+              buf[i][j]=(float)Double.parseDouble(new String(b,x,y-x));
+            }
+            j++;
+          }
+          if(cr) {
+            i++;//skip to next line
+            j = -1;//don't store line number
+            x=y;//skip to end of number
+            x++;//skip past return
+          } else {
+            x=y;//skip to end of number
+            x++;//skip past space
           }
-          x=y;//skip to end of number
-          x++;//skip past space
-          j++;
         }
       }
     }