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

Comparing jsr166/src/test/loops/FJPhaserJacobi.java (file contents):
Revision 1.6 by jsr166, Tue Nov 3 01:04:02 2009 UTC vs.
Revision 1.9 by jsr166, Wed Jul 4 20:07:01 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
5 – */
6 –
1   // Barrier version of Jacobi iteration
2  
3   import java.util.concurrent.*;
10 – //import jsr166y.*;
4  
5   public class FJPhaserJacobi {
6  
# Line 26 | Line 19 | public class FJPhaserJacobi {
19          }
20  
21          catch (Exception e) {
22 <            System.out.println("Usage: java FJPhaserJacobi <matrix size> <max steps>");
22 >            System.out.println("Usage: java ThreadPhaserJacobi <matrix size> <max steps>");
23              return;
24          }
25  
26          ForkJoinPool fjp = new ForkJoinPool();
27 +        //        int granularity = (n * n / fjp.getParallelism()) / 2;
28          int granularity = n * n / fjp.getParallelism();
29 <        dimGran = (int) Math.sqrt(granularity);
29 >        dimGran = (int)(Math.sqrt(granularity));
30  
31          // allocate enough space for edges
32          int dim = n+2;
# Line 59 | Line 53 | public class FJPhaserJacobi {
53              fjp.invoke(driver);
54  
55              long time = System.currentTimeMillis() - startTime;
56 <            double secs = (double) time / 1000.0;
56 >            double secs = ((double)time) / 1000.0;
57  
58              System.out.println("Compute Time: " + secs);
59              System.out.println(fjp);
# Line 143 | Line 137 | public class FJPhaserJacobi {
137          public void compute() {
138              int rows = hiRow - loRow + 1;
139              int cols = hiCol - loCol + 1;
140 <            int rblocks = Math.round((float) rows / dimGran);
141 <            int cblocks = Math.round((float) cols / dimGran);
140 >            int rblocks = (int)(Math.round((float)rows / dimGran));
141 >            int cblocks = (int)(Math.round((float)cols / dimGran));
142  
143              int n = rblocks * cblocks;
144  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines