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.10 by jsr166, Sat Feb 16 21:37:44 2013 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 – // Barrier version of Jacobi iteration
8 –
7   import java.util.concurrent.*;
10 – //import jsr166y.*;
8  
9 + /** Barrier version of Jacobi iteration */
10   public class FJPhaserJacobi {
11  
12      static int dimGran;
# Line 26 | Line 24 | public class FJPhaserJacobi {
24          }
25  
26          catch (Exception e) {
27 <            System.out.println("Usage: java FJPhaserJacobi <matrix size> <max steps>");
27 >            System.out.println("Usage: java ThreadPhaserJacobi <matrix size> <max steps>");
28              return;
29          }
30  
31          ForkJoinPool fjp = new ForkJoinPool();
32 +        //        int granularity = (n * n / fjp.getParallelism()) / 2;
33          int granularity = n * n / fjp.getParallelism();
34 <        dimGran = (int) Math.sqrt(granularity);
34 >        dimGran = (int)(Math.sqrt(granularity));
35  
36          // allocate enough space for edges
37          int dim = n+2;
# Line 59 | Line 58 | public class FJPhaserJacobi {
58              fjp.invoke(driver);
59  
60              long time = System.currentTimeMillis() - startTime;
61 <            double secs = (double) time / 1000.0;
61 >            double secs = ((double)time) / 1000.0;
62  
63              System.out.println("Compute Time: " + secs);
64              System.out.println(fjp);
# Line 143 | Line 142 | public class FJPhaserJacobi {
142          public void compute() {
143              int rows = hiRow - loRow + 1;
144              int cols = hiCol - loCol + 1;
145 <            int rblocks = Math.round((float) rows / dimGran);
146 <            int cblocks = Math.round((float) cols / dimGran);
145 >            int rblocks = (int)(Math.round((float)rows / dimGran));
146 >            int cblocks = (int)(Math.round((float)cols / dimGran));
147  
148              int n = rblocks * cblocks;
149  

Diff Legend

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