X-Git-Url: http://plrg.eecs.uci.edu/git/?p=IRC.git;a=blobdiff_plain;f=Robust%2Fsrc%2FBenchmarks%2FoooJava%2Fmergesort%2FBMergeSort4.java;h=a7fb956fc1cb991f329941ee8090e088001de176;hp=899a3bbf128fd5ee94417f2069d58084b3ebfb6d;hb=b8806556ab04f603adf089c7bd86b92a63964c40;hpb=4c0d447e6e01694c4bc2aaa7e9edcc6c8d22f109 diff --git a/Robust/src/Benchmarks/oooJava/mergesort/BMergeSort4.java b/Robust/src/Benchmarks/oooJava/mergesort/BMergeSort4.java index 899a3bbf..a7fb956f 100644 --- a/Robust/src/Benchmarks/oooJava/mergesort/BMergeSort4.java +++ b/Robust/src/Benchmarks/oooJava/mergesort/BMergeSort4.java @@ -3,22 +3,30 @@ */ public class MergeSort4 extends MergeSort { + + public boolean validationTest; public static void main(String[] args) { int problemSize = 4194304; int parallelBranch=32; + + MergeSort4 sort = new MergeSort4(); + if (args.length > 0) { problemSize = Integer.parseInt(args[0]); } if (args.length > 1) { parallelBranch = Integer.parseInt(args[1]); } - MergeSort4 sort = new MergeSort4(); + if (args.length > 2){ + sort.validationTest=true; + } sort.run(problemSize,parallelBranch); } public MergeSort4() { super(); + validationTest=false; } public void runWorkAndTest() { @@ -28,9 +36,11 @@ public class MergeSort4 extends MergeSort { long endT=System.currentTimeMillis(); System.out.println("running time="+(endT-startT)); } -// sese test{ -// checkSorted(output); -// } + if(validationTest){ + sese test{ + checkSorted(output); + } + } } public int[] serializedSort(int A[], int low, int high) {