--- jsr166/src/test/loops/MapMicroBenchmark.java 2009/11/02 23:42:46 1.6 +++ jsr166/src/test/loops/MapMicroBenchmark.java 2011/03/15 19:47:05 1.10 @@ -1,7 +1,7 @@ /* * 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 + * http://creativecommons.org/publicdomain/zero/1.0/ */ import java.util.*; @@ -102,15 +102,15 @@ public class MapMicroBenchmark { jobs[2] = new Job("Integer ", is, Integer.class); Object[] ls = new Object[n]; - for (int i = 0; i < n; i++) ls[i] = Long.valueOf((long)i); + for (int i = 0; i < n; i++) ls[i] = Long.valueOf((long) i); jobs[3] = new Job("Long ", ls, Long.class); Object[] fs = new Object[n]; - for (int i = 0; i < n; i++) fs[i] = Float.valueOf((float)i); + for (int i = 0; i < n; i++) fs[i] = Float.valueOf((float) i); jobs[4] = new Job("Float ", fs, Float.class); Object[] ds = new Object[n]; - for (int i = 0; i < n; i++) ds[i] = Double.valueOf((double)i); + for (int i = 0; i < n; i++) ds[i] = Double.valueOf((double) i); jobs[5] = new Job("Double ", ds, Double.class); Object[] bs = new Object[n]; @@ -143,7 +143,7 @@ public class MapMicroBenchmark { warmup1(mixed); warmup3(jobs); Thread.sleep(500); - time(jobs); + time(jobs); } static void runWork(Job[] jobs, int minIters, int maxIters, long timeLimit) throws Throwable { @@ -193,7 +193,7 @@ public class MapMicroBenchmark { long[] aves = new long[nsizes]; int njobs = jobs.length; - for (int i = 0; i < njobs; i++) { + for (int i = 0; i < njobs; i++) { System.out.print(jobs[i].name); for (int k = 0; k < nsizes; ++k) { long nanos = jobs[i].nanos[k]; @@ -212,7 +212,7 @@ public class MapMicroBenchmark { static final class Job { - final String name; + final String name; final Class elementClass; long[] nanos = new long[nsizes]; final Object[] items; @@ -350,7 +350,7 @@ public class MapMicroBenchmark { if (minIters != 1 && randomSearches) shuffleSome(ins, len, len >>> 3); } - long ops = ((long)j) * len * OPS_PER_ITER; + long ops = ((long) j) * len * OPS_PER_ITER; lastSum = sum; return elapsed / ops; } @@ -444,7 +444,7 @@ public class MapMicroBenchmark { int c = in.read(); if (c < 0) break outer; - char ch = (char)c; + char ch = (char) c; if (ch == '\n') { keys[k++] = sb.toString(); break; @@ -458,7 +458,7 @@ public class MapMicroBenchmark { // fill up remaining keys with path-like compounds of previous pairs int j = 0; while (k < n) - keys[k++] = (String)keys[j++] + "/" + (String)keys[j]; + keys[k++] = (String) keys[j++] + "/" + (String) keys[j]; } }