[cvs] / jsr166 / src / main / java / util / SplittableRandom.java Repository:
ViewVC logotype

Diff of /jsr166/src/main/java/util/SplittableRandom.java

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

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

Legend:
Removed from v.1.27  
changed lines
  Added in v.1.28

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8