jdk-sandbox: comparison src/java.base/share/classes/java/util/random/L64X256MixRandom.java

equal deleted inserted replaced

-:1ca1cfdcb451
+:56cbdc3ea079
 package java.util.random;
 import java.math.BigInteger;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.random.RandomGenerator.SplittableGenerator;
+import java.util.random.RandomSupport.AbstractSplittableGenerator;
 /**
 * A generator of uniform pseudorandom values applicable for use in
 * (among other contexts) isolated parallel computations that may
 * generate subtasks.  Class {@link L64X256MixRandom} implements
-* interfaces {@link RandomNumberGenerator} and {@link SplittableRNG},
+* interfaces {@link RandomGenerator} and {@link SplittableGenerator},
 * and therefore supports methods for producing pseudorandomly chosen
 * numbers of type {@code int}, {@code long}, {@code float}, and {@code double}
 * as well as creating new split-off {@link L64X256MixRandom} objects,
 * with similar usages as for class {@link java.util.SplittableRandom}.
 * <p>
 * seed unless the {@linkplain System#getProperty system property}
 * {@code java.util.secureRandomSeed} is set to {@code true}.
 *
 * @since 14
 */
-public final class L64X256MixRandom extends AbstractSplittableRNG {
+public final class L64X256MixRandom extends AbstractSplittableGenerator {
 /*
 * Implementation Overview.
 *
 * The split operation uses the current generator to choose six new 64-bit
 /* ---------------- static fields ---------------- */
 /**
 * The seed generator for default constructors.
 */
-private static final AtomicLong defaultGen = new AtomicLong(RNGSupport.initialSeed());
+private static final AtomicLong defaultGen = new AtomicLong(RandomSupport.initialSeed());
 /*
 * The period of this generator, which is (2**256 - 1) * 2**64.
 */
 private static final BigInteger PERIOD =
 this.x2 = x2;
 this.x3 = x3;
 // If x0, x1, x2, and x3 are all zero, we must choose nonzero values.
 if ((x0 | x1 | x2 | x3) == 0) {
 // At least three of the four values generated here will be nonzero.
-this.x0 = RNGSupport.mixStafford13(s += RNGSupport.GOLDEN_RATIO_64);
+this.x0 = RandomSupport.mixStafford13(s += RandomSupport.GOLDEN_RATIO_64);
-this.x1 = RNGSupport.mixStafford13(s += RNGSupport.GOLDEN_RATIO_64);
+this.x1 = RandomSupport.mixStafford13(s += RandomSupport.GOLDEN_RATIO_64);
-this.x2 = RNGSupport.mixStafford13(s += RNGSupport.GOLDEN_RATIO_64);
+this.x2 = RandomSupport.mixStafford13(s += RandomSupport.GOLDEN_RATIO_64);
-this.x3 = RNGSupport.mixStafford13(s + RNGSupport.GOLDEN_RATIO_64);
+this.x3 = RandomSupport.mixStafford13(s + RandomSupport.GOLDEN_RATIO_64);
 }
 }
 /**
 * Creates a new instance of {@link L64X256MixRandom} using the
 // The seed is hashed by mixMurmur64 to produce the `a` parameter.
 // The seed is hashed by mixStafford13 to produce the initial `x0`,
 // which will then be used to produce the first generated value.
 // The other x values are filled in as if by a SplitMix PRNG with
 // GOLDEN_RATIO_64 as the gamma value and Stafford13 as the mixer.
-this(RNGSupport.mixMurmur64(seed ^= RNGSupport.SILVER_RATIO_64),
+this(RandomSupport.mixMurmur64(seed ^= RandomSupport.SILVER_RATIO_64),
 1,
-RNGSupport.mixStafford13(seed),
+RandomSupport.mixStafford13(seed),
-RNGSupport.mixStafford13(seed += RNGSupport.GOLDEN_RATIO_64),
+RandomSupport.mixStafford13(seed += RandomSupport.GOLDEN_RATIO_64),
-RNGSupport.mixStafford13(seed += RNGSupport.GOLDEN_RATIO_64),
+RandomSupport.mixStafford13(seed += RandomSupport.GOLDEN_RATIO_64),
-RNGSupport.mixStafford13(seed + RNGSupport.GOLDEN_RATIO_64));
+RandomSupport.mixStafford13(seed + RandomSupport.GOLDEN_RATIO_64));
 }
 /**
 * Creates a new instance of {@link L64X256MixRandom} that is likely to
 * generate sequences of values that are statistically independent
 * of those of any other instances in the current program execution,
 * but may, and typically does, vary across program invocations.
 */
 public L64X256MixRandom() {
 // Using GOLDEN_RATIO_64 here gives us a good Weyl sequence of values.
-this(defaultGen.getAndAdd(RNGSupport.GOLDEN_RATIO_64));
+this(defaultGen.getAndAdd(RandomSupport.GOLDEN_RATIO_64));
 }
 /**
 * Creates a new instance of {@link L64X256MixRandom} using the specified array of
 * initial seed bytes. Instances of {@link L64X256MixRandom} created with the same
 *
 * @param seed the initial seed
 */
 public L64X256MixRandom(byte[] seed) {
 // Convert the seed to 6 long values, of which the last 4 are not all zero.
-long[] data = RNGSupport.convertSeedBytesToLongs(seed, 6, 4);
+long[] data = RandomSupport.convertSeedBytesToLongs(seed, 6, 4);
 long a = data[0], s = data[1], x0 = data[2], x1 = data[3], x2 = data[4], x3 = data[5];
 // Force a to be odd.
 this.a = a | 1;
 this.s = s;
 this.x0 = x0;
 * a single {@link L64X256MixRandom} object.  Either or both of the two
 * objects may be further split using the {@code split} method,
 * and the same expected statistical properties apply to the
 * entire set of generators constructed by such recursive splitting.
 *
-* @param source a {@link SplittableRNG} instance to be used instead
+* @param source a {@link SplittableGenerator} instance to be used instead
 *               of this one as a source of pseudorandom bits used to
 *               initialize the state of the new ones.
 *
 * @return a new instance of {@link L64X256MixRandom}
 */
-public L64X256MixRandom split(SplittableRNG source) {
+public L64X256MixRandom split(SplittableGenerator source) {
 // Literally pick a new instance "at random".
 return new L64X256MixRandom(source.nextLong(), source.nextLong(),
 source.nextLong(), source.nextLong(),
 source.nextLong(), source.nextLong());
 }
 final long z = s + x0;
 s = M * s + a;  // LCG
 long q0 = x0, q1 = x1, q2 = x2, q3 = x3;
 { long t = q1 << 17; q2 ^= q0; q3 ^= q1; q1 ^= q2; q0 ^= q3; q2 ^= t; q3 = Long.rotateLeft(q3, 45); }  // xoshiro256 1.0
 x0 = q0; x1 = q1; x2 = q2; x3 = q3;
-return RNGSupport.mixLea64(z);  // mixing function
+return RandomSupport.mixLea64(z);  // mixing function
 }
 public BigInteger period() {
 return PERIOD;
 }

branch	JDK-8193209-branch
changeset 57547	56cbdc3ea079
parent 57437	f02ffcb61dce
child 57684	7cb325557832