--- jsr166/src/test/loops/Integrate.java 2009/10/23 19:57:06 1.1
+++ jsr166/src/test/loops/Integrate.java 2012/10/21 06:14:12 1.15
@@ -1,10 +1,9 @@
/*
* 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.*;
/**
@@ -12,7 +11,6 @@ import java.util.concurrent.*;
* This version uses a simplified hardwired function. Inspired by a
*
* Filaments demo program.
- *
*/
public final class Integrate {
@@ -27,21 +25,21 @@ public final class Integrate {
static String forkArg = "dynamic";
// the function to integrate
- static double computeFunction(double x) {
+ static double computeFunction(double x) {
return (x * x + 1.0) * x;
}
static final double start = 0.0;
static final double end = 1536.0;
- /*
- * The number of recursive calls for
+ /*
+ * The number of recursive calls for
* integrate from start to end.
* (Empirically determined)
*/
static final int calls = 263479047;
public static void main(String[] args) throws Exception {
- int procs = Runtime.getRuntime().availableProcessors();
+ int procs = 0;
try {
if (args.length > 0)
@@ -58,16 +56,23 @@ public final class Integrate {
System.out.println("Usage: java Integrate3 threads ");
return;
}
+ oneTest(procs);
+ oneTest(procs);
+ oneTest(procs);
+ }
- ForkJoinPool g = new ForkJoinPool(procs);
- System.out.println("Integrating from " + start + " to " + end +
+ static void oneTest(int procs) {
+ ForkJoinPool g = (procs == 0) ? new ForkJoinPool() :
+ new ForkJoinPool(procs);
+ System.out.println("Number of procs=" + g.getParallelism());
+ System.out.println("Integrating from " + start + " to " + end +
" forkPolicy = " + forkArg);
long lastTime = System.nanoTime();
- for (int i = 0; i < 10; ++i) {
+ for (int i = 0; i < 20; ++i) {
double a;
if (forkPolicy == SERIAL)
a = SQuad.computeArea(g, start, end);
- else if (forkPolicy == FORK)
+ else if (forkPolicy == FORK)
a = FQuad.computeArea(g, start, end);
else
a = DQuad.computeArea(g, start, end);
@@ -76,7 +81,8 @@ public final class Integrate {
lastTime = now;
System.out.printf("Calls/sec: %12d", (long) (calls / s));
System.out.printf(" Time: %7.3f", s);
- System.out.printf(" Area: %12.1f", a);
+ System.out.printf(" Threads: %5d", g.getPoolSize());
+ // System.out.printf(" Area: %12.1f", a);
System.out.println();
}
System.out.println(g);
@@ -95,24 +101,24 @@ public final class Integrate {
final double left; // lower bound
final double right; // upper bound
double area;
-
+
SQuad(double l, double r, double a) {
this.left = l; this.right = r; this.area = a;
}
-
+
public final void compute() {
double l = left;
double r = right;
area = recEval(l, r, (l * l + 1.0) * l, (r * r + 1.0) * r, area);
}
-
+
static final double recEval(double l, double r, double fl,
double fr, double a) {
double h = (r - l) * 0.5;
double c = l + h;
- double fc = (c * c + 1.0) * c;
+ double fc = (c * c + 1.0) * c;
double hh = h * 0.5;
- double al = (fl + fc) * hh;
+ double al = (fl + fc) * hh;
double ar = (fr + fc) * hh;
double alr = al + ar;
if (Math.abs(alr - a) <= errorTolerance)
@@ -136,24 +142,24 @@ public final class Integrate {
final double left; // lower bound
final double right; // upper bound
double area;
-
+
FQuad(double l, double r, double a) {
this.left = l; this.right = r; this.area = a;
}
-
+
public final void compute() {
double l = left;
double r = right;
area = recEval(l, r, (l * l + 1.0) * l, (r * r + 1.0) * r, area);
}
-
+
static final double recEval(double l, double r, double fl,
double fr, double a) {
double h = (r - l) * 0.5;
double c = l + h;
- double fc = (c * c + 1.0) * c;
+ double fc = (c * c + 1.0) * c;
double hh = h * 0.5;
- double al = (fl + fc) * hh;
+ double al = (fl + fc) * hh;
double ar = (fr + fc) * hh;
double alr = al + ar;
if (Math.abs(alr - a) <= errorTolerance)
@@ -162,7 +168,7 @@ public final class Integrate {
q.fork();
ar = recEval(c, r, fc, fr, ar);
if (!q.tryUnfork()) {
- q.quietlyHelpJoin();
+ q.quietlyJoin();
return ar + q.area;
}
return ar + recEval(l, c, fl, fc, al);
@@ -172,7 +178,7 @@ public final class Integrate {
// ...........................
- // Version using on-demand Fork
+ // Version using on-demand Fork
static final class DQuad extends RecursiveAction {
static double computeArea(ForkJoinPool pool, double l, double r) {
DQuad q = new DQuad(l, r, 0);
@@ -183,24 +189,24 @@ public final class Integrate {
final double left; // lower bound
final double right; // upper bound
double area;
-
+
DQuad(double l, double r, double a) {
this.left = l; this.right = r; this.area = a;
}
-
+
public final void compute() {
double l = left;
double r = right;
area = recEval(l, r, (l * l + 1.0) * l, (r * r + 1.0) * r, area);
}
-
+
static final double recEval(double l, double r, double fl,
double fr, double a) {
double h = (r - l) * 0.5;
double c = l + h;
- double fc = (c * c + 1.0) * c;
+ double fc = (c * c + 1.0) * c;
double hh = h * 0.5;
- double al = (fl + fc) * hh;
+ double al = (fl + fc) * hh;
double ar = (fr + fc) * hh;
double alr = al + ar;
if (Math.abs(alr - a) <= errorTolerance)
@@ -210,7 +216,7 @@ public final class Integrate {
(q = new DQuad(l, c, al)).fork();
ar = recEval(c, r, fc, fr, ar);
if (q != null && !q.tryUnfork()) {
- q.quietlyHelpJoin();
+ q.quietlyJoin();
return ar + q.area;
}
return ar + recEval(l, c, fl, fc, al);
@@ -219,5 +225,3 @@ public final class Integrate {
}
}
-
-