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/02 22:53:29 UTC
[math] Make private fields final if possible,
add missing @Override tags for implemented interfaces, javadoc formatting.
Repository: commons-math
Updated Branches:
refs/heads/master 1e7d4f057 -> 51a9539c6
Make private fields final if possible, add missing @Override tags for implemented interfaces, javadoc 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/51a9539c
Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/51a9539c
Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/51a9539c
Branch: refs/heads/master
Commit: 51a9539c693b805714674d1641dd52c5a997bd0e
Parents: 1e7d4f0
Author: Thomas Neidhart <th...@gmail.com>
Authored: Mon Mar 2 22:53:16 2015 +0100
Committer: Thomas Neidhart <th...@gmail.com>
Committed: Mon Mar 2 22:53:16 2015 +0100
----------------------------------------------------------------------
.../math4/filter/DefaultMeasurementModel.java | 6 ++++--
.../commons/math4/filter/DefaultProcessModel.java | 15 ++++++++++-----
.../apache/commons/math4/fraction/BigFraction.java | 9 +++++++++
.../commons/math4/fraction/BigFractionField.java | 3 +++
.../org/apache/commons/math4/fraction/Fraction.java | 9 +++++++++
.../apache/commons/math4/fraction/FractionField.java | 3 +++
.../commons/math4/genetics/BinaryMutation.java | 1 +
.../apache/commons/math4/genetics/Chromosome.java | 1 +
.../commons/math4/genetics/CycleCrossover.java | 1 +
.../math4/genetics/ElitisticListPopulation.java | 1 +
.../commons/math4/genetics/FixedElapsedTime.java | 6 ++++--
.../commons/math4/genetics/FixedGenerationCount.java | 9 ++++++---
.../commons/math4/genetics/ListPopulation.java | 7 ++++++-
.../commons/math4/genetics/NPointCrossover.java | 1 +
.../commons/math4/genetics/OnePointCrossover.java | 1 +
.../commons/math4/genetics/OrderedCrossover.java | 1 +
.../org/apache/commons/math4/genetics/RandomKey.java | 1 +
.../commons/math4/genetics/RandomKeyMutation.java | 1 +
.../commons/math4/genetics/TournamentSelection.java | 2 ++
.../commons/math4/genetics/UniformCrossover.java | 1 +
.../commons/math4/ml/clustering/DoublePoint.java | 1 +
.../commons/math4/ml/distance/CanberraDistance.java | 1 +
.../commons/math4/ml/distance/ChebyshevDistance.java | 1 +
.../math4/ml/distance/EarthMoversDistance.java | 1 +
.../commons/math4/ml/distance/EuclideanDistance.java | 1 +
.../commons/math4/ml/distance/ManhattanDistance.java | 1 +
26 files changed, 72 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-math/blob/51a9539c/src/main/java/org/apache/commons/math4/filter/DefaultMeasurementModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/filter/DefaultMeasurementModel.java b/src/main/java/org/apache/commons/math4/filter/DefaultMeasurementModel.java
index d03f63a..1c7a2f8 100644
--- a/src/main/java/org/apache/commons/math4/filter/DefaultMeasurementModel.java
+++ b/src/main/java/org/apache/commons/math4/filter/DefaultMeasurementModel.java
@@ -33,12 +33,12 @@ public class DefaultMeasurementModel implements MeasurementModel {
* The measurement matrix, used to associate the measurement vector to the
* internal state estimation vector.
*/
- private RealMatrix measurementMatrix;
+ private final RealMatrix measurementMatrix;
/**
* The measurement noise covariance matrix.
*/
- private RealMatrix measurementNoise;
+ private final RealMatrix measurementNoise;
/**
* Create a new {@link MeasurementModel}, taking double arrays as input parameters for the
@@ -73,11 +73,13 @@ public class DefaultMeasurementModel implements MeasurementModel {
}
/** {@inheritDoc} */
+ @Override
public RealMatrix getMeasurementMatrix() {
return measurementMatrix;
}
/** {@inheritDoc} */
+ @Override
public RealMatrix getMeasurementNoise() {
return measurementNoise;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/51a9539c/src/main/java/org/apache/commons/math4/filter/DefaultProcessModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/filter/DefaultProcessModel.java b/src/main/java/org/apache/commons/math4/filter/DefaultProcessModel.java
index b89be26..cb535dc 100644
--- a/src/main/java/org/apache/commons/math4/filter/DefaultProcessModel.java
+++ b/src/main/java/org/apache/commons/math4/filter/DefaultProcessModel.java
@@ -33,21 +33,21 @@ public class DefaultProcessModel implements ProcessModel {
/**
* The state transition matrix, used to advance the internal state estimation each time-step.
*/
- private RealMatrix stateTransitionMatrix;
+ private final RealMatrix stateTransitionMatrix;
/**
* The control matrix, used to integrate a control input into the state estimation.
*/
- private RealMatrix controlMatrix;
+ private final RealMatrix controlMatrix;
/** The process noise covariance matrix. */
- private RealMatrix processNoiseCovMatrix;
+ private final RealMatrix processNoiseCovMatrix;
/** The initial state estimation of the observed process. */
- private RealVector initialStateEstimateVector;
+ private final RealVector initialStateEstimateVector;
/** The initial error covariance matrix of the observed process. */
- private RealMatrix initialErrorCovMatrix;
+ private final RealMatrix initialErrorCovMatrix;
/**
* Create a new {@link ProcessModel}, taking double arrays as input parameters.
@@ -139,26 +139,31 @@ public class DefaultProcessModel implements ProcessModel {
}
/** {@inheritDoc} */
+ @Override
public RealMatrix getStateTransitionMatrix() {
return stateTransitionMatrix;
}
/** {@inheritDoc} */
+ @Override
public RealMatrix getControlMatrix() {
return controlMatrix;
}
/** {@inheritDoc} */
+ @Override
public RealMatrix getProcessNoise() {
return processNoiseCovMatrix;
}
/** {@inheritDoc} */
+ @Override
public RealVector getInitialStateEstimate() {
return initialStateEstimateVector;
}
/** {@inheritDoc} */
+ @Override
public RealMatrix getInitialErrorCovariance() {
return initialErrorCovMatrix;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/51a9539c/src/main/java/org/apache/commons/math4/fraction/BigFraction.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/fraction/BigFraction.java b/src/main/java/org/apache/commons/math4/fraction/BigFraction.java
index 5c2f24b..078682d 100644
--- a/src/main/java/org/apache/commons/math4/fraction/BigFraction.java
+++ b/src/main/java/org/apache/commons/math4/fraction/BigFraction.java
@@ -509,6 +509,7 @@ public class BigFraction
* @return a {@link BigFraction} instance with the resulting values.
* @throws NullArgumentException if the {@link BigFraction} is {@code null}.
*/
+ @Override
public BigFraction add(final BigFraction fraction) {
if (fraction == null) {
throw new NullArgumentException(LocalizedFormats.FRACTION);
@@ -596,6 +597,7 @@ public class BigFraction
* than {@code object}, 0 if they are equal.
* @see java.lang.Comparable#compareTo(java.lang.Object)
*/
+ @Override
public int compareTo(final BigFraction object) {
BigInteger nOd = numerator.multiply(object.denominator);
BigInteger dOn = denominator.multiply(object.numerator);
@@ -662,6 +664,7 @@ public class BigFraction
* @throws NullArgumentException if the {@code fraction} is {@code null}.
* @throws MathArithmeticException if the fraction to divide by is zero
*/
+ @Override
public BigFraction divide(final BigFraction fraction) {
if (fraction == null) {
throw new NullArgumentException(LocalizedFormats.FRACTION);
@@ -883,6 +886,7 @@ public class BigFraction
* the {@code int} to multiply by.
* @return a {@link BigFraction} instance with the resulting values.
*/
+ @Override
public BigFraction multiply(final int i) {
return multiply(BigInteger.valueOf(i));
}
@@ -911,6 +915,7 @@ public class BigFraction
* @return a {@link BigFraction} instance with the resulting values.
* @throws NullArgumentException if {@code fraction} is {@code null}.
*/
+ @Override
public BigFraction multiply(final BigFraction fraction) {
if (fraction == null) {
throw new NullArgumentException(LocalizedFormats.FRACTION);
@@ -931,6 +936,7 @@ public class BigFraction
*
* @return the negation of this fraction.
*/
+ @Override
public BigFraction negate() {
return new BigFraction(numerator.negate(), denominator);
}
@@ -1026,6 +1032,7 @@ public class BigFraction
*
* @return the reciprocal fraction.
*/
+ @Override
public BigFraction reciprocal() {
return new BigFraction(denominator, numerator);
}
@@ -1096,6 +1103,7 @@ public class BigFraction
* @return a {@link BigFraction} instance with the resulting values
* @throws NullArgumentException if the {@code fraction} is {@code null}.
*/
+ @Override
public BigFraction subtract(final BigFraction fraction) {
if (fraction == null) {
throw new NullArgumentException(LocalizedFormats.FRACTION);
@@ -1140,6 +1148,7 @@ public class BigFraction
}
/** {@inheritDoc} */
+ @Override
public BigFractionField getField() {
return BigFractionField.getInstance();
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/51a9539c/src/main/java/org/apache/commons/math4/fraction/BigFractionField.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/fraction/BigFractionField.java b/src/main/java/org/apache/commons/math4/fraction/BigFractionField.java
index 4cf4d8f..fd55002 100644
--- a/src/main/java/org/apache/commons/math4/fraction/BigFractionField.java
+++ b/src/main/java/org/apache/commons/math4/fraction/BigFractionField.java
@@ -48,16 +48,19 @@ public class BigFractionField implements Field<BigFraction>, Serializable {
}
/** {@inheritDoc} */
+ @Override
public BigFraction getOne() {
return BigFraction.ONE;
}
/** {@inheritDoc} */
+ @Override
public BigFraction getZero() {
return BigFraction.ZERO;
}
/** {@inheritDoc} */
+ @Override
public Class<? extends FieldElement<BigFraction>> getRuntimeClass() {
return BigFraction.class;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/51a9539c/src/main/java/org/apache/commons/math4/fraction/Fraction.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/fraction/Fraction.java b/src/main/java/org/apache/commons/math4/fraction/Fraction.java
index 7c193f3..0713b85 100644
--- a/src/main/java/org/apache/commons/math4/fraction/Fraction.java
+++ b/src/main/java/org/apache/commons/math4/fraction/Fraction.java
@@ -310,6 +310,7 @@ public class Fraction
* @return -1 if this is less than {@code object}, +1 if this is greater
* than {@code object}, 0 if they are equal.
*/
+ @Override
public int compareTo(Fraction object) {
long nOd = ((long) numerator) * object.denominator;
long dOn = ((long) denominator) * object.numerator;
@@ -409,6 +410,7 @@ public class Fraction
* Return the additive inverse of this fraction.
* @return the negation of this fraction.
*/
+ @Override
public Fraction negate() {
if (numerator==Integer.MIN_VALUE) {
throw new MathArithmeticException(LocalizedFormats.OVERFLOW_IN_FRACTION, numerator, denominator);
@@ -420,6 +422,7 @@ public class Fraction
* Return the multiplicative inverse of this fraction.
* @return the reciprocal fraction
*/
+ @Override
public Fraction reciprocal() {
return new Fraction(denominator, numerator);
}
@@ -434,6 +437,7 @@ public class Fraction
* @throws MathArithmeticException if the resulting numerator or denominator exceeds
* {@code Integer.MAX_VALUE}
*/
+ @Override
public Fraction add(Fraction fraction) {
return addSub(fraction, true /* add */);
}
@@ -457,6 +461,7 @@ public class Fraction
* @throws MathArithmeticException if the resulting numerator or denominator
* cannot be represented in an {@code int}.
*/
+ @Override
public Fraction subtract(Fraction fraction) {
return addSub(fraction, false /* subtract */);
}
@@ -537,6 +542,7 @@ public class Fraction
* @throws MathArithmeticException if the resulting numerator or denominator exceeds
* {@code Integer.MAX_VALUE}
*/
+ @Override
public Fraction multiply(Fraction fraction) {
if (fraction == null) {
throw new NullArgumentException(LocalizedFormats.FRACTION);
@@ -558,6 +564,7 @@ public class Fraction
* @param i the {@code integer} to multiply by.
* @return this * i
*/
+ @Override
public Fraction multiply(final int i) {
return new Fraction(numerator * i, denominator);
}
@@ -572,6 +579,7 @@ public class Fraction
* @throws MathArithmeticException if the resulting numerator or denominator exceeds
* {@code Integer.MAX_VALUE}
*/
+ @Override
public Fraction divide(Fraction fraction) {
if (fraction == null) {
throw new NullArgumentException(LocalizedFormats.FRACTION);
@@ -666,6 +674,7 @@ public class Fraction
}
/** {@inheritDoc} */
+ @Override
public FractionField getField() {
return FractionField.getInstance();
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/51a9539c/src/main/java/org/apache/commons/math4/fraction/FractionField.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/fraction/FractionField.java b/src/main/java/org/apache/commons/math4/fraction/FractionField.java
index 8a49265..0b513a5 100644
--- a/src/main/java/org/apache/commons/math4/fraction/FractionField.java
+++ b/src/main/java/org/apache/commons/math4/fraction/FractionField.java
@@ -48,16 +48,19 @@ public class FractionField implements Field<Fraction>, Serializable {
}
/** {@inheritDoc} */
+ @Override
public Fraction getOne() {
return Fraction.ONE;
}
/** {@inheritDoc} */
+ @Override
public Fraction getZero() {
return Fraction.ZERO;
}
/** {@inheritDoc} */
+ @Override
public Class<? extends FieldElement<Fraction>> getRuntimeClass() {
return Fraction.class;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/51a9539c/src/main/java/org/apache/commons/math4/genetics/BinaryMutation.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/genetics/BinaryMutation.java b/src/main/java/org/apache/commons/math4/genetics/BinaryMutation.java
index e2ba8c2..33c5ac5 100644
--- a/src/main/java/org/apache/commons/math4/genetics/BinaryMutation.java
+++ b/src/main/java/org/apache/commons/math4/genetics/BinaryMutation.java
@@ -36,6 +36,7 @@ public class BinaryMutation implements MutationPolicy {
* @return the mutated chromosome.
* @throws MathIllegalArgumentException if <code>original</code> is not an instance of {@link BinaryChromosome}.
*/
+ @Override
public Chromosome mutate(Chromosome original) throws MathIllegalArgumentException {
if (!(original instanceof BinaryChromosome)) {
throw new MathIllegalArgumentException(LocalizedFormats.INVALID_BINARY_CHROMOSOME);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/51a9539c/src/main/java/org/apache/commons/math4/genetics/Chromosome.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/genetics/Chromosome.java b/src/main/java/org/apache/commons/math4/genetics/Chromosome.java
index 09b3392..3d3603b 100644
--- a/src/main/java/org/apache/commons/math4/genetics/Chromosome.java
+++ b/src/main/java/org/apache/commons/math4/genetics/Chromosome.java
@@ -57,6 +57,7 @@ public abstract class Chromosome implements Comparable<Chromosome>,Fitness {
* <li>0 if the two chromosomes have the same fitness</li>
* </ul>
*/
+ @Override
public int compareTo(final Chromosome another) {
return Double.compare(getFitness(), another.getFitness());
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/51a9539c/src/main/java/org/apache/commons/math4/genetics/CycleCrossover.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/genetics/CycleCrossover.java b/src/main/java/org/apache/commons/math4/genetics/CycleCrossover.java
index 021f61a..507ffdf 100644
--- a/src/main/java/org/apache/commons/math4/genetics/CycleCrossover.java
+++ b/src/main/java/org/apache/commons/math4/genetics/CycleCrossover.java
@@ -98,6 +98,7 @@ public class CycleCrossover<T> implements CrossoverPolicy {
* @throws MathIllegalArgumentException if the chromosomes are not an instance of {@link AbstractListChromosome}
* @throws DimensionMismatchException if the length of the two chromosomes is different
*/
+ @Override
@SuppressWarnings("unchecked")
public ChromosomePair crossover(final Chromosome first, final Chromosome second)
throws DimensionMismatchException, MathIllegalArgumentException {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/51a9539c/src/main/java/org/apache/commons/math4/genetics/ElitisticListPopulation.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/genetics/ElitisticListPopulation.java b/src/main/java/org/apache/commons/math4/genetics/ElitisticListPopulation.java
index b7834ff..0930279 100644
--- a/src/main/java/org/apache/commons/math4/genetics/ElitisticListPopulation.java
+++ b/src/main/java/org/apache/commons/math4/genetics/ElitisticListPopulation.java
@@ -77,6 +77,7 @@ public class ElitisticListPopulation extends ListPopulation {
*
* @return the beginnings of the next generation.
*/
+ @Override
public Population nextGeneration() {
// initialize a new generation with the same parameters
ElitisticListPopulation nextGeneration =
http://git-wip-us.apache.org/repos/asf/commons-math/blob/51a9539c/src/main/java/org/apache/commons/math4/genetics/FixedElapsedTime.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/genetics/FixedElapsedTime.java b/src/main/java/org/apache/commons/math4/genetics/FixedElapsedTime.java
index 9eafc0b..2509760 100644
--- a/src/main/java/org/apache/commons/math4/genetics/FixedElapsedTime.java
+++ b/src/main/java/org/apache/commons/math4/genetics/FixedElapsedTime.java
@@ -23,8 +23,9 @@ import org.apache.commons.math4.exception.NumberIsTooSmallException;
/**
* Stops after a fixed amount of time has elapsed.
* <p>
- * The first time {@link #isSatisfied(Population)} is invoked, the end time of the evolution is determined based on the
- * provided <code>maxTime</code> value. Once the elapsed time reaches the configured <code>maxTime</code> value,
+ * The first time {@link #isSatisfied(Population)} is invoked, the end time of
+ * the evolution is determined based on the provided <code>maxTime</code> value.
+ * Once the elapsed time reaches the configured <code>maxTime</code> value,
* {@link #isSatisfied(Population)} returns true.
*
* @since 3.1
@@ -67,6 +68,7 @@ public class FixedElapsedTime implements StoppingCondition {
* @param population ignored (no impact on result)
* @return <code>true</code> IFF the maximum allowed time period has elapsed
*/
+ @Override
public boolean isSatisfied(final Population population) {
if (endTime < 0) {
endTime = System.nanoTime() + maxTimePeriod;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/51a9539c/src/main/java/org/apache/commons/math4/genetics/FixedGenerationCount.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/genetics/FixedGenerationCount.java b/src/main/java/org/apache/commons/math4/genetics/FixedGenerationCount.java
index 70ae10d..3c90559 100644
--- a/src/main/java/org/apache/commons/math4/genetics/FixedGenerationCount.java
+++ b/src/main/java/org/apache/commons/math4/genetics/FixedGenerationCount.java
@@ -19,9 +19,11 @@ package org.apache.commons.math4.genetics;
import org.apache.commons.math4.exception.NumberIsTooSmallException;
/**
- * Stops after a fixed number of generations. Each time {@link #isSatisfied(Population)} is invoked, a generation
- * counter is incremented. Once the counter reaches the configured <code>maxGenerations</code> value,
- * {@link #isSatisfied(Population)} returns true.
+ * Stops after a fixed number of generations.
+ * <p>
+ * Each time {@link #isSatisfied(Population)} is invoked, a generation counter
+ * is incremented. Once the counter reaches the configured
+ * {@code maxGenerations} value, {@link #isSatisfied(Population)} returns true.
*
* @since 2.0
*/
@@ -52,6 +54,7 @@ public class FixedGenerationCount implements StoppingCondition {
* @param population ignored (no impact on result)
* @return <code>true</code> IFF the maximum number of generations has been exceeded
*/
+ @Override
public boolean isSatisfied(final Population population) {
if (this.numGenerations < this.maxGenerations) {
numGenerations++;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/51a9539c/src/main/java/org/apache/commons/math4/genetics/ListPopulation.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/genetics/ListPopulation.java b/src/main/java/org/apache/commons/math4/genetics/ListPopulation.java
index d86680c..1adf6ac 100644
--- a/src/main/java/org/apache/commons/math4/genetics/ListPopulation.java
+++ b/src/main/java/org/apache/commons/math4/genetics/ListPopulation.java
@@ -36,7 +36,7 @@ import org.apache.commons.math4.exception.util.LocalizedFormats;
public abstract class ListPopulation implements Population {
/** List of chromosomes */
- private List<Chromosome> chromosomes;
+ private final List<Chromosome> chromosomes;
/** maximal size of the population */
private int populationLimit;
@@ -119,6 +119,7 @@ public abstract class ListPopulation implements Population {
* @throws NumberIsTooLargeException if the population would exceed the {@code populationLimit} after
* adding this chromosome
*/
+ @Override
public void addChromosome(final Chromosome chromosome) throws NumberIsTooLargeException {
if (chromosomes.size() >= populationLimit) {
throw new NumberIsTooLargeException(LocalizedFormats.LIST_OF_CHROMOSOMES_BIGGER_THAN_POPULATION_SIZE,
@@ -131,6 +132,7 @@ public abstract class ListPopulation implements Population {
* Access the fittest chromosome in this population.
* @return the fittest chromosome.
*/
+ @Override
public Chromosome getFittestChromosome() {
// best so far
Chromosome bestChromosome = this.chromosomes.get(0);
@@ -147,6 +149,7 @@ public abstract class ListPopulation implements Population {
* Access the maximum population size.
* @return the maximum population size.
*/
+ @Override
public int getPopulationLimit() {
return this.populationLimit;
}
@@ -172,6 +175,7 @@ public abstract class ListPopulation implements Population {
* Access the current population size.
* @return the current population size.
*/
+ @Override
public int getPopulationSize() {
return this.chromosomes.size();
}
@@ -190,6 +194,7 @@ public abstract class ListPopulation implements Population {
*
* @return chromosome iterator
*/
+ @Override
public Iterator<Chromosome> iterator() {
return getChromosomes().iterator();
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/51a9539c/src/main/java/org/apache/commons/math4/genetics/NPointCrossover.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/genetics/NPointCrossover.java b/src/main/java/org/apache/commons/math4/genetics/NPointCrossover.java
index 0b16c95..5c79ef1 100644
--- a/src/main/java/org/apache/commons/math4/genetics/NPointCrossover.java
+++ b/src/main/java/org/apache/commons/math4/genetics/NPointCrossover.java
@@ -103,6 +103,7 @@ public class NPointCrossover<T> implements CrossoverPolicy {
* not an instance of {@link AbstractListChromosome}
* @throws DimensionMismatchException if the length of the two chromosomes is different
*/
+ @Override
@SuppressWarnings("unchecked") // OK because of instanceof checks
public ChromosomePair crossover(final Chromosome first, final Chromosome second)
throws DimensionMismatchException, MathIllegalArgumentException {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/51a9539c/src/main/java/org/apache/commons/math4/genetics/OnePointCrossover.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/genetics/OnePointCrossover.java b/src/main/java/org/apache/commons/math4/genetics/OnePointCrossover.java
index 03559d2..0df7313 100644
--- a/src/main/java/org/apache/commons/math4/genetics/OnePointCrossover.java
+++ b/src/main/java/org/apache/commons/math4/genetics/OnePointCrossover.java
@@ -74,6 +74,7 @@ public class OnePointCrossover<T> implements CrossoverPolicy {
* not an instance of {@link AbstractListChromosome}
* @throws DimensionMismatchException if the length of the two chromosomes is different
*/
+ @Override
@SuppressWarnings("unchecked") // OK because of instanceof checks
public ChromosomePair crossover(final Chromosome first, final Chromosome second)
throws DimensionMismatchException, MathIllegalArgumentException {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/51a9539c/src/main/java/org/apache/commons/math4/genetics/OrderedCrossover.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/genetics/OrderedCrossover.java b/src/main/java/org/apache/commons/math4/genetics/OrderedCrossover.java
index f9dbb2f..b5aecc8 100644
--- a/src/main/java/org/apache/commons/math4/genetics/OrderedCrossover.java
+++ b/src/main/java/org/apache/commons/math4/genetics/OrderedCrossover.java
@@ -66,6 +66,7 @@ public class OrderedCrossover<T> implements CrossoverPolicy {
* not an instance of {@link AbstractListChromosome}
* @throws DimensionMismatchException if the length of the two chromosomes is different
*/
+ @Override
@SuppressWarnings("unchecked")
public ChromosomePair crossover(final Chromosome first, final Chromosome second)
throws DimensionMismatchException, MathIllegalArgumentException {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/51a9539c/src/main/java/org/apache/commons/math4/genetics/RandomKey.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/genetics/RandomKey.java b/src/main/java/org/apache/commons/math4/genetics/RandomKey.java
index 0eb679a..07bd27c 100644
--- a/src/main/java/org/apache/commons/math4/genetics/RandomKey.java
+++ b/src/main/java/org/apache/commons/math4/genetics/RandomKey.java
@@ -94,6 +94,7 @@ public abstract class RandomKey<T> extends AbstractListChromosome<Double> implem
/**
* {@inheritDoc}
*/
+ @Override
public List<T> decode(final List<T> sequence) {
return decodeGeneric(sequence, getRepresentation(), sortedRepresentation);
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/51a9539c/src/main/java/org/apache/commons/math4/genetics/RandomKeyMutation.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/genetics/RandomKeyMutation.java b/src/main/java/org/apache/commons/math4/genetics/RandomKeyMutation.java
index 54edfbb..ef74a28 100644
--- a/src/main/java/org/apache/commons/math4/genetics/RandomKeyMutation.java
+++ b/src/main/java/org/apache/commons/math4/genetics/RandomKeyMutation.java
@@ -35,6 +35,7 @@ public class RandomKeyMutation implements MutationPolicy {
*
* @throws MathIllegalArgumentException if <code>original</code> is not a {@link RandomKey} instance
*/
+ @Override
public Chromosome mutate(final Chromosome original) throws MathIllegalArgumentException {
if (!(original instanceof RandomKey<?>)) {
throw new MathIllegalArgumentException(LocalizedFormats.RANDOMKEY_MUTATION_WRONG_CLASS,
http://git-wip-us.apache.org/repos/asf/commons-math/blob/51a9539c/src/main/java/org/apache/commons/math4/genetics/TournamentSelection.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/genetics/TournamentSelection.java b/src/main/java/org/apache/commons/math4/genetics/TournamentSelection.java
index 871c17d..69f2cfa 100644
--- a/src/main/java/org/apache/commons/math4/genetics/TournamentSelection.java
+++ b/src/main/java/org/apache/commons/math4/genetics/TournamentSelection.java
@@ -54,6 +54,7 @@ public class TournamentSelection implements SelectionPolicy {
* @return the selected chromosomes.
* @throws MathIllegalArgumentException if the tournament arity is bigger than the population size
*/
+ @Override
public ChromosomePair select(final Population population) throws MathIllegalArgumentException {
return new ChromosomePair(tournament((ListPopulation) population),
tournament((ListPopulation) population));
@@ -74,6 +75,7 @@ public class TournamentSelection implements SelectionPolicy {
}
// auxiliary population
ListPopulation tournamentPopulation = new ListPopulation(this.arity) {
+ @Override
public Population nextGeneration() {
// not useful here
return null;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/51a9539c/src/main/java/org/apache/commons/math4/genetics/UniformCrossover.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/genetics/UniformCrossover.java b/src/main/java/org/apache/commons/math4/genetics/UniformCrossover.java
index 1427d24..3da1c87 100644
--- a/src/main/java/org/apache/commons/math4/genetics/UniformCrossover.java
+++ b/src/main/java/org/apache/commons/math4/genetics/UniformCrossover.java
@@ -82,6 +82,7 @@ public class UniformCrossover<T> implements CrossoverPolicy {
* not an instance of {@link AbstractListChromosome}
* @throws DimensionMismatchException if the length of the two chromosomes is different
*/
+ @Override
@SuppressWarnings("unchecked")
public ChromosomePair crossover(final Chromosome first, final Chromosome second)
throws DimensionMismatchException, MathIllegalArgumentException {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/51a9539c/src/main/java/org/apache/commons/math4/ml/clustering/DoublePoint.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ml/clustering/DoublePoint.java b/src/main/java/org/apache/commons/math4/ml/clustering/DoublePoint.java
index c1b7f41..04b8544 100644
--- a/src/main/java/org/apache/commons/math4/ml/clustering/DoublePoint.java
+++ b/src/main/java/org/apache/commons/math4/ml/clustering/DoublePoint.java
@@ -58,6 +58,7 @@ public class DoublePoint implements Clusterable, Serializable {
}
/** {@inheritDoc} */
+ @Override
public double[] getPoint() {
return point;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/51a9539c/src/main/java/org/apache/commons/math4/ml/distance/CanberraDistance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ml/distance/CanberraDistance.java b/src/main/java/org/apache/commons/math4/ml/distance/CanberraDistance.java
index 36a6268..0a3aaa3 100644
--- a/src/main/java/org/apache/commons/math4/ml/distance/CanberraDistance.java
+++ b/src/main/java/org/apache/commons/math4/ml/distance/CanberraDistance.java
@@ -29,6 +29,7 @@ public class CanberraDistance implements DistanceMeasure {
private static final long serialVersionUID = -6972277381587032228L;
/** {@inheritDoc} */
+ @Override
public double compute(double[] a, double[] b) {
double sum = 0;
for (int i = 0; i < a.length; i++) {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/51a9539c/src/main/java/org/apache/commons/math4/ml/distance/ChebyshevDistance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ml/distance/ChebyshevDistance.java b/src/main/java/org/apache/commons/math4/ml/distance/ChebyshevDistance.java
index 0fb5145..4b6cf28 100644
--- a/src/main/java/org/apache/commons/math4/ml/distance/ChebyshevDistance.java
+++ b/src/main/java/org/apache/commons/math4/ml/distance/ChebyshevDistance.java
@@ -29,6 +29,7 @@ public class ChebyshevDistance implements DistanceMeasure {
private static final long serialVersionUID = -4694868171115238296L;
/** {@inheritDoc} */
+ @Override
public double compute(double[] a, double[] b) {
return MathArrays.distanceInf(a, b);
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/51a9539c/src/main/java/org/apache/commons/math4/ml/distance/EarthMoversDistance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ml/distance/EarthMoversDistance.java b/src/main/java/org/apache/commons/math4/ml/distance/EarthMoversDistance.java
index cce78bf..b5cdd2e 100644
--- a/src/main/java/org/apache/commons/math4/ml/distance/EarthMoversDistance.java
+++ b/src/main/java/org/apache/commons/math4/ml/distance/EarthMoversDistance.java
@@ -31,6 +31,7 @@ public class EarthMoversDistance implements DistanceMeasure {
private static final long serialVersionUID = -5406732779747414922L;
/** {@inheritDoc} */
+ @Override
public double compute(double[] a, double[] b) {
double lastDistance = 0;
double totalDistance = 0;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/51a9539c/src/main/java/org/apache/commons/math4/ml/distance/EuclideanDistance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ml/distance/EuclideanDistance.java b/src/main/java/org/apache/commons/math4/ml/distance/EuclideanDistance.java
index 76de013..c42d02e 100644
--- a/src/main/java/org/apache/commons/math4/ml/distance/EuclideanDistance.java
+++ b/src/main/java/org/apache/commons/math4/ml/distance/EuclideanDistance.java
@@ -29,6 +29,7 @@ public class EuclideanDistance implements DistanceMeasure {
private static final long serialVersionUID = 1717556319784040040L;
/** {@inheritDoc} */
+ @Override
public double compute(double[] a, double[] b) {
return MathArrays.distance(a, b);
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/51a9539c/src/main/java/org/apache/commons/math4/ml/distance/ManhattanDistance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ml/distance/ManhattanDistance.java b/src/main/java/org/apache/commons/math4/ml/distance/ManhattanDistance.java
index 6c54a9b..b7e1938 100644
--- a/src/main/java/org/apache/commons/math4/ml/distance/ManhattanDistance.java
+++ b/src/main/java/org/apache/commons/math4/ml/distance/ManhattanDistance.java
@@ -29,6 +29,7 @@ public class ManhattanDistance implements DistanceMeasure {
private static final long serialVersionUID = -9108154600539125566L;
/** {@inheritDoc} */
+ @Override
public double compute(double[] a, double[] b) {
return MathArrays.distance1(a, b);
}