run-doj-validation-test.sh: a single script that performs validation tests for all...

[IRC.git] / Robust / src / Benchmarks / oooJava / mergesort / BMergeSort4.java

diff --git a/Robust/src/Benchmarks/oooJava/mergesort/BMergeSort4.java b/Robust/src/Benchmarks/oooJava/mergesort/BMergeSort4.java
index 899a3bbf128fd5ee94417f2069d58084b3ebfb6d..a7fb956fc1cb991f329941ee8090e088001de176 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/mergesort/BMergeSort4.java
+++ b/Robust/src/Benchmarks/oooJava/mergesort/BMergeSort4.java
@@ -3,22 +3,30 @@
  */\r
 \r
 public class MergeSort4 extends MergeSort {\r
  */\r
 \r
 public class MergeSort4 extends MergeSort {\r

+  \r
+  public  boolean validationTest;\r

 \r
   public static void main(String[] args) {\r
     int problemSize = 4194304;\r
     int parallelBranch=32;\r
 \r
   public static void main(String[] args) {\r
     int problemSize = 4194304;\r
     int parallelBranch=32;\r

+    \r
+    MergeSort4 sort = new MergeSort4();\r
+    \r

     if (args.length > 0) {\r
       problemSize = Integer.parseInt(args[0]);\r
     }\r
     if (args.length > 1) {\r
       parallelBranch = Integer.parseInt(args[1]);\r
     }\r
     if (args.length > 0) {\r
       problemSize = Integer.parseInt(args[0]);\r
     }\r
     if (args.length > 1) {\r
       parallelBranch = Integer.parseInt(args[1]);\r
     }\r

-    MergeSort4 sort = new MergeSort4();\r
+    if (args.length > 2){\r
+     sort.validationTest=true;\r
+    }\r

     sort.run(problemSize,parallelBranch);\r
   }\r
 \r
   public MergeSort4() {\r
     super();\r
     sort.run(problemSize,parallelBranch);\r
   }\r
 \r
   public MergeSort4() {\r
     super();\r

+    validationTest=false;\r

   }\r
 \r
   public void runWorkAndTest() {\r
   }\r
 \r
   public void runWorkAndTest() {\r


@@ -28,9 +36,11 @@ public class MergeSort4 extends MergeSort {
       long endT=System.currentTimeMillis();\r
       System.out.println("running time="+(endT-startT));\r
     }\r
       long endT=System.currentTimeMillis();\r
       System.out.println("running time="+(endT-startT));\r
     }\r

-//    sese test{\r
-//      checkSorted(output);\r
-//    }\r
+    if(validationTest){\r
+      sese test{\r
+        checkSorted(output);\r
+      }\r
+    }\r

   }\r
 \r
   public int[] serializedSort(int A[], int low, int high) {\r
   }\r
 \r
   public int[] serializedSort(int A[], int low, int high) {\r