echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated implementation to match the RandomSource javadocs (inclusive of both 0 and n, unlike SecureRandom, which is inclusive of 0 and exclusive of n)

Browse Source
This commit is contained in:
jrandom
2004-08-07 19:14:13 +00:00
committed by zzz
parent bc46ad4331
commit 2cb519cd06
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/src/net/i2p/util/RandomSource.java
View File

@ -31,16 +31,17 @@ public class RandomSource extends SecureRandom {
/** /**
* According to the java docs (http://java.sun.com/j2se/1.4.1/docs/api/java/util/Random.html#nextInt(int)) * According to the java docs (http://java.sun.com/j2se/1.4.1/docs/api/java/util/Random.html#nextInt(int))
* nextInt(n) should return a number between 0 and n inclusive. However, their pseudocode, * nextInt(n) should return a number between 0 and n (including 0 and excluding n). However, their pseudocode,
* as well as sun's, kaffe's, and classpath's implementation INCLUDES NEGATIVE VALUES. * as well as sun's, kaffe's, and classpath's implementation INCLUDES NEGATIVE VALUES.
* WTF. Ok, so we're going to have it return between 0 and n, since thats what * WTF. Ok, so we're going to have it return between 0 and n (including both 0 and n), since
* it has been used for. * thats what it has been used for.
* *
*/ */
public int nextInt(int n) { public int nextInt(int n) {
if (n == 0) return 0; if (n == 0) return 0;
int val = super.nextInt(n); int val = super.nextInt(n+1);
if (val < 0) val = 0 - val; if (val < 0) val = 0 - val;
if (val > n) val = val % (n+1);
return val; return val;
} }
@ -51,7 +52,7 @@ public class RandomSource extends SecureRandom {
public long nextLong(long n) { public long nextLong(long n) {
long v = super.nextLong(); long v = super.nextLong();
if (v < 0) v = 0 - v; if (v < 0) v = 0 - v;
if (v > n) v = v % n; if (v > n) v = v % (n+1);
return v; return v;
} }