Repository: commons-math Updated Branches: refs/heads/master ce2badf02 -> f5532557b
Add missing @Override tags, formatting. Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/cc467caf Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/cc467caf Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/cc467caf Branch: refs/heads/master Commit: cc467caf26e1ba94be02f27a349647c62dca6a7b Parents: 4aa4c6d Author: Thomas Neidhart <[email protected]> Authored: Tue Mar 10 22:30:44 2015 +0100 Committer: Thomas Neidhart <[email protected]> Committed: Tue Mar 10 22:30:44 2015 +0100 ---------------------------------------------------------------------- .../commons/math4/random/AbstractRandomGenerator.java | 11 +++++++++++ .../commons/math4/random/BitsStreamGenerator.java | 13 ++++++++++++- .../math4/random/CorrelatedRandomVectorGenerator.java | 1 + .../commons/math4/random/EmpiricalDistribution.java | 12 +++++++++--- .../commons/math4/random/GaussianRandomGenerator.java | 1 + .../commons/math4/random/HaltonSequenceGenerator.java | 1 + .../org/apache/commons/math4/random/ISAACRandom.java | 11 ++++++----- .../commons/math4/random/JDKRandomGenerator.java | 2 ++ .../org/apache/commons/math4/random/RandomAdaptor.java | 2 ++ .../commons/math4/random/RandomGeneratorFactory.java | 11 +++++++++++ .../commons/math4/random/RandomVectorGenerator.java | 2 -- .../commons/math4/random/SobolSequenceGenerator.java | 1 + .../commons/math4/random/StableRandomGenerator.java | 1 + .../math4/random/SynchronizedRandomGenerator.java | 11 +++++++++++ .../random/UncorrelatedRandomVectorGenerator.java | 4 ++-- .../commons/math4/random/UniformRandomGenerator.java | 3 +-- .../math4/random/UnitSphereRandomVectorGenerator.java | 2 +- 17 files changed, 73 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-math/blob/cc467caf/src/main/java/org/apache/commons/math4/random/AbstractRandomGenerator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/random/AbstractRandomGenerator.java b/src/main/java/org/apache/commons/math4/random/AbstractRandomGenerator.java index 0e1251c..1b9cead 100644 --- a/src/main/java/org/apache/commons/math4/random/AbstractRandomGenerator.java +++ b/src/main/java/org/apache/commons/math4/random/AbstractRandomGenerator.java @@ -62,11 +62,13 @@ public abstract class AbstractRandomGenerator implements RandomGenerator { } /** {@inheritDoc} */ + @Override public void setSeed(int seed) { setSeed((long) seed); } /** {@inheritDoc} */ + @Override public void setSeed(int[] seed) { // the following number is the largest prime that fits in 32 bits (it is 2^32 - 5) final long prime = 4294967291l; @@ -89,6 +91,7 @@ public abstract class AbstractRandomGenerator implements RandomGenerator { * * @param seed the seed value */ + @Override public abstract void setSeed(long seed); /** @@ -102,6 +105,7 @@ public abstract class AbstractRandomGenerator implements RandomGenerator { * @param bytes the non-null byte array in which to put the * random bytes */ + @Override public void nextBytes(byte[] bytes) { int bytesOut = 0; while (bytesOut < bytes.length) { @@ -132,6 +136,7 @@ public abstract class AbstractRandomGenerator implements RandomGenerator { * @return the next pseudorandom, uniformly distributed {@code int} * value from this random number generator's sequence */ + @Override public int nextInt() { return (int) ((2d * nextDouble() - 1d) * Integer.MAX_VALUE); } @@ -152,6 +157,7 @@ public abstract class AbstractRandomGenerator implements RandomGenerator { * value between 0 (inclusive) and n (exclusive). * @throws NotStrictlyPositiveException if {@code n <= 0}. */ + @Override public int nextInt(int n) { if (n <= 0 ) { throw new NotStrictlyPositiveException(n); @@ -174,6 +180,7 @@ public abstract class AbstractRandomGenerator implements RandomGenerator { * @return the next pseudorandom, uniformly distributed {@code long} *value from this random number generator's sequence */ + @Override public long nextLong() { return (long) ((2d * nextDouble() - 1d) * Long.MAX_VALUE); } @@ -192,6 +199,7 @@ public abstract class AbstractRandomGenerator implements RandomGenerator { * {@code boolean} value from this random number generator's * sequence */ + @Override public boolean nextBoolean() { return nextDouble() <= 0.5; } @@ -210,6 +218,7 @@ public abstract class AbstractRandomGenerator implements RandomGenerator { * value between {@code 0.0} and {@code 1.0} from this * random number generator's sequence */ + @Override public float nextFloat() { return (float) nextDouble(); } @@ -226,6 +235,7 @@ public abstract class AbstractRandomGenerator implements RandomGenerator { * {@code double} value between {@code 0.0} and * {@code 1.0} from this random number generator's sequence */ + @Override public abstract double nextDouble(); /** @@ -248,6 +258,7 @@ public abstract class AbstractRandomGenerator implements RandomGenerator { * standard deviation {@code 1.0} from this random number * generator's sequence */ + @Override public double nextGaussian() { if (!Double.isNaN(cachedNormalDeviate)) { double dev = cachedNormalDeviate; http://git-wip-us.apache.org/repos/asf/commons-math/blob/cc467caf/src/main/java/org/apache/commons/math4/random/BitsStreamGenerator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/random/BitsStreamGenerator.java b/src/main/java/org/apache/commons/math4/random/BitsStreamGenerator.java index d8ddd2e..81968e2 100644 --- a/src/main/java/org/apache/commons/math4/random/BitsStreamGenerator.java +++ b/src/main/java/org/apache/commons/math4/random/BitsStreamGenerator.java @@ -41,12 +41,15 @@ public abstract class BitsStreamGenerator } /** {@inheritDoc} */ + @Override public abstract void setSeed(int seed); /** {@inheritDoc} */ + @Override public abstract void setSeed(int[] seed); /** {@inheritDoc} */ + @Override public abstract void setSeed(long seed); /** Generate next pseudorandom number. @@ -61,11 +64,13 @@ public abstract class BitsStreamGenerator protected abstract int next(int bits); /** {@inheritDoc} */ + @Override public boolean nextBoolean() { return next(1) != 0; } /** {@inheritDoc} */ + @Override public void nextBytes(byte[] bytes) { int i = 0; final int iEnd = bytes.length - 3; @@ -85,6 +90,7 @@ public abstract class BitsStreamGenerator } /** {@inheritDoc} */ + @Override public double nextDouble() { final long high = ((long) next(26)) << 26; final int low = next(26); @@ -92,11 +98,13 @@ public abstract class BitsStreamGenerator } /** {@inheritDoc} */ + @Override public float nextFloat() { return next(23) * 0x1.0p-23f; } /** {@inheritDoc} */ + @Override public double nextGaussian() { final double random; @@ -119,6 +127,7 @@ public abstract class BitsStreamGenerator } /** {@inheritDoc} */ + @Override public int nextInt() { return next(32); } @@ -138,6 +147,7 @@ public abstract class BitsStreamGenerator * is generated. Rejection of this initial segment is necessary to ensure * a uniform distribution.</li></ul></p> */ + @Override public int nextInt(int n) throws IllegalArgumentException { if (n > 0) { if ((n & -n) == n) { @@ -155,9 +165,10 @@ public abstract class BitsStreamGenerator } /** {@inheritDoc} */ + @Override public long nextLong() { final long high = ((long) next(32)) << 32; - final long low = ((long) next(32)) & 0xffffffffL; + final long low = (next(32)) & 0xffffffffL; return high | low; } http://git-wip-us.apache.org/repos/asf/commons-math/blob/cc467caf/src/main/java/org/apache/commons/math4/random/CorrelatedRandomVectorGenerator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/random/CorrelatedRandomVectorGenerator.java b/src/main/java/org/apache/commons/math4/random/CorrelatedRandomVectorGenerator.java index f95b018..a167686 100644 --- a/src/main/java/org/apache/commons/math4/random/CorrelatedRandomVectorGenerator.java +++ b/src/main/java/org/apache/commons/math4/random/CorrelatedRandomVectorGenerator.java @@ -161,6 +161,7 @@ public class CorrelatedRandomVectorGenerator * @return a random vector as an array of double. The returned array * is created at each call, the caller can do what it wants with it. */ + @Override public double[] nextVector() { // generate uncorrelated vector http://git-wip-us.apache.org/repos/asf/commons-math/blob/cc467caf/src/main/java/org/apache/commons/math4/random/EmpiricalDistribution.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/random/EmpiricalDistribution.java b/src/main/java/org/apache/commons/math4/random/EmpiricalDistribution.java index 3b3a864..218a33a 100644 --- a/src/main/java/org/apache/commons/math4/random/EmpiricalDistribution.java +++ b/src/main/java/org/apache/commons/math4/random/EmpiricalDistribution.java @@ -356,7 +356,7 @@ public class EmpiricalDistribution extends AbstractRealDistribution { private class ArrayDataAdapter extends DataAdapter { /** Array of input data values */ - private double[] inputArray; + private final double[] inputArray; /** * Construct an ArrayDataAdapter from a double[] array @@ -401,7 +401,7 @@ public class EmpiricalDistribution extends AbstractRealDistribution { // Set up grid min = sampleStats.getMin(); max = sampleStats.getMax(); - delta = (max - min)/((double) binCount); + delta = (max - min)/(binCount); // Initialize binStats ArrayList if (!binStats.isEmpty()) { @@ -575,6 +575,7 @@ public class EmpiricalDistribution extends AbstractRealDistribution { * and P(B) is the mass of B.</li></ol></p> * @since 3.1 */ + @Override public double density(double x) { if (x < min || x > max) { return 0d; @@ -597,6 +598,7 @@ public class EmpiricalDistribution extends AbstractRealDistribution { * * @since 3.1 */ + @Override public double cumulativeProbability(double x) { if (x < min) { return 0d; @@ -672,6 +674,7 @@ public class EmpiricalDistribution extends AbstractRealDistribution { * {@inheritDoc} * @since 3.1 */ + @Override public double getNumericalMean() { return sampleStats.getMean(); } @@ -680,6 +683,7 @@ public class EmpiricalDistribution extends AbstractRealDistribution { * {@inheritDoc} * @since 3.1 */ + @Override public double getNumericalVariance() { return sampleStats.getVariance(); } @@ -688,6 +692,7 @@ public class EmpiricalDistribution extends AbstractRealDistribution { * {@inheritDoc} * @since 3.1 */ + @Override public double getSupportLowerBound() { return min; } @@ -696,6 +701,7 @@ public class EmpiricalDistribution extends AbstractRealDistribution { * {@inheritDoc} * @since 3.1 */ + @Override public double getSupportUpperBound() { return max; } @@ -720,6 +726,7 @@ public class EmpiricalDistribution extends AbstractRealDistribution { * {@inheritDoc} * @since 3.1 */ + @Override public boolean isSupportConnected() { return true; } @@ -761,7 +768,6 @@ public class EmpiricalDistribution extends AbstractRealDistribution { * @return the difference in the within-bin kernel cdf between the * upper and lower endpoints of bin i */ - @SuppressWarnings("deprecation") private double kB(int i) { final double[] binBounds = getUpperBounds(); final RealDistribution kernel = getKernel(binStats.get(i)); http://git-wip-us.apache.org/repos/asf/commons-math/blob/cc467caf/src/main/java/org/apache/commons/math4/random/GaussianRandomGenerator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/random/GaussianRandomGenerator.java b/src/main/java/org/apache/commons/math4/random/GaussianRandomGenerator.java index 55369b2..f3172c2 100644 --- a/src/main/java/org/apache/commons/math4/random/GaussianRandomGenerator.java +++ b/src/main/java/org/apache/commons/math4/random/GaussianRandomGenerator.java @@ -39,6 +39,7 @@ public class GaussianRandomGenerator implements NormalizedRandomGenerator { /** Generate a random scalar with null mean and unit standard deviation. * @return a random scalar with null mean and unit standard deviation */ + @Override public double nextNormalizedDouble() { return generator.nextGaussian(); } http://git-wip-us.apache.org/repos/asf/commons-math/blob/cc467caf/src/main/java/org/apache/commons/math4/random/HaltonSequenceGenerator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/random/HaltonSequenceGenerator.java b/src/main/java/org/apache/commons/math4/random/HaltonSequenceGenerator.java index 25059ab..efbe21d 100644 --- a/src/main/java/org/apache/commons/math4/random/HaltonSequenceGenerator.java +++ b/src/main/java/org/apache/commons/math4/random/HaltonSequenceGenerator.java @@ -121,6 +121,7 @@ public class HaltonSequenceGenerator implements RandomVectorGenerator { } /** {@inheritDoc} */ + @Override public double[] nextVector() { final double[] v = new double[dimension]; for (int i = 0; i < dimension; i++) { http://git-wip-us.apache.org/repos/asf/commons-math/blob/cc467caf/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 24ef390..ed07ddf 100644 --- a/src/main/java/org/apache/commons/math4/random/ISAACRandom.java +++ b/src/main/java/org/apache/commons/math4/random/ISAACRandom.java @@ -22,9 +22,8 @@ import java.io.Serializable; import org.apache.commons.math4.util.FastMath; /** - * <a href="http://burtleburtle.net/bob/rand/isaacafa.html";> - * ISAAC: a fast cryptographic pseudo-random number generator</a> - * <br/> + * A fast cryptographic pseudo-random number generator. + * <p> * ISAAC (Indirection, Shift, Accumulate, Add, and Count) generates 32-bit * random numbers. * ISAAC has been designed to be cryptographically secure and is inspired @@ -33,10 +32,12 @@ import org.apache.commons.math4.util.FastMath; * are 2<sup>8295</sup> values long on average. * The results are uniformly distributed, unbiased, and unpredictable unless * you know the seed. - * <br/> + * <p> * This code is based (with minor changes and improvements) on the original * implementation of the algorithm by Bob Jenkins. - * <br/> + * + * @see <a href="http://burtleburtle.net/bob/rand/isaacafa.html";> + * ISAAC: a fast cryptographic pseudo-random number generator</a> * * @since 3.0 */ http://git-wip-us.apache.org/repos/asf/commons-math/blob/cc467caf/src/main/java/org/apache/commons/math4/random/JDKRandomGenerator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/random/JDKRandomGenerator.java b/src/main/java/org/apache/commons/math4/random/JDKRandomGenerator.java index 3594332..29bc166 100644 --- a/src/main/java/org/apache/commons/math4/random/JDKRandomGenerator.java +++ b/src/main/java/org/apache/commons/math4/random/JDKRandomGenerator.java @@ -30,11 +30,13 @@ public class JDKRandomGenerator extends Random implements RandomGenerator { private static final long serialVersionUID = -7745277476784028798L; /** {@inheritDoc} */ + @Override public void setSeed(int seed) { setSeed((long) seed); } /** {@inheritDoc} */ + @Override public void setSeed(int[] seed) { setSeed(RandomGeneratorFactory.convertToLong(seed)); } http://git-wip-us.apache.org/repos/asf/commons-math/blob/cc467caf/src/main/java/org/apache/commons/math4/random/RandomAdaptor.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/random/RandomAdaptor.java b/src/main/java/org/apache/commons/math4/random/RandomAdaptor.java index 066aa99..ea08bae 100644 --- a/src/main/java/org/apache/commons/math4/random/RandomAdaptor.java +++ b/src/main/java/org/apache/commons/math4/random/RandomAdaptor.java @@ -173,6 +173,7 @@ public class RandomAdaptor extends Random implements RandomGenerator { } /** {@inheritDoc} */ + @Override public void setSeed(int seed) { if (randomGenerator != null) { // required to avoid NPE in constructor randomGenerator.setSeed(seed); @@ -180,6 +181,7 @@ public class RandomAdaptor extends Random implements RandomGenerator { } /** {@inheritDoc} */ + @Override public void setSeed(int[] seed) { if (randomGenerator != null) { // required to avoid NPE in constructor randomGenerator.setSeed(seed); http://git-wip-us.apache.org/repos/asf/commons-math/blob/cc467caf/src/main/java/org/apache/commons/math4/random/RandomGeneratorFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/random/RandomGeneratorFactory.java b/src/main/java/org/apache/commons/math4/random/RandomGeneratorFactory.java index 401397a..1d3d71d 100644 --- a/src/main/java/org/apache/commons/math4/random/RandomGeneratorFactory.java +++ b/src/main/java/org/apache/commons/math4/random/RandomGeneratorFactory.java @@ -42,31 +42,37 @@ public class RandomGeneratorFactory { public static RandomGenerator createRandomGenerator(final Random rng) { return new RandomGenerator() { /** {@inheritDoc} */ + @Override public void setSeed(int seed) { rng.setSeed((long) seed); } /** {@inheritDoc} */ + @Override public void setSeed(int[] seed) { rng.setSeed(convertToLong(seed)); } /** {@inheritDoc} */ + @Override public void setSeed(long seed) { rng.setSeed(seed); } /** {@inheritDoc} */ + @Override public void nextBytes(byte[] bytes) { rng.nextBytes(bytes); } /** {@inheritDoc} */ + @Override public int nextInt() { return rng.nextInt(); } /** {@inheritDoc} */ + @Override public int nextInt(int n) { if (n <= 0) { throw new NotStrictlyPositiveException(n); @@ -75,26 +81,31 @@ public class RandomGeneratorFactory { } /** {@inheritDoc} */ + @Override public long nextLong() { return rng.nextLong(); } /** {@inheritDoc} */ + @Override public boolean nextBoolean() { return rng.nextBoolean(); } /** {@inheritDoc} */ + @Override public float nextFloat() { return rng.nextFloat(); } /** {@inheritDoc} */ + @Override public double nextDouble() { return rng.nextDouble(); } /** {@inheritDoc} */ + @Override public double nextGaussian() { return rng.nextGaussian(); } http://git-wip-us.apache.org/repos/asf/commons-math/blob/cc467caf/src/main/java/org/apache/commons/math4/random/RandomVectorGenerator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/random/RandomVectorGenerator.java b/src/main/java/org/apache/commons/math4/random/RandomVectorGenerator.java index fc6ddec..2a6250c 100644 --- a/src/main/java/org/apache/commons/math4/random/RandomVectorGenerator.java +++ b/src/main/java/org/apache/commons/math4/random/RandomVectorGenerator.java @@ -21,9 +21,7 @@ package org.apache.commons.math4.random; /** This interface represents a random generator for whole vectors. * * @since 1.2 - * */ - public interface RandomVectorGenerator { /** Generate a random vector. http://git-wip-us.apache.org/repos/asf/commons-math/blob/cc467caf/src/main/java/org/apache/commons/math4/random/SobolSequenceGenerator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/random/SobolSequenceGenerator.java b/src/main/java/org/apache/commons/math4/random/SobolSequenceGenerator.java index 5fd89fc..af3cf22 100644 --- a/src/main/java/org/apache/commons/math4/random/SobolSequenceGenerator.java +++ b/src/main/java/org/apache/commons/math4/random/SobolSequenceGenerator.java @@ -254,6 +254,7 @@ public class SobolSequenceGenerator implements RandomVectorGenerator { } /** {@inheritDoc} */ + @Override public double[] nextVector() { final double[] v = new double[dimension]; if (count == 0) { http://git-wip-us.apache.org/repos/asf/commons-math/blob/cc467caf/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 c8b0987..a93df01 100644 --- a/src/main/java/org/apache/commons/math4/random/StableRandomGenerator.java +++ b/src/main/java/org/apache/commons/math4/random/StableRandomGenerator.java @@ -86,6 +86,7 @@ public class StableRandomGenerator implements NormalizedRandomGenerator { * * @return a random scalar with zero location and unit scale */ + @Override public double nextNormalizedDouble() { // we need 2 uniform random numbers to calculate omega and phi double omega = -FastMath.log(generator.nextDouble()); http://git-wip-us.apache.org/repos/asf/commons-math/blob/cc467caf/src/main/java/org/apache/commons/math4/random/SynchronizedRandomGenerator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/random/SynchronizedRandomGenerator.java b/src/main/java/org/apache/commons/math4/random/SynchronizedRandomGenerator.java index 615f708..4024043 100644 --- a/src/main/java/org/apache/commons/math4/random/SynchronizedRandomGenerator.java +++ b/src/main/java/org/apache/commons/math4/random/SynchronizedRandomGenerator.java @@ -45,6 +45,7 @@ public class SynchronizedRandomGenerator implements RandomGenerator { /** * {@inheritDoc} */ + @Override public synchronized void setSeed(int seed) { wrapped.setSeed(seed); } @@ -52,6 +53,7 @@ public class SynchronizedRandomGenerator implements RandomGenerator { /** * {@inheritDoc} */ + @Override public synchronized void setSeed(int[] seed) { wrapped.setSeed(seed); } @@ -59,6 +61,7 @@ public class SynchronizedRandomGenerator implements RandomGenerator { /** * {@inheritDoc} */ + @Override public synchronized void setSeed(long seed) { wrapped.setSeed(seed); } @@ -66,6 +69,7 @@ public class SynchronizedRandomGenerator implements RandomGenerator { /** * {@inheritDoc} */ + @Override public synchronized void nextBytes(byte[] bytes) { wrapped.nextBytes(bytes); } @@ -73,6 +77,7 @@ public class SynchronizedRandomGenerator implements RandomGenerator { /** * {@inheritDoc} */ + @Override public synchronized int nextInt() { return wrapped.nextInt(); } @@ -80,6 +85,7 @@ public class SynchronizedRandomGenerator implements RandomGenerator { /** * {@inheritDoc} */ + @Override public synchronized int nextInt(int n) { return wrapped.nextInt(n); } @@ -87,6 +93,7 @@ public class SynchronizedRandomGenerator implements RandomGenerator { /** * {@inheritDoc} */ + @Override public synchronized long nextLong() { return wrapped.nextLong(); } @@ -94,6 +101,7 @@ public class SynchronizedRandomGenerator implements RandomGenerator { /** * {@inheritDoc} */ + @Override public synchronized boolean nextBoolean() { return wrapped.nextBoolean(); } @@ -101,6 +109,7 @@ public class SynchronizedRandomGenerator implements RandomGenerator { /** * {@inheritDoc} */ + @Override public synchronized float nextFloat() { return wrapped.nextFloat(); } @@ -108,6 +117,7 @@ public class SynchronizedRandomGenerator implements RandomGenerator { /** * {@inheritDoc} */ + @Override public synchronized double nextDouble() { return wrapped.nextDouble(); } @@ -115,6 +125,7 @@ public class SynchronizedRandomGenerator implements RandomGenerator { /** * {@inheritDoc} */ + @Override public synchronized double nextGaussian() { return wrapped.nextGaussian(); } http://git-wip-us.apache.org/repos/asf/commons-math/blob/cc467caf/src/main/java/org/apache/commons/math4/random/UncorrelatedRandomVectorGenerator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/random/UncorrelatedRandomVectorGenerator.java b/src/main/java/org/apache/commons/math4/random/UncorrelatedRandomVectorGenerator.java index 71bba9b..88360fe 100644 --- a/src/main/java/org/apache/commons/math4/random/UncorrelatedRandomVectorGenerator.java +++ b/src/main/java/org/apache/commons/math4/random/UncorrelatedRandomVectorGenerator.java @@ -28,7 +28,6 @@ import org.apache.commons.math4.exception.DimensionMismatchException; * * @since 1.2 */ - public class UncorrelatedRandomVectorGenerator implements RandomVectorGenerator { @@ -78,7 +77,8 @@ public class UncorrelatedRandomVectorGenerator /** Generate an uncorrelated random vector. * @return a random vector as a newly built array of double */ - public double[] nextVector() { + @Override +public double[] nextVector() { double[] random = new double[mean.length]; for (int i = 0; i < random.length; ++i) { http://git-wip-us.apache.org/repos/asf/commons-math/blob/cc467caf/src/main/java/org/apache/commons/math4/random/UniformRandomGenerator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/random/UniformRandomGenerator.java b/src/main/java/org/apache/commons/math4/random/UniformRandomGenerator.java index 6a2eb92..aac8295 100644 --- a/src/main/java/org/apache/commons/math4/random/UniformRandomGenerator.java +++ b/src/main/java/org/apache/commons/math4/random/UniformRandomGenerator.java @@ -27,9 +27,7 @@ import org.apache.commons.math4.util.FastMath; * [-√3, +√3].</p> * * @since 1.2 - * */ - public class UniformRandomGenerator implements NormalizedRandomGenerator { /** Square root of three. */ @@ -50,6 +48,7 @@ public class UniformRandomGenerator implements NormalizedRandomGenerator { * and +&sqrt;(3).</p> * @return a random scalar with null mean and unit standard deviation */ + @Override public double nextNormalizedDouble() { return SQRT3 * (2 * generator.nextDouble() - 1.0); } http://git-wip-us.apache.org/repos/asf/commons-math/blob/cc467caf/src/main/java/org/apache/commons/math4/random/UnitSphereRandomVectorGenerator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/random/UnitSphereRandomVectorGenerator.java b/src/main/java/org/apache/commons/math4/random/UnitSphereRandomVectorGenerator.java index 9ac8ffe..34d66cb 100644 --- a/src/main/java/org/apache/commons/math4/random/UnitSphereRandomVectorGenerator.java +++ b/src/main/java/org/apache/commons/math4/random/UnitSphereRandomVectorGenerator.java @@ -25,7 +25,6 @@ import org.apache.commons.math4.util.FastMath; * * @since 2.1 */ - public class UnitSphereRandomVectorGenerator implements RandomVectorGenerator { /** @@ -57,6 +56,7 @@ public class UnitSphereRandomVectorGenerator } /** {@inheritDoc} */ + @Override public double[] nextVector() { final double[] v = new double[dimension];
