commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From l..@apache.org
Subject svn commit: r1003892 - in /commons/proper/math/branches/MATH_2_X: ./ src/main/java/org/apache/commons/math/analysis/interpolation/ src/main/java/org/apache/commons/math/dfp/ src/main/java/org/apache/commons/math/exception/util/ src/main/java/org/apache...
Date Sat, 02 Oct 2010 21:28:56 GMT
Author: luc
Date: Sat Oct  2 21:28:56 2010
New Revision: 1003892

URL: http://svn.apache.org/viewvc?rev=1003892&view=rev
Log:
backported part of r1003351 from trunk to branch 2.X
Add missing @Override marker

Modified:
    commons/proper/math/branches/MATH_2_X/   (props changed)
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/interpolation/SmoothingPolynomialBicubicSplineInterpolator.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/dfp/DfpDec.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/exception/util/DummyLocalizable.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/general/AbstractScalarDifferentiableOptimizer.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/AbstractWell.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/Well1024a.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/Well19937a.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/Well19937c.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/Well44497a.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/Well44497b.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/Well512a.java
    commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/util/MultidimensionalCounter.java
    commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/dfp/Decimal10.java

Propchange: commons/proper/math/branches/MATH_2_X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct  2 21:28:56 2010
@@ -1 +1 @@
-/commons/proper/math/trunk:1003346,1003348-1003350
+/commons/proper/math/trunk:1003346,1003348-1003351

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/interpolation/SmoothingPolynomialBicubicSplineInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/interpolation/SmoothingPolynomialBicubicSplineInterpolator.java?rev=1003892&r1=1003891&r2=1003892&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/interpolation/SmoothingPolynomialBicubicSplineInterpolator.java
(original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/analysis/interpolation/SmoothingPolynomialBicubicSplineInterpolator.java
Sat Oct  2 21:28:56 2010
@@ -70,6 +70,7 @@ public class SmoothingPolynomialBicubicS
     /**
      * {@inheritDoc}
      */
+    @Override
     public BicubicSplineInterpolatingFunction interpolate(final double[] xval,
                                                           final double[] yval,
                                                           final double[][] fval)

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/dfp/DfpDec.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/dfp/DfpDec.java?rev=1003892&r1=1003891&r2=1003892&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/dfp/DfpDec.java
(original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/dfp/DfpDec.java
Sat Oct  2 21:28:56 2010
@@ -94,31 +94,37 @@ public class DfpDec extends Dfp {
     }
 
     /** {@inheritDoc} */
+    @Override
     public Dfp newInstance() {
         return new DfpDec(getField());
     }
 
     /** {@inheritDoc} */
+    @Override
     public Dfp newInstance(final byte x) {
         return new DfpDec(getField(), x);
     }
 
     /** {@inheritDoc} */
+    @Override
     public Dfp newInstance(final int x) {
         return new DfpDec(getField(), x);
     }
 
     /** {@inheritDoc} */
+    @Override
     public Dfp newInstance(final long x) {
         return new DfpDec(getField(), x);
     }
 
     /** {@inheritDoc} */
+    @Override
     public Dfp newInstance(final double x) {
         return new DfpDec(getField(), x);
     }
 
     /** {@inheritDoc} */
+    @Override
     public Dfp newInstance(final Dfp d) {
 
         // make sure we don't mix number with different precision
@@ -134,11 +140,13 @@ public class DfpDec extends Dfp {
     }
 
     /** {@inheritDoc} */
+    @Override
     public Dfp newInstance(final String s) {
         return new DfpDec(getField(), s);
     }
 
     /** {@inheritDoc} */
+    @Override
     public Dfp newInstance(final byte sign, final byte nans) {
         return new DfpDec(getField(), sign, nans);
     }
@@ -153,6 +161,7 @@ public class DfpDec extends Dfp {
     }
 
     /** {@inheritDoc} */
+    @Override
     protected int round(int in) {
 
         int msb = mant[mant.length-1];
@@ -280,6 +289,7 @@ public class DfpDec extends Dfp {
     }
 
     /** {@inheritDoc} */
+    @Override
     public Dfp nextAfter(Dfp x) {
 
         final String trapName = "nextAfter";

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/exception/util/DummyLocalizable.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/exception/util/DummyLocalizable.java?rev=1003892&r1=1003891&r2=1003892&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/exception/util/DummyLocalizable.java
(original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/exception/util/DummyLocalizable.java
Sat Oct  2 21:28:56 2010
@@ -50,6 +50,7 @@ public class DummyLocalizable implements
     }
 
     /** {@inheritDoc} */
+    @Override
     public String toString() {
         return source;
     }

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/general/AbstractScalarDifferentiableOptimizer.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/general/AbstractScalarDifferentiableOptimizer.java?rev=1003892&r1=1003891&r2=1003892&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/general/AbstractScalarDifferentiableOptimizer.java
(original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/optimization/general/AbstractScalarDifferentiableOptimizer.java
Sat Oct  2 21:28:56 2010
@@ -98,6 +98,7 @@ public abstract class AbstractScalarDiff
     }
 
     /** {@inheritDoc} */
+    @Override
     public RealPointValuePair optimize(final DifferentiableMultivariateRealFunction f,
                                        final GoalType goalType,
                                        final double[] startPoint)

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/AbstractWell.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/AbstractWell.java?rev=1003892&r1=1003891&r2=1003892&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/AbstractWell.java
(original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/AbstractWell.java
Sat Oct  2 21:28:56 2010
@@ -137,6 +137,7 @@ public abstract class AbstractWell exten
      * generator built with the same seed.</p>
      * @param seed the initial seed (32 bits integer)
      */
+    @Override
     public void setSeed(final int seed) {
         setSeed(new int[] { seed });
     }
@@ -147,6 +148,7 @@ public abstract class AbstractWell exten
      * @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(final int[] seed) {
 
         if (seed == null) {
@@ -172,11 +174,13 @@ public abstract class AbstractWell exten
      * generator built with the same seed.</p>
      * @param seed the initial seed (64 bits integer)
      */
+    @Override
     public void setSeed(final long seed) {
         setSeed(new int[] { (int) (seed >>> 32), (int) (seed & 0xffffffffl)
});
     }
 
     /** {@inheritDoc} */
+    @Override
     protected abstract int next(final int bits);
 
 }

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/Well1024a.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/Well1024a.java?rev=1003892&r1=1003891&r2=1003892&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/Well1024a.java
(original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/Well1024a.java
Sat Oct  2 21:28:56 2010
@@ -80,6 +80,7 @@ public class Well1024a extends AbstractW
     }
 
     /** {@inheritDoc} */
+    @Override
     protected int next(final int bits) {
 
         final int indexRm1 = iRm1[index];

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/Well19937a.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/Well19937a.java?rev=1003892&r1=1003891&r2=1003892&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/Well19937a.java
(original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/Well19937a.java
Sat Oct  2 21:28:56 2010
@@ -80,6 +80,7 @@ public class Well19937a extends Abstract
     }
 
     /** {@inheritDoc} */
+    @Override
     protected int next(final int bits) {
 
         final int indexRm1 = iRm1[index];

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/Well19937c.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/Well19937c.java?rev=1003892&r1=1003891&r2=1003892&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/Well19937c.java
(original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/Well19937c.java
Sat Oct  2 21:28:56 2010
@@ -80,6 +80,7 @@ public class Well19937c extends Abstract
     }
 
     /** {@inheritDoc} */
+    @Override
     protected int next(final int bits) {
 
         final int indexRm1 = iRm1[index];

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/Well44497a.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/Well44497a.java?rev=1003892&r1=1003891&r2=1003892&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/Well44497a.java
(original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/Well44497a.java
Sat Oct  2 21:28:56 2010
@@ -80,6 +80,7 @@ public class Well44497a extends Abstract
     }
 
     /** {@inheritDoc} */
+    @Override
     protected int next(final int bits) {
 
         final int indexRm1 = iRm1[index];

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/Well44497b.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/Well44497b.java?rev=1003892&r1=1003891&r2=1003892&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/Well44497b.java
(original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/Well44497b.java
Sat Oct  2 21:28:56 2010
@@ -80,6 +80,7 @@ public class Well44497b extends Abstract
     }
 
     /** {@inheritDoc} */
+    @Override
     protected int next(final int bits) {
 
         // compute raw value given by WELL44497a generator

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/Well512a.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/Well512a.java?rev=1003892&r1=1003891&r2=1003892&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/Well512a.java
(original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/random/Well512a.java
Sat Oct  2 21:28:56 2010
@@ -80,6 +80,7 @@ public class Well512a extends AbstractWe
     }
 
     /** {@inheritDoc} */
+    @Override
     protected int next(final int bits) {
 
         final int indexRm1 = iRm1[index];

Modified: commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/util/MultidimensionalCounter.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/util/MultidimensionalCounter.java?rev=1003892&r1=1003891&r2=1003892&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/util/MultidimensionalCounter.java
(original)
+++ commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/util/MultidimensionalCounter.java
Sat Oct  2 21:28:56 2010
@@ -292,6 +292,7 @@ public class MultidimensionalCounter imp
     /**
      * {@inheritDoc}
      */
+    @Override
     public String toString() {
         final StringBuilder sb = new StringBuilder();
         for (int i = 0; i < dimension; i++) {

Modified: commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/dfp/Decimal10.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/dfp/Decimal10.java?rev=1003892&r1=1003891&r2=1003892&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/dfp/Decimal10.java
(original)
+++ commons/proper/math/branches/MATH_2_X/src/test/java/org/apache/commons/math/dfp/Decimal10.java
Sat Oct  2 21:28:56 2010
@@ -51,38 +51,47 @@ public class Decimal10 extends DfpDec {
         super(factory, sign, nans);
     }
 
+    @Override
     public Dfp newInstance() {
         return new Decimal10(getField());
     }
 
+    @Override
     public Dfp newInstance(final byte x) {
         return new Decimal10(getField(), x);
     }
 
+    @Override
     public Dfp newInstance(final int x) {
         return new Decimal10(getField(), x);
     }
 
+    @Override
     public Dfp newInstance(final long x) {
         return new Decimal10(getField(), x);
     }
 
+    @Override
     public Dfp newInstance(final double x) {
         return new Decimal10(getField(), x);
     }
 
+    @Override
     public Dfp newInstance(final Dfp d) {
         return new Decimal10(d);
     }
 
+    @Override
     public Dfp newInstance(final String s) {
         return new Decimal10(getField(), s);
     }
 
+    @Override
     public Dfp newInstance(final byte sign, final byte nans) {
         return new Decimal10(getField(), sign, nans);
     }
 
+    @Override
     protected int getDecimalDigits() {
         return 10;
     }



Mime
View raw message