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.10 by jsr166, Sat Oct 16 16:22:56 2010 UTC vs.
Revision 1.15 by jsr166, Sun Oct 21 06:14:12 2012 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 java.util.concurrent.*;
# Line 11 | Line 11 | import java.util.concurrent.*;
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.
14 *
14   */
15   public final class Integrate {
16  
# Line 63 | Line 62 | public final class Integrate {
62      }
63  
64      static void oneTest(int procs) {
65 <        ForkJoinPool g = procs == 0? new ForkJoinPool() :
65 >        ForkJoinPool g = (procs == 0) ? new ForkJoinPool() :
66              new ForkJoinPool(procs);
67          System.out.println("Number of procs=" + g.getParallelism());
68          System.out.println("Integrating from " + start + " to " + end +
# Line 169 | Line 168 | public final class Integrate {
168              q.fork();
169              ar = recEval(c, r, fc, fr, ar);
170              if (!q.tryUnfork()) {
172                //                q.quietlyHelpJoin();
171                  q.quietlyJoin();
172                  return ar + q.area;
173              }
# Line 218 | 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()) {
221                //                q.quietlyHelpJoin();
219                  q.quietlyJoin();
220                  return ar + q.area;
221              }
# Line 228 | Line 225 | public final class Integrate {
225      }
226  
227   }
231
232

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines