ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/main/java/util/SplittableRandom.java

Comparing jsr166/src/main/java/util/SplittableRandom.java (file contents):
Revision 1.10 by jsr166, Sun Jul 14 08:06:49 2013 UTC vs.
Revision 1.13 by dl, Thu Jul 25 13:19:09 2013 UTC

#	Line 25 | Line 25
25
26		package java.util;
27
28	+	import java.security.SecureRandom;
29		import java.util.concurrent.atomic.AtomicLong;
30		import java.util.Spliterator;
31		import java.util.function.IntConsumer;
#	Line 51 | Line 52 | import java.util.stream.DoubleStream;
52		* href="http://www.phy.duke.edu/~rgb/General/dieharder.php"> version
53		* 3.31.1</a>.) These tests validate only the methods for certain
54		* types and ranges, but similar properties are expected to hold, at
55	<	* least approximately, for others as well.  </li>
55	>	* least approximately, for others as well. The <em>period</em>
56	>	* (length of any series of generated values before it repeats) is at
57	>	* least 2<sup>64</sup>. </li>
58		*
59		* <li> Method {@link #split} constructs and returns a new
60		* SplittableRandom instance that shares no mutable state with the
#	Line 112 | Line 115 | public class SplittableRandom {
115		* are encountered; see method addGammaModGeorge. For this to
116		* work, initial gamma values must be at least 13.
117		*
115	–	* The value of gamma differs for each instance across a series of
116	–	* splits, and is generated using a slightly stripped-down variant
117	–	* of the same algorithm, but operating across calls to split(),
118	–	* not calls to nextSeed(): Each instance carries the state of
119	–	* this generator as nextSplit, and uses mix64(nextSplit) as its
120	–	* own gamma value. Computations of gammas themselves use a fixed
121	–	* constant as the second argument to the addGammaModGeorge
122	–	* function, GAMMA_GAMMA, a "genuinely random" number from a
123	–	* radioactive decay reading (obtained from
124	–	* http://www.fourmilab.ch/hotbits/) meeting the above range
125	–	* constraint. Using a fixed constant maintains the invariant that
126	–	* the value of gamma is the same for every instance that is at
127	–	* the same split-distance from their common root. (Note: there is
128	–	* nothing especially magic about obtaining this constant from a
129	–	* "truly random" physical source rather than just choosing one
130	–	* arbitrarily; using "hotbits" was merely an aesthetically pleasing
131	–	* choice.  In either case, good statistical behavior of the
132	–	* algorithm should be, and was, verified by using the DieHarder
133	–	* test suite.)
134	–	*
118		* The mix64 bit-mixing function called by nextLong and other
119		* methods computes the same value as the "64-bit finalizer"
120		* function in Austin Appleby's MurmurHash3 algorithm.  See
121		* http://code.google.com/p/smhasher/wiki/MurmurHash3 , which
122		* comments: "The constants for the finalizers were generated by a
123		* simple simulated-annealing algorithm, and both avalanche all
124	<	* bits of 'h' to within 0.25% bias." It also appears to work to
125	<	* use instead any of the variants proposed by David Stafford at
126	<	* http://zimbry.blogspot.com/2011/09/better-bit-mixing-improving-on.html
127	<	* but these variants have not yet been tested as thoroughly
128	<	* in the context of the implementation of SplittableRandom.
124	>	* bits of 'h' to within 0.25% bias."
125	>	*
126	>	* The value of gamma differs for each instance across a series of
127	>	* splits, and is generated using an independent variant of the
128	>	* same algorithm, but operating across calls to split(), not
129	>	* calls to nextSeed(): Each instance carries the state of this
130	>	* generator as nextSplit. Gammas are treated as 57bit values,
131	>	* advancing by adding GAMMA_GAMMA mod GAMMA_PRIME, and bit-mixed
132	>	* with a 57-bit version of mix, using the "Mix01" multiplicative
133	>	* constants for MurmurHash3 described by David Stafford
134	>	* (http://zimbry.blogspot.com/2011/09/better-bit-mixing-improving-on.html).
135	>	* The value of GAMMA_GAMMA is arbitrary (except must be at least
136	>	* 13 and less than GAMMA_PRIME), but because it serves as the
137	>	* base of split sequences, should be subject to validation of
138	>	* consequent random number quality metrics.
139		*
140		* The mix32 function used for nextInt just consists of two of the
141	<	* five lines of mix64; avalanche testing shows that the 64-bit result
142	<	* has its top 32 bits avalanched well, though not the bottom 32 bits.
143	<	* DieHarder tests show that it is adequate for generating one
144	<	* random int from the 64-bit result of nextSeed.
141	>	* five lines of mix64; avalanche testing shows that the 64-bit
142	>	* result has its top 32 bits avalanched well, though not the
143	>	* bottom 32 bits.  DieHarder tests show that it is adequate for
144	>	* generating one random int from the 64-bit result of nextSeed.
145		*
146		* Support for the default (no-argument) constructor relies on an
147		* AtomicLong (defaultSeedGenerator) to help perform the
#	Line 156 | Line 149 | public class SplittableRandom {
149		* SplittableRandom. Unlike other cases, this split must be
150		* performed in a thread-safe manner. We use
151		* AtomicLong.compareAndSet as the (typically) most efficient
152	<	* mechanism. To bootstrap, we start off using System.nanotime(),
153	<	* and update using another "genuinely random" constant
152	>	* mechanism. To bootstrap, we start off using a SecureRandom
153	>	* initial default seed, and update using a fixed
154		* DEFAULT_SEED_GAMMA. The default constructor uses GAMMA_GAMMA,
155		* not 0, for its splitSeed argument (addGammaModGeorge(0,
156		* GAMMA_GAMMA) == GAMMA_GAMMA) to reflect that each is split from
#	Line 166 | Line 159 | public class SplittableRandom {
159		*/
160
161		/**
162	<	* The "genuinely random" value for producing new gamma values.
170	<	* The value is arbitrary, subject to the requirement that it be
171	<	* greater or equal to 13.
162	>	* The prime modulus for gamma values.
163		*/
164	<	private static final long GAMMA_GAMMA = 0xF2281E2DBA6606F3L;
164	>	private static final long GAMMA_PRIME = (1L << 57) - 13L;
165
166		/**
167	<	* The "genuinely random" seed update value for default constructors.
168	<	* The value is arbitrary, subject to the requirement that it be
169	<	* greater or equal to 13.
167	>	* The value for producing new gamma values. Must be greater or
168	>	* equal to 13 and less than GAMMA_PRIME. Otherwise, the value is
169	>	* arbitrary subject to validation of the resulting statistical
170	>	* quality of splits.
171		*/
172	<	private static final long DEFAULT_SEED_GAMMA = 0xBD24B73A95FB84D9L;
172	>	private static final long GAMMA_GAMMA = 0x00aae38294f712aabL;
173	>
174	>	/**
175	>	* The seed update value for default constructors.  Must be
176	>	* greater or equal to 13. Otherwise, the value is arbitrary
177	>	* subject to quality checks.
178	>	*/
179	>	private static final long DEFAULT_SEED_GAMMA = 0x9e3779b97f4a7c15L;
180	>
181	>	/**
182	>	* The value 13 with 64bit sign bit set. Used in the signed
183	>	* comparison in addGammaModGeorge.
184	>	*/
185	>	private static final long BOTTOM13 = 0x800000000000000DL;
186
187		/**
188		* The least non-zero value returned by nextDouble(). This value
#	Line 189 | Line 194 | public class SplittableRandom {
194		* The next seed for default constructors.
195		*/
196		private static final AtomicLong defaultSeedGenerator =
197	<	new AtomicLong(System.nanoTime());
197	>	new AtomicLong(getInitialDefaultSeed());
198
199		/**
200		* The seed, updated only via method nextSeed.
#	Line 217 | Line 222 | public class SplittableRandom {
222		* George < 2^64; thus we need only a conditional, not a loop,
223		* to be sure of getting a representable value.
224		*
225	<	* @param s a seed value
225	>	* Because Java comparison operators are signed, we implement this
226	>	* by conceptually offsetting seed values downwards by 2^63, so
227	>	* 0..13 is represented as Long.MIN_VALUE..BOTTOM13.
228	>	*
229	>	* @param s a seed value, viewed as a signed long
230		* @param g a gamma value, 13 <= g (as unsigned)
231		*/
232		private static long addGammaModGeorge(long s, long g) {
233		long p = s + g;
234	<	if (Long.compareUnsigned(p, g) >= 0)
226	<	return p;
227	<	long q = p - 13L;
228	<	return (Long.compareUnsigned(p, 13L) >= 0) ? q : (q + g);
234	>	return (p >= s) ? p : ((p >= BOTTOM13) ? p  : p + g) - 13L;
235		}
236
237		/**
#	Line 252 | Line 258 | public class SplittableRandom {
258		}
259
260		/**
261	+	* Returns a 57-bit mixed transformation of its argument.  See
262	+	* above for explanation.
263	+	*/
264	+	private static long mix57(long z) {
265	+	z ^= (z >>> 33);
266	+	z *= 0x7fb5d329728ea185L;
267	+	z &= 0x01FFFFFFFFFFFFFFL;
268	+	z ^= (z >>> 33);
269	+	z *= 0x81dadef4bc2dd44dL;
270	+	z &= 0x01FFFFFFFFFFFFFFL;
271	+	z ^= (z >>> 33);
272	+	return z;
273	+	}
274	+
275	+	/**
276		* Internal constructor used by all other constructors and by
277		* method split. Establishes the initial seed for this instance,
278		* and uses the given splitSeed to establish gamma, as well as the
#	Line 262 | Line 283 | public class SplittableRandom {
283		this.seed = seed;
284		long s = splitSeed, g;
285		do { // ensure gamma >= 13, considered as an unsigned integer
286	<	s = addGammaModGeorge(s, GAMMA_GAMMA);
287	<	g = mix64(s);
288	<	} while (Long.compareUnsigned(g, 13L) < 0);
286	>	s += GAMMA_GAMMA;
287	>	if (s >= GAMMA_PRIME)
288	>	s -= GAMMA_PRIME;
289	>	g = mix57(s);
290	>	} while (g < 13L);
291		this.gamma = g;
292		this.nextSplit = s;
293		}
#	Line 289 | Line 312 | public class SplittableRandom {
312		return mix64(newSeed);
313		}
314
315	+	/**
316	+	* Returns an initial default seed.
317	+	*/
318	+	private static long getInitialDefaultSeed() {
319	+	byte[] seedBytes = java.security.SecureRandom.getSeed(8);
320	+	long s = (long)(seedBytes[0]) & 0xffL;
321	+	for (int i = 1; i < 8; ++i)
322	+	s = (s << 8) | ((long)(seedBytes[i]) & 0xffL);
323	+	return s;
324	+	}
325	+
326		/*
327		* Internal versions of nextX methods used by streams, as well as
328		* the public nextX(origin, bound) methods.  These exist mainly to
#	Line 364 | Line 398 | public class SplittableRandom {
398		int r = mix32(nextSeed());
399		if (origin < bound) {
400		int n = bound - origin, m = n - 1;
401	<	if ((n & m) == 0L)
401	>	if ((n & m) == 0)
402		r = (r & m) + origin;
403		else if (n > 0) {
404		for (int u = r >>> 1;
#	Line 403 | Line 437 | public class SplittableRandom {
437		/**
438		* Creates a new SplittableRandom instance using the specified
439		* initial seed. SplittableRandom instances created with the same
440	<	* seed generate identical sequences of values.
440	>	* seed in the same program generate identical sequences of values.
441		*
442		* @param seed the initial seed
443		*/
444		public SplittableRandom(long seed) {
445	<	this(seed, 0);
445	>	this(seed, 0L);
446		}
447
448		/**
#	Line 464 | Line 498 | public class SplittableRandom {
498		// Specialize internalNextInt for origin 0
499		int r = mix32(nextSeed());
500		int m = bound - 1;
501	<	if ((bound & m) == 0L) // power of two
501	>	if ((bound & m) == 0) // power of two
502		r &= m;
503		else { // reject over-represented candidates
504		for (int u = r >>> 1;
#	Line 553 | Line 587 | public class SplittableRandom {
587		* (inclusive) and one (exclusive)
588		*/
589		public double nextDouble() {
590	<	return (nextLong() >>> 11) * DOUBLE_UNIT;
590	>	return (mix64(nextSeed()) >>> 11) * DOUBLE_UNIT;
591		}
592
593		/**
#	Line 569 | Line 603 | public class SplittableRandom {
603		public double nextDouble(double bound) {
604		if (!(bound > 0.0))
605		throw new IllegalArgumentException("bound must be positive");
606	<	double result = nextDouble() * bound;
606	>	double result = (mix64(nextSeed()) >>> 11) * DOUBLE_UNIT * bound;
607		return (result < bound) ?  result : // correct for rounding
608		Double.longBitsToDouble(Double.doubleToLongBits(bound) - 1);
609		}
#	Line 591 | Line 625 | public class SplittableRandom {
625		return internalNextDouble(origin, bound);
626		}
627
628	+	/**
629	+	* Returns a pseudorandom {@code boolean} value.
630	+	*
631	+	* @return a pseudorandom {@code boolean} value
632	+	*/
633	+	public boolean nextBoolean() {
634	+	return mix32(nextSeed()) < 0;
635	+	}
636	+
637		// stream methods, coded in a way intended to better isolate for
638		// maintenance purposes the small differences across forms.
639
#	Line 854 | Line 897 | public class SplittableRandom {
897		* approach. The long and double versions of this class are
898		* identical except for types.
899		*/
900	<	static class RandomIntsSpliterator implements Spliterator.OfInt {
900	>	static final class RandomIntsSpliterator implements Spliterator.OfInt {
901		final SplittableRandom rng;
902		long index;
903		final long fence;
#	Line 908 | Line 951 | public class SplittableRandom {
951		/**
952		* Spliterator for long streams.
953		*/
954	<	static class RandomLongsSpliterator implements Spliterator.OfLong {
954	>	static final class RandomLongsSpliterator implements Spliterator.OfLong {
955		final SplittableRandom rng;
956		long index;
957		final long fence;
#	Line 963 | Line 1006 | public class SplittableRandom {
1006		/**
1007		* Spliterator for double streams.
1008		*/
1009	<	static class RandomDoublesSpliterator implements Spliterator.OfDouble {
1009	>	static final class RandomDoublesSpliterator implements Spliterator.OfDouble {
1010		final SplittableRandom rng;
1011		long index;
1012		final long fence;

Diff Legend

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