Moved Primes into its own folder

diff --git a/Robust/src/Tests/mlp/stephen/Primes/Test.bak b/Robust/src/Tests/mlp/stephen/Primes/Test.bak
new file mode 100755 (executable)
index 0000000..421292f
--- /dev/null
+++ b/Robust/src/Tests/mlp/stephen/Primes/Test.bak
@@ -0,0 +1,65 @@
+public class Test\r
+{\r
+    private final int MAX = 100000;\r
+\r
+    public Test(){}\r
+\r
+    public static void main(String args[]) {\r
+\r
+        System.out.println("# it starts");\r
+        Test t = new Test();\r
+        t.doSomeWork();\r
+\r
+    }\r
+\r
+    public void doSomeWork()\r
+    {\r
+        long sum = 0;\r
+        long time = System.currentTimeMillis();\r
+        \r
+        //I did the for loop this way so that each parallel thread would take\r
+        //about the same time \r
+        for(int i = 0; i < MAX/2 + 1; i++)\r
+        {\r
+               int innerSum = 0;\r
+               \r
+               {\r
+                       int oppositeNum = MAX - i;\r
+                       \r
+                       if(isPrime(i))\r
+                               innerSum += i;\r
+                       \r
+                       if(i != oppositeNum && isPrime(oppositeNum))\r
+                               innerSum += MAX - i;\r
+               }\r
+               \r
+               sum += innerSum;\r
+        }\r
+\r
+        System.out.println("The sum of primes from 1 to " + MAX + " is " + sum + ".");\r
+        System.out.println("Note: 1 is counted as a prime.");\r
+        System.out.println("Time Consumed (Not Parallelized): " + (System.currentTimeMillis() - time) + " ms");\r
+\r
+    }\r
+    \r
+\r
+    private boolean isPrime(int number)\r
+    {\r
+       //handles special cases\r
+        if(number < 1)\r
+            return false;\r
+\r
+        if (number < 3)\r
+               return true;\r
+\r
+        //Tests the rest of the numbers\r
+        for(int i = 2; i < number; i++)\r
+        {\r
+            if(number%i == 0)\r
+                return false;\r
+        }\r
+        \r
+        return true;\r
+    }\r
+\r
+}\r

diff --git a/Robust/src/Tests/mlp/stephen/Primes/Test.java b/Robust/src/Tests/mlp/stephen/Primes/Test.java
new file mode 100755 (executable)
index 0000000..409319e
--- /dev/null
+++ b/Robust/src/Tests/mlp/stephen/Primes/Test.java
@@ -0,0 +1,77 @@
+public class Test\r
+{\r
+    //Apparently global variables are not yet supported\r
+    //private int MAX = 100000;\r
+\r
+    public Test(){}\r
+\r
+    public static void main(String args[]) {\r
+\r
+        System.out.println("# it starts");\r
+        Test t = new Test();\r
+        t.doSomeWork();\r
+\r
+    }\r
+\r
+    public void doSomeWork()\r
+    {\r
+        int MAX = 100000;\r
+       int ittr = 100;\r
+\r
+        long sum = 0;\r
+        long time = System.currentTimeMillis();\r
+        \r
+        //I did the for loop this way so that each parallel thread would take\r
+        //about the same time \r
+        for(int i = 0; i < MAX/2 + 1; i += ittr)\r
+        {\r
+               int innerSum = 0;\r
+               \r
+               sese a \r
+               {\r
+                   for(int j = i; (j < i + ittr) && j < MAX/2 + 1; j++)\r
+                       {\r
+               \r
+                           int oppositeNum = MAX - j;\r
+                       \r
+                           if(isPrime(j))\r
+                               innerSum += j;\r
+                       \r
+                           if(i != oppositeNum && isPrime(oppositeNum))\r
+                               innerSum += oppositeNum;\r
+                       }\r
+               }\r
+            \r
+               sese b \r
+               {\r
+                       sum += innerSum;\r
+               }\r
+        }\r
+\r
+        System.out.println("The sum of primes from 1 to " + MAX + " is " + sum + ".");\r
+        System.out.println("Note: 1 is counted as a prime.");\r
+        System.out.println("Time Consumed: " + (System.currentTimeMillis() - time) + " ms");\r
+\r
+    }\r
+    \r
+\r
+    private boolean isPrime(int number)\r
+    {\r
+       //handles special cases\r
+        if(number < 1)\r
+            return false;\r
+\r
+        if (number < 3)\r
+               return true;\r
+\r
+        //Tests the rest of the numbers\r
+        for(int i = 2; i < number; i++)\r
+        {\r
+            if(number%i == 0)\r
+                return false;\r
+        }\r
+        \r
+        return true;\r
+    }\r
+\r
+}\r

