Author: sebb Date: Fri Jan 22 18:27:41 2010 New Revision: 902203 URL: http://svn.apache.org/viewvc?rev=902203&view=rev Log: Fix missing @Override and @Deprecated annotations
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/BinaryFunction.java commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/ComposableFunction.java commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/AbstractRealVector.java commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/ArrayRealVector.java commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/OpenMapRealVector.java commons/proper/math/trunk/src/main/java/org/apache/commons/math/random/MersenneTwister.java commons/proper/math/trunk/src/main/java/org/apache/commons/math/stat/Frequency.java commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/AbstractRealVectorTest.java commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/ArrayRealVectorTest.java commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/SparseRealVectorTest.java commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblem1.java commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblem2.java commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblem3.java commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblem4.java commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblem5.java commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblem6.java Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/BinaryFunction.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/BinaryFunction.java?rev=902203&r1=902202&r2=902203&view=diff ============================================================================== --- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/BinaryFunction.java (original) +++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/BinaryFunction.java Fri Jan 22 18:27:41 2010 @@ -31,6 +31,7 @@ /** The + operator method wrapped as a {...@link BinaryFunction}. */ public static final BinaryFunction ADD = new BinaryFunction() { /** {...@inheritdoc} */ + @Override public double value(double x, double y) { return x + y; } @@ -39,6 +40,7 @@ /** The - operator method wrapped as a {...@link BinaryFunction}. */ public static final BinaryFunction SUBTRACT = new BinaryFunction() { /** {...@inheritdoc} */ + @Override public double value(double x, double y) { return x - y; } @@ -47,6 +49,7 @@ /** The * operator method wrapped as a {...@link BinaryFunction}. */ public static final BinaryFunction MULTIPLY = new BinaryFunction() { /** {...@inheritdoc} */ + @Override public double value(double x, double y) { return x * y; } @@ -55,6 +58,7 @@ /** The / operator method wrapped as a {...@link BinaryFunction}. */ public static final BinaryFunction DIVIDE = new BinaryFunction() { /** {...@inheritdoc} */ + @Override public double value(double x, double y) { return x / y; } @@ -63,6 +67,7 @@ /** The {...@code Math.pow} method wrapped as a {...@link BinaryFunction}. */ public static final BinaryFunction POW = new BinaryFunction() { /** {...@inheritdoc} */ + @Override public double value(double x, double y) { return Math.pow(x, y); } @@ -71,6 +76,7 @@ /** The {...@code Math.atan2} method wrapped as a {...@link BinaryFunction}. */ public static final BinaryFunction ATAN2 = new BinaryFunction() { /** {...@inheritdoc} */ + @Override public double value(double x, double y) { return Math.atan2(x, y); } Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/ComposableFunction.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/ComposableFunction.java?rev=902203&r1=902202&r2=902203&view=diff ============================================================================== --- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/ComposableFunction.java (original) +++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/ComposableFunction.java Fri Jan 22 18:27:41 2010 @@ -30,6 +30,7 @@ /** The constant function always returning 0. */ public static final ComposableFunction ZERO = new ComposableFunction() { /** {...@inheritdoc} */ + @Override public double value(double d) { return 0; } @@ -38,6 +39,7 @@ /** The constant function always returning 1. */ public static final ComposableFunction ONE = new ComposableFunction() { /** {...@inheritdoc} */ + @Override public double value(double d) { return 1; } @@ -46,6 +48,7 @@ /** The identity function. */ public static final ComposableFunction IDENTITY = new ComposableFunction() { /** {...@inheritdoc} */ + @Override public double value(double d) { return d; } @@ -54,6 +57,7 @@ /** The {...@code Math.abs} method wrapped as a {...@link ComposableFunction}. */ public static final ComposableFunction ABS = new ComposableFunction() { /** {...@inheritdoc} */ + @Override public double value(double d) { return Math.abs(d); } @@ -62,6 +66,7 @@ /** The - operator wrapped as a {...@link ComposableFunction}. */ public static final ComposableFunction NEGATE = new ComposableFunction() { /** {...@inheritdoc} */ + @Override public double value(double d) { return -d; } @@ -70,6 +75,7 @@ /** The invert operator wrapped as a {...@link ComposableFunction}. */ public static final ComposableFunction INVERT = new ComposableFunction () { /** {...@inheritdoc} */ + @Override public double value(double d){ return 1/d; } @@ -78,6 +84,7 @@ /** The {...@code Math.sin} method wrapped as a {...@link ComposableFunction}. */ public static final ComposableFunction SIN = new ComposableFunction() { /** {...@inheritdoc} */ + @Override public double value(double d) { return Math.sin(d); } @@ -86,6 +93,7 @@ /** The {...@code Math.sqrt} method wrapped as a {...@link ComposableFunction}. */ public static final ComposableFunction SQRT = new ComposableFunction() { /** {...@inheritdoc} */ + @Override public double value(double d) { return Math.sqrt(d); } @@ -94,6 +102,7 @@ /** The {...@code Math.sinh} method wrapped as a {...@link ComposableFunction}. */ public static final ComposableFunction SINH = new ComposableFunction() { /** {...@inheritdoc} */ + @Override public double value(double d) { return Math.sinh(d); } @@ -102,6 +111,7 @@ /** The {...@code Math.exp} method wrapped as a {...@link ComposableFunction}. */ public static final ComposableFunction EXP = new ComposableFunction() { /** {...@inheritdoc} */ + @Override public double value(double d) { return Math.exp(d); } @@ -110,6 +120,7 @@ /** The {...@code Math.expm1} method wrapped as a {...@link ComposableFunction}. */ public static final ComposableFunction EXPM1 = new ComposableFunction() { /** {...@inheritdoc} */ + @Override public double value(double d) { return Math.expm1(d); } @@ -118,6 +129,7 @@ /** The {...@code Math.asin} method wrapped as a {...@link ComposableFunction}. */ public static final ComposableFunction ASIN = new ComposableFunction() { /** {...@inheritdoc} */ + @Override public double value(double d) { return Math.asin(d); } @@ -126,6 +138,7 @@ /** The {...@code Math.atan} method wrapped as a {...@link ComposableFunction}. */ public static final ComposableFunction ATAN = new ComposableFunction() { /** {...@inheritdoc} */ + @Override public double value(double d) { return Math.atan(d); } @@ -134,6 +147,7 @@ /** The {...@code Math.tan} method wrapped as a {...@link ComposableFunction}. */ public static final ComposableFunction TAN = new ComposableFunction() { /** {...@inheritdoc} */ + @Override public double value(double d) { return Math.tan(d); } @@ -142,6 +156,7 @@ /** The {...@code Math.tanh} method wrapped as a {...@link ComposableFunction}. */ public static final ComposableFunction TANH = new ComposableFunction() { /** {...@inheritdoc} */ + @Override public double value(double d) { return Math.tanh(d); } @@ -150,6 +165,7 @@ /** The {...@code Math.cbrt} method wrapped as a {...@link ComposableFunction}. */ public static final ComposableFunction CBRT = new ComposableFunction() { /** {...@inheritdoc} */ + @Override public double value(double d) { return Math.cbrt(d); } @@ -158,6 +174,7 @@ /** The {...@code Math.ceil} method wrapped as a {...@link ComposableFunction}. */ public static final ComposableFunction CEIL = new ComposableFunction() { /** {...@inheritdoc} */ + @Override public double value(double d) { return Math.ceil(d); } @@ -166,6 +183,7 @@ /** The {...@code Math.floor} method wrapped as a {...@link ComposableFunction}. */ public static final ComposableFunction FLOOR = new ComposableFunction() { /** {...@inheritdoc} */ + @Override public double value(double d) { return Math.floor(d); } @@ -174,6 +192,7 @@ /** The {...@code Math.log} method wrapped as a {...@link ComposableFunction}. */ public static final ComposableFunction LOG = new ComposableFunction() { /** {...@inheritdoc} */ + @Override public double value(double d) { return Math.log(d); } @@ -182,6 +201,7 @@ /** The {...@code Math.log10} method wrapped as a {...@link ComposableFunction}. */ public static final ComposableFunction LOG10 = new ComposableFunction() { /** {...@inheritdoc} */ + @Override public double value(double d) { return Math.log10(d); } @@ -189,6 +209,7 @@ /** The {...@code Math.log1p} method wrapped as a {...@link ComposableFunction}. */ public static final ComposableFunction LOG1P = new ComposableFunction () { + @Override public double value(double d){ return Math.log1p(d); } @@ -197,6 +218,7 @@ /** The {...@code Math.cos} method wrapped as a {...@link ComposableFunction}. */ public static final ComposableFunction COS = new ComposableFunction() { /** {...@inheritdoc} */ + @Override public double value(double d) { return Math.cos(d); } @@ -205,6 +227,7 @@ /** The {...@code Math.abs} method wrapped as a {...@link ComposableFunction}. */ public static final ComposableFunction ACOS = new ComposableFunction() { /** {...@inheritdoc} */ + @Override public double value(double d) { return Math.acos(d); } @@ -213,6 +236,7 @@ /** The {...@code Math.cosh} method wrapped as a {...@link ComposableFunction}. */ public static final ComposableFunction COSH = new ComposableFunction() { /** {...@inheritdoc} */ + @Override public double value(double d) { return Math.cosh(d); } @@ -221,6 +245,7 @@ /** The {...@code Math.rint} method wrapped as a {...@link ComposableFunction}. */ public static final ComposableFunction RINT = new ComposableFunction() { /** {...@inheritdoc} */ + @Override public double value(double d) { return Math.rint(d); } @@ -229,6 +254,7 @@ /** The {...@code Math.signum} method wrapped as a {...@link ComposableFunction}. */ public static final ComposableFunction SIGNUM = new ComposableFunction() { /** {...@inheritdoc} */ + @Override public double value(double d) { return Math.signum(d); } @@ -237,6 +263,7 @@ /** The {...@code Math.ulp} method wrapped as a {...@link ComposableFunction}. */ public static final ComposableFunction ULP = new ComposableFunction() { /** {...@inheritdoc} */ + @Override public double value(double d) { return Math.ulp(d); } Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/AbstractRealVector.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/AbstractRealVector.java?rev=902203&r1=902202&r2=902203&view=diff ============================================================================== --- commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/AbstractRealVector.java (original) +++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/AbstractRealVector.java Fri Jan 22 18:27:41 2010 @@ -793,11 +793,13 @@ } /** {...@inheritdoc} */ + @Override public double getValue() { return getEntry(getIndex()); } /** {...@inheritdoc} */ + @Override public void setValue(double newValue) { setEntry(getIndex(), newValue); } Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/ArrayRealVector.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/ArrayRealVector.java?rev=902203&r1=902202&r2=902203&view=diff ============================================================================== --- commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/ArrayRealVector.java (original) +++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/ArrayRealVector.java Fri Jan 22 18:27:41 2010 @@ -260,11 +260,13 @@ } /** {...@inheritdoc} */ + @Override public AbstractRealVector copy() { return new ArrayRealVector(this, true); } /** {...@inheritdoc} */ + @Override public RealVector add(RealVector v) throws IllegalArgumentException { if (v instanceof ArrayRealVector) { @@ -282,6 +284,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector add(double[] v) throws IllegalArgumentException { checkVectorDimensions(v.length); @@ -304,6 +307,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector subtract(RealVector v) throws IllegalArgumentException { if (v instanceof ArrayRealVector) { @@ -321,6 +325,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector subtract(double[] v) throws IllegalArgumentException { checkVectorDimensions(v.length); @@ -343,6 +348,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector mapAddToSelf(double d) { for (int i = 0; i < data.length; i++) { data[i] = data[i] + d; @@ -351,6 +357,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector mapSubtractToSelf(double d) { for (int i = 0; i < data.length; i++) { data[i] = data[i] - d; @@ -359,6 +366,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector mapMultiplyToSelf(double d) { for (int i = 0; i < data.length; i++) { data[i] = data[i] * d; @@ -367,6 +375,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector mapDivideToSelf(double d) { for (int i = 0; i < data.length; i++) { data[i] = data[i] / d; @@ -375,6 +384,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector mapPowToSelf(double d) { for (int i = 0; i < data.length; i++) { data[i] = Math.pow(data[i], d); @@ -383,6 +393,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector mapExpToSelf() { for (int i = 0; i < data.length; i++) { data[i] = Math.exp(data[i]); @@ -391,6 +402,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector mapExpm1ToSelf() { for (int i = 0; i < data.length; i++) { data[i] = Math.expm1(data[i]); @@ -399,6 +411,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector mapLogToSelf() { for (int i = 0; i < data.length; i++) { data[i] = Math.log(data[i]); @@ -407,6 +420,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector mapLog10ToSelf() { for (int i = 0; i < data.length; i++) { data[i] = Math.log10(data[i]); @@ -415,6 +429,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector mapLog1pToSelf() { for (int i = 0; i < data.length; i++) { data[i] = Math.log1p(data[i]); @@ -423,6 +438,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector mapCoshToSelf() { for (int i = 0; i < data.length; i++) { data[i] = Math.cosh(data[i]); @@ -431,6 +447,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector mapSinhToSelf() { for (int i = 0; i < data.length; i++) { data[i] = Math.sinh(data[i]); @@ -439,6 +456,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector mapTanhToSelf() { for (int i = 0; i < data.length; i++) { data[i] = Math.tanh(data[i]); @@ -447,6 +465,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector mapCosToSelf() { for (int i = 0; i < data.length; i++) { data[i] = Math.cos(data[i]); @@ -455,6 +474,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector mapSinToSelf() { for (int i = 0; i < data.length; i++) { data[i] = Math.sin(data[i]); @@ -463,6 +483,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector mapTanToSelf() { for (int i = 0; i < data.length; i++) { data[i] = Math.tan(data[i]); @@ -471,6 +492,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector mapAcosToSelf() { for (int i = 0; i < data.length; i++) { data[i] = Math.acos(data[i]); @@ -479,6 +501,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector mapAsinToSelf() { for (int i = 0; i < data.length; i++) { data[i] = Math.asin(data[i]); @@ -487,6 +510,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector mapAtanToSelf() { for (int i = 0; i < data.length; i++) { data[i] = Math.atan(data[i]); @@ -495,6 +519,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector mapInvToSelf() { for (int i = 0; i < data.length; i++) { data[i] = 1.0 / data[i]; @@ -503,6 +528,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector mapAbsToSelf() { for (int i = 0; i < data.length; i++) { data[i] = Math.abs(data[i]); @@ -511,6 +537,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector mapSqrtToSelf() { for (int i = 0; i < data.length; i++) { data[i] = Math.sqrt(data[i]); @@ -519,6 +546,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector mapCbrtToSelf() { for (int i = 0; i < data.length; i++) { data[i] = Math.cbrt(data[i]); @@ -527,6 +555,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector mapCeilToSelf() { for (int i = 0; i < data.length; i++) { data[i] = Math.ceil(data[i]); @@ -535,6 +564,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector mapFloorToSelf() { for (int i = 0; i < data.length; i++) { data[i] = Math.floor(data[i]); @@ -543,6 +573,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector mapRintToSelf() { for (int i = 0; i < data.length; i++) { data[i] = Math.rint(data[i]); @@ -551,6 +582,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector mapSignumToSelf() { for (int i = 0; i < data.length; i++) { data[i] = Math.signum(data[i]); @@ -559,6 +591,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector mapUlpToSelf() { for (int i = 0; i < data.length; i++) { data[i] = Math.ulp(data[i]); @@ -582,6 +615,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector ebeMultiply(double[] v) throws IllegalArgumentException { checkVectorDimensions(v.length); @@ -619,6 +653,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector ebeDivide(double[] v) throws IllegalArgumentException { checkVectorDimensions(v.length); @@ -641,6 +676,7 @@ } /** {...@inheritdoc} */ + @Override public double[] getData() { return data.clone(); } @@ -655,6 +691,7 @@ } /** {...@inheritdoc} */ + @Override public double dotProduct(RealVector v) throws IllegalArgumentException { if (v instanceof ArrayRealVector) { @@ -672,6 +709,7 @@ } /** {...@inheritdoc} */ + @Override public double dotProduct(double[] v) throws IllegalArgumentException { checkVectorDimensions(v.length); @@ -724,6 +762,7 @@ } /** {...@inheritdoc} */ + @Override public double getDistance(RealVector v) throws IllegalArgumentException { if (v instanceof ArrayRealVector) { @@ -740,6 +779,7 @@ } /** {...@inheritdoc} */ + @Override public double getDistance(double[] v) throws IllegalArgumentException { checkVectorDimensions(v.length); @@ -770,6 +810,7 @@ } /** {...@inheritdoc} */ + @Override public double getL1Distance(RealVector v) throws IllegalArgumentException { if (v instanceof ArrayRealVector) { @@ -786,6 +827,7 @@ } /** {...@inheritdoc} */ + @Override public double getL1Distance(double[] v) throws IllegalArgumentException { checkVectorDimensions(v.length); @@ -816,6 +858,7 @@ } /** {...@inheritdoc} */ + @Override public double getLInfDistance(RealVector v) throws IllegalArgumentException { if (v instanceof ArrayRealVector) { @@ -832,6 +875,7 @@ } /** {...@inheritdoc} */ + @Override public double getLInfDistance(double[] v) throws IllegalArgumentException { checkVectorDimensions(v.length); @@ -862,6 +906,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector unitVector() throws ArithmeticException { final double norm = getNorm(); if (norm == 0) { @@ -871,6 +916,7 @@ } /** {...@inheritdoc} */ + @Override public void unitize() throws ArithmeticException { final double norm = getNorm(); if (norm == 0) { @@ -885,6 +931,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector projection(double[] v) { return projection(new ArrayRealVector(v, false)); } @@ -899,6 +946,7 @@ } /** {...@inheritdoc} */ + @Override public RealMatrix outerProduct(RealVector v) throws IllegalArgumentException { if (v instanceof ArrayRealVector) { @@ -928,6 +976,7 @@ } /** {...@inheritdoc} */ + @Override public RealMatrix outerProduct(double[] v) throws IllegalArgumentException { checkVectorDimensions(v.length); @@ -1004,6 +1053,7 @@ } /** {...@inheritdoc} */ + @Override public void setSubVector(int index, RealVector v) { try { try { @@ -1020,6 +1070,7 @@ } /** {...@inheritdoc} */ + @Override public void setSubVector(int index, double[] v) { try { System.arraycopy(v, 0, data, index, v.length); @@ -1043,11 +1094,13 @@ } /** {...@inheritdoc} */ + @Override public void set(double value) { Arrays.fill(data, value); } /** {...@inheritdoc} */ + @Override public double[] toArray(){ return data.clone(); } @@ -1064,6 +1117,7 @@ * @exception IllegalArgumentException if the vectors do not * have the same dimension */ + @Override protected void checkVectorDimensions(RealVector v) throws IllegalArgumentException { checkVectorDimensions(v.getDimension()); @@ -1076,6 +1130,7 @@ * @exception IllegalArgumentException if the dimension is * inconsistent with vector size */ + @Override protected void checkVectorDimensions(int n) throws IllegalArgumentException { if (data.length != n) { Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/OpenMapRealVector.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/OpenMapRealVector.java?rev=902203&r1=902202&r2=902203&view=diff ============================================================================== --- commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/OpenMapRealVector.java (original) +++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/OpenMapRealVector.java Fri Jan 22 18:27:41 2010 @@ -206,6 +206,7 @@ } /** {...@inheritdoc} */ + @Override public RealVector add(RealVector v) throws IllegalArgumentException { checkVectorDimensions(v.getDimension()); if (v instanceof OpenMapRealVector) { @@ -279,6 +280,7 @@ } /** {...@inheritdoc} */ + @Override public OpenMapRealVector copy() { return new OpenMapRealVector(this); } @@ -304,6 +306,7 @@ } /** {...@inheritdoc} */ + @Override public double dotProduct(RealVector v) throws IllegalArgumentException { if(v instanceof OpenMapRealVector) { return dotProduct((OpenMapRealVector)v); @@ -325,6 +328,7 @@ } /** {...@inheritdoc} */ + @Override public OpenMapRealVector ebeDivide(double[] v) throws IllegalArgumentException { checkVectorDimensions(v.length); OpenMapRealVector res = new OpenMapRealVector(this); @@ -349,6 +353,7 @@ } /** {...@inheritdoc} */ + @Override public OpenMapRealVector ebeMultiply(double[] v) throws IllegalArgumentException { checkVectorDimensions(v.length); OpenMapRealVector res = new OpenMapRealVector(this); @@ -378,6 +383,7 @@ } /** {...@inheritdoc} */ + @Override public double[] getData() { double[] res = new double[virtualSize]; Iterator iter = entries.iterator(); @@ -422,6 +428,7 @@ } /** {...@inheritdoc} */ + @Override public double getDistance(RealVector v) throws IllegalArgumentException { checkVectorDimensions(v.getDimension()); if (v instanceof OpenMapRealVector) { @@ -431,6 +438,7 @@ } /** {...@inheritdoc} */ + @Override public double getDistance(double[] v) throws IllegalArgumentException { checkVectorDimensions(v.length); double res = 0; @@ -476,6 +484,7 @@ } /** {...@inheritdoc} */ + @Override public double getL1Distance(RealVector v) throws IllegalArgumentException { checkVectorDimensions(v.getDimension()); if (v instanceof OpenMapRealVector) { @@ -485,6 +494,7 @@ } /** {...@inheritdoc} */ + @Override public double getL1Distance(double[] v) throws IllegalArgumentException { checkVectorDimensions(v.length); double max = 0; @@ -524,6 +534,7 @@ } /** {...@inheritdoc} */ + @Override public double getLInfDistance(RealVector v) throws IllegalArgumentException { checkVectorDimensions(v.getDimension()); if (v instanceof OpenMapRealVector) { @@ -533,6 +544,7 @@ } /** {...@inheritdoc} */ + @Override public double getLInfDistance(double[] v) throws IllegalArgumentException { checkVectorDimensions(v.length); double max = 0; @@ -575,11 +587,13 @@ } /** {...@inheritdoc} */ + @Override public OpenMapRealVector mapAdd(double d) { return copy().mapAddToSelf(d); } /** {...@inheritdoc} */ + @Override public OpenMapRealVector mapAddToSelf(double d) { for (int i = 0; i < virtualSize; i++) { setEntry(i, getEntry(i) + d); @@ -588,6 +602,7 @@ } /** {...@inheritdoc} */ + @Override public RealMatrix outerProduct(double[] v) throws IllegalArgumentException { checkVectorDimensions(v.length); RealMatrix res = new OpenMapRealMatrix(virtualSize, virtualSize); @@ -610,6 +625,7 @@ } /** {...@inheritdoc} */ + @Override public OpenMapRealVector projection(double[] v) throws IllegalArgumentException { checkVectorDimensions(v.length); return (OpenMapRealVector) projection(new OpenMapRealVector(v)); @@ -626,6 +642,7 @@ } /** {...@inheritdoc} */ + @Override public void setSubVector(int index, RealVector v) throws MatrixIndexException { checkIndex(index); checkIndex(index + v.getDimension() - 1); @@ -633,6 +650,7 @@ } /** {...@inheritdoc} */ + @Override public void setSubVector(int index, double[] v) throws MatrixIndexException { checkIndex(index); checkIndex(index + v.length - 1); @@ -642,6 +660,7 @@ } /** {...@inheritdoc} */ + @Override public void set(double value) { for (int i = 0; i < virtualSize; i++) { setEntry(i, value); @@ -671,6 +690,7 @@ } /** {...@inheritdoc} */ + @Override public OpenMapRealVector subtract(RealVector v) throws IllegalArgumentException { checkVectorDimensions(v.getDimension()); if (v instanceof OpenMapRealVector) { @@ -680,6 +700,7 @@ } /** {...@inheritdoc} */ + @Override public OpenMapRealVector subtract(double[] v) throws IllegalArgumentException { checkVectorDimensions(v.length); OpenMapRealVector res = new OpenMapRealVector(this); @@ -695,6 +716,7 @@ /** {...@inheritdoc} */ + @Override public OpenMapRealVector unitVector() { OpenMapRealVector res = copy(); res.unitize(); @@ -702,6 +724,7 @@ } /** {...@inheritdoc} */ + @Override public void unitize() { double norm = getNorm(); if (isDefaultValue(norm)) { @@ -717,6 +740,7 @@ /** {...@inheritdoc} */ + @Override public double[] toArray() { return getData(); } @@ -796,6 +820,7 @@ } /** {...@inheritdoc} */ + @Override public java.util.Iterator<Entry> sparseIterator() { return new OpenMapSparseIterator(); } Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/random/MersenneTwister.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/random/MersenneTwister.java?rev=902203&r1=902202&r2=902203&view=diff ============================================================================== --- commons/proper/math/trunk/src/main/java/org/apache/commons/math/random/MersenneTwister.java (original) +++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/random/MersenneTwister.java Fri Jan 22 18:27:41 2010 @@ -136,6 +136,7 @@ * generator built with the same seed.</p> * @param seed the initial seed (32 bits integer) */ + @Override public void setSeed(int seed) { // we use a long masked by 0xffffffffL as a poor man unsigned int long longMT = seed; @@ -154,6 +155,7 @@ * @param seed the initial seed (32 bits integers array), if null * the seed of the generator will be related to the current time */ + @Override public void setSeed(int[] seed) { if (seed == null) { @@ -201,6 +203,7 @@ * generator built with the same seed.</p> * @param seed the initial seed (64 bits integer) */ + @Override public void setSeed(long seed) { setSeed(new int[] { (int) (seed >>> 32), (int) (seed & 0xffffffffl) }); } @@ -214,6 +217,7 @@ * @param bits number of random bits to produce * @return random bits generated */ + @Override protected int next(int bits) { int y; Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/stat/Frequency.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/stat/Frequency.java?rev=902203&r1=902202&r2=902203&view=diff ============================================================================== --- commons/proper/math/trunk/src/main/java/org/apache/commons/math/stat/Frequency.java (original) +++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/stat/Frequency.java Fri Jan 22 18:27:41 2010 @@ -164,6 +164,7 @@ * @param v the value to add. * @deprecated to be removed in math 3.0 */ + @Deprecated public void addValue(Integer v) { addValue(Long.valueOf(v.longValue())); } Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/AbstractRealVectorTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/AbstractRealVectorTest.java?rev=902203&r1=902202&r2=902203&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/AbstractRealVectorTest.java (original) +++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/AbstractRealVectorTest.java Fri Jan 22 18:27:41 2010 @@ -34,16 +34,19 @@ return new UnsupportedOperationException("Test implementation only supports methods necessary for testing"); } + @Override public RealVector add(RealVector v) throws IllegalArgumentException { RealVector result = new ArrayRealVector(v); return result.add(this); } + @Override public RealVector subtract(RealVector v) throws IllegalArgumentException { RealVector result = new ArrayRealVector(v); return result.subtract(this).mapMultiplyToSelf(-1); } + @Override public RealVector mapAddToSelf(double d) { for(int i=0; i<values.length; i++) { values[i] += d; @@ -51,6 +54,7 @@ return this; } + @Override public RealVector mapSubtractToSelf(double d) { for(int i=0; i<values.length; i++) { values[i] -= d; @@ -58,6 +62,7 @@ return this; } + @Override public RealVector mapMultiplyToSelf(double d) { for(int i=0; i<values.length; i++) { values[i] *= d; @@ -65,6 +70,7 @@ return this; } + @Override public RealVector mapDivideToSelf(double d) { for(int i=0; i<values.length; i++) { values[i] /= d; @@ -72,6 +78,7 @@ return this; } + @Override public RealVector mapPowToSelf(double d) { for(int i=0; i<values.length; i++) { values[i] = Math.pow(values[i], d); @@ -79,6 +86,7 @@ return this; } + @Override public RealVector mapInvToSelf() { for(int i=0; i<values.length; i++) { values[i] = 1/values[i]; @@ -94,18 +102,22 @@ throw unsupported(); } + @Override public double dotProduct(RealVector v) throws IllegalArgumentException { throw unsupported(); } + @Override public double getNorm() { throw unsupported(); } + @Override public double getL1Norm() { throw unsupported(); } + @Override public double getLInfNorm() { throw unsupported(); } Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/ArrayRealVectorTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/ArrayRealVectorTest.java?rev=902203&r1=902202&r2=902203&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/ArrayRealVectorTest.java (original) +++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/ArrayRealVectorTest.java Fri Jan 22 18:27:41 2010 @@ -82,9 +82,11 @@ public Entry next() { final int j = i++; Entry e = new Entry() { + @Override public double getValue() { return data[j]; } + @Override public void setValue(double newValue) { data[j] = newValue; } Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/SparseRealVectorTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/SparseRealVectorTest.java?rev=902203&r1=902202&r2=902203&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/SparseRealVectorTest.java (original) +++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/SparseRealVectorTest.java Fri Jan 22 18:27:41 2010 @@ -63,54 +63,67 @@ return new UnsupportedOperationException("Not supported, unneeded for test purposes"); } + @Override public RealVector map(UnivariateRealFunction function) throws FunctionEvaluationException { throw unsupported(); } + @Override public RealVector mapToSelf(UnivariateRealFunction function) throws FunctionEvaluationException { throw unsupported(); } + @Override public Iterator<Entry> iterator() { throw unsupported(); } + @Override public AbstractRealVector copy() { return new SparseRealVectorTestImpl(data); } + @Override public RealVector add(RealVector v) throws IllegalArgumentException { throw unsupported(); } + @Override public RealVector add(double[] v) throws IllegalArgumentException { throw unsupported(); } + @Override public RealVector subtract(RealVector v) throws IllegalArgumentException { throw unsupported(); } + @Override public RealVector subtract(double[] v) throws IllegalArgumentException { throw unsupported(); } + @Override public RealVector mapAdd(double d) { throw unsupported(); } + @Override public RealVector mapAddToSelf(double d) { throw unsupported(); } + @Override public RealVector mapSubtract(double d) { throw unsupported(); } + @Override public RealVector mapSubtractToSelf(double d) { throw unsupported(); } + @Override public RealVector mapMultiply(double d) { double[] out = new double[data.length]; for (int i = 0; i < data.length; i++) { @@ -119,206 +132,257 @@ return new OpenMapRealVector(out); } + @Override public RealVector mapMultiplyToSelf(double d) { throw unsupported(); } + @Override public RealVector mapDivide(double d) { throw unsupported(); } + @Override public RealVector mapDivideToSelf(double d) { throw unsupported(); } + @Override public RealVector mapPow(double d) { throw unsupported(); } + @Override public RealVector mapPowToSelf(double d) { throw unsupported(); } + @Override public RealVector mapExp() { throw unsupported(); } + @Override public RealVector mapExpToSelf() { throw unsupported(); } + @Override public RealVector mapExpm1() { throw unsupported(); } + @Override public RealVector mapExpm1ToSelf() { throw unsupported(); } + @Override public RealVector mapLog() { throw unsupported(); } + @Override public RealVector mapLogToSelf() { throw unsupported(); } + @Override public RealVector mapLog10() { throw unsupported(); } + @Override public RealVector mapLog10ToSelf() { throw unsupported(); } + @Override public RealVector mapLog1p() { throw unsupported(); } + @Override public RealVector mapLog1pToSelf() { throw unsupported(); } + @Override public RealVector mapCosh() { throw unsupported(); } + @Override public RealVector mapCoshToSelf() { throw unsupported(); } + @Override public RealVector mapSinh() { throw unsupported(); } + @Override public RealVector mapSinhToSelf() { throw unsupported(); } + @Override public RealVector mapTanh() { throw unsupported(); } + @Override public RealVector mapTanhToSelf() { throw unsupported(); } + @Override public RealVector mapCos() { throw unsupported(); } + @Override public RealVector mapCosToSelf() { throw unsupported(); } + @Override public RealVector mapSin() { throw unsupported(); } + @Override public RealVector mapSinToSelf() { throw unsupported(); } + @Override public RealVector mapTan() { throw unsupported(); } + @Override public RealVector mapTanToSelf() { throw unsupported(); } + @Override public RealVector mapAcos() { throw unsupported(); } + @Override public RealVector mapAcosToSelf() { throw unsupported(); } + @Override public RealVector mapAsin() { throw unsupported(); } + @Override public RealVector mapAsinToSelf() { throw unsupported(); } + @Override public RealVector mapAtan() { throw unsupported(); } + @Override public RealVector mapAtanToSelf() { throw unsupported(); } + @Override public RealVector mapInv() { throw unsupported(); } + @Override public RealVector mapInvToSelf() { throw unsupported(); } + @Override public RealVector mapAbs() { throw unsupported(); } + @Override public RealVector mapAbsToSelf() { throw unsupported(); } + @Override public RealVector mapSqrt() { throw unsupported(); } + @Override public RealVector mapSqrtToSelf() { throw unsupported(); } + @Override public RealVector mapCbrt() { throw unsupported(); } + @Override public RealVector mapCbrtToSelf() { throw unsupported(); } + @Override public RealVector mapCeil() { throw unsupported(); } + @Override public RealVector mapCeilToSelf() { throw unsupported(); } + @Override public RealVector mapFloor() { throw unsupported(); } + @Override public RealVector mapFloorToSelf() { throw unsupported(); } + @Override public RealVector mapRint() { throw unsupported(); } + @Override public RealVector mapRintToSelf() { throw unsupported(); } + @Override public RealVector mapSignum() { throw unsupported(); } + @Override public RealVector mapSignumToSelf() { throw unsupported(); } + @Override public RealVector mapUlp() { throw unsupported(); } + @Override public RealVector mapUlpToSelf() { throw unsupported(); } @@ -327,6 +391,7 @@ throw unsupported(); } + @Override public RealVector ebeMultiply(double[] v) throws IllegalArgumentException { throw unsupported(); } @@ -335,14 +400,17 @@ throw unsupported(); } + @Override public RealVector ebeDivide(double[] v) throws IllegalArgumentException { throw unsupported(); } + @Override public double[] getData() { return data.clone(); } + @Override public double dotProduct(RealVector v) throws IllegalArgumentException { double dot = 0; for (int i = 0; i < data.length; i++) { @@ -351,6 +419,7 @@ return dot; } + @Override public double dotProduct(double[] v) throws IllegalArgumentException { double dot = 0; for (int i = 0; i < data.length; i++) { @@ -359,46 +428,57 @@ return dot; } + @Override public double getNorm() { throw unsupported(); } + @Override public double getL1Norm() { throw unsupported(); } + @Override public double getLInfNorm() { throw unsupported(); } + @Override public double getDistance(RealVector v) throws IllegalArgumentException { throw unsupported(); } + @Override public double getDistance(double[] v) throws IllegalArgumentException { throw unsupported(); } + @Override public double getL1Distance(RealVector v) throws IllegalArgumentException { throw unsupported(); } + @Override public double getL1Distance(double[] v) throws IllegalArgumentException { throw unsupported(); } + @Override public double getLInfDistance(RealVector v) throws IllegalArgumentException { throw unsupported(); } + @Override public double getLInfDistance(double[] v) throws IllegalArgumentException { throw unsupported(); } + @Override public RealVector unitVector() { throw unsupported(); } + @Override public void unitize() { throw unsupported(); } @@ -407,14 +487,17 @@ throw unsupported(); } + @Override public RealVector projection(double[] v) throws IllegalArgumentException { throw unsupported(); } + @Override public RealMatrix outerProduct(RealVector v) throws IllegalArgumentException { throw unsupported(); } + @Override public RealMatrix outerProduct(double[] v) throws IllegalArgumentException { throw unsupported(); } @@ -447,18 +530,22 @@ data[index] = value; } + @Override public void setSubVector(int index, RealVector v) throws MatrixIndexException { throw unsupported(); } + @Override public void setSubVector(int index, double[] v) throws MatrixIndexException { throw unsupported(); } + @Override public void set(double value) { throw unsupported(); } + @Override public double[] toArray() { throw unsupported(); } Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblem1.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblem1.java?rev=902203&r1=902202&r2=902203&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblem1.java (original) +++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblem1.java Fri Jan 22 18:27:41 2010 @@ -63,7 +63,8 @@ } /** {...@inheritdoc} */ - public TestProblem1 copy() { + @Override +public TestProblem1 copy() { return new TestProblem1(this); } Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblem2.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblem2.java?rev=902203&r1=902202&r2=902203&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblem2.java (original) +++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblem2.java Fri Jan 22 18:27:41 2010 @@ -64,7 +64,8 @@ } /** {...@inheritdoc} */ - public TestProblem2 copy() { + @Override +public TestProblem2 copy() { return new TestProblem2(this); } Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblem3.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblem3.java?rev=902203&r1=902202&r2=902203&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblem3.java (original) +++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblem3.java Fri Jan 22 18:27:41 2010 @@ -79,7 +79,8 @@ } /** {...@inheritdoc} */ - public TestProblem3 copy() { + @Override +public TestProblem3 copy() { return new TestProblem3(this); } Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblem4.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblem4.java?rev=902203&r1=902202&r2=902203&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblem4.java (original) +++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblem4.java Fri Jan 22 18:27:41 2010 @@ -69,7 +69,8 @@ } /** {...@inheritdoc} */ - public TestProblem4 copy() { + @Override +public TestProblem4 copy() { return new TestProblem4(this); } Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblem5.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblem5.java?rev=902203&r1=902202&r2=902203&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblem5.java (original) +++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblem5.java Fri Jan 22 18:27:41 2010 @@ -37,6 +37,7 @@ } /** {...@inheritdoc} */ + @Override public TestProblem5 copy() { return new TestProblem5(); } Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblem6.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblem6.java?rev=902203&r1=902202&r2=902203&view=diff ============================================================================== --- commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblem6.java (original) +++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblem6.java Fri Jan 22 18:27:41 2010 @@ -64,6 +64,7 @@ } /** {...@inheritdoc} */ + @Override public TestProblem6 copy() { return new TestProblem6(this); }