You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by er...@apache.org on 2015/12/28 18:23:17 UTC
[05/18] [math] MATH-1307
MATH-1307
Extends new base class.
Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/921d0d60
Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/921d0d60
Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/921d0d60
Branch: refs/heads/master
Commit: 921d0d60d40d8fbda29f14a64e848c70026ea32e
Parents: 87497c7
Author: Gilles <er...@apache.org>
Authored: Mon Dec 28 16:49:55 2015 +0100
Committer: Gilles <er...@apache.org>
Committed: Mon Dec 28 16:49:55 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/commons/math4/random/ISAACRandom.java | 10 ++++++----
.../java/org/apache/commons/math4/random/ISAACTest.java | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-math/blob/921d0d60/src/main/java/org/apache/commons/math4/random/ISAACRandom.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/random/ISAACRandom.java b/src/main/java/org/apache/commons/math4/random/ISAACRandom.java
index ed07ddf..b9c0e36 100644
--- a/src/main/java/org/apache/commons/math4/random/ISAACRandom.java
+++ b/src/main/java/org/apache/commons/math4/random/ISAACRandom.java
@@ -41,9 +41,11 @@ import org.apache.commons.math4.util.FastMath;
*
* @since 3.0
*/
-public class ISAACRandom extends BitsStreamGenerator implements Serializable {
+public class ISAACRandom
+ extends BaseRandomGenerator
+ implements Serializable {
/** Serializable version identifier */
- private static final long serialVersionUID = 7288197941165002400L;
+ private static final long serialVersionUID = 20151227L;
/** Log of size of rsl[] and mem[] */
private static final int SIZE_L = 8;
/** Size of rsl[] and mem[] */
@@ -138,12 +140,12 @@ public class ISAACRandom extends BitsStreamGenerator implements Serializable {
/** {@inheritDoc} */
@Override
- protected int next(int bits) {
+ public int nextInt() {
if (count < 0) {
isaac();
count = SIZE - 1;
}
- return rsl[count--] >>> 32 - bits;
+ return rsl[count--];
}
/** Generate 256 results */
http://git-wip-us.apache.org/repos/asf/commons-math/blob/921d0d60/src/test/java/org/apache/commons/math4/random/ISAACTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/random/ISAACTest.java b/src/test/java/org/apache/commons/math4/random/ISAACTest.java
index f8e7e65..6db04ba 100644
--- a/src/test/java/org/apache/commons/math4/random/ISAACTest.java
+++ b/src/test/java/org/apache/commons/math4/random/ISAACTest.java
@@ -22,7 +22,7 @@ import org.apache.commons.math4.random.RandomGenerator;
import org.junit.Assert;
import org.junit.Test;
-public final class ISAACTest extends RandomGeneratorAbstractTest {
+public final class ISAACTest extends BaseRandomGeneratorTest {
@Override
protected RandomGenerator makeGenerator() {