From 4f2f94cd0435621a05f1db53aca6aacc3b7163b1 Mon Sep 17 00:00:00 2001 From: Sebastian Bazley Date: Mon, 15 Jul 2013 15:16:29 +0000 Subject: [PATCH] Missing @Override git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@1503290 13f79535-47bb-0310-9956-ffa450edef68 --- .../distribution/MixtureMultivariateRealDistribution.java | 2 ++ .../math3/distribution/MultivariateNormalDistribution.java | 1 + .../org/apache/commons/math3/linear/DiagonalMatrix.java | 1 + .../org/apache/commons/math3/linear/RRQRDecomposition.java | 3 +++ .../apache/commons/math3/ml/clustering/DBSCANClusterer.java | 1 + .../commons/math3/ml/clustering/FuzzyKMeansClusterer.java | 1 + .../math3/ml/clustering/KMeansPlusPlusClusterer.java | 1 + .../math3/ml/clustering/MultiKMeansPlusPlusClusterer.java | 1 + .../org/apache/commons/math3/ode/events/FilterType.java | 4 ++++ .../org/apache/commons/math3/ode/events/Transformer.java | 5 +++++ .../optim/nonlinear/vector/MultivariateVectorOptimizer.java | 1 + .../commons/math3/optim/univariate/UnivariateOptimizer.java | 1 + .../apache/commons/math3/random/EmpiricalDistribution.java | 2 ++ .../analysis/differentiation/DerivativeStructureTest.java | 6 ++++++ src/test/java/org/apache/commons/math3/dfp/DfpTest.java | 6 ++++++ .../commons/math3/distribution/LevyDistributionTest.java | 4 ++++ .../vector/MultiStartMultivariateVectorOptimizerTest.java | 1 + .../commons/math3/random/EmpiricalDistributionTest.java | 3 +++ .../commons/math3/userguide/ClusterAlgorithmComparison.java | 1 + .../math3/userguide/LowDiscrepancyGeneratorComparison.java | 1 + .../java/org/apache/commons/math3/util/Decimal64Test.java | 1 + 21 files changed, 47 insertions(+) diff --git a/src/main/java/org/apache/commons/math3/distribution/MixtureMultivariateRealDistribution.java b/src/main/java/org/apache/commons/math3/distribution/MixtureMultivariateRealDistribution.java index 054d69412..912ab0938 100644 --- a/src/main/java/org/apache/commons/math3/distribution/MixtureMultivariateRealDistribution.java +++ b/src/main/java/org/apache/commons/math3/distribution/MixtureMultivariateRealDistribution.java @@ -105,6 +105,7 @@ public class MixtureMultivariateRealDistribution extends Clusterer { * @return the list of clusters * @throws NullArgumentException if the data points are null */ + @Override public List> cluster(final Collection points) throws NullArgumentException { // sanity checks diff --git a/src/main/java/org/apache/commons/math3/ml/clustering/FuzzyKMeansClusterer.java b/src/main/java/org/apache/commons/math3/ml/clustering/FuzzyKMeansClusterer.java index 17427611e..8218485d4 100644 --- a/src/main/java/org/apache/commons/math3/ml/clustering/FuzzyKMeansClusterer.java +++ b/src/main/java/org/apache/commons/math3/ml/clustering/FuzzyKMeansClusterer.java @@ -265,6 +265,7 @@ public class FuzzyKMeansClusterer extends Clusterer { * @throws MathIllegalArgumentException if the data points are null or the number * of clusters is larger than the number of data points */ + @Override public List> cluster(final Collection dataPoints) throws MathIllegalArgumentException { diff --git a/src/main/java/org/apache/commons/math3/ml/clustering/KMeansPlusPlusClusterer.java b/src/main/java/org/apache/commons/math3/ml/clustering/KMeansPlusPlusClusterer.java index 825dd2759..ef19a7e8b 100644 --- a/src/main/java/org/apache/commons/math3/ml/clustering/KMeansPlusPlusClusterer.java +++ b/src/main/java/org/apache/commons/math3/ml/clustering/KMeansPlusPlusClusterer.java @@ -193,6 +193,7 @@ public class KMeansPlusPlusClusterer extends Clusterer * @throws ConvergenceException if an empty cluster is encountered and the * {@link #emptyStrategy} is set to {@code ERROR} */ + @Override public List> cluster(final Collection points) throws MathIllegalArgumentException, ConvergenceException { diff --git a/src/main/java/org/apache/commons/math3/ml/clustering/MultiKMeansPlusPlusClusterer.java b/src/main/java/org/apache/commons/math3/ml/clustering/MultiKMeansPlusPlusClusterer.java index 546c0cfda..fa970ac5f 100644 --- a/src/main/java/org/apache/commons/math3/ml/clustering/MultiKMeansPlusPlusClusterer.java +++ b/src/main/java/org/apache/commons/math3/ml/clustering/MultiKMeansPlusPlusClusterer.java @@ -77,6 +77,7 @@ public class MultiKMeansPlusPlusClusterer extends Cluster * underlying {@link KMeansPlusPlusClusterer} has its * {@link KMeansPlusPlusClusterer.EmptyClusterStrategy} is set to {@code ERROR}. */ + @Override public List> cluster(final Collection points) throws MathIllegalArgumentException, ConvergenceException { diff --git a/src/main/java/org/apache/commons/math3/ode/events/FilterType.java b/src/main/java/org/apache/commons/math3/ode/events/FilterType.java index 91d8bfcaf..438df0512 100644 --- a/src/main/java/org/apache/commons/math3/ode/events/FilterType.java +++ b/src/main/java/org/apache/commons/math3/ode/events/FilterType.java @@ -36,6 +36,7 @@ public enum FilterType { TRIGGER_ONLY_DECREASING_EVENTS { /** {@inheritDoc} */ + @Override protected boolean getTriggeredIncreasing() { return false; } @@ -86,6 +87,7 @@ public enum FilterType { * where s is a tiny positive value: {@link org.apache.commons.math3.util.Precision#SAFE_MIN}. *

*/ + @Override protected Transformer selectTransformer(final Transformer previous, final double g, final boolean forward) { if (forward) { @@ -212,6 +214,7 @@ public enum FilterType { TRIGGER_ONLY_INCREASING_EVENTS { /** {@inheritDoc} */ + @Override protected boolean getTriggeredIncreasing() { return true; } @@ -262,6 +265,7 @@ public enum FilterType { * where s is a tiny positive value: {@link org.apache.commons.math3.util.Precision#SAFE_MIN}. *

*/ + @Override protected Transformer selectTransformer(final Transformer previous, final double g, final boolean forward) { if (forward) { diff --git a/src/main/java/org/apache/commons/math3/ode/events/Transformer.java b/src/main/java/org/apache/commons/math3/ode/events/Transformer.java index 10902937e..ade78a58a 100644 --- a/src/main/java/org/apache/commons/math3/ode/events/Transformer.java +++ b/src/main/java/org/apache/commons/math3/ode/events/Transformer.java @@ -37,6 +37,7 @@ enum Transformer { */ UNINITIALIZED { /** {@inheritDoc} */ + @Override protected double transformed(final double g) { return 0; } @@ -50,6 +51,7 @@ enum Transformer { */ PLUS { /** {@inheritDoc} */ + @Override protected double transformed(final double g) { return g; } @@ -63,6 +65,7 @@ enum Transformer { */ MINUS { /** {@inheritDoc} */ + @Override protected double transformed(final double g) { return -g; } @@ -76,6 +79,7 @@ enum Transformer { */ MIN { /** {@inheritDoc} */ + @Override protected double transformed(final double g) { return FastMath.min(-Precision.SAFE_MIN, FastMath.min(-g, +g)); } @@ -89,6 +93,7 @@ enum Transformer { */ MAX { /** {@inheritDoc} */ + @Override protected double transformed(final double g) { return FastMath.max(+Precision.SAFE_MIN, FastMath.max(-g, +g)); } diff --git a/src/main/java/org/apache/commons/math3/optim/nonlinear/vector/MultivariateVectorOptimizer.java b/src/main/java/org/apache/commons/math3/optim/nonlinear/vector/MultivariateVectorOptimizer.java index 6f56fc237..2d344bc60 100644 --- a/src/main/java/org/apache/commons/math3/optim/nonlinear/vector/MultivariateVectorOptimizer.java +++ b/src/main/java/org/apache/commons/math3/optim/nonlinear/vector/MultivariateVectorOptimizer.java @@ -80,6 +80,7 @@ public abstract class MultivariateVectorOptimizer * @throws DimensionMismatchException if the initial guess, target, and weight * arguments have inconsistent dimensions. */ + @Override public PointVectorValuePair optimize(OptimizationData... optData) throws TooManyEvaluationsException, DimensionMismatchException { diff --git a/src/main/java/org/apache/commons/math3/optim/univariate/UnivariateOptimizer.java b/src/main/java/org/apache/commons/math3/optim/univariate/UnivariateOptimizer.java index 78451316f..970b47603 100644 --- a/src/main/java/org/apache/commons/math3/optim/univariate/UnivariateOptimizer.java +++ b/src/main/java/org/apache/commons/math3/optim/univariate/UnivariateOptimizer.java @@ -64,6 +64,7 @@ public abstract class UnivariateOptimizer * @throws TooManyEvaluationsException if the maximal number of * evaluations is exceeded. */ + @Override public UnivariatePointValuePair optimize(OptimizationData... optData) throws TooManyEvaluationsException { // Perform computation. diff --git a/src/main/java/org/apache/commons/math3/random/EmpiricalDistribution.java b/src/main/java/org/apache/commons/math3/random/EmpiricalDistribution.java index 5b0a1e3d0..796db8d8b 100644 --- a/src/main/java/org/apache/commons/math3/random/EmpiricalDistribution.java +++ b/src/main/java/org/apache/commons/math3/random/EmpiricalDistribution.java @@ -594,6 +594,7 @@ public class EmpiricalDistribution extends AbstractRealDistribution { * {@inheritDoc} * @since 3.1 */ + @Override public double probability(double x) { return 0; } @@ -672,6 +673,7 @@ public class EmpiricalDistribution extends AbstractRealDistribution { * * @since 3.1 */ + @Override public double inverseCumulativeProbability(final double p) throws OutOfRangeException { if (p < 0.0 || p > 1.0) { throw new OutOfRangeException(p, 0, 1); diff --git a/src/test/java/org/apache/commons/math3/analysis/differentiation/DerivativeStructureTest.java b/src/test/java/org/apache/commons/math3/analysis/differentiation/DerivativeStructureTest.java index 17b3bfbcb..1851cce98 100644 --- a/src/test/java/org/apache/commons/math3/analysis/differentiation/DerivativeStructureTest.java +++ b/src/test/java/org/apache/commons/math3/analysis/differentiation/DerivativeStructureTest.java @@ -36,6 +36,7 @@ import org.junit.Test; */ public class DerivativeStructureTest extends ExtendedFieldElementAbstractTest { + @Override protected DerivativeStructure build(final double x) { return new DerivativeStructure(2, 1, 0, x); } @@ -610,6 +611,7 @@ public class DerivativeStructureTest extends ExtendedFieldElementAbstractTest { + @Override protected Dfp build(final double x) { return field.newDfp(x); } @@ -1230,6 +1231,7 @@ public class DfpTest extends ExtendedFieldElementAbstractTest { Assert.assertEquals("toString #9", "0.00001234", field.newDfp("0.00001234").toString()); } + @Override @Test public void testRound() { @@ -1349,6 +1351,7 @@ public class DfpTest extends ExtendedFieldElementAbstractTest { field.setRoundingMode(DfpField.RoundingMode.ROUND_HALF_EVEN); // reset } + @Override @Test public void testCeil() { @@ -1357,6 +1360,7 @@ public class DfpTest extends ExtendedFieldElementAbstractTest { DfpField.FLAG_INEXACT, "Ceil #1"); } + @Override @Test public void testFloor() { @@ -1365,6 +1369,7 @@ public class DfpTest extends ExtendedFieldElementAbstractTest { DfpField.FLAG_INEXACT, "Floor #1"); } + @Override @Test public void testRint() { @@ -1503,6 +1508,7 @@ public class DfpTest extends ExtendedFieldElementAbstractTest { 0, "Remainder #3"); } + @Override @Test public void testSqrt() { diff --git a/src/test/java/org/apache/commons/math3/distribution/LevyDistributionTest.java b/src/test/java/org/apache/commons/math3/distribution/LevyDistributionTest.java index 45506971d..1501ddb41 100644 --- a/src/test/java/org/apache/commons/math3/distribution/LevyDistributionTest.java +++ b/src/test/java/org/apache/commons/math3/distribution/LevyDistributionTest.java @@ -38,16 +38,19 @@ public class LevyDistributionTest extends RealDistributionAbstractTest { Assert.assertTrue(d.isSupportConnected()); } + @Override public LevyDistribution makeDistribution() { return new LevyDistribution(new Well19937a(0xc5a5506bbb17e57al), 1.2, 0.4); } + @Override public double[] makeCumulativeTestPoints() { return new double[] { 1.2001, 1.21, 1.225, 1.25, 1.3, 1.9, 3.4, 5.6 }; } + @Override public double[] makeCumulativeTestValues() { // values computed with R and function plevy from rmutil package return new double[] { @@ -56,6 +59,7 @@ public class LevyDistributionTest extends RealDistributionAbstractTest { }; } + @Override public double[] makeDensityTestValues() { // values computed with R and function dlevy from rmutil package return new double[] { diff --git a/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/MultiStartMultivariateVectorOptimizerTest.java b/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/MultiStartMultivariateVectorOptimizerTest.java index df8b6329a..7cd5c032b 100644 --- a/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/MultiStartMultivariateVectorOptimizerTest.java +++ b/src/test/java/org/apache/commons/math3/optim/nonlinear/vector/MultiStartMultivariateVectorOptimizerTest.java @@ -152,6 +152,7 @@ public class MultiStartMultivariateVectorOptimizerTest { LinearProblem problem = new LinearProblem(new double[][] { { 2 } }, new double[] { 3 }); JacobianMultivariateVectorOptimizer underlyingOptimizer = new GaussNewtonOptimizer(true, new SimpleVectorValueChecker(1e-6, 1e-6)) { + @Override public PointVectorValuePair optimize(OptimizationData... optData) { // filter out simple bounds, as they are not supported // by the underlying optimizer, and we don't really care for this test diff --git a/src/test/java/org/apache/commons/math3/random/EmpiricalDistributionTest.java b/src/test/java/org/apache/commons/math3/random/EmpiricalDistributionTest.java index 766a92d16..3530ccfbc 100644 --- a/src/test/java/org/apache/commons/math3/random/EmpiricalDistributionTest.java +++ b/src/test/java/org/apache/commons/math3/random/EmpiricalDistributionTest.java @@ -55,6 +55,7 @@ public final class EmpiricalDistributionTest extends RealDistributionAbstractTes protected double[] dataArray = null; protected final int n = 10000; + @Override @Before public void setUp() { super.setUp(); @@ -499,6 +500,7 @@ public final class EmpiricalDistributionTest extends RealDistributionAbstractTes super(i); } // Use constant distribution equal to bin mean within bin + @Override protected RealDistribution getKernel(SummaryStatistics bStats) { return new ConstantDistribution(bStats.getMean()); } @@ -511,6 +513,7 @@ public final class EmpiricalDistributionTest extends RealDistributionAbstractTes public UniformKernelEmpiricalDistribution(int i) { super(i); } + @Override protected RealDistribution getKernel(SummaryStatistics bStats) { return new UniformRealDistribution(randomData.getRandomGenerator(), bStats.getMin(), bStats.getMax(), UniformRealDistribution.DEFAULT_INVERSE_ABSOLUTE_ACCURACY); diff --git a/src/test/java/org/apache/commons/math3/userguide/ClusterAlgorithmComparison.java b/src/test/java/org/apache/commons/math3/userguide/ClusterAlgorithmComparison.java index aa3c2b2bb..946d39c2e 100644 --- a/src/test/java/org/apache/commons/math3/userguide/ClusterAlgorithmComparison.java +++ b/src/test/java/org/apache/commons/math3/userguide/ClusterAlgorithmComparison.java @@ -247,6 +247,7 @@ public class ClusterAlgorithmComparison { this.duration = duration; } + @Override protected void paintComponent(Graphics g) { super.paintComponent(g); Graphics2D g2 = (Graphics2D)g; diff --git a/src/test/java/org/apache/commons/math3/userguide/LowDiscrepancyGeneratorComparison.java b/src/test/java/org/apache/commons/math3/userguide/LowDiscrepancyGeneratorComparison.java index 1c1e0fe35..19426de6a 100644 --- a/src/test/java/org/apache/commons/math3/userguide/LowDiscrepancyGeneratorComparison.java +++ b/src/test/java/org/apache/commons/math3/userguide/LowDiscrepancyGeneratorComparison.java @@ -213,6 +213,7 @@ public class LowDiscrepancyGeneratorComparison { this.points = points; } + @Override protected void paintComponent(Graphics g) { super.paintComponent(g); Graphics2D g2 = (Graphics2D)g; diff --git a/src/test/java/org/apache/commons/math3/util/Decimal64Test.java b/src/test/java/org/apache/commons/math3/util/Decimal64Test.java index 9f5c40960..bf96c71f1 100644 --- a/src/test/java/org/apache/commons/math3/util/Decimal64Test.java +++ b/src/test/java/org/apache/commons/math3/util/Decimal64Test.java @@ -38,6 +38,7 @@ public class Decimal64Test extends ExtendedFieldElementAbstractTest { public static final Decimal64 MINUS_ZERO = new Decimal64(-0.0); + @Override protected Decimal64 build(final double x) { return new Decimal64(x); }