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

Comparing jsr166/src/test/loops/LoopHelpers.java (file contents):
Revision 1.6 by dl, Mon Feb 13 12:39:23 2006 UTC vs.
Revision 1.12 by jsr166, Mon Dec 5 04:08:46 2011 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   * Misc utilities in JSR166 performance tests
# Line 17 | Line 17 | class LoopHelpers {
17      // Some mindless computation to do between synchronizations...
18  
19      /**
20 <     * generates 32 bit pseudo-random numbers.
20 >     * generates 32 bit pseudo-random numbers.
21       * Adapted from http://www.snippets.org
22       */
23 <    public static int compute1(int x) {
23 >    public static int compute1(int x) {
24          int lo = 16807 * (x & 0xFFFF);
25          int hi = 16807 * (x >>> 16);
26          lo += (hi & 0x7FFF) << 16;
# Line 40 | Line 40 | class LoopHelpers {
40       *  Computes a linear congruential random number a random number
41       *  of times.
42       */
43 <    public static int compute2(int x) {
43 >    public static int compute2(int x) {
44          int loops = (x >>> 4) & 7;
45          while (loops-- > 0) {
46              x = (x * 2147483647) % 16807;
# Line 51 | Line 51 | class LoopHelpers {
51      /**
52       * Yet another random number generator
53       */
54 <    public static int compute3(int x) {
54 >    public static int compute3(int x) {
55          int t = (x % 127773) * 16807 - (x / 127773) * 2836;
56 <        return (t > 0)? t : t + 0x7fffffff;
56 >        return (t > 0) ? t : t + 0x7fffffff;
57      }
58  
59      /**
60       * Yet another random number generator
61       */
62 <    public static int compute4(int x) {
62 >    public static int compute4(int x) {
63          return x * 134775813 + 1;
64      }
65  
# Line 67 | Line 67 | class LoopHelpers {
67      /**
68       * Yet another random number generator
69       */
70 <    public static int compute5(int x) {
70 >    public static int compute5(int x) {
71          return 36969 * (x & 65535) + (x >> 16);
72      }
73  
74      /**
75       * Marsaglia xorshift (1, 3, 10)
76       */
77 <    public static int compute6(int seed) {
78 <        seed ^= seed << 1;
79 <        seed ^= seed >>> 3;
77 >    public static int compute6(int seed) {
78 >        seed ^= seed << 1;
79 >        seed ^= seed >>> 3;
80          seed ^= (seed << 10);
81          return seed;
82      }
# Line 85 | Line 85 | class LoopHelpers {
85       * Marsaglia xorshift (6, 21, 7)
86       */
87      public static int compute7(int y) {
88 <        y ^= y << 6;
89 <        y ^= y >>> 21;
88 >        y ^= y << 6;
89 >        y ^= y >>> 21;
90          y ^= (y << 7);
91          return y;
92      }
# Line 96 | Line 96 | class LoopHelpers {
96      /**
97       * Marsaglia xorshift for longs
98       */
99 <    public static long compute8(long x) {
100 <        x ^= x << 13;
101 <        x ^= x >>> 7;
99 >    public static long compute8(long x) {
100 >        x ^= x << 13;
101 >        x ^= x >>> 7;
102          x ^= (x << 17);
103          return x;
104      }
# Line 106 | Line 106 | class LoopHelpers {
106      public static final class XorShift32Random {
107          static final AtomicInteger seq = new AtomicInteger(8862213);
108          int x = -1831433054;
109 <        public XorShift32Random(int seed) { x = seed;  }
110 <        public XorShift32Random() {
111 <            this((int)System.nanoTime() + seq.getAndAdd(129));
109 >        public XorShift32Random(int seed) { x = seed; }
110 >        public XorShift32Random() {
111 >            this((int) System.nanoTime() + seq.getAndAdd(129));
112          }
113          public int next() {
114 <            x ^= x << 6;
115 <            x ^= x >>> 21;
114 >            x ^= x << 6;
115 >            x ^= x >>> 21;
116              x ^= (x << 7);
117              return x;
118          }
# Line 127 | Line 127 | class LoopHelpers {
127          int z = -715159705;
128          int w = 273326509;
129          public MarsagliaRandom(int seed) { x = seed; }
130 <        public MarsagliaRandom() {
131 <            this((int)System.nanoTime() + seq.getAndAdd(129));
130 >        public MarsagliaRandom() {
131 >            this((int) System.nanoTime() + seq.getAndAdd(129));
132          }
133          public int next() {
134              int t = x ^ (x << 11);
135 <            x = y;
136 <            y = z;
135 >            x = y;
136 >            y = z;
137              z = w;
138              return w = (w ^ (w >>> 19) ^ (t ^ (t >>> 8)));
139          }
# Line 143 | Line 143 | class LoopHelpers {
143       * Unsynchronized version of java.util.Random algorithm.
144       */
145      public static final class SimpleRandom {
146 <        private final static long multiplier = 0x5DEECE66DL;
147 <        private final static long addend = 0xBL;
148 <        private final static long mask = (1L << 48) - 1;
146 >        private static final long multiplier = 0x5DEECE66DL;
147 >        private static final long addend = 0xBL;
148 >        private static final long mask = (1L << 48) - 1;
149          static final AtomicLong seq = new AtomicLong( -715159705);
150          private long seed;
151  
# Line 164 | Line 164 | class LoopHelpers {
164          public int next() {
165              long nextseed = (seed * multiplier + addend) & mask;
166              seed = nextseed;
167 <            return ((int)(nextseed >>> 17)) & 0x7FFFFFFF;
167 >            return ((int) (nextseed >>> 17)) & 0x7FFFFFFF;
168          }
169      }
170  
# Line 198 | Line 198 | class LoopHelpers {
198          b.replace(b.length()-num.length(), b.length(), num);
199          return b.toString();
200      }
201 <  
201 >
202   }

Diff Legend

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