--- jsr166/src/test/loops/MatrixMultiply.java 2010/10/16 16:22:57 1.3 +++ jsr166/src/test/loops/MatrixMultiply.java 2015/01/15 18:34:19 1.8 @@ -1,13 +1,11 @@ /* * Written by Doug Lea with assistance from members of JCP JSR-166 * Expert Group and released to the public domain, as explained at - * http://creativecommons.org/licenses/publicdomain + * http://creativecommons.org/publicdomain/zero/1.0/ */ //import jsr166y.*; import java.util.concurrent.*; -import java.util.concurrent.TimeUnit; - /** * Divide and Conquer matrix multiply demo @@ -56,7 +54,7 @@ public class MatrixMultiply { return; } - ForkJoinPool pool = procs == 0? new ForkJoinPool() : + ForkJoinPool pool = (procs == 0) ? new ForkJoinPool() : new ForkJoinPool(procs); System.out.println("procs: " + pool.getParallelism() + " n: " + n + " granularity: " + granularity + @@ -80,7 +78,6 @@ public class MatrixMultiply { pool.shutdown(); } - // To simplify checking, fill with all 1's. Answer should be all n's. static void init(float[][] a, float[][] b, int n) { for (int i = 0; i < n; ++i) { @@ -111,8 +108,6 @@ public class MatrixMultiply { * A21 | A22 B21 | B21 A21*B11 | A21*B21 A22*B21 | A22*B22 * */ - - static class Multiplier extends RecursiveAction { final float[][] A; // Matrix A final int aRow; // first row of current quadrant of A @@ -250,6 +245,4 @@ public class MatrixMultiply { snd.invoke(); } } - - }