From 177eff33cb429de835ce4a8ea00e566be9e66912 Mon Sep 17 00:00:00 2001 From: Sebastian Bazley Date: Fri, 4 Nov 2011 09:49:06 +0000 Subject: [PATCH] Missing @Override git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@1197464 13f79535-47bb-0310-9956-ffa450edef68 --- .../analysis/integration/LegendreGaussIntegrator.java | 1 + .../math/analysis/integration/RombergIntegrator.java | 1 + .../math/analysis/integration/SimpsonIntegrator.java | 1 + .../analysis/integration/TrapezoidIntegrator.java | 1 + .../math/analysis/polynomials/PolynomialsUtils.java | 2 ++ .../math/analysis/solvers/BaseSecantSolver.java | 1 + .../math/geometry/euclidean/oned/IntervalsSet.java | 2 ++ .../geometry/euclidean/oned/SubOrientedPoint.java | 4 ++++ .../math/geometry/euclidean/oned/Vector1DFormat.java | 3 +++ .../geometry/euclidean/threed/PolyhedronsSet.java | 2 ++ .../math/geometry/euclidean/threed/SubPlane.java | 3 +++ .../geometry/euclidean/threed/Vector3DFormat.java | 3 +++ .../math/geometry/euclidean/twod/PolygonsSet.java | 2 ++ .../commons/math/geometry/euclidean/twod/SubLine.java | 3 +++ .../math/geometry/euclidean/twod/Vector2DFormat.java | 3 +++ .../apache/commons/math/linear/ArrayRealVector.java | 11 +++++++++++ .../apache/commons/math/linear/OpenMapRealVector.java | 11 +++++++++++ .../math/ode/nonstiff/AdaptiveStepsizeIntegrator.java | 1 + .../math/ode/nonstiff/RungeKuttaIntegrator.java | 1 + 19 files changed, 56 insertions(+) diff --git a/src/main/java/org/apache/commons/math/analysis/integration/LegendreGaussIntegrator.java b/src/main/java/org/apache/commons/math/analysis/integration/LegendreGaussIntegrator.java index 7423d0634..62dc6252a 100644 --- a/src/main/java/org/apache/commons/math/analysis/integration/LegendreGaussIntegrator.java +++ b/src/main/java/org/apache/commons/math/analysis/integration/LegendreGaussIntegrator.java @@ -194,6 +194,7 @@ public class LegendreGaussIntegrator extends UnivariateRealIntegratorImpl { } /** {@inheritDoc} */ + @Override protected double doIntegrate() throws TooManyEvaluationsException, MaxCountExceededException { diff --git a/src/main/java/org/apache/commons/math/analysis/integration/RombergIntegrator.java b/src/main/java/org/apache/commons/math/analysis/integration/RombergIntegrator.java index 09962381e..57c1babfc 100644 --- a/src/main/java/org/apache/commons/math/analysis/integration/RombergIntegrator.java +++ b/src/main/java/org/apache/commons/math/analysis/integration/RombergIntegrator.java @@ -98,6 +98,7 @@ public class RombergIntegrator extends UnivariateRealIntegratorImpl { } /** {@inheritDoc} */ + @Override protected double doIntegrate() throws TooManyEvaluationsException, MaxCountExceededException { diff --git a/src/main/java/org/apache/commons/math/analysis/integration/SimpsonIntegrator.java b/src/main/java/org/apache/commons/math/analysis/integration/SimpsonIntegrator.java index 151443b70..b5ddc8b8b 100644 --- a/src/main/java/org/apache/commons/math/analysis/integration/SimpsonIntegrator.java +++ b/src/main/java/org/apache/commons/math/analysis/integration/SimpsonIntegrator.java @@ -97,6 +97,7 @@ public class SimpsonIntegrator extends UnivariateRealIntegratorImpl { } /** {@inheritDoc} */ + @Override protected double doIntegrate() throws TooManyEvaluationsException, MaxCountExceededException { diff --git a/src/main/java/org/apache/commons/math/analysis/integration/TrapezoidIntegrator.java b/src/main/java/org/apache/commons/math/analysis/integration/TrapezoidIntegrator.java index 247d4bba5..68187ccf7 100644 --- a/src/main/java/org/apache/commons/math/analysis/integration/TrapezoidIntegrator.java +++ b/src/main/java/org/apache/commons/math/analysis/integration/TrapezoidIntegrator.java @@ -138,6 +138,7 @@ public class TrapezoidIntegrator extends UnivariateRealIntegratorImpl { } /** {@inheritDoc} */ + @Override protected double doIntegrate() throws TooManyEvaluationsException, MaxCountExceededException { diff --git a/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialsUtils.java b/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialsUtils.java index e0bc1f869..11fb8ea99 100644 --- a/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialsUtils.java +++ b/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialsUtils.java @@ -273,6 +273,7 @@ public class PolynomialsUtils { /** Get hash code. * @return hash code */ + @Override public int hashCode() { return (v << 16) ^ w; } @@ -281,6 +282,7 @@ public class PolynomialsUtils { * @param key other key * @return true if the instance and the other key refer to the same polynomial */ + @Override public boolean equals(final Object key) { if ((key == null) || !(key instanceof JacobiKey)) { diff --git a/src/main/java/org/apache/commons/math/analysis/solvers/BaseSecantSolver.java b/src/main/java/org/apache/commons/math/analysis/solvers/BaseSecantSolver.java index 034752553..94e0af55f 100644 --- a/src/main/java/org/apache/commons/math/analysis/solvers/BaseSecantSolver.java +++ b/src/main/java/org/apache/commons/math/analysis/solvers/BaseSecantSolver.java @@ -126,6 +126,7 @@ public abstract class BaseSecantSolver } /** {@inheritDoc} */ + @Override protected final double doSolve() { // Get initial solution double x0 = getMin(); diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/oned/IntervalsSet.java b/src/main/java/org/apache/commons/math/geometry/euclidean/oned/IntervalsSet.java index 53c8df3aa..45149e218 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/oned/IntervalsSet.java +++ b/src/main/java/org/apache/commons/math/geometry/euclidean/oned/IntervalsSet.java @@ -127,11 +127,13 @@ public class IntervalsSet extends AbstractRegion { } /** {@inheritDoc} */ + @Override public IntervalsSet buildNew(final BSPTree tree) { return new IntervalsSet(tree); } /** {@inheritDoc} */ + @Override protected void computeGeometricalProperties() { if (getTree(false).getCut() == null) { setBarycenter(Vector1D.NaN); diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/oned/SubOrientedPoint.java b/src/main/java/org/apache/commons/math/geometry/euclidean/oned/SubOrientedPoint.java index c2ce1f96c..b62d7340a 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/oned/SubOrientedPoint.java +++ b/src/main/java/org/apache/commons/math/geometry/euclidean/oned/SubOrientedPoint.java @@ -40,23 +40,27 @@ public class SubOrientedPoint extends AbstractSubHyperplane buildNew(final Hyperplane hyperplane, final Region remainingRegion) { return new SubOrientedPoint(hyperplane, remainingRegion); } /** {@inheritDoc} */ + @Override public Side side(final Hyperplane hyperplane) { final double global = hyperplane.getOffset(((OrientedPoint) getHyperplane()).getLocation()); return (global < -1.0e-10) ? Side.MINUS : ((global > 1.0e-10) ? Side.PLUS : Side.HYPER); } /** {@inheritDoc} */ + @Override public SplitSubHyperplane split(final Hyperplane hyperplane) { final double global = hyperplane.getOffset(((OrientedPoint) getHyperplane()).getLocation()); return (global < -1.0e-10) ? diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/oned/Vector1DFormat.java b/src/main/java/org/apache/commons/math/geometry/euclidean/oned/Vector1DFormat.java index b431e981e..f037d0af3 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/oned/Vector1DFormat.java +++ b/src/main/java/org/apache/commons/math/geometry/euclidean/oned/Vector1DFormat.java @@ -100,6 +100,7 @@ public class Vector1DFormat extends VectorFormat { } /** {@inheritDoc} */ + @Override public StringBuffer format(final Vector vector, final StringBuffer toAppendTo, final FieldPosition pos) { final Vector1D p1 = (Vector1D) vector; @@ -107,6 +108,7 @@ public class Vector1DFormat extends VectorFormat { } /** {@inheritDoc} */ + @Override public Vector1D parse(final String source) { ParsePosition parsePosition = new ParsePosition(0); Vector1D result = parse(source, parsePosition); @@ -119,6 +121,7 @@ public class Vector1DFormat extends VectorFormat { } /** {@inheritDoc} */ + @Override public Vector1D parse(final String source, final ParsePosition pos) { final double[] coordinates = parseCoordinates(1, source, pos); if (coordinates == null) { diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/threed/PolyhedronsSet.java b/src/main/java/org/apache/commons/math/geometry/euclidean/threed/PolyhedronsSet.java index e04af679c..ce5a0b56a 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/threed/PolyhedronsSet.java +++ b/src/main/java/org/apache/commons/math/geometry/euclidean/threed/PolyhedronsSet.java @@ -105,11 +105,13 @@ public class PolyhedronsSet extends AbstractRegion { } /** {@inheritDoc} */ + @Override public PolyhedronsSet buildNew(final BSPTree tree) { return new PolyhedronsSet(tree); } /** {@inheritDoc} */ + @Override protected void computeGeometricalProperties() { // compute the contribution of all boundary facets diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/threed/SubPlane.java b/src/main/java/org/apache/commons/math/geometry/euclidean/threed/SubPlane.java index b492a6e7f..7402bedd4 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/threed/SubPlane.java +++ b/src/main/java/org/apache/commons/math/geometry/euclidean/threed/SubPlane.java @@ -43,12 +43,14 @@ public class SubPlane extends AbstractSubHyperplane { } /** {@inheritDoc} */ + @Override protected AbstractSubHyperplane buildNew(final Hyperplane hyperplane, final Region remainingRegion) { return new SubPlane(hyperplane, remainingRegion); } /** {@inheritDoc} */ + @Override public Side side(Hyperplane hyperplane) { final Plane otherPlane = (Plane) hyperplane; @@ -91,6 +93,7 @@ public class SubPlane extends AbstractSubHyperplane { * on the plus side of the instance and the part of the * instance on the minus side of the instance */ + @Override public SplitSubHyperplane split(Hyperplane hyperplane) { final Plane otherPlane = (Plane) hyperplane; diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/threed/Vector3DFormat.java b/src/main/java/org/apache/commons/math/geometry/euclidean/threed/Vector3DFormat.java index 88c9a16cd..14c77f8f2 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/threed/Vector3DFormat.java +++ b/src/main/java/org/apache/commons/math/geometry/euclidean/threed/Vector3DFormat.java @@ -109,6 +109,7 @@ public class Vector3DFormat extends VectorFormat { * offsets of the alignment field * @return the value passed in as toAppendTo. */ + @Override public StringBuffer format(final Vector vector, final StringBuffer toAppendTo, final FieldPosition pos) { final Vector3D v3 = (Vector3D) vector; @@ -122,6 +123,7 @@ public class Vector3DFormat extends VectorFormat { * @throws MathParseException if the beginning of the specified string * cannot be parsed. */ + @Override public Vector3D parse(final String source) { ParsePosition parsePosition = new ParsePosition(0); Vector3D result = parse(source, parsePosition); @@ -139,6 +141,7 @@ public class Vector3DFormat extends VectorFormat { * @param pos input/ouput parsing parameter. * @return the parsed {@link Vector3D} object. */ + @Override public Vector3D parse(final String source, final ParsePosition pos) { final double[] coordinates = parseCoordinates(3, source, pos); if (coordinates == null) { diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/twod/PolygonsSet.java b/src/main/java/org/apache/commons/math/geometry/euclidean/twod/PolygonsSet.java index e1cab36d1..f5d2489df 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/twod/PolygonsSet.java +++ b/src/main/java/org/apache/commons/math/geometry/euclidean/twod/PolygonsSet.java @@ -120,11 +120,13 @@ public class PolygonsSet extends AbstractRegion { } /** {@inheritDoc} */ + @Override public PolygonsSet buildNew(final BSPTree tree) { return new PolygonsSet(tree); } /** {@inheritDoc} */ + @Override protected void computeGeometricalProperties() { final Vector2D[][] v = getVertices(); diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/twod/SubLine.java b/src/main/java/org/apache/commons/math/geometry/euclidean/twod/SubLine.java index 7be4970fa..3e3f67010 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/twod/SubLine.java +++ b/src/main/java/org/apache/commons/math/geometry/euclidean/twod/SubLine.java @@ -142,12 +142,14 @@ public class SubLine extends AbstractSubHyperplane { } /** {@inheritDoc} */ + @Override protected AbstractSubHyperplane buildNew(final Hyperplane hyperplane, final Region remainingRegion) { return new SubLine(hyperplane, remainingRegion); } /** {@inheritDoc} */ + @Override public Side side(final Hyperplane hyperplane) { final Line thisLine = (Line) getHyperplane(); @@ -168,6 +170,7 @@ public class SubLine extends AbstractSubHyperplane { } /** {@inheritDoc} */ + @Override public SplitSubHyperplane split(final Hyperplane hyperplane) { final Line thisLine = (Line) getHyperplane(); diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/twod/Vector2DFormat.java b/src/main/java/org/apache/commons/math/geometry/euclidean/twod/Vector2DFormat.java index 1befe2581..4350559ed 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/twod/Vector2DFormat.java +++ b/src/main/java/org/apache/commons/math/geometry/euclidean/twod/Vector2DFormat.java @@ -103,6 +103,7 @@ public class Vector2DFormat extends VectorFormat { } /** {@inheritDoc} */ + @Override public StringBuffer format(final Vector vector, final StringBuffer toAppendTo, final FieldPosition pos) { final Vector2D p2 = (Vector2D) vector; @@ -110,6 +111,7 @@ public class Vector2DFormat extends VectorFormat { } /** {@inheritDoc} */ + @Override public Vector2D parse(final String source) { ParsePosition parsePosition = new ParsePosition(0); Vector2D result = parse(source, parsePosition); @@ -122,6 +124,7 @@ public class Vector2DFormat extends VectorFormat { } /** {@inheritDoc} */ + @Override public Vector2D parse(final String source, final ParsePosition pos) { final double[] coordinates = parseCoordinates(2, source, pos); if (coordinates == null) { diff --git a/src/main/java/org/apache/commons/math/linear/ArrayRealVector.java b/src/main/java/org/apache/commons/math/linear/ArrayRealVector.java index 67281c50f..10d8defea 100644 --- a/src/main/java/org/apache/commons/math/linear/ArrayRealVector.java +++ b/src/main/java/org/apache/commons/math/linear/ArrayRealVector.java @@ -409,6 +409,7 @@ public class ArrayRealVector extends RealVector implements Serializable { } /** {@inheritDoc} */ + @Override public ArrayRealVector ebeDivide(RealVector v) { if (v instanceof ArrayRealVector) { final double[] vData = ((ArrayRealVector) v).data; @@ -583,6 +584,7 @@ public class ArrayRealVector extends RealVector implements Serializable { } /** {@inheritDoc} */ + @Override public RealVector projection(RealVector v) { return v.mapMultiply(dotProduct(v) / v.dotProduct(v)); } @@ -615,16 +617,19 @@ public class ArrayRealVector extends RealVector implements Serializable { } /** {@inheritDoc} */ + @Override public double getEntry(int index) { return data[index]; } /** {@inheritDoc} */ + @Override public int getDimension() { return data.length; } /** {@inheritDoc} */ + @Override public RealVector append(RealVector v) { try { return new ArrayRealVector(this, (ArrayRealVector) v); @@ -644,6 +649,7 @@ public class ArrayRealVector extends RealVector implements Serializable { } /** {@inheritDoc} */ + @Override public RealVector append(double in) { final double[] out = new double[data.length + 1]; System.arraycopy(data, 0, out, 0, data.length); @@ -652,6 +658,7 @@ public class ArrayRealVector extends RealVector implements Serializable { } /** {@inheritDoc} */ + @Override public RealVector getSubVector(int index, int n) { ArrayRealVector out = new ArrayRealVector(n); try { @@ -664,6 +671,7 @@ public class ArrayRealVector extends RealVector implements Serializable { } /** {@inheritDoc} */ + @Override public void setEntry(int index, double value) { try { data[index] = value; @@ -673,6 +681,7 @@ public class ArrayRealVector extends RealVector implements Serializable { } /** {@inheritDoc} */ + @Override public void addToEntry(int index, double increment) { data[index] += increment; } @@ -761,6 +770,7 @@ public class ArrayRealVector extends RealVector implements Serializable { * @return {@code true} if any coordinate of this vector is {@code NaN}, * {@code false} otherwise. */ + @Override public boolean isNaN() { for (double v : data) { if (Double.isNaN(v)) { @@ -777,6 +787,7 @@ public class ArrayRealVector extends RealVector implements Serializable { * @return {@code true} if any coordinate of this vector is infinite and * none are {@code NaN}, {@code false} otherwise. */ + @Override public boolean isInfinite() { if (isNaN()) { return false; diff --git a/src/main/java/org/apache/commons/math/linear/OpenMapRealVector.java b/src/main/java/org/apache/commons/math/linear/OpenMapRealVector.java index cea9806ba..1c9c7d28e 100644 --- a/src/main/java/org/apache/commons/math/linear/OpenMapRealVector.java +++ b/src/main/java/org/apache/commons/math/linear/OpenMapRealVector.java @@ -273,6 +273,7 @@ public class OpenMapRealVector extends SparseRealVector } /** {@inheritDoc} */ + @Override public OpenMapRealVector append(RealVector v) { if (v instanceof OpenMapRealVector) { return append((OpenMapRealVector) v); @@ -286,6 +287,7 @@ public class OpenMapRealVector extends SparseRealVector } /** {@inheritDoc} */ + @Override public OpenMapRealVector append(double d) { OpenMapRealVector res = new OpenMapRealVector(this, 1); res.setEntry(virtualSize, d); @@ -334,6 +336,7 @@ public class OpenMapRealVector extends SparseRealVector } /** {@inheritDoc} */ + @Override public OpenMapRealVector ebeDivide(RealVector v) { checkVectorDimensions(v.getDimension()); OpenMapRealVector res = new OpenMapRealVector(this); @@ -346,6 +349,7 @@ public class OpenMapRealVector extends SparseRealVector } /** {@inheritDoc} */ + @Override public OpenMapRealVector ebeMultiply(RealVector v) { checkVectorDimensions(v.getDimension()); OpenMapRealVector res = new OpenMapRealVector(this); @@ -358,6 +362,7 @@ public class OpenMapRealVector extends SparseRealVector } /** {@inheritDoc} */ + @Override public OpenMapRealVector getSubVector(int index, int n) { checkIndex(index); checkIndex(index + n - 1); @@ -375,6 +380,7 @@ public class OpenMapRealVector extends SparseRealVector } /** {@inheritDoc} */ + @Override public int getDimension() { return virtualSize; } @@ -421,6 +427,7 @@ public class OpenMapRealVector extends SparseRealVector } /** {@inheritDoc} */ + @Override public double getEntry(int index) { checkIndex(index); return entries.get(index); @@ -507,6 +514,7 @@ public class OpenMapRealVector extends SparseRealVector } /** {@inheritDoc} */ + @Override public boolean isInfinite() { boolean infiniteFound = false; Iterator iter = entries.iterator(); @@ -524,6 +532,7 @@ public class OpenMapRealVector extends SparseRealVector } /** {@inheritDoc} */ + @Override public boolean isNaN() { Iterator iter = entries.iterator(); while (iter.hasNext()) { @@ -551,12 +560,14 @@ public class OpenMapRealVector extends SparseRealVector } /** {@inheritDoc} */ + @Override public RealVector projection(RealVector v) { checkVectorDimensions(v.getDimension()); return v.mapMultiply(dotProduct(v) / v.dotProduct(v)); } /** {@inheritDoc} */ + @Override public void setEntry(int index, double value) { checkIndex(index); if (!isDefaultValue(value)) { diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/AdaptiveStepsizeIntegrator.java b/src/main/java/org/apache/commons/math/ode/nonstiff/AdaptiveStepsizeIntegrator.java index 7c4df5c51..265f89157 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/AdaptiveStepsizeIntegrator.java +++ b/src/main/java/org/apache/commons/math/ode/nonstiff/AdaptiveStepsizeIntegrator.java @@ -339,6 +339,7 @@ public abstract class AdaptiveStepsizeIntegrator } /** {@inheritDoc} */ + @Override public abstract void integrate (ExpandableStatefulODE equations, double t) throws MathIllegalStateException, MathIllegalArgumentException; diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/RungeKuttaIntegrator.java b/src/main/java/org/apache/commons/math/ode/nonstiff/RungeKuttaIntegrator.java index 71682bc2a..fb82d0c9e 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/RungeKuttaIntegrator.java +++ b/src/main/java/org/apache/commons/math/ode/nonstiff/RungeKuttaIntegrator.java @@ -90,6 +90,7 @@ public abstract class RungeKuttaIntegrator extends AbstractIntegrator { } /** {@inheritDoc} */ + @Override public void integrate(final ExpandableStatefulODE equations, final double t) throws MathIllegalStateException, MathIllegalArgumentException {