You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by tn...@apache.org on 2015/03/10 22:47:46 UTC
[1/4] [math] Add missing @Override tags, formatting.
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 <th...@gmail.com>
Authored: Tue Mar 10 22:30:44 2015 +0100
Committer: Thomas Neidhart <th...@gmail.com>
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];
[2/4] [math] [MATH-945] Added log10 to RealFieldElement.
Posted by tn...@apache.org.
[MATH-945] Added log10 to RealFieldElement.
Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/45df5da2
Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/45df5da2
Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/45df5da2
Branch: refs/heads/master
Commit: 45df5da2640f8f097915b8a2a0249ef0f6cf514e
Parents: cc467ca
Author: Thomas Neidhart <th...@gmail.com>
Authored: Tue Mar 10 22:38:48 2015 +0100
Committer: Thomas Neidhart <th...@gmail.com>
Committed: Tue Mar 10 22:38:48 2015 +0100
----------------------------------------------------------------------
src/changes/changes.xml | 3 +
.../apache/commons/math4/RealFieldElement.java | 12 +--
.../java/org/apache/commons/math4/dfp/Dfp.java | 77 ++++++++++++++++----
3 files changed, 70 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-math/blob/45df5da2/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 08ba014..22d53f8 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -54,6 +54,9 @@ If the output is not quite correct, check for invisible trailing spaces!
</release>
<release version="4.0" date="XXXX-XX-XX" description="">
+ <action dev="tn" type="add" issue="MATH-945">
+ Added method "T log10()" to interface "RealFieldElement".
+ </action>
<action dev="psteitz" type="fix" issue="MATH-1203">
EmpiricalDistribution getKernel fails for buckets with only multiple instances of the same value.
</action>
http://git-wip-us.apache.org/repos/asf/commons-math/blob/45df5da2/src/main/java/org/apache/commons/math4/RealFieldElement.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/RealFieldElement.java b/src/main/java/org/apache/commons/math4/RealFieldElement.java
index aa171f9..e88499d 100644
--- a/src/main/java/org/apache/commons/math4/RealFieldElement.java
+++ b/src/main/java/org/apache/commons/math4/RealFieldElement.java
@@ -146,6 +146,7 @@ public interface RealFieldElement<T> extends FieldElement<T> {
throws DimensionMismatchException;
/** {@inheritDoc} */
+ @Override
T reciprocal();
/** Square root.
@@ -204,12 +205,11 @@ public interface RealFieldElement<T> extends FieldElement<T> {
*/
T log1p();
-// TODO: add this method in 4.0, as it is not possible to do it in 3.2
-// due to incompatibility of the return type in the Dfp class
-// /** Base 10 logarithm.
-// * @return base 10 logarithm of the instance
-// */
-// T log10();
+ /** Base 10 logarithm.
+ * @return base 10 logarithm of the instance
+ * @since 4.0
+ */
+ T log10();
/** Cosine operation.
* @return cos(this)
http://git-wip-us.apache.org/repos/asf/commons-math/blob/45df5da2/src/main/java/org/apache/commons/math4/dfp/Dfp.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/dfp/Dfp.java b/src/main/java/org/apache/commons/math4/dfp/Dfp.java
index 52b992c..7f15e88 100644
--- a/src/main/java/org/apache/commons/math4/dfp/Dfp.java
+++ b/src/main/java/org/apache/commons/math4/dfp/Dfp.java
@@ -632,6 +632,7 @@ public class Dfp implements RealFieldElement<Dfp> {
* </p>
* @return {@link org.apache.commons.math4.Field Field} (really a {@link DfpField}) to which the instance belongs
*/
+ @Override
public DfpField getField() {
return field;
}
@@ -861,6 +862,7 @@ public class Dfp implements RealFieldElement<Dfp> {
* @return absolute value of instance
* @since 3.2
*/
+ @Override
public Dfp abs() {
Dfp result = newInstance(this);
result.sign = 1;
@@ -1003,6 +1005,7 @@ public class Dfp implements RealFieldElement<Dfp> {
* @return rounded value
* @since 3.2
*/
+ @Override
public Dfp rint() {
return trunc(DfpField.RoundingMode.ROUND_HALF_EVEN);
}
@@ -1012,6 +1015,7 @@ public class Dfp implements RealFieldElement<Dfp> {
* @return rounded value
* @since 3.2
*/
+ @Override
public Dfp floor() {
return trunc(DfpField.RoundingMode.ROUND_FLOOR);
}
@@ -1021,6 +1025,7 @@ public class Dfp implements RealFieldElement<Dfp> {
* @return rounded value
* @since 3.2
*/
+ @Override
public Dfp ceil() {
return trunc(DfpField.RoundingMode.ROUND_CEIL);
}
@@ -1030,6 +1035,7 @@ public class Dfp implements RealFieldElement<Dfp> {
* @return this less n × d, where n is the integer closest to this/d
* @since 3.2
*/
+ @Override
public Dfp remainder(final Dfp d) {
final Dfp result = this.subtract(this.divide(d).rint().multiply(d));
@@ -1255,6 +1261,7 @@ public class Dfp implements RealFieldElement<Dfp> {
* @param x number to add
* @return sum of this and x
*/
+ @Override
public Dfp add(final Dfp x) {
// make sure we don't mix number with different precision
@@ -1403,6 +1410,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** Returns a number that is this number with the sign bit reversed.
* @return the opposite of this
*/
+ @Override
public Dfp negate() {
Dfp result = newInstance(this);
result.sign = (byte) - result.sign;
@@ -1413,6 +1421,7 @@ public class Dfp implements RealFieldElement<Dfp> {
* @param x number to subtract
* @return difference of this and a
*/
+ @Override
public Dfp subtract(final Dfp x) {
return add(x.negate());
}
@@ -1500,6 +1509,7 @@ public class Dfp implements RealFieldElement<Dfp> {
* @param x multiplicand
* @return product of this and x
*/
+ @Override
public Dfp multiply(final Dfp x) {
// make sure we don't mix number with different precision
@@ -1606,6 +1616,7 @@ public class Dfp implements RealFieldElement<Dfp> {
* @param x multiplicand
* @return product of this and x
*/
+ @Override
public Dfp multiply(final int x) {
if (x >= 0 && x < RADIX) {
return multiplyFast(x);
@@ -1681,6 +1692,7 @@ public class Dfp implements RealFieldElement<Dfp> {
* @param divisor divisor
* @return quotient of this by divisor
*/
+ @Override
public Dfp divide(Dfp divisor) {
int dividend[]; // current status of the dividend
int quotient[]; // quotient
@@ -1957,6 +1969,7 @@ public class Dfp implements RealFieldElement<Dfp> {
}
/** {@inheritDoc} */
+ @Override
public Dfp reciprocal() {
return field.getOne().divide(this);
}
@@ -1965,6 +1978,7 @@ public class Dfp implements RealFieldElement<Dfp> {
* @return square root of the instance
* @since 3.2
*/
+ @Override
public Dfp sqrt() {
// check for unusual cases
@@ -2514,6 +2528,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public double getReal() {
return toDouble();
}
@@ -2521,6 +2536,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp add(final double a) {
return add(newInstance(a));
}
@@ -2528,6 +2544,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp subtract(final double a) {
return subtract(newInstance(a));
}
@@ -2535,6 +2552,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp multiply(final double a) {
return multiply(newInstance(a));
}
@@ -2542,6 +2560,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp divide(final double a) {
return divide(newInstance(a));
}
@@ -2549,6 +2568,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp remainder(final double a) {
return remainder(newInstance(a));
}
@@ -2556,6 +2576,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public long round() {
return FastMath.round(toDouble());
}
@@ -2563,6 +2584,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp signum() {
if (isNaN() || isZero()) {
return this;
@@ -2574,6 +2596,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp copySign(final Dfp s) {
if ((sign >= 0 && s.sign >= 0) || (sign < 0 && s.sign < 0)) { // Sign is currently OK
return this;
@@ -2584,6 +2607,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp copySign(final double s) {
long sb = Double.doubleToLongBits(s);
if ((sign >= 0 && sb >= 0) || (sign < 0 && sb < 0)) { // Sign is currently OK
@@ -2595,6 +2619,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp scalb(final int n) {
return multiply(DfpMath.pow(getTwo(), n));
}
@@ -2602,6 +2627,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp hypot(final Dfp y) {
return multiply(this).add(y.multiply(y)).sqrt();
}
@@ -2609,6 +2635,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp cbrt() {
return rootN(3);
}
@@ -2616,6 +2643,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp rootN(final int n) {
return (sign >= 0) ?
DfpMath.pow(this, getOne().divide(n)) :
@@ -2625,6 +2653,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp pow(final double p) {
return DfpMath.pow(this, newInstance(p));
}
@@ -2632,6 +2661,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp pow(final int n) {
return DfpMath.pow(this, n);
}
@@ -2639,6 +2669,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp pow(final Dfp e) {
return DfpMath.pow(this, e);
}
@@ -2646,6 +2677,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp exp() {
return DfpMath.exp(this);
}
@@ -2653,6 +2685,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp expm1() {
return DfpMath.exp(this).subtract(getOne());
}
@@ -2660,6 +2693,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp log() {
return DfpMath.log(this);
}
@@ -2667,32 +2701,23 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp log1p() {
return DfpMath.log(this.add(getOne()));
}
-// TODO: deactivate this implementation (and return type) in 4.0
- /** Get the exponent of the greatest power of 10 that is less than or equal to abs(this).
- * @return integer base 10 logarithm
- * @deprecated as of 3.2, replaced by {@link #intLog10()}, in 4.0 the return type
- * will be changed to Dfp
+ /** {@inheritDoc}
+ * @since 3.2, return type changed to {@link Dfp} in 4.0
*/
- @Deprecated
- public int log10() {
- return intLog10();
+ @Override
+ public Dfp log10() {
+ return DfpMath.log(this).divide(DfpMath.log(newInstance(10)));
}
-// TODO: activate this implementation (and return type) in 4.0
-// /** {@inheritDoc}
-// * @since 3.2
-// */
-// public Dfp log10() {
-// return DfpMath.log(this).divide(DfpMath.log(newInstance(10)));
-// }
-
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp cos() {
return DfpMath.cos(this);
}
@@ -2700,6 +2725,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp sin() {
return DfpMath.sin(this);
}
@@ -2707,6 +2733,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp tan() {
return DfpMath.tan(this);
}
@@ -2714,6 +2741,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp acos() {
return DfpMath.acos(this);
}
@@ -2721,6 +2749,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp asin() {
return DfpMath.asin(this);
}
@@ -2728,6 +2757,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp atan() {
return DfpMath.atan(this);
}
@@ -2735,6 +2765,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp atan2(final Dfp x)
throws DimensionMismatchException {
@@ -2760,6 +2791,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp cosh() {
return DfpMath.exp(this).add(DfpMath.exp(negate())).divide(2);
}
@@ -2767,6 +2799,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp sinh() {
return DfpMath.exp(this).subtract(DfpMath.exp(negate())).divide(2);
}
@@ -2774,6 +2807,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp tanh() {
final Dfp ePlus = DfpMath.exp(this);
final Dfp eMinus = DfpMath.exp(negate());
@@ -2783,6 +2817,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp acosh() {
return multiply(this).subtract(getOne()).sqrt().add(this).log();
}
@@ -2790,6 +2825,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp asinh() {
return multiply(this).add(getOne()).sqrt().add(this).log();
}
@@ -2797,6 +2833,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp atanh() {
return getOne().add(this).divide(getOne().subtract(this)).log().divide(2);
}
@@ -2804,6 +2841,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp linearCombination(final Dfp[] a, final Dfp[] b)
throws DimensionMismatchException {
if (a.length != b.length) {
@@ -2819,6 +2857,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp linearCombination(final double[] a, final Dfp[] b)
throws DimensionMismatchException {
if (a.length != b.length) {
@@ -2834,6 +2873,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp linearCombination(final Dfp a1, final Dfp b1, final Dfp a2, final Dfp b2) {
return a1.multiply(b1).add(a2.multiply(b2));
}
@@ -2841,6 +2881,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp linearCombination(final double a1, final Dfp b1, final double a2, final Dfp b2) {
return b1.multiply(a1).add(b2.multiply(a2));
}
@@ -2848,6 +2889,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp linearCombination(final Dfp a1, final Dfp b1,
final Dfp a2, final Dfp b2,
final Dfp a3, final Dfp b3) {
@@ -2857,6 +2899,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp linearCombination(final double a1, final Dfp b1,
final double a2, final Dfp b2,
final double a3, final Dfp b3) {
@@ -2866,6 +2909,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp linearCombination(final Dfp a1, final Dfp b1, final Dfp a2, final Dfp b2,
final Dfp a3, final Dfp b3, final Dfp a4, final Dfp b4) {
return a1.multiply(b1).add(a2.multiply(b2)).add(a3.multiply(b3)).add(a4.multiply(b4));
@@ -2874,6 +2918,7 @@ public class Dfp implements RealFieldElement<Dfp> {
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Dfp linearCombination(final double a1, final Dfp b1, final double a2, final Dfp b2,
final double a3, final Dfp b3, final double a4, final Dfp b4) {
return b1.multiply(a1).add(b2.multiply(a2)).add(b3.multiply(a3)).add(b4.multiply(a4));
[4/4] [math] Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/commons-math
Posted by tn...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/commons-math
Conflicts:
src/changes/changes.xml
Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/f5532557
Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/f5532557
Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/f5532557
Branch: refs/heads/master
Commit: f5532557b9fd00c2e1c8b1cc4559d95eed0ad8ac
Parents: ab9c3e9 ce2badf
Author: Thomas Neidhart <th...@gmail.com>
Authored: Tue Mar 10 22:46:30 2015 +0100
Committer: Thomas Neidhart <th...@gmail.com>
Committed: Tue Mar 10 22:46:30 2015 +0100
----------------------------------------------------------------------
src/changes/changes.xml | 2 ++
.../commons/math4/random/EmpiricalDistribution.java | 13 +++++++++++--
.../ml/neuralnet/sofm/KohonenUpdateActionTest.java | 2 +-
.../math4/random/EmpiricalDistributionTest.java | 6 +++++-
4 files changed, 19 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-math/blob/f5532557/src/changes/changes.xml
----------------------------------------------------------------------
diff --cc src/changes/changes.xml
index 22d53f8,79e3d25..8be9d68
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@@ -54,8 -54,8 +54,10 @@@ If the output is not quite correct, che
</release>
<release version="4.0" date="XXXX-XX-XX" description="">
+ <action dev="tn" type="add" issue="MATH-945">
+ Added method "T log10()" to interface "RealFieldElement".
+ <action dev="psteitz" type="fix" issue="MATH-1208">
+ EmpiricalDistribution cumulativeProbability can return NaN when evaluated within a constant bin.
</action>
<action dev="psteitz" type="fix" issue="MATH-1203">
EmpiricalDistribution getKernel fails for buckets with only multiple instances of the same value.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/f5532557/src/main/java/org/apache/commons/math4/random/EmpiricalDistribution.java
----------------------------------------------------------------------
[3/4] [math] Add missing @Override tags.
Posted by tn...@apache.org.
Add missing @Override tags.
Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/ab9c3e93
Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/ab9c3e93
Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/ab9c3e93
Branch: refs/heads/master
Commit: ab9c3e935ebfc4864c413fc6880363d4d7282f16
Parents: 45df5da
Author: Thomas Neidhart <th...@gmail.com>
Authored: Tue Mar 10 22:42:03 2015 +0100
Committer: Thomas Neidhart <th...@gmail.com>
Committed: Tue Mar 10 22:42:03 2015 +0100
----------------------------------------------------------------------
.../apache/commons/math4/complex/Complex.java | 8 +++
.../commons/math4/complex/ComplexField.java | 5 +-
.../org/apache/commons/math4/dfp/DfpField.java | 3 +
.../apache/commons/math4/special/BesselJ.java | 2 +-
.../math4/transform/FastCosineTransformer.java | 2 +
.../transform/FastHadamardTransformer.java | 2 +
.../math4/transform/FastSineTransformer.java | 2 +
.../org/apache/commons/math4/util/BigReal.java | 9 +++
.../apache/commons/math4/util/BigRealField.java | 3 +
.../math4/util/CentralPivotingStrategy.java | 1 +
.../apache/commons/math4/util/Combinations.java | 14 ++++-
.../apache/commons/math4/util/Decimal64.java | 58 ++++++++++++++++++++
.../commons/math4/util/Decimal64Field.java | 3 +
.../commons/math4/util/DefaultTransformer.java | 2 +-
.../apache/commons/math4/util/Incrementor.java | 3 +-
.../apache/commons/math4/util/MathArrays.java | 2 +
.../math4/util/MedianOf3PivotingStrategy.java | 1 +
.../math4/util/MultidimensionalCounter.java | 4 ++
.../math4/util/RandomPivotingStrategy.java | 1 +
.../math4/util/ResizableDoubleArray.java | 8 +++
.../commons/math4/util/TransformerMap.java | 1 +
21 files changed, 127 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-math/blob/ab9c3e93/src/main/java/org/apache/commons/math4/complex/Complex.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/complex/Complex.java b/src/main/java/org/apache/commons/math4/complex/Complex.java
index 546b8da..fa8397c 100644
--- a/src/main/java/org/apache/commons/math4/complex/Complex.java
+++ b/src/main/java/org/apache/commons/math4/complex/Complex.java
@@ -153,6 +153,7 @@ public class Complex implements FieldElement<Complex>, Serializable {
* @return {@code this + addend}.
* @throws NullArgumentException if {@code addend} is {@code null}.
*/
+ @Override
public Complex add(Complex addend) throws NullArgumentException {
MathUtils.checkNotNull(addend);
if (isNaN || addend.isNaN) {
@@ -243,6 +244,7 @@ public class Complex implements FieldElement<Complex>, Serializable {
* @return {@code this / divisor}.
* @throws NullArgumentException if {@code divisor} is {@code null}.
*/
+ @Override
public Complex divide(Complex divisor)
throws NullArgumentException {
MathUtils.checkNotNull(divisor);
@@ -296,6 +298,7 @@ public class Complex implements FieldElement<Complex>, Serializable {
}
/** {@inheritDoc} */
+ @Override
public Complex reciprocal() {
if (isNaN) {
return NaN;
@@ -520,6 +523,7 @@ public class Complex implements FieldElement<Complex>, Serializable {
* @return {@code this * factor}.
* @throws NullArgumentException if {@code factor} is {@code null}.
*/
+ @Override
public Complex multiply(Complex factor)
throws NullArgumentException {
MathUtils.checkNotNull(factor);
@@ -545,6 +549,7 @@ public class Complex implements FieldElement<Complex>, Serializable {
* @return {@code this * factor}.
* @see #multiply(Complex)
*/
+ @Override
public Complex multiply(final int factor) {
if (isNaN) {
return NaN;
@@ -584,6 +589,7 @@ public class Complex implements FieldElement<Complex>, Serializable {
*
* @return {@code -this}.
*/
+ @Override
public Complex negate() {
if (isNaN) {
return NaN;
@@ -610,6 +616,7 @@ public class Complex implements FieldElement<Complex>, Serializable {
* @return {@code this - subtrahend}.
* @throws NullArgumentException if {@code subtrahend} is {@code null}.
*/
+ @Override
public Complex subtract(Complex subtrahend)
throws NullArgumentException {
MathUtils.checkNotNull(subtrahend);
@@ -1305,6 +1312,7 @@ public class Complex implements FieldElement<Complex>, Serializable {
}
/** {@inheritDoc} */
+ @Override
public ComplexField getField() {
return ComplexField.getInstance();
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/ab9c3e93/src/main/java/org/apache/commons/math4/complex/ComplexField.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/complex/ComplexField.java b/src/main/java/org/apache/commons/math4/complex/ComplexField.java
index 8a91d00..c761941 100644
--- a/src/main/java/org/apache/commons/math4/complex/ComplexField.java
+++ b/src/main/java/org/apache/commons/math4/complex/ComplexField.java
@@ -30,7 +30,7 @@ import org.apache.commons.math4.FieldElement;
* @see Complex
* @since 2.0
*/
-public class ComplexField implements Field<Complex>, Serializable {
+public class ComplexField implements Field<Complex>, Serializable {
/** Serializable version identifier. */
private static final long serialVersionUID = -6130362688700788798L;
@@ -48,16 +48,19 @@ public class ComplexField implements Field<Complex>, Serializable {
}
/** {@inheritDoc} */
+ @Override
public Complex getOne() {
return Complex.ONE;
}
/** {@inheritDoc} */
+ @Override
public Complex getZero() {
return Complex.ZERO;
}
/** {@inheritDoc} */
+ @Override
public Class<? extends FieldElement<Complex>> getRuntimeClass() {
return Complex.class;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/ab9c3e93/src/main/java/org/apache/commons/math4/dfp/DfpField.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/dfp/DfpField.java b/src/main/java/org/apache/commons/math4/dfp/DfpField.java
index 0e65b59..c83051d 100644
--- a/src/main/java/org/apache/commons/math4/dfp/DfpField.java
+++ b/src/main/java/org/apache/commons/math4/dfp/DfpField.java
@@ -398,6 +398,7 @@ public class DfpField implements Field<Dfp> {
/** Get the constant 0.
* @return a {@link Dfp} with value 0
*/
+ @Override
public Dfp getZero() {
return zero;
}
@@ -405,11 +406,13 @@ public class DfpField implements Field<Dfp> {
/** Get the constant 1.
* @return a {@link Dfp} with value 1
*/
+ @Override
public Dfp getOne() {
return one;
}
/** {@inheritDoc} */
+ @Override
public Class<? extends FieldElement<Dfp>> getRuntimeClass() {
return Dfp.class;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/ab9c3e93/src/main/java/org/apache/commons/math4/special/BesselJ.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/special/BesselJ.java b/src/main/java/org/apache/commons/math4/special/BesselJ.java
index ad5eddc..ff82161 100644
--- a/src/main/java/org/apache/commons/math4/special/BesselJ.java
+++ b/src/main/java/org/apache/commons/math4/special/BesselJ.java
@@ -21,7 +21,6 @@ import org.apache.commons.math4.analysis.UnivariateFunction;
import org.apache.commons.math4.exception.ConvergenceException;
import org.apache.commons.math4.exception.MathIllegalArgumentException;
import org.apache.commons.math4.exception.util.LocalizedFormats;
-import org.apache.commons.math4.special.Gamma;
import org.apache.commons.math4.util.FastMath;
import org.apache.commons.math4.util.MathArrays;
@@ -139,6 +138,7 @@ public class BesselJ
* @throws MathIllegalArgumentException if {@code x} is too large relative to {@code order}
* @throws ConvergenceException if the algorithm fails to converge
*/
+ @Override
public double value(double x)
throws MathIllegalArgumentException, ConvergenceException {
return BesselJ.value(order, x);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/ab9c3e93/src/main/java/org/apache/commons/math4/transform/FastCosineTransformer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/transform/FastCosineTransformer.java b/src/main/java/org/apache/commons/math4/transform/FastCosineTransformer.java
index 0884701..969675e 100644
--- a/src/main/java/org/apache/commons/math4/transform/FastCosineTransformer.java
+++ b/src/main/java/org/apache/commons/math4/transform/FastCosineTransformer.java
@@ -87,6 +87,7 @@ public class FastCosineTransformer implements RealTransformer, Serializable {
* @throws MathIllegalArgumentException if the length of the data array is
* not a power of two plus one
*/
+ @Override
public double[] transform(final double[] f, final TransformType type)
throws MathIllegalArgumentException {
if (type == TransformType.FORWARD) {
@@ -116,6 +117,7 @@ public class FastCosineTransformer implements RealTransformer, Serializable {
* @throws MathIllegalArgumentException if the number of sample points is
* not a power of two plus one
*/
+ @Override
public double[] transform(final UnivariateFunction f,
final double min, final double max, final int n,
final TransformType type) throws MathIllegalArgumentException {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/ab9c3e93/src/main/java/org/apache/commons/math4/transform/FastHadamardTransformer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/transform/FastHadamardTransformer.java b/src/main/java/org/apache/commons/math4/transform/FastHadamardTransformer.java
index d6b3ad9..cf8e45d 100644
--- a/src/main/java/org/apache/commons/math4/transform/FastHadamardTransformer.java
+++ b/src/main/java/org/apache/commons/math4/transform/FastHadamardTransformer.java
@@ -47,6 +47,7 @@ public class FastHadamardTransformer implements RealTransformer, Serializable {
* @throws MathIllegalArgumentException if the length of the data array is
* not a power of two
*/
+ @Override
public double[] transform(final double[] f, final TransformType type) {
if (type == TransformType.FORWARD) {
return fht(f);
@@ -63,6 +64,7 @@ public class FastHadamardTransformer implements RealTransformer, Serializable {
* if the number of sample points is negative
* @throws MathIllegalArgumentException if the number of sample points is not a power of two
*/
+ @Override
public double[] transform(final UnivariateFunction f,
final double min, final double max, final int n,
final TransformType type) {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/ab9c3e93/src/main/java/org/apache/commons/math4/transform/FastSineTransformer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/transform/FastSineTransformer.java b/src/main/java/org/apache/commons/math4/transform/FastSineTransformer.java
index 34a94ef..440ec7d 100644
--- a/src/main/java/org/apache/commons/math4/transform/FastSineTransformer.java
+++ b/src/main/java/org/apache/commons/math4/transform/FastSineTransformer.java
@@ -92,6 +92,7 @@ public class FastSineTransformer implements RealTransformer, Serializable {
* @throws MathIllegalArgumentException if the length of the data array is
* not a power of two, or the first element of the data array is not zero
*/
+ @Override
public double[] transform(final double[] f, final TransformType type) {
if (normalization == DstNormalization.ORTHOGONAL_DST_I) {
final double s = FastMath.sqrt(2.0 / f.length);
@@ -115,6 +116,7 @@ public class FastSineTransformer implements RealTransformer, Serializable {
* if the number of sample points is negative
* @throws MathIllegalArgumentException if the number of sample points is not a power of two
*/
+ @Override
public double[] transform(final UnivariateFunction f,
final double min, final double max, final int n,
final TransformType type) {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/ab9c3e93/src/main/java/org/apache/commons/math4/util/BigReal.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/util/BigReal.java b/src/main/java/org/apache/commons/math4/util/BigReal.java
index cd3a7d4..a69ed5d 100644
--- a/src/main/java/org/apache/commons/math4/util/BigReal.java
+++ b/src/main/java/org/apache/commons/math4/util/BigReal.java
@@ -228,16 +228,19 @@ public class BigReal implements FieldElement<BigReal>, Comparable<BigReal>, Seri
}
/** {@inheritDoc} */
+ @Override
public BigReal add(BigReal a) {
return new BigReal(d.add(a.d));
}
/** {@inheritDoc} */
+ @Override
public BigReal subtract(BigReal a) {
return new BigReal(d.subtract(a.d));
}
/** {@inheritDoc} */
+ @Override
public BigReal negate() {
return new BigReal(d.negate());
}
@@ -247,6 +250,7 @@ public class BigReal implements FieldElement<BigReal>, Comparable<BigReal>, Seri
*
* @throws MathArithmeticException if {@code a} is zero
*/
+ @Override
public BigReal divide(BigReal a) throws MathArithmeticException {
try {
return new BigReal(d.divide(a.d, scale, roundingMode));
@@ -261,6 +265,7 @@ public class BigReal implements FieldElement<BigReal>, Comparable<BigReal>, Seri
*
* @throws MathArithmeticException if {@code this} is zero
*/
+ @Override
public BigReal reciprocal() throws MathArithmeticException {
try {
return new BigReal(BigDecimal.ONE.divide(d, scale, roundingMode));
@@ -271,16 +276,19 @@ public class BigReal implements FieldElement<BigReal>, Comparable<BigReal>, Seri
}
/** {@inheritDoc} */
+ @Override
public BigReal multiply(BigReal a) {
return new BigReal(d.multiply(a.d));
}
/** {@inheritDoc} */
+ @Override
public BigReal multiply(final int n) {
return new BigReal(d.multiply(new BigDecimal(n)));
}
/** {@inheritDoc} */
+ @Override
public int compareTo(BigReal a) {
return d.compareTo(a.d);
}
@@ -319,6 +327,7 @@ public class BigReal implements FieldElement<BigReal>, Comparable<BigReal>, Seri
}
/** {@inheritDoc} */
+ @Override
public Field<BigReal> getField() {
return BigRealField.getInstance();
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/ab9c3e93/src/main/java/org/apache/commons/math4/util/BigRealField.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/util/BigRealField.java b/src/main/java/org/apache/commons/math4/util/BigRealField.java
index ce8ff5b..d6e9bca 100644
--- a/src/main/java/org/apache/commons/math4/util/BigRealField.java
+++ b/src/main/java/org/apache/commons/math4/util/BigRealField.java
@@ -48,16 +48,19 @@ public class BigRealField implements Field<BigReal>, Serializable {
}
/** {@inheritDoc} */
+ @Override
public BigReal getOne() {
return BigReal.ONE;
}
/** {@inheritDoc} */
+ @Override
public BigReal getZero() {
return BigReal.ZERO;
}
/** {@inheritDoc} */
+ @Override
public Class<? extends FieldElement<BigReal>> getRuntimeClass() {
return BigReal.class;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/ab9c3e93/src/main/java/org/apache/commons/math4/util/CentralPivotingStrategy.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/util/CentralPivotingStrategy.java b/src/main/java/org/apache/commons/math4/util/CentralPivotingStrategy.java
index 8d19b6d..9581a37 100644
--- a/src/main/java/org/apache/commons/math4/util/CentralPivotingStrategy.java
+++ b/src/main/java/org/apache/commons/math4/util/CentralPivotingStrategy.java
@@ -37,6 +37,7 @@ public class CentralPivotingStrategy implements PivotingStrategyInterface, Seria
* the first and the last element indices of the array slice
* @throws MathIllegalArgumentException when indices exceeds range
*/
+ @Override
public int pivotIndex(final double[] work, final int begin, final int end)
throws MathIllegalArgumentException {
MathArrays.verifyValues(work, begin, end-begin);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/ab9c3e93/src/main/java/org/apache/commons/math4/util/Combinations.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/util/Combinations.java b/src/main/java/org/apache/commons/math4/util/Combinations.java
index 8079ba5..372bd17 100644
--- a/src/main/java/org/apache/commons/math4/util/Combinations.java
+++ b/src/main/java/org/apache/commons/math4/util/Combinations.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.math4.util;
-import java.util.Iterator;
-import java.util.Comparator;
+import java.io.Serializable;
import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Iterator;
import java.util.NoSuchElementException;
-import java.io.Serializable;
import org.apache.commons.math4.exception.DimensionMismatchException;
import org.apache.commons.math4.exception.MathInternalError;
@@ -129,6 +129,7 @@ public class Combinations implements Iterable<int[]> {
}
/** {@inheritDoc} */
+ @Override
public Iterator<int[]> iterator() {
if (k == 0 ||
k == n) {
@@ -224,6 +225,7 @@ public class Combinations implements Iterable<int[]> {
/**
* {@inheritDoc}
*/
+ @Override
public boolean hasNext() {
return more;
}
@@ -231,6 +233,7 @@ public class Combinations implements Iterable<int[]> {
/**
* {@inheritDoc}
*/
+ @Override
public int[] next() {
if (!more) {
throw new NoSuchElementException();
@@ -280,6 +283,7 @@ public class Combinations implements Iterable<int[]> {
/**
* Not supported.
*/
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
@@ -302,10 +306,12 @@ public class Combinations implements Iterable<int[]> {
this.singleton = singleton;
}
/** @return True until next is called the first time, then false */
+ @Override
public boolean hasNext() {
return more;
}
/** @return the singleton in first activation; throws NSEE thereafter */
+ @Override
public int[] next() {
if (more) {
more = false;
@@ -315,6 +321,7 @@ public class Combinations implements Iterable<int[]> {
}
}
/** Not supported */
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
@@ -351,6 +358,7 @@ public class Combinations implements Iterable<int[]> {
* @throws OutOfRangeException if an element of the array is not
* within the interval [0, {@code n}).
*/
+ @Override
public int compare(int[] c1,
int[] c2) {
if (c1.length != k) {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/ab9c3e93/src/main/java/org/apache/commons/math4/util/Decimal64.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/util/Decimal64.java b/src/main/java/org/apache/commons/math4/util/Decimal64.java
index 15c174d..b8f4999 100644
--- a/src/main/java/org/apache/commons/math4/util/Decimal64.java
+++ b/src/main/java/org/apache/commons/math4/util/Decimal64.java
@@ -79,6 +79,7 @@ public class Decimal64 extends Number
*/
/** {@inheritDoc} */
+ @Override
public Field<Decimal64> getField() {
return Decimal64Field.getInstance();
}
@@ -90,6 +91,7 @@ public class Decimal64 extends Number
* {@code this.add(a).equals(new Decimal64(this.doubleValue()
* + a.doubleValue()))}.
*/
+ @Override
public Decimal64 add(final Decimal64 a) {
return new Decimal64(this.value + a.value);
}
@@ -101,6 +103,7 @@ public class Decimal64 extends Number
* {@code this.subtract(a).equals(new Decimal64(this.doubleValue()
* - a.doubleValue()))}.
*/
+ @Override
public Decimal64 subtract(final Decimal64 a) {
return new Decimal64(this.value - a.value);
}
@@ -111,6 +114,7 @@ public class Decimal64 extends Number
* The current implementation strictly enforces
* {@code this.negate().equals(new Decimal64(-this.doubleValue()))}.
*/
+ @Override
public Decimal64 negate() {
return new Decimal64(-this.value);
}
@@ -122,6 +126,7 @@ public class Decimal64 extends Number
* {@code this.multiply(a).equals(new Decimal64(this.doubleValue()
* * a.doubleValue()))}.
*/
+ @Override
public Decimal64 multiply(final Decimal64 a) {
return new Decimal64(this.value * a.value);
}
@@ -132,6 +137,7 @@ public class Decimal64 extends Number
* The current implementation strictly enforces
* {@code this.multiply(n).equals(new Decimal64(n * this.doubleValue()))}.
*/
+ @Override
public Decimal64 multiply(final int n) {
return new Decimal64(n * this.value);
}
@@ -144,6 +150,7 @@ public class Decimal64 extends Number
* / a.doubleValue()))}.
*
*/
+ @Override
public Decimal64 divide(final Decimal64 a) {
return new Decimal64(this.value / a.value);
}
@@ -155,6 +162,7 @@ public class Decimal64 extends Number
* {@code this.reciprocal().equals(new Decimal64(1.0
* / this.doubleValue()))}.
*/
+ @Override
public Decimal64 reciprocal() {
return new Decimal64(1.0 / this.value);
}
@@ -232,6 +240,7 @@ public class Decimal64 extends Number
*
* @see Double#compareTo(Double)
*/
+ @Override
public int compareTo(final Decimal64 o) {
return Double.compare(this.value, o.value);
}
@@ -305,6 +314,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public double getReal() {
return value;
}
@@ -312,6 +322,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 add(final double a) {
return new Decimal64(value + a);
}
@@ -319,6 +330,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 subtract(final double a) {
return new Decimal64(value - a);
}
@@ -326,6 +338,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 multiply(final double a) {
return new Decimal64(value * a);
}
@@ -333,6 +346,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 divide(final double a) {
return new Decimal64(value / a);
}
@@ -340,6 +354,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 remainder(final double a) {
return new Decimal64(FastMath.IEEEremainder(value, a));
}
@@ -347,6 +362,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 remainder(final Decimal64 a) {
return new Decimal64(FastMath.IEEEremainder(value, a.value));
}
@@ -354,6 +370,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 abs() {
return new Decimal64(FastMath.abs(value));
}
@@ -361,6 +378,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 ceil() {
return new Decimal64(FastMath.ceil(value));
}
@@ -368,6 +386,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 floor() {
return new Decimal64(FastMath.floor(value));
}
@@ -375,6 +394,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 rint() {
return new Decimal64(FastMath.rint(value));
}
@@ -382,6 +402,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public long round() {
return FastMath.round(value);
}
@@ -389,6 +410,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 signum() {
return new Decimal64(FastMath.signum(value));
}
@@ -396,6 +418,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 copySign(final Decimal64 sign) {
return new Decimal64(FastMath.copySign(value, sign.value));
}
@@ -403,6 +426,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 copySign(final double sign) {
return new Decimal64(FastMath.copySign(value, sign));
}
@@ -410,6 +434,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 scalb(final int n) {
return new Decimal64(FastMath.scalb(value, n));
}
@@ -417,6 +442,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 hypot(final Decimal64 y) {
return new Decimal64(FastMath.hypot(value, y.value));
}
@@ -424,6 +450,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 sqrt() {
return new Decimal64(FastMath.sqrt(value));
}
@@ -431,6 +458,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 cbrt() {
return new Decimal64(FastMath.cbrt(value));
}
@@ -438,6 +466,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 rootN(final int n) {
if (value < 0) {
return new Decimal64(-FastMath.pow(-value, 1.0 / n));
@@ -449,6 +478,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 pow(final double p) {
return new Decimal64(FastMath.pow(value, p));
}
@@ -456,6 +486,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 pow(final int n) {
return new Decimal64(FastMath.pow(value, n));
}
@@ -463,6 +494,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 pow(final Decimal64 e) {
return new Decimal64(FastMath.pow(value, e.value));
}
@@ -470,6 +502,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 exp() {
return new Decimal64(FastMath.exp(value));
}
@@ -477,6 +510,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 expm1() {
return new Decimal64(FastMath.expm1(value));
}
@@ -484,6 +518,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 log() {
return new Decimal64(FastMath.log(value));
}
@@ -491,6 +526,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 log1p() {
return new Decimal64(FastMath.log1p(value));
}
@@ -499,6 +535,7 @@ public class Decimal64 extends Number
* @return base 10 logarithm of the instance
* @since 3.2
*/
+ @Override
public Decimal64 log10() {
return new Decimal64(FastMath.log10(value));
}
@@ -506,6 +543,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 cos() {
return new Decimal64(FastMath.cos(value));
}
@@ -513,6 +551,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 sin() {
return new Decimal64(FastMath.sin(value));
}
@@ -520,6 +559,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 tan() {
return new Decimal64(FastMath.tan(value));
}
@@ -527,6 +567,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 acos() {
return new Decimal64(FastMath.acos(value));
}
@@ -534,6 +575,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 asin() {
return new Decimal64(FastMath.asin(value));
}
@@ -541,6 +583,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 atan() {
return new Decimal64(FastMath.atan(value));
}
@@ -548,6 +591,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 atan2(final Decimal64 x) {
return new Decimal64(FastMath.atan2(value, x.value));
}
@@ -555,6 +599,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 cosh() {
return new Decimal64(FastMath.cosh(value));
}
@@ -562,6 +607,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 sinh() {
return new Decimal64(FastMath.sinh(value));
}
@@ -569,6 +615,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 tanh() {
return new Decimal64(FastMath.tanh(value));
}
@@ -576,6 +623,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 acosh() {
return new Decimal64(FastMath.acosh(value));
}
@@ -583,6 +631,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 asinh() {
return new Decimal64(FastMath.asinh(value));
}
@@ -590,6 +639,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 atanh() {
return new Decimal64(FastMath.atanh(value));
}
@@ -597,6 +647,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 linearCombination(final Decimal64[] a, final Decimal64[] b)
throws DimensionMismatchException {
if (a.length != b.length) {
@@ -614,6 +665,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 linearCombination(final double[] a, final Decimal64[] b)
throws DimensionMismatchException {
if (a.length != b.length) {
@@ -629,6 +681,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 linearCombination(final Decimal64 a1, final Decimal64 b1,
final Decimal64 a2, final Decimal64 b2) {
return new Decimal64(MathArrays.linearCombination(a1.value, b1.value,
@@ -638,6 +691,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 linearCombination(final double a1, final Decimal64 b1,
final double a2, final Decimal64 b2) {
return new Decimal64(MathArrays.linearCombination(a1, b1.value,
@@ -647,6 +701,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 linearCombination(final Decimal64 a1, final Decimal64 b1,
final Decimal64 a2, final Decimal64 b2,
final Decimal64 a3, final Decimal64 b3) {
@@ -658,6 +713,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 linearCombination(final double a1, final Decimal64 b1,
final double a2, final Decimal64 b2,
final double a3, final Decimal64 b3) {
@@ -669,6 +725,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 linearCombination(final Decimal64 a1, final Decimal64 b1,
final Decimal64 a2, final Decimal64 b2,
final Decimal64 a3, final Decimal64 b3,
@@ -682,6 +739,7 @@ public class Decimal64 extends Number
/** {@inheritDoc}
* @since 3.2
*/
+ @Override
public Decimal64 linearCombination(final double a1, final Decimal64 b1,
final double a2, final Decimal64 b2,
final double a3, final Decimal64 b3,
http://git-wip-us.apache.org/repos/asf/commons-math/blob/ab9c3e93/src/main/java/org/apache/commons/math4/util/Decimal64Field.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/util/Decimal64Field.java b/src/main/java/org/apache/commons/math4/util/Decimal64Field.java
index 67117f2..c0a401d 100644
--- a/src/main/java/org/apache/commons/math4/util/Decimal64Field.java
+++ b/src/main/java/org/apache/commons/math4/util/Decimal64Field.java
@@ -45,16 +45,19 @@ public class Decimal64Field implements Field<Decimal64> {
}
/** {@inheritDoc} */
+ @Override
public Decimal64 getZero() {
return Decimal64.ZERO;
}
/** {@inheritDoc} */
+ @Override
public Decimal64 getOne() {
return Decimal64.ONE;
}
/** {@inheritDoc} */
+ @Override
public Class<? extends FieldElement<Decimal64>> getRuntimeClass() {
return Decimal64.class;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/ab9c3e93/src/main/java/org/apache/commons/math4/util/DefaultTransformer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/util/DefaultTransformer.java b/src/main/java/org/apache/commons/math4/util/DefaultTransformer.java
index b0d2078..b0d8d04 100644
--- a/src/main/java/org/apache/commons/math4/util/DefaultTransformer.java
+++ b/src/main/java/org/apache/commons/math4/util/DefaultTransformer.java
@@ -28,7 +28,6 @@ import org.apache.commons.math4.exception.util.LocalizedFormats;
* provides some simple conversion capabilities to turn any java.lang.Number
* into a primitive double or to turn a String representation of a Number into
* a double.
- *
*/
public class DefaultTransformer implements NumberTransformer, Serializable {
@@ -43,6 +42,7 @@ public class DefaultTransformer implements NumberTransformer, Serializable {
* cannot successfully be transformed
* @see <a href="http://commons.apache.org/collections/api-release/org/apache/commons/collections/Transformer.html">Commons Collections Transformer</a>
*/
+ @Override
public double transform(Object o)
throws NullArgumentException, MathIllegalArgumentException {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/ab9c3e93/src/main/java/org/apache/commons/math4/util/Incrementor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/util/Incrementor.java b/src/main/java/org/apache/commons/math4/util/Incrementor.java
index c63081d..1f10cac 100644
--- a/src/main/java/org/apache/commons/math4/util/Incrementor.java
+++ b/src/main/java/org/apache/commons/math4/util/Incrementor.java
@@ -61,7 +61,8 @@ public class Incrementor {
this(max,
new MaxCountExceededCallback() {
/** {@inheritDoc} */
- public void trigger(int max) throws MaxCountExceededException {
+ @Override
+ public void trigger(int max) throws MaxCountExceededException {
throw new MaxCountExceededException(max);
}
});
http://git-wip-us.apache.org/repos/asf/commons-math/blob/ab9c3e93/src/main/java/org/apache/commons/math4/util/MathArrays.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/util/MathArrays.java b/src/main/java/org/apache/commons/math4/util/MathArrays.java
index d7f7928..ea2e9f2 100644
--- a/src/main/java/org/apache/commons/math4/util/MathArrays.java
+++ b/src/main/java/org/apache/commons/math4/util/MathArrays.java
@@ -727,11 +727,13 @@ public class MathArrays {
final Comparator<Pair<Double, Integer>> comp
= dir == MathArrays.OrderDirection.INCREASING ?
new Comparator<Pair<Double, Integer>>() {
+ @Override
public int compare(Pair<Double, Integer> o1,
Pair<Double, Integer> o2) {
return o1.getKey().compareTo(o2.getKey());
}
} : new Comparator<Pair<Double,Integer>>() {
+ @Override
public int compare(Pair<Double, Integer> o1,
Pair<Double, Integer> o2) {
return o2.getKey().compareTo(o1.getKey());
http://git-wip-us.apache.org/repos/asf/commons-math/blob/ab9c3e93/src/main/java/org/apache/commons/math4/util/MedianOf3PivotingStrategy.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/util/MedianOf3PivotingStrategy.java b/src/main/java/org/apache/commons/math4/util/MedianOf3PivotingStrategy.java
index 0eaa6a2..e8499dc 100644
--- a/src/main/java/org/apache/commons/math4/util/MedianOf3PivotingStrategy.java
+++ b/src/main/java/org/apache/commons/math4/util/MedianOf3PivotingStrategy.java
@@ -36,6 +36,7 @@ public class MedianOf3PivotingStrategy implements PivotingStrategyInterface, Ser
* first, middle and the last indices of the array slice
* @throws MathIllegalArgumentException when indices exceeds range
*/
+ @Override
public int pivotIndex(final double[] work, final int begin, final int end)
throws MathIllegalArgumentException {
MathArrays.verifyValues(work, begin, end-begin);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/ab9c3e93/src/main/java/org/apache/commons/math4/util/MultidimensionalCounter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/util/MultidimensionalCounter.java b/src/main/java/org/apache/commons/math4/util/MultidimensionalCounter.java
index 58b8445..c73fe24 100644
--- a/src/main/java/org/apache/commons/math4/util/MultidimensionalCounter.java
+++ b/src/main/java/org/apache/commons/math4/util/MultidimensionalCounter.java
@@ -94,6 +94,7 @@ public class MultidimensionalCounter implements Iterable<Integer> {
/**
* {@inheritDoc}
*/
+ @Override
public boolean hasNext() {
return count < maxCount;
}
@@ -104,6 +105,7 @@ public class MultidimensionalCounter implements Iterable<Integer> {
* @throws NoSuchElementException if {@link #hasNext()} would have
* returned {@code false}.
*/
+ @Override
public Integer next() {
if (!hasNext()) {
throw new NoSuchElementException();
@@ -156,6 +158,7 @@ public class MultidimensionalCounter implements Iterable<Integer> {
/**
* @throws UnsupportedOperationException
*/
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
@@ -198,6 +201,7 @@ public class MultidimensionalCounter implements Iterable<Integer> {
*
* @return the iterator.
*/
+ @Override
public Iterator iterator() {
return new Iterator();
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/ab9c3e93/src/main/java/org/apache/commons/math4/util/RandomPivotingStrategy.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/util/RandomPivotingStrategy.java b/src/main/java/org/apache/commons/math4/util/RandomPivotingStrategy.java
index fa0374f..e386664 100644
--- a/src/main/java/org/apache/commons/math4/util/RandomPivotingStrategy.java
+++ b/src/main/java/org/apache/commons/math4/util/RandomPivotingStrategy.java
@@ -48,6 +48,7 @@ public class RandomPivotingStrategy implements PivotingStrategyInterface, Serial
* value between first and the last indices of the array slice
* @throws MathIllegalArgumentException when indices exceeds range
*/
+ @Override
public int pivotIndex(final double[] work, final int begin, final int end)
throws MathIllegalArgumentException {
MathArrays.verifyValues(work, begin, end-begin);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/ab9c3e93/src/main/java/org/apache/commons/math4/util/ResizableDoubleArray.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/util/ResizableDoubleArray.java b/src/main/java/org/apache/commons/math4/util/ResizableDoubleArray.java
index 3fd29f3..b0dd132 100644
--- a/src/main/java/org/apache/commons/math4/util/ResizableDoubleArray.java
+++ b/src/main/java/org/apache/commons/math4/util/ResizableDoubleArray.java
@@ -437,6 +437,7 @@ public class ResizableDoubleArray implements DoubleArray, Serializable {
*
* @param value Value to be added to end of array.
*/
+ @Override
public synchronized void addElement(double value) {
if (internalArray.length <= startIndex + numElements) {
expand();
@@ -450,6 +451,7 @@ public class ResizableDoubleArray implements DoubleArray, Serializable {
* @param values Values to be added to end of array.
* @since 2.2
*/
+ @Override
public synchronized void addElements(double[] values) {
final double[] tempArray = new double[numElements + values.length + 1];
System.arraycopy(internalArray, startIndex, tempArray, 0, numElements);
@@ -475,6 +477,7 @@ public class ResizableDoubleArray implements DoubleArray, Serializable {
* @return the value which has been discarded or "pushed" out of the array
* by this rolling insert.
*/
+ @Override
public synchronized double addElementRolling(double value) {
double discarded = internalArray[startIndex];
@@ -578,6 +581,7 @@ public class ResizableDoubleArray implements DoubleArray, Serializable {
/**
* Clear the array contents, resetting the number of elements to zero.
*/
+ @Override
public synchronized void clear() {
numElements = 0;
startIndex = 0;
@@ -757,6 +761,7 @@ public class ResizableDoubleArray implements DoubleArray, Serializable {
* @throws ArrayIndexOutOfBoundsException if <code>index</code> is less than
* zero or is greater than <code>getNumElements() - 1</code>.
*/
+ @Override
public synchronized double getElement(int index) {
if (index >= numElements) {
throw new ArrayIndexOutOfBoundsException(index);
@@ -774,6 +779,7 @@ public class ResizableDoubleArray implements DoubleArray, Serializable {
* array have no effect on this <code>ResizableArray.</code>
* @return the double array.
*/
+ @Override
public synchronized double[] getElements() {
final double[] elementArray = new double[numElements];
System.arraycopy(internalArray, startIndex, elementArray, 0, numElements);
@@ -851,6 +857,7 @@ public class ResizableDoubleArray implements DoubleArray, Serializable {
*
* @return the number of elements.
*/
+ @Override
public synchronized int getNumElements() {
return numElements;
}
@@ -958,6 +965,7 @@ public class ResizableDoubleArray implements DoubleArray, Serializable {
* @param value value to store at the specified index
* @throws ArrayIndexOutOfBoundsException if {@code index < 0}.
*/
+ @Override
public synchronized void setElement(int index, double value) {
if (index < 0) {
throw new ArrayIndexOutOfBoundsException(index);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/ab9c3e93/src/main/java/org/apache/commons/math4/util/TransformerMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/util/TransformerMap.java b/src/main/java/org/apache/commons/math4/util/TransformerMap.java
index c5b9ce0..374b9f6 100644
--- a/src/main/java/org/apache/commons/math4/util/TransformerMap.java
+++ b/src/main/java/org/apache/commons/math4/util/TransformerMap.java
@@ -137,6 +137,7 @@ public class TransformerMap implements NumberTransformer, Serializable {
* transformed into a Double.
* @see org.apache.commons.math4.util.NumberTransformer#transform(java.lang.Object)
*/
+ @Override
public double transform(Object o) throws MathIllegalArgumentException {
double value = Double.NaN;