ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/loops/Integrate.java
(Generate patch)

Comparing jsr166/src/test/loops/Integrate.java (file contents):
Revision 1.3 by jsr166, Thu Oct 29 23:11:03 2009 UTC vs.
Revision 1.17 by jsr166, Thu Jan 15 18:34:19 2015 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   */
6  
7 //import jsr166y.*;
7   import java.util.concurrent.*;
8  
9   /**
10 < * Sample program using Gaussian Quadrature for numerical integration.
10 > * Sample program using Guassian Quadrature for numerical integration.
11   * This version uses a simplified hardwired function.  Inspired by a
12   * <A href="http://www.cs.uga.edu/~dkl/filaments/dist.html">
13   * Filaments</A> demo program.
15 *
14   */
15   public final class Integrate {
16  
# Line 26 | Line 24 | public final class Integrate {
24      static int forkPolicy = DYNAMIC;
25      static String forkArg = "dynamic";
26  
27 <    // the function to integrate
28 <    static double computeFunction(double x)  {
27 >    /** the function to integrate */
28 >    static double computeFunction(double x) {
29          return (x * x + 1.0) * x;
30      }
31  
32      static final double start = 0.0;
33      static final double end = 1536.0;
34 <    /*
34 >
35 >    /**
36       * The number of recursive calls for
37       * integrate from start to end.
38       * (Empirically determined)
# Line 41 | Line 40 | public final class Integrate {
40      static final int calls = 263479047;
41  
42      public static void main(String[] args) throws Exception {
43 <        int procs = Runtime.getRuntime().availableProcessors();
43 >        int procs = 0;
44  
45          try {
46              if (args.length > 0)
# Line 58 | Line 57 | public final class Integrate {
57              System.out.println("Usage: java Integrate3 threads <s[erial] | d[ynamic] | f[ork] - default d>");
58              return;
59          }
60 +        oneTest(procs);
61 +        oneTest(procs);
62 +        oneTest(procs);
63 +    }
64  
65 <        ForkJoinPool g = new ForkJoinPool(procs);
65 >    static void oneTest(int procs) {
66 >        ForkJoinPool g = (procs == 0) ? new ForkJoinPool() :
67 >            new ForkJoinPool(procs);
68 >        System.out.println("Number of procs=" + g.getParallelism());
69          System.out.println("Integrating from " + start + " to " + end +
70                             " forkPolicy = " + forkArg);
71          long lastTime = System.nanoTime();
72 <        for (int i = 0; i < 10; ++i) {
72 >        for (int i = 0; i < 20; ++i) {
73              double a;
74              if (forkPolicy == SERIAL)
75                  a = SQuad.computeArea(g, start, end);
# Line 76 | Line 82 | public final class Integrate {
82              lastTime = now;
83              System.out.printf("Calls/sec: %12d", (long) (calls / s));
84              System.out.printf(" Time: %7.3f", s);
85 <            System.out.printf(" Area: %12.1f", a);
85 >            System.out.printf(" Threads: %5d", g.getPoolSize());
86 >            //            System.out.printf(" Area: %12.1f", a);
87              System.out.println();
88          }
89          System.out.println(g);
90          g.shutdown();
91      }
92  
86
93      // Sequential version
94      static final class SQuad extends RecursiveAction {
95          static double computeArea(ForkJoinPool pool, double l, double r) {
# Line 162 | Line 168 | public final class Integrate {
168              q.fork();
169              ar = recEval(c, r, fc, fr, ar);
170              if (!q.tryUnfork()) {
171 <                q.quietlyHelpJoin();
171 >                q.quietlyJoin();
172                  return ar + q.area;
173              }
174              return ar + recEval(l, c, fl, fc, al);
# Line 210 | Line 216 | public final class Integrate {
216                  (q = new DQuad(l, c, al)).fork();
217              ar = recEval(c, r, fc, fr, ar);
218              if (q != null && !q.tryUnfork()) {
219 <                q.quietlyHelpJoin();
219 >                q.quietlyJoin();
220                  return ar + q.area;
221              }
222              return ar + recEval(l, c, fl, fc, al);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines