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.13 by dl, Thu Jul 25 13:19:09 2013 UTC vs.
Revision 1.30 by jsr166, Sat Jan 2 02:27:03 2016 UTC

#	Line 25 | Line 25
25
26		package java.util;
27
28	–	import java.security.SecureRandom;
28		import java.util.concurrent.atomic.AtomicLong;
29	<	import java.util.Spliterator;
29	>	import java.util.function.DoubleConsumer;
30		import java.util.function.IntConsumer;
31		import java.util.function.LongConsumer;
32	<	import java.util.function.DoubleConsumer;
34	<	import java.util.stream.StreamSupport;
32	>	import java.util.stream.DoubleStream;
33		import java.util.stream.IntStream;
34		import java.util.stream.LongStream;
35	<	import java.util.stream.DoubleStream;
35	>	import java.util.stream.StreamSupport;
36
37		/**
38		* A generator of uniform pseudorandom values applicable for use in
39		* (among other contexts) isolated parallel computations that may
40	<	* generate subtasks. Class SplittableRandom supports methods for
40	>	* generate subtasks. Class {@code SplittableRandom} supports methods for
41		* producing pseudorandom numbers of type {@code int}, {@code long},
42		* and {@code double} with similar usages as for class
43		* {@link java.util.Random} but differs in the following ways:
#	Line 54 | Line 52 | import java.util.stream.DoubleStream;
52		* types and ranges, but similar properties are expected to hold, at
53		* least approximately, for others as well. The <em>period</em>
54		* (length of any series of generated values before it repeats) is at
55	<	* least 2<sup>64</sup>. </li>
55	>	* least 2<sup>64</sup>.
56		*
57	<	* <li> Method {@link #split} constructs and returns a new
57	>	* <li>Method {@link #split} constructs and returns a new
58		* SplittableRandom instance that shares no mutable state with the
59		* current instance. However, with very high probability, the
60		* values collectively generated by the two objects have the same
61		* statistical properties as if the same quantity of values were
62		* generated by a single thread using a single {@code
63	<	* SplittableRandom} object.  </li>
63	>	* SplittableRandom} object.
64		*
65		* <li>Instances of SplittableRandom are <em>not</em> thread-safe.
66		* They are designed to be split, not shared, across threads. For
#	Line 73 | Line 71 | import java.util.stream.DoubleStream;
71		*
72		* <li>This class provides additional methods for generating random
73		* streams, that employ the above techniques when used in {@code
74	<	* stream.parallel()} mode.</li>
74	>	* stream.parallel()} mode.
75		*
76		* </ul>
77		*
78	+	* <p>Instances of {@code SplittableRandom} are not cryptographically
79	+	* secure.  Consider instead using {@link java.security.SecureRandom}
80	+	* in security-sensitive applications. Additionally,
81	+	* default-constructed instances do not use a cryptographically random
82	+	* seed unless the {@linkplain System#getProperty system property}
83	+	* {@code java.util.secureRandomSeed} is set to {@code true}.
84	+	*
85		* @author  Guy Steele
86		* @author  Doug Lea
87		* @since   1.8
88		*/
89	<	public class SplittableRandom {
85	<
86	<	/*
87	<	* File organization: First the non-public methods that constitute
88	<	* the main algorithm, then the main public methods, followed by
89	<	* some custom spliterator classes needed for stream methods.
90	<	*
91	<	* Credits: Primary algorithm and code by Guy Steele.  Stream
92	<	* support methods by Doug Lea.  Documentation jointly produced
93	<	* with additional help from Brian Goetz.
94	<	*/
89	>	public final class SplittableRandom {
90
91		/*
92		* Implementation Overview.
#	Line 99 | Line 94 | public class SplittableRandom {
94		* This algorithm was inspired by the "DotMix" algorithm by
95		* Leiserson, Schardl, and Sukha "Deterministic Parallel
96		* Random-Number Generation for Dynamic-Multithreading Platforms",
97	<	* PPoPP 2012, but improves and extends it in several ways.
97	>	* PPoPP 2012, as well as those in "Parallel random numbers: as
98	>	* easy as 1, 2, 3" by Salmon, Morae, Dror, and Shaw, SC 2011.  It
99	>	* differs mainly in simplifying and cheapening operations.
100	>	*
101	>	* The primary update step (method nextSeed()) is to add a
102	>	* constant ("gamma") to the current (64 bit) seed, forming a
103	>	* simple sequence.  The seed and the gamma values for any two
104	>	* SplittableRandom instances are highly likely to be different.
105	>	*
106	>	* Methods nextLong, nextInt, and derivatives do not return the
107	>	* sequence (seed) values, but instead a hash-like bit-mix of
108	>	* their bits, producing more independently distributed sequences.
109	>	* For nextLong, the mix64 function is based on David Stafford's
110	>	* (http://zimbry.blogspot.com/2011/09/better-bit-mixing-improving-on.html)
111	>	* "Mix13" variant of the "64-bit finalizer" function in Austin
112	>	* Appleby's MurmurHash3 algorithm (see
113	>	* http://code.google.com/p/smhasher/wiki/MurmurHash3). The mix32
114	>	* function is based on Stafford's Mix04 mix function, but returns
115	>	* the upper 32 bits cast as int.
116	>	*
117	>	* The split operation uses the current generator to form the seed
118	>	* and gamma for another SplittableRandom.  To conservatively
119	>	* avoid potential correlations between seed and value generation,
120	>	* gamma selection (method mixGamma) uses different
121	>	* (Murmurhash3's) mix constants.  To avoid potential weaknesses
122	>	* in bit-mixing transformations, we restrict gammas to odd values
123	>	* with at least 24 0-1 or 1-0 bit transitions.  Rather than
124	>	* rejecting candidates with too few or too many bits set, method
125	>	* mixGamma flips some bits (which has the effect of mapping at
126	>	* most 4 to any given gamma value).  This reduces the effective
127	>	* set of 64bit odd gamma values by about 2%, and serves as an
128	>	* automated screening for sequence constant selection that is
129	>	* left as an empirical decision in some other hashing and crypto
130	>	* algorithms.
131	>	*
132	>	* The resulting generator thus transforms a sequence in which
133	>	* (typically) many bits change on each step, with an inexpensive
134	>	* mixer with good (but less than cryptographically secure)
135	>	* avalanching.
136	>	*
137	>	* The default (no-argument) constructor, in essence, invokes
138	>	* split() for a common "defaultGen" SplittableRandom.  Unlike
139	>	* other cases, this split must be performed in a thread-safe
140	>	* manner, so we use an AtomicLong to represent the seed rather
141	>	* than use an explicit SplittableRandom. To bootstrap the
142	>	* defaultGen, we start off using a seed based on current time
143	>	* unless the java.util.secureRandomSeed property is set. This
144	>	* serves as a slimmed-down (and insecure) variant of SecureRandom
145	>	* that also avoids stalls that may occur when using /dev/random.
146	>	*
147	>	* It is a relatively simple matter to apply the basic design here
148	>	* to use 128 bit seeds. However, emulating 128bit arithmetic and
149	>	* carrying around twice the state add more overhead than appears
150	>	* warranted for current usages.
151		*
152	<	* The primary update step (see method nextSeed()) is simply to
153	<	* add a constant ("gamma") to the current seed, modulo a prime
154	<	* ("George"). However, the nextLong and nextInt methods do not
107	<	* return this value, but instead the results of bit-mixing
108	<	* transformations that produce more uniformly distributed
109	<	* sequences.
110	<	*
111	<	* "George" is the otherwise nameless (because it cannot be
112	<	* represented) prime number 2^64+13. Using a prime number larger
113	<	* than can fit in a long ensures that all possible long values
114	<	* can occur, plus 13 others that just get skipped over when they
115	<	* are encountered; see method addGammaModGeorge. For this to
116	<	* work, initial gamma values must be at least 13.
117	<	*
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."
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
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
148	<	* equivalent of a split of a statically constructed
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 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
157	<	* this root generator, even though the root is not explicitly
158	<	* represented as a SplittableRandom.
159	<	*/
160	<
161	<	/**
162	<	* The prime modulus for gamma values.
163	<	*/
164	<	private static final long GAMMA_PRIME = (1L << 57) - 13L;
165	<
166	<	/**
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 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.
152	>	* File organization: First the non-public methods that constitute
153	>	* the main algorithm, then the main public methods, followed by
154	>	* some custom spliterator classes needed for stream methods.
155		*/
179	–	private static final long DEFAULT_SEED_GAMMA = 0x9e3779b97f4a7c15L;
156
157		/**
158	<	* The value 13 with 64bit sign bit set. Used in the signed
159	<	* comparison in addGammaModGeorge.
158	>	* The golden ratio scaled to 64bits, used as the initial gamma
159	>	* value for (unsplit) SplittableRandoms.
160		*/
161	<	private static final long BOTTOM13 = 0x800000000000000DL;
161	>	private static final long GOLDEN_GAMMA = 0x9e3779b97f4a7c15L;
162
163		/**
164		* The least non-zero value returned by nextDouble(). This value
165		* is scaled by a random value of 53 bits to produce a result.
166		*/
167	<	private static final double DOUBLE_UNIT = 1.0 / (1L << 53);
192	<
193	<	/**
194	<	* The next seed for default constructors.
195	<	*/
196	<	private static final AtomicLong defaultSeedGenerator =
197	<	new AtomicLong(getInitialDefaultSeed());
167	>	private static final double DOUBLE_UNIT = 0x1.0p-53; // 1.0 / (1L << 53);
168
169		/**
170	<	* The seed, updated only via method nextSeed.
170	>	* The seed. Updated only via method nextSeed.
171		*/
172		private long seed;
173
174		/**
175	<	* The constant value added to seed (mod George) on each update.
175	>	* The step value.
176		*/
177		private final long gamma;
178
179		/**
180	<	* The next seed to use for splits. Propagated using
211	<	* addGammaModGeorge across instances.
180	>	* Internal constructor used by all others except default constructor.
181		*/
182	<	private final long nextSplit;
183	<
184	<	/**
216	<	* Adds the given gamma value, g, to the given seed value s, mod
217	<	* George (2^64+13). We regard s and g as unsigned values
218	<	* (ranging from 0 to 2^64-1). We add g to s either once or twice
219	<	* (mod George) as necessary to produce an (unsigned) result less
220	<	* than 2^64.  We require that g must be at least 13. This
221	<	* guarantees that if (s+g) mod George >= 2^64 then (s+g+g) mod
222	<	* George < 2^64; thus we need only a conditional, not a loop,
223	<	* to be sure of getting a representable value.
224	<	*
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	<	return (p >= s) ? p : ((p >= BOTTOM13) ? p  : p + g) - 13L;
182	>	private SplittableRandom(long seed, long gamma) {
183	>	this.seed = seed;
184	>	this.gamma = gamma;
185		}
186
187		/**
188	<	* Returns a bit-mixed transformation of its argument.
239	<	* See above for explanation.
188	>	* Computes Stafford variant 13 of 64bit mix function.
189		*/
190		private static long mix64(long z) {
191	<	z ^= (z >>> 33);
192	<	z *= 0xff51afd7ed558ccdL;
193	<	z ^= (z >>> 33);
245	<	z *= 0xc4ceb9fe1a85ec53L;
246	<	z ^= (z >>> 33);
247	<	return z;
191	>	z = (z ^ (z >>> 30)) * 0xbf58476d1ce4e5b9L;
192	>	z = (z ^ (z >>> 27)) * 0x94d049bb133111ebL;
193	>	return z ^ (z >>> 31);
194		}
195
196		/**
197	<	* Returns a bit-mixed int transformation of its argument.
252	<	* See above for explanation.
197	>	* Returns the 32 high bits of Stafford variant 4 mix64 function as int.
198		*/
199		private static int mix32(long z) {
200	<	z ^= (z >>> 33);
201	<	z *= 0xc4ceb9fe1a85ec53L;
257	<	return (int)(z >>> 32);
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;
200	>	z = (z ^ (z >>> 33)) * 0x62a9d9ed799705f5L;
201	>	return (int)(((z ^ (z >>> 28)) * 0xcb24d0a5c88c35b3L) >>> 32);
202		}
203
204		/**
205	<	* 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
279	<	* nextSplit to use by this instance. The loop to skip ineligible
280	<	* gammas very rarely iterates, and does so at most 13 times.
205	>	* Returns the gamma value to use for a new split instance.
206		*/
207	<	private SplittableRandom(long seed, long splitSeed) {
208	<	this.seed = seed;
209	<	long s = splitSeed, g;
210	<	do { // ensure gamma >= 13, considered as an unsigned integer
211	<	s += GAMMA_GAMMA;
212	<	if (s >= GAMMA_PRIME)
288	<	s -= GAMMA_PRIME;
289	<	g = mix57(s);
290	<	} while (g < 13L);
291	<	this.gamma = g;
292	<	this.nextSplit = s;
207	>	private static long mixGamma(long z) {
208	>	z = (z ^ (z >>> 33)) * 0xff51afd7ed558ccdL; // MurmurHash3 mix constants
209	>	z = (z ^ (z >>> 33)) * 0xc4ceb9fe1a85ec53L;
210	>	z = (z ^ (z >>> 33)) | 1L;                  // force to be odd
211	>	int n = Long.bitCount(z ^ (z >>> 1));       // ensure enough transitions
212	>	return (n < 24) ? z ^ 0xaaaaaaaaaaaaaaaaL : z;
213		}
214
215		/**
216	<	* Updates in-place and returns seed.
297	<	* See above for explanation.
216	>	* Adds gamma to seed.
217		*/
218		private long nextSeed() {
219	<	return seed = addGammaModGeorge(seed, gamma);
219	>	return seed += gamma;
220		}
221
222		/**
223	<	* Atomically updates and returns next seed for default constructor.
223	>	* The seed generator for default constructors.
224		*/
225	<	private static long nextDefaultSeed() {
307	<	long oldSeed, newSeed;
308	<	do {
309	<	oldSeed = defaultSeedGenerator.get();
310	<	newSeed = addGammaModGeorge(oldSeed, DEFAULT_SEED_GAMMA);
311	<	} while (!defaultSeedGenerator.compareAndSet(oldSeed, newSeed));
312	<	return mix64(newSeed);
313	<	}
225	>	private static final AtomicLong defaultGen = new AtomicLong(initialSeed());
226
227	<	/**
228	<	* Returns an initial default seed.
229	<	*/
230	<	private static long getInitialDefaultSeed() {
231	<	byte[] seedBytes = java.security.SecureRandom.getSeed(8);
232	<	long s = (long)(seedBytes[0]) & 0xffL;
233	<	for (int i = 1; i < 8; ++i)
234	<	s = (s << 8) | ((long)(seedBytes[i]) & 0xffL);
235	<	return s;
227	>	private static long initialSeed() {
228	>	java.security.PrivilegedAction<Boolean> action =
229	>	() -> Boolean.getBoolean("java.util.secureRandomSeed");
230	>	if (java.security.AccessController.doPrivileged(action)) {
231	>	byte[] seedBytes = java.security.SecureRandom.getSeed(8);
232	>	long s = (long)seedBytes[0] & 0xffL;
233	>	for (int i = 1; i < 8; ++i)
234	>	s = (s << 8) | ((long)seedBytes[i] & 0xffL);
235	>	return s;
236	>	}
237	>	return (mix64(System.currentTimeMillis()) ^
238	>	mix64(System.nanoTime()));
239		}
240
241	+	// IllegalArgumentException messages
242	+	static final String BAD_BOUND = "bound must be positive";
243	+	static final String BAD_RANGE = "bound must be greater than origin";
244	+	static final String BAD_SIZE  = "size must be non-negative";
245	+
246		/*
247		* Internal versions of nextX methods used by streams, as well as
248		* the public nextX(origin, bound) methods.  These exist mainly to
#	Line 442 | Line 362 | public class SplittableRandom {
362		* @param seed the initial seed
363		*/
364		public SplittableRandom(long seed) {
365	<	this(seed, 0L);
365	>	this(seed, GOLDEN_GAMMA);
366		}
367
368		/**
#	Line 451 | Line 371 | public class SplittableRandom {
371		* of those of any other instances in the current program; and
372		* may, and typically does, vary across program invocations.
373		*/
374	<	public SplittableRandom() {
375	<	this(nextDefaultSeed(), GAMMA_GAMMA);
374	>	public SplittableRandom() { // emulate defaultGen.split()
375	>	long s = defaultGen.getAndAdd(2 * GOLDEN_GAMMA);
376	>	this.seed = mix64(s);
377	>	this.gamma = mixGamma(s + GOLDEN_GAMMA);
378		}
379
380		/**
#	Line 470 | Line 392 | public class SplittableRandom {
392		* @return the new SplittableRandom instance
393		*/
394		public SplittableRandom split() {
395	<	return new SplittableRandom(nextSeed(), nextSplit);
395	>	return new SplittableRandom(nextLong(), mixGamma(nextSeed()));
396		}
397
398		/**
#	Line 486 | Line 408 | public class SplittableRandom {
408		* Returns a pseudorandom {@code int} value between zero (inclusive)
409		* and the specified bound (exclusive).
410		*
411	<	* @param bound the bound on the random number to be returned.  Must be
490	<	*        positive.
411	>	* @param bound the upper bound (exclusive).  Must be positive.
412		* @return a pseudorandom {@code int} value between zero
413		*         (inclusive) and the bound (exclusive)
414	<	* @throws IllegalArgumentException if the bound is less than zero
414	>	* @throws IllegalArgumentException if {@code bound} is not positive
415		*/
416		public int nextInt(int bound) {
417		if (bound <= 0)
418	<	throw new IllegalArgumentException("bound must be positive");
418	>	throw new IllegalArgumentException(BAD_BOUND);
419		// Specialize internalNextInt for origin 0
420		int r = mix32(nextSeed());
421		int m = bound - 1;
#	Line 522 | Line 443 | public class SplittableRandom {
443		*/
444		public int nextInt(int origin, int bound) {
445		if (origin >= bound)
446	<	throw new IllegalArgumentException("bound must be greater than origin");
446	>	throw new IllegalArgumentException(BAD_RANGE);
447		return internalNextInt(origin, bound);
448		}
449
#	Line 539 | Line 460 | public class SplittableRandom {
460		* Returns a pseudorandom {@code long} value between zero (inclusive)
461		* and the specified bound (exclusive).
462		*
463	<	* @param bound the bound on the random number to be returned.  Must be
543	<	*        positive.
463	>	* @param bound the upper bound (exclusive).  Must be positive.
464		* @return a pseudorandom {@code long} value between zero
465		*         (inclusive) and the bound (exclusive)
466	<	* @throws IllegalArgumentException if {@code bound} is less than zero
466	>	* @throws IllegalArgumentException if {@code bound} is not positive
467		*/
468		public long nextLong(long bound) {
469		if (bound <= 0)
470	<	throw new IllegalArgumentException("bound must be positive");
470	>	throw new IllegalArgumentException(BAD_BOUND);
471		// Specialize internalNextLong for origin 0
472		long r = mix64(nextSeed());
473		long m = bound - 1;
#	Line 575 | Line 495 | public class SplittableRandom {
495		*/
496		public long nextLong(long origin, long bound) {
497		if (origin >= bound)
498	<	throw new IllegalArgumentException("bound must be greater than origin");
498	>	throw new IllegalArgumentException(BAD_RANGE);
499		return internalNextLong(origin, bound);
500		}
501
#	Line 584 | Line 504 | public class SplittableRandom {
504		* (inclusive) and one (exclusive).
505		*
506		* @return a pseudorandom {@code double} value between zero
507	<	* (inclusive) and one (exclusive)
507	>	*         (inclusive) and one (exclusive)
508		*/
509		public double nextDouble() {
510		return (mix64(nextSeed()) >>> 11) * DOUBLE_UNIT;
#	Line 594 | Line 514 | public class SplittableRandom {
514		* Returns a pseudorandom {@code double} value between 0.0
515		* (inclusive) and the specified bound (exclusive).
516		*
517	<	* @param bound the bound on the random number to be returned.  Must be
598	<	*        positive.
517	>	* @param bound the upper bound (exclusive).  Must be positive.
518		* @return a pseudorandom {@code double} value between zero
519		*         (inclusive) and the bound (exclusive)
520	<	* @throws IllegalArgumentException if {@code bound} is less than zero
520	>	* @throws IllegalArgumentException if {@code bound} is not positive
521		*/
522		public double nextDouble(double bound) {
523		if (!(bound > 0.0))
524	<	throw new IllegalArgumentException("bound must be positive");
524	>	throw new IllegalArgumentException(BAD_BOUND);
525		double result = (mix64(nextSeed()) >>> 11) * DOUBLE_UNIT * bound;
526		return (result < bound) ?  result : // correct for rounding
527		Double.longBitsToDouble(Double.doubleToLongBits(bound) - 1);
#	Line 613 | Line 532 | public class SplittableRandom {
532		* origin (inclusive) and bound (exclusive).
533		*
534		* @param origin the least value returned
535	<	* @param bound the upper bound
535	>	* @param bound the upper bound (exclusive)
536		* @return a pseudorandom {@code double} value between the origin
537		*         (inclusive) and the bound (exclusive)
538		* @throws IllegalArgumentException if {@code origin} is greater than
#	Line 621 | Line 540 | public class SplittableRandom {
540		*/
541		public double nextDouble(double origin, double bound) {
542		if (!(origin < bound))
543	<	throw new IllegalArgumentException("bound must be greater than origin");
543	>	throw new IllegalArgumentException(BAD_RANGE);
544		return internalNextDouble(origin, bound);
545		}
546
#	Line 638 | Line 557 | public class SplittableRandom {
557		// maintenance purposes the small differences across forms.
558
559		/**
560	<	* Returns a stream producing the given {@code streamSize} number of
561	<	* pseudorandom {@code int} values.
560	>	* Returns a stream producing the given {@code streamSize} number
561	>	* of pseudorandom {@code int} values from this generator and/or
562	>	* one split from it.
563		*
564		* @param streamSize the number of values to generate
565		* @return a stream of pseudorandom {@code int} values
#	Line 648 | Line 568 | public class SplittableRandom {
568		*/
569		public IntStream ints(long streamSize) {
570		if (streamSize < 0L)
571	<	throw new IllegalArgumentException("negative Stream size");
571	>	throw new IllegalArgumentException(BAD_SIZE);
572		return StreamSupport.intStream
573		(new RandomIntsSpliterator
574		(this, 0L, streamSize, Integer.MAX_VALUE, 0),
#	Line 657 | Line 577 | public class SplittableRandom {
577
578		/**
579		* Returns an effectively unlimited stream of pseudorandom {@code int}
580	<	* values.
580	>	* values from this generator and/or one split from it.
581		*
582		* @implNote This method is implemented to be equivalent to {@code
583		* ints(Long.MAX_VALUE)}.
#	Line 672 | Line 592 | public class SplittableRandom {
592		}
593
594		/**
595	<	* Returns a stream producing the given {@code streamSize} number of
596	<	* pseudorandom {@code int} values, each conforming to the given
597	<	* origin and bound.
595	>	* Returns a stream producing the given {@code streamSize} number
596	>	* of pseudorandom {@code int} values from this generator and/or one split
597	>	* from it; each value conforms to the given origin (inclusive) and bound
598	>	* (exclusive).
599		*
600		* @param streamSize the number of values to generate
601	<	* @param randomNumberOrigin the origin of each random value
602	<	* @param randomNumberBound the bound of each random value
601	>	* @param randomNumberOrigin the origin (inclusive) of each random value
602	>	* @param randomNumberBound the bound (exclusive) of each random value
603		* @return a stream of pseudorandom {@code int} values,
604	<	*         each with the given origin and bound
604	>	*         each with the given origin (inclusive) and bound (exclusive)
605		* @throws IllegalArgumentException if {@code streamSize} is
606		*         less than zero, or {@code randomNumberOrigin}
607		*         is greater than or equal to {@code randomNumberBound}
#	Line 688 | Line 609 | public class SplittableRandom {
609		public IntStream ints(long streamSize, int randomNumberOrigin,
610		int randomNumberBound) {
611		if (streamSize < 0L)
612	<	throw new IllegalArgumentException("negative Stream size");
612	>	throw new IllegalArgumentException(BAD_SIZE);
613		if (randomNumberOrigin >= randomNumberBound)
614	<	throw new IllegalArgumentException("bound must be greater than origin");
614	>	throw new IllegalArgumentException(BAD_RANGE);
615		return StreamSupport.intStream
616		(new RandomIntsSpliterator
617		(this, 0L, streamSize, randomNumberOrigin, randomNumberBound),
#	Line 699 | Line 620 | public class SplittableRandom {
620
621		/**
622		* Returns an effectively unlimited stream of pseudorandom {@code
623	<	* int} values, each conforming to the given origin and bound.
623	>	* int} values from this generator and/or one split from it; each value
624	>	* conforms to the given origin (inclusive) and bound (exclusive).
625		*
626		* @implNote This method is implemented to be equivalent to {@code
627		* ints(Long.MAX_VALUE, randomNumberOrigin, randomNumberBound)}.
628		*
629	<	* @param randomNumberOrigin the origin of each random value
630	<	* @param randomNumberBound the bound of each random value
629	>	* @param randomNumberOrigin the origin (inclusive) of each random value
630	>	* @param randomNumberBound the bound (exclusive) of each random value
631		* @return a stream of pseudorandom {@code int} values,
632	<	*         each with the given origin and bound
632	>	*         each with the given origin (inclusive) and bound (exclusive)
633		* @throws IllegalArgumentException if {@code randomNumberOrigin}
634		*         is greater than or equal to {@code randomNumberBound}
635		*/
636		public IntStream ints(int randomNumberOrigin, int randomNumberBound) {
637		if (randomNumberOrigin >= randomNumberBound)
638	<	throw new IllegalArgumentException("bound must be greater than origin");
638	>	throw new IllegalArgumentException(BAD_RANGE);
639		return StreamSupport.intStream
640		(new RandomIntsSpliterator
641		(this, 0L, Long.MAX_VALUE, randomNumberOrigin, randomNumberBound),
#	Line 721 | Line 643 | public class SplittableRandom {
643		}
644
645		/**
646	<	* Returns a stream producing the given {@code streamSize} number of
647	<	* pseudorandom {@code long} values.
646	>	* Returns a stream producing the given {@code streamSize} number
647	>	* of pseudorandom {@code long} values from this generator and/or
648	>	* one split from it.
649		*
650		* @param streamSize the number of values to generate
651		* @return a stream of pseudorandom {@code long} values
#	Line 731 | Line 654 | public class SplittableRandom {
654		*/
655		public LongStream longs(long streamSize) {
656		if (streamSize < 0L)
657	<	throw new IllegalArgumentException("negative Stream size");
657	>	throw new IllegalArgumentException(BAD_SIZE);
658		return StreamSupport.longStream
659		(new RandomLongsSpliterator
660		(this, 0L, streamSize, Long.MAX_VALUE, 0L),
#	Line 739 | Line 662 | public class SplittableRandom {
662		}
663
664		/**
665	<	* Returns an effectively unlimited stream of pseudorandom {@code long}
666	<	* values.
665	>	* Returns an effectively unlimited stream of pseudorandom {@code
666	>	* long} values from this generator and/or one split from it.
667		*
668		* @implNote This method is implemented to be equivalent to {@code
669		* longs(Long.MAX_VALUE)}.
#	Line 756 | Line 679 | public class SplittableRandom {
679
680		/**
681		* Returns a stream producing the given {@code streamSize} number of
682	<	* pseudorandom {@code long} values, each conforming to the
683	<	* given origin and bound.
682	>	* pseudorandom {@code long} values from this generator and/or one split
683	>	* from it; each value conforms to the given origin (inclusive) and bound
684	>	* (exclusive).
685		*
686		* @param streamSize the number of values to generate
687	<	* @param randomNumberOrigin the origin of each random value
688	<	* @param randomNumberBound the bound of each random value
687	>	* @param randomNumberOrigin the origin (inclusive) of each random value
688	>	* @param randomNumberBound the bound (exclusive) of each random value
689		* @return a stream of pseudorandom {@code long} values,
690	<	*         each with the given origin and bound
690	>	*         each with the given origin (inclusive) and bound (exclusive)
691		* @throws IllegalArgumentException if {@code streamSize} is
692		*         less than zero, or {@code randomNumberOrigin}
693		*         is greater than or equal to {@code randomNumberBound}
#	Line 771 | Line 695 | public class SplittableRandom {
695		public LongStream longs(long streamSize, long randomNumberOrigin,
696		long randomNumberBound) {
697		if (streamSize < 0L)
698	<	throw new IllegalArgumentException("negative Stream size");
698	>	throw new IllegalArgumentException(BAD_SIZE);
699		if (randomNumberOrigin >= randomNumberBound)
700	<	throw new IllegalArgumentException("bound must be greater than origin");
700	>	throw new IllegalArgumentException(BAD_RANGE);
701		return StreamSupport.longStream
702		(new RandomLongsSpliterator
703		(this, 0L, streamSize, randomNumberOrigin, randomNumberBound),
#	Line 782 | Line 706 | public class SplittableRandom {
706
707		/**
708		* Returns an effectively unlimited stream of pseudorandom {@code
709	<	* long} values, each conforming to the given origin and bound.
709	>	* long} values from this generator and/or one split from it; each value
710	>	* conforms to the given origin (inclusive) and bound (exclusive).
711		*
712		* @implNote This method is implemented to be equivalent to {@code
713		* longs(Long.MAX_VALUE, randomNumberOrigin, randomNumberBound)}.
714		*
715	<	* @param randomNumberOrigin the origin of each random value
716	<	* @param randomNumberBound the bound of each random value
715	>	* @param randomNumberOrigin the origin (inclusive) of each random value
716	>	* @param randomNumberBound the bound (exclusive) of each random value
717		* @return a stream of pseudorandom {@code long} values,
718	<	*         each with the given origin and bound
718	>	*         each with the given origin (inclusive) and bound (exclusive)
719		* @throws IllegalArgumentException if {@code randomNumberOrigin}
720		*         is greater than or equal to {@code randomNumberBound}
721		*/
722		public LongStream longs(long randomNumberOrigin, long randomNumberBound) {
723		if (randomNumberOrigin >= randomNumberBound)
724	<	throw new IllegalArgumentException("bound must be greater than origin");
724	>	throw new IllegalArgumentException(BAD_RANGE);
725		return StreamSupport.longStream
726		(new RandomLongsSpliterator
727		(this, 0L, Long.MAX_VALUE, randomNumberOrigin, randomNumberBound),
#	Line 805 | Line 730 | public class SplittableRandom {
730
731		/**
732		* Returns a stream producing the given {@code streamSize} number of
733	<	* pseudorandom {@code double} values, each between zero
734	<	* (inclusive) and one (exclusive).
733	>	* pseudorandom {@code double} values from this generator and/or one split
734	>	* from it; each value is between zero (inclusive) and one (exclusive).
735		*
736		* @param streamSize the number of values to generate
737		* @return a stream of {@code double} values
#	Line 815 | Line 740 | public class SplittableRandom {
740		*/
741		public DoubleStream doubles(long streamSize) {
742		if (streamSize < 0L)
743	<	throw new IllegalArgumentException("negative Stream size");
743	>	throw new IllegalArgumentException(BAD_SIZE);
744		return StreamSupport.doubleStream
745		(new RandomDoublesSpliterator
746		(this, 0L, streamSize, Double.MAX_VALUE, 0.0),
#	Line 824 | Line 749 | public class SplittableRandom {
749
750		/**
751		* Returns an effectively unlimited stream of pseudorandom {@code
752	<	* double} values, each between zero (inclusive) and one
753	<	* (exclusive).
752	>	* double} values from this generator and/or one split from it; each value
753	>	* is between zero (inclusive) and one (exclusive).
754		*
755		* @implNote This method is implemented to be equivalent to {@code
756		* doubles(Long.MAX_VALUE)}.
#	Line 841 | Line 766 | public class SplittableRandom {
766
767		/**
768		* Returns a stream producing the given {@code streamSize} number of
769	<	* pseudorandom {@code double} values, each conforming to the
770	<	* given origin and bound.
769	>	* pseudorandom {@code double} values from this generator and/or one split
770	>	* from it; each value conforms to the given origin (inclusive) and bound
771	>	* (exclusive).
772		*
773		* @param streamSize the number of values to generate
774	<	* @param randomNumberOrigin the origin of each random value
775	<	* @param randomNumberBound the bound of each random value
774	>	* @param randomNumberOrigin the origin (inclusive) of each random value
775	>	* @param randomNumberBound the bound (exclusive) of each random value
776		* @return a stream of pseudorandom {@code double} values,
777	<	* each with the given origin and bound
777	>	*         each with the given origin (inclusive) and bound (exclusive)
778		* @throws IllegalArgumentException if {@code streamSize} is
779	<	* less than zero
779	>	*         less than zero
780		* @throws IllegalArgumentException if {@code randomNumberOrigin}
781		*         is greater than or equal to {@code randomNumberBound}
782		*/
783		public DoubleStream doubles(long streamSize, double randomNumberOrigin,
784		double randomNumberBound) {
785		if (streamSize < 0L)
786	<	throw new IllegalArgumentException("negative Stream size");
786	>	throw new IllegalArgumentException(BAD_SIZE);
787		if (!(randomNumberOrigin < randomNumberBound))
788	<	throw new IllegalArgumentException("bound must be greater than origin");
788	>	throw new IllegalArgumentException(BAD_RANGE);
789		return StreamSupport.doubleStream
790		(new RandomDoublesSpliterator
791		(this, 0L, streamSize, randomNumberOrigin, randomNumberBound),
#	Line 868 | Line 794 | public class SplittableRandom {
794
795		/**
796		* Returns an effectively unlimited stream of pseudorandom {@code
797	<	* double} values, each conforming to the given origin and bound.
797	>	* double} values from this generator and/or one split from it; each value
798	>	* conforms to the given origin (inclusive) and bound (exclusive).
799		*
800		* @implNote This method is implemented to be equivalent to {@code
801		* doubles(Long.MAX_VALUE, randomNumberOrigin, randomNumberBound)}.
802		*
803	<	* @param randomNumberOrigin the origin of each random value
804	<	* @param randomNumberBound the bound of each random value
803	>	* @param randomNumberOrigin the origin (inclusive) of each random value
804	>	* @param randomNumberBound the bound (exclusive) of each random value
805		* @return a stream of pseudorandom {@code double} values,
806	<	* each with the given origin and bound
806	>	*         each with the given origin (inclusive) and bound (exclusive)
807		* @throws IllegalArgumentException if {@code randomNumberOrigin}
808		*         is greater than or equal to {@code randomNumberBound}
809		*/
810		public DoubleStream doubles(double randomNumberOrigin, double randomNumberBound) {
811		if (!(randomNumberOrigin < randomNumberBound))
812	<	throw new IllegalArgumentException("bound must be greater than origin");
812	>	throw new IllegalArgumentException(BAD_RANGE);
813		return StreamSupport.doubleStream
814		(new RandomDoublesSpliterator
815		(this, 0L, Long.MAX_VALUE, randomNumberOrigin, randomNumberBound),
#	Line 897 | Line 824 | public class SplittableRandom {
824		* approach. The long and double versions of this class are
825		* identical except for types.
826		*/
827	<	static final class RandomIntsSpliterator implements Spliterator.OfInt {
827	>	private static final class RandomIntsSpliterator
828	>	implements Spliterator.OfInt {
829		final SplittableRandom rng;
830		long index;
831		final long fence;
#	Line 940 | Line 868 | public class SplittableRandom {
868		long i = index, f = fence;
869		if (i < f) {
870		index = f;
871	+	SplittableRandom r = rng;
872		int o = origin, b = bound;
873		do {
874	<	consumer.accept(rng.internalNextInt(o, b));
874	>	consumer.accept(r.internalNextInt(o, b));
875		} while (++i < f);
876		}
877		}
#	Line 951 | Line 880 | public class SplittableRandom {
880		/**
881		* Spliterator for long streams.
882		*/
883	<	static final class RandomLongsSpliterator implements Spliterator.OfLong {
883	>	private static final class RandomLongsSpliterator
884	>	implements Spliterator.OfLong {
885		final SplittableRandom rng;
886		long index;
887		final long fence;
#	Line 994 | Line 924 | public class SplittableRandom {
924		long i = index, f = fence;
925		if (i < f) {
926		index = f;
927	+	SplittableRandom r = rng;
928		long o = origin, b = bound;
929		do {
930	<	consumer.accept(rng.internalNextLong(o, b));
930	>	consumer.accept(r.internalNextLong(o, b));
931		} while (++i < f);
932		}
933		}
#	Line 1006 | Line 937 | public class SplittableRandom {
937		/**
938		* Spliterator for double streams.
939		*/
940	<	static final class RandomDoublesSpliterator implements Spliterator.OfDouble {
940	>	private static final class RandomDoublesSpliterator
941	>	implements Spliterator.OfDouble {
942		final SplittableRandom rng;
943		long index;
944		final long fence;
#	Line 1049 | Line 981 | public class SplittableRandom {
981		long i = index, f = fence;
982		if (i < f) {
983		index = f;
984	+	SplittableRandom r = rng;
985		double o = origin, b = bound;
986		do {
987	<	consumer.accept(rng.internalNextDouble(o, b));
987	>	consumer.accept(r.internalNextDouble(o, b));
988		} while (++i < f);
989		}
990		}

Diff Legend

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