25 |
|
|
26 |
|
package java.util; |
27 |
|
|
28 |
– |
import java.security.SecureRandom; |
29 |
– |
import java.net.InetAddress; |
28 |
|
import java.util.concurrent.atomic.AtomicLong; |
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 |
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 |
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 |
|
* |
86 |
|
* @author Doug Lea |
87 |
|
* @since 1.8 |
88 |
|
*/ |
89 |
< |
public class SplittableRandom { |
89 |
> |
public final class SplittableRandom { |
90 |
|
|
91 |
|
/* |
92 |
|
* Implementation Overview. |
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 bit-mixing function computes the same |
110 |
< |
* value as the "64-bit finalizer" function in Austin Appleby's |
111 |
< |
* MurmurHash3 algorithm. See |
112 |
< |
* http://code.google.com/p/smhasher/wiki/MurmurHash3 , which |
113 |
< |
* comments: "The constants for the finalizers were generated by a |
114 |
< |
* simple simulated-annealing algorithm, and both avalanche all |
115 |
< |
* bits of 'h' to within 0.25% bias." The mix32 function is |
118 |
< |
* equivalent to (int)(mix64(seed) >>> 32), but faster because it |
119 |
< |
* omits a step that doesn't contribute to result. |
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 nextGamma) uses the "Mix13" constants |
121 |
< |
* for MurmurHash3 described by David Stafford |
122 |
< |
* (http://zimbry.blogspot.com/2011/09/better-bit-mixing-improving-on.html) |
123 |
< |
* To avoid potential weaknesses in bit-mixing transformations, we |
124 |
< |
* restrict gammas to odd values with at least 12 and no more than |
125 |
< |
* 52 bits set. Rather than rejecting candidates with too few or |
126 |
< |
* too many bits set, method nextGamma flips some bits (which has |
127 |
< |
* the effect of mapping at most 4 to any given gamma value). |
132 |
< |
* This reduces the effective set of 64bit odd gamma values by |
133 |
< |
* about 2<sup>14</sup>, a very tiny percentage, and serves as an |
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. |
135 |
|
* avalanching. |
136 |
|
* |
137 |
|
* The default (no-argument) constructor, in essence, invokes |
138 |
< |
* split() for a common "seeder" SplittableRandom. Unlike other |
139 |
< |
* cases, this split must be performed in a thread-safe manner, so |
140 |
< |
* we use an AtomicLong to represent the seed rather than use an |
141 |
< |
* explicit SplittableRandom. To bootstrap the seeder, we start |
142 |
< |
* off using a seed based on current time and host unless the |
143 |
< |
* java.util.secureRandomSeed property is set. This serves as a |
144 |
< |
* slimmed-down (and insecure) variant of SecureRandom that also |
145 |
< |
* avoids stalls that may occur when using /dev/random. |
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 |
155 |
|
*/ |
156 |
|
|
157 |
|
/** |
158 |
< |
* The initial gamma value for (unsplit) SplittableRandoms. Must |
159 |
< |
* be odd with at least 12 and no more than 52 bits set. Currently |
166 |
< |
* set to the golden ratio scaled to 64bits. |
158 |
> |
* The golden ratio scaled to 64bits, used as the initial gamma |
159 |
> |
* value for (unsplit) SplittableRandoms. |
160 |
|
*/ |
161 |
< |
private static final long INITIAL_GAMMA = 0x9e3779b97f4a7c15L; |
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); |
167 |
> |
private static final double DOUBLE_UNIT = 0x1.0p-53; // 1.0 / (1L << 53); |
168 |
|
|
169 |
|
/** |
170 |
|
* The seed. Updated only via method nextSeed. |
185 |
|
} |
186 |
|
|
187 |
|
/** |
188 |
< |
* Computes MurmurHash3 64bit mix function. |
188 |
> |
* Computes Stafford variant 13 of 64bit mix function. |
189 |
|
*/ |
190 |
|
private static long mix64(long z) { |
191 |
< |
z = (z ^ (z >>> 33)) * 0xff51afd7ed558ccdL; |
192 |
< |
z = (z ^ (z >>> 33)) * 0xc4ceb9fe1a85ec53L; |
193 |
< |
return z ^ (z >>> 33); |
191 |
> |
z = (z ^ (z >>> 30)) * 0xbf58476d1ce4e5b9L; |
192 |
> |
z = (z ^ (z >>> 27)) * 0x94d049bb133111ebL; |
193 |
> |
return z ^ (z >>> 31); |
194 |
|
} |
195 |
|
|
196 |
|
/** |
197 |
< |
* Returns the 32 high bits of mix64(z) as int. |
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 ^ (z >>> 33)) * 0xff51afd7ed558ccdL; |
201 |
< |
return (int)(((z ^ (z >>> 33)) * 0xc4ceb9fe1a85ec53L) >>> 32); |
200 |
> |
z = (z ^ (z >>> 33)) * 0x62a9d9ed799705f5L; |
201 |
> |
return (int)(((z ^ (z >>> 28)) * 0xcb24d0a5c88c35b3L) >>> 32); |
202 |
|
} |
203 |
|
|
204 |
|
/** |
205 |
|
* Returns the gamma value to use for a new split instance. |
206 |
|
*/ |
207 |
< |
private static long nextGamma(long z) { |
208 |
< |
z = (z ^ (z >>> 30)) * 0xbf58476d1ce4e5b9L; // Stafford "Mix13" |
209 |
< |
z = (z ^ (z >>> 27)) * 0x94d049bb133111ebL; |
210 |
< |
z = (z ^ (z >>> 31)) | 1L; // force to be odd |
211 |
< |
int n = Long.bitCount(z); // ensure enough 0 and 1 bits |
212 |
< |
return (n < 12 || n > 52) ? z ^ 0xaaaaaaaaaaaaaaaaL : z; |
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 |
|
/** |
219 |
|
return seed += gamma; |
220 |
|
} |
221 |
|
|
222 |
+ |
// IllegalArgumentException messages |
223 |
+ |
static final String BAD_BOUND = "bound must be positive"; |
224 |
+ |
static final String BAD_RANGE = "bound must be greater than origin"; |
225 |
+ |
static final String BAD_SIZE = "size must be non-negative"; |
226 |
+ |
|
227 |
|
/** |
228 |
|
* The seed generator for default constructors. |
229 |
|
*/ |
230 |
< |
private static final AtomicLong seeder = new AtomicLong(initialSeed()); |
231 |
< |
|
232 |
< |
private static long initialSeed() { |
233 |
< |
try { // ignore exceptions in accessing/parsing properties |
234 |
< |
String pp = System.getProperty |
235 |
< |
("java.util.secureRandomSeed"); |
236 |
< |
if (pp != null && pp.equalsIgnoreCase("true")) { |
237 |
< |
byte[] seedBytes = java.security.SecureRandom.getSeed(8); |
238 |
< |
long s = (long)(seedBytes[0]) & 0xffL; |
239 |
< |
for (int i = 1; i < 8; ++i) |
240 |
< |
s = (s << 8) | ((long)(seedBytes[i]) & 0xffL); |
241 |
< |
return s; |
242 |
< |
} |
243 |
< |
} catch (Exception ignore) { |
230 |
> |
private static final AtomicLong defaultGen |
231 |
> |
= new AtomicLong(mix64(System.currentTimeMillis()) ^ |
232 |
> |
mix64(System.nanoTime())); |
233 |
> |
|
234 |
> |
// at end of <clinit> to survive static initialization circularity |
235 |
> |
static { |
236 |
> |
if (java.security.AccessController.doPrivileged( |
237 |
> |
new java.security.PrivilegedAction<Boolean>() { |
238 |
> |
public Boolean run() { |
239 |
> |
return Boolean.getBoolean("java.util.secureRandomSeed"); |
240 |
> |
}})) { |
241 |
> |
byte[] seedBytes = java.security.SecureRandom.getSeed(8); |
242 |
> |
long s = (long)seedBytes[0] & 0xffL; |
243 |
> |
for (int i = 1; i < 8; ++i) |
244 |
> |
s = (s << 8) | ((long)seedBytes[i] & 0xffL); |
245 |
> |
defaultGen.set(s); |
246 |
|
} |
247 |
– |
int hh = 0; // hashed host address |
248 |
– |
try { |
249 |
– |
hh = InetAddress.getLocalHost().hashCode(); |
250 |
– |
} catch (Exception ignore) { |
251 |
– |
} |
252 |
– |
return (mix64((((long)hh) << 32) ^ System.currentTimeMillis()) ^ |
253 |
– |
mix64(System.nanoTime())); |
247 |
|
} |
248 |
|
|
256 |
– |
// IllegalArgumentException messages |
257 |
– |
static final String BadBound = "bound must be positive"; |
258 |
– |
static final String BadRange = "bound must be greater than origin"; |
259 |
– |
static final String BadSize = "size must be non-negative"; |
260 |
– |
|
249 |
|
/* |
250 |
|
* Internal versions of nextX methods used by streams, as well as |
251 |
|
* the public nextX(origin, bound) methods. These exist mainly to |
365 |
|
* @param seed the initial seed |
366 |
|
*/ |
367 |
|
public SplittableRandom(long seed) { |
368 |
< |
this(seed, INITIAL_GAMMA); |
368 |
> |
this(seed, GOLDEN_GAMMA); |
369 |
|
} |
370 |
|
|
371 |
|
/** |
374 |
|
* of those of any other instances in the current program; and |
375 |
|
* may, and typically does, vary across program invocations. |
376 |
|
*/ |
377 |
< |
public SplittableRandom() { // emulate seeder.split() |
378 |
< |
this.gamma = nextGamma(this.seed = seeder.addAndGet(INITIAL_GAMMA)); |
377 |
> |
public SplittableRandom() { // emulate defaultGen.split() |
378 |
> |
long s = defaultGen.getAndAdd(GOLDEN_GAMMA << 1); |
379 |
> |
this.seed = mix64(s); |
380 |
> |
this.gamma = mixGamma(s + GOLDEN_GAMMA); |
381 |
|
} |
382 |
|
|
383 |
|
/** |
395 |
|
* @return the new SplittableRandom instance |
396 |
|
*/ |
397 |
|
public SplittableRandom split() { |
398 |
< |
long s = nextSeed(); |
399 |
< |
return new SplittableRandom(s, nextGamma(s)); |
398 |
> |
return new SplittableRandom(nextLong(), mixGamma(nextSeed())); |
399 |
> |
} |
400 |
> |
|
401 |
> |
/** |
402 |
> |
* Fills a user-supplied byte array with generated pseudorandom bytes. |
403 |
> |
* |
404 |
> |
* @param bytes the byte array to fill with pseudorandom bytes |
405 |
> |
* @throws NullPointerException if bytes is null |
406 |
> |
* @since 10 |
407 |
> |
*/ |
408 |
> |
public void nextBytes(byte[] bytes) { |
409 |
> |
int i = 0; |
410 |
> |
int len = bytes.length; |
411 |
> |
for (int words = len >> 3; words--> 0; ) { |
412 |
> |
long rnd = nextLong(); |
413 |
> |
for (int n = 8; n--> 0; rnd >>>= Byte.SIZE) |
414 |
> |
bytes[i++] = (byte)rnd; |
415 |
> |
} |
416 |
> |
if (i < len) |
417 |
> |
for (long rnd = nextLong(); i < len; rnd >>>= Byte.SIZE) |
418 |
> |
bytes[i++] = (byte)rnd; |
419 |
|
} |
420 |
|
|
421 |
|
/** |
438 |
|
*/ |
439 |
|
public int nextInt(int bound) { |
440 |
|
if (bound <= 0) |
441 |
< |
throw new IllegalArgumentException(BadBound); |
441 |
> |
throw new IllegalArgumentException(BAD_BOUND); |
442 |
|
// Specialize internalNextInt for origin 0 |
443 |
|
int r = mix32(nextSeed()); |
444 |
|
int m = bound - 1; |
466 |
|
*/ |
467 |
|
public int nextInt(int origin, int bound) { |
468 |
|
if (origin >= bound) |
469 |
< |
throw new IllegalArgumentException(BadRange); |
469 |
> |
throw new IllegalArgumentException(BAD_RANGE); |
470 |
|
return internalNextInt(origin, bound); |
471 |
|
} |
472 |
|
|
490 |
|
*/ |
491 |
|
public long nextLong(long bound) { |
492 |
|
if (bound <= 0) |
493 |
< |
throw new IllegalArgumentException(BadBound); |
493 |
> |
throw new IllegalArgumentException(BAD_BOUND); |
494 |
|
// Specialize internalNextLong for origin 0 |
495 |
|
long r = mix64(nextSeed()); |
496 |
|
long m = bound - 1; |
518 |
|
*/ |
519 |
|
public long nextLong(long origin, long bound) { |
520 |
|
if (origin >= bound) |
521 |
< |
throw new IllegalArgumentException(BadRange); |
521 |
> |
throw new IllegalArgumentException(BAD_RANGE); |
522 |
|
return internalNextLong(origin, bound); |
523 |
|
} |
524 |
|
|
544 |
|
*/ |
545 |
|
public double nextDouble(double bound) { |
546 |
|
if (!(bound > 0.0)) |
547 |
< |
throw new IllegalArgumentException(BadBound); |
547 |
> |
throw new IllegalArgumentException(BAD_BOUND); |
548 |
|
double result = (mix64(nextSeed()) >>> 11) * DOUBLE_UNIT * bound; |
549 |
|
return (result < bound) ? result : // correct for rounding |
550 |
|
Double.longBitsToDouble(Double.doubleToLongBits(bound) - 1); |
563 |
|
*/ |
564 |
|
public double nextDouble(double origin, double bound) { |
565 |
|
if (!(origin < bound)) |
566 |
< |
throw new IllegalArgumentException(BadRange); |
566 |
> |
throw new IllegalArgumentException(BAD_RANGE); |
567 |
|
return internalNextDouble(origin, bound); |
568 |
|
} |
569 |
|
|
591 |
|
*/ |
592 |
|
public IntStream ints(long streamSize) { |
593 |
|
if (streamSize < 0L) |
594 |
< |
throw new IllegalArgumentException(BadSize); |
594 |
> |
throw new IllegalArgumentException(BAD_SIZE); |
595 |
|
return StreamSupport.intStream |
596 |
|
(new RandomIntsSpliterator |
597 |
|
(this, 0L, streamSize, Integer.MAX_VALUE, 0), |
632 |
|
public IntStream ints(long streamSize, int randomNumberOrigin, |
633 |
|
int randomNumberBound) { |
634 |
|
if (streamSize < 0L) |
635 |
< |
throw new IllegalArgumentException(BadSize); |
635 |
> |
throw new IllegalArgumentException(BAD_SIZE); |
636 |
|
if (randomNumberOrigin >= randomNumberBound) |
637 |
< |
throw new IllegalArgumentException(BadRange); |
637 |
> |
throw new IllegalArgumentException(BAD_RANGE); |
638 |
|
return StreamSupport.intStream |
639 |
|
(new RandomIntsSpliterator |
640 |
|
(this, 0L, streamSize, randomNumberOrigin, randomNumberBound), |
658 |
|
*/ |
659 |
|
public IntStream ints(int randomNumberOrigin, int randomNumberBound) { |
660 |
|
if (randomNumberOrigin >= randomNumberBound) |
661 |
< |
throw new IllegalArgumentException(BadRange); |
661 |
> |
throw new IllegalArgumentException(BAD_RANGE); |
662 |
|
return StreamSupport.intStream |
663 |
|
(new RandomIntsSpliterator |
664 |
|
(this, 0L, Long.MAX_VALUE, randomNumberOrigin, randomNumberBound), |
677 |
|
*/ |
678 |
|
public LongStream longs(long streamSize) { |
679 |
|
if (streamSize < 0L) |
680 |
< |
throw new IllegalArgumentException(BadSize); |
680 |
> |
throw new IllegalArgumentException(BAD_SIZE); |
681 |
|
return StreamSupport.longStream |
682 |
|
(new RandomLongsSpliterator |
683 |
|
(this, 0L, streamSize, Long.MAX_VALUE, 0L), |
718 |
|
public LongStream longs(long streamSize, long randomNumberOrigin, |
719 |
|
long randomNumberBound) { |
720 |
|
if (streamSize < 0L) |
721 |
< |
throw new IllegalArgumentException(BadSize); |
721 |
> |
throw new IllegalArgumentException(BAD_SIZE); |
722 |
|
if (randomNumberOrigin >= randomNumberBound) |
723 |
< |
throw new IllegalArgumentException(BadRange); |
723 |
> |
throw new IllegalArgumentException(BAD_RANGE); |
724 |
|
return StreamSupport.longStream |
725 |
|
(new RandomLongsSpliterator |
726 |
|
(this, 0L, streamSize, randomNumberOrigin, randomNumberBound), |
744 |
|
*/ |
745 |
|
public LongStream longs(long randomNumberOrigin, long randomNumberBound) { |
746 |
|
if (randomNumberOrigin >= randomNumberBound) |
747 |
< |
throw new IllegalArgumentException(BadRange); |
747 |
> |
throw new IllegalArgumentException(BAD_RANGE); |
748 |
|
return StreamSupport.longStream |
749 |
|
(new RandomLongsSpliterator |
750 |
|
(this, 0L, Long.MAX_VALUE, randomNumberOrigin, randomNumberBound), |
763 |
|
*/ |
764 |
|
public DoubleStream doubles(long streamSize) { |
765 |
|
if (streamSize < 0L) |
766 |
< |
throw new IllegalArgumentException(BadSize); |
766 |
> |
throw new IllegalArgumentException(BAD_SIZE); |
767 |
|
return StreamSupport.doubleStream |
768 |
|
(new RandomDoublesSpliterator |
769 |
|
(this, 0L, streamSize, Double.MAX_VALUE, 0.0), |
799 |
|
* @return a stream of pseudorandom {@code double} values, |
800 |
|
* each with the given origin (inclusive) and bound (exclusive) |
801 |
|
* @throws IllegalArgumentException if {@code streamSize} is |
802 |
< |
* less than zero |
794 |
< |
* @throws IllegalArgumentException if {@code randomNumberOrigin} |
802 |
> |
* less than zero, or {@code randomNumberOrigin} |
803 |
|
* is greater than or equal to {@code randomNumberBound} |
804 |
|
*/ |
805 |
|
public DoubleStream doubles(long streamSize, double randomNumberOrigin, |
806 |
|
double randomNumberBound) { |
807 |
|
if (streamSize < 0L) |
808 |
< |
throw new IllegalArgumentException(BadSize); |
808 |
> |
throw new IllegalArgumentException(BAD_SIZE); |
809 |
|
if (!(randomNumberOrigin < randomNumberBound)) |
810 |
< |
throw new IllegalArgumentException(BadRange); |
810 |
> |
throw new IllegalArgumentException(BAD_RANGE); |
811 |
|
return StreamSupport.doubleStream |
812 |
|
(new RandomDoublesSpliterator |
813 |
|
(this, 0L, streamSize, randomNumberOrigin, randomNumberBound), |
831 |
|
*/ |
832 |
|
public DoubleStream doubles(double randomNumberOrigin, double randomNumberBound) { |
833 |
|
if (!(randomNumberOrigin < randomNumberBound)) |
834 |
< |
throw new IllegalArgumentException(BadRange); |
834 |
> |
throw new IllegalArgumentException(BAD_RANGE); |
835 |
|
return StreamSupport.doubleStream |
836 |
|
(new RandomDoublesSpliterator |
837 |
|
(this, 0L, Long.MAX_VALUE, randomNumberOrigin, randomNumberBound), |
846 |
|
* approach. The long and double versions of this class are |
847 |
|
* identical except for types. |
848 |
|
*/ |
849 |
< |
static final class RandomIntsSpliterator implements Spliterator.OfInt { |
849 |
> |
private static final class RandomIntsSpliterator |
850 |
> |
implements Spliterator.OfInt { |
851 |
|
final SplittableRandom rng; |
852 |
|
long index; |
853 |
|
final long fence; |
902 |
|
/** |
903 |
|
* Spliterator for long streams. |
904 |
|
*/ |
905 |
< |
static final class RandomLongsSpliterator implements Spliterator.OfLong { |
905 |
> |
private static final class RandomLongsSpliterator |
906 |
> |
implements Spliterator.OfLong { |
907 |
|
final SplittableRandom rng; |
908 |
|
long index; |
909 |
|
final long fence; |
959 |
|
/** |
960 |
|
* Spliterator for double streams. |
961 |
|
*/ |
962 |
< |
static final class RandomDoublesSpliterator implements Spliterator.OfDouble { |
962 |
> |
private static final class RandomDoublesSpliterator |
963 |
> |
implements Spliterator.OfDouble { |
964 |
|
final SplittableRandom rng; |
965 |
|
long index; |
966 |
|
final long fence; |