--- jsr166/src/test/loops/FJPhaserJacobi.java	2009/11/03 01:04:02	1.6
+++ jsr166/src/test/loops/FJPhaserJacobi.java	2010/09/20 20:42:37	1.8
@@ -1,13 +1,6 @@
-/*
- * Written by Doug Lea with assistance from members of JCP JSR-166
- * Expert Group and released to the public domain, as explained at
- * http://creativecommons.org/licenses/publicdomain
- */
-
 // Barrier version of Jacobi iteration
 
 import java.util.concurrent.*;
-//import jsr166y.*;
 
 public class FJPhaserJacobi {
 
@@ -26,13 +19,14 @@ public class FJPhaserJacobi {
         }
 
         catch (Exception e) {
-            System.out.println("Usage: java FJPhaserJacobi <matrix size> <max steps>");
+            System.out.println("Usage: java ThreadPhaserJacobi <matrix size> <max steps>");
             return;
         }
 
         ForkJoinPool fjp = new ForkJoinPool();
+        //        int granularity = (n * n / fjp.getParallelism()) / 2;
         int granularity = n * n / fjp.getParallelism();
-        dimGran = (int) Math.sqrt(granularity);
+        dimGran = (int)(Math.sqrt(granularity));
 
         // allocate enough space for edges
         int dim = n+2;
@@ -59,7 +53,7 @@ public class FJPhaserJacobi {
             fjp.invoke(driver);
 
             long time = System.currentTimeMillis() - startTime;
-            double secs = (double) time / 1000.0;
+            double secs = ((double)time) / 1000.0;
 
             System.out.println("Compute Time: " + secs);
             System.out.println(fjp);
@@ -143,8 +137,8 @@ public class FJPhaserJacobi {
         public void compute() {
             int rows = hiRow - loRow + 1;
             int cols = hiCol - loCol + 1;
-            int rblocks = Math.round((float) rows / dimGran);
-            int cblocks = Math.round((float) cols / dimGran);
+            int rblocks = (int)(Math.round((float)rows / dimGran));
+            int cblocks = (int)(Math.round((float)cols / dimGran));
 
             int n = rblocks * cblocks;
 
@@ -177,3 +171,4 @@ public class FJPhaserJacobi {
         }
     }
 }
+