--- jsr166/src/test/loops/Integrate.java	2009/11/03 01:04:02	1.6
+++ jsr166/src/test/loops/Integrate.java	2012/07/04 20:07:01	1.14
@@ -1,17 +1,17 @@
 /*
  * 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.*;
 
 /**
- * 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
  * <A href="http://www.cs.uga.edu/~dkl/filaments/dist.html">
  * Filaments</A> demo program.
+ *
  */
 public final class Integrate {
 
@@ -26,7 +26,7 @@ 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;
     }
 
@@ -40,7 +40,7 @@ public final class Integrate {
     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,15 +54,22 @@ public final class Integrate {
             }
         }
         catch (Exception e) {
-            System.out.println("Usage: java Integrate threads <s[erial] | d[ynamic] | f[ork] - default d>");
+            System.out.println("Usage: java Integrate3 threads <s[erial] | d[ynamic] | f[ork] - default d>");
             return;
         }
+        oneTest(procs);
+        oneTest(procs);
+        oneTest(procs);
+    }
 
-        ForkJoinPool g = new ForkJoinPool(procs);
+    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);
@@ -71,11 +78,12 @@ public final class Integrate {
             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);
@@ -161,7 +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;
             }
             return ar + recEval(l, c, fl, fc, al);
@@ -209,7 +217,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);