--- jsr166/src/test/loops/FJJacobi.java 2010/10/22 05:18:31 1.9 +++ jsr166/src/test/loops/FJJacobi.java 2015/01/15 18:34:19 1.12 @@ -1,7 +1,7 @@ /* * 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/ */ // Jacobi iteration on a mesh. Based loosely on a Filaments demo @@ -10,7 +10,8 @@ import java.util.concurrent.*; public class FJJacobi { - static final int DEFAULT_GRANULARITY = 4096; // 1024; + // static final int DEFAULT_GRANULARITY = 4096; + static final int DEFAULT_GRANULARITY = 256; /** * The maximum number of matrix cells @@ -76,7 +77,6 @@ public class FJJacobi { } } - abstract static class MatrixTree extends RecursiveAction { // maximum difference between old and new values double maxDiff; @@ -97,7 +97,6 @@ public class FJJacobi { } - static final class LeafNode extends MatrixTree { final double[][] A; // matrix to get old values from final double[][] B; // matrix to put new values into @@ -161,7 +160,6 @@ public class FJJacobi { } } - static final class TwoNode extends MatrixTree { final MatrixTree q1; final MatrixTree q2; @@ -177,7 +175,6 @@ public class FJJacobi { } - static final class Driver extends RecursiveAction { MatrixTree mat; double[][] A; double[][] B; @@ -249,6 +246,4 @@ public class FJJacobi { System.out.println("max diff after " + steps + " steps = " + md); } } - - }