You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ch...@apache.org on 2016/09/20 18:20:37 UTC
[52/57] [abbrv] [math] Add missing '@Override' annotations.
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);
}