--- jsr166/src/test/loops/Integrate.java 2010/07/07 20:32:04 1.7
+++ jsr166/src/test/loops/Integrate.java 2010/09/19 12:55:37 1.8
@@ -4,14 +4,14 @@
* http://creativecommons.org/licenses/publicdomain
*/
-//import jsr166y.*;
import java.util.concurrent.*;
/**
- * Sample program using Gaussian Quadrature for numerical integration.
+ * Sample program using Guassian Quadrature for numerical integration.
* This version uses a simplified hardwired function. Inspired by a
*
* Filaments demo program.
+ *
*/
public final class Integrate {
@@ -32,15 +32,15 @@ public final class Integrate {
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)
@@ -54,28 +54,36 @@ public final class Integrate {
}
}
catch (Exception e) {
- System.out.println("Usage: java Integrate threads ");
+ 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);
long now = System.nanoTime();
- double s = ((double) (now - lastTime)) / NPS;
+ double s = ((double)(now - lastTime))/NPS;
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);
@@ -94,24 +102,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)
@@ -135,24 +143,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)
@@ -161,6 +169,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;
}
@@ -171,7 +180,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);
@@ -182,24 +191,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)
@@ -209,6 +218,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;
}
@@ -218,3 +228,5 @@ public final class Integrate {
}
}
+
+