You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2016/09/20 17:38:17 UTC
[1/4] [math] Add missing '@Override' annotations.
Repository: commons-math
Updated Branches:
refs/heads/develop 762eb53f5 -> 221c843b8
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/gradient/NonLinearConjugateGradientOptimizerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/gradient/NonLinearConjugateGradientOptimizerTest.java b/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/gradient/NonLinearConjugateGradientOptimizerTest.java
index 1298778..12b2897 100644
--- a/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/gradient/NonLinearConjugateGradientOptimizerTest.java
+++ b/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/gradient/NonLinearConjugateGradientOptimizerTest.java
@@ -221,6 +221,7 @@ public class NonLinearConjugateGradientOptimizerTest {
final Preconditioner preconditioner
= new Preconditioner() {
+ @Override
public double[] precondition(double[] point, double[] r) {
double[] d = r.clone();
d[0] /= 72.0;
@@ -448,6 +449,7 @@ public class NonLinearConjugateGradientOptimizerTest {
public ObjectiveFunction getObjectiveFunction() {
return new ObjectiveFunction(new MultivariateFunction() {
+ @Override
public double value(double[] point) {
double[] y = factors.operate(point);
double sum = 0;
@@ -462,6 +464,7 @@ public class NonLinearConjugateGradientOptimizerTest {
public ObjectiveFunctionGradient getObjectiveFunctionGradient() {
return new ObjectiveFunctionGradient(new MultivariateVectorFunction() {
+ @Override
public double[] value(double[] point) {
double[] r = factors.operate(point);
for (int i = 0; i < r.length; ++i) {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/BOBYQAOptimizerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/BOBYQAOptimizerTest.java b/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/BOBYQAOptimizerTest.java
index db69efd..55d43a0 100644
--- a/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/BOBYQAOptimizerTest.java
+++ b/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/BOBYQAOptimizerTest.java
@@ -365,6 +365,7 @@ public class BOBYQAOptimizerTest {
private static class Sphere implements MultivariateFunction {
+ @Override
public double value(double[] x) {
double f = 0;
for (int i = 0; i < x.length; ++i)
@@ -384,6 +385,7 @@ public class BOBYQAOptimizerTest {
factor = axisratio * axisratio;
}
+ @Override
public double value(double[] x) {
double f = x[0] * x[0];
for (int i = 1; i < x.length; ++i)
@@ -403,6 +405,7 @@ public class BOBYQAOptimizerTest {
factor = axisratio * axisratio;
}
+ @Override
public double value(double[] x) {
double f = factor * x[0] * x[0];
for (int i = 1; i < x.length; ++i)
@@ -422,6 +425,7 @@ public class BOBYQAOptimizerTest {
factor = axisratio;
}
+ @Override
public double value(double[] x) {
int end = x.length - 1;
double f = x[0] * x[0] / factor + factor * x[end] * x[end];
@@ -443,6 +447,7 @@ public class BOBYQAOptimizerTest {
factor = axisratio * axisratio;
}
+ @Override
public double value(double[] x) {
double f = 0;
for (int i = 0; i < x.length; ++i)
@@ -463,6 +468,7 @@ public class BOBYQAOptimizerTest {
factor = axisratio * axisratio;
}
+ @Override
public double value(double[] x) {
double f = 0;
x = B.Rotate(x);
@@ -484,6 +490,7 @@ public class BOBYQAOptimizerTest {
factor = axisratio * axisratio;
}
+ @Override
public double value(double[] x) {
double f = 0;
for (int i = 0; i < x.length; ++i)
@@ -494,6 +501,7 @@ public class BOBYQAOptimizerTest {
private static class MinusElli implements MultivariateFunction {
private final Elli elli = new Elli();
+ @Override
public double value(double[] x) {
return 1.0 - elli.value(x);
}
@@ -501,6 +509,7 @@ public class BOBYQAOptimizerTest {
private static class DiffPow implements MultivariateFunction {
// private int fcount = 0;
+ @Override
public double value(double[] x) {
double f = 0;
for (int i = 0; i < x.length; ++i)
@@ -516,6 +525,7 @@ public class BOBYQAOptimizerTest {
private static class SsDiffPow implements MultivariateFunction {
+ @Override
public double value(double[] x) {
double f = FastMath.pow(new DiffPow().value(x), 0.25);
return f;
@@ -524,6 +534,7 @@ public class BOBYQAOptimizerTest {
private static class Rosen implements MultivariateFunction {
+ @Override
public double value(double[] x) {
double f = 0;
for (int i = 0; i < x.length - 1; ++i)
@@ -544,6 +555,7 @@ public class BOBYQAOptimizerTest {
this(1);
}
+ @Override
public double value(double[] x) {
double f = 0;
double res2 = 0;
@@ -573,6 +585,7 @@ public class BOBYQAOptimizerTest {
this.amplitude = amplitude;
}
+ @Override
public double value(double[] x) {
double f = 0;
double fac;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/CMAESOptimizerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/CMAESOptimizerTest.java b/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/CMAESOptimizerTest.java
index 7d9390a..c722798 100644
--- a/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/CMAESOptimizerTest.java
+++ b/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/CMAESOptimizerTest.java
@@ -370,6 +370,7 @@ public class CMAESOptimizerTest {
= new CMAESOptimizer(30000, 0, true, 10,
0, RandomSource.create(RandomSource.MT_64), false, null);
final MultivariateFunction fitnessFunction = new MultivariateFunction() {
+ @Override
public double value(double[] parameters) {
final double target = 1;
final double error = target - parameters[0];
@@ -401,6 +402,7 @@ public class CMAESOptimizerTest {
= new CMAESOptimizer(30000, 0, true, 10,
0, RandomSource.create(RandomSource.MT_64), false, null);
final MultivariateFunction fitnessFunction = new MultivariateFunction() {
+ @Override
public double value(double[] parameters) {
final double target = 11.1;
final double error = target - parameters[0];
@@ -531,6 +533,7 @@ public class CMAESOptimizerTest {
private static class Sphere implements MultivariateFunction {
+ @Override
public double value(double[] x) {
double f = 0;
for (int i = 0; i < x.length; ++i)
@@ -550,6 +553,7 @@ public class CMAESOptimizerTest {
factor = axisratio * axisratio;
}
+ @Override
public double value(double[] x) {
double f = x[0] * x[0];
for (int i = 1; i < x.length; ++i)
@@ -569,6 +573,7 @@ public class CMAESOptimizerTest {
factor = axisratio * axisratio;
}
+ @Override
public double value(double[] x) {
double f = factor * x[0] * x[0];
for (int i = 1; i < x.length; ++i)
@@ -588,6 +593,7 @@ public class CMAESOptimizerTest {
factor = axisratio;
}
+ @Override
public double value(double[] x) {
int end = x.length - 1;
double f = x[0] * x[0] / factor + factor * x[end] * x[end];
@@ -609,6 +615,7 @@ public class CMAESOptimizerTest {
factor = axisratio * axisratio;
}
+ @Override
public double value(double[] x) {
double f = 0;
for (int i = 0; i < x.length; ++i)
@@ -629,6 +636,7 @@ public class CMAESOptimizerTest {
factor = axisratio * axisratio;
}
+ @Override
public double value(double[] x) {
double f = 0;
x = B.Rotate(x);
@@ -650,6 +658,7 @@ public class CMAESOptimizerTest {
factor = axisratio * axisratio;
}
+ @Override
public double value(double[] x) {
double f = 0;
for (int i = 0; i < x.length; ++i)
@@ -660,6 +669,7 @@ public class CMAESOptimizerTest {
private static class MinusElli implements MultivariateFunction {
+ @Override
public double value(double[] x) {
return 1.0-(new Elli().value(x));
}
@@ -667,6 +677,7 @@ public class CMAESOptimizerTest {
private static class DiffPow implements MultivariateFunction {
+ @Override
public double value(double[] x) {
double f = 0;
for (int i = 0; i < x.length; ++i)
@@ -678,6 +689,7 @@ public class CMAESOptimizerTest {
private static class SsDiffPow implements MultivariateFunction {
+ @Override
public double value(double[] x) {
double f = FastMath.pow(new DiffPow().value(x), 0.25);
return f;
@@ -686,6 +698,7 @@ public class CMAESOptimizerTest {
private static class Rosen implements MultivariateFunction {
+ @Override
public double value(double[] x) {
double f = 0;
for (int i = 0; i < x.length - 1; ++i)
@@ -706,6 +719,7 @@ public class CMAESOptimizerTest {
this(1);
}
+ @Override
public double value(double[] x) {
double f = 0;
double res2 = 0;
@@ -735,6 +749,7 @@ public class CMAESOptimizerTest {
this.amplitude = amplitude;
}
+ @Override
public double value(double[] x) {
double f = 0;
double fac;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/PowellOptimizerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/PowellOptimizerTest.java b/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/PowellOptimizerTest.java
index 4d0be63..1f4bfa4 100644
--- a/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/PowellOptimizerTest.java
+++ b/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/PowellOptimizerTest.java
@@ -79,6 +79,7 @@ public class PowellOptimizerTest {
@Test
public void testQuadratic() {
final MultivariateFunction func = new MultivariateFunction() {
+ @Override
public double value(double[] x) {
final double a = x[0] - 1;
final double b = x[1] - 1;
@@ -110,6 +111,7 @@ public class PowellOptimizerTest {
@Test
public void testMaximizeQuadratic() {
final MultivariateFunction func = new MultivariateFunction() {
+ @Override
public double value(double[] x) {
final double a = x[0] - 1;
final double b = x[1] - 1;
@@ -148,6 +150,7 @@ public class PowellOptimizerTest {
@Test
public void testRelativeToleranceOnScaledValues() {
final MultivariateFunction func = new MultivariateFunction() {
+ @Override
public double value(double[] x) {
final double a = x[0] - 1;
final double b = x[1] - 1;
@@ -183,6 +186,7 @@ public class PowellOptimizerTest {
final double scale = 1e10;
final MultivariateFunction funcScaled = new MultivariateFunction() {
+ @Override
public double value(double[] x) {
return scale * func.value(x);
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/SimplexOptimizerMultiDirectionalTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/SimplexOptimizerMultiDirectionalTest.java b/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/SimplexOptimizerMultiDirectionalTest.java
index 8f5c726..11da025 100644
--- a/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/SimplexOptimizerMultiDirectionalTest.java
+++ b/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/SimplexOptimizerMultiDirectionalTest.java
@@ -136,6 +136,7 @@ public class SimplexOptimizerMultiDirectionalTest {
public void testRosenbrock() {
MultivariateFunction rosenbrock
= new MultivariateFunction() {
+ @Override
public double value(double[] x) {
++count;
double a = x[1] - x[0] * x[0];
@@ -166,6 +167,7 @@ public class SimplexOptimizerMultiDirectionalTest {
public void testPowell() {
MultivariateFunction powell
= new MultivariateFunction() {
+ @Override
public double value(double[] x) {
++count;
double a = x[0] + 10 * x[1];
@@ -223,6 +225,7 @@ public class SimplexOptimizerMultiDirectionalTest {
final double valueXpYm = -0.7290400707055187115322; // Global minimum.
final double valueXpYp = -valueXpYm; // Global maximum.
+ @Override
public double value(double[] variables) {
final double x = variables[0];
final double y = variables[1];
@@ -248,6 +251,7 @@ public class SimplexOptimizerMultiDirectionalTest {
return maximumPosition.clone();
}
+ @Override
public double value(double[] point) {
final double x = point[0], y = point[1];
final double twoS2 = 2.0 * std * std;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/SimplexOptimizerNelderMeadTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/SimplexOptimizerNelderMeadTest.java b/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/SimplexOptimizerNelderMeadTest.java
index 4f01d75..0f5067d 100644
--- a/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/SimplexOptimizerNelderMeadTest.java
+++ b/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/SimplexOptimizerNelderMeadTest.java
@@ -181,6 +181,7 @@ public class SimplexOptimizerNelderMeadTest {
{ 0, 1 }
}, false);
LeastSquaresConverter ls = new LeastSquaresConverter(new MultivariateVectorFunction() {
+ @Override
public double[] value(double[] variables) {
return factors.operate(variables);
}
@@ -207,6 +208,7 @@ public class SimplexOptimizerNelderMeadTest {
{ 0, 1 }
}, false);
LeastSquaresConverter ls = new LeastSquaresConverter(new MultivariateVectorFunction() {
+ @Override
public double[] value(double[] variables) {
return factors.operate(variables);
}
@@ -233,6 +235,7 @@ public class SimplexOptimizerNelderMeadTest {
{ 0, 1 }
}, false);
LeastSquaresConverter ls = new LeastSquaresConverter(new MultivariateVectorFunction() {
+ @Override
public double[] value(double[] variables) {
return factors.operate(variables);
}
@@ -275,6 +278,7 @@ public class SimplexOptimizerNelderMeadTest {
final double valueXpYm = -0.7290400707055187115322; // Global minimum.
final double valueXpYp = -valueXpYm; // Global maximum.
+ @Override
public double value(double[] variables) {
final double x = variables[0];
final double y = variables[1];
@@ -290,6 +294,7 @@ public class SimplexOptimizerNelderMeadTest {
count = 0;
}
+ @Override
public double value(double[] x) {
++count;
double a = x[1] - x[0] * x[0];
@@ -309,6 +314,7 @@ public class SimplexOptimizerNelderMeadTest {
count = 0;
}
+ @Override
public double value(double[] x) {
++count;
double a = x[0] + 10 * x[1];
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/optim/univariate/BracketFinderTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/optim/univariate/BracketFinderTest.java b/src/test/java/org/apache/commons/math4/optim/univariate/BracketFinderTest.java
index b7ea9e1..b2ea791 100644
--- a/src/test/java/org/apache/commons/math4/optim/univariate/BracketFinderTest.java
+++ b/src/test/java/org/apache/commons/math4/optim/univariate/BracketFinderTest.java
@@ -31,6 +31,7 @@ public class BracketFinderTest {
public void testCubicMin() {
final BracketFinder bFind = new BracketFinder();
final UnivariateFunction func = new UnivariateFunction() {
+ @Override
public double value(double x) {
if (x < -2) {
return value(-2);
@@ -53,6 +54,7 @@ public class BracketFinderTest {
public void testCubicMax() {
final BracketFinder bFind = new BracketFinder();
final UnivariateFunction func = new UnivariateFunction() {
+ @Override
public double value(double x) {
if (x < -2) {
return value(-2);
@@ -73,6 +75,7 @@ public class BracketFinderTest {
@Test
public void testMinimumIsOnIntervalBoundary() {
final UnivariateFunction func = new UnivariateFunction() {
+ @Override
public double value(double x) {
return x * x;
}
@@ -92,6 +95,7 @@ public class BracketFinderTest {
@Test
public void testIntervalBoundsOrdering() {
final UnivariateFunction func = new UnivariateFunction() {
+ @Override
public double value(double x) {
return x * x;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/optim/univariate/BrentOptimizerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/optim/univariate/BrentOptimizerTest.java b/src/test/java/org/apache/commons/math4/optim/univariate/BrentOptimizerTest.java
index 319e0f1..cb778a8 100644
--- a/src/test/java/org/apache/commons/math4/optim/univariate/BrentOptimizerTest.java
+++ b/src/test/java/org/apache/commons/math4/optim/univariate/BrentOptimizerTest.java
@@ -90,6 +90,7 @@ public final class BrentOptimizerTest {
final double lower = -1.0;
final double upper = +1.0;
UnivariateFunction f = new UnivariateFunction() {
+ @Override
public double value(double x) {
if (x < lower) {
throw new NumberIsTooSmallException(x, lower, true);
@@ -215,6 +216,7 @@ public final class BrentOptimizerTest {
@Test
public void testMath832() {
final UnivariateFunction f = new UnivariateFunction() {
+ @Override
public double value(double x) {
final double sqrtX = FastMath.sqrt(x);
final double a = 1e2 * sqrtX;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/optim/univariate/MultiStartUnivariateOptimizerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/optim/univariate/MultiStartUnivariateOptimizerTest.java b/src/test/java/org/apache/commons/math4/optim/univariate/MultiStartUnivariateOptimizerTest.java
index 9232063..aafc95c 100644
--- a/src/test/java/org/apache/commons/math4/optim/univariate/MultiStartUnivariateOptimizerTest.java
+++ b/src/test/java/org/apache/commons/math4/optim/univariate/MultiStartUnivariateOptimizerTest.java
@@ -101,6 +101,7 @@ public class MultiStartUnivariateOptimizerTest {
@Test
public void testBadFunction() {
UnivariateFunction f = new UnivariateFunction() {
+ @Override
public double value(double x) {
if (x < 0) {
throw new LocalException();
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/util/IncrementorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/util/IncrementorTest.java b/src/test/java/org/apache/commons/math4/util/IncrementorTest.java
index f25b3ff..a28d065 100644
--- a/src/test/java/org/apache/commons/math4/util/IncrementorTest.java
+++ b/src/test/java/org/apache/commons/math4/util/IncrementorTest.java
@@ -103,6 +103,7 @@ public class IncrementorTest {
final Incrementor.MaxCountExceededCallback cb
= new Incrementor.MaxCountExceededCallback() {
/** {@inheritDoc} */
+ @Override
public void trigger(int max) {
throw new TooManyEvaluationsException(max);
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/util/IntegerSequenceTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/util/IntegerSequenceTest.java b/src/test/java/org/apache/commons/math4/util/IntegerSequenceTest.java
index 4b29906..d850729 100644
--- a/src/test/java/org/apache/commons/math4/util/IntegerSequenceTest.java
+++ b/src/test/java/org/apache/commons/math4/util/IntegerSequenceTest.java
@@ -256,6 +256,7 @@ public class IntegerSequenceTest {
final IntegerSequence.Incrementor.MaxCountExceededCallback cb
= new IntegerSequence.Incrementor.MaxCountExceededCallback() {
/** {@inheritDoc} */
+ @Override
public void trigger(int max) {
throw new TooManyEvaluationsException(max);
}
[4/4] [math] Add missing '@Override' annotations.
Posted by gg...@apache.org.
Add missing '@Override' annotations.
Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/221c843b
Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/221c843b
Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/221c843b
Branch: refs/heads/develop
Commit: 221c843b8437e1c87a98a9a015b03b050dd08561
Parents: 762eb53
Author: Gary Gregory <gg...@apache.org>
Authored: Tue Sep 20 10:38:11 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Tue Sep 20 10:38:11 2016 -0700
----------------------------------------------------------------------
.../FieldBracketingNthOrderBrentSolver.java | 7 +++
.../math4/ode/ContinuousOutputFieldModel.java | 1 +
.../math4/ode/ContinuousOutputModel.java | 3 +-
.../commons/math4/ode/FirstOrderConverter.java | 6 +-
.../nonstiff/AdamsFieldStepInterpolator.java | 1 +
.../nonstiff/AdamsMoultonFieldIntegrator.java | 1 +
.../ode/nonstiff/AdamsMoultonIntegrator.java | 1 +
.../ode/sampling/AbstractStepInterpolator.java | 6 +-
.../math4/ode/sampling/DummyStepHandler.java | 1 +
.../math4/ode/sampling/FieldStepNormalizer.java | 1 +
.../math4/ode/sampling/StepNormalizer.java | 1 +
.../org/apache/commons/math4/PerfTestUtils.java | 1 +
.../integration/gauss/BaseRuleFactoryTest.java | 1 +
.../analysis/integration/gauss/HermiteTest.java | 3 +
.../BracketingNthOrderBrentSolverTest.java | 3 +
.../math4/analysis/solvers/BrentSolverTest.java | 1 +
.../FieldBracketingNthOrderBrentSolverTest.java | 7 +++
.../analysis/solvers/RegulaFalsiSolverTest.java | 1 +
.../solvers/UnivariateSolverUtilsTest.java | 2 +
.../AbstractIntegerDistributionTest.java | 7 +++
.../AbstractRealDistributionTest.java | 2 +
.../RealDistributionAbstractTest.java | 1 +
...stractLeastSquaresOptimizerAbstractTest.java | 4 ++
.../fitting/leastsquares/CircleProblem.java | 2 +
.../fitting/leastsquares/CircleVectorial.java | 2 +
.../leastsquares/EvaluationRmsCheckerTest.java | 9 +++
.../fitting/leastsquares/EvaluationTest.java | 9 +++
.../LevenbergMarquardtOptimizerTest.java | 4 ++
.../math4/fitting/leastsquares/MinpackTest.java | 2 +
.../StatisticalReferenceDataset.java | 2 +
.../leastsquares/StraightLineProblem.java | 3 +
.../commons/math4/genetics/ChromosomeTest.java | 9 +++
.../math4/genetics/CycleCrossoverTest.java | 2 +
.../math4/genetics/DummyBinaryChromosome.java | 1 +
.../math4/genetics/DummyListChromosome.java | 1 +
.../commons/math4/genetics/DummyRandomKey.java | 1 +
.../genetics/ElitisticListPopulationTest.java | 1 +
.../math4/genetics/FixedElapsedTimeTest.java | 6 ++
.../genetics/FixedGenerationCountTest.java | 6 ++
.../genetics/GeneticAlgorithmTestBinary.java | 1 +
.../GeneticAlgorithmTestPermutations.java | 1 +
.../math4/genetics/ListPopulationTest.java | 13 ++++
.../math4/genetics/NPointCrossoverTest.java | 2 +
.../math4/genetics/OrderedCrossoverTest.java | 2 +
.../math4/genetics/TournamentSelectionTest.java | 1 +
.../math4/genetics/UniformCrossoverTest.java | 2 +
.../euclidean/threed/PolyhedronsSetTest.java | 3 +
.../euclidean/twod/PolygonsSetTest.java | 3 +
.../math4/linear/ArrayFieldVectorTest.java | 64 ++++++++++++++++++++
.../math4/linear/ConjugateGradientTest.java | 20 ++++++
.../math4/linear/SparseFieldVectorTest.java | 36 +++++++++++
.../apache/commons/math4/linear/SymmLQTest.java | 12 ++++
.../ml/neuralnet/OffsetFeatureInitializer.java | 1 +
.../sofm/TravellingSalesmanSolver.java | 5 ++
.../ode/ContinuousOutputFieldModelTest.java | 6 ++
.../math4/ode/FieldExpandableODETest.java | 5 ++
.../math4/ode/FirstOrderConverterTest.java | 6 +-
.../commons/math4/ode/JacobianMatricesTest.java | 16 +++++
.../commons/math4/ode/TestFieldProblem4.java | 8 +++
.../math4/ode/TestFieldProblemAbstract.java | 3 +
.../math4/ode/TestFieldProblemHandler.java | 2 +
.../apache/commons/math4/ode/TestProblem4.java | 8 +++
.../commons/math4/ode/TestProblemAbstract.java | 6 +-
.../commons/math4/ode/TestProblemHandler.java | 6 +-
.../math4/ode/events/CloseEventsTest.java | 6 ++
.../math4/ode/events/EventFilterTest.java | 6 ++
.../math4/ode/events/EventStateTest.java | 22 +++++++
.../math4/ode/events/OverlappingEventsTest.java | 6 ++
.../math4/ode/events/ReappearingEventTest.java | 6 ++
...ctEmbeddedRungeKuttaFieldIntegratorTest.java | 24 ++++++--
.../AbstractRungeKuttaFieldIntegratorTest.java | 20 ++++++
.../AdamsBashforthFieldIntegratorTest.java | 8 +++
.../nonstiff/AdamsBashforthIntegratorTest.java | 13 ++++
.../AdamsFieldIntegratorAbstractTest.java | 5 ++
.../AdamsMoultonFieldIntegratorTest.java | 8 +++
.../nonstiff/AdamsMoultonIntegratorTest.java | 13 ++++
...sicalRungKuttaFieldStepInterpolatorTest.java | 5 ++
.../ClassicalRungeKuttaFieldIntegratorTest.java | 1 +
.../ClassicalRungeKuttaIntegratorTest.java | 38 ++++++++----
.../DormandPrince54FieldIntegratorTest.java | 2 +
...ormandPrince54FieldStepInterpolatorTest.java | 5 ++
.../nonstiff/DormandPrince54IntegratorTest.java | 6 ++
.../DormandPrince54StepInterpolatorTest.java | 6 +-
.../DormandPrince853FieldIntegratorTest.java | 2 +
...rmandPrince853FieldStepInterpolatorTest.java | 5 ++
.../DormandPrince853IntegratorTest.java | 49 ++++++++++-----
.../DormandPrince853StepInterpolatorTest.java | 2 +
...edRungeKuttaFieldIntegratorAbstractTest.java | 24 ++++++--
.../ode/nonstiff/EulerFieldIntegratorTest.java | 1 +
.../EulerFieldStepInterpolatorTest.java | 5 ++
.../math4/ode/nonstiff/EulerIntegratorTest.java | 8 ++-
.../ode/nonstiff/GillFieldIntegratorTest.java | 1 +
.../nonstiff/GillFieldStepInterpolatorTest.java | 5 ++
.../math4/ode/nonstiff/GillIntegratorTest.java | 14 +++--
.../GraggBulirschStoerIntegratorTest.java | 22 +++++--
.../GraggBulirschStoerStepInterpolatorTest.java | 2 +
.../HighamHall54FieldIntegratorTest.java | 2 +
.../HighamHall54FieldStepInterpolatorTest.java | 5 ++
.../nonstiff/HighamHall54IntegratorTest.java | 20 ++++--
.../HighamHall54StepInterpolatorTest.java | 2 +
.../ode/nonstiff/LutherFieldIntegratorTest.java | 1 +
.../LutherFieldStepInterpolatorTest.java | 5 ++
.../ode/nonstiff/LutherIntegratorTest.java | 12 ++++
.../nonstiff/MidpointFieldIntegratorTest.java | 1 +
.../MidpointFieldStepInterpolatorTest.java | 5 ++
.../ode/nonstiff/MidpointIntegratorTest.java | 12 ++--
.../RungeKuttaFieldIntegratorAbstractTest.java | 20 ++++++
...eKuttaFieldStepInterpolatorAbstractTest.java | 3 +
.../math4/ode/nonstiff/StepFieldProblem.java | 7 +++
.../commons/math4/ode/nonstiff/StepProblem.java | 18 ++++--
.../ThreeEighthesFieldIntegratorTest.java | 1 +
.../ThreeEighthesFieldStepInterpolatorTest.java | 5 ++
.../nonstiff/ThreeEighthesIntegratorTest.java | 14 +++--
.../ode/sampling/StepInterpolatorTestUtils.java | 4 ++
.../sampling/StepNormalizerOutputTestBase.java | 4 ++
.../math4/ode/sampling/StepNormalizerTest.java | 12 ++--
.../MultiStartMultivariateOptimizerTest.java | 1 +
.../MultivariateFunctionMappingAdapterTest.java | 1 +
.../MultivariateFunctionPenaltyAdapterTest.java | 1 +
.../nonlinear/scalar/gradient/CircleScalar.java | 2 +
...NonLinearConjugateGradientOptimizerTest.java | 3 +
.../scalar/noderiv/BOBYQAOptimizerTest.java | 13 ++++
.../scalar/noderiv/CMAESOptimizerTest.java | 15 +++++
.../scalar/noderiv/PowellOptimizerTest.java | 4 ++
.../SimplexOptimizerMultiDirectionalTest.java | 4 ++
.../noderiv/SimplexOptimizerNelderMeadTest.java | 6 ++
.../optim/univariate/BracketFinderTest.java | 4 ++
.../optim/univariate/BrentOptimizerTest.java | 2 +
.../MultiStartUnivariateOptimizerTest.java | 1 +
.../commons/math4/util/IncrementorTest.java | 1 +
.../commons/math4/util/IntegerSequenceTest.java | 1 +
131 files changed, 823 insertions(+), 83 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/main/java/org/apache/commons/math4/analysis/solvers/FieldBracketingNthOrderBrentSolver.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/solvers/FieldBracketingNthOrderBrentSolver.java b/src/main/java/org/apache/commons/math4/analysis/solvers/FieldBracketingNthOrderBrentSolver.java
index 8d5e670..75871f3 100644
--- a/src/main/java/org/apache/commons/math4/analysis/solvers/FieldBracketingNthOrderBrentSolver.java
+++ b/src/main/java/org/apache/commons/math4/analysis/solvers/FieldBracketingNthOrderBrentSolver.java
@@ -106,6 +106,7 @@ public class FieldBracketingNthOrderBrentSolver<T extends RealFieldElement<T>>
*
* @return the maximal number of function evaluations.
*/
+ @Override
public int getMaxEvaluations() {
return evaluations.getMaximalCount();
}
@@ -118,6 +119,7 @@ public class FieldBracketingNthOrderBrentSolver<T extends RealFieldElement<T>>
*
* @return the number of evaluations of the objective function.
*/
+ @Override
public int getEvaluations() {
return evaluations.getCount();
}
@@ -126,6 +128,7 @@ public class FieldBracketingNthOrderBrentSolver<T extends RealFieldElement<T>>
* Get the absolute accuracy.
* @return absolute accuracy
*/
+ @Override
public T getAbsoluteAccuracy() {
return absoluteAccuracy;
}
@@ -134,6 +137,7 @@ public class FieldBracketingNthOrderBrentSolver<T extends RealFieldElement<T>>
* Get the relative accuracy.
* @return relative accuracy
*/
+ @Override
public T getRelativeAccuracy() {
return relativeAccuracy;
}
@@ -142,6 +146,7 @@ public class FieldBracketingNthOrderBrentSolver<T extends RealFieldElement<T>>
* Get the function accuracy.
* @return function accuracy
*/
+ @Override
public T getFunctionValueAccuracy() {
return functionValueAccuracy;
}
@@ -162,6 +167,7 @@ public class FieldBracketingNthOrderBrentSolver<T extends RealFieldElement<T>>
* @exception NullArgumentException if f is null.
* @exception NoBracketingException if root cannot be bracketed
*/
+ @Override
public T solve(final int maxEval, final RealFieldUnivariateFunction<T> f,
final T min, final T max, final AllowedSolution allowedSolution)
throws NullArgumentException, NoBracketingException {
@@ -185,6 +191,7 @@ public class FieldBracketingNthOrderBrentSolver<T extends RealFieldElement<T>>
* @exception NullArgumentException if f is null.
* @exception NoBracketingException if root cannot be bracketed
*/
+ @Override
public T solve(final int maxEval, final RealFieldUnivariateFunction<T> f,
final T min, final T max, final T startValue,
final AllowedSolution allowedSolution)
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/main/java/org/apache/commons/math4/ode/ContinuousOutputFieldModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/ContinuousOutputFieldModel.java b/src/main/java/org/apache/commons/math4/ode/ContinuousOutputFieldModel.java
index b1d8be2..45a5694 100644
--- a/src/main/java/org/apache/commons/math4/ode/ContinuousOutputFieldModel.java
+++ b/src/main/java/org/apache/commons/math4/ode/ContinuousOutputFieldModel.java
@@ -193,6 +193,7 @@ public class ContinuousOutputFieldModel<T extends RealFieldElement<T>>
* @exception MaxCountExceededException if the number of functions evaluations is exceeded
* during step finalization
*/
+ @Override
public void handleStep(final FieldStepInterpolator<T> interpolator, final boolean isLast)
throws MaxCountExceededException {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/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 8f63847..2f555ca 100644
--- a/src/main/java/org/apache/commons/math4/ode/ContinuousOutputModel.java
+++ b/src/main/java/org/apache/commons/math4/ode/ContinuousOutputModel.java
@@ -186,7 +186,8 @@ public class ContinuousOutputModel
* @exception MaxCountExceededException if the number of functions evaluations is exceeded
* during step finalization
*/
- public void handleStep(final StepInterpolator interpolator, final boolean isLast)
+ @Override
+public void handleStep(final StepInterpolator interpolator, final boolean isLast)
throws MaxCountExceededException {
if (steps.size() == 0) {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/main/java/org/apache/commons/math4/ode/FirstOrderConverter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/FirstOrderConverter.java b/src/main/java/org/apache/commons/math4/ode/FirstOrderConverter.java
index d59c9bb..4e079eb 100644
--- a/src/main/java/org/apache/commons/math4/ode/FirstOrderConverter.java
+++ b/src/main/java/org/apache/commons/math4/ode/FirstOrderConverter.java
@@ -87,7 +87,8 @@ public class FirstOrderConverter implements FirstOrderDifferentialEquations {
* dimension of the underlying second order problem.</p>
* @return dimension of the problem
*/
- public int getDimension() {
+ @Override
+public int getDimension() {
return 2 * dimension;
}
@@ -96,7 +97,8 @@ public class FirstOrderConverter implements FirstOrderDifferentialEquations {
* @param y array containing the current value of the state vector
* @param yDot placeholder array where to put the time derivative of the state vector
*/
- public void computeDerivatives(final double t, final double[] y, final double[] yDot) {
+ @Override
+public void computeDerivatives(final double t, final double[] y, final double[] yDot) {
// split the state vector in two
System.arraycopy(y, 0, z, 0, dimension);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsFieldStepInterpolator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsFieldStepInterpolator.java b/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsFieldStepInterpolator.java
index feac005..3d2b112 100644
--- a/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsFieldStepInterpolator.java
+++ b/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsFieldStepInterpolator.java
@@ -115,6 +115,7 @@ class AdamsFieldStepInterpolator<T extends RealFieldElement<T>> extends Abstract
* @param newMapper equations mapper for the all equations
* @return a new instance
*/
+ @Override
protected AdamsFieldStepInterpolator<T> create(boolean newForward,
FieldODEStateAndDerivative<T> newGlobalPreviousState,
FieldODEStateAndDerivative<T> newGlobalCurrentState,
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonFieldIntegrator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonFieldIntegrator.java b/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonFieldIntegrator.java
index 72d4de2..658cd6d 100644
--- a/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonFieldIntegrator.java
+++ b/src/main/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonFieldIntegrator.java
@@ -395,6 +395,7 @@ public class AdamsMoultonFieldIntegrator<T extends RealFieldElement<T>> extends
* @return the normalized correction, if greater than 1, the step
* must be rejected
*/
+ @Override
public T end() {
T error = getField().getZero();
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/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 7670ff9..2e5c544 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
@@ -400,6 +400,7 @@ public class AdamsMoultonIntegrator extends AdamsIntegrator {
* @return the normalized correction, if greater than 1, the step
* must be rejected
*/
+ @Override
public double end() {
double error = 0;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/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 6099231..c6cb115 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
@@ -356,7 +356,8 @@ public abstract class AbstractStepInterpolator
* @return previous soft grid point time
* @see #setSoftPreviousTime(double)
*/
- public double getPreviousTime() {
+ @Override
+public double getPreviousTime() {
return softPreviousTime;
}
@@ -365,7 +366,8 @@ public abstract class AbstractStepInterpolator
* @return current soft grid point time
* @see #setSoftCurrentTime(double)
*/
- public double getCurrentTime() {
+ @Override
+public double getCurrentTime() {
return softCurrentTime;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/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 4832a96..b293c90 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
@@ -66,6 +66,7 @@ public class DummyStepHandler implements StepHandler {
* copy.
* @param isLast true if the step is the last one
*/
+ @Override
public void handleStep(final StepInterpolator interpolator, final boolean isLast) {
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/main/java/org/apache/commons/math4/ode/sampling/FieldStepNormalizer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/sampling/FieldStepNormalizer.java b/src/main/java/org/apache/commons/math4/ode/sampling/FieldStepNormalizer.java
index 9038080..e50e297 100644
--- a/src/main/java/org/apache/commons/math4/ode/sampling/FieldStepNormalizer.java
+++ b/src/main/java/org/apache/commons/math4/ode/sampling/FieldStepNormalizer.java
@@ -193,6 +193,7 @@ public class FieldStepNormalizer<T extends RealFieldElement<T>> implements Field
* @exception MaxCountExceededException if the interpolator throws one because
* the number of functions evaluations is exceeded
*/
+ @Override
public void handleStep(final FieldStepInterpolator<T> interpolator, final boolean isLast)
throws MaxCountExceededException {
// The first time, update the last state with the start information.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/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 abf95e1..dfc34fe 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
@@ -200,6 +200,7 @@ public class StepNormalizer implements StepHandler {
* @exception MaxCountExceededException if the interpolator throws one because
* the number of functions evaluations is exceeded
*/
+ @Override
public void handleStep(final StepInterpolator interpolator, final boolean isLast)
throws MaxCountExceededException {
// The first time, update the last state with the start information.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/PerfTestUtils.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/PerfTestUtils.java b/src/test/java/org/apache/commons/math4/PerfTestUtils.java
index e56c81f..dfeed00 100644
--- a/src/test/java/org/apache/commons/math4/PerfTestUtils.java
+++ b/src/test/java/org/apache/commons/math4/PerfTestUtils.java
@@ -299,6 +299,7 @@ public class PerfTestUtils {
}
/** {@inheritDoc} */
+ @Override
public abstract Double call() throws Exception;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/analysis/integration/gauss/BaseRuleFactoryTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/analysis/integration/gauss/BaseRuleFactoryTest.java b/src/test/java/org/apache/commons/math4/analysis/integration/gauss/BaseRuleFactoryTest.java
index 6eda161..3e79548 100644
--- a/src/test/java/org/apache/commons/math4/analysis/integration/gauss/BaseRuleFactoryTest.java
+++ b/src/test/java/org/apache/commons/math4/analysis/integration/gauss/BaseRuleFactoryTest.java
@@ -70,6 +70,7 @@ public class BaseRuleFactoryTest {
class RuleBuilder implements Callable<Pair<double[], double[]>> {
private static final DummyRuleFactory factory = new DummyRuleFactory();
+ @Override
public Pair<double[], double[]> call() {
final int dummy = 2; // Always request the same rule.
return factory.getRule(dummy);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/analysis/integration/gauss/HermiteTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/analysis/integration/gauss/HermiteTest.java b/src/test/java/org/apache/commons/math4/analysis/integration/gauss/HermiteTest.java
index b140443..513b13f 100644
--- a/src/test/java/org/apache/commons/math4/analysis/integration/gauss/HermiteTest.java
+++ b/src/test/java/org/apache/commons/math4/analysis/integration/gauss/HermiteTest.java
@@ -46,6 +46,7 @@ public class HermiteTest {
// is transformed to
// f(y) * exp(-y^2)
final UnivariateFunction f = new UnivariateFunction() {
+ @Override
public double value(double y) {
return oneOverSqrtPi; // Constant function.
}
@@ -73,6 +74,7 @@ public class HermiteTest {
// is transformed to
// f(y) * exp(-y^2)
final UnivariateFunction f = new UnivariateFunction() {
+ @Override
public double value(double y) {
return oneOverSqrtPi * (sqrtTwo * sigma * y + mu);
}
@@ -99,6 +101,7 @@ public class HermiteTest {
// is transformed to
// f(y) * exp(-y^2)
final UnivariateFunction f = new UnivariateFunction() {
+ @Override
public double value(double y) {
return twoOverSqrtPi * sigma2 * y * y;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/analysis/solvers/BracketingNthOrderBrentSolverTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/analysis/solvers/BracketingNthOrderBrentSolverTest.java b/src/test/java/org/apache/commons/math4/analysis/solvers/BracketingNthOrderBrentSolverTest.java
index 5f6c123..2a4e8f1 100644
--- a/src/test/java/org/apache/commons/math4/analysis/solvers/BracketingNthOrderBrentSolverTest.java
+++ b/src/test/java/org/apache/commons/math4/analysis/solvers/BracketingNthOrderBrentSolverTest.java
@@ -89,6 +89,7 @@ public final class BracketingNthOrderBrentSolverTest extends BaseSecantSolverAbs
BracketingNthOrderBrentSolver solver =
new BracketingNthOrderBrentSolver(1.0e-12, 1.0e-10, 1.0e-22, 5);
UnivariateFunction sharpTurn = new UnivariateFunction() {
+ @Override
public double value(double x) {
return (2 * x + 1) / (1.0e9 * (x + 1));
}
@@ -204,10 +205,12 @@ public final class BracketingNthOrderBrentSolverTest extends BaseSecantSolverAbs
return max;
}
+ @Override
public double value(final double x) {
return value(new DerivativeStructure(0, 0, x)).getValue();
}
+ @Override
public abstract DerivativeStructure value(final DerivativeStructure t);
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/analysis/solvers/BrentSolverTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/analysis/solvers/BrentSolverTest.java b/src/test/java/org/apache/commons/math4/analysis/solvers/BrentSolverTest.java
index 59547d0..3da021c 100644
--- a/src/test/java/org/apache/commons/math4/analysis/solvers/BrentSolverTest.java
+++ b/src/test/java/org/apache/commons/math4/analysis/solvers/BrentSolverTest.java
@@ -256,6 +256,7 @@ public final class BrentSolverTest {
FunctionUtils.multiply(new Constant(1e4),
FunctionUtils.compose(inv, sqrt)));
+ @Override
public double value(double x) {
return func.value(new DerivativeStructure(1, 1, 0, x)).getPartialDerivative(1);
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/analysis/solvers/FieldBracketingNthOrderBrentSolverTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/analysis/solvers/FieldBracketingNthOrderBrentSolverTest.java b/src/test/java/org/apache/commons/math4/analysis/solvers/FieldBracketingNthOrderBrentSolverTest.java
index d50e06c..a8dcf2a 100644
--- a/src/test/java/org/apache/commons/math4/analysis/solvers/FieldBracketingNthOrderBrentSolverTest.java
+++ b/src/test/java/org/apache/commons/math4/analysis/solvers/FieldBracketingNthOrderBrentSolverTest.java
@@ -54,6 +54,7 @@ public final class FieldBracketingNthOrderBrentSolverTest {
new FieldBracketingNthOrderBrentSolver<>(relativeAccuracy, absoluteAccuracy,
field.newDfp(1.0e-20), 20);
RealFieldUnivariateFunction<Dfp> f = new RealFieldUnivariateFunction<Dfp>() {
+ @Override
public Dfp value(Dfp x) {
Dfp one = field.getOne();
Dfp oneHalf = one.divide(2);
@@ -86,36 +87,42 @@ public final class FieldBracketingNthOrderBrentSolverTest {
// available here: http://www.math.nps.navy.mil/~bneta/SeveralNewMethods.PDF
for (AllowedSolution allowed : AllowedSolution.values()) {
check(new RealFieldUnivariateFunction<Dfp>() {
+ @Override
public Dfp value(Dfp x) {
return DfpMath.sin(x).subtract(x.divide(2));
}
}, 200, -2.0, 2.0, allowed);
check(new RealFieldUnivariateFunction<Dfp>() {
+ @Override
public Dfp value(Dfp x) {
return DfpMath.pow(x, 5).add(x).subtract(field.newDfp(10000));
}
}, 200, -5.0, 10.0, allowed);
check(new RealFieldUnivariateFunction<Dfp>() {
+ @Override
public Dfp value(Dfp x) {
return x.sqrt().subtract(field.getOne().divide(x)).subtract(field.newDfp(3));
}
}, 200, 0.001, 10.0, allowed);
check(new RealFieldUnivariateFunction<Dfp>() {
+ @Override
public Dfp value(Dfp x) {
return DfpMath.exp(x).add(x).subtract(field.newDfp(20));
}
}, 200, -5.0, 5.0, allowed);
check(new RealFieldUnivariateFunction<Dfp>() {
+ @Override
public Dfp value(Dfp x) {
return DfpMath.log(x).add(x.sqrt()).subtract(field.newDfp(5));
}
}, 200, 0.001, 10.0, allowed);
check(new RealFieldUnivariateFunction<Dfp>() {
+ @Override
public Dfp value(Dfp x) {
return x.subtract(field.getOne()).multiply(x).multiply(x).subtract(field.getOne());
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/analysis/solvers/RegulaFalsiSolverTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/analysis/solvers/RegulaFalsiSolverTest.java b/src/test/java/org/apache/commons/math4/analysis/solvers/RegulaFalsiSolverTest.java
index 8f3fece..774c807 100644
--- a/src/test/java/org/apache/commons/math4/analysis/solvers/RegulaFalsiSolverTest.java
+++ b/src/test/java/org/apache/commons/math4/analysis/solvers/RegulaFalsiSolverTest.java
@@ -49,6 +49,7 @@ public final class RegulaFalsiSolverTest extends BaseSecantSolverAbstractTest {
public void testIssue631() {
final UnivariateFunction f = new UnivariateFunction() {
/** {@inheritDoc} */
+ @Override
public double value(double x) {
return FastMath.exp(x) - FastMath.pow(Math.PI, 3.0);
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/analysis/solvers/UnivariateSolverUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/analysis/solvers/UnivariateSolverUtilsTest.java b/src/test/java/org/apache/commons/math4/analysis/solvers/UnivariateSolverUtilsTest.java
index f2471b7..ea9ca3d 100644
--- a/src/test/java/org/apache/commons/math4/analysis/solvers/UnivariateSolverUtilsTest.java
+++ b/src/test/java/org/apache/commons/math4/analysis/solvers/UnivariateSolverUtilsTest.java
@@ -121,6 +121,7 @@ public class UnivariateSolverUtilsTest {
@Test(expected=NoBracketingException.class)
public void testBracketLinear(){
UnivariateSolverUtils.bracket(new UnivariateFunction() {
+ @Override
public double value(double x) {
return 1 - x;
}
@@ -130,6 +131,7 @@ public class UnivariateSolverUtilsTest {
@Test
public void testBracketExponential(){
double[] result = UnivariateSolverUtils.bracket(new UnivariateFunction() {
+ @Override
public double value(double x) {
return 1 - x;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/distribution/AbstractIntegerDistributionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/distribution/AbstractIntegerDistributionTest.java b/src/test/java/org/apache/commons/math4/distribution/AbstractIntegerDistributionTest.java
index 32e5976..5643be3 100644
--- a/src/test/java/org/apache/commons/math4/distribution/AbstractIntegerDistributionTest.java
+++ b/src/test/java/org/apache/commons/math4/distribution/AbstractIntegerDistributionTest.java
@@ -83,6 +83,7 @@ public class AbstractIntegerDistributionTest {
private final double p = 1d/6d;
+ @Override
public double probability(int x) {
if (x < 1 || x > 6) {
return 0;
@@ -91,6 +92,7 @@ public class AbstractIntegerDistributionTest {
}
}
+ @Override
public double cumulativeProbability(int x) {
if (x < 1) {
return 0;
@@ -101,22 +103,27 @@ public class AbstractIntegerDistributionTest {
}
}
+ @Override
public double getNumericalMean() {
return 3.5;
}
+ @Override
public double getNumericalVariance() {
return 70/24; // E(X^2) - E(X)^2
}
+ @Override
public int getSupportLowerBound() {
return 1;
}
+ @Override
public int getSupportUpperBound() {
return 6;
}
+ @Override
public final boolean isSupportConnected() {
return true;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/distribution/AbstractRealDistributionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/distribution/AbstractRealDistributionTest.java b/src/test/java/org/apache/commons/math4/distribution/AbstractRealDistributionTest.java
index 449f4a6..60645c2 100644
--- a/src/test/java/org/apache/commons/math4/distribution/AbstractRealDistributionTest.java
+++ b/src/test/java/org/apache/commons/math4/distribution/AbstractRealDistributionTest.java
@@ -158,6 +158,7 @@ public class AbstractRealDistributionTest {
public double getNumericalMean() {
final UnivariateFunction f = new UnivariateFunction() {
+ @Override
public double value(final double x) {
return x * density(x);
}
@@ -171,6 +172,7 @@ public class AbstractRealDistributionTest {
final double meanX = getNumericalMean();
final UnivariateFunction f = new UnivariateFunction() {
+ @Override
public double value(final double x) {
return x * x * density(x);
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/distribution/RealDistributionAbstractTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/distribution/RealDistributionAbstractTest.java b/src/test/java/org/apache/commons/math4/distribution/RealDistributionAbstractTest.java
index 5b087c2..fd96ce4 100644
--- a/src/test/java/org/apache/commons/math4/distribution/RealDistributionAbstractTest.java
+++ b/src/test/java/org/apache/commons/math4/distribution/RealDistributionAbstractTest.java
@@ -356,6 +356,7 @@ public abstract class RealDistributionAbstractTest {
final BaseAbstractUnivariateIntegrator integrator =
new IterativeLegendreGaussIntegrator(5, 1.0e-12, 1.0e-10);
final UnivariateFunction d = new UnivariateFunction() {
+ @Override
public double value(double x) {
return distribution.density(x);
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/fitting/leastsquares/AbstractLeastSquaresOptimizerAbstractTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/fitting/leastsquares/AbstractLeastSquaresOptimizerAbstractTest.java b/src/test/java/org/apache/commons/math4/fitting/leastsquares/AbstractLeastSquaresOptimizerAbstractTest.java
index 6880bbe..a7d7374 100644
--- a/src/test/java/org/apache/commons/math4/fitting/leastsquares/AbstractLeastSquaresOptimizerAbstractTest.java
+++ b/src/test/java/org/apache/commons/math4/fitting/leastsquares/AbstractLeastSquaresOptimizerAbstractTest.java
@@ -131,6 +131,7 @@ public abstract class AbstractLeastSquaresOptimizerAbstractTest {
.weight(new DiagonalMatrix(new double[]{1}))
.start(new double[]{3})
.model(new MultivariateJacobianFunction() {
+ @Override
public Pair<RealVector, RealMatrix> value(final RealVector point) {
return new Pair<RealVector, RealMatrix>(
new ArrayRealVector(
@@ -550,6 +551,7 @@ public abstract class AbstractLeastSquaresOptimizerAbstractTest {
final LeastSquaresBuilder builder = problem.getBuilder()
.checker(new ConvergenceChecker<Evaluation>() {
+ @Override
public boolean converged(int iteration, Evaluation previous, Evaluation current) {
Assert.assertThat(
previous.getPoint(),
@@ -580,6 +582,7 @@ public abstract class AbstractLeastSquaresOptimizerAbstractTest {
public MultivariateVectorFunction getModelFunction() {
return new MultivariateVectorFunction() {
+ @Override
public double[] value(double[] params) {
return factors.operate(params);
}
@@ -588,6 +591,7 @@ public abstract class AbstractLeastSquaresOptimizerAbstractTest {
public MultivariateMatrixFunction getModelFunctionJacobian() {
return new MultivariateMatrixFunction() {
+ @Override
public double[][] value(double[] params) {
return factors.getData();
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/fitting/leastsquares/CircleProblem.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/fitting/leastsquares/CircleProblem.java b/src/test/java/org/apache/commons/math4/fitting/leastsquares/CircleProblem.java
index 016bf8b..01961ed 100644
--- a/src/test/java/org/apache/commons/math4/fitting/leastsquares/CircleProblem.java
+++ b/src/test/java/org/apache/commons/math4/fitting/leastsquares/CircleProblem.java
@@ -103,6 +103,7 @@ class CircleProblem {
public MultivariateVectorFunction getModelFunction() {
return new MultivariateVectorFunction() {
+ @Override
public double[] value(double[] params) {
final double cx = params[0];
final double cy = params[1];
@@ -148,6 +149,7 @@ class CircleProblem {
public MultivariateMatrixFunction getModelFunctionJacobian() {
return new MultivariateMatrixFunction() {
+ @Override
public double[][] value(double[] point) {
return jacobian(point);
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/fitting/leastsquares/CircleVectorial.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/fitting/leastsquares/CircleVectorial.java b/src/test/java/org/apache/commons/math4/fitting/leastsquares/CircleVectorial.java
index 87a2b6f..69d0b01 100644
--- a/src/test/java/org/apache/commons/math4/fitting/leastsquares/CircleVectorial.java
+++ b/src/test/java/org/apache/commons/math4/fitting/leastsquares/CircleVectorial.java
@@ -50,6 +50,7 @@ class CircleVectorial {
public MultivariateVectorFunction getModelFunction() {
return new MultivariateVectorFunction() {
+ @Override
public double[] value(double[] params) {
Vector2D center = new Vector2D(params[0], params[1]);
double radius = getRadius(center);
@@ -65,6 +66,7 @@ class CircleVectorial {
public MultivariateMatrixFunction getModelFunctionJacobian() {
return new MultivariateMatrixFunction() {
+ @Override
public double[][] value(double[] params) {
final int n = points.size();
final Vector2D center = new Vector2D(params[0], params[1]);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/fitting/leastsquares/EvaluationRmsCheckerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/fitting/leastsquares/EvaluationRmsCheckerTest.java b/src/test/java/org/apache/commons/math4/fitting/leastsquares/EvaluationRmsCheckerTest.java
index 767c04e..ef09b0e 100644
--- a/src/test/java/org/apache/commons/math4/fitting/leastsquares/EvaluationRmsCheckerTest.java
+++ b/src/test/java/org/apache/commons/math4/fitting/leastsquares/EvaluationRmsCheckerTest.java
@@ -54,38 +54,47 @@ public class EvaluationRmsCheckerTest {
*/
private static Evaluation mockEvaluation(final double rms) {
return new Evaluation() {
+ @Override
public RealMatrix getCovariances(double threshold) {
return null;
}
+ @Override
public RealVector getSigma(double covarianceSingularityThreshold) {
return null;
}
+ @Override
public double getRMS() {
return rms;
}
+ @Override
public RealMatrix getJacobian() {
return null;
}
+ @Override
public double getCost() {
return 0;
}
+ @Override
public double getChiSquare() {
return 0;
}
+ @Override
public double getReducedChiSquare(int n) {
return 0;
}
+ @Override
public RealVector getResiduals() {
return null;
}
+ @Override
public RealVector getPoint() {
return null;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/fitting/leastsquares/EvaluationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/fitting/leastsquares/EvaluationTest.java b/src/test/java/org/apache/commons/math4/fitting/leastsquares/EvaluationTest.java
index bffb95b..f8bcc9d 100644
--- a/src/test/java/org/apache/commons/math4/fitting/leastsquares/EvaluationTest.java
+++ b/src/test/java/org/apache/commons/math4/fitting/leastsquares/EvaluationTest.java
@@ -73,6 +73,7 @@ public class EvaluationTest {
Evaluation evaluation = new LeastSquaresBuilder()
.target(new ArrayRealVector(new double[]{3,-1}))
.model(new MultivariateJacobianFunction() {
+ @Override
public Pair<RealVector, RealMatrix> value(RealVector point) {
return new Pair<RealVector, RealMatrix>(
new ArrayRealVector(new double[]{1, 2}),
@@ -97,6 +98,7 @@ public class EvaluationTest {
RealVector point = new ArrayRealVector(2);
Evaluation evaluation = new LeastSquaresBuilder()
.model(new MultivariateJacobianFunction() {
+ @Override
public Pair<RealVector, RealMatrix> value(RealVector point) {
return new Pair<RealVector, RealMatrix>(
new ArrayRealVector(2),
@@ -133,6 +135,7 @@ public class EvaluationTest {
Evaluation evaluation = new LeastSquaresBuilder()
.weight(new DiagonalMatrix(new double[]{16, 4}))
.model(new MultivariateJacobianFunction() {
+ @Override
public Pair<RealVector, RealMatrix> value(RealVector actualPoint) {
//verify correct values passed in
Assert.assertArrayEquals(
@@ -261,6 +264,7 @@ public class EvaluationTest {
// "ValueAndJacobianFunction" is required but we implement only
// "MultivariateJacobianFunction".
final MultivariateJacobianFunction m1 = new MultivariateJacobianFunction() {
+ @Override
public Pair<RealVector, RealMatrix> value(RealVector notUsed) {
return new Pair<>(null, null);
}
@@ -275,12 +279,15 @@ public class EvaluationTest {
}
final MultivariateJacobianFunction m2 = new ValueAndJacobianFunction() {
+ @Override
public Pair<RealVector, RealMatrix> value(RealVector notUsed) {
return new Pair<>(null, null);
}
+ @Override
public RealVector computeValue(final double[] params) {
return null;
}
+ @Override
public RealMatrix computeJacobian(final double[] params) {
return null;
}
@@ -314,6 +321,7 @@ public class EvaluationTest {
/** Used for testing direct vs lazy evaluation. */
private MultivariateVectorFunction dummyModel() {
return new MultivariateVectorFunction() {
+ @Override
public double[] value(double[] p) {
throw new RuntimeException("dummyModel");
}
@@ -323,6 +331,7 @@ public class EvaluationTest {
/** Used for testing direct vs lazy evaluation. */
private MultivariateMatrixFunction dummyJacobian() {
return new MultivariateMatrixFunction() {
+ @Override
public double[][] value(double[] p) {
throw new RuntimeException("dummyJacobian");
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/fitting/leastsquares/LevenbergMarquardtOptimizerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/fitting/leastsquares/LevenbergMarquardtOptimizerTest.java b/src/test/java/org/apache/commons/math4/fitting/leastsquares/LevenbergMarquardtOptimizerTest.java
index cd884bb..29466b6 100644
--- a/src/test/java/org/apache/commons/math4/fitting/leastsquares/LevenbergMarquardtOptimizerTest.java
+++ b/src/test/java/org/apache/commons/math4/fitting/leastsquares/LevenbergMarquardtOptimizerTest.java
@@ -321,6 +321,7 @@ public class LevenbergMarquardtOptimizerTest
// Build a new problem with a validator that amounts to cheating.
final ParameterValidator cheatValidator
= new ParameterValidator() {
+ @Override
public RealVector validate(RealVector params) {
// Cheat: return the optimum found previously.
return optimum.getPoint();
@@ -340,6 +341,7 @@ public class LevenbergMarquardtOptimizerTest
LeastSquaresProblem lsp = new LinearProblem(new double[][] {{1}}, new double[] {1})
.getBuilder()
.checker(new ConvergenceChecker<Evaluation>() {
+ @Override
public boolean converged(int iteration, Evaluation previous, Evaluation current) {
return true;
}
@@ -371,6 +373,7 @@ public class LevenbergMarquardtOptimizerTest
public MultivariateVectorFunction getModelFunction() {
return new MultivariateVectorFunction() {
+ @Override
public double[] value(double[] params) {
double[] values = new double[time.size()];
for (int i = 0; i < values.length; ++i) {
@@ -386,6 +389,7 @@ public class LevenbergMarquardtOptimizerTest
public MultivariateMatrixFunction getModelFunctionJacobian() {
return new MultivariateMatrixFunction() {
+ @Override
public double[][] value(double[] params) {
double[][] jacobian = new double[time.size()][5];
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/fitting/leastsquares/MinpackTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/fitting/leastsquares/MinpackTest.java b/src/test/java/org/apache/commons/math4/fitting/leastsquares/MinpackTest.java
index 98b221f..e68a518 100644
--- a/src/test/java/org/apache/commons/math4/fitting/leastsquares/MinpackTest.java
+++ b/src/test/java/org/apache/commons/math4/fitting/leastsquares/MinpackTest.java
@@ -595,6 +595,7 @@ public class MinpackTest {
public MultivariateVectorFunction getModelFunction() {
return new MultivariateVectorFunction() {
+ @Override
public double[] value(double[] point) {
return computeValue(point);
}
@@ -603,6 +604,7 @@ public class MinpackTest {
public MultivariateMatrixFunction getModelFunctionJacobian() {
return new MultivariateMatrixFunction() {
+ @Override
public double[][] value(double[] point) {
return computeJacobian(point);
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/fitting/leastsquares/StatisticalReferenceDataset.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/fitting/leastsquares/StatisticalReferenceDataset.java b/src/test/java/org/apache/commons/math4/fitting/leastsquares/StatisticalReferenceDataset.java
index 08c60f7..491a463 100644
--- a/src/test/java/org/apache/commons/math4/fitting/leastsquares/StatisticalReferenceDataset.java
+++ b/src/test/java/org/apache/commons/math4/fitting/leastsquares/StatisticalReferenceDataset.java
@@ -145,6 +145,7 @@ public abstract class StatisticalReferenceDataset {
class LeastSquaresProblem {
public MultivariateVectorFunction getModelFunction() {
return new MultivariateVectorFunction() {
+ @Override
public double[] value(final double[] a) {
final int n = getNumObservations();
final double[] yhat = new double[n];
@@ -158,6 +159,7 @@ public abstract class StatisticalReferenceDataset {
public MultivariateMatrixFunction getModelFunctionJacobian() {
return new MultivariateMatrixFunction() {
+ @Override
public double[][] value(final double[] a)
throws IllegalArgumentException {
final int n = getNumObservations();
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/fitting/leastsquares/StraightLineProblem.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/fitting/leastsquares/StraightLineProblem.java b/src/test/java/org/apache/commons/math4/fitting/leastsquares/StraightLineProblem.java
index 7ce8323..9124703 100644
--- a/src/test/java/org/apache/commons/math4/fitting/leastsquares/StraightLineProblem.java
+++ b/src/test/java/org/apache/commons/math4/fitting/leastsquares/StraightLineProblem.java
@@ -96,6 +96,7 @@ class StraightLineProblem {
public MultivariateVectorFunction getModelFunction() {
return new MultivariateVectorFunction() {
+ @Override
public double[] value(double[] params) {
final Model line = new Model(params[0], params[1]);
@@ -112,6 +113,7 @@ class StraightLineProblem {
public MultivariateMatrixFunction getModelFunctionJacobian() {
return new MultivariateMatrixFunction() {
+ @Override
public double[][] value(double[] point) {
return jacobian(point);
}
@@ -159,6 +161,7 @@ class StraightLineProblem {
this.b = b;
}
+ @Override
public double value(double x) {
return a * x + b;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/genetics/ChromosomeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/genetics/ChromosomeTest.java b/src/test/java/org/apache/commons/math4/genetics/ChromosomeTest.java
index 3c1a6ed..091ed8d 100644
--- a/src/test/java/org/apache/commons/math4/genetics/ChromosomeTest.java
+++ b/src/test/java/org/apache/commons/math4/genetics/ChromosomeTest.java
@@ -31,16 +31,19 @@ public class ChromosomeTest {
@Test
public void testCompareTo() {
Chromosome c1 = new Chromosome() {
+ @Override
public double fitness() {
return 0;
}
};
Chromosome c2 = new Chromosome() {
+ @Override
public double fitness() {
return 10;
}
};
Chromosome c3 = new Chromosome() {
+ @Override
public double fitness() {
return 10;
}
@@ -67,26 +70,31 @@ public class ChromosomeTest {
@Test
public void testFindSameChromosome() {
Chromosome c1 = new DummyChromosome(1) {
+ @Override
public double fitness() {
return 1;
}
};
Chromosome c2 = new DummyChromosome(2) {
+ @Override
public double fitness() {
return 2;
}
};
Chromosome c3 = new DummyChromosome(3) {
+ @Override
public double fitness() {
return 3;
}
};
Chromosome c4 = new DummyChromosome(1) {
+ @Override
public double fitness() {
return 5;
}
};
Chromosome c5 = new DummyChromosome(15) {
+ @Override
public double fitness() {
return 15;
}
@@ -97,6 +105,7 @@ public class ChromosomeTest {
popChr.add(c2);
popChr.add(c3);
Population pop = new ListPopulation(popChr,3) {
+ @Override
public Population nextGeneration() {
// not important
return null;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/genetics/CycleCrossoverTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/genetics/CycleCrossoverTest.java b/src/test/java/org/apache/commons/math4/genetics/CycleCrossoverTest.java
index fd7b177..862bc40 100644
--- a/src/test/java/org/apache/commons/math4/genetics/CycleCrossoverTest.java
+++ b/src/test/java/org/apache/commons/math4/genetics/CycleCrossoverTest.java
@@ -127,6 +127,7 @@ public class CycleCrossoverTest {
final Integer[] p1 = new Integer[] { 1, 0, 1, 0, 0, 1, 0, 1, 1 };
final BinaryChromosome p1c = new DummyBinaryChromosome(p1);
final Chromosome p2c = new Chromosome() {
+ @Override
public double fitness() {
// Not important
return 0;
@@ -142,6 +143,7 @@ public class CycleCrossoverTest {
final Integer[] p1 = new Integer[] { 1, 0, 1, 0, 0, 1, 0, 1, 1 };
final BinaryChromosome p2c = new DummyBinaryChromosome(p1);
final Chromosome p1c = new Chromosome() {
+ @Override
public double fitness() {
// Not important
return 0;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/genetics/DummyBinaryChromosome.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/genetics/DummyBinaryChromosome.java b/src/test/java/org/apache/commons/math4/genetics/DummyBinaryChromosome.java
index 789da5a..30700cf 100644
--- a/src/test/java/org/apache/commons/math4/genetics/DummyBinaryChromosome.java
+++ b/src/test/java/org/apache/commons/math4/genetics/DummyBinaryChromosome.java
@@ -39,6 +39,7 @@ public class DummyBinaryChromosome extends BinaryChromosome {
return new DummyBinaryChromosome(chromosomeRepresentation);
}
+ @Override
public double fitness() {
// uninteresting
return 0;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/genetics/DummyListChromosome.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/genetics/DummyListChromosome.java b/src/test/java/org/apache/commons/math4/genetics/DummyListChromosome.java
index f4c8602..c78f67e 100644
--- a/src/test/java/org/apache/commons/math4/genetics/DummyListChromosome.java
+++ b/src/test/java/org/apache/commons/math4/genetics/DummyListChromosome.java
@@ -34,6 +34,7 @@ public class DummyListChromosome extends AbstractListChromosome<Integer> {
super(representation);
}
+ @Override
public double fitness() {
// Not important.
return 0;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/genetics/DummyRandomKey.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/genetics/DummyRandomKey.java b/src/test/java/org/apache/commons/math4/genetics/DummyRandomKey.java
index 594ebb3..f8af835 100644
--- a/src/test/java/org/apache/commons/math4/genetics/DummyRandomKey.java
+++ b/src/test/java/org/apache/commons/math4/genetics/DummyRandomKey.java
@@ -39,6 +39,7 @@ public class DummyRandomKey extends RandomKey<String> {
return new DummyRandomKey(chromosomeRepresentation);
}
+ @Override
public double fitness() {
// unimportant
return 0;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/genetics/ElitisticListPopulationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/genetics/ElitisticListPopulationTest.java b/src/test/java/org/apache/commons/math4/genetics/ElitisticListPopulationTest.java
index 4737b61..e231830 100644
--- a/src/test/java/org/apache/commons/math4/genetics/ElitisticListPopulationTest.java
+++ b/src/test/java/org/apache/commons/math4/genetics/ElitisticListPopulationTest.java
@@ -100,6 +100,7 @@ public class ElitisticListPopulationTest {
counter++;
}
+ @Override
public double fitness() {
return this.fitness;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/genetics/FixedElapsedTimeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/genetics/FixedElapsedTimeTest.java b/src/test/java/org/apache/commons/math4/genetics/FixedElapsedTimeTest.java
index 75e21bb..fdfa971 100644
--- a/src/test/java/org/apache/commons/math4/genetics/FixedElapsedTimeTest.java
+++ b/src/test/java/org/apache/commons/math4/genetics/FixedElapsedTimeTest.java
@@ -31,25 +31,31 @@ public class FixedElapsedTimeTest {
@Test
public void testIsSatisfied() {
final Population pop = new Population() {
+ @Override
public void addChromosome(final Chromosome chromosome) {
// unimportant
}
+ @Override
public Chromosome getFittestChromosome() {
// unimportant
return null;
}
+ @Override
public int getPopulationLimit() {
// unimportant
return 0;
}
+ @Override
public int getPopulationSize() {
// unimportant
return 0;
}
+ @Override
public Population nextGeneration() {
// unimportant
return null;
}
+ @Override
public Iterator<Chromosome> iterator() {
// unimportant
return null;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/genetics/FixedGenerationCountTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/genetics/FixedGenerationCountTest.java b/src/test/java/org/apache/commons/math4/genetics/FixedGenerationCountTest.java
index e174879..07e9e04 100644
--- a/src/test/java/org/apache/commons/math4/genetics/FixedGenerationCountTest.java
+++ b/src/test/java/org/apache/commons/math4/genetics/FixedGenerationCountTest.java
@@ -33,25 +33,31 @@ public class FixedGenerationCountTest {
int cnt = 0;
Population pop = new Population() {
+ @Override
public void addChromosome(Chromosome chromosome) {
// unimportant
}
+ @Override
public Chromosome getFittestChromosome() {
// unimportant
return null;
}
+ @Override
public int getPopulationLimit() {
// unimportant
return 0;
}
+ @Override
public int getPopulationSize() {
// unimportant
return 0;
}
+ @Override
public Population nextGeneration() {
// unimportant
return null;
}
+ @Override
public Iterator<Chromosome> iterator() {
// unimportant
return null;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/genetics/GeneticAlgorithmTestBinary.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/genetics/GeneticAlgorithmTestBinary.java b/src/test/java/org/apache/commons/math4/genetics/GeneticAlgorithmTestBinary.java
index e383e34..71a1258 100644
--- a/src/test/java/org/apache/commons/math4/genetics/GeneticAlgorithmTestBinary.java
+++ b/src/test/java/org/apache/commons/math4/genetics/GeneticAlgorithmTestBinary.java
@@ -115,6 +115,7 @@ public class GeneticAlgorithmTestBinary {
/**
* Returns number of elements != 0
*/
+ @Override
public double fitness() {
int num = 0;
for (int val : this.getRepresentation()) {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/genetics/GeneticAlgorithmTestPermutations.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/genetics/GeneticAlgorithmTestPermutations.java b/src/test/java/org/apache/commons/math4/genetics/GeneticAlgorithmTestPermutations.java
index e4ccd50..1e01915 100644
--- a/src/test/java/org/apache/commons/math4/genetics/GeneticAlgorithmTestPermutations.java
+++ b/src/test/java/org/apache/commons/math4/genetics/GeneticAlgorithmTestPermutations.java
@@ -120,6 +120,7 @@ public class GeneticAlgorithmTestPermutations {
super(representation);
}
+ @Override
public double fitness() {
int res = 0;
List<Integer> decoded = decode(sequence);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/genetics/ListPopulationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/genetics/ListPopulationTest.java b/src/test/java/org/apache/commons/math4/genetics/ListPopulationTest.java
index f13fb91..1d337ab 100644
--- a/src/test/java/org/apache/commons/math4/genetics/ListPopulationTest.java
+++ b/src/test/java/org/apache/commons/math4/genetics/ListPopulationTest.java
@@ -35,16 +35,19 @@ public class ListPopulationTest {
@Test
public void testGetFittestChromosome() {
Chromosome c1 = new Chromosome() {
+ @Override
public double fitness() {
return 0;
}
};
Chromosome c2 = new Chromosome() {
+ @Override
public double fitness() {
return 10;
}
};
Chromosome c3 = new Chromosome() {
+ @Override
public double fitness() {
return 15;
}
@@ -56,6 +59,7 @@ public class ListPopulationTest {
chromosomes.add(c3);
ListPopulation population = new ListPopulation(chromosomes, 10) {
+ @Override
public Population nextGeneration() {
// not important
return null;
@@ -73,6 +77,7 @@ public class ListPopulationTest {
chromosomes.add(new DummyBinaryChromosome(BinaryChromosome.randomBinaryRepresentation(3)));
final ListPopulation population = new ListPopulation(10) {
+ @Override
public Population nextGeneration() {
// not important
return null;
@@ -91,6 +96,7 @@ public class ListPopulationTest {
@Test(expected = NotPositiveException.class)
public void testSetPopulationLimit() {
final ListPopulation population = new ListPopulation(10) {
+ @Override
public Population nextGeneration() {
// not important
return null;
@@ -103,6 +109,7 @@ public class ListPopulationTest {
@Test(expected = NotPositiveException.class)
public void testConstructorPopulationLimitNotPositive() {
new ListPopulation(-10) {
+ @Override
public Population nextGeneration() {
// not important
return null;
@@ -115,6 +122,7 @@ public class ListPopulationTest {
final ArrayList<Chromosome> chromosomes = new ArrayList<> ();
chromosomes.add(new DummyBinaryChromosome(BinaryChromosome.randomBinaryRepresentation(3)));
new ListPopulation(chromosomes, -10) {
+ @Override
public Population nextGeneration() {
// not important
return null;
@@ -129,6 +137,7 @@ public class ListPopulationTest {
chromosomes.add(new DummyBinaryChromosome(BinaryChromosome.randomBinaryRepresentation(3)));
chromosomes.add(new DummyBinaryChromosome(BinaryChromosome.randomBinaryRepresentation(3)));
new ListPopulation(chromosomes, 1) {
+ @Override
public Population nextGeneration() {
// not important
return null;
@@ -144,6 +153,7 @@ public class ListPopulationTest {
chromosomes.add(new DummyBinaryChromosome(BinaryChromosome.randomBinaryRepresentation(3)));
final ListPopulation population = new ListPopulation(2) {
+ @Override
public Population nextGeneration() {
// not important
return null;
@@ -157,6 +167,7 @@ public class ListPopulationTest {
public void testAddTooManyChromosomesSingleCall() {
final ListPopulation population = new ListPopulation(2) {
+ @Override
public Population nextGeneration() {
// not important
return null;
@@ -176,6 +187,7 @@ public class ListPopulationTest {
chromosomes.add(new DummyBinaryChromosome(BinaryChromosome.randomBinaryRepresentation(3)));
final ListPopulation population = new ListPopulation(10) {
+ @Override
public Population nextGeneration() {
// not important
return null;
@@ -199,6 +211,7 @@ public class ListPopulationTest {
chromosomes.add(new DummyBinaryChromosome(BinaryChromosome.randomBinaryRepresentation(3)));
final ListPopulation population = new ListPopulation(chromosomes, 3) {
+ @Override
public Population nextGeneration() {
// not important
return null;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/genetics/NPointCrossoverTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/genetics/NPointCrossoverTest.java b/src/test/java/org/apache/commons/math4/genetics/NPointCrossoverTest.java
index 2a1231f..a03185e 100644
--- a/src/test/java/org/apache/commons/math4/genetics/NPointCrossoverTest.java
+++ b/src/test/java/org/apache/commons/math4/genetics/NPointCrossoverTest.java
@@ -60,6 +60,7 @@ public class NPointCrossoverTest {
final Integer[] p1 = new Integer[] {1,0,1,0,0,1,0,1,1};
final BinaryChromosome p1c = new DummyBinaryChromosome(p1);
final Chromosome p2c = new Chromosome() {
+ @Override
public double fitness() {
// Not important
return 0;
@@ -75,6 +76,7 @@ public class NPointCrossoverTest {
final Integer[] p1 = new Integer[] {1,0,1,0,0,1,0,1,1};
final BinaryChromosome p2c = new DummyBinaryChromosome(p1);
final Chromosome p1c = new Chromosome() {
+ @Override
public double fitness() {
// Not important
return 0;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/genetics/OrderedCrossoverTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/genetics/OrderedCrossoverTest.java b/src/test/java/org/apache/commons/math4/genetics/OrderedCrossoverTest.java
index 2290fab..44fd972 100644
--- a/src/test/java/org/apache/commons/math4/genetics/OrderedCrossoverTest.java
+++ b/src/test/java/org/apache/commons/math4/genetics/OrderedCrossoverTest.java
@@ -80,6 +80,7 @@ public class OrderedCrossoverTest {
final Integer[] p1 = new Integer[] { 1, 0, 1, 0, 0, 1, 0, 1, 1 };
final BinaryChromosome p1c = new DummyBinaryChromosome(p1);
final Chromosome p2c = new Chromosome() {
+ @Override
public double fitness() {
// Not important
return 0;
@@ -95,6 +96,7 @@ public class OrderedCrossoverTest {
final Integer[] p1 = new Integer[] { 1, 0, 1, 0, 0, 1, 0, 1, 1 };
final BinaryChromosome p2c = new DummyBinaryChromosome(p1);
final Chromosome p1c = new Chromosome() {
+ @Override
public double fitness() {
// Not important
return 0;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/genetics/TournamentSelectionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/genetics/TournamentSelectionTest.java b/src/test/java/org/apache/commons/math4/genetics/TournamentSelectionTest.java
index 4f132db..bd3395a 100644
--- a/src/test/java/org/apache/commons/math4/genetics/TournamentSelectionTest.java
+++ b/src/test/java/org/apache/commons/math4/genetics/TournamentSelectionTest.java
@@ -52,6 +52,7 @@ public class TournamentSelectionTest {
counter++;
}
+ @Override
public double fitness() {
return this.fitness;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/genetics/UniformCrossoverTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/genetics/UniformCrossoverTest.java b/src/test/java/org/apache/commons/math4/genetics/UniformCrossoverTest.java
index 73c6052..208aace 100644
--- a/src/test/java/org/apache/commons/math4/genetics/UniformCrossoverTest.java
+++ b/src/test/java/org/apache/commons/math4/genetics/UniformCrossoverTest.java
@@ -128,6 +128,7 @@ public class UniformCrossoverTest {
final Integer[] p1 = new Integer[] {1,0,1,0,0,1,0,1,1};
final BinaryChromosome p1c = new DummyBinaryChromosome(p1);
final Chromosome p2c = new Chromosome() {
+ @Override
public double fitness() {
// Not important
return 0;
@@ -144,6 +145,7 @@ public class UniformCrossoverTest {
final Integer[] p1 = new Integer[] {1,0,1,0,0,1,0,1,1};
final BinaryChromosome p2c = new DummyBinaryChromosome(p1);
final Chromosome p1c = new Chromosome() {
+ @Override
public double fitness() {
// Not important
return 0;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/geometry/euclidean/threed/PolyhedronsSetTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/geometry/euclidean/threed/PolyhedronsSetTest.java b/src/test/java/org/apache/commons/math4/geometry/euclidean/threed/PolyhedronsSetTest.java
index c3d032d..30d8c78 100644
--- a/src/test/java/org/apache/commons/math4/geometry/euclidean/threed/PolyhedronsSetTest.java
+++ b/src/test/java/org/apache/commons/math4/geometry/euclidean/threed/PolyhedronsSetTest.java
@@ -174,10 +174,12 @@ public class PolyhedronsSetTest {
};
tree.getTree(true).visit(new BSPTreeVisitor<Euclidean3D>() {
+ @Override
public Order visitOrder(BSPTree<Euclidean3D> node) {
return Order.MINUS_SUB_PLUS;
}
+ @Override
public void visitInternalNode(BSPTree<Euclidean3D> node) {
@SuppressWarnings("unchecked")
BoundaryAttribute<Euclidean3D> attribute =
@@ -190,6 +192,7 @@ public class PolyhedronsSetTest {
}
}
+ @Override
public void visitLeafNode(BSPTree<Euclidean3D> node) {
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/geometry/euclidean/twod/PolygonsSetTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/geometry/euclidean/twod/PolygonsSetTest.java b/src/test/java/org/apache/commons/math4/geometry/euclidean/twod/PolygonsSetTest.java
index bb4e51b..08ffdcd 100644
--- a/src/test/java/org/apache/commons/math4/geometry/euclidean/twod/PolygonsSetTest.java
+++ b/src/test/java/org/apache/commons/math4/geometry/euclidean/twod/PolygonsSetTest.java
@@ -1212,12 +1212,15 @@ public class PolygonsSetTest {
leafNodes = 0;
internalNodes = 0;
polygonsSet.getTree(false).visit(new BSPTreeVisitor<Euclidean2D>() {
+ @Override
public Order visitOrder(BSPTree<Euclidean2D> node) {
return Order.SUB_PLUS_MINUS;
}
+ @Override
public void visitInternalNode(BSPTree<Euclidean2D> node) {
++internalNodes;
}
+ @Override
public void visitLeafNode(BSPTree<Euclidean2D> node) {
++leafNodes;
}
[2/4] [math] Add missing '@Override' annotations.
Posted by gg...@apache.org.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/ClassicalRungKuttaFieldStepInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/ClassicalRungKuttaFieldStepInterpolatorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/ClassicalRungKuttaFieldStepInterpolatorTest.java
index f484baa..2292028 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/ClassicalRungKuttaFieldStepInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/ClassicalRungKuttaFieldStepInterpolatorTest.java
@@ -27,6 +27,7 @@ import org.junit.Test;
public class ClassicalRungKuttaFieldStepInterpolatorTest extends RungeKuttaFieldStepInterpolatorAbstractTest {
+ @Override
protected <T extends RealFieldElement<T>> RungeKuttaFieldStepInterpolator<T>
createInterpolator(Field<T> field, boolean forward, T[][] yDotK,
FieldODEStateAndDerivative<T> globalPreviousState,
@@ -40,21 +41,25 @@ public class ClassicalRungKuttaFieldStepInterpolatorTest extends RungeKuttaField
mapper);
}
+ @Override
protected <T extends RealFieldElement<T>> FieldButcherArrayProvider<T>
createButcherArrayProvider(final Field<T> field) {
return new ClassicalRungeKuttaFieldIntegrator<>(field, field.getOne());
}
+ @Override
@Test
public void interpolationAtBounds() {
doInterpolationAtBounds(Decimal64Field.getInstance(), 1.0e-15);
}
+ @Override
@Test
public void interpolationInside() {
doInterpolationInside(Decimal64Field.getInstance(), 2.6e-7, 3.6e-6);
}
+ @Override
@Test
public void nonFieldInterpolatorConsistency() {
doNonFieldInterpolatorConsistency(Decimal64Field.getInstance(), 2.8e-17, 1.2e-16, 3.4e-16, 2.1e-17);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/ClassicalRungeKuttaFieldIntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/ClassicalRungeKuttaFieldIntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/ClassicalRungeKuttaFieldIntegratorTest.java
index ebc9962..45e4e4e 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/ClassicalRungeKuttaFieldIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/ClassicalRungeKuttaFieldIntegratorTest.java
@@ -24,6 +24,7 @@ import org.apache.commons.math4.util.Decimal64Field;
public class ClassicalRungeKuttaFieldIntegratorTest extends RungeKuttaFieldIntegratorAbstractTest {
+ @Override
protected <T extends RealFieldElement<T>> RungeKuttaFieldIntegrator<T>
createIntegrator(Field<T> field, T step) {
return new ClassicalRungeKuttaFieldIntegrator<>(field, step);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/ClassicalRungeKuttaIntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/ClassicalRungeKuttaIntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/ClassicalRungeKuttaIntegratorTest.java
index 016576b..8fc5df3 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/ClassicalRungeKuttaIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/ClassicalRungeKuttaIntegratorTest.java
@@ -52,11 +52,13 @@ public class ClassicalRungeKuttaIntegratorTest {
final double[] k = { 1.0e-4, 1.0e-5, 1.0e-6 };
FirstOrderDifferentialEquations ode = new FirstOrderDifferentialEquations() {
- public int getDimension() {
+ @Override
+ public int getDimension() {
return k.length;
}
- public void computeDerivatives(double t, double[] y, double[] yDot) {
+ @Override
+ public void computeDerivatives(double t, double[] y, double[] yDot) {
for (int i = 0; i < y.length; ++i) {
yDot[i] = k[i] * y[i];
}
@@ -79,17 +81,21 @@ public class ClassicalRungeKuttaIntegratorTest {
integrator.addEventHandler(new EventHandler() {
- public void init(double t0, double[] y0, double t) {
+ @Override
+ public void init(double t0, double[] y0, double t) {
}
- public void resetState(double t, double[] y) {
+ @Override
+ public void resetState(double t, double[] y) {
}
- public double g(double t, double[] y) {
+ @Override
+ public double g(double t, double[] y) {
return t - tEvent;
}
- public Action eventOccurred(double t, double[] y, boolean increasing) {
+ @Override
+ public Action eventOccurred(double t, double[] y, boolean increasing) {
Assert.assertEquals(tEvent, t, 5.0e-6);
return Action.CONTINUE;
}
@@ -263,9 +269,11 @@ public class ClassicalRungeKuttaIntegratorTest {
this.pb = pb;
maxError = 0;
}
+ @Override
public void init(double t0, double[] y0, double t) {
maxError = 0;
}
+ @Override
public void handleStep(StepInterpolator interpolator, boolean isLast)
throws MaxCountExceededException {
@@ -295,21 +303,25 @@ public class ClassicalRungeKuttaIntegratorTest {
final double step = 1.23456;
FirstOrderIntegrator integ = new ClassicalRungeKuttaIntegrator(step);
integ.addStepHandler(new StepHandler() {
- public void handleStep(StepInterpolator interpolator, boolean isLast) {
+ @Override
+ public void handleStep(StepInterpolator interpolator, boolean isLast) {
if (! isLast) {
Assert.assertEquals(step,
interpolator.getCurrentTime() - interpolator.getPreviousTime(),
1.0e-12);
}
}
- public void init(double t0, double[] y0, double t) {
+ @Override
+ public void init(double t0, double[] y0, double t) {
}
});
integ.integrate(new FirstOrderDifferentialEquations() {
- public void computeDerivatives(double t, double[] y, double[] dot) {
+ @Override
+ public void computeDerivatives(double t, double[] y, double[] dot) {
dot[0] = 1.0;
}
- public int getDimension() {
+ @Override
+ public int getDimension() {
return 1;
}
}, 0.0, new double[] { 0.0 }, 5.0, new double[1]);
@@ -323,11 +335,13 @@ public class ClassicalRungeKuttaIntegratorTest {
final double end = 0.001;
FirstOrderDifferentialEquations equations = new FirstOrderDifferentialEquations() {
- public int getDimension() {
+ @Override
+ public int getDimension() {
return 1;
}
- public void computeDerivatives(double t, double[] y, double[] yDot) {
+ @Override
+ public void computeDerivatives(double t, double[] y, double[] yDot) {
Assert.assertTrue(t >= FastMath.nextAfter(start, Double.NEGATIVE_INFINITY));
Assert.assertTrue(t <= FastMath.nextAfter(end, Double.POSITIVE_INFINITY));
yDot[0] = -100.0 * y[0];
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54FieldIntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54FieldIntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54FieldIntegratorTest.java
index 28267e0..c3e24b1 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54FieldIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54FieldIntegratorTest.java
@@ -24,12 +24,14 @@ import org.apache.commons.math4.util.Decimal64Field;
public class DormandPrince54FieldIntegratorTest extends EmbeddedRungeKuttaFieldIntegratorAbstractTest {
+ @Override
protected <T extends RealFieldElement<T>> EmbeddedRungeKuttaFieldIntegrator<T>
createIntegrator(Field<T> field, final double minStep, final double maxStep,
final double scalAbsoluteTolerance, final double scalRelativeTolerance) {
return new DormandPrince54FieldIntegrator<>(field, minStep, maxStep, scalAbsoluteTolerance, scalRelativeTolerance);
}
+ @Override
protected <T extends RealFieldElement<T>> EmbeddedRungeKuttaFieldIntegrator<T>
createIntegrator(Field<T> field, final double minStep, final double maxStep,
final double[] vecAbsoluteTolerance, final double[] vecRelativeTolerance) {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54FieldStepInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54FieldStepInterpolatorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54FieldStepInterpolatorTest.java
index b10501f..4bda2df 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54FieldStepInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54FieldStepInterpolatorTest.java
@@ -27,6 +27,7 @@ import org.junit.Test;
public class DormandPrince54FieldStepInterpolatorTest extends RungeKuttaFieldStepInterpolatorAbstractTest {
+ @Override
protected <T extends RealFieldElement<T>> RungeKuttaFieldStepInterpolator<T>
createInterpolator(Field<T> field, boolean forward, T[][] yDotK,
FieldODEStateAndDerivative<T> globalPreviousState,
@@ -40,21 +41,25 @@ public class DormandPrince54FieldStepInterpolatorTest extends RungeKuttaFieldSte
mapper);
}
+ @Override
protected <T extends RealFieldElement<T>> FieldButcherArrayProvider<T>
createButcherArrayProvider(final Field<T> field) {
return new DormandPrince54FieldIntegrator<>(field, 0, 1, 1, 1);
}
+ @Override
@Test
public void interpolationAtBounds() {
doInterpolationAtBounds(Decimal64Field.getInstance(), 1.0e-50);
}
+ @Override
@Test
public void interpolationInside() {
doInterpolationInside(Decimal64Field.getInstance(), 9.5e-14, 1.8e-15);
}
+ @Override
@Test
public void nonFieldInterpolatorConsistency() {
doNonFieldInterpolatorConsistency(Decimal64Field.getInstance(), 2.8e-17, 2.3e-16, 5.6e-16, 5.6e-17);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54IntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54IntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54IntegratorTest.java
index b4909c9..870d5e9 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54IntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54IntegratorTest.java
@@ -135,9 +135,11 @@ public class DormandPrince54IntegratorTest {
this.minStep = minStep;
}
+ @Override
public void init(double t0, double[] y0, double t) {
}
+ @Override
public void handleStep(StepInterpolator interpolator, boolean isLast) {
if (isLast) {
lastSeen = true;
@@ -281,10 +283,12 @@ public class DormandPrince54IntegratorTest {
public KeplerHandler(TestProblem3 pb) {
this.pb = pb;
}
+ @Override
public void init(double t0, double[] y0, double t) {
nbSteps = 0;
maxError = 0;
}
+ @Override
public void handleStep(StepInterpolator interpolator, boolean isLast)
throws MaxCountExceededException {
@@ -321,11 +325,13 @@ public class DormandPrince54IntegratorTest {
minStep = 0;
maxStep = 0;
}
+ @Override
public void init(double t0, double[] y0, double t) {
firstTime = true;
minStep = 0;
maxStep = 0;
}
+ @Override
public void handleStep(StepInterpolator interpolator,
boolean isLast) {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54StepInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54StepInterpolatorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54StepInterpolatorTest.java
index 06949e3..8fa30ff 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54StepInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54StepInterpolatorTest.java
@@ -121,7 +121,8 @@ public class DormandPrince54StepInterpolatorTest {
scalAbsoluteTolerance,
scalRelativeTolerance);
integ.addStepHandler(new StepHandler() {
- public void handleStep(StepInterpolator interpolator, boolean isLast)
+ @Override
+ public void handleStep(StepInterpolator interpolator, boolean isLast)
throws MaxCountExceededException {
StepInterpolator cloned = interpolator.copy();
double tA = cloned.getPreviousTime();
@@ -142,7 +143,8 @@ public class DormandPrince54StepInterpolatorTest {
}
}
}
- public void init(double t0, double[] y0, double t) {
+ @Override
+ public void init(double t0, double[] y0, double t) {
}
});
integ.integrate(pb,
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853FieldIntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853FieldIntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853FieldIntegratorTest.java
index 258ccc7..839c6e1 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853FieldIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853FieldIntegratorTest.java
@@ -24,12 +24,14 @@ import org.apache.commons.math4.util.Decimal64Field;
public class DormandPrince853FieldIntegratorTest extends EmbeddedRungeKuttaFieldIntegratorAbstractTest {
+ @Override
protected <T extends RealFieldElement<T>> EmbeddedRungeKuttaFieldIntegrator<T>
createIntegrator(Field<T> field, final double minStep, final double maxStep,
final double scalAbsoluteTolerance, final double scalRelativeTolerance) {
return new DormandPrince853FieldIntegrator<>(field, minStep, maxStep, scalAbsoluteTolerance, scalRelativeTolerance);
}
+ @Override
protected <T extends RealFieldElement<T>> EmbeddedRungeKuttaFieldIntegrator<T>
createIntegrator(Field<T> field, final double minStep, final double maxStep,
final double[] vecAbsoluteTolerance, final double[] vecRelativeTolerance) {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853FieldStepInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853FieldStepInterpolatorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853FieldStepInterpolatorTest.java
index 69dbec4..541dbe0 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853FieldStepInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853FieldStepInterpolatorTest.java
@@ -27,6 +27,7 @@ import org.junit.Test;
public class DormandPrince853FieldStepInterpolatorTest extends RungeKuttaFieldStepInterpolatorAbstractTest {
+ @Override
protected <T extends RealFieldElement<T>> RungeKuttaFieldStepInterpolator<T>
createInterpolator(Field<T> field, boolean forward, T[][] yDotK,
FieldODEStateAndDerivative<T> globalPreviousState,
@@ -40,21 +41,25 @@ public class DormandPrince853FieldStepInterpolatorTest extends RungeKuttaFieldSt
mapper);
}
+ @Override
protected <T extends RealFieldElement<T>> FieldButcherArrayProvider<T>
createButcherArrayProvider(final Field<T> field) {
return new DormandPrince853FieldIntegrator<>(field, 0, 1, 1, 1);
}
+ @Override
@Test
public void interpolationAtBounds() {
doInterpolationAtBounds(Decimal64Field.getInstance(), 1.0e-50);
}
+ @Override
@Test
public void interpolationInside() {
doInterpolationInside(Decimal64Field.getInstance(), 3.1e-17, 3.4e-16);
}
+ @Override
@Test
public void nonFieldInterpolatorConsistency() {
doNonFieldInterpolatorConsistency(Decimal64Field.getInstance(), 3.4e-12, 5.7e-11, 1.9e-10, 3.1e-9);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853IntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853IntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853IntegratorTest.java
index 33c721c..21bd0c2 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853IntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853IntegratorTest.java
@@ -49,11 +49,13 @@ public class DormandPrince853IntegratorTest {
final double[] k = { 1.0e-4, 1.0e-5, 1.0e-6 };
FirstOrderDifferentialEquations ode = new FirstOrderDifferentialEquations() {
- public int getDimension() {
+ @Override
+ public int getDimension() {
return k.length;
}
- public void computeDerivatives(double t, double[] y, double[] yDot) {
+ @Override
+ public void computeDerivatives(double t, double[] y, double[] yDot) {
for (int i = 0; i < y.length; ++i) {
yDot[i] = k[i] * y[i];
}
@@ -79,17 +81,21 @@ public class DormandPrince853IntegratorTest {
integrator.setInitialStepSize(60.0);
integrator.addEventHandler(new EventHandler() {
- public void init(double t0, double[] y0, double t) {
+ @Override
+ public void init(double t0, double[] y0, double t) {
}
- public void resetState(double t, double[] y) {
+ @Override
+ public void resetState(double t, double[] y) {
}
- public double g(double t, double[] y) {
+ @Override
+ public double g(double t, double[] y) {
return t - tEvent;
}
- public Action eventOccurred(double t, double[] y, boolean increasing) {
+ @Override
+ public Action eventOccurred(double t, double[] y, boolean increasing) {
Assert.assertEquals(tEvent, t, 5.0e-6);
return Action.CONTINUE;
}
@@ -200,11 +206,13 @@ public class DormandPrince853IntegratorTest {
final double end = 0.001;
FirstOrderDifferentialEquations equations = new FirstOrderDifferentialEquations() {
- public int getDimension() {
+ @Override
+ public int getDimension() {
return 1;
}
- public void computeDerivatives(double t, double[] y, double[] yDot) {
+ @Override
+ public void computeDerivatives(double t, double[] y, double[] yDot) {
Assert.assertTrue(t >= FastMath.nextAfter(start, Double.NEGATIVE_INFINITY));
Assert.assertTrue(t <= FastMath.nextAfter(end, Double.POSITIVE_INFINITY));
yDot[0] = -100.0 * y[0];
@@ -340,11 +348,13 @@ public class DormandPrince853IntegratorTest {
FirstOrderDifferentialEquations sincos = new FirstOrderDifferentialEquations() {
- public int getDimension() {
+ @Override
+ public int getDimension() {
return 2;
}
- public void computeDerivatives(double t, double[] y, double[] yDot) {
+ @Override
+ public void computeDerivatives(double t, double[] y, double[] yDot) {
yDot[0] = y[1];
yDot[1] = -y[0];
}
@@ -377,26 +387,31 @@ public class DormandPrince853IntegratorTest {
this.index = index;
}
- public void init(double t0, double[] y0, double t) {
+ @Override
+ public void init(double t0, double[] y0, double t) {
tMin = t0;
}
- public void handleStep(StepInterpolator interpolator, boolean isLast) {
+ @Override
+ public void handleStep(StepInterpolator interpolator, boolean isLast) {
tMin = interpolator.getCurrentTime();
}
- public double g(double t, double[] y) {
+ @Override
+ public double g(double t, double[] y) {
// once a step has been handled by handleStep,
// events checking should only refer to dates after the step
Assert.assertTrue(t >= tMin);
return y[index];
}
- public Action eventOccurred(double t, double[] y, boolean increasing) {
+ @Override
+ public Action eventOccurred(double t, double[] y, boolean increasing) {
return Action.RESET_STATE;
}
- public void resetState(double t, double[] y) {
+ @Override
+ public void resetState(double t, double[] y) {
// in fact, we don't need to reset anything for the test
}
@@ -406,10 +421,12 @@ public class DormandPrince853IntegratorTest {
public KeplerHandler(TestProblem3 pb) {
this.pb = pb;
}
+ @Override
public void init(double t0, double[] y0, double t) {
nbSteps = 0;
maxError = 0;
}
+ @Override
public void handleStep(StepInterpolator interpolator, boolean isLast)
throws MaxCountExceededException {
@@ -446,11 +463,13 @@ public class DormandPrince853IntegratorTest {
minStep = 0;
maxStep = 0;
}
+ @Override
public void init(double t0, double[] y0, double t) {
firstTime = true;
minStep = 0;
maxStep = 0;
}
+ @Override
public void handleStep(StepInterpolator interpolator,
boolean isLast) {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853StepInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853StepInterpolatorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853StepInterpolatorTest.java
index 512c5b7..3a739ac 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853StepInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853StepInterpolatorTest.java
@@ -121,6 +121,7 @@ public class DormandPrince853StepInterpolatorTest {
scalAbsoluteTolerance,
scalRelativeTolerance);
integ.addStepHandler(new StepHandler() {
+ @Override
public void handleStep(StepInterpolator interpolator, boolean isLast)
throws MaxCountExceededException {
StepInterpolator cloned = interpolator.copy();
@@ -142,6 +143,7 @@ public class DormandPrince853StepInterpolatorTest {
}
}
}
+ @Override
public void init(double t0, double[] y0, double t) {
}
});
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/EmbeddedRungeKuttaFieldIntegratorAbstractTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/EmbeddedRungeKuttaFieldIntegratorAbstractTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/EmbeddedRungeKuttaFieldIntegratorAbstractTest.java
index edb9501..74cf664 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/EmbeddedRungeKuttaFieldIntegratorAbstractTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/EmbeddedRungeKuttaFieldIntegratorAbstractTest.java
@@ -133,13 +133,16 @@ public abstract class EmbeddedRungeKuttaFieldIntegratorAbstractTest {
protected <T extends RealFieldElement<T>> void doTestForwardBackwardExceptions(final Field<T> field) {
FirstOrderFieldDifferentialEquations<T> equations = new FirstOrderFieldDifferentialEquations<T>() {
+ @Override
public int getDimension() {
return 1;
}
+ @Override
public void init(T t0, T[] y0, T t) {
}
+ @Override
public T[] computeDerivatives(T t, T[] y) {
if (t.getReal() < -0.5) {
throw new LocalException();
@@ -281,12 +284,15 @@ public abstract class EmbeddedRungeKuttaFieldIntegratorAbstractTest {
integ.addStepHandler(handler);
integ.addEventHandler(new FieldEventHandler<T>() {
- public void init(FieldODEStateAndDerivative<T> state0, T t) {
+ @Override
+ public void init(FieldODEStateAndDerivative<T> state0, T t) {
}
- public Action eventOccurred(FieldODEStateAndDerivative<T> state, boolean increasing) {
+ @Override
+ public Action eventOccurred(FieldODEStateAndDerivative<T> state, boolean increasing) {
return Action.CONTINUE;
}
- public T g(FieldODEStateAndDerivative<T> state) {
+ @Override
+ public T g(FieldODEStateAndDerivative<T> state) {
T middle = pb.getInitialState().getTime().add(pb.getFinalTime()).multiply(0.5);
T offset = state.getTime().subtract(middle);
if (offset.getReal() > 0) {
@@ -294,7 +300,8 @@ public abstract class EmbeddedRungeKuttaFieldIntegratorAbstractTest {
}
return offset;
}
- public FieldODEState<T> resetState(FieldODEStateAndDerivative<T> state) {
+ @Override
+ public FieldODEState<T> resetState(FieldODEStateAndDerivative<T> state) {
return state;
}
}, Double.POSITIVE_INFINITY, 1.0e-8 * maxStep, 1000);
@@ -320,16 +327,20 @@ public abstract class EmbeddedRungeKuttaFieldIntegratorAbstractTest {
integ.addStepHandler(handler);
integ.addEventHandler(new FieldEventHandler<T>() {
+ @Override
public void init(FieldODEStateAndDerivative<T> state0, T t) {
}
+ @Override
public Action eventOccurred(FieldODEStateAndDerivative<T> state, boolean increasing) {
return Action.CONTINUE;
}
+ @Override
public T g(FieldODEStateAndDerivative<T> state) {
T middle = pb.getInitialState().getTime().add(pb.getFinalTime()).multiply(0.5);
T offset = state.getTime().subtract(middle);
return (offset.getReal() > 0) ? offset.add(0.5) : offset.subtract(0.5);
}
+ @Override
public FieldODEState<T> resetState(FieldODEStateAndDerivative<T> state) {
return state;
}
@@ -437,9 +448,11 @@ public abstract class EmbeddedRungeKuttaFieldIntegratorAbstractTest {
this.epsilon = epsilon;
maxError = pb.getField().getZero();
}
+ @Override
public void init(FieldODEStateAndDerivative<T> state0, T t) {
maxError = pb.getField().getZero();
}
+ @Override
public void handleStep(FieldStepInterpolator<T> interpolator, boolean isLast)
throws MaxCountExceededException {
@@ -528,10 +541,12 @@ public abstract class EmbeddedRungeKuttaFieldIntegratorAbstractTest {
this.omega = omega;
}
+ @Override
public int getDimension() {
return 2;
}
+ @Override
public void init(final DerivativeStructure t0, final DerivativeStructure[] y0,
final DerivativeStructure finalTime) {
@@ -551,6 +566,7 @@ public abstract class EmbeddedRungeKuttaFieldIntegratorAbstractTest {
}
+ @Override
public DerivativeStructure[] computeDerivatives(final DerivativeStructure t, final DerivativeStructure[] y) {
return new DerivativeStructure[] {
omega.multiply(y[1]),
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/EulerFieldIntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/EulerFieldIntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/EulerFieldIntegratorTest.java
index d492cab..25ca071 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/EulerFieldIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/EulerFieldIntegratorTest.java
@@ -24,6 +24,7 @@ import org.apache.commons.math4.util.Decimal64Field;
public class EulerFieldIntegratorTest extends RungeKuttaFieldIntegratorAbstractTest {
+ @Override
protected <T extends RealFieldElement<T>> RungeKuttaFieldIntegrator<T>
createIntegrator(Field<T> field, T step) {
return new EulerFieldIntegrator<>(field, step);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/EulerFieldStepInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/EulerFieldStepInterpolatorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/EulerFieldStepInterpolatorTest.java
index 9f7f1ff..99bc9a5 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/EulerFieldStepInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/EulerFieldStepInterpolatorTest.java
@@ -27,6 +27,7 @@ import org.junit.Test;
public class EulerFieldStepInterpolatorTest extends RungeKuttaFieldStepInterpolatorAbstractTest {
+ @Override
protected <T extends RealFieldElement<T>> RungeKuttaFieldStepInterpolator<T>
createInterpolator(Field<T> field, boolean forward, T[][] yDotK,
FieldODEStateAndDerivative<T> globalPreviousState,
@@ -39,21 +40,25 @@ public class EulerFieldStepInterpolatorTest extends RungeKuttaFieldStepInterpola
mapper);
}
+ @Override
protected <T extends RealFieldElement<T>> FieldButcherArrayProvider<T>
createButcherArrayProvider(final Field<T> field) {
return new EulerFieldIntegrator<>(field, field.getOne());
}
+ @Override
@Test
public void interpolationAtBounds() {
doInterpolationAtBounds(Decimal64Field.getInstance(), 1.0e-15);
}
+ @Override
@Test
public void interpolationInside() {
doInterpolationInside(Decimal64Field.getInstance(), 3.3e-4, 7.9e-3);
}
+ @Override
@Test
public void nonFieldInterpolatorConsistency() {
doNonFieldInterpolatorConsistency(Decimal64Field.getInstance(), 7.0e-18, 1.0e-50, 1.0e-50, 1.0e-50);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/EulerIntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/EulerIntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/EulerIntegratorTest.java
index e132190..1d63340 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/EulerIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/EulerIntegratorTest.java
@@ -171,6 +171,7 @@ public class EulerIntegratorTest {
final double step = 1.23456;
FirstOrderIntegrator integ = new EulerIntegrator(step);
integ.addStepHandler(new StepHandler() {
+ @Override
public void handleStep(StepInterpolator interpolator, boolean isLast) {
if (! isLast) {
Assert.assertEquals(step,
@@ -178,14 +179,17 @@ public class EulerIntegratorTest {
1.0e-12);
}
}
+ @Override
public void init(double t0, double[] y0, double t) {
}
});
integ.integrate(new FirstOrderDifferentialEquations() {
- public void computeDerivatives(double t, double[] y, double[] dot) {
+ @Override
+ public void computeDerivatives(double t, double[] y, double[] dot) {
dot[0] = 1.0;
}
- public int getDimension() {
+ @Override
+ public int getDimension() {
return 1;
}
}, 0.0, new double[] { 0.0 }, 5.0, new double[1]);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/GillFieldIntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/GillFieldIntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/GillFieldIntegratorTest.java
index 7100cbf..9255a72 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/GillFieldIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/GillFieldIntegratorTest.java
@@ -24,6 +24,7 @@ import org.apache.commons.math4.util.Decimal64Field;
public class GillFieldIntegratorTest extends RungeKuttaFieldIntegratorAbstractTest {
+ @Override
protected <T extends RealFieldElement<T>> RungeKuttaFieldIntegrator<T>
createIntegrator(Field<T> field, T step) {
return new GillFieldIntegrator<>(field, step);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/GillFieldStepInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/GillFieldStepInterpolatorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/GillFieldStepInterpolatorTest.java
index 3c7d21c..4b4ea9c 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/GillFieldStepInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/GillFieldStepInterpolatorTest.java
@@ -27,6 +27,7 @@ import org.junit.Test;
public class GillFieldStepInterpolatorTest extends RungeKuttaFieldStepInterpolatorAbstractTest {
+ @Override
protected <T extends RealFieldElement<T>> RungeKuttaFieldStepInterpolator<T>
createInterpolator(Field<T> field, boolean forward, T[][] yDotK,
FieldODEStateAndDerivative<T> globalPreviousState,
@@ -40,21 +41,25 @@ public class GillFieldStepInterpolatorTest extends RungeKuttaFieldStepInterpolat
mapper);
}
+ @Override
protected <T extends RealFieldElement<T>> FieldButcherArrayProvider<T>
createButcherArrayProvider(final Field<T> field) {
return new GillFieldIntegrator<>(field, field.getOne());
}
+ @Override
@Test
public void interpolationAtBounds() {
doInterpolationAtBounds(Decimal64Field.getInstance(), 1.0e-15);
}
+ @Override
@Test
public void interpolationInside() {
doInterpolationInside(Decimal64Field.getInstance(), 2.6e-7, 3.6e-6);
}
+ @Override
@Test
public void nonFieldInterpolatorConsistency() {
doNonFieldInterpolatorConsistency(Decimal64Field.getInstance(), 1.4e-17, 1.0e-50, 3.4e-16, 2.1e-17);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/GillIntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/GillIntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/GillIntegratorTest.java
index 790c877..138fdc4 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/GillIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/GillIntegratorTest.java
@@ -193,9 +193,11 @@ public class GillIntegratorTest {
public KeplerStepHandler(TestProblem3 pb) {
this.pb = pb;
}
+ @Override
public void init(double t0, double[] y0, double t) {
maxError = 0;
}
+ @Override
public void handleStep(StepInterpolator interpolator, boolean isLast)
throws MaxCountExceededException {
@@ -225,21 +227,25 @@ public class GillIntegratorTest {
final double step = 1.23456;
FirstOrderIntegrator integ = new GillIntegrator(step);
integ.addStepHandler(new StepHandler() {
- public void handleStep(StepInterpolator interpolator, boolean isLast) {
+ @Override
+ public void handleStep(StepInterpolator interpolator, boolean isLast) {
if (! isLast) {
Assert.assertEquals(step,
interpolator.getCurrentTime() - interpolator.getPreviousTime(),
1.0e-12);
}
}
- public void init(double t0, double[] y0, double t) {
+ @Override
+ public void init(double t0, double[] y0, double t) {
}
});
integ.integrate(new FirstOrderDifferentialEquations() {
- public void computeDerivatives(double t, double[] y, double[] dot) {
+ @Override
+ public void computeDerivatives(double t, double[] y, double[] dot) {
dot[0] = 1.0;
}
- public int getDimension() {
+ @Override
+ public int getDimension() {
return 1;
}
}, 0.0, new double[] { 0.0 }, 5.0, new double[1]);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/GraggBulirschStoerIntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/GraggBulirschStoerIntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/GraggBulirschStoerIntegratorTest.java
index ad39b78..ae8a8e5 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/GraggBulirschStoerIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/GraggBulirschStoerIntegratorTest.java
@@ -283,11 +283,13 @@ public class GraggBulirschStoerIntegratorTest {
final double end = 0.001;
FirstOrderDifferentialEquations equations = new FirstOrderDifferentialEquations() {
- public int getDimension() {
+ @Override
+ public int getDimension() {
return 1;
}
- public void computeDerivatives(double t, double[] y, double[] yDot) {
+ @Override
+ public void computeDerivatives(double t, double[] y, double[] yDot) {
Assert.assertTrue(t >= FastMath.nextAfter(start, Double.NEGATIVE_INFINITY));
Assert.assertTrue(t <= FastMath.nextAfter(end, Double.POSITIVE_INFINITY));
yDot[0] = -100.0 * y[0];
@@ -320,10 +322,12 @@ public class GraggBulirschStoerIntegratorTest {
FirstOrderIntegrator integ = new GraggBulirschStoerIntegrator(1e-10, 100.0, 1e-7, 1e-7);
integ.addStepHandler(new StepHandler() {
- public void init(double t0, double[] y0, double t) {
+ @Override
+ public void init(double t0, double[] y0, double t) {
}
- public void handleStep(StepInterpolator interpolator, boolean isLast)
+ @Override
+ public void handleStep(StepInterpolator interpolator, boolean isLast)
throws MaxCountExceededException {
double t = interpolator.getCurrentTime();
interpolator.setInterpolatedTime(t);
@@ -337,11 +341,13 @@ public class GraggBulirschStoerIntegratorTest {
double t0 = 3.0;
double tend = 10.0;
integ.integrate(new FirstOrderDifferentialEquations() {
- public int getDimension() {
+ @Override
+ public int getDimension() {
return 1;
}
- public void computeDerivatives(double t, double[] y, double[] yDot) {
+ @Override
+ public void computeDerivatives(double t, double[] y, double[] yDot) {
yDot[0] = 3.0;
}
}, t0, y, tend, y);
@@ -352,10 +358,12 @@ public class GraggBulirschStoerIntegratorTest {
public KeplerStepHandler(TestProblem3 pb) {
this.pb = pb;
}
+ @Override
public void init(double t0, double[] y0, double t) {
nbSteps = 0;
maxError = 0;
}
+ @Override
public void handleStep(StepInterpolator interpolator, boolean isLast)
throws MaxCountExceededException {
@@ -392,11 +400,13 @@ public class GraggBulirschStoerIntegratorTest {
minStep = 0;
maxStep = 0;
}
+ @Override
public void init(double t0, double[] y0, double t) {
firstTime = true;
minStep = 0;
maxStep = 0;
}
+ @Override
public void handleStep(StepInterpolator interpolator,
boolean isLast) {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java
index a3a211d..fa637d2 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java
@@ -123,6 +123,7 @@ public class GraggBulirschStoerStepInterpolatorTest {
scalAbsoluteTolerance,
scalRelativeTolerance);
integ.addStepHandler(new StepHandler() {
+ @Override
public void handleStep(StepInterpolator interpolator, boolean isLast)
throws MaxCountExceededException {
StepInterpolator cloned = interpolator.copy();
@@ -144,6 +145,7 @@ public class GraggBulirschStoerStepInterpolatorTest {
}
}
}
+ @Override
public void init(double t0, double[] y0, double t) {
}
});
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/HighamHall54FieldIntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/HighamHall54FieldIntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/HighamHall54FieldIntegratorTest.java
index 6263e7c..b0110ae 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/HighamHall54FieldIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/HighamHall54FieldIntegratorTest.java
@@ -24,12 +24,14 @@ import org.apache.commons.math4.util.Decimal64Field;
public class HighamHall54FieldIntegratorTest extends EmbeddedRungeKuttaFieldIntegratorAbstractTest {
+ @Override
protected <T extends RealFieldElement<T>> EmbeddedRungeKuttaFieldIntegrator<T>
createIntegrator(Field<T> field, final double minStep, final double maxStep,
final double scalAbsoluteTolerance, final double scalRelativeTolerance) {
return new HighamHall54FieldIntegrator<>(field, minStep, maxStep, scalAbsoluteTolerance, scalRelativeTolerance);
}
+ @Override
protected <T extends RealFieldElement<T>> EmbeddedRungeKuttaFieldIntegrator<T>
createIntegrator(Field<T> field, final double minStep, final double maxStep,
final double[] vecAbsoluteTolerance, final double[] vecRelativeTolerance) {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/HighamHall54FieldStepInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/HighamHall54FieldStepInterpolatorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/HighamHall54FieldStepInterpolatorTest.java
index 7559e98..b32929c 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/HighamHall54FieldStepInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/HighamHall54FieldStepInterpolatorTest.java
@@ -27,6 +27,7 @@ import org.junit.Test;
public class HighamHall54FieldStepInterpolatorTest extends RungeKuttaFieldStepInterpolatorAbstractTest {
+ @Override
protected <T extends RealFieldElement<T>> RungeKuttaFieldStepInterpolator<T>
createInterpolator(Field<T> field, boolean forward, T[][] yDotK,
FieldODEStateAndDerivative<T> globalPreviousState,
@@ -40,21 +41,25 @@ public class HighamHall54FieldStepInterpolatorTest extends RungeKuttaFieldStepIn
mapper);
}
+ @Override
protected <T extends RealFieldElement<T>> FieldButcherArrayProvider<T>
createButcherArrayProvider(final Field<T> field) {
return new HighamHall54FieldIntegrator<>(field, 0, 1, 1, 1);
}
+ @Override
@Test
public void interpolationAtBounds() {
doInterpolationAtBounds(Decimal64Field.getInstance(), 4.9e-16);
}
+ @Override
@Test
public void interpolationInside() {
doInterpolationInside(Decimal64Field.getInstance(), 4.0e-13, 2.7e-15);
}
+ @Override
@Test
public void nonFieldInterpolatorConsistency() {
doNonFieldInterpolatorConsistency(Decimal64Field.getInstance(), 1.3e-16, 1.0e-50, 3.6e-15, 2.1e-16);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/HighamHall54IntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/HighamHall54IntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/HighamHall54IntegratorTest.java
index d34de40..1f57bc1 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/HighamHall54IntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/HighamHall54IntegratorTest.java
@@ -46,6 +46,7 @@ public class HighamHall54IntegratorTest {
new HighamHall54Integrator(0.0, 1.0, 1.0e-10, 1.0e-10);
FirstOrderDifferentialEquations equations =
new FirstOrderDifferentialEquations() {
+ @Override
public void computeDerivatives(double t, double[] y, double[] dot) {
if (t < -0.5) {
throw new LocalException();
@@ -53,7 +54,8 @@ public class HighamHall54IntegratorTest {
throw new RuntimeException("oops");
}
}
- public int getDimension() {
+ @Override
+ public int getDimension() {
return 1;
}
};
@@ -212,11 +214,14 @@ public class HighamHall54IntegratorTest {
integ.addStepHandler(handler);
integ.addEventHandler(new EventHandler() {
+ @Override
public void init(double t0, double[] y0, double t) {
}
+ @Override
public Action eventOccurred(double t, double[] y, boolean increasing) {
return Action.CONTINUE;
}
+ @Override
public double g(double t, double[] y) {
double middle = (pb.getInitialTime() + pb.getFinalTime()) / 2;
double offset = t - middle;
@@ -225,6 +230,7 @@ public class HighamHall54IntegratorTest {
}
return offset;
}
+ @Override
public void resetState(double t, double[] y) {
}
}, Double.POSITIVE_INFINITY, 1.0e-8 * maxStep, 1000);
@@ -257,17 +263,21 @@ public class HighamHall54IntegratorTest {
integ.addStepHandler(handler);
integ.addEventHandler(new EventHandler() {
- public void init(double t0, double[] y0, double t) {
+ @Override
+ public void init(double t0, double[] y0, double t) {
}
- public Action eventOccurred(double t, double[] y, boolean increasing) {
+ @Override
+ public Action eventOccurred(double t, double[] y, boolean increasing) {
return Action.CONTINUE;
}
- public double g(double t, double[] y) {
+ @Override
+ public double g(double t, double[] y) {
double middle = (pb.getInitialTime() + pb.getFinalTime()) / 2;
double offset = t - middle;
return (offset > 0) ? (offset + 0.5) : (offset - 0.5);
}
- public void resetState(double t, double[] y) {
+ @Override
+ public void resetState(double t, double[] y) {
}
}, Double.POSITIVE_INFINITY, 1.0e-8 * maxStep, 3);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/HighamHall54StepInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/HighamHall54StepInterpolatorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/HighamHall54StepInterpolatorTest.java
index 47f653f..d4d23b4 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/HighamHall54StepInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/HighamHall54StepInterpolatorTest.java
@@ -121,6 +121,7 @@ public class HighamHall54StepInterpolatorTest {
scalAbsoluteTolerance,
scalRelativeTolerance);
integ.addStepHandler(new StepHandler() {
+ @Override
public void handleStep(StepInterpolator interpolator, boolean isLast)
throws MaxCountExceededException {
StepInterpolator cloned = interpolator.copy();
@@ -142,6 +143,7 @@ public class HighamHall54StepInterpolatorTest {
}
}
}
+ @Override
public void init(double t0, double[] y0, double t) {
}
});
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/LutherFieldIntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/LutherFieldIntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/LutherFieldIntegratorTest.java
index 31db176..3074d61 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/LutherFieldIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/LutherFieldIntegratorTest.java
@@ -28,6 +28,7 @@ import org.apache.commons.math4.util.Decimal64Field;
public class LutherFieldIntegratorTest extends RungeKuttaFieldIntegratorAbstractTest {
+ @Override
protected <T extends RealFieldElement<T>> RungeKuttaFieldIntegrator<T>
createIntegrator(Field<T> field, T step) {
return new LutherFieldIntegrator<>(field, step);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/LutherFieldStepInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/LutherFieldStepInterpolatorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/LutherFieldStepInterpolatorTest.java
index 1a0d5e2..b83cbf5 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/LutherFieldStepInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/LutherFieldStepInterpolatorTest.java
@@ -27,6 +27,7 @@ import org.junit.Test;
public class LutherFieldStepInterpolatorTest extends RungeKuttaFieldStepInterpolatorAbstractTest {
+ @Override
protected <T extends RealFieldElement<T>> RungeKuttaFieldStepInterpolator<T>
createInterpolator(Field<T> field, boolean forward, T[][] yDotK,
FieldODEStateAndDerivative<T> globalPreviousState,
@@ -40,21 +41,25 @@ public class LutherFieldStepInterpolatorTest extends RungeKuttaFieldStepInterpol
mapper);
}
+ @Override
protected <T extends RealFieldElement<T>> FieldButcherArrayProvider<T>
createButcherArrayProvider(final Field<T> field) {
return new LutherFieldIntegrator<>(field, field.getOne());
}
+ @Override
@Test
public void interpolationAtBounds() {
doInterpolationAtBounds(Decimal64Field.getInstance(), 1.0e-15);
}
+ @Override
@Test
public void interpolationInside() {
doInterpolationInside(Decimal64Field.getInstance(), 1.1e-7, 9.6e-9);
}
+ @Override
@Test
public void nonFieldInterpolatorConsistency() {
doNonFieldInterpolatorConsistency(Decimal64Field.getInstance(), 8.4e-17, 2.3e-16, 2.1e-14, 1.3e-15);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/LutherIntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/LutherIntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/LutherIntegratorTest.java
index 018232e..cccbe1a 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/LutherIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/LutherIntegratorTest.java
@@ -52,10 +52,12 @@ public class LutherIntegratorTest {
final double[] k = { 1.0e-4, 1.0e-5, 1.0e-6 };
FirstOrderDifferentialEquations ode = new FirstOrderDifferentialEquations() {
+ @Override
public int getDimension() {
return k.length;
}
+ @Override
public void computeDerivatives(double t, double[] y, double[] yDot) {
for (int i = 0; i < y.length; ++i) {
yDot[i] = k[i] * y[i];
@@ -79,16 +81,20 @@ public class LutherIntegratorTest {
integrator.addEventHandler(new EventHandler() {
+ @Override
public void init(double t0, double[] y0, double t) {
}
+ @Override
public void resetState(double t, double[] y) {
}
+ @Override
public double g(double t, double[] y) {
return t - tEvent;
}
+ @Override
public Action eventOccurred(double t, double[] y, boolean increasing) {
Assert.assertEquals(tEvent, t, 1.0e-15);
return Action.CONTINUE;
@@ -263,9 +269,11 @@ public class LutherIntegratorTest {
this.pb = pb;
maxError = 0;
}
+ @Override
public void init(double t0, double[] y0, double t) {
maxError = 0;
}
+ @Override
public void handleStep(StepInterpolator interpolator, boolean isLast) {
double[] interpolatedY = interpolator.getInterpolatedState ();
@@ -291,6 +299,7 @@ public class LutherIntegratorTest {
final double step = 1.23456;
FirstOrderIntegrator integ = new LutherIntegrator(step);
integ.addStepHandler(new StepHandler() {
+ @Override
public void handleStep(StepInterpolator interpolator, boolean isLast) {
if (! isLast) {
Assert.assertEquals(step,
@@ -298,13 +307,16 @@ public class LutherIntegratorTest {
1.0e-12);
}
}
+ @Override
public void init(double t0, double[] y0, double t) {
}
});
integ.integrate(new FirstOrderDifferentialEquations() {
+ @Override
public void computeDerivatives(double t, double[] y, double[] dot) {
dot[0] = 1.0;
}
+ @Override
public int getDimension() {
return 1;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/MidpointFieldIntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/MidpointFieldIntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/MidpointFieldIntegratorTest.java
index 0f64075..fe31cf9 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/MidpointFieldIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/MidpointFieldIntegratorTest.java
@@ -24,6 +24,7 @@ import org.apache.commons.math4.util.Decimal64Field;
public class MidpointFieldIntegratorTest extends RungeKuttaFieldIntegratorAbstractTest {
+ @Override
protected <T extends RealFieldElement<T>> RungeKuttaFieldIntegrator<T>
createIntegrator(Field<T> field, T step) {
return new MidpointFieldIntegrator<>(field, step);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/MidpointFieldStepInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/MidpointFieldStepInterpolatorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/MidpointFieldStepInterpolatorTest.java
index ef0aa9c..4794bb0 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/MidpointFieldStepInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/MidpointFieldStepInterpolatorTest.java
@@ -27,6 +27,7 @@ import org.junit.Test;
public class MidpointFieldStepInterpolatorTest extends RungeKuttaFieldStepInterpolatorAbstractTest {
+ @Override
protected <T extends RealFieldElement<T>> RungeKuttaFieldStepInterpolator<T>
createInterpolator(Field<T> field, boolean forward, T[][] yDotK,
FieldODEStateAndDerivative<T> globalPreviousState,
@@ -40,21 +41,25 @@ public class MidpointFieldStepInterpolatorTest extends RungeKuttaFieldStepInterp
mapper);
}
+ @Override
protected <T extends RealFieldElement<T>> FieldButcherArrayProvider<T>
createButcherArrayProvider(final Field<T> field) {
return new MidpointFieldIntegrator<>(field, field.getOne());
}
+ @Override
@Test
public void interpolationAtBounds() {
doInterpolationAtBounds(Decimal64Field.getInstance(), 1.0e-15);
}
+ @Override
@Test
public void interpolationInside() {
doInterpolationInside(Decimal64Field.getInstance(), 3.3e-4, 1.1e-5);
}
+ @Override
@Test
public void nonFieldInterpolatorConsistency() {
doNonFieldInterpolatorConsistency(Decimal64Field.getInstance(), 1.4e-17, 1.0e-50, 1.0e-50, 7.0e-18);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/MidpointIntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/MidpointIntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/MidpointIntegratorTest.java
index 1a1139d..eb87c03 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/MidpointIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/MidpointIntegratorTest.java
@@ -171,21 +171,25 @@ public class MidpointIntegratorTest {
final double step = 1.23456;
FirstOrderIntegrator integ = new MidpointIntegrator(step);
integ.addStepHandler(new StepHandler() {
- public void handleStep(StepInterpolator interpolator, boolean isLast) {
+ @Override
+ public void handleStep(StepInterpolator interpolator, boolean isLast) {
if (! isLast) {
Assert.assertEquals(step,
interpolator.getCurrentTime() - interpolator.getPreviousTime(),
1.0e-12);
}
}
- public void init(double t0, double[] y0, double t) {
+ @Override
+ public void init(double t0, double[] y0, double t) {
}
});
integ.integrate(new FirstOrderDifferentialEquations() {
- public void computeDerivatives(double t, double[] y, double[] dot) {
+ @Override
+ public void computeDerivatives(double t, double[] y, double[] dot) {
dot[0] = 1.0;
}
- public int getDimension() {
+ @Override
+ public int getDimension() {
return 1;
}
}, 0.0, new double[] { 0.0 }, 5.0, new double[1]);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/RungeKuttaFieldIntegratorAbstractTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/RungeKuttaFieldIntegratorAbstractTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/RungeKuttaFieldIntegratorAbstractTest.java
index a6d480c..36b1dec 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/RungeKuttaFieldIntegratorAbstractTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/RungeKuttaFieldIntegratorAbstractTest.java
@@ -128,13 +128,16 @@ public abstract class RungeKuttaFieldIntegratorAbstractTest {
k[2] = field.getZero().add(1.0e-6);
FirstOrderFieldDifferentialEquations<T> ode = new FirstOrderFieldDifferentialEquations<T>() {
+ @Override
public int getDimension() {
return k.length;
}
+ @Override
public void init(T t0, T[] y0, T t) {
}
+ @Override
public T[] computeDerivatives(T t, T[] y) {
T[] yDot = MathArrays.buildArray(field, k.length);
for (int i = 0; i < y.length; ++i) {
@@ -164,17 +167,21 @@ public abstract class RungeKuttaFieldIntegratorAbstractTest {
integrator.addEventHandler(new FieldEventHandler<T>() {
+ @Override
public void init(FieldODEStateAndDerivative<T> state0, T t) {
}
+ @Override
public FieldODEState<T> resetState(FieldODEStateAndDerivative<T> state) {
return state;
}
+ @Override
public T g(FieldODEStateAndDerivative<T> state) {
return state.getTime().subtract(tEvent);
}
+ @Override
public Action eventOccurred(FieldODEStateAndDerivative<T> state, boolean increasing) {
Assert.assertEquals(tEvent.getReal(), state.getTime().getReal(), epsilonT);
return Action.CONTINUE;
@@ -385,9 +392,11 @@ public abstract class RungeKuttaFieldIntegratorAbstractTest {
this.epsilon = epsilon;
maxError = pb.getField().getZero();
}
+ @Override
public void init(FieldODEStateAndDerivative<T> state0, T t) {
maxError = pb.getField().getZero();
}
+ @Override
public void handleStep(FieldStepInterpolator<T> interpolator, boolean isLast)
throws MaxCountExceededException {
@@ -414,6 +423,7 @@ public abstract class RungeKuttaFieldIntegratorAbstractTest {
final T step = field.getZero().add(1.23456);
RungeKuttaFieldIntegrator<T> integ = createIntegrator(field, step);
integ.addStepHandler(new FieldStepHandler<T>() {
+ @Override
public void handleStep(FieldStepInterpolator<T> interpolator, boolean isLast) {
if (! isLast) {
Assert.assertEquals(step.getReal(),
@@ -421,17 +431,21 @@ public abstract class RungeKuttaFieldIntegratorAbstractTest {
epsilon);
}
}
+ @Override
public void init(FieldODEStateAndDerivative<T> s0, T t) {
}
});
integ.integrate(new FieldExpandableODE<>(new FirstOrderFieldDifferentialEquations<T>() {
+ @Override
public void init(T t0, T[] y0, T t) {
}
+ @Override
public T[] computeDerivatives(T t, T[] y) {
T[] dot = MathArrays.buildArray(t.getField(), 1);
dot[0] = t.getField().getOne();
return dot;
}
+ @Override
public int getDimension() {
return 1;
}
@@ -472,13 +486,16 @@ public abstract class RungeKuttaFieldIntegratorAbstractTest {
final T t = field.getZero().add(0.001);
FirstOrderFieldDifferentialEquations<T> equations = new FirstOrderFieldDifferentialEquations<T>() {
+ @Override
public int getDimension() {
return 1;
}
+ @Override
public void init(T t0, T[] y0, T t) {
}
+ @Override
public T[] computeDerivatives(T t, T[] y) {
Assert.assertTrue(t.getReal() >= FastMath.nextAfter(t0.getReal(), Double.NEGATIVE_INFINITY));
Assert.assertTrue(t.getReal() <= FastMath.nextAfter(t.getReal(), Double.POSITIVE_INFINITY));
@@ -590,10 +607,12 @@ public abstract class RungeKuttaFieldIntegratorAbstractTest {
this.omega = omega;
}
+ @Override
public int getDimension() {
return 2;
}
+ @Override
public void init(final DerivativeStructure t0, final DerivativeStructure[] y0,
final DerivativeStructure finalTime) {
@@ -613,6 +632,7 @@ public abstract class RungeKuttaFieldIntegratorAbstractTest {
}
+ @Override
public DerivativeStructure[] computeDerivatives(final DerivativeStructure t, final DerivativeStructure[] y) {
return new DerivativeStructure[] {
omega.multiply(y[1]),
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/RungeKuttaFieldStepInterpolatorAbstractTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/RungeKuttaFieldStepInterpolatorAbstractTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/RungeKuttaFieldStepInterpolatorAbstractTest.java
index ca77ac3..9bde16a 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/RungeKuttaFieldStepInterpolatorAbstractTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/RungeKuttaFieldStepInterpolatorAbstractTest.java
@@ -289,11 +289,14 @@ public abstract class RungeKuttaFieldStepInterpolatorAbstractTest {
protected SinCos(final Field<T> field) {
this.field = field;
}
+ @Override
public int getDimension() {
return 2;
}
+ @Override
public void init(final T t0, final T[] y0, final T finalTime) {
}
+ @Override
public T[] computeDerivatives(final T t, final T[] y) {
T[] yDot = MathArrays.buildArray(field, 2);
yDot[0] = y[1];
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/StepFieldProblem.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/StepFieldProblem.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/StepFieldProblem.java
index 0368c85..1fc3b62 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/StepFieldProblem.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/StepFieldProblem.java
@@ -37,12 +37,14 @@ public class StepFieldProblem<T extends RealFieldElement<T>>
setRate(rateBefore);
}
+ @Override
public T[] computeDerivatives(T t, T[] y) {
T[] yDot = MathArrays.buildArray(field, 1);
yDot[0] = rate;
return yDot;
}
+ @Override
public int getDimension() {
return 1;
}
@@ -51,21 +53,26 @@ public class StepFieldProblem<T extends RealFieldElement<T>>
this.rate = rate;
}
+ @Override
public void init(T t0, T[] y0, T t) {
}
+ @Override
public void init(FieldODEStateAndDerivative<T> state0, T t) {
}
+ @Override
public Action eventOccurred(FieldODEStateAndDerivative<T> state, boolean increasing) {
setRate(rateAfter);
return Action.RESET_DERIVATIVES;
}
+ @Override
public T g(FieldODEStateAndDerivative<T> state) {
return state.getTime().subtract(switchTime);
}
+ @Override
public FieldODEState<T> resetState(FieldODEStateAndDerivative<T> state) {
return state;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/StepProblem.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/StepProblem.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/StepProblem.java
index 5a52597..4f3ab5e 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/StepProblem.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/StepProblem.java
@@ -31,11 +31,13 @@ public class StepProblem
setRate(rateBefore);
}
- public void computeDerivatives(double t, double[] y, double[] yDot) {
+ @Override
+public void computeDerivatives(double t, double[] y, double[] yDot) {
yDot[0] = rate;
}
- public int getDimension() {
+ @Override
+public int getDimension() {
return 1;
}
@@ -43,19 +45,23 @@ public class StepProblem
this.rate = rate;
}
- public void init(double t0, double[] y0, double t) {
+ @Override
+public void init(double t0, double[] y0, double t) {
}
- public Action eventOccurred(double t, double[] y, boolean increasing) {
+ @Override
+public Action eventOccurred(double t, double[] y, boolean increasing) {
setRate(rateAfter);
return Action.RESET_DERIVATIVES;
}
- public double g(double t, double[] y) {
+ @Override
+public double g(double t, double[] y) {
return t - switchTime;
}
- public void resetState(double t, double[] y) {
+ @Override
+public void resetState(double t, double[] y) {
}
private double rate;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/ThreeEighthesFieldIntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/ThreeEighthesFieldIntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/ThreeEighthesFieldIntegratorTest.java
index 1739a28..62eae5d 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/ThreeEighthesFieldIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/ThreeEighthesFieldIntegratorTest.java
@@ -24,6 +24,7 @@ import org.apache.commons.math4.util.Decimal64Field;
public class ThreeEighthesFieldIntegratorTest extends RungeKuttaFieldIntegratorAbstractTest {
+ @Override
protected <T extends RealFieldElement<T>> RungeKuttaFieldIntegrator<T>
createIntegrator(Field<T> field, T step) {
return new ThreeEighthesFieldIntegrator<>(field, step);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/ThreeEighthesFieldStepInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/ThreeEighthesFieldStepInterpolatorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/ThreeEighthesFieldStepInterpolatorTest.java
index 601a32f..f125a2d 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/ThreeEighthesFieldStepInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/ThreeEighthesFieldStepInterpolatorTest.java
@@ -27,6 +27,7 @@ import org.junit.Test;
public class ThreeEighthesFieldStepInterpolatorTest extends RungeKuttaFieldStepInterpolatorAbstractTest {
+ @Override
protected <T extends RealFieldElement<T>> RungeKuttaFieldStepInterpolator<T>
createInterpolator(Field<T> field, boolean forward, T[][] yDotK,
FieldODEStateAndDerivative<T> globalPreviousState,
@@ -40,21 +41,25 @@ public class ThreeEighthesFieldStepInterpolatorTest extends RungeKuttaFieldStepI
mapper);
}
+ @Override
protected <T extends RealFieldElement<T>> FieldButcherArrayProvider<T>
createButcherArrayProvider(final Field<T> field) {
return new ThreeEighthesFieldIntegrator<>(field, field.getOne());
}
+ @Override
@Test
public void interpolationAtBounds() {
doInterpolationAtBounds(Decimal64Field.getInstance(), 1.0e-15);
}
+ @Override
@Test
public void interpolationInside() {
doInterpolationInside(Decimal64Field.getInstance(), 2.6e-7, 3.6e-6);
}
+ @Override
@Test
public void nonFieldInterpolatorConsistency() {
doNonFieldInterpolatorConsistency(Decimal64Field.getInstance(), 1.4e-17, 1.2e-16, 3.4e-16, 1.4e-17);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/ThreeEighthesIntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/ThreeEighthesIntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/ThreeEighthesIntegratorTest.java
index 6d95401..c81de9a 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/ThreeEighthesIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/ThreeEighthesIntegratorTest.java
@@ -184,10 +184,12 @@ public class ThreeEighthesIntegratorTest {
maxError = 0;
}
+ @Override
public void init(double t0, double[] y0, double t) {
maxError = 0;
}
+ @Override
public void handleStep(StepInterpolator interpolator, boolean isLast)
throws MaxCountExceededException {
@@ -219,21 +221,25 @@ public class ThreeEighthesIntegratorTest {
final double step = 1.23456;
FirstOrderIntegrator integ = new ThreeEighthesIntegrator(step);
integ.addStepHandler(new StepHandler() {
- public void handleStep(StepInterpolator interpolator, boolean isLast) {
+ @Override
+ public void handleStep(StepInterpolator interpolator, boolean isLast) {
if (! isLast) {
Assert.assertEquals(step,
interpolator.getCurrentTime() - interpolator.getPreviousTime(),
1.0e-12);
}
}
- public void init(double t0, double[] y0, double t) {
+ @Override
+ public void init(double t0, double[] y0, double t) {
}
});
integ.integrate(new FirstOrderDifferentialEquations() {
- public void computeDerivatives(double t, double[] y, double[] dot) {
+ @Override
+ public void computeDerivatives(double t, double[] y, double[] dot) {
dot[0] = 1.0;
}
- public int getDimension() {
+ @Override
+ public int getDimension() {
return 1;
}
}, 0.0, new double[] { 0.0 }, 5.0, new double[1]);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/sampling/StepInterpolatorTestUtils.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/sampling/StepInterpolatorTestUtils.java b/src/test/java/org/apache/commons/math4/ode/sampling/StepInterpolatorTestUtils.java
index d3d5fca..7a8834d 100644
--- a/src/test/java/org/apache/commons/math4/ode/sampling/StepInterpolatorTestUtils.java
+++ b/src/test/java/org/apache/commons/math4/ode/sampling/StepInterpolatorTestUtils.java
@@ -43,6 +43,7 @@ public class StepInterpolatorTestUtils {
MaxCountExceededException, NoBracketingException {
integrator.addStepHandler(new StepHandler() {
+ @Override
public void handleStep(StepInterpolator interpolator, boolean isLast)
throws MaxCountExceededException {
@@ -84,6 +85,7 @@ public class StepInterpolatorTestUtils {
}
+ @Override
public void init(double t0, double[] y0, double t) {
}
@@ -100,6 +102,7 @@ public class StepInterpolatorTestUtils {
final double threshold) {
integrator.addStepHandler(new FieldStepHandler<T>() {
+ @Override
public void handleStep(FieldStepInterpolator<T> interpolator, boolean isLast)
throws MaxCountExceededException {
@@ -132,6 +135,7 @@ public class StepInterpolatorTestUtils {
}
+ @Override
public void init(FieldODEStateAndDerivative<T> state0, T t) {
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/sampling/StepNormalizerOutputTestBase.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/sampling/StepNormalizerOutputTestBase.java b/src/test/java/org/apache/commons/math4/ode/sampling/StepNormalizerOutputTestBase.java
index 6f6bfbe..682e16c 100644
--- a/src/test/java/org/apache/commons/math4/ode/sampling/StepNormalizerOutputTestBase.java
+++ b/src/test/java/org/apache/commons/math4/ode/sampling/StepNormalizerOutputTestBase.java
@@ -265,20 +265,24 @@ public abstract class StepNormalizerOutputTestBase
}
/** {@inheritDoc} */
+ @Override
public int getDimension() {
return 1;
}
/** {@inheritDoc} */
+ @Override
public void computeDerivatives(double t, double[] y, double[] yDot) {
yDot[0] = y[0];
}
/** {@inheritDoc} */
+ @Override
public void init(double t0, double[] y0, double t) {
}
/** {@inheritDoc} */
+ @Override
public void handleStep(double t, double[] y, double[] yDot, boolean isLast) {
output.add(t);
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/sampling/StepNormalizerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/sampling/StepNormalizerTest.java b/src/test/java/org/apache/commons/math4/ode/sampling/StepNormalizerTest.java
index 3a8ba4b..488ff94 100644
--- a/src/test/java/org/apache/commons/math4/ode/sampling/StepNormalizerTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/sampling/StepNormalizerTest.java
@@ -49,9 +49,11 @@ public class StepNormalizerTest {
integ.addStepHandler(new StepNormalizer(range / 10.0,
new FixedStepHandler() {
private boolean firstCall = true;
- public void init(double t0, double[] y0, double t) {
+ @Override
+ public void init(double t0, double[] y0, double t) {
}
- public void handleStep(double t,
+ @Override
+ public void handleStep(double t,
double[] y,
double[] yDot,
boolean isLast) {
@@ -79,9 +81,11 @@ public class StepNormalizerTest {
setLastSeen(false);
integ.addStepHandler(new StepNormalizer(range / 10.5,
new FixedStepHandler() {
- public void init(double t0, double[] y0, double t) {
+ @Override
+ public void init(double t0, double[] y0, double t) {
}
- public void handleStep(double t,
+ @Override
+ public void handleStep(double t,
double[] y,
double[] yDot,
boolean isLast) {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/MultiStartMultivariateOptimizerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/MultiStartMultivariateOptimizerTest.java b/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/MultiStartMultivariateOptimizerTest.java
index 1d6ea55..4db0f2b 100644
--- a/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/MultiStartMultivariateOptimizerTest.java
+++ b/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/MultiStartMultivariateOptimizerTest.java
@@ -121,6 +121,7 @@ public class MultiStartMultivariateOptimizerTest {
count = 0;
}
+ @Override
public double value(double[] x) {
++count;
double a = x[1] - x[0] * x[0];
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateFunctionMappingAdapterTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateFunctionMappingAdapterTest.java b/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateFunctionMappingAdapterTest.java
index ed67a63..3335ec5 100644
--- a/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateFunctionMappingAdapterTest.java
+++ b/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateFunctionMappingAdapterTest.java
@@ -163,6 +163,7 @@ public class MultivariateFunctionMappingAdapterTest {
this.yMax = yMax;
}
+ @Override
public double value(double[] point) {
// the function should never be called with out of range points
Assert.assertTrue(point[0] >= xMin);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateFunctionPenaltyAdapterTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateFunctionPenaltyAdapterTest.java b/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateFunctionPenaltyAdapterTest.java
index 0c02844..79d1ece 100644
--- a/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateFunctionPenaltyAdapterTest.java
+++ b/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateFunctionPenaltyAdapterTest.java
@@ -171,6 +171,7 @@ public class MultivariateFunctionPenaltyAdapterTest {
this.yMax = yMax;
}
+ @Override
public double value(double[] point) {
// the function should never be called with out of range points
Assert.assertTrue(point[0] >= xMin);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/gradient/CircleScalar.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/gradient/CircleScalar.java b/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/gradient/CircleScalar.java
index 0c80254..5e5e90a 100644
--- a/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/gradient/CircleScalar.java
+++ b/src/test/java/org/apache/commons/math4/optim/nonlinear/scalar/gradient/CircleScalar.java
@@ -49,6 +49,7 @@ public class CircleScalar {
public ObjectiveFunction getObjectiveFunction() {
return new ObjectiveFunction(new MultivariateFunction() {
+ @Override
public double value(double[] params) {
Vector2D center = new Vector2D(params[0], params[1]);
double radius = getRadius(center);
@@ -64,6 +65,7 @@ public class CircleScalar {
public ObjectiveFunctionGradient getObjectiveFunctionGradient() {
return new ObjectiveFunctionGradient(new MultivariateVectorFunction() {
+ @Override
public double[] value(double[] params) {
Vector2D center = new Vector2D(params[0], params[1]);
double radius = getRadius(center);
[3/4] [math] Add missing '@Override' annotations.
Posted by gg...@apache.org.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/linear/ArrayFieldVectorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/linear/ArrayFieldVectorTest.java b/src/test/java/org/apache/commons/math4/linear/ArrayFieldVectorTest.java
index 1268b26..2369824 100644
--- a/src/test/java/org/apache/commons/math4/linear/ArrayFieldVectorTest.java
+++ b/src/test/java/org/apache/commons/math4/linear/ArrayFieldVectorTest.java
@@ -90,6 +90,7 @@ public class ArrayFieldVectorTest {
data = d.clone();
}
+ @Override
public Field<T> getField() {
return field;
}
@@ -98,10 +99,12 @@ public class ArrayFieldVectorTest {
return new UnsupportedOperationException("Not supported, unneeded for test purposes");
}
+ @Override
public FieldVector<T> copy() {
throw unsupported();
}
+ @Override
public FieldVector<T> add(FieldVector<T> v) {
throw unsupported();
}
@@ -110,6 +113,7 @@ public class ArrayFieldVectorTest {
throw unsupported();
}
+ @Override
public FieldVector<T> subtract(FieldVector<T> v) {
throw unsupported();
}
@@ -118,22 +122,27 @@ public class ArrayFieldVectorTest {
throw unsupported();
}
+ @Override
public FieldVector<T> mapAdd(T d) {
throw unsupported();
}
+ @Override
public FieldVector<T> mapAddToSelf(T d) {
throw unsupported();
}
+ @Override
public FieldVector<T> mapSubtract(T d) {
throw unsupported();
}
+ @Override
public FieldVector<T> mapSubtractToSelf(T d) {
throw unsupported();
}
+ @Override
public FieldVector<T> mapMultiply(T d) {
T[] out = buildArray(data.length);
for (int i = 0; i < data.length; i++) {
@@ -142,26 +151,32 @@ public class ArrayFieldVectorTest {
return new FieldVectorTestImpl<>(out);
}
+ @Override
public FieldVector<T> mapMultiplyToSelf(T d) {
throw unsupported();
}
+ @Override
public FieldVector<T> mapDivide(T d) {
throw unsupported();
}
+ @Override
public FieldVector<T> mapDivideToSelf(T d) {
throw unsupported();
}
+ @Override
public FieldVector<T> mapInv() {
throw unsupported();
}
+ @Override
public FieldVector<T> mapInvToSelf() {
throw unsupported();
}
+ @Override
public FieldVector<T> ebeMultiply(FieldVector<T> v) {
throw unsupported();
}
@@ -170,6 +185,7 @@ public class ArrayFieldVectorTest {
throw unsupported();
}
+ @Override
public FieldVector<T> ebeDivide(FieldVector<T> v) {
throw unsupported();
}
@@ -182,6 +198,7 @@ public class ArrayFieldVectorTest {
return data.clone();
}
+ @Override
public T dotProduct(FieldVector<T> v) {
T dot = field.getZero();
for (int i = 0; i < data.length; i++) {
@@ -198,6 +215,7 @@ public class ArrayFieldVectorTest {
return dot;
}
+ @Override
public FieldVector<T> projection(FieldVector<T> v) {
throw unsupported();
}
@@ -206,6 +224,7 @@ public class ArrayFieldVectorTest {
throw unsupported();
}
+ @Override
public FieldMatrix<T> outerProduct(FieldVector<T> v) {
throw unsupported();
}
@@ -214,18 +233,22 @@ public class ArrayFieldVectorTest {
throw unsupported();
}
+ @Override
public T getEntry(int index) {
return data[index];
}
+ @Override
public int getDimension() {
return data.length;
}
+ @Override
public FieldVector<T> append(FieldVector<T> v) {
throw unsupported();
}
+ @Override
public FieldVector<T> append(T d) {
throw unsupported();
}
@@ -234,14 +257,17 @@ public class ArrayFieldVectorTest {
throw unsupported();
}
+ @Override
public FieldVector<T> getSubVector(int index, int n) {
throw unsupported();
}
+ @Override
public void setEntry(int index, T value) {
throw unsupported();
}
+ @Override
public void setSubVector(int index, FieldVector<T> v) {
throw unsupported();
}
@@ -250,10 +276,12 @@ public class ArrayFieldVectorTest {
throw unsupported();
}
+ @Override
public void set(T value) {
throw unsupported();
}
+ @Override
public T[] toArray() {
return data.clone();
}
@@ -681,6 +709,7 @@ public class ArrayFieldVectorTest {
private int expectedIndex;
+ @Override
public void visit(final int actualIndex, final Fraction actualValue) {
Assert.assertEquals(expectedIndex, actualIndex);
Assert.assertEquals(Integer.toString(actualIndex),
@@ -688,6 +717,7 @@ public class ArrayFieldVectorTest {
++expectedIndex;
}
+ @Override
public void start(final int actualSize, final int actualStart,
final int actualEnd) {
Assert.assertEquals(data.length, actualSize);
@@ -696,6 +726,7 @@ public class ArrayFieldVectorTest {
expectedIndex = 0;
}
+ @Override
public Fraction end() {
return Fraction.ZERO;
}
@@ -710,14 +741,17 @@ public class ArrayFieldVectorTest {
final FieldVectorPreservingVisitor<Fraction> visitor;
visitor = new FieldVectorPreservingVisitor<Fraction>() {
+ @Override
public void visit(int index, Fraction value) {
// Do nothing
}
+ @Override
public void start(int dimension, int start, int end) {
// Do nothing
}
+ @Override
public Fraction end() {
return Fraction.ZERO;
}
@@ -770,6 +804,7 @@ public class ArrayFieldVectorTest {
private int expectedIndex;
+ @Override
public void visit(final int actualIndex, final Fraction actualValue) {
Assert.assertEquals(expectedIndex, actualIndex);
Assert.assertEquals(Integer.toString(actualIndex),
@@ -777,6 +812,7 @@ public class ArrayFieldVectorTest {
++expectedIndex;
}
+ @Override
public void start(final int actualSize, final int actualStart,
final int actualEnd) {
Assert.assertEquals(data.length, actualSize);
@@ -785,6 +821,7 @@ public class ArrayFieldVectorTest {
expectedIndex = expectedStart;
}
+ @Override
public Fraction end() {
return Fraction.ZERO;
}
@@ -805,12 +842,14 @@ public class ArrayFieldVectorTest {
visitor = new FieldVectorPreservingVisitor<Fraction>() {
private final boolean[] visited = new boolean[data.length];
+ @Override
public void visit(final int actualIndex, final Fraction actualValue) {
visited[actualIndex] = true;
Assert.assertEquals(Integer.toString(actualIndex),
data[actualIndex], actualValue);
}
+ @Override
public void start(final int actualSize, final int actualStart,
final int actualEnd) {
Assert.assertEquals(data.length, actualSize);
@@ -819,6 +858,7 @@ public class ArrayFieldVectorTest {
Arrays.fill(visited, false);
}
+ @Override
public Fraction end() {
for (int i = 0; i < data.length; i++) {
Assert.assertTrue("entry " + i + "has not been visited",
@@ -837,14 +877,17 @@ public class ArrayFieldVectorTest {
final FieldVectorPreservingVisitor<Fraction> visitor;
visitor = new FieldVectorPreservingVisitor<Fraction>() {
+ @Override
public void visit(int index, Fraction value) {
// Do nothing
}
+ @Override
public void start(int dimension, int start, int end) {
// Do nothing
}
+ @Override
public Fraction end() {
return Fraction.ZERO;
}
@@ -896,12 +939,14 @@ public class ArrayFieldVectorTest {
visitor = new FieldVectorPreservingVisitor<Fraction>() {
private final boolean[] visited = new boolean[data.length];
+ @Override
public void visit(final int actualIndex, final Fraction actualValue) {
Assert.assertEquals(Integer.toString(actualIndex),
data[actualIndex], actualValue);
visited[actualIndex] = true;
}
+ @Override
public void start(final int actualSize, final int actualStart,
final int actualEnd) {
Assert.assertEquals(data.length, actualSize);
@@ -910,6 +955,7 @@ public class ArrayFieldVectorTest {
Arrays.fill(visited, true);
}
+ @Override
public Fraction end() {
for (int i = expectedStart; i <= expectedEnd; i++) {
Assert.assertTrue("entry " + i + "has not been visited",
@@ -935,6 +981,7 @@ public class ArrayFieldVectorTest {
private int expectedIndex;
+ @Override
public Fraction visit(final int actualIndex, final Fraction actualValue) {
Assert.assertEquals(expectedIndex, actualIndex);
Assert.assertEquals(Integer.toString(actualIndex),
@@ -943,6 +990,7 @@ public class ArrayFieldVectorTest {
return actualValue.add(actualIndex);
}
+ @Override
public void start(final int actualSize, final int actualStart,
final int actualEnd) {
Assert.assertEquals(data.length, actualSize);
@@ -951,6 +999,7 @@ public class ArrayFieldVectorTest {
expectedIndex = 0;
}
+ @Override
public Fraction end() {
return Fraction.ZERO;
}
@@ -968,14 +1017,17 @@ public class ArrayFieldVectorTest {
final FieldVectorChangingVisitor<Fraction> visitor;
visitor = new FieldVectorChangingVisitor<Fraction>() {
+ @Override
public Fraction visit(int index, Fraction value) {
return Fraction.ZERO;
}
+ @Override
public void start(int dimension, int start, int end) {
// Do nothing
}
+ @Override
public Fraction end() {
return Fraction.ZERO;
}
@@ -1028,6 +1080,7 @@ public class ArrayFieldVectorTest {
private int expectedIndex;
+ @Override
public Fraction visit(final int actualIndex, final Fraction actualValue) {
Assert.assertEquals(expectedIndex, actualIndex);
Assert.assertEquals(Integer.toString(actualIndex),
@@ -1036,6 +1089,7 @@ public class ArrayFieldVectorTest {
return actualValue.add(actualIndex);
}
+ @Override
public void start(final int actualSize, final int actualStart,
final int actualEnd) {
Assert.assertEquals(data.length, actualSize);
@@ -1044,6 +1098,7 @@ public class ArrayFieldVectorTest {
expectedIndex = expectedStart;
}
+ @Override
public Fraction end() {
return Fraction.ZERO;
}
@@ -1067,6 +1122,7 @@ public class ArrayFieldVectorTest {
visitor = new FieldVectorChangingVisitor<Fraction>() {
private final boolean[] visited = new boolean[data.length];
+ @Override
public Fraction visit(final int actualIndex, final Fraction actualValue) {
visited[actualIndex] = true;
Assert.assertEquals(Integer.toString(actualIndex),
@@ -1074,6 +1130,7 @@ public class ArrayFieldVectorTest {
return actualValue.add(actualIndex);
}
+ @Override
public void start(final int actualSize, final int actualStart,
final int actualEnd) {
Assert.assertEquals(data.length, actualSize);
@@ -1082,6 +1139,7 @@ public class ArrayFieldVectorTest {
Arrays.fill(visited, false);
}
+ @Override
public Fraction end() {
for (int i = 0; i < data.length; i++) {
Assert.assertTrue("entry " + i + "has not been visited",
@@ -1103,14 +1161,17 @@ public class ArrayFieldVectorTest {
final FieldVectorChangingVisitor<Fraction> visitor;
visitor = new FieldVectorChangingVisitor<Fraction>() {
+ @Override
public Fraction visit(int index, Fraction value) {
return Fraction.ZERO;
}
+ @Override
public void start(int dimension, int start, int end) {
// Do nothing
}
+ @Override
public Fraction end() {
return Fraction.ZERO;
}
@@ -1162,6 +1223,7 @@ public class ArrayFieldVectorTest {
visitor = new FieldVectorChangingVisitor<Fraction>() {
private final boolean[] visited = new boolean[data.length];
+ @Override
public Fraction visit(final int actualIndex, final Fraction actualValue) {
Assert.assertEquals(Integer.toString(actualIndex),
data[actualIndex], actualValue);
@@ -1169,6 +1231,7 @@ public class ArrayFieldVectorTest {
return actualValue.add(actualIndex);
}
+ @Override
public void start(final int actualSize, final int actualStart,
final int actualEnd) {
Assert.assertEquals(data.length, actualSize);
@@ -1177,6 +1240,7 @@ public class ArrayFieldVectorTest {
Arrays.fill(visited, true);
}
+ @Override
public Fraction end() {
for (int i = expectedStart; i <= expectedEnd; i++) {
Assert.assertTrue("entry " + i + "has not been visited",
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/linear/ConjugateGradientTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/linear/ConjugateGradientTest.java b/src/test/java/org/apache/commons/math4/linear/ConjugateGradientTest.java
index 07c2ee0..9cbbc8f 100644
--- a/src/test/java/org/apache/commons/math4/linear/ConjugateGradientTest.java
+++ b/src/test/java/org/apache/commons/math4/linear/ConjugateGradientTest.java
@@ -179,14 +179,17 @@ public class ConjugateGradientTest {
final RealVector x = new ArrayRealVector(n);
final IterationListener listener = new IterationListener() {
+ @Override
public void terminationPerformed(final IterationEvent e) {
// Do nothing
}
+ @Override
public void iterationStarted(final IterationEvent e) {
// Do nothing
}
+ @Override
public void iterationPerformed(final IterationEvent e) {
final IterativeLinearSolverEvent evt;
evt = (IterativeLinearSolverEvent) e;
@@ -196,6 +199,7 @@ public class ConjugateGradientTest {
x.setSubVector(0, v);
}
+ @Override
public void initializationPerformed(final IterationEvent e) {
// Do nothing
}
@@ -350,14 +354,17 @@ public class ConjugateGradientTest {
final RealVector x = new ArrayRealVector(n);
final IterationListener listener = new IterationListener() {
+ @Override
public void terminationPerformed(final IterationEvent e) {
// Do nothing
}
+ @Override
public void iterationStarted(final IterationEvent e) {
// Do nothing
}
+ @Override
public void iterationPerformed(final IterationEvent e) {
final IterativeLinearSolverEvent evt;
evt = (IterativeLinearSolverEvent) e;
@@ -367,6 +374,7 @@ public class ConjugateGradientTest {
x.setSubVector(0, v);
}
+ @Override
public void initializationPerformed(final IterationEvent e) {
// Do nothing
}
@@ -479,11 +487,13 @@ public class ConjugateGradientTest {
}
}
+ @Override
public void initializationPerformed(final IterationEvent e) {
++count[0];
doTestVectorsAreUnmodifiable(e);
}
+ @Override
public void iterationPerformed(final IterationEvent e) {
++count[2];
Assert.assertEquals("iteration performed",
@@ -491,6 +501,7 @@ public class ConjugateGradientTest {
doTestVectorsAreUnmodifiable(e);
}
+ @Override
public void iterationStarted(final IterationEvent e) {
++count[1];
Assert.assertEquals("iteration started",
@@ -498,6 +509,7 @@ public class ConjugateGradientTest {
doTestVectorsAreUnmodifiable(e);
}
+ @Override
public void terminationPerformed(final IterationEvent e) {
++count[3];
doTestVectorsAreUnmodifiable(e);
@@ -538,18 +550,22 @@ public class ConjugateGradientTest {
FastMath.max(1E-5 * rnorm, 1E-10));
}
+ @Override
public void initializationPerformed(final IterationEvent e) {
doTestNormOfResidual(e);
}
+ @Override
public void iterationPerformed(final IterationEvent e) {
doTestNormOfResidual(e);
}
+ @Override
public void iterationStarted(final IterationEvent e) {
doTestNormOfResidual(e);
}
+ @Override
public void terminationPerformed(final IterationEvent e) {
doTestNormOfResidual(e);
}
@@ -585,18 +601,22 @@ public class ConjugateGradientTest {
FastMath.max(1E-5 * rnorm, 1E-10));
}
+ @Override
public void initializationPerformed(final IterationEvent e) {
doTestNormOfResidual(e);
}
+ @Override
public void iterationPerformed(final IterationEvent e) {
doTestNormOfResidual(e);
}
+ @Override
public void iterationStarted(final IterationEvent e) {
doTestNormOfResidual(e);
}
+ @Override
public void terminationPerformed(final IterationEvent e) {
doTestNormOfResidual(e);
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/linear/SparseFieldVectorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/linear/SparseFieldVectorTest.java b/src/test/java/org/apache/commons/math4/linear/SparseFieldVectorTest.java
index 5df1142..29efdd3 100644
--- a/src/test/java/org/apache/commons/math4/linear/SparseFieldVectorTest.java
+++ b/src/test/java/org/apache/commons/math4/linear/SparseFieldVectorTest.java
@@ -266,6 +266,7 @@ public class SparseFieldVectorTest {
private int expectedIndex;
+ @Override
public void visit(final int actualIndex, final Fraction actualValue) {
Assert.assertEquals(expectedIndex, actualIndex);
Assert.assertEquals(Integer.toString(actualIndex),
@@ -273,6 +274,7 @@ public class SparseFieldVectorTest {
++expectedIndex;
}
+ @Override
public void start(final int actualSize, final int actualStart,
final int actualEnd) {
Assert.assertEquals(data.length, actualSize);
@@ -281,6 +283,7 @@ public class SparseFieldVectorTest {
expectedIndex = 0;
}
+ @Override
public Fraction end() {
return Fraction.ZERO;
}
@@ -295,14 +298,17 @@ public class SparseFieldVectorTest {
final FieldVectorPreservingVisitor<Fraction> visitor;
visitor = new FieldVectorPreservingVisitor<Fraction>() {
+ @Override
public void visit(int index, Fraction value) {
// Do nothing
}
+ @Override
public void start(int dimension, int start, int end) {
// Do nothing
}
+ @Override
public Fraction end() {
return Fraction.ZERO;
}
@@ -355,6 +361,7 @@ public class SparseFieldVectorTest {
private int expectedIndex;
+ @Override
public void visit(final int actualIndex, final Fraction actualValue) {
Assert.assertEquals(expectedIndex, actualIndex);
Assert.assertEquals(Integer.toString(actualIndex),
@@ -362,6 +369,7 @@ public class SparseFieldVectorTest {
++expectedIndex;
}
+ @Override
public void start(final int actualSize, final int actualStart,
final int actualEnd) {
Assert.assertEquals(data.length, actualSize);
@@ -370,6 +378,7 @@ public class SparseFieldVectorTest {
expectedIndex = expectedStart;
}
+ @Override
public Fraction end() {
return Fraction.ZERO;
}
@@ -390,12 +399,14 @@ public class SparseFieldVectorTest {
visitor = new FieldVectorPreservingVisitor<Fraction>() {
private final boolean[] visited = new boolean[data.length];
+ @Override
public void visit(final int actualIndex, final Fraction actualValue) {
visited[actualIndex] = true;
Assert.assertEquals(Integer.toString(actualIndex),
data[actualIndex], actualValue);
}
+ @Override
public void start(final int actualSize, final int actualStart,
final int actualEnd) {
Assert.assertEquals(data.length, actualSize);
@@ -404,6 +415,7 @@ public class SparseFieldVectorTest {
Arrays.fill(visited, false);
}
+ @Override
public Fraction end() {
for (int i = 0; i < data.length; i++) {
Assert.assertTrue("entry " + i + "has not been visited",
@@ -422,14 +434,17 @@ public class SparseFieldVectorTest {
final FieldVectorPreservingVisitor<Fraction> visitor;
visitor = new FieldVectorPreservingVisitor<Fraction>() {
+ @Override
public void visit(int index, Fraction value) {
// Do nothing
}
+ @Override
public void start(int dimension, int start, int end) {
// Do nothing
}
+ @Override
public Fraction end() {
return Fraction.ZERO;
}
@@ -481,12 +496,14 @@ public class SparseFieldVectorTest {
visitor = new FieldVectorPreservingVisitor<Fraction>() {
private final boolean[] visited = new boolean[data.length];
+ @Override
public void visit(final int actualIndex, final Fraction actualValue) {
Assert.assertEquals(Integer.toString(actualIndex),
data[actualIndex], actualValue);
visited[actualIndex] = true;
}
+ @Override
public void start(final int actualSize, final int actualStart,
final int actualEnd) {
Assert.assertEquals(data.length, actualSize);
@@ -495,6 +512,7 @@ public class SparseFieldVectorTest {
Arrays.fill(visited, true);
}
+ @Override
public Fraction end() {
for (int i = expectedStart; i <= expectedEnd; i++) {
Assert.assertTrue("entry " + i + "has not been visited",
@@ -520,6 +538,7 @@ public class SparseFieldVectorTest {
private int expectedIndex;
+ @Override
public Fraction visit(final int actualIndex, final Fraction actualValue) {
Assert.assertEquals(expectedIndex, actualIndex);
Assert.assertEquals(Integer.toString(actualIndex),
@@ -528,6 +547,7 @@ public class SparseFieldVectorTest {
return actualValue.add(actualIndex);
}
+ @Override
public void start(final int actualSize, final int actualStart,
final int actualEnd) {
Assert.assertEquals(data.length, actualSize);
@@ -536,6 +556,7 @@ public class SparseFieldVectorTest {
expectedIndex = 0;
}
+ @Override
public Fraction end() {
return Fraction.ZERO;
}
@@ -553,14 +574,17 @@ public class SparseFieldVectorTest {
final FieldVectorChangingVisitor<Fraction> visitor;
visitor = new FieldVectorChangingVisitor<Fraction>() {
+ @Override
public Fraction visit(int index, Fraction value) {
return Fraction.ZERO;
}
+ @Override
public void start(int dimension, int start, int end) {
// Do nothing
}
+ @Override
public Fraction end() {
return Fraction.ZERO;
}
@@ -613,6 +637,7 @@ public class SparseFieldVectorTest {
private int expectedIndex;
+ @Override
public Fraction visit(final int actualIndex, final Fraction actualValue) {
Assert.assertEquals(expectedIndex, actualIndex);
Assert.assertEquals(Integer.toString(actualIndex),
@@ -621,6 +646,7 @@ public class SparseFieldVectorTest {
return actualValue.add(actualIndex);
}
+ @Override
public void start(final int actualSize, final int actualStart,
final int actualEnd) {
Assert.assertEquals(data.length, actualSize);
@@ -629,6 +655,7 @@ public class SparseFieldVectorTest {
expectedIndex = expectedStart;
}
+ @Override
public Fraction end() {
return Fraction.ZERO;
}
@@ -652,6 +679,7 @@ public class SparseFieldVectorTest {
visitor = new FieldVectorChangingVisitor<Fraction>() {
private final boolean[] visited = new boolean[data.length];
+ @Override
public Fraction visit(final int actualIndex, final Fraction actualValue) {
visited[actualIndex] = true;
Assert.assertEquals(Integer.toString(actualIndex),
@@ -659,6 +687,7 @@ public class SparseFieldVectorTest {
return actualValue.add(actualIndex);
}
+ @Override
public void start(final int actualSize, final int actualStart,
final int actualEnd) {
Assert.assertEquals(data.length, actualSize);
@@ -667,6 +696,7 @@ public class SparseFieldVectorTest {
Arrays.fill(visited, false);
}
+ @Override
public Fraction end() {
for (int i = 0; i < data.length; i++) {
Assert.assertTrue("entry " + i + "has not been visited",
@@ -688,14 +718,17 @@ public class SparseFieldVectorTest {
final FieldVectorChangingVisitor<Fraction> visitor;
visitor = new FieldVectorChangingVisitor<Fraction>() {
+ @Override
public Fraction visit(int index, Fraction value) {
return Fraction.ZERO;
}
+ @Override
public void start(int dimension, int start, int end) {
// Do nothing
}
+ @Override
public Fraction end() {
return Fraction.ZERO;
}
@@ -747,6 +780,7 @@ public class SparseFieldVectorTest {
visitor = new FieldVectorChangingVisitor<Fraction>() {
private final boolean[] visited = new boolean[data.length];
+ @Override
public Fraction visit(final int actualIndex, final Fraction actualValue) {
Assert.assertEquals(Integer.toString(actualIndex),
data[actualIndex], actualValue);
@@ -754,6 +788,7 @@ public class SparseFieldVectorTest {
return actualValue.add(actualIndex);
}
+ @Override
public void start(final int actualSize, final int actualStart,
final int actualEnd) {
Assert.assertEquals(data.length, actualSize);
@@ -762,6 +797,7 @@ public class SparseFieldVectorTest {
Arrays.fill(visited, true);
}
+ @Override
public Fraction end() {
for (int i = expectedStart; i <= expectedEnd; i++) {
Assert.assertTrue("entry " + i + "has not been visited",
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/linear/SymmLQTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/linear/SymmLQTest.java b/src/test/java/org/apache/commons/math4/linear/SymmLQTest.java
index 5934b58..75ae635 100644
--- a/src/test/java/org/apache/commons/math4/linear/SymmLQTest.java
+++ b/src/test/java/org/apache/commons/math4/linear/SymmLQTest.java
@@ -503,10 +503,12 @@ public class SymmLQTest {
final RealVector xFromListener = new ArrayRealVector(n);
final IterationListener listener = new IterationListener() {
+ @Override
public void initializationPerformed(final IterationEvent e) {
++count[0];
}
+ @Override
public void iterationPerformed(final IterationEvent e) {
++count[2];
Assert.assertEquals("iteration performed",
@@ -514,6 +516,7 @@ public class SymmLQTest {
e.getIterations() - 1);
}
+ @Override
public void iterationStarted(final IterationEvent e) {
++count[1];
Assert.assertEquals("iteration started",
@@ -521,6 +524,7 @@ public class SymmLQTest {
e.getIterations() - 1);
}
+ @Override
public void terminationPerformed(final IterationEvent e) {
++count[3];
final IterativeLinearSolverEvent ilse;
@@ -625,18 +629,22 @@ public class SymmLQTest {
FastMath.max(1E-5 * rnorm, 1E-10));
}
+ @Override
public void initializationPerformed(final IterationEvent e) {
doTestNormOfResidual(e);
}
+ @Override
public void iterationPerformed(final IterationEvent e) {
doTestNormOfResidual(e);
}
+ @Override
public void iterationStarted(final IterationEvent e) {
doTestNormOfResidual(e);
}
+ @Override
public void terminationPerformed(final IterationEvent e) {
doTestNormOfResidual(e);
}
@@ -673,18 +681,22 @@ public class SymmLQTest {
FastMath.max(1E-5 * rnorm, 1E-10));
}
+ @Override
public void initializationPerformed(final IterationEvent e) {
doTestNormOfResidual(e);
}
+ @Override
public void iterationPerformed(final IterationEvent e) {
doTestNormOfResidual(e);
}
+ @Override
public void iterationStarted(final IterationEvent e) {
doTestNormOfResidual(e);
}
+ @Override
public void terminationPerformed(final IterationEvent e) {
doTestNormOfResidual(e);
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ml/neuralnet/OffsetFeatureInitializer.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ml/neuralnet/OffsetFeatureInitializer.java b/src/test/java/org/apache/commons/math4/ml/neuralnet/OffsetFeatureInitializer.java
index 9e13e35..fb91d80 100644
--- a/src/test/java/org/apache/commons/math4/ml/neuralnet/OffsetFeatureInitializer.java
+++ b/src/test/java/org/apache/commons/math4/ml/neuralnet/OffsetFeatureInitializer.java
@@ -43,6 +43,7 @@ public class OffsetFeatureInitializer
}
/** {@inheritDoc} */
+ @Override
public double value() {
return orig.value() + inc++;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/TravellingSalesmanSolver.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/TravellingSalesmanSolver.java b/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/TravellingSalesmanSolver.java
index aad20db..c15a869 100644
--- a/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/TravellingSalesmanSolver.java
+++ b/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/TravellingSalesmanSolver.java
@@ -183,15 +183,18 @@ public class TravellingSalesmanSolver {
/** Number of samples. */
private long n = 0;
/** {@inheritDoc} */
+ @Override
public boolean hasNext() {
return n < numSamples;
}
/** {@inheritDoc} */
+ @Override
public double[] next() {
++n;
return cityList.get(random.nextInt(cityList.size())).getCoordinates();
}
/** {@inheritDoc} */
+ @Override
public void remove() {
throw new MathUnsupportedOperationException();
}
@@ -405,6 +408,7 @@ class City {
}
/** {@inheritDoc} */
+ @Override
public boolean equals(Object o) {
if (o instanceof City) {
final City other = (City) o;
@@ -415,6 +419,7 @@ class City {
}
/** {@inheritDoc} */
+ @Override
public int hashCode() {
int result = 17;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/ContinuousOutputFieldModelTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/ContinuousOutputFieldModelTest.java b/src/test/java/org/apache/commons/math4/ode/ContinuousOutputFieldModelTest.java
index b50d0b9..46a01d0 100644
--- a/src/test/java/org/apache/commons/math4/ode/ContinuousOutputFieldModelTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/ContinuousOutputFieldModelTest.java
@@ -103,15 +103,18 @@ public class ContinuousOutputFieldModelTest {
// theoretical solution: y[0] = cos(t), y[1] = sin(t)
FirstOrderFieldDifferentialEquations<T> problem =
new FirstOrderFieldDifferentialEquations<T>() {
+ @Override
public T[] computeDerivatives(T t, T[] y) {
T[] yDot = MathArrays.buildArray(field, 2);
yDot[0] = y[1].negate();
yDot[1] = y[0];
return yDot;
}
+ @Override
public int getDimension() {
return 2;
}
+ @Override
public void init(T t0, T[] y0, T finalTime) {
}
};
@@ -204,11 +207,14 @@ public class ContinuousOutputFieldModelTest {
final FieldODEStateAndDerivative<T> s0 = new FieldODEStateAndDerivative<>(field.getZero().add(t0), fieldY, fieldY);
final FieldODEStateAndDerivative<T> s1 = new FieldODEStateAndDerivative<>(field.getZero().add(t1), fieldY, fieldY);
final FieldEquationsMapper<T> mapper = new FieldExpandableODE<>(new FirstOrderFieldDifferentialEquations<T>() {
+ @Override
public int getDimension() {
return s0.getStateDimension();
}
+ @Override
public void init(T t0, T[] y0, T finalTime) {
}
+ @Override
public T[] computeDerivatives(T t, T[] y) {
return y;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/FieldExpandableODETest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/FieldExpandableODETest.java b/src/test/java/org/apache/commons/math4/ode/FieldExpandableODETest.java
index 20fc11f..6a4e399 100644
--- a/src/test/java/org/apache/commons/math4/ode/FieldExpandableODETest.java
+++ b/src/test/java/org/apache/commons/math4/ode/FieldExpandableODETest.java
@@ -298,10 +298,12 @@ public class FieldExpandableODETest {
this.start = start;
}
+ @Override
public int getDimension() {
return dimension;
}
+ @Override
public void init(final T t0, final T[] y0, final T finalTime) {
Assert.assertEquals(dimension, y0.length);
Assert.assertEquals(10.0, t0.getReal(), 1.0e-15);
@@ -311,6 +313,7 @@ public class FieldExpandableODETest {
}
}
+ @Override
public T[] computeDerivatives(final T t, final T[] y) {
final T[] yDot = MathArrays.buildArray(field, dimension);
for (int i = 0; i < dimension; ++i) {
@@ -319,6 +322,7 @@ public class FieldExpandableODETest {
return yDot;
}
+ @Override
public void init(final T t0, final T[] primary0, final T[] secondary0, final T finalTime) {
Assert.assertEquals(dimension, secondary0.length);
Assert.assertEquals(10.0, t0.getReal(), 1.0e-15);
@@ -331,6 +335,7 @@ public class FieldExpandableODETest {
}
}
+ @Override
public T[] computeDerivatives(final T t, final T[] primary, final T[] primaryDot, final T[] secondary) {
final T[] secondaryDot = MathArrays.buildArray(field, dimension);
for (int i = 0; i < dimension; ++i) {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/FirstOrderConverterTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/FirstOrderConverterTest.java b/src/test/java/org/apache/commons/math4/ode/FirstOrderConverterTest.java
index 0ea620e..a22f5c8 100644
--- a/src/test/java/org/apache/commons/math4/ode/FirstOrderConverterTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/FirstOrderConverterTest.java
@@ -86,11 +86,13 @@ public class FirstOrderConverterTest {
omega2 = omega * omega;
}
- public int getDimension() {
+ @Override
+ public int getDimension() {
return n;
}
- public void computeSecondDerivatives(double t, double[] y, double[] yDot,
+ @Override
+ public void computeSecondDerivatives(double t, double[] y, double[] yDot,
double[] yDDot) {
for (int i = 0; i < n; ++i) {
yDDot[i] = -omega2 * y[i];
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/JacobianMatricesTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/JacobianMatricesTest.java b/src/test/java/org/apache/commons/math4/ode/JacobianMatricesTest.java
index d843ccb..fab7f2a 100644
--- a/src/test/java/org/apache/commons/math4/ode/JacobianMatricesTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/JacobianMatricesTest.java
@@ -329,16 +329,19 @@ public class JacobianMatricesTest {
this.b = b;
}
+ @Override
public int getDimension() {
return 2;
}
+ @Override
public void computeDerivatives(double t, double[] y, double[] yDot) {
double prod = y[0] * y[0] * y[1];
yDot[0] = 1 + prod - (b + 1) * y[0];
yDot[1] = b * y[0] - prod;
}
+ @Override
public void computeMainStateJacobian(double t, double[] y, double[] yDot,
double[][] dFdY) {
double p = 2 * y[0] * y[1];
@@ -349,6 +352,7 @@ public class JacobianMatricesTest {
dFdY[1][1] = -y02;
}
+ @Override
public void computeParameterJacobian(double t, double[] y, double[] yDot,
String paramName, double[] dFdP) {
if (isSupported(paramName)) {
@@ -382,11 +386,13 @@ public class JacobianMatricesTest {
this.b = b;
}
+ @Override
public int getDimension() {
return 2;
}
/** {@inheritDoc} */
+ @Override
public double getParameter(final String name)
throws UnknownParameterException {
complainIfNotSupported(name);
@@ -394,12 +400,14 @@ public class JacobianMatricesTest {
}
/** {@inheritDoc} */
+ @Override
public void setParameter(final String name, final double value)
throws UnknownParameterException {
complainIfNotSupported(name);
b = value;
}
+ @Override
public void computeDerivatives(double t, double[] y, double[] yDot) {
double prod = y[0] * y[0] * y[1];
yDot[0] = 1 + prod - (b + 1) * y[0];
@@ -437,15 +445,18 @@ public class JacobianMatricesTest {
this.omega = omega;
}
+ @Override
public int getDimension() {
return 2;
}
+ @Override
public void computeDerivatives(double t, double[] y, double[] yDot) {
yDot[0] = omega * (cy - y[1]);
yDot[1] = omega * (y[0] - cx);
}
+ @Override
public void computeMainStateJacobian(double t, double[] y,
double[] yDot, double[][] dFdY) {
dFdY[0][0] = 0;
@@ -454,6 +465,7 @@ public class JacobianMatricesTest {
dFdY[1][1] = 0;
}
+ @Override
public void computeParameterJacobian(double t, double[] y, double[] yDot,
String paramName, double[] dFdP)
throws UnknownParameterException {
@@ -533,15 +545,18 @@ public class JacobianMatricesTest {
this.omega = omega;
}
+ @Override
public int getDimension() {
return 2;
}
+ @Override
public void computeDerivatives(double t, double[] y, double[] yDot) {
yDot[0] = omega * (cy - y[1]);
yDot[1] = omega * (y[0] - cx);
}
+ @Override
public double getParameter(final String name)
throws UnknownParameterException {
if (name.equals(CX)) {
@@ -555,6 +570,7 @@ public class JacobianMatricesTest {
}
}
+ @Override
public void setParameter(final String name, final double value)
throws UnknownParameterException {
if (name.equals(CX)) {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/TestFieldProblem4.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/TestFieldProblem4.java b/src/test/java/org/apache/commons/math4/ode/TestFieldProblem4.java
index 01db18f..a47afb6 100644
--- a/src/test/java/org/apache/commons/math4/ode/TestFieldProblem4.java
+++ b/src/test/java/org/apache/commons/math4/ode/TestFieldProblem4.java
@@ -113,19 +113,23 @@ public class TestFieldProblem4<T extends RealFieldElement<T>>
sign = +1;
}
+ @Override
public void init(FieldODEStateAndDerivative<T> state0, T t) {
}
+ @Override
public T g(FieldODEStateAndDerivative<T> state) {
return state.getState()[0].multiply(sign);
}
+ @Override
public Action eventOccurred(FieldODEStateAndDerivative<T> state, boolean increasing) {
// this sign change is needed because the state will be reset soon
sign = -sign;
return Action.RESET_STATE;
}
+ @Override
public FieldODEState<T> resetState(FieldODEStateAndDerivative<T> state) {
T[] y = state.getState();
y[0] = y[0].negate();
@@ -140,17 +144,21 @@ public class TestFieldProblem4<T extends RealFieldElement<T>>
public Stop() {
}
+ @Override
public void init(FieldODEStateAndDerivative<T> state0, T t) {
}
+ @Override
public T g(FieldODEStateAndDerivative<T> state) {
return state.getTime().subtract(12.0);
}
+ @Override
public Action eventOccurred(FieldODEStateAndDerivative<T> state, boolean increasing) {
return Action.STOP;
}
+ @Override
public FieldODEState<T> resetState(FieldODEStateAndDerivative<T> state) {
return state;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/TestFieldProblemAbstract.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/TestFieldProblemAbstract.java b/src/test/java/org/apache/commons/math4/ode/TestFieldProblemAbstract.java
index cf404d6..b8e5f08 100644
--- a/src/test/java/org/apache/commons/math4/ode/TestFieldProblemAbstract.java
+++ b/src/test/java/org/apache/commons/math4/ode/TestFieldProblemAbstract.java
@@ -105,6 +105,7 @@ public abstract class TestFieldProblemAbstract<T extends RealFieldElement<T>>
/** Get the problem dimension.
* @return problem dimension
*/
+ @Override
public int getDimension() {
return n;
}
@@ -160,10 +161,12 @@ public abstract class TestFieldProblemAbstract<T extends RealFieldElement<T>>
}
/** {@inheritDoc} */
+ @Override
public void init(T t0, T[] y0, T t) {
}
/** {@inheritDoc} */
+ @Override
public T[] computeDerivatives(T t, T[] y) {
++calls;
return doComputeDerivatives(t, y);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/TestFieldProblemHandler.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/TestFieldProblemHandler.java b/src/test/java/org/apache/commons/math4/ode/TestFieldProblemHandler.java
index c298bf3..14d9329 100644
--- a/src/test/java/org/apache/commons/math4/ode/TestFieldProblemHandler.java
+++ b/src/test/java/org/apache/commons/math4/ode/TestFieldProblemHandler.java
@@ -64,6 +64,7 @@ public class TestFieldProblemHandler<T extends RealFieldElement<T>>
expectedStepStart = null;
}
+ @Override
public void init(FieldODEStateAndDerivative<T> state0, T t) {
maxValueError = problem.getField().getZero();
maxTimeError = problem.getField().getZero();
@@ -71,6 +72,7 @@ public class TestFieldProblemHandler<T extends RealFieldElement<T>>
expectedStepStart = null;
}
+ @Override
public void handleStep(FieldStepInterpolator<T> interpolator, boolean isLast) throws MaxCountExceededException {
T start = integrator.getCurrentStepStart().getTime();
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/TestProblem4.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/TestProblem4.java b/src/test/java/org/apache/commons/math4/ode/TestProblem4.java
index 29da0f5..accc5a7 100644
--- a/src/test/java/org/apache/commons/math4/ode/TestProblem4.java
+++ b/src/test/java/org/apache/commons/math4/ode/TestProblem4.java
@@ -99,19 +99,23 @@ public class TestProblem4
sign = +1;
}
+ @Override
public void init(double t0, double[] y0, double t) {
}
+ @Override
public double g(double t, double[] y) {
return sign * y[0];
}
+ @Override
public Action eventOccurred(double t, double[] y, boolean increasing) {
// this sign change is needed because the state will be reset soon
sign = -sign;
return Action.RESET_STATE;
}
+ @Override
public void resetState(double t, double[] y) {
y[0] = -y[0];
y[1] = -y[1];
@@ -124,17 +128,21 @@ public class TestProblem4
public Stop() {
}
+ @Override
public void init(double t0, double[] y0, double t) {
}
+ @Override
public double g(double t, double[] y) {
return t - 12.0;
}
+ @Override
public Action eventOccurred(double t, double[] y, boolean increasing) {
return Action.STOP;
}
+ @Override
public void resetState(double t, double[] y) {
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/TestProblemAbstract.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/TestProblemAbstract.java b/src/test/java/org/apache/commons/math4/ode/TestProblemAbstract.java
index e59df45..baa1ba1 100644
--- a/src/test/java/org/apache/commons/math4/ode/TestProblemAbstract.java
+++ b/src/test/java/org/apache/commons/math4/ode/TestProblemAbstract.java
@@ -85,7 +85,8 @@ public abstract class TestProblemAbstract
this.errorScale = errorScale.clone();
}
- public int getDimension() {
+ @Override
+public int getDimension() {
return n;
}
@@ -144,7 +145,8 @@ public abstract class TestProblemAbstract
return calls;
}
- public void computeDerivatives(double t, double[] y, double[] yDot) {
+ @Override
+public void computeDerivatives(double t, double[] y, double[] yDot) {
++calls;
doComputeDerivatives(t, y, yDot);
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/TestProblemHandler.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/TestProblemHandler.java b/src/test/java/org/apache/commons/math4/ode/TestProblemHandler.java
index 73402e5..00c40b3 100644
--- a/src/test/java/org/apache/commons/math4/ode/TestProblemHandler.java
+++ b/src/test/java/org/apache/commons/math4/ode/TestProblemHandler.java
@@ -63,14 +63,16 @@ public class TestProblemHandler
expectedStepStart = Double.NaN;
}
- public void init(double t0, double[] y0, double t) {
+ @Override
+public void init(double t0, double[] y0, double t) {
maxValueError = 0;
maxTimeError = 0;
lastError = 0;
expectedStepStart = Double.NaN;
}
- public void handleStep(StepInterpolator interpolator, boolean isLast) throws MaxCountExceededException {
+ @Override
+public void handleStep(StepInterpolator interpolator, boolean isLast) throws MaxCountExceededException {
double start = integrator.getCurrentStepStart();
if (FastMath.abs((start - problem.getInitialTime()) / integrator.getCurrentSignedStepsize()) > 0.001) {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/events/CloseEventsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/events/CloseEventsTest.java b/src/test/java/org/apache/commons/math4/ode/events/CloseEventsTest.java
index 59366d1..ecd3b4c 100644
--- a/src/test/java/org/apache/commons/math4/ode/events/CloseEventsTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/events/CloseEventsTest.java
@@ -93,18 +93,22 @@ public class CloseEventsTest {
return actualT;
}
+ @Override
public void init(double t0, double[] y0, double t) {
}
+ @Override
public double g(double t, double[] y) {
return t - eventT;
}
+ @Override
public Action eventOccurred(double t, double[] y, boolean increasing) {
this.actualT = t;
return Action.CONTINUE;
}
+ @Override
public void resetState(double t, double[] y) {
}
@@ -113,10 +117,12 @@ public class CloseEventsTest {
/** Some basic equations to integrate. */
public static class Equation implements FirstOrderDifferentialEquations {
+ @Override
public int getDimension() {
return 2;
}
+ @Override
public void computeDerivatives(double t, double[] y, double[] yDot) {
yDot[0] = 1.0;
yDot[1] = 2.0;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/events/EventFilterTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/events/EventFilterTest.java b/src/test/java/org/apache/commons/math4/ode/events/EventFilterTest.java
index 7fb853d..34085b0 100644
--- a/src/test/java/org/apache/commons/math4/ode/events/EventFilterTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/events/EventFilterTest.java
@@ -220,10 +220,12 @@ public class EventFilterTest {
}
private static class SineCosine implements FirstOrderDifferentialEquations {
+ @Override
public int getDimension() {
return 2;
}
+ @Override
public void computeDerivatives(double t, double[] y, double[] yDot) {
yDot[0] = y[1];
yDot[1] = -y[0];
@@ -246,14 +248,17 @@ public class EventFilterTest {
return eventCount;
}
+ @Override
public void init(double t0, double[] y0, double t) {
eventCount = 0;
}
+ @Override
public double g(double t, double[] y) {
return y[0];
}
+ @Override
public Action eventOccurred(double t, double[] y, boolean increasing) {
if (increasing) {
Assert.assertTrue(expectIncreasing);
@@ -264,6 +269,7 @@ public class EventFilterTest {
return Action.RESET_STATE;
}
+ @Override
public void resetState(double t, double[] y) {
// in fact, we don't really reset anything for this test
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/events/EventStateTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/events/EventStateTest.java b/src/test/java/org/apache/commons/math4/ode/events/EventStateTest.java
index cb8f5a8..cd13861 100644
--- a/src/test/java/org/apache/commons/math4/ode/events/EventStateTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/events/EventStateTest.java
@@ -50,9 +50,11 @@ public class EventStateTest {
tolerance, 100,
new BrentSolver(tolerance));
es.setExpandable(new ExpandableStatefulODE(new FirstOrderDifferentialEquations() {
+ @Override
public int getDimension() {
return 0;
}
+ @Override
public void computeDerivatives(double t, double[] y, double[] yDot) {
}
}));
@@ -89,10 +91,12 @@ public class EventStateTest {
FirstOrderDifferentialEquations equation = new FirstOrderDifferentialEquations() {
+ @Override
public int getDimension() {
return 1;
}
+ @Override
public void computeDerivatives(double t, double[] y, double[] yDot) {
yDot[0] = 1.0;
}
@@ -120,9 +124,11 @@ public class EventStateTest {
this.tEvent = tEvent;
}
+ @Override
public void init(double t0, double[] y0, double t) {
}
+ @Override
public double g(double t, double[] y) {
// the bug corresponding to issue 695 causes the g function
// to be called at obsolete times t despite an event
@@ -133,12 +139,14 @@ public class EventStateTest {
return t - tEvent;
}
+ @Override
public Action eventOccurred(double t, double[] y, boolean increasing) {
// remember in a class variable when the event was triggered
lastTriggerTime = t;
return Action.RESET_STATE;
}
+ @Override
public void resetState(double t, double[] y) {
y[0] += 1.0;
}
@@ -154,10 +162,12 @@ public class EventStateTest {
ExpandableStatefulODE equation =
new ExpandableStatefulODE(new FirstOrderDifferentialEquations() {
+ @Override
public int getDimension() {
return 1;
}
+ @Override
public void computeDerivatives(double t, double[] y, double[] yDot) {
yDot[0] = 2.0;
}
@@ -166,10 +176,12 @@ public class EventStateTest {
equation.setPrimaryState(new double[1]);
equation.addSecondaryEquations(new SecondaryEquations() {
+ @Override
public int getDimension() {
return 1;
}
+ @Override
public void computeDerivatives(double t, double[] primary,
double[] primaryDot, double[] secondary,
double[] secondaryDot) {
@@ -199,17 +211,21 @@ public class EventStateTest {
this.target = target;
}
+ @Override
public void init(double t0, double[] y0, double t) {
}
+ @Override
public double g(double t, double[] y) {
return y[index] - target;
}
+ @Override
public Action eventOccurred(double t, double[] y, boolean increasing) {
return Action.STOP;
}
+ @Override
public void resetState(double t, double[] y) {
}
@@ -222,10 +238,12 @@ public class EventStateTest {
FirstOrderDifferentialEquations equation = new FirstOrderDifferentialEquations() {
+ @Override
public int getDimension() {
return 1;
}
+ @Override
public void computeDerivatives(double t, double[] y, double[] yDot) {
yDot[0] = 1.0;
}
@@ -254,16 +272,20 @@ public class EventStateTest {
this.count = 0;
}
+ @Override
public void init(double t0, double[] y0, double t) {
}
+ @Override
public void resetState(double t, double[] y) {
}
+ @Override
public double g(double t, double[] y) {
return (t - r1) * (r2 - t);
}
+ @Override
public Action eventOccurred(double t, double[] y, boolean increasing) {
return ++count < 2 ? Action.CONTINUE : Action.STOP;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/events/OverlappingEventsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/events/OverlappingEventsTest.java b/src/test/java/org/apache/commons/math4/ode/events/OverlappingEventsTest.java
index 38f1cf3..7d24ad3 100644
--- a/src/test/java/org/apache/commons/math4/ode/events/OverlappingEventsTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/events/OverlappingEventsTest.java
@@ -119,11 +119,13 @@ public class OverlappingEventsTest implements FirstOrderDifferentialEquations {
}
/** {@inheritDoc} */
+ @Override
public int getDimension() {
return 2;
}
/** {@inheritDoc} */
+ @Override
public void computeDerivatives(double t, double[] y, double[] yDot) {
yDot[0] = 1.0;
yDot[1] = 2.0;
@@ -147,21 +149,25 @@ public class OverlappingEventsTest implements FirstOrderDifferentialEquations {
}
/** {@inheritDoc} */
+ @Override
public void init(double t0, double[] y0, double t) {
}
/** {@inheritDoc} */
+ @Override
public double g(double t, double[] y) {
return (eventType == 0) ? y[idx] >= 1.0 ? 1.0 : -1.0
: y[idx] - 1.0;
}
/** {@inheritDoc} */
+ @Override
public Action eventOccurred(double t, double[] y, boolean increasing) {
return Action.STOP;
}
/** {@inheritDoc} */
+ @Override
public void resetState(double t, double[] y) {
// Never called.
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/events/ReappearingEventTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/events/ReappearingEventTest.java b/src/test/java/org/apache/commons/math4/ode/events/ReappearingEventTest.java
index b53e760..84e7b85 100644
--- a/src/test/java/org/apache/commons/math4/ode/events/ReappearingEventTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/events/ReappearingEventTest.java
@@ -66,10 +66,12 @@ public class ReappearingEventTest {
}
private static class Ode implements FirstOrderDifferentialEquations {
+ @Override
public int getDimension() {
return 7;
}
+ @Override
public void computeDerivatives(double t, double[] y, double[] yDot) {
Arrays.fill(yDot, 1.0);
}
@@ -78,17 +80,21 @@ public class ReappearingEventTest {
/** State events for this unit test. */
protected static class Event implements EventHandler {
+ @Override
public void init(double t0, double[] y0, double t) {
}
+ @Override
public double g(double t, double[] y) {
return y[6] - 15.0;
}
+ @Override
public Action eventOccurred(double t, double[] y, boolean increasing) {
return Action.STOP;
}
+ @Override
public void resetState(double t, double[] y) {
// Never called.
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/AbstractEmbeddedRungeKuttaFieldIntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/AbstractEmbeddedRungeKuttaFieldIntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/AbstractEmbeddedRungeKuttaFieldIntegratorTest.java
index aceede0..01b6512 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/AbstractEmbeddedRungeKuttaFieldIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/AbstractEmbeddedRungeKuttaFieldIntegratorTest.java
@@ -133,13 +133,16 @@ public abstract class AbstractEmbeddedRungeKuttaFieldIntegratorTest {
protected <T extends RealFieldElement<T>> void doTestForwardBackwardExceptions(final Field<T> field) {
FirstOrderFieldDifferentialEquations<T> equations = new FirstOrderFieldDifferentialEquations<T>() {
+ @Override
public int getDimension() {
return 1;
}
+ @Override
public void init(T t0, T[] y0, T t) {
}
+ @Override
public T[] computeDerivatives(T t, T[] y) {
if (t.getReal() < -0.5) {
throw new LocalException();
@@ -281,12 +284,15 @@ public abstract class AbstractEmbeddedRungeKuttaFieldIntegratorTest {
integ.addStepHandler(handler);
integ.addEventHandler(new FieldEventHandler<T>() {
- public void init(FieldODEStateAndDerivative<T> state0, T t) {
+ @Override
+ public void init(FieldODEStateAndDerivative<T> state0, T t) {
}
- public Action eventOccurred(FieldODEStateAndDerivative<T> state, boolean increasing) {
+ @Override
+ public Action eventOccurred(FieldODEStateAndDerivative<T> state, boolean increasing) {
return Action.CONTINUE;
}
- public T g(FieldODEStateAndDerivative<T> state) {
+ @Override
+ public T g(FieldODEStateAndDerivative<T> state) {
T middle = pb.getInitialState().getTime().add(pb.getFinalTime()).multiply(0.5);
T offset = state.getTime().subtract(middle);
if (offset.getReal() > 0) {
@@ -294,7 +300,8 @@ public abstract class AbstractEmbeddedRungeKuttaFieldIntegratorTest {
}
return offset;
}
- public FieldODEState<T> resetState(FieldODEStateAndDerivative<T> state) {
+ @Override
+ public FieldODEState<T> resetState(FieldODEStateAndDerivative<T> state) {
return state;
}
}, Double.POSITIVE_INFINITY, 1.0e-8 * maxStep, 1000);
@@ -320,16 +327,20 @@ public abstract class AbstractEmbeddedRungeKuttaFieldIntegratorTest {
integ.addStepHandler(handler);
integ.addEventHandler(new FieldEventHandler<T>() {
+ @Override
public void init(FieldODEStateAndDerivative<T> state0, T t) {
}
+ @Override
public Action eventOccurred(FieldODEStateAndDerivative<T> state, boolean increasing) {
return Action.CONTINUE;
}
+ @Override
public T g(FieldODEStateAndDerivative<T> state) {
T middle = pb.getInitialState().getTime().add(pb.getFinalTime()).multiply(0.5);
T offset = state.getTime().subtract(middle);
return (offset.getReal() > 0) ? offset.add(0.5) : offset.subtract(0.5);
}
+ @Override
public FieldODEState<T> resetState(FieldODEStateAndDerivative<T> state) {
return state;
}
@@ -437,9 +448,11 @@ public abstract class AbstractEmbeddedRungeKuttaFieldIntegratorTest {
this.epsilon = epsilon;
maxError = pb.getField().getZero();
}
+ @Override
public void init(FieldODEStateAndDerivative<T> state0, T t) {
maxError = pb.getField().getZero();
}
+ @Override
public void handleStep(FieldStepInterpolator<T> interpolator, boolean isLast)
throws MaxCountExceededException {
@@ -528,10 +541,12 @@ public abstract class AbstractEmbeddedRungeKuttaFieldIntegratorTest {
this.omega = omega;
}
+ @Override
public int getDimension() {
return 2;
}
+ @Override
public void init(final DerivativeStructure t0, final DerivativeStructure[] y0,
final DerivativeStructure finalTime) {
@@ -551,6 +566,7 @@ public abstract class AbstractEmbeddedRungeKuttaFieldIntegratorTest {
}
+ @Override
public DerivativeStructure[] computeDerivatives(final DerivativeStructure t, final DerivativeStructure[] y) {
return new DerivativeStructure[] {
omega.multiply(y[1]),
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/AbstractRungeKuttaFieldIntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/AbstractRungeKuttaFieldIntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/AbstractRungeKuttaFieldIntegratorTest.java
index 80b6828..3c96a74 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/AbstractRungeKuttaFieldIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/AbstractRungeKuttaFieldIntegratorTest.java
@@ -128,13 +128,16 @@ public abstract class AbstractRungeKuttaFieldIntegratorTest {
k[2] = field.getZero().add(1.0e-6);
FirstOrderFieldDifferentialEquations<T> ode = new FirstOrderFieldDifferentialEquations<T>() {
+ @Override
public int getDimension() {
return k.length;
}
+ @Override
public void init(T t0, T[] y0, T t) {
}
+ @Override
public T[] computeDerivatives(T t, T[] y) {
T[] yDot = MathArrays.buildArray(field, k.length);
for (int i = 0; i < y.length; ++i) {
@@ -164,17 +167,21 @@ public abstract class AbstractRungeKuttaFieldIntegratorTest {
integrator.addEventHandler(new FieldEventHandler<T>() {
+ @Override
public void init(FieldODEStateAndDerivative<T> state0, T t) {
}
+ @Override
public FieldODEState<T> resetState(FieldODEStateAndDerivative<T> state) {
return state;
}
+ @Override
public T g(FieldODEStateAndDerivative<T> state) {
return state.getTime().subtract(tEvent);
}
+ @Override
public Action eventOccurred(FieldODEStateAndDerivative<T> state, boolean increasing) {
Assert.assertEquals(tEvent.getReal(), state.getTime().getReal(), epsilonT);
return Action.CONTINUE;
@@ -385,9 +392,11 @@ public abstract class AbstractRungeKuttaFieldIntegratorTest {
this.epsilon = epsilon;
maxError = pb.getField().getZero();
}
+ @Override
public void init(FieldODEStateAndDerivative<T> state0, T t) {
maxError = pb.getField().getZero();
}
+ @Override
public void handleStep(FieldStepInterpolator<T> interpolator, boolean isLast)
throws MaxCountExceededException {
@@ -414,6 +423,7 @@ public abstract class AbstractRungeKuttaFieldIntegratorTest {
final T step = field.getZero().add(1.23456);
RungeKuttaFieldIntegrator<T> integ = createIntegrator(field, step);
integ.addStepHandler(new FieldStepHandler<T>() {
+ @Override
public void handleStep(FieldStepInterpolator<T> interpolator, boolean isLast) {
if (! isLast) {
Assert.assertEquals(step.getReal(),
@@ -421,17 +431,21 @@ public abstract class AbstractRungeKuttaFieldIntegratorTest {
epsilon);
}
}
+ @Override
public void init(FieldODEStateAndDerivative<T> s0, T t) {
}
});
integ.integrate(new FieldExpandableODE<>(new FirstOrderFieldDifferentialEquations<T>() {
+ @Override
public void init(T t0, T[] y0, T t) {
}
+ @Override
public T[] computeDerivatives(T t, T[] y) {
T[] dot = MathArrays.buildArray(t.getField(), 1);
dot[0] = t.getField().getOne();
return dot;
}
+ @Override
public int getDimension() {
return 1;
}
@@ -472,13 +486,16 @@ public abstract class AbstractRungeKuttaFieldIntegratorTest {
final T t = field.getZero().add(0.001);
FirstOrderFieldDifferentialEquations<T> equations = new FirstOrderFieldDifferentialEquations<T>() {
+ @Override
public int getDimension() {
return 1;
}
+ @Override
public void init(T t0, T[] y0, T t) {
}
+ @Override
public T[] computeDerivatives(T t, T[] y) {
Assert.assertTrue(t.getReal() >= FastMath.nextAfter(t0.getReal(), Double.NEGATIVE_INFINITY));
Assert.assertTrue(t.getReal() <= FastMath.nextAfter(t.getReal(), Double.POSITIVE_INFINITY));
@@ -590,10 +607,12 @@ public abstract class AbstractRungeKuttaFieldIntegratorTest {
this.omega = omega;
}
+ @Override
public int getDimension() {
return 2;
}
+ @Override
public void init(final DerivativeStructure t0, final DerivativeStructure[] y0,
final DerivativeStructure finalTime) {
@@ -613,6 +632,7 @@ public abstract class AbstractRungeKuttaFieldIntegratorTest {
}
+ @Override
public DerivativeStructure[] computeDerivatives(final DerivativeStructure t, final DerivativeStructure[] y) {
return new DerivativeStructure[] {
omega.multiply(y[1]),
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsBashforthFieldIntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsBashforthFieldIntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsBashforthFieldIntegratorTest.java
index 15d05a8..0918abd 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsBashforthFieldIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsBashforthFieldIntegratorTest.java
@@ -28,6 +28,7 @@ import org.junit.Test;
public class AdamsBashforthFieldIntegratorTest extends AdamsFieldIntegratorAbstractTest {
+ @Override
protected <T extends RealFieldElement<T>> AdamsFieldIntegrator<T>
createIntegrator(Field<T> field, final int nSteps, final double minStep, final double maxStep,
final double scalAbsoluteTolerance, final double scalRelativeTolerance) {
@@ -35,6 +36,7 @@ public class AdamsBashforthFieldIntegratorTest extends AdamsFieldIntegratorAbstr
scalAbsoluteTolerance, scalRelativeTolerance);
}
+ @Override
protected <T extends RealFieldElement<T>> AdamsFieldIntegrator<T>
createIntegrator(Field<T> field, final int nSteps, final double minStep, final double maxStep,
final double[] vecAbsoluteTolerance, final double[] vecRelativeTolerance) {
@@ -42,11 +44,13 @@ public class AdamsBashforthFieldIntegratorTest extends AdamsFieldIntegratorAbstr
vecAbsoluteTolerance, vecRelativeTolerance);
}
+ @Override
@Test(expected=NumberIsTooSmallException.class)
public void testMinStep() {
doDimensionCheck(Decimal64Field.getInstance());
}
+ @Override
@Test
public void testIncreasingTolerance() {
// the 2.6 and 122 factors are only valid for this test
@@ -55,21 +59,25 @@ public class AdamsBashforthFieldIntegratorTest extends AdamsFieldIntegratorAbstr
doTestIncreasingTolerance(Decimal64Field.getInstance(), 2.6, 122);
}
+ @Override
@Test(expected = MaxCountExceededException.class)
public void exceedMaxEvaluations() {
doExceedMaxEvaluations(Decimal64Field.getInstance(), 650);
}
+ @Override
@Test
public void backward() {
doBackward(Decimal64Field.getInstance(), 4.3e-8, 4.3e-8, 1.0e-16, "Adams-Bashforth");
}
+ @Override
@Test
public void polynomial() {
doPolynomial(Decimal64Field.getInstance(), 5, 0.004, 6.0e-10);
}
+ @Override
@Test(expected=MathIllegalStateException.class)
public void testStartFailure() {
doTestStartFailure(Decimal64Field.getInstance());
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsBashforthIntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsBashforthIntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsBashforthIntegratorTest.java
index f655238..70af74b 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsBashforthIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsBashforthIntegratorTest.java
@@ -198,6 +198,7 @@ public class AdamsBashforthIntegratorTest {
this.nbSteps = nbSteps;
}
+ @Override
public void integrate(ExpandableStatefulODE equations, double t) {
double tStart = equations.getTime() + 0.01 * (t - equations.getTime());
getCounter().increment(nbSteps);
@@ -227,12 +228,15 @@ public class AdamsBashforthIntegratorTest {
this.interpolatedTime = problem.getInitialTime();
}
+ @Override
public void readExternal(ObjectInput arg0) {
}
+ @Override
public void writeExternal(ObjectOutput arg0) {
}
+ @Override
public double getPreviousTime() {
return previousTime;
}
@@ -241,6 +245,7 @@ public class AdamsBashforthIntegratorTest {
previousTime = time;
}
+ @Override
public double getCurrentTime() {
return currentTime;
}
@@ -249,18 +254,22 @@ public class AdamsBashforthIntegratorTest {
currentTime = time;
}
+ @Override
public double getInterpolatedTime() {
return interpolatedTime;
}
+ @Override
public void setInterpolatedTime(double time) {
interpolatedTime = time;
}
+ @Override
public double[] getInterpolatedState() {
return problem.computeTheoreticalState(interpolatedTime);
}
+ @Override
public double[] getInterpolatedDerivatives() {
double[] y = problem.computeTheoreticalState(interpolatedTime);
double[] yDot = new double[y.length];
@@ -268,18 +277,22 @@ public class AdamsBashforthIntegratorTest {
return yDot;
}
+ @Override
public double[] getInterpolatedSecondaryState(int index) {
return null;
}
+ @Override
public double[] getInterpolatedSecondaryDerivatives(int index) {
return null;
}
+ @Override
public boolean isForward() {
return problem.getFinalTime() > problem.getInitialTime();
}
+ @Override
public StepInterpolator copy() {
return this;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsFieldIntegratorAbstractTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsFieldIntegratorAbstractTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsFieldIntegratorAbstractTest.java
index 1f786bc..a767f35 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsFieldIntegratorAbstractTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsFieldIntegratorAbstractTest.java
@@ -198,6 +198,7 @@ public abstract class AdamsFieldIntegratorAbstractTest {
this.nbSteps = nbSteps;
}
+ @Override
public FieldODEStateAndDerivative<T> integrate(FieldExpandableODE<T> equations,
FieldODEState<T> initialState, T finalTime) {
T tStart = initialState.getTime().add(finalTime.subtract(initialState.getTime()).multiply(0.01));
@@ -237,18 +238,22 @@ public abstract class AdamsFieldIntegratorAbstractTest {
return currentTime;
}
+ @Override
public boolean isForward() {
return problem.getFinalTime().subtract(problem.getInitialState().getTime()).getReal() >= 0;
}
+ @Override
public FieldODEStateAndDerivative<T> getPreviousState() {
return getInterpolatedState(previousTime);
}
+ @Override
public FieldODEStateAndDerivative<T> getCurrentState() {
return getInterpolatedState(currentTime);
}
+ @Override
public FieldODEStateAndDerivative<T> getInterpolatedState(T time) {
T[] y = problem.computeTheoreticalState(time);
T[] yDot = problem.computeDerivatives(time, y);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonFieldIntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonFieldIntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonFieldIntegratorTest.java
index 84a0f7d..b3a2063 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonFieldIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonFieldIntegratorTest.java
@@ -28,6 +28,7 @@ import org.junit.Test;
public class AdamsMoultonFieldIntegratorTest extends AdamsFieldIntegratorAbstractTest {
+ @Override
protected <T extends RealFieldElement<T>> AdamsFieldIntegrator<T>
createIntegrator(Field<T> field, final int nSteps, final double minStep, final double maxStep,
final double scalAbsoluteTolerance, final double scalRelativeTolerance) {
@@ -35,6 +36,7 @@ public class AdamsMoultonFieldIntegratorTest extends AdamsFieldIntegratorAbstrac
scalAbsoluteTolerance, scalRelativeTolerance);
}
+ @Override
protected <T extends RealFieldElement<T>> AdamsFieldIntegrator<T>
createIntegrator(Field<T> field, final int nSteps, final double minStep, final double maxStep,
final double[] vecAbsoluteTolerance, final double[] vecRelativeTolerance) {
@@ -42,11 +44,13 @@ public class AdamsMoultonFieldIntegratorTest extends AdamsFieldIntegratorAbstrac
vecAbsoluteTolerance, vecRelativeTolerance);
}
+ @Override
@Test(expected=NumberIsTooSmallException.class)
public void testMinStep() {
doDimensionCheck(Decimal64Field.getInstance());
}
+ @Override
@Test
public void testIncreasingTolerance() {
// the 0.45 and 8.69 factors are only valid for this test
@@ -55,21 +59,25 @@ public class AdamsMoultonFieldIntegratorTest extends AdamsFieldIntegratorAbstrac
doTestIncreasingTolerance(Decimal64Field.getInstance(), 0.45, 8.69);
}
+ @Override
@Test(expected = MaxCountExceededException.class)
public void exceedMaxEvaluations() {
doExceedMaxEvaluations(Decimal64Field.getInstance(), 650);
}
+ @Override
@Test
public void backward() {
doBackward(Decimal64Field.getInstance(), 3.0e-9, 3.0e-9, 1.0e-16, "Adams-Moulton");
}
+ @Override
@Test
public void polynomial() {
doPolynomial(Decimal64Field.getInstance(), 5, 2.2e-05, 1.1e-11);
}
+ @Override
@Test(expected=MathIllegalStateException.class)
public void testStartFailure() {
doTestStartFailure(Decimal64Field.getInstance());
http://git-wip-us.apache.org/repos/asf/commons-math/blob/221c843b/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonIntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonIntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonIntegratorTest.java
index 3e03651..23063bf 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonIntegratorTest.java
@@ -186,6 +186,7 @@ public class AdamsMoultonIntegratorTest {
this.nbSteps = nbSteps;
}
+ @Override
public void integrate(ExpandableStatefulODE equations, double t) {
double tStart = equations.getTime() + 0.01 * (t - equations.getTime());
getCounter().increment(nbSteps);
@@ -215,12 +216,15 @@ public class AdamsMoultonIntegratorTest {
this.interpolatedTime = problem.getInitialTime();
}
+ @Override
public void readExternal(ObjectInput arg0) {
}
+ @Override
public void writeExternal(ObjectOutput arg0) {
}
+ @Override
public double getPreviousTime() {
return previousTime;
}
@@ -229,6 +233,7 @@ public class AdamsMoultonIntegratorTest {
previousTime = time;
}
+ @Override
public double getCurrentTime() {
return currentTime;
}
@@ -237,18 +242,22 @@ public class AdamsMoultonIntegratorTest {
currentTime = time;
}
+ @Override
public double getInterpolatedTime() {
return interpolatedTime;
}
+ @Override
public void setInterpolatedTime(double time) {
interpolatedTime = time;
}
+ @Override
public double[] getInterpolatedState() {
return problem.computeTheoreticalState(interpolatedTime);
}
+ @Override
public double[] getInterpolatedDerivatives() {
double[] y = problem.computeTheoreticalState(interpolatedTime);
double[] yDot = new double[y.length];
@@ -256,18 +265,22 @@ public class AdamsMoultonIntegratorTest {
return yDot;
}
+ @Override
public double[] getInterpolatedSecondaryState(int index) {
return null;
}
+ @Override
public double[] getInterpolatedSecondaryDerivatives(int index) {
return null;
}
+ @Override
public boolean isForward() {
return problem.getFinalTime() > problem.getInitialTime();
}
+ @Override
public StepInterpolator copy() {
return this;
}