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.4 by jsr166, Thu Oct 29 23:16:47 2009 UTC vs.
Revision 1.7 by dl, Wed Jul 7 20:32:04 2010 UTC

# Line 12 | Line 12 | import java.util.concurrent.*;
12   * This version uses a simplified hardwired function.  Inspired by a
13   * <A href="http://www.cs.uga.edu/~dkl/filaments/dist.html">
14   * Filaments</A> demo program.
15 *
15   */
16   public final class Integrate {
17  
# Line 72 | Line 71 | public final class Integrate {
71              else
72                  a = DQuad.computeArea(g, start, end);
73              long now = System.nanoTime();
74 <            double s = ((double)(now - lastTime))/NPS;
74 >            double s = ((double) (now - lastTime)) / NPS;
75              lastTime = now;
76              System.out.printf("Calls/sec: %12d", (long) (calls / s));
77              System.out.printf(" Time: %7.3f", s);
# Line 162 | Line 161 | public final class Integrate {
161              q.fork();
162              ar = recEval(c, r, fc, fr, ar);
163              if (!q.tryUnfork()) {
164 <                q.quietlyHelpJoin();
164 >                q.quietlyJoin();
165                  return ar + q.area;
166              }
167              return ar + recEval(l, c, fl, fc, al);
# Line 210 | Line 209 | public final class Integrate {
209                  (q = new DQuad(l, c, al)).fork();
210              ar = recEval(c, r, fc, fr, ar);
211              if (q != null && !q.tryUnfork()) {
212 <                q.quietlyHelpJoin();
212 >                q.quietlyJoin();
213                  return ar + q.area;
214              }
215              return ar + recEval(l, c, fl, fc, al);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines