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.27 by jsr166, Sun Sep 13 16:28:14 2015 UTC vs.
Revision 1.28 by jsr166, Sat Sep 19 21:07:10 2015 UTC

#	Line 240 | Line 240 | public final class SplittableRandom {
240		}
241
242		// IllegalArgumentException messages
243	<	static final String BadBound = "bound must be positive";
244	<	static final String BadRange = "bound must be greater than origin";
245	<	static final String BadSize  = "size must be non-negative";
243	>	static final String BAD_BOUND = "bound must be positive";
244	>	static final String BAD_RANGE = "bound must be greater than origin";
245	>	static final String BAD_SIZE  = "size must be non-negative";
246
247		/*
248		* Internal versions of nextX methods used by streams, as well as
#	Line 416 | Line 416 | public final class SplittableRandom {
416		*/
417		public int nextInt(int bound) {
418		if (bound <= 0)
419	<	throw new IllegalArgumentException(BadBound);
419	>	throw new IllegalArgumentException(BAD_BOUND);
420		// Specialize internalNextInt for origin 0
421		int r = mix32(nextSeed());
422		int m = bound - 1;
#	Line 444 | Line 444 | public final class SplittableRandom {
444		*/
445		public int nextInt(int origin, int bound) {
446		if (origin >= bound)
447	<	throw new IllegalArgumentException(BadRange);
447	>	throw new IllegalArgumentException(BAD_RANGE);
448		return internalNextInt(origin, bound);
449		}
450
#	Line 468 | Line 468 | public final class SplittableRandom {
468		*/
469		public long nextLong(long bound) {
470		if (bound <= 0)
471	<	throw new IllegalArgumentException(BadBound);
471	>	throw new IllegalArgumentException(BAD_BOUND);
472		// Specialize internalNextLong for origin 0
473		long r = mix64(nextSeed());
474		long m = bound - 1;
#	Line 496 | Line 496 | public final class SplittableRandom {
496		*/
497		public long nextLong(long origin, long bound) {
498		if (origin >= bound)
499	<	throw new IllegalArgumentException(BadRange);
499	>	throw new IllegalArgumentException(BAD_RANGE);
500		return internalNextLong(origin, bound);
501		}
502
#	Line 522 | Line 522 | public final class SplittableRandom {
522		*/
523		public double nextDouble(double bound) {
524		if (!(bound > 0.0))
525	<	throw new IllegalArgumentException(BadBound);
525	>	throw new IllegalArgumentException(BAD_BOUND);
526		double result = (mix64(nextSeed()) >>> 11) * DOUBLE_UNIT * bound;
527		return (result < bound) ?  result : // correct for rounding
528		Double.longBitsToDouble(Double.doubleToLongBits(bound) - 1);
#	Line 541 | Line 541 | public final class SplittableRandom {
541		*/
542		public double nextDouble(double origin, double bound) {
543		if (!(origin < bound))
544	<	throw new IllegalArgumentException(BadRange);
544	>	throw new IllegalArgumentException(BAD_RANGE);
545		return internalNextDouble(origin, bound);
546		}
547
#	Line 569 | Line 569 | public final class SplittableRandom {
569		*/
570		public IntStream ints(long streamSize) {
571		if (streamSize < 0L)
572	<	throw new IllegalArgumentException(BadSize);
572	>	throw new IllegalArgumentException(BAD_SIZE);
573		return StreamSupport.intStream
574		(new RandomIntsSpliterator
575		(this, 0L, streamSize, Integer.MAX_VALUE, 0),
#	Line 610 | Line 610 | public final class SplittableRandom {
610		public IntStream ints(long streamSize, int randomNumberOrigin,
611		int randomNumberBound) {
612		if (streamSize < 0L)
613	<	throw new IllegalArgumentException(BadSize);
613	>	throw new IllegalArgumentException(BAD_SIZE);
614		if (randomNumberOrigin >= randomNumberBound)
615	<	throw new IllegalArgumentException(BadRange);
615	>	throw new IllegalArgumentException(BAD_RANGE);
616		return StreamSupport.intStream
617		(new RandomIntsSpliterator
618		(this, 0L, streamSize, randomNumberOrigin, randomNumberBound),
#	Line 636 | Line 636 | public final class SplittableRandom {
636		*/
637		public IntStream ints(int randomNumberOrigin, int randomNumberBound) {
638		if (randomNumberOrigin >= randomNumberBound)
639	<	throw new IllegalArgumentException(BadRange);
639	>	throw new IllegalArgumentException(BAD_RANGE);
640		return StreamSupport.intStream
641		(new RandomIntsSpliterator
642		(this, 0L, Long.MAX_VALUE, randomNumberOrigin, randomNumberBound),
#	Line 655 | Line 655 | public final class SplittableRandom {
655		*/
656		public LongStream longs(long streamSize) {
657		if (streamSize < 0L)
658	<	throw new IllegalArgumentException(BadSize);
658	>	throw new IllegalArgumentException(BAD_SIZE);
659		return StreamSupport.longStream
660		(new RandomLongsSpliterator
661		(this, 0L, streamSize, Long.MAX_VALUE, 0L),
#	Line 696 | Line 696 | public final class SplittableRandom {
696		public LongStream longs(long streamSize, long randomNumberOrigin,
697		long randomNumberBound) {
698		if (streamSize < 0L)
699	<	throw new IllegalArgumentException(BadSize);
699	>	throw new IllegalArgumentException(BAD_SIZE);
700		if (randomNumberOrigin >= randomNumberBound)
701	<	throw new IllegalArgumentException(BadRange);
701	>	throw new IllegalArgumentException(BAD_RANGE);
702		return StreamSupport.longStream
703		(new RandomLongsSpliterator
704		(this, 0L, streamSize, randomNumberOrigin, randomNumberBound),
#	Line 722 | Line 722 | public final class SplittableRandom {
722		*/
723		public LongStream longs(long randomNumberOrigin, long randomNumberBound) {
724		if (randomNumberOrigin >= randomNumberBound)
725	<	throw new IllegalArgumentException(BadRange);
725	>	throw new IllegalArgumentException(BAD_RANGE);
726		return StreamSupport.longStream
727		(new RandomLongsSpliterator
728		(this, 0L, Long.MAX_VALUE, randomNumberOrigin, randomNumberBound),
#	Line 741 | Line 741 | public final class SplittableRandom {
741		*/
742		public DoubleStream doubles(long streamSize) {
743		if (streamSize < 0L)
744	<	throw new IllegalArgumentException(BadSize);
744	>	throw new IllegalArgumentException(BAD_SIZE);
745		return StreamSupport.doubleStream
746		(new RandomDoublesSpliterator
747		(this, 0L, streamSize, Double.MAX_VALUE, 0.0),
#	Line 784 | Line 784 | public final class SplittableRandom {
784		public DoubleStream doubles(long streamSize, double randomNumberOrigin,
785		double randomNumberBound) {
786		if (streamSize < 0L)
787	<	throw new IllegalArgumentException(BadSize);
787	>	throw new IllegalArgumentException(BAD_SIZE);
788		if (!(randomNumberOrigin < randomNumberBound))
789	<	throw new IllegalArgumentException(BadRange);
789	>	throw new IllegalArgumentException(BAD_RANGE);
790		return StreamSupport.doubleStream
791		(new RandomDoublesSpliterator
792		(this, 0L, streamSize, randomNumberOrigin, randomNumberBound),
#	Line 810 | Line 810 | public final class SplittableRandom {
810		*/
811		public DoubleStream doubles(double randomNumberOrigin, double randomNumberBound) {
812		if (!(randomNumberOrigin < randomNumberBound))
813	<	throw new IllegalArgumentException(BadRange);
813	>	throw new IllegalArgumentException(BAD_RANGE);
814		return StreamSupport.doubleStream
815		(new RandomDoublesSpliterator
816		(this, 0L, Long.MAX_VALUE, randomNumberOrigin, randomNumberBound),

Diff Legend

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