diff --git a/Robust/src/Tests/mlp/stephen/Primes/Test.original b/Robust/src/Tests/mlp/stephen/Primes/Test.original
new file mode 100644 (file)
index 0000000..d71d4b4
--- /dev/null
+++ b/Robust/src/Tests/mlp/stephen/Primes/Test.original
@@ -0,0 +1,65 @@
+public class Test\r
+{\r
+    private final int MAX = 100000;\r
+\r
+    public Test(){}\r
+\r
+    public static void main(String args[]) {\r
+\r
+        System.out.println("# it starts");\r
+        Test t = new Test();\r
+        t.doSomeWork();\r
+\r
+    }\r
+\r
+    public void doSomeWork()\r
+    {\r
+        long sum = 0;\r
+        long time = System.currentTimeMillis();\r
+        \r
+        //I did the for loop this way so that each parallel thread would take\r
+        //about the same time \r
+        for(int i = 0; i < MAX/2 + 1; i++)\r
+        {\r
+               int innerSum = 0;\r
+               \r
+               {\r
+                       int oppositeNum = MAX - i;\r
+                       \r
+                       if(isPrime(i))\r
+                               innerSum += i;\r
+                       \r
+                       if(i != oppositeNum && isPrime(oppositeNum))\r
+                               innerSum += oppositeNum;\r
+               }\r
+               \r
+               sum += innerSum;\r
+        }\r
+\r
+        System.out.println("The sum of primes from 1 to " + MAX + " is " + sum + ".");\r
+        System.out.println("Note: 1 is counted as a prime.");\r
+        System.out.println("Time Consumed (Not Parallelized): " + (System.currentTimeMillis() - time) + " ms");\r
+\r
+    }\r
+    \r
+\r
+    private boolean isPrime(int number)\r
+    {\r
+       //handles special cases\r
+        if(number < 1)\r
+            return false;\r
+\r
+        if (number < 3)\r
+               return true;\r
+\r
+        //Tests the rest of the numbers\r
+        for(int i = 2; i < number; i++)\r
+        {\r
+            if(number%i == 0)\r
+                return false;\r
+        }\r
+        \r
+        return true;\r
+    }\r
+\r
+}\r

diff --git a/Robust/src/Tests/mlp/stephen/Primes/Test.serial b/Robust/src/Tests/mlp/stephen/Primes/Test.serial
new file mode 100755 (executable)
index 0000000..9802b4e
--- /dev/null
+++ b/Robust/src/Tests/mlp/stephen/Primes/Test.serial
@@ -0,0 +1,67 @@
+public class Test\r
+{\r
+    //Apparently global variables are not yet supported\r
+    //private int MAX = 100000;\r
+\r
+    public Test(){}\r
+\r
+    public static void main(String args[]) {\r
+\r
+        System.out.println("# it starts");\r
+        Test t = new Test();\r
+        t.doSomeWork();\r
+\r
+    }\r
+\r
+    public void doSomeWork()\r
+    {\r
+        int MAX = 100000;\r
+        long sum = 0;\r
+        long time = System.currentTimeMillis();\r
+        \r
+        //I did the for loop this way so that each parallel thread would take\r
+        //about the same time \r
+        for(int i = 0; i < MAX/2 + 1; i++)\r
+        {\r
+               int innerSum = 0;\r
+               \r
+               {\r
+                       int oppositeNum = MAX - i;\r
+                       \r
+                       if(isPrime(i))\r
+                               innerSum += i;\r
+                       \r
+                       if(i != oppositeNum && isPrime(oppositeNum))\r
+                               innerSum += oppositeNum;\r
+               }\r
+               \r
+               sum += innerSum;\r
+        }\r
+\r
+        System.out.println("The sum of primes from 1 to " + MAX + " is " + sum + ".");\r
+        System.out.println("Note: 1 is counted as a prime.");\r
+        System.out.println("Time Consumed (Not Parallelized): " + (System.currentTimeMillis() - time) + " ms");\r
+\r
+    }\r
+    \r
+\r
+    private boolean isPrime(int number)\r
+    {\r
+       //handles special cases\r
+        if(number < 1)\r
+            return false;\r
+\r
+        if (number < 3)\r
+               return true;\r
+\r
+        //Tests the rest of the numbers\r
+        for(int i = 2; i < number; i++)\r
+        {\r
+            if(number%i == 0)\r
+                return false;\r
+        }\r
+        \r
+        return true;\r
+    }\r
+\r
+}\r

diff --git a/Robust/src/Tests/mlp/stephen/Primes/makefile b/Robust/src/Tests/mlp/stephen/Primes/makefile
new file mode 100644 (file)
index 0000000..ce9662a
--- /dev/null
+++ b/Robust/src/Tests/mlp/stephen/Primes/makefile
@@ -0,0 +1,29 @@
+PROGRAM=test
+
+SOURCE_FILES=Test.java
+
+BUILDSCRIPT=../../../buildscript
+
+USEMLP=  -mlp 8 2 -mlpdebug  # use to turn mlp on and off and make sure rest of build not broken
+BSFLAGS= -32bit -nooptimize -debug -garbagestats -mainclass Test 
+OWNERSHIP= -ownership -ownallocdepth 1 -enable-assertions  -methodeffects -flatirusermethods -ownwritedots final -ownaliasfile aliases.txt 
+
+default:
+       ../../../buildscript -nojava $(USEMLP) $(BSFLAGS) $(OWNERSHIP) -o $(PROGRAM) $(SOURCE_FILES)
+
+single:
+       ../../../buildscript $(BSFLAGS) -o $(PROGRAM) $(SOURCE_FILES)
+
+java:
+       ../../../buildscript $(USEMLP) $(BSFLAGS) $(OWNERSHIP) -o $(PROGRAM) $(SOURCE_FILES)
+
+clean:
+       rm -f  $(PROGRAM).bin
+       rm -fr tmpbuilddirectory
+       rm -f  *~
+       rm -f  *.dot
+       rm -f  *.png
+       rm -f  *.txt
+       rm -f  aliases.txt
+       rm -f  mlpReport*txt
+       rm -f  results*txt