--- jsr166/src/test/loops/TSPExchangerTest.java	2009/10/29 23:11:03	1.7
+++ jsr166/src/test/loops/TSPExchangerTest.java	2011/12/05 04:08:46	1.13
@@ -1,7 +1,7 @@
 /*
  * Written by Doug Lea and Bill Scherer with assistance from members
  * of JCP JSR-166 Expert Group and released to the public domain, as
- * explained at http://creativecommons.org/licenses/publicdomain
+ * explained at http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 import java.util.*;
@@ -225,7 +225,7 @@ public class TSPExchangerTest {
         //        Thread.sleep(100);
 
         long elapsed = stopTime - startTime;
-        double secs = (double)elapsed / 1000000000.0;
+        double secs = (double) elapsed / 1000000000.0;
         p.printSnapshot(secs);
     }
 
@@ -300,7 +300,7 @@ public class TSPExchangerTest {
          */
         void printSnapshot(double secs) {
             int xs = totalExchanges();
-            long rate = (xs == 0)? 0L : (long)((secs * 1000000000.0) / xs);
+            long rate = (xs == 0) ? 0L : (long) ((secs * 1000000000.0) / xs);
             Chromosome bestc = subpops[0].chromosomes[0];
             Chromosome worstc = bestc;
             for (int k = 0; k < subpops.length; ++k) {
@@ -577,9 +577,9 @@ public class TSPExchangerTest {
         }
 
         public int compareTo(Object x) { // to enable sorting
-            int xf = ((Chromosome)x).fitness;
+            int xf = ((Chromosome) x).fitness;
             int f = fitness;
-            return ((f == xf)? 0 :((f < xf)? -1 : 1));
+            return ((f == xf) ? 0 :((f < xf) ? -1 : 1));
         }
 
         void recalcFitness() {
@@ -592,7 +592,7 @@ public class TSPExchangerTest {
                 f += cities.distanceBetween(p, n);
                 p = n;
             }
-            fitness = (int)(f / len);
+            fitness = (int) (f / len);
         }
 
         /**
@@ -661,36 +661,36 @@ public class TSPExchangerTest {
 
             for (int i = 0; i < n; i++) {
                 for (int j = 0; j < n; j++) {
-                    double dx = (double)xPts[i] - (double)xPts[j];
-                    double dy = (double)yPts[i] - (double)yPts[j];
+                    double dx = (double) xPts[i] - (double) xPts[j];
+                    double dy = (double) yPts[i] - (double) yPts[j];
                     double dd = Math.hypot(dx, dy) / 2.0;
                     long ld = Math.round(dd);
-                    distances[i][j] = (ld >= Integer.MAX_VALUE)?
-                        Integer.MAX_VALUE : (int)ld;
+                    distances[i][j] = (ld >= Integer.MAX_VALUE) ?
+                        Integer.MAX_VALUE : (int) ld;
                 }
             }
         }
 
         /**
-         *  Returns the cached distance between a pair of cities
+         * Returns the cached distance between a pair of cities.
          */
         int distanceBetween(int i, int j) {
             return distances[i][j];
         }
 
         // Scale ints to doubles in [0,1)
-        static final double PSCALE = (double)0x80000000L;
+        static final double PSCALE = (double) 0x80000000L;
 
         /**
-         * Return distance for points scaled in [0,1). This simplifies
+         * Returns distance for points scaled in [0,1). This simplifies
          * checking results.  The expected optimal TSP for random
          * points is believed to be around 0.76 * sqrt(N). For papers
          * discussing this, see
          * http://www.densis.fee.unicamp.br/~moscato/TSPBIB_home.html
          */
         double unitDistanceBetween(int i, int j) {
-            double dx = ((double)xPts[i] - (double)xPts[j]) / PSCALE;
-            double dy = ((double)yPts[i] - (double)yPts[j]) / PSCALE;
+            double dx = ((double) xPts[i] - (double) xPts[j]) / PSCALE;
+            double dy = ((double) yPts[i] - (double) yPts[j]) / PSCALE;
             return Math.hypot(dx, dy);
         }
 
@@ -705,7 +705,7 @@ public class TSPExchangerTest {
 
         int seed;
         RNG(int seed) { this.seed = seed; }
-        RNG()         { this.seed = seedGenerator.nextInt() | 1;  }
+        RNG()         { this.seed = seedGenerator.nextInt() | 1; }
 
         int next() {
             int x = seed;