Repository: commons-math Updated Branches: refs/heads/develop 57e01f404 -> 0e89d6c31
MATH-1335 Use new RNG API. Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/8e71711c Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/8e71711c Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/8e71711c Branch: refs/heads/develop Commit: 8e71711c1caaa404d84ec6682f1b7b266064c2e9 Parents: 0caba08 Author: Gilles <er...@apache.org> Authored: Thu May 12 17:08:28 2016 +0200 Committer: Gilles <er...@apache.org> Committed: Tue May 17 15:30:23 2016 +0200 ---------------------------------------------------------------------- .../commons/math4/random/StableRandomGenerator.java | 10 ++++------ .../commons/math4/random/StableRandomGeneratorTest.java | 12 ++++-------- 2 files changed, 8 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-math/blob/8e71711c/src/main/java/org/apache/commons/math4/random/StableRandomGenerator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/random/StableRandomGenerator.java b/src/main/java/org/apache/commons/math4/random/StableRandomGenerator.java index a93df01..3199c0f 100644 --- a/src/main/java/org/apache/commons/math4/random/StableRandomGenerator.java +++ b/src/main/java/org/apache/commons/math4/random/StableRandomGenerator.java @@ -16,6 +16,7 @@ */ package org.apache.commons.math4.random; +import org.apache.commons.math4.rng.UniformRandomProvider; import org.apache.commons.math4.exception.NullArgumentException; import org.apache.commons.math4.exception.OutOfRangeException; import org.apache.commons.math4.exception.util.LocalizedFormats; @@ -33,28 +34,25 @@ import org.apache.commons.math4.util.FastMath; */ public class StableRandomGenerator implements NormalizedRandomGenerator { /** Underlying generator. */ - private final RandomGenerator generator; - + private final UniformRandomProvider generator; /** stability parameter */ private final double alpha; - /** skewness parameter */ private final double beta; - /** cache of expression value used in generation */ private final double zeta; /** * Create a new generator. * - * @param generator underlying random generator to use + * @param generator Underlying random generator * @param alpha Stability parameter. Must be in range (0, 2] * @param beta Skewness parameter. Must be in range [-1, 1] * @throws NullArgumentException if generator is null * @throws OutOfRangeException if {@code alpha <= 0} or {@code alpha > 2} * or {@code beta < -1} or {@code beta > 1} */ - public StableRandomGenerator(final RandomGenerator generator, + public StableRandomGenerator(final UniformRandomProvider generator, final double alpha, final double beta) throws NullArgumentException, OutOfRangeException { if (generator == null) { http://git-wip-us.apache.org/repos/asf/commons-math/blob/8e71711c/src/test/java/org/apache/commons/math4/random/StableRandomGeneratorTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/random/StableRandomGeneratorTest.java b/src/test/java/org/apache/commons/math4/random/StableRandomGeneratorTest.java index f6c9f3e..5ad14f0 100644 --- a/src/test/java/org/apache/commons/math4/random/StableRandomGeneratorTest.java +++ b/src/test/java/org/apache/commons/math4/random/StableRandomGeneratorTest.java @@ -17,22 +17,18 @@ package org.apache.commons.math4.random; import org.apache.commons.math4.exception.OutOfRangeException; -import org.apache.commons.math4.random.RandomGenerator; -import org.apache.commons.math4.random.StableRandomGenerator; -import org.apache.commons.math4.random.Well19937c; +import org.apache.commons.math4.rng.UniformRandomProvider; +import org.apache.commons.math4.rng.RandomSource; import org.apache.commons.math4.stat.StatUtils; import org.apache.commons.math4.stat.descriptive.DescriptiveStatistics; import org.junit.Assert; import org.junit.Test; /** - * The class <code>StableRandomGeneratorTest</code> contains tests for the class - * {@link StableRandomGenerator} - * + * Tests for the class {@link StableRandomGenerator}. */ public class StableRandomGeneratorTest { - - private RandomGenerator rg = new Well19937c(100); + private final UniformRandomProvider rg = RandomSource.create(RandomSource.WELL_19937_C, 100); private final static int sampleSize = 10000; /**
