You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by lu...@apache.org on 2015/04/10 17:45:58 UTC
[2/4] [math] Fixed @Override checkstyle warnings.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/linear/AbstractRealMatrix.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/linear/AbstractRealMatrix.java b/src/main/java/org/apache/commons/math4/linear/AbstractRealMatrix.java
index e72d4c4..4dcf640 100644
--- a/src/main/java/org/apache/commons/math4/linear/AbstractRealMatrix.java
+++ b/src/main/java/org/apache/commons/math4/linear/AbstractRealMatrix.java
@@ -73,6 +73,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public RealMatrix add(RealMatrix m)
throws MatrixDimensionMismatchException {
MatrixUtils.checkAdditionCompatible(this, m);
@@ -90,6 +91,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public RealMatrix subtract(final RealMatrix m)
throws MatrixDimensionMismatchException {
MatrixUtils.checkSubtractionCompatible(this, m);
@@ -107,6 +109,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public RealMatrix scalarAdd(final double d) {
final int rowCount = getRowDimension();
final int columnCount = getColumnDimension();
@@ -121,6 +124,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public RealMatrix scalarMultiply(final double d) {
final int rowCount = getRowDimension();
final int columnCount = getColumnDimension();
@@ -135,6 +139,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public RealMatrix multiply(final RealMatrix m)
throws DimensionMismatchException {
MatrixUtils.checkMultiplicationCompatible(this, m);
@@ -157,12 +162,14 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public RealMatrix preMultiply(final RealMatrix m)
throws DimensionMismatchException {
return m.multiply(this);
}
/** {@inheritDoc} */
+ @Override
public RealMatrix power(final int p)
throws NotPositiveException, NonSquareMatrixException {
if (p < 0) {
@@ -223,6 +230,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public double[][] getData() {
final double[][] data = new double[getRowDimension()][getColumnDimension()];
@@ -237,6 +245,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public double getNorm() {
return walkInColumnOrder(new RealMatrixPreservingVisitor() {
@@ -250,6 +259,7 @@ public abstract class AbstractRealMatrix
private double maxColSum;
/** {@inheritDoc} */
+ @Override
public void start(final int rows, final int columns,
final int startRow, final int endRow,
final int startColumn, final int endColumn) {
@@ -259,6 +269,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public void visit(final int row, final int column, final double value) {
columnSum += FastMath.abs(value);
if (row == endRow) {
@@ -268,6 +279,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public double end() {
return maxColSum;
}
@@ -275,6 +287,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public double getFrobeniusNorm() {
return walkInOptimizedOrder(new RealMatrixPreservingVisitor() {
@@ -282,6 +295,7 @@ public abstract class AbstractRealMatrix
private double sum;
/** {@inheritDoc} */
+ @Override
public void start(final int rows, final int columns,
final int startRow, final int endRow,
final int startColumn, final int endColumn) {
@@ -289,11 +303,13 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public void visit(final int row, final int column, final double value) {
sum += value * value;
}
/** {@inheritDoc} */
+ @Override
public double end() {
return FastMath.sqrt(sum);
}
@@ -301,6 +317,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public RealMatrix getSubMatrix(final int startRow, final int endRow,
final int startColumn, final int endColumn)
throws OutOfRangeException, NumberIsTooSmallException {
@@ -318,6 +335,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public RealMatrix getSubMatrix(final int[] selectedRows,
final int[] selectedColumns)
throws NullArgumentException, NoDataException, OutOfRangeException {
@@ -339,6 +357,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public void copySubMatrix(final int startRow, final int endRow,
final int startColumn, final int endColumn,
final double[][] destination)
@@ -386,6 +405,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public void copySubMatrix(int[] selectedRows, int[] selectedColumns,
double[][] destination)
throws OutOfRangeException, NullArgumentException, NoDataException,
@@ -411,6 +431,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public void setSubMatrix(final double[][] subMatrix, final int row, final int column)
throws NoDataException, OutOfRangeException,
DimensionMismatchException, NullArgumentException {
@@ -444,6 +465,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public RealMatrix getRowMatrix(final int row) throws OutOfRangeException {
MatrixUtils.checkRowIndex(this, row);
final int nCols = getColumnDimension();
@@ -456,6 +478,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public void setRowMatrix(final int row, final RealMatrix matrix)
throws OutOfRangeException, MatrixDimensionMismatchException {
MatrixUtils.checkRowIndex(this, row);
@@ -472,6 +495,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public RealMatrix getColumnMatrix(final int column)
throws OutOfRangeException {
MatrixUtils.checkColumnIndex(this, column);
@@ -485,6 +509,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public void setColumnMatrix(final int column, final RealMatrix matrix)
throws OutOfRangeException, MatrixDimensionMismatchException {
MatrixUtils.checkColumnIndex(this, column);
@@ -501,12 +526,14 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public RealVector getRowVector(final int row)
throws OutOfRangeException {
return new ArrayRealVector(getRow(row), false);
}
/** {@inheritDoc} */
+ @Override
public void setRowVector(final int row, final RealVector vector)
throws OutOfRangeException, MatrixDimensionMismatchException {
MatrixUtils.checkRowIndex(this, row);
@@ -521,12 +548,14 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public RealVector getColumnVector(final int column)
throws OutOfRangeException {
return new ArrayRealVector(getColumn(column), false);
}
/** {@inheritDoc} */
+ @Override
public void setColumnVector(final int column, final RealVector vector)
throws OutOfRangeException, MatrixDimensionMismatchException {
MatrixUtils.checkColumnIndex(this, column);
@@ -541,6 +570,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public double[] getRow(final int row) throws OutOfRangeException {
MatrixUtils.checkRowIndex(this, row);
final int nCols = getColumnDimension();
@@ -553,6 +583,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public void setRow(final int row, final double[] array)
throws OutOfRangeException, MatrixDimensionMismatchException {
MatrixUtils.checkRowIndex(this, row);
@@ -566,6 +597,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public double[] getColumn(final int column) throws OutOfRangeException {
MatrixUtils.checkColumnIndex(this, column);
final int nRows = getRowDimension();
@@ -578,6 +610,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public void setColumn(final int column, final double[] array)
throws OutOfRangeException, MatrixDimensionMismatchException {
MatrixUtils.checkColumnIndex(this, column);
@@ -591,6 +624,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public void addToEntry(int row, int column, double increment)
throws OutOfRangeException {
MatrixUtils.checkMatrixIndex(this, row, column);
@@ -598,6 +632,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public void multiplyEntry(int row, int column, double factor)
throws OutOfRangeException {
MatrixUtils.checkMatrixIndex(this, row, column);
@@ -605,6 +640,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public RealMatrix transpose() {
final int nRows = getRowDimension();
final int nCols = getColumnDimension();
@@ -623,6 +659,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public boolean isSquare() {
return getColumnDimension() == getRowDimension();
}
@@ -644,6 +681,7 @@ public abstract class AbstractRealMatrix
public abstract int getColumnDimension();
/** {@inheritDoc} */
+ @Override
public double getTrace() throws NonSquareMatrixException {
final int nRows = getRowDimension();
final int nCols = getColumnDimension();
@@ -658,6 +696,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public double[] operate(final double[] v)
throws DimensionMismatchException {
final int nRows = getRowDimension();
@@ -705,6 +744,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public double[] preMultiply(final double[] v) throws DimensionMismatchException {
final int nRows = getRowDimension();
@@ -726,6 +766,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public RealVector preMultiply(final RealVector v) throws DimensionMismatchException {
try {
return new ArrayRealVector(preMultiply(((ArrayRealVector) v).getDataRef()), false);
@@ -751,6 +792,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public double walkInRowOrder(final RealMatrixChangingVisitor visitor) {
final int rows = getRowDimension();
final int columns = getColumnDimension();
@@ -766,6 +808,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public double walkInRowOrder(final RealMatrixPreservingVisitor visitor) {
final int rows = getRowDimension();
final int columns = getColumnDimension();
@@ -779,6 +822,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public double walkInRowOrder(final RealMatrixChangingVisitor visitor,
final int startRow, final int endRow,
final int startColumn, final int endColumn)
@@ -797,6 +841,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public double walkInRowOrder(final RealMatrixPreservingVisitor visitor,
final int startRow, final int endRow,
final int startColumn, final int endColumn)
@@ -813,6 +858,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public double walkInColumnOrder(final RealMatrixChangingVisitor visitor) {
final int rows = getRowDimension();
final int columns = getColumnDimension();
@@ -828,6 +874,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public double walkInColumnOrder(final RealMatrixPreservingVisitor visitor) {
final int rows = getRowDimension();
final int columns = getColumnDimension();
@@ -841,6 +888,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public double walkInColumnOrder(final RealMatrixChangingVisitor visitor,
final int startRow, final int endRow,
final int startColumn, final int endColumn)
@@ -859,6 +907,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public double walkInColumnOrder(final RealMatrixPreservingVisitor visitor,
final int startRow, final int endRow,
final int startColumn, final int endColumn)
@@ -875,16 +924,19 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public double walkInOptimizedOrder(final RealMatrixChangingVisitor visitor) {
return walkInRowOrder(visitor);
}
/** {@inheritDoc} */
+ @Override
public double walkInOptimizedOrder(final RealMatrixPreservingVisitor visitor) {
return walkInRowOrder(visitor);
}
/** {@inheritDoc} */
+ @Override
public double walkInOptimizedOrder(final RealMatrixChangingVisitor visitor,
final int startRow, final int endRow,
final int startColumn,
@@ -894,6 +946,7 @@ public abstract class AbstractRealMatrix
}
/** {@inheritDoc} */
+ @Override
public double walkInOptimizedOrder(final RealMatrixPreservingVisitor visitor,
final int startRow, final int endRow,
final int startColumn,
@@ -976,17 +1029,21 @@ public abstract class AbstractRealMatrix
*/
/** {@inheritDoc} */
+ @Override
public abstract RealMatrix createMatrix(int rowDimension, int columnDimension)
throws NotStrictlyPositiveException;
/** {@inheritDoc} */
+ @Override
public abstract RealMatrix copy();
/** {@inheritDoc} */
+ @Override
public abstract double getEntry(int row, int column)
throws OutOfRangeException;
/** {@inheritDoc} */
+ @Override
public abstract void setEntry(int row, int column, double value)
throws OutOfRangeException;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/linear/ArrayFieldVector.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/linear/ArrayFieldVector.java b/src/main/java/org/apache/commons/math4/linear/ArrayFieldVector.java
index 191b685..b2240e6 100644
--- a/src/main/java/org/apache/commons/math4/linear/ArrayFieldVector.java
+++ b/src/main/java/org/apache/commons/math4/linear/ArrayFieldVector.java
@@ -380,16 +380,19 @@ public class ArrayFieldVector<T extends FieldElement<T>> implements FieldVector<
}
/** {@inheritDoc} */
+ @Override
public Field<T> getField() {
return field;
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> copy() {
return new ArrayFieldVector<T>(this, true);
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> add(FieldVector<T> v)
throws DimensionMismatchException {
try {
@@ -422,6 +425,7 @@ public class ArrayFieldVector<T extends FieldElement<T>> implements FieldVector<
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> subtract(FieldVector<T> v)
throws DimensionMismatchException {
try {
@@ -454,6 +458,7 @@ public class ArrayFieldVector<T extends FieldElement<T>> implements FieldVector<
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> mapAdd(T d) throws NullArgumentException {
T[] out = MathArrays.buildArray(field, data.length);
for (int i = 0; i < data.length; i++) {
@@ -463,6 +468,7 @@ public class ArrayFieldVector<T extends FieldElement<T>> implements FieldVector<
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> mapAddToSelf(T d) throws NullArgumentException {
for (int i = 0; i < data.length; i++) {
data[i] = data[i].add(d);
@@ -471,6 +477,7 @@ public class ArrayFieldVector<T extends FieldElement<T>> implements FieldVector<
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> mapSubtract(T d) throws NullArgumentException {
T[] out = MathArrays.buildArray(field, data.length);
for (int i = 0; i < data.length; i++) {
@@ -480,6 +487,7 @@ public class ArrayFieldVector<T extends FieldElement<T>> implements FieldVector<
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> mapSubtractToSelf(T d) throws NullArgumentException {
for (int i = 0; i < data.length; i++) {
data[i] = data[i].subtract(d);
@@ -488,6 +496,7 @@ public class ArrayFieldVector<T extends FieldElement<T>> implements FieldVector<
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> mapMultiply(T d) throws NullArgumentException {
T[] out = MathArrays.buildArray(field, data.length);
for (int i = 0; i < data.length; i++) {
@@ -497,6 +506,7 @@ public class ArrayFieldVector<T extends FieldElement<T>> implements FieldVector<
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> mapMultiplyToSelf(T d) throws NullArgumentException {
for (int i = 0; i < data.length; i++) {
data[i] = data[i].multiply(d);
@@ -505,6 +515,7 @@ public class ArrayFieldVector<T extends FieldElement<T>> implements FieldVector<
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> mapDivide(T d)
throws NullArgumentException, MathArithmeticException {
MathUtils.checkNotNull(d);
@@ -516,6 +527,7 @@ public class ArrayFieldVector<T extends FieldElement<T>> implements FieldVector<
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> mapDivideToSelf(T d)
throws NullArgumentException, MathArithmeticException {
MathUtils.checkNotNull(d);
@@ -526,6 +538,7 @@ public class ArrayFieldVector<T extends FieldElement<T>> implements FieldVector<
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> mapInv() throws MathArithmeticException {
T[] out = MathArrays.buildArray(field, data.length);
final T one = field.getOne();
@@ -540,6 +553,7 @@ public class ArrayFieldVector<T extends FieldElement<T>> implements FieldVector<
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> mapInvToSelf() throws MathArithmeticException {
final T one = field.getOne();
for (int i = 0; i < data.length; i++) {
@@ -553,6 +567,7 @@ public class ArrayFieldVector<T extends FieldElement<T>> implements FieldVector<
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> ebeMultiply(FieldVector<T> v)
throws DimensionMismatchException {
try {
@@ -585,6 +600,7 @@ public class ArrayFieldVector<T extends FieldElement<T>> implements FieldVector<
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> ebeDivide(FieldVector<T> v)
throws DimensionMismatchException, MathArithmeticException {
try {
@@ -635,6 +651,7 @@ public class ArrayFieldVector<T extends FieldElement<T>> implements FieldVector<
}
/** {@inheritDoc} */
+ @Override
public T dotProduct(FieldVector<T> v)
throws DimensionMismatchException {
try {
@@ -667,6 +684,7 @@ public class ArrayFieldVector<T extends FieldElement<T>> implements FieldVector<
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> projection(FieldVector<T> v)
throws DimensionMismatchException, MathArithmeticException {
return v.mapMultiply(dotProduct(v).divide(v.dotProduct(v)));
@@ -685,6 +703,7 @@ public class ArrayFieldVector<T extends FieldElement<T>> implements FieldVector<
}
/** {@inheritDoc} */
+ @Override
public FieldMatrix<T> outerProduct(FieldVector<T> v) {
try {
return outerProduct((ArrayFieldVector<T>) v);
@@ -719,16 +738,19 @@ public class ArrayFieldVector<T extends FieldElement<T>> implements FieldVector<
}
/** {@inheritDoc} */
+ @Override
public T getEntry(int index) {
return data[index];
}
/** {@inheritDoc} */
+ @Override
public int getDimension() {
return data.length;
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> append(FieldVector<T> v) {
try {
return append((ArrayFieldVector<T>) v);
@@ -747,6 +769,7 @@ public class ArrayFieldVector<T extends FieldElement<T>> implements FieldVector<
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> append(T in) {
final T[] out = MathArrays.buildArray(field, data.length + 1);
System.arraycopy(data, 0, out, 0, data.length);
@@ -755,6 +778,7 @@ public class ArrayFieldVector<T extends FieldElement<T>> implements FieldVector<
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> getSubVector(int index, int n)
throws OutOfRangeException, NotPositiveException {
if (n < 0) {
@@ -771,6 +795,7 @@ public class ArrayFieldVector<T extends FieldElement<T>> implements FieldVector<
}
/** {@inheritDoc} */
+ @Override
public void setEntry(int index, T value) {
try {
data[index] = value;
@@ -780,6 +805,7 @@ public class ArrayFieldVector<T extends FieldElement<T>> implements FieldVector<
}
/** {@inheritDoc} */
+ @Override
public void setSubVector(int index, FieldVector<T> v) throws OutOfRangeException {
try {
try {
@@ -812,11 +838,13 @@ public class ArrayFieldVector<T extends FieldElement<T>> implements FieldVector<
}
/** {@inheritDoc} */
+ @Override
public void set(T value) {
Arrays.fill(data, value);
}
/** {@inheritDoc} */
+ @Override
public T[] toArray(){
return data.clone();
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/linear/CholeskyDecomposition.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/linear/CholeskyDecomposition.java b/src/main/java/org/apache/commons/math4/linear/CholeskyDecomposition.java
index 66d5260..520c15e 100644
--- a/src/main/java/org/apache/commons/math4/linear/CholeskyDecomposition.java
+++ b/src/main/java/org/apache/commons/math4/linear/CholeskyDecomposition.java
@@ -216,12 +216,14 @@ public class CholeskyDecomposition {
}
/** {@inheritDoc} */
+ @Override
public boolean isNonSingular() {
// if we get this far, the matrix was positive definite, hence non-singular
return true;
}
/** {@inheritDoc} */
+ @Override
public RealVector solve(final RealVector b) {
final int m = lTData.length;
if (b.getDimension() != m) {
@@ -253,6 +255,7 @@ public class CholeskyDecomposition {
}
/** {@inheritDoc} */
+ @Override
public RealMatrix solve(RealMatrix b) {
final int m = lTData.length;
if (b.getRowDimension() != m) {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/linear/DefaultFieldMatrixChangingVisitor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/linear/DefaultFieldMatrixChangingVisitor.java b/src/main/java/org/apache/commons/math4/linear/DefaultFieldMatrixChangingVisitor.java
index 7c93429..a9abded 100644
--- a/src/main/java/org/apache/commons/math4/linear/DefaultFieldMatrixChangingVisitor.java
+++ b/src/main/java/org/apache/commons/math4/linear/DefaultFieldMatrixChangingVisitor.java
@@ -42,16 +42,19 @@ public class DefaultFieldMatrixChangingVisitor<T extends FieldElement<T>>
}
/** {@inheritDoc} */
+ @Override
public void start(int rows, int columns,
int startRow, int endRow, int startColumn, int endColumn) {
}
/** {@inheritDoc} */
+ @Override
public T visit(int row, int column, T value) {
return value;
}
/** {@inheritDoc} */
+ @Override
public T end() {
return zero;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/linear/DefaultFieldMatrixPreservingVisitor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/linear/DefaultFieldMatrixPreservingVisitor.java b/src/main/java/org/apache/commons/math4/linear/DefaultFieldMatrixPreservingVisitor.java
index 1e8e14f..ab924b9 100644
--- a/src/main/java/org/apache/commons/math4/linear/DefaultFieldMatrixPreservingVisitor.java
+++ b/src/main/java/org/apache/commons/math4/linear/DefaultFieldMatrixPreservingVisitor.java
@@ -42,14 +42,17 @@ public class DefaultFieldMatrixPreservingVisitor<T extends FieldElement<T>>
}
/** {@inheritDoc} */
+ @Override
public void start(int rows, int columns,
int startRow, int endRow, int startColumn, int endColumn) {
}
/** {@inheritDoc} */
+ @Override
public void visit(int row, int column, T value) {}
/** {@inheritDoc} */
+ @Override
public T end() {
return zero;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/linear/DefaultRealMatrixChangingVisitor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/linear/DefaultRealMatrixChangingVisitor.java b/src/main/java/org/apache/commons/math4/linear/DefaultRealMatrixChangingVisitor.java
index 04db987..0e091bb 100644
--- a/src/main/java/org/apache/commons/math4/linear/DefaultRealMatrixChangingVisitor.java
+++ b/src/main/java/org/apache/commons/math4/linear/DefaultRealMatrixChangingVisitor.java
@@ -28,16 +28,19 @@ package org.apache.commons.math4.linear;
*/
public class DefaultRealMatrixChangingVisitor implements RealMatrixChangingVisitor {
/** {@inheritDoc} */
+ @Override
public void start(int rows, int columns,
int startRow, int endRow, int startColumn, int endColumn) {
}
/** {@inheritDoc} */
+ @Override
public double visit(int row, int column, double value) {
return value;
}
/** {@inheritDoc} */
+ @Override
public double end() {
return 0;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/linear/DefaultRealMatrixPreservingVisitor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/linear/DefaultRealMatrixPreservingVisitor.java b/src/main/java/org/apache/commons/math4/linear/DefaultRealMatrixPreservingVisitor.java
index ac6dcfe..7e5c3ac 100644
--- a/src/main/java/org/apache/commons/math4/linear/DefaultRealMatrixPreservingVisitor.java
+++ b/src/main/java/org/apache/commons/math4/linear/DefaultRealMatrixPreservingVisitor.java
@@ -28,14 +28,17 @@ package org.apache.commons.math4.linear;
*/
public class DefaultRealMatrixPreservingVisitor implements RealMatrixPreservingVisitor {
/** {@inheritDoc} */
+ @Override
public void start(int rows, int columns,
int startRow, int endRow, int startColumn, int endColumn) {
}
/** {@inheritDoc} */
+ @Override
public void visit(int row, int column, double value) {}
/** {@inheritDoc} */
+ @Override
public double end() {
return 0;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/linear/EigenDecomposition.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/linear/EigenDecomposition.java b/src/main/java/org/apache/commons/math4/linear/EigenDecomposition.java
index 5118a61..332320c 100644
--- a/src/main/java/org/apache/commons/math4/linear/EigenDecomposition.java
+++ b/src/main/java/org/apache/commons/math4/linear/EigenDecomposition.java
@@ -434,6 +434,7 @@ public class EigenDecomposition {
}
/** {@inheritDoc} */
+ @Override
public RealMatrix solve(RealMatrix b) {
if (!isNonSingular()) {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/linear/FieldLUDecomposition.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/linear/FieldLUDecomposition.java b/src/main/java/org/apache/commons/math4/linear/FieldLUDecomposition.java
index 8c23ce6..101c315 100644
--- a/src/main/java/org/apache/commons/math4/linear/FieldLUDecomposition.java
+++ b/src/main/java/org/apache/commons/math4/linear/FieldLUDecomposition.java
@@ -287,11 +287,13 @@ public class FieldLUDecomposition<T extends FieldElement<T>> {
}
/** {@inheritDoc} */
+ @Override
public boolean isNonSingular() {
return !singular;
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> solve(FieldVector<T> b) {
try {
return solve((ArrayFieldVector<T>) b);
@@ -377,6 +379,7 @@ public class FieldLUDecomposition<T extends FieldElement<T>> {
}
/** {@inheritDoc} */
+ @Override
public FieldMatrix<T> solve(FieldMatrix<T> b) {
final int m = pivot.length;
if (b.getRowDimension() != m) {
@@ -431,6 +434,7 @@ public class FieldLUDecomposition<T extends FieldElement<T>> {
}
/** {@inheritDoc} */
+ @Override
public FieldMatrix<T> getInverse() {
final int m = pivot.length;
final T one = field.getOne();
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/linear/LUDecomposition.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/linear/LUDecomposition.java b/src/main/java/org/apache/commons/math4/linear/LUDecomposition.java
index 6fbc57a..397898e 100644
--- a/src/main/java/org/apache/commons/math4/linear/LUDecomposition.java
+++ b/src/main/java/org/apache/commons/math4/linear/LUDecomposition.java
@@ -282,11 +282,13 @@ public class LUDecomposition {
}
/** {@inheritDoc} */
+ @Override
public boolean isNonSingular() {
return !singular;
}
/** {@inheritDoc} */
+ @Override
public RealVector solve(RealVector b) {
final int m = pivot.length;
if (b.getDimension() != m) {
@@ -324,6 +326,7 @@ public class LUDecomposition {
}
/** {@inheritDoc} */
+ @Override
public RealMatrix solve(RealMatrix b) {
final int m = pivot.length;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/linear/OpenMapRealVector.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/linear/OpenMapRealVector.java b/src/main/java/org/apache/commons/math4/linear/OpenMapRealVector.java
index 6928b93..48136d9 100644
--- a/src/main/java/org/apache/commons/math4/linear/OpenMapRealVector.java
+++ b/src/main/java/org/apache/commons/math4/linear/OpenMapRealVector.java
@@ -791,17 +791,20 @@ public class OpenMapRealVector extends SparseRealVector
}
/** {@inheritDoc} */
+ @Override
public boolean hasNext() {
return iter.hasNext();
}
/** {@inheritDoc} */
+ @Override
public Entry next() {
iter.advance();
return current;
}
/** {@inheritDoc} */
+ @Override
public void remove() {
throw new UnsupportedOperationException("Not supported");
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/linear/RRQRDecomposition.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/linear/RRQRDecomposition.java b/src/main/java/org/apache/commons/math4/linear/RRQRDecomposition.java
index 857cce0..f85b22e 100644
--- a/src/main/java/org/apache/commons/math4/linear/RRQRDecomposition.java
+++ b/src/main/java/org/apache/commons/math4/linear/RRQRDecomposition.java
@@ -219,16 +219,19 @@ public class RRQRDecomposition extends QRDecomposition {
}
/** {@inheritDoc} */
+ @Override
public boolean isNonSingular() {
return upper.isNonSingular();
}
/** {@inheritDoc} */
+ @Override
public RealVector solve(RealVector b) {
return p.operate(upper.solve(b));
}
/** {@inheritDoc} */
+ @Override
public RealMatrix solve(RealMatrix b) {
return p.multiply(upper.solve(b));
}
@@ -237,6 +240,7 @@ public class RRQRDecomposition extends QRDecomposition {
* {@inheritDoc}
* @throws SingularMatrixException if the decomposed matrix is singular.
*/
+ @Override
public RealMatrix getInverse() {
return solve(MatrixUtils.createRealIdentityMatrix(p.getRowDimension()));
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/linear/RealVector.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/linear/RealVector.java b/src/main/java/org/apache/commons/math4/linear/RealVector.java
index 2d0a1b9..545a521 100644
--- a/src/main/java/org/apache/commons/math4/linear/RealVector.java
+++ b/src/main/java/org/apache/commons/math4/linear/RealVector.java
@@ -759,11 +759,13 @@ public abstract class RealVector {
private Entry e = new Entry();
/** {@inheritDoc} */
+ @Override
public boolean hasNext() {
return i < dim;
}
/** {@inheritDoc} */
+ @Override
public Entry next() {
if (i < dim) {
e.setIndex(i++);
@@ -778,6 +780,7 @@ public abstract class RealVector {
*
* @throws MathUnsupportedOperationException in all circumstances.
*/
+ @Override
public void remove() throws MathUnsupportedOperationException {
throw new MathUnsupportedOperationException();
}
@@ -1159,11 +1162,13 @@ public abstract class RealVector {
}
/** {@inheritDoc} */
+ @Override
public boolean hasNext() {
return next.getIndex() >= 0;
}
/** {@inheritDoc} */
+ @Override
public Entry next() {
int index = next.getIndex();
if (index < 0) {
@@ -1179,6 +1184,7 @@ public abstract class RealVector {
*
* @throws MathUnsupportedOperationException in all circumstances.
*/
+ @Override
public void remove() throws MathUnsupportedOperationException {
throw new MathUnsupportedOperationException();
}
@@ -1239,11 +1245,13 @@ public abstract class RealVector {
private final UnmodifiableEntry e = new UnmodifiableEntry();
/** {@inheritDoc} */
+ @Override
public boolean hasNext() {
return i.hasNext();
}
/** {@inheritDoc} */
+ @Override
public Entry next() {
e.setIndex(i.next().getIndex());
return e;
@@ -1255,6 +1263,7 @@ public abstract class RealVector {
* @throws MathUnsupportedOperationException in all
* circumstances.
*/
+ @Override
public void remove() throws MathUnsupportedOperationException {
throw new MathUnsupportedOperationException();
}
@@ -1271,11 +1280,13 @@ public abstract class RealVector {
private final UnmodifiableEntry e = new UnmodifiableEntry();
/** {@inheritDoc} */
+ @Override
public boolean hasNext() {
return i.hasNext();
}
/** {@inheritDoc} */
+ @Override
public Entry next() {
e.setIndex(i.next().getIndex());
return e;
@@ -1287,6 +1298,7 @@ public abstract class RealVector {
* @throws MathUnsupportedOperationException in all
* circumstances.
*/
+ @Override
public void remove()
throws MathUnsupportedOperationException {
throw new MathUnsupportedOperationException();
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/linear/SparseFieldVector.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/linear/SparseFieldVector.java b/src/main/java/org/apache/commons/math4/linear/SparseFieldVector.java
index f95fdbe..7065f10 100644
--- a/src/main/java/org/apache/commons/math4/linear/SparseFieldVector.java
+++ b/src/main/java/org/apache/commons/math4/linear/SparseFieldVector.java
@@ -189,6 +189,7 @@ public class SparseFieldVector<T extends FieldElement<T>> implements FieldVector
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> append(FieldVector<T> v) {
if (v instanceof SparseFieldVector<?>) {
return append((SparseFieldVector<T>) v);
@@ -205,6 +206,7 @@ public class SparseFieldVector<T extends FieldElement<T>> implements FieldVector
/** {@inheritDoc}
* @exception NullArgumentException if d is null
*/
+ @Override
public FieldVector<T> append(T d) throws NullArgumentException {
MathUtils.checkNotNull(d);
FieldVector<T> res = new SparseFieldVector<T>(this, 1);
@@ -213,11 +215,13 @@ public class SparseFieldVector<T extends FieldElement<T>> implements FieldVector
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> copy() {
return new SparseFieldVector<T>(this);
}
/** {@inheritDoc} */
+ @Override
public T dotProduct(FieldVector<T> v) throws DimensionMismatchException {
checkVectorDimensions(v.getDimension());
T res = field.getZero();
@@ -230,6 +234,7 @@ public class SparseFieldVector<T extends FieldElement<T>> implements FieldVector
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> ebeDivide(FieldVector<T> v)
throws DimensionMismatchException, MathArithmeticException {
checkVectorDimensions(v.getDimension());
@@ -243,6 +248,7 @@ public class SparseFieldVector<T extends FieldElement<T>> implements FieldVector
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> ebeMultiply(FieldVector<T> v)
throws DimensionMismatchException {
checkVectorDimensions(v.getDimension());
@@ -256,22 +262,26 @@ public class SparseFieldVector<T extends FieldElement<T>> implements FieldVector
}
/** {@inheritDoc} */
+ @Override
public int getDimension() {
return virtualSize;
}
/** {@inheritDoc} */
+ @Override
public T getEntry(int index) throws OutOfRangeException {
checkIndex(index);
return entries.get(index);
}
/** {@inheritDoc} */
+ @Override
public Field<T> getField() {
return field;
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> getSubVector(int index, int n)
throws OutOfRangeException, NotPositiveException {
if (n < 0) {
@@ -293,11 +303,13 @@ public class SparseFieldVector<T extends FieldElement<T>> implements FieldVector
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> mapAdd(T d) throws NullArgumentException {
return copy().mapAddToSelf(d);
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> mapAddToSelf(T d) throws NullArgumentException {
for (int i = 0; i < virtualSize; i++) {
setEntry(i, getEntry(i).add(d));
@@ -306,12 +318,14 @@ public class SparseFieldVector<T extends FieldElement<T>> implements FieldVector
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> mapDivide(T d)
throws NullArgumentException, MathArithmeticException {
return copy().mapDivideToSelf(d);
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> mapDivideToSelf(T d)
throws NullArgumentException, MathArithmeticException {
OpenIntToFieldHashMap<T>.Iterator iter = entries.iterator();
@@ -323,11 +337,13 @@ public class SparseFieldVector<T extends FieldElement<T>> implements FieldVector
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> mapInv() throws MathArithmeticException {
return copy().mapInvToSelf();
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> mapInvToSelf() throws MathArithmeticException {
for (int i = 0; i < virtualSize; i++) {
setEntry(i, field.getOne().divide(getEntry(i)));
@@ -336,11 +352,13 @@ public class SparseFieldVector<T extends FieldElement<T>> implements FieldVector
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> mapMultiply(T d) throws NullArgumentException {
return copy().mapMultiplyToSelf(d);
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> mapMultiplyToSelf(T d) throws NullArgumentException {
OpenIntToFieldHashMap<T>.Iterator iter = entries.iterator();
while (iter.hasNext()) {
@@ -351,11 +369,13 @@ public class SparseFieldVector<T extends FieldElement<T>> implements FieldVector
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> mapSubtract(T d) throws NullArgumentException {
return copy().mapSubtractToSelf(d);
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> mapSubtractToSelf(T d) throws NullArgumentException {
return mapAddToSelf(field.getZero().subtract(d));
}
@@ -381,6 +401,7 @@ public class SparseFieldVector<T extends FieldElement<T>> implements FieldVector
}
/** {@inheritDoc} */
+ @Override
public FieldMatrix<T> outerProduct(FieldVector<T> v) {
if (v instanceof SparseFieldVector<?>) {
return outerProduct((SparseFieldVector<T>)v);
@@ -401,6 +422,7 @@ public class SparseFieldVector<T extends FieldElement<T>> implements FieldVector
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> projection(FieldVector<T> v)
throws DimensionMismatchException, MathArithmeticException {
checkVectorDimensions(v.getDimension());
@@ -410,6 +432,7 @@ public class SparseFieldVector<T extends FieldElement<T>> implements FieldVector
/** {@inheritDoc}
* @exception NullArgumentException if value is null
*/
+ @Override
public void set(T value) {
MathUtils.checkNotNull(value);
for (int i = 0; i < virtualSize; i++) {
@@ -420,6 +443,7 @@ public class SparseFieldVector<T extends FieldElement<T>> implements FieldVector
/** {@inheritDoc}
* @exception NullArgumentException if value is null
*/
+ @Override
public void setEntry(int index, T value) throws NullArgumentException, OutOfRangeException {
MathUtils.checkNotNull(value);
checkIndex(index);
@@ -427,6 +451,7 @@ public class SparseFieldVector<T extends FieldElement<T>> implements FieldVector
}
/** {@inheritDoc} */
+ @Override
public void setSubVector(int index, FieldVector<T> v)
throws OutOfRangeException {
checkIndex(index);
@@ -462,6 +487,7 @@ public class SparseFieldVector<T extends FieldElement<T>> implements FieldVector
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> subtract(FieldVector<T> v)
throws DimensionMismatchException {
if (v instanceof SparseFieldVector<?>) {
@@ -482,6 +508,7 @@ public class SparseFieldVector<T extends FieldElement<T>> implements FieldVector
}
/** {@inheritDoc} */
+ @Override
public T[] toArray() {
T[] res = MathArrays.buildArray(field, virtualSize);
OpenIntToFieldHashMap<T>.Iterator iter = entries.iterator();
@@ -544,6 +571,7 @@ public class SparseFieldVector<T extends FieldElement<T>> implements FieldVector
}
/** {@inheritDoc} */
+ @Override
public FieldVector<T> add(FieldVector<T> v) throws DimensionMismatchException {
if (v instanceof SparseFieldVector<?>) {
return add((SparseFieldVector<T>) v);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/ml/neuralnet/FeatureInitializerFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ml/neuralnet/FeatureInitializerFactory.java b/src/main/java/org/apache/commons/math4/ml/neuralnet/FeatureInitializerFactory.java
index 1521a60..1729e42 100644
--- a/src/main/java/org/apache/commons/math4/ml/neuralnet/FeatureInitializerFactory.java
+++ b/src/main/java/org/apache/commons/math4/ml/neuralnet/FeatureInitializerFactory.java
@@ -86,6 +86,7 @@ public class FeatureInitializerFactory {
private double arg = init;
/** {@inheritDoc} */
+ @Override
public double value() {
final double result = f.value(arg);
arg += inc;
@@ -106,6 +107,7 @@ public class FeatureInitializerFactory {
final FeatureInitializer orig) {
return new FeatureInitializer() {
/** {@inheritDoc} */
+ @Override
public double value() {
return orig.value() + random.sample();
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/ml/neuralnet/Network.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ml/neuralnet/Network.java b/src/main/java/org/apache/commons/math4/ml/neuralnet/Network.java
index 89d335f..5520063 100644
--- a/src/main/java/org/apache/commons/math4/ml/neuralnet/Network.java
+++ b/src/main/java/org/apache/commons/math4/ml/neuralnet/Network.java
@@ -70,6 +70,7 @@ public class Network
private static final long serialVersionUID = 20130207L;
/** {@inheritDoc} */
+ @Override
public int compare(Neuron a,
Neuron b) {
final long aId = a.getIdentifier();
@@ -138,6 +139,7 @@ public class Network
/**
* {@inheritDoc}
*/
+ @Override
public Iterator<Neuron> iterator() {
return neuronMap.values().iterator();
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/ml/neuralnet/sofm/KohonenTrainingTask.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ml/neuralnet/sofm/KohonenTrainingTask.java b/src/main/java/org/apache/commons/math4/ml/neuralnet/sofm/KohonenTrainingTask.java
index 0e0fcab..8f17335 100644
--- a/src/main/java/org/apache/commons/math4/ml/neuralnet/sofm/KohonenTrainingTask.java
+++ b/src/main/java/org/apache/commons/math4/ml/neuralnet/sofm/KohonenTrainingTask.java
@@ -52,6 +52,7 @@ public class KohonenTrainingTask implements Runnable {
/**
* {@inheritDoc}
*/
+ @Override
public void run() {
while (featuresIterator.hasNext()) {
updateAction.update(net, featuresIterator.next());
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/ml/neuralnet/sofm/KohonenUpdateAction.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ml/neuralnet/sofm/KohonenUpdateAction.java b/src/main/java/org/apache/commons/math4/ml/neuralnet/sofm/KohonenUpdateAction.java
index f09ed24..ffe6943 100644
--- a/src/main/java/org/apache/commons/math4/ml/neuralnet/sofm/KohonenUpdateAction.java
+++ b/src/main/java/org/apache/commons/math4/ml/neuralnet/sofm/KohonenUpdateAction.java
@@ -92,6 +92,7 @@ public class KohonenUpdateAction implements UpdateAction {
/**
* {@inheritDoc}
*/
+ @Override
public void update(Network net,
double[] features) {
final long numCalls = numberOfCalls.incrementAndGet();
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/ml/neuralnet/sofm/LearningFactorFunctionFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ml/neuralnet/sofm/LearningFactorFunctionFactory.java b/src/main/java/org/apache/commons/math4/ml/neuralnet/sofm/LearningFactorFunctionFactory.java
index 0371475..1f3ccd8 100644
--- a/src/main/java/org/apache/commons/math4/ml/neuralnet/sofm/LearningFactorFunctionFactory.java
+++ b/src/main/java/org/apache/commons/math4/ml/neuralnet/sofm/LearningFactorFunctionFactory.java
@@ -68,6 +68,7 @@ public class LearningFactorFunctionFactory {
= new ExponentialDecayFunction(initValue, valueAtNumCall, numCall);
/** {@inheritDoc} */
+ @Override
public double value(long n) {
return decay.value(n);
}
@@ -109,6 +110,7 @@ public class LearningFactorFunctionFactory {
= new QuasiSigmoidDecayFunction(initValue, slope, numCall);
/** {@inheritDoc} */
+ @Override
public double value(long n) {
return decay.value(n);
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/ml/neuralnet/sofm/NeighbourhoodSizeFunctionFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ml/neuralnet/sofm/NeighbourhoodSizeFunctionFactory.java b/src/main/java/org/apache/commons/math4/ml/neuralnet/sofm/NeighbourhoodSizeFunctionFactory.java
index e87a973..73f6d67 100644
--- a/src/main/java/org/apache/commons/math4/ml/neuralnet/sofm/NeighbourhoodSizeFunctionFactory.java
+++ b/src/main/java/org/apache/commons/math4/ml/neuralnet/sofm/NeighbourhoodSizeFunctionFactory.java
@@ -63,6 +63,7 @@ public class NeighbourhoodSizeFunctionFactory {
= new ExponentialDecayFunction(initValue, valueAtNumCall, numCall);
/** {@inheritDoc} */
+ @Override
public int value(long n) {
return (int) FastMath.rint(decay.value(n));
}
@@ -99,6 +100,7 @@ public class NeighbourhoodSizeFunctionFactory {
= new QuasiSigmoidDecayFunction(initValue, slope, numCall);
/** {@inheritDoc} */
+ @Override
public int value(long n) {
return (int) FastMath.rint(decay.value(n));
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/ode/AbstractIntegrator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/AbstractIntegrator.java b/src/main/java/org/apache/commons/math4/ode/AbstractIntegrator.java
index 9d23fe2..b9127ad 100644
--- a/src/main/java/org/apache/commons/math4/ode/AbstractIntegrator.java
+++ b/src/main/java/org/apache/commons/math4/ode/AbstractIntegrator.java
@@ -99,26 +99,31 @@ public abstract class AbstractIntegrator implements FirstOrderIntegrator {
}
/** {@inheritDoc} */
+ @Override
public String getName() {
return name;
}
/** {@inheritDoc} */
+ @Override
public void addStepHandler(final StepHandler handler) {
stepHandlers.add(handler);
}
/** {@inheritDoc} */
+ @Override
public Collection<StepHandler> getStepHandlers() {
return Collections.unmodifiableCollection(stepHandlers);
}
/** {@inheritDoc} */
+ @Override
public void clearStepHandlers() {
stepHandlers.clear();
}
/** {@inheritDoc} */
+ @Override
public void addEventHandler(final EventHandler handler,
final double maxCheckInterval,
final double convergence,
@@ -129,6 +134,7 @@ public abstract class AbstractIntegrator implements FirstOrderIntegrator {
}
/** {@inheritDoc} */
+ @Override
public void addEventHandler(final EventHandler handler,
final double maxCheckInterval,
final double convergence,
@@ -139,6 +145,7 @@ public abstract class AbstractIntegrator implements FirstOrderIntegrator {
}
/** {@inheritDoc} */
+ @Override
public Collection<EventHandler> getEventHandlers() {
final List<EventHandler> list = new ArrayList<EventHandler>(eventsStates.size());
for (EventState state : eventsStates) {
@@ -148,31 +155,37 @@ public abstract class AbstractIntegrator implements FirstOrderIntegrator {
}
/** {@inheritDoc} */
+ @Override
public void clearEventHandlers() {
eventsStates.clear();
}
/** {@inheritDoc} */
+ @Override
public double getCurrentStepStart() {
return stepStart;
}
/** {@inheritDoc} */
+ @Override
public double getCurrentSignedStepsize() {
return stepSize;
}
/** {@inheritDoc} */
+ @Override
public void setMaxEvaluations(int maxEvaluations) {
evaluations.setMaximalCount((maxEvaluations < 0) ? Integer.MAX_VALUE : maxEvaluations);
}
/** {@inheritDoc} */
+ @Override
public int getMaxEvaluations() {
return evaluations.getMaximalCount();
}
/** {@inheritDoc} */
+ @Override
public int getEvaluations() {
return evaluations.getCount();
}
@@ -223,6 +236,7 @@ public abstract class AbstractIntegrator implements FirstOrderIntegrator {
}
/** {@inheritDoc} */
+ @Override
public double integrate(final FirstOrderDifferentialEquations equations,
final double t0, final double[] y0, final double t, final double[] y)
throws DimensionMismatchException, NumberIsTooSmallException,
@@ -329,6 +343,7 @@ public abstract class AbstractIntegrator implements FirstOrderIntegrator {
SortedSet<EventState> occurringEvents = new TreeSet<EventState>(new Comparator<EventState>() {
/** {@inheritDoc} */
+ @Override
public int compare(EventState es0, EventState es1) {
return orderingSign * Double.compare(es0.getEventTime(), es1.getEventTime());
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/ode/AbstractParameterizable.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/AbstractParameterizable.java b/src/main/java/org/apache/commons/math4/ode/AbstractParameterizable.java
index baa5cbb..5b4aea7 100644
--- a/src/main/java/org/apache/commons/math4/ode/AbstractParameterizable.java
+++ b/src/main/java/org/apache/commons/math4/ode/AbstractParameterizable.java
@@ -48,11 +48,13 @@ public abstract class AbstractParameterizable implements Parameterizable {
}
/** {@inheritDoc} */
+ @Override
public Collection<String> getParametersNames() {
return parametersNames;
}
/** {@inheritDoc} */
+ @Override
public boolean isSupported(final String name) {
for (final String supportedName : parametersNames) {
if (supportedName.equals(name)) {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/ode/ContinuousOutputModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/ContinuousOutputModel.java b/src/main/java/org/apache/commons/math4/ode/ContinuousOutputModel.java
index de3d6c4..e48dff9 100644
--- a/src/main/java/org/apache/commons/math4/ode/ContinuousOutputModel.java
+++ b/src/main/java/org/apache/commons/math4/ode/ContinuousOutputModel.java
@@ -169,6 +169,7 @@ public class ContinuousOutputModel
}
/** {@inheritDoc} */
+ @Override
public void init(double t0, double[] y0, double t) {
initialTime = Double.NaN;
finalTime = Double.NaN;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/ode/JacobianMatrices.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/JacobianMatrices.java b/src/main/java/org/apache/commons/math4/ode/JacobianMatrices.java
index e2f3af9..bcbbc6e 100644
--- a/src/main/java/org/apache/commons/math4/ode/JacobianMatrices.java
+++ b/src/main/java/org/apache/commons/math4/ode/JacobianMatrices.java
@@ -343,11 +343,13 @@ public class JacobianMatrices {
private class JacobiansSecondaryEquations implements SecondaryEquations {
/** {@inheritDoc} */
+ @Override
public int getDimension() {
return stateDim * (stateDim + paramDim);
}
/** {@inheritDoc} */
+ @Override
public void computeDerivatives(final double t, final double[] y, final double[] yDot,
final double[] z, final double[] zDot)
throws MaxCountExceededException, DimensionMismatchException {
@@ -442,17 +444,20 @@ public class JacobianMatrices {
}
/** {@inheritDoc} */
+ @Override
public int getDimension() {
return ode.getDimension();
}
/** {@inheritDoc} */
+ @Override
public void computeDerivatives(double t, double[] y, double[] yDot)
throws MaxCountExceededException, DimensionMismatchException {
ode.computeDerivatives(t, y, yDot);
}
/** {@inheritDoc} */
+ @Override
public void computeMainStateJacobian(double t, double[] y, double[] yDot, double[][] dFdY)
throws MaxCountExceededException, DimensionMismatchException {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/ode/MultistepIntegrator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/MultistepIntegrator.java b/src/main/java/org/apache/commons/math4/ode/MultistepIntegrator.java
index df9797d..b8b6a1d 100644
--- a/src/main/java/org/apache/commons/math4/ode/MultistepIntegrator.java
+++ b/src/main/java/org/apache/commons/math4/ode/MultistepIntegrator.java
@@ -234,11 +234,13 @@ public abstract class MultistepIntegrator extends AdaptiveStepsizeIntegrator {
starter.integrate(new FirstOrderDifferentialEquations() {
/** {@inheritDoc} */
+ @Override
public int getDimension() {
return getExpandable().getTotalDimension();
}
/** {@inheritDoc} */
+ @Override
public void computeDerivatives(double t, double[] y, double[] yDot) {
getExpandable().computeDerivatives(t, y, yDot);
}
@@ -363,6 +365,7 @@ public abstract class MultistepIntegrator extends AdaptiveStepsizeIntegrator {
}
/** {@inheritDoc} */
+ @Override
public void handleStep(StepInterpolator interpolator, boolean isLast)
throws MaxCountExceededException {
@@ -424,6 +427,7 @@ public abstract class MultistepIntegrator extends AdaptiveStepsizeIntegrator {
}
/** {@inheritDoc} */
+ @Override
public void init(double t0, double[] y0, double time) {
// nothing to do
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/ode/ParameterJacobianWrapper.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/ParameterJacobianWrapper.java b/src/main/java/org/apache/commons/math4/ode/ParameterJacobianWrapper.java
index 856eb15..a01d98f 100644
--- a/src/main/java/org/apache/commons/math4/ode/ParameterJacobianWrapper.java
+++ b/src/main/java/org/apache/commons/math4/ode/ParameterJacobianWrapper.java
@@ -63,16 +63,19 @@ class ParameterJacobianWrapper implements ParameterJacobianProvider {
}
/** {@inheritDoc} */
+ @Override
public Collection<String> getParametersNames() {
return pode.getParametersNames();
}
/** {@inheritDoc} */
+ @Override
public boolean isSupported(String name) {
return pode.isSupported(name);
}
/** {@inheritDoc} */
+ @Override
public void computeParameterJacobian(double t, double[] y, double[] yDot,
String paramName, double[] dFdP)
throws DimensionMismatchException, MaxCountExceededException {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/ode/ParameterizedWrapper.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/ParameterizedWrapper.java b/src/main/java/org/apache/commons/math4/ode/ParameterizedWrapper.java
index 14594d0..e37b849 100644
--- a/src/main/java/org/apache/commons/math4/ode/ParameterizedWrapper.java
+++ b/src/main/java/org/apache/commons/math4/ode/ParameterizedWrapper.java
@@ -59,16 +59,19 @@ class ParameterizedWrapper implements ParameterizedODE {
}
/** {@inheritDoc} */
+ @Override
public Collection<String> getParametersNames() {
return new ArrayList<String>();
}
/** {@inheritDoc} */
+ @Override
public boolean isSupported(String name) {
return false;
}
/** {@inheritDoc} */
+ @Override
public double getParameter(String name)
throws UnknownParameterException {
if (!isSupported(name)) {
@@ -78,6 +81,7 @@ class ParameterizedWrapper implements ParameterizedODE {
}
/** {@inheritDoc} */
+ @Override
public void setParameter(String name, double value) {
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/ode/events/EventFilter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/events/EventFilter.java b/src/main/java/org/apache/commons/math4/ode/events/EventFilter.java
index 27eab1a..ccb6865 100644
--- a/src/main/java/org/apache/commons/math4/ode/events/EventFilter.java
+++ b/src/main/java/org/apache/commons/math4/ode/events/EventFilter.java
@@ -87,6 +87,7 @@ public class EventFilter implements EventHandler {
}
/** {@inheritDoc} */
+ @Override
public void init(double t0, double[] y0, double t) {
// delegate to raw handler
@@ -101,6 +102,7 @@ public class EventFilter implements EventHandler {
}
/** {@inheritDoc} */
+ @Override
public double g(double t, double[] y) {
final double rawG = rawHandler.g(t, y);
@@ -190,12 +192,14 @@ public class EventFilter implements EventHandler {
}
/** {@inheritDoc} */
+ @Override
public Action eventOccurred(double t, double[] y, boolean increasing) {
// delegate to raw handler, fixing increasing status on the fly
return rawHandler.eventOccurred(t, y, filter.getTriggeredIncreasing());
}
/** {@inheritDoc} */
+ @Override
public void resetState(double t, double[] y) {
// delegate to raw handler
rawHandler.resetState(t, y);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonIntegrator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonIntegrator.java b/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonIntegrator.java
index dc58b6c..37affbe 100644
--- a/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonIntegrator.java
+++ b/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonIntegrator.java
@@ -375,12 +375,14 @@ public class AdamsMoultonIntegrator extends AdamsIntegrator {
}
/** {@inheritDoc} */
+ @Override
public void start(int rows, int columns,
int startRow, int endRow, int startColumn, int endColumn) {
Arrays.fill(after, 0.0);
}
/** {@inheritDoc} */
+ @Override
public void visit(int row, int column, double value) {
if ((row & 0x1) == 0) {
after[column] -= value;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/ode/sampling/AbstractStepInterpolator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/sampling/AbstractStepInterpolator.java b/src/main/java/org/apache/commons/math4/ode/sampling/AbstractStepInterpolator.java
index fdd0030..6099231 100644
--- a/src/main/java/org/apache/commons/math4/ode/sampling/AbstractStepInterpolator.java
+++ b/src/main/java/org/apache/commons/math4/ode/sampling/AbstractStepInterpolator.java
@@ -262,6 +262,7 @@ public abstract class AbstractStepInterpolator
}
/** {@inheritDoc} */
+ @Override
public StepInterpolator copy() throws MaxCountExceededException {
// finalize the step before performing copy
@@ -369,17 +370,20 @@ public abstract class AbstractStepInterpolator
}
/** {@inheritDoc} */
+ @Override
public double getInterpolatedTime() {
return interpolatedTime;
}
/** {@inheritDoc} */
+ @Override
public void setInterpolatedTime(final double time) {
interpolatedTime = time;
dirtyState = true;
}
/** {@inheritDoc} */
+ @Override
public boolean isForward() {
return forward;
}
@@ -412,6 +416,7 @@ public abstract class AbstractStepInterpolator
}
/** {@inheritDoc} */
+ @Override
public double[] getInterpolatedState() throws MaxCountExceededException {
evaluateCompleteInterpolatedState();
primaryMapper.extractEquationData(interpolatedState,
@@ -420,6 +425,7 @@ public abstract class AbstractStepInterpolator
}
/** {@inheritDoc} */
+ @Override
public double[] getInterpolatedDerivatives() throws MaxCountExceededException {
evaluateCompleteInterpolatedState();
primaryMapper.extractEquationData(interpolatedDerivatives,
@@ -428,6 +434,7 @@ public abstract class AbstractStepInterpolator
}
/** {@inheritDoc} */
+ @Override
public double[] getInterpolatedSecondaryState(final int index) throws MaxCountExceededException {
evaluateCompleteInterpolatedState();
secondaryMappers[index].extractEquationData(interpolatedState,
@@ -436,6 +443,7 @@ public abstract class AbstractStepInterpolator
}
/** {@inheritDoc} */
+ @Override
public double[] getInterpolatedSecondaryDerivatives(final int index) throws MaxCountExceededException {
evaluateCompleteInterpolatedState();
secondaryMappers[index].extractEquationData(interpolatedDerivatives,
@@ -500,10 +508,12 @@ public abstract class AbstractStepInterpolator
}
/** {@inheritDoc} */
+ @Override
public abstract void writeExternal(ObjectOutput out)
throws IOException;
/** {@inheritDoc} */
+ @Override
public abstract void readExternal(ObjectInput in)
throws IOException, ClassNotFoundException;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/ode/sampling/DummyStepHandler.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/sampling/DummyStepHandler.java b/src/main/java/org/apache/commons/math4/ode/sampling/DummyStepHandler.java
index 7134619..4832a96 100644
--- a/src/main/java/org/apache/commons/math4/ode/sampling/DummyStepHandler.java
+++ b/src/main/java/org/apache/commons/math4/ode/sampling/DummyStepHandler.java
@@ -50,6 +50,7 @@ public class DummyStepHandler implements StepHandler {
}
/** {@inheritDoc} */
+ @Override
public void init(double t0, double[] y0, double t) {
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/ode/sampling/StepNormalizer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/sampling/StepNormalizer.java b/src/main/java/org/apache/commons/math4/ode/sampling/StepNormalizer.java
index 1766248..abf95e1 100644
--- a/src/main/java/org/apache/commons/math4/ode/sampling/StepNormalizer.java
+++ b/src/main/java/org/apache/commons/math4/ode/sampling/StepNormalizer.java
@@ -173,6 +173,7 @@ public class StepNormalizer implements StepHandler {
}
/** {@inheritDoc} */
+ @Override
public void init(double t0, double[] y0, double t) {
firstTime = Double.NaN;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/optim/AbstractConvergenceChecker.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/AbstractConvergenceChecker.java b/src/main/java/org/apache/commons/math4/optim/AbstractConvergenceChecker.java
index 6e0b9ab..4c8cf22 100644
--- a/src/main/java/org/apache/commons/math4/optim/AbstractConvergenceChecker.java
+++ b/src/main/java/org/apache/commons/math4/optim/AbstractConvergenceChecker.java
@@ -63,6 +63,7 @@ public abstract class AbstractConvergenceChecker<PAIR>
/**
* {@inheritDoc}
*/
+ @Override
public abstract boolean converged(int iteration,
PAIR previous,
PAIR current);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/optim/AbstractOptimizationProblem.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/AbstractOptimizationProblem.java b/src/main/java/org/apache/commons/math4/optim/AbstractOptimizationProblem.java
index 3432404..488e4f7 100644
--- a/src/main/java/org/apache/commons/math4/optim/AbstractOptimizationProblem.java
+++ b/src/main/java/org/apache/commons/math4/optim/AbstractOptimizationProblem.java
@@ -59,16 +59,19 @@ public abstract class AbstractOptimizationProblem<PAIR>
}
/** {@inheritDoc} */
+ @Override
public Incrementor getEvaluationCounter() {
return new Incrementor(this.maxEvaluations, MAX_EVAL_CALLBACK);
}
/** {@inheritDoc} */
+ @Override
public Incrementor getIterationCounter() {
return new Incrementor(this.maxIterations, MAX_ITER_CALLBACK);
}
/** {@inheritDoc} */
+ @Override
public ConvergenceChecker<PAIR> getConvergenceChecker() {
return checker;
}
@@ -81,6 +84,7 @@ public abstract class AbstractOptimizationProblem<PAIR>
*
* @throws TooManyEvaluationsException
*/
+ @Override
public void trigger(int max) {
throw new TooManyEvaluationsException(max);
}
@@ -94,6 +98,7 @@ public abstract class AbstractOptimizationProblem<PAIR>
*
* @throws TooManyIterationsException
*/
+ @Override
public void trigger(int max) {
throw new TooManyIterationsException(max);
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/optim/BaseOptimizer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/BaseOptimizer.java b/src/main/java/org/apache/commons/math4/optim/BaseOptimizer.java
index 00c0a3c..1a3ae4c 100644
--- a/src/main/java/org/apache/commons/math4/optim/BaseOptimizer.java
+++ b/src/main/java/org/apache/commons/math4/optim/BaseOptimizer.java
@@ -238,6 +238,7 @@ public abstract class BaseOptimizer<PAIR> {
* {@inheritDoc}
* @throws TooManyEvaluationsException
*/
+ @Override
public void trigger(int max) {
throw new TooManyEvaluationsException(max);
}
@@ -253,6 +254,7 @@ public abstract class BaseOptimizer<PAIR> {
* {@inheritDoc}
* @throws TooManyIterationsException
*/
+ @Override
public void trigger(int max) {
throw new TooManyIterationsException(max);
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/LeastSquaresConverter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/LeastSquaresConverter.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/LeastSquaresConverter.java
index fc59f2c..3860cd5 100644
--- a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/LeastSquaresConverter.java
+++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/LeastSquaresConverter.java
@@ -154,6 +154,7 @@ public class LeastSquaresConverter implements MultivariateFunction {
}
/** {@inheritDoc} */
+ @Override
public double value(final double[] point) {
// compute residuals
final double[] residuals = function.value(point);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateFunctionMappingAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateFunctionMappingAdapter.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateFunctionMappingAdapter.java
index 7363825..a34f02d 100644
--- a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateFunctionMappingAdapter.java
+++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateFunctionMappingAdapter.java
@@ -201,11 +201,13 @@ public class MultivariateFunctionMappingAdapter
/** Local class for no bounds mapping. */
private static class NoBoundsMapper implements Mapper {
/** {@inheritDoc} */
+ @Override
public double unboundedToBounded(final double y) {
return y;
}
/** {@inheritDoc} */
+ @Override
public double boundedToUnbounded(final double x) {
return x;
}
@@ -226,11 +228,13 @@ public class MultivariateFunctionMappingAdapter
}
/** {@inheritDoc} */
+ @Override
public double unboundedToBounded(final double y) {
return lower + FastMath.exp(y);
}
/** {@inheritDoc} */
+ @Override
public double boundedToUnbounded(final double x) {
return FastMath.log(x - lower);
}
@@ -251,11 +255,13 @@ public class MultivariateFunctionMappingAdapter
}
/** {@inheritDoc} */
+ @Override
public double unboundedToBounded(final double y) {
return upper - FastMath.exp(-y);
}
/** {@inheritDoc} */
+ @Override
public double boundedToUnbounded(final double x) {
return -FastMath.log(upper - x);
}
@@ -281,11 +287,13 @@ public class MultivariateFunctionMappingAdapter
}
/** {@inheritDoc} */
+ @Override
public double unboundedToBounded(final double y) {
return boundingFunction.value(y);
}
/** {@inheritDoc} */
+ @Override
public double boundedToUnbounded(final double x) {
return unboundingFunction.value(x);
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/gradient/NonLinearConjugateGradientOptimizer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/gradient/NonLinearConjugateGradientOptimizer.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/gradient/NonLinearConjugateGradientOptimizer.java
index 4d4e2ce..078c6ec 100644
--- a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/gradient/NonLinearConjugateGradientOptimizer.java
+++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/gradient/NonLinearConjugateGradientOptimizer.java
@@ -347,6 +347,7 @@ public class NonLinearConjugateGradientOptimizer
/** Default identity preconditioner. */
public static class IdentityPreconditioner implements Preconditioner {
/** {@inheritDoc} */
+ @Override
public double[] precondition(double[] variables, double[] r) {
return r.clone();
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/CMAESOptimizer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/CMAESOptimizer.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/CMAESOptimizer.java
index bc1e41e..121aa2e 100644
--- a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/CMAESOptimizer.java
+++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/CMAESOptimizer.java
@@ -872,6 +872,7 @@ public class CMAESOptimizer
}
/** {@inheritDoc} */
+ @Override
public int compareTo(DoubleIndex o) {
return Double.compare(value, o.value);
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/stat/descriptive/AbstractStorelessUnivariateStatistic.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/stat/descriptive/AbstractStorelessUnivariateStatistic.java b/src/main/java/org/apache/commons/math4/stat/descriptive/AbstractStorelessUnivariateStatistic.java
index fe46039..9920adf 100644
--- a/src/main/java/org/apache/commons/math4/stat/descriptive/AbstractStorelessUnivariateStatistic.java
+++ b/src/main/java/org/apache/commons/math4/stat/descriptive/AbstractStorelessUnivariateStatistic.java
@@ -104,16 +104,19 @@ public abstract class AbstractStorelessUnivariateStatistic
/**
* {@inheritDoc}
*/
+ @Override
public abstract void clear();
/**
* {@inheritDoc}
*/
+ @Override
public abstract double getResult();
/**
* {@inheritDoc}
*/
+ @Override
public abstract void increment(final double d);
/**
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/stat/descriptive/AbstractUnivariateStatistic.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/stat/descriptive/AbstractUnivariateStatistic.java b/src/main/java/org/apache/commons/math4/stat/descriptive/AbstractUnivariateStatistic.java
index c55d3f1..ab8e02d 100644
--- a/src/main/java/org/apache/commons/math4/stat/descriptive/AbstractUnivariateStatistic.java
+++ b/src/main/java/org/apache/commons/math4/stat/descriptive/AbstractUnivariateStatistic.java
@@ -116,6 +116,7 @@ public abstract class AbstractUnivariateStatistic
/**
* {@inheritDoc}
*/
+ @Override
public double evaluate(final double[] values) throws MathIllegalArgumentException {
test(values, 0, 0);
return evaluate(values, 0, values.length);
@@ -124,12 +125,14 @@ public abstract class AbstractUnivariateStatistic
/**
* {@inheritDoc}
*/
+ @Override
public abstract double evaluate(final double[] values, final int begin, final int length)
throws MathIllegalArgumentException;
/**
* {@inheritDoc}
*/
+ @Override
public abstract UnivariateStatistic copy();
/**
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/stat/descriptive/AggregateSummaryStatistics.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/stat/descriptive/AggregateSummaryStatistics.java b/src/main/java/org/apache/commons/math4/stat/descriptive/AggregateSummaryStatistics.java
index 3a7c345..52fc9cc 100644
--- a/src/main/java/org/apache/commons/math4/stat/descriptive/AggregateSummaryStatistics.java
+++ b/src/main/java/org/apache/commons/math4/stat/descriptive/AggregateSummaryStatistics.java
@@ -134,6 +134,7 @@ public class AggregateSummaryStatistics implements StatisticalSummary,
*
* @see StatisticalSummary#getMax()
*/
+ @Override
public double getMax() {
synchronized (statistics) {
return statistics.getMax();
@@ -145,6 +146,7 @@ public class AggregateSummaryStatistics implements StatisticalSummary,
*
* @see StatisticalSummary#getMean()
*/
+ @Override
public double getMean() {
synchronized (statistics) {
return statistics.getMean();
@@ -157,6 +159,7 @@ public class AggregateSummaryStatistics implements StatisticalSummary,
*
* @see StatisticalSummary#getMin()
*/
+ @Override
public double getMin() {
synchronized (statistics) {
return statistics.getMin();
@@ -168,6 +171,7 @@ public class AggregateSummaryStatistics implements StatisticalSummary,
*
* @see StatisticalSummary#getN()
*/
+ @Override
public long getN() {
synchronized (statistics) {
return statistics.getN();
@@ -180,6 +184,7 @@ public class AggregateSummaryStatistics implements StatisticalSummary,
*
* @see StatisticalSummary#getStandardDeviation()
*/
+ @Override
public double getStandardDeviation() {
synchronized (statistics) {
return statistics.getStandardDeviation();
@@ -191,6 +196,7 @@ public class AggregateSummaryStatistics implements StatisticalSummary,
*
* @see StatisticalSummary#getSum()
*/
+ @Override
public double getSum() {
synchronized (statistics) {
return statistics.getSum();
@@ -203,6 +209,7 @@ public class AggregateSummaryStatistics implements StatisticalSummary,
*
* @see StatisticalSummary#getVariance()
*/
+ @Override
public double getVariance() {
synchronized (statistics) {
return statistics.getVariance();
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/stat/descriptive/moment/FirstMoment.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/stat/descriptive/moment/FirstMoment.java b/src/main/java/org/apache/commons/math4/stat/descriptive/moment/FirstMoment.java
index 8ab7b0f..00d8513 100644
--- a/src/main/java/org/apache/commons/math4/stat/descriptive/moment/FirstMoment.java
+++ b/src/main/java/org/apache/commons/math4/stat/descriptive/moment/FirstMoment.java
@@ -133,6 +133,7 @@ class FirstMoment extends AbstractStorelessUnivariateStatistic
/**
* {@inheritDoc}
*/
+ @Override
public long getN() {
return n;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/stat/descriptive/moment/GeometricMean.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/stat/descriptive/moment/GeometricMean.java b/src/main/java/org/apache/commons/math4/stat/descriptive/moment/GeometricMean.java
index 41c58b9..ab628de 100644
--- a/src/main/java/org/apache/commons/math4/stat/descriptive/moment/GeometricMean.java
+++ b/src/main/java/org/apache/commons/math4/stat/descriptive/moment/GeometricMean.java
@@ -152,6 +152,7 @@ public class GeometricMean extends AbstractStorelessUnivariateStatistic implemen
/**
* {@inheritDoc}
*/
+ @Override
public long getN() {
return sumOfLogs.getN();
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/stat/descriptive/moment/Kurtosis.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/stat/descriptive/moment/Kurtosis.java b/src/main/java/org/apache/commons/math4/stat/descriptive/moment/Kurtosis.java
index 4970058..2164ed9 100644
--- a/src/main/java/org/apache/commons/math4/stat/descriptive/moment/Kurtosis.java
+++ b/src/main/java/org/apache/commons/math4/stat/descriptive/moment/Kurtosis.java
@@ -138,6 +138,7 @@ public class Kurtosis extends AbstractStorelessUnivariateStatistic implements S
/**
* {@inheritDoc}
*/
+ @Override
public long getN() {
return moment.getN();
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/8d9ddbca/src/main/java/org/apache/commons/math4/stat/descriptive/moment/Mean.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/stat/descriptive/moment/Mean.java b/src/main/java/org/apache/commons/math4/stat/descriptive/moment/Mean.java
index 94c58a2..593eb42 100644
--- a/src/main/java/org/apache/commons/math4/stat/descriptive/moment/Mean.java
+++ b/src/main/java/org/apache/commons/math4/stat/descriptive/moment/Mean.java
@@ -138,6 +138,7 @@ public class Mean extends AbstractStorelessUnivariateStatistic
/**
* {@inheritDoc}
*/
+ @Override
public long getN() {
return moment.getN();
}