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 <ggreg...@apache.org> Authored: Tue Sep 20 10:38:11 2016 -0700 Committer: Gary Gregory <ggreg...@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; }
