fixed Mail constructor

diff --git a/Robust/src/Benchmarks/Distributed/SpamFilter/Mail.java b/Robust/src/Benchmarks/Distributed/SpamFilter/Mail.java
index 98890c41f748d8b76f0f689f78fc7be90ccd52d7..81f56691a632444e46f1dedc5354c5697f4db8d8 100644 (file)
--- a/Robust/src/Benchmarks/Distributed/SpamFilter/Mail.java
+++ b/Robust/src/Benchmarks/Distributed/SpamFilter/Mail.java
@@ -65,14 +65,15 @@ public class Mail {
       }
     } // parsed messageID, To, from, cc, Title
 
+
     if(!chk)
       System.out.println("no line read");
 
 
     body = new String();
-    byte[] readBody = new byte[1000000];
+    byte[] readBody = new byte[256];
 
-    while((fileinput.read(readBody)!= -1))
+    while((fileinput.read(readBody)>0))
     {
       body.concat(new String(readBody));
     }

diff --git a/Robust/src/Benchmarks/Distributed/SpamFilter/SpamFilter.java b/Robust/src/Benchmarks/Distributed/SpamFilter/SpamFilter.java
index db7ab44888c10cd9f637c184a8048b26add0cfd0..a4bc9e23fd44b2c9751df0f1c9516d32f4e73cca 100644 (file)
--- a/Robust/src/Benchmarks/Distributed/SpamFilter/SpamFilter.java
+++ b/Robust/src/Benchmarks/Distributed/SpamFilter/SpamFilter.java
@@ -34,6 +34,8 @@ public class SpamFilter extends Thread {
     int niter;
     int nemails;
     int thid;
+    int correct=0;
+    int wrong=0;
     atomic {
       niter=numiter;
       nemails=numemail;
@@ -44,6 +46,8 @@ public class SpamFilter extends Thread {
     Random myrand = new Random(0);
 
     for(int i=0; i<niter; i++) {
+      correct =0;
+      wrong = 0;
       for(int j=0; j<nemails; j++) {
         int pickemail = rand.nextInt(100);
 
@@ -73,14 +77,18 @@ public class SpamFilter extends Thread {
         //---- get user's take on email and send feedback ------
         boolean userAnswer = email.getIsSpam();
 
-        //System.out.println("userAnswer= " + userAnswer + " filterAnswer= " + filterAnswer);
+ //       System.out.println("userAnswer= " + userAnswer + " filterAnswer= " + filterAnswer);
 
         if(filterAnswer != userAnswer) {
+          wrong++;
           atomic {
             sendFeedBack(signatures, userAnswer, thid);
           }
         }
+        else 
+          correct++;
       } //end num emails
+      System.out.println((i+1)+"th iteration correct = " + correct + " Wrong = " + wrong + " percentage = " + ((float)correct/(float)nemails));
     }//end num iter
   }