You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by tn...@apache.org on 2015/04/11 15:48:34 UTC
[2/3] [math] Remove deprecated interfaces/classes/methods in analysis
package.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/function/Sinc.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/function/Sinc.java b/src/main/java/org/apache/commons/math4/analysis/function/Sinc.java
index 72bf611..b6207fc 100644
--- a/src/main/java/org/apache/commons/math4/analysis/function/Sinc.java
+++ b/src/main/java/org/apache/commons/math4/analysis/function/Sinc.java
@@ -17,9 +17,6 @@
package org.apache.commons.math4.analysis.function;
-import org.apache.commons.math4.analysis.DifferentiableUnivariateFunction;
-import org.apache.commons.math4.analysis.FunctionUtils;
-import org.apache.commons.math4.analysis.UnivariateFunction;
import org.apache.commons.math4.analysis.differentiation.DerivativeStructure;
import org.apache.commons.math4.analysis.differentiation.UnivariateDifferentiableFunction;
import org.apache.commons.math4.exception.DimensionMismatchException;
@@ -35,7 +32,7 @@ import org.apache.commons.math4.util.FastMath;
*
* @since 3.0
*/
-public class Sinc implements UnivariateDifferentiableFunction, DifferentiableUnivariateFunction {
+public class Sinc implements UnivariateDifferentiableFunction {
/**
* Value below which the computations are done using Taylor series.
* <p>
@@ -96,15 +93,6 @@ public class Sinc implements UnivariateDifferentiableFunction, DifferentiableUni
}
/** {@inheritDoc}
- * @deprecated as of 3.1, replaced by {@link #value(DerivativeStructure)}
- */
- @Override
- @Deprecated
- public UnivariateFunction derivative() {
- return FunctionUtils.toDifferentiableUnivariateFunction(this).derivative();
- }
-
- /** {@inheritDoc}
* @since 3.1
*/
@Override
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/function/Sinh.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/function/Sinh.java b/src/main/java/org/apache/commons/math4/analysis/function/Sinh.java
index 2274fb1..617f9a4 100644
--- a/src/main/java/org/apache/commons/math4/analysis/function/Sinh.java
+++ b/src/main/java/org/apache/commons/math4/analysis/function/Sinh.java
@@ -17,7 +17,6 @@
package org.apache.commons.math4.analysis.function;
-import org.apache.commons.math4.analysis.DifferentiableUnivariateFunction;
import org.apache.commons.math4.analysis.differentiation.DerivativeStructure;
import org.apache.commons.math4.analysis.differentiation.UnivariateDifferentiableFunction;
import org.apache.commons.math4.util.FastMath;
@@ -27,7 +26,7 @@ import org.apache.commons.math4.util.FastMath;
*
* @since 3.0
*/
-public class Sinh implements UnivariateDifferentiableFunction, DifferentiableUnivariateFunction {
+public class Sinh implements UnivariateDifferentiableFunction {
/** {@inheritDoc} */
@Override
public double value(double x) {
@@ -35,15 +34,6 @@ public class Sinh implements UnivariateDifferentiableFunction, DifferentiableUni
}
/** {@inheritDoc}
- * @deprecated as of 3.1, replaced by {@link #value(DerivativeStructure)}
- */
- @Override
- @Deprecated
- public DifferentiableUnivariateFunction derivative() {
- return new Cosh();
- }
-
- /** {@inheritDoc}
* @since 3.1
*/
@Override
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/function/Sqrt.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/function/Sqrt.java b/src/main/java/org/apache/commons/math4/analysis/function/Sqrt.java
index 381d8cc..979e67d 100644
--- a/src/main/java/org/apache/commons/math4/analysis/function/Sqrt.java
+++ b/src/main/java/org/apache/commons/math4/analysis/function/Sqrt.java
@@ -17,9 +17,6 @@
package org.apache.commons.math4.analysis.function;
-import org.apache.commons.math4.analysis.DifferentiableUnivariateFunction;
-import org.apache.commons.math4.analysis.FunctionUtils;
-import org.apache.commons.math4.analysis.UnivariateFunction;
import org.apache.commons.math4.analysis.differentiation.DerivativeStructure;
import org.apache.commons.math4.analysis.differentiation.UnivariateDifferentiableFunction;
import org.apache.commons.math4.util.FastMath;
@@ -29,7 +26,7 @@ import org.apache.commons.math4.util.FastMath;
*
* @since 3.0
*/
-public class Sqrt implements UnivariateDifferentiableFunction, DifferentiableUnivariateFunction {
+public class Sqrt implements UnivariateDifferentiableFunction {
/** {@inheritDoc} */
@Override
public double value(double x) {
@@ -37,15 +34,6 @@ public class Sqrt implements UnivariateDifferentiableFunction, DifferentiableUni
}
/** {@inheritDoc}
- * @deprecated as of 3.1, replaced by {@link #value(DerivativeStructure)}
- */
- @Override
- @Deprecated
- public UnivariateFunction derivative() {
- return FunctionUtils.toDifferentiableUnivariateFunction(this).derivative();
- }
-
- /** {@inheritDoc}
* @since 3.1
*/
@Override
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/function/Tan.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/function/Tan.java b/src/main/java/org/apache/commons/math4/analysis/function/Tan.java
index cef9146..dc20589 100644
--- a/src/main/java/org/apache/commons/math4/analysis/function/Tan.java
+++ b/src/main/java/org/apache/commons/math4/analysis/function/Tan.java
@@ -17,9 +17,6 @@
package org.apache.commons.math4.analysis.function;
-import org.apache.commons.math4.analysis.DifferentiableUnivariateFunction;
-import org.apache.commons.math4.analysis.FunctionUtils;
-import org.apache.commons.math4.analysis.UnivariateFunction;
import org.apache.commons.math4.analysis.differentiation.DerivativeStructure;
import org.apache.commons.math4.analysis.differentiation.UnivariateDifferentiableFunction;
import org.apache.commons.math4.util.FastMath;
@@ -29,7 +26,7 @@ import org.apache.commons.math4.util.FastMath;
*
* @since 3.0
*/
-public class Tan implements UnivariateDifferentiableFunction, DifferentiableUnivariateFunction {
+public class Tan implements UnivariateDifferentiableFunction {
/** {@inheritDoc} */
@Override
public double value(double x) {
@@ -37,15 +34,6 @@ public class Tan implements UnivariateDifferentiableFunction, DifferentiableUniv
}
/** {@inheritDoc}
- * @deprecated as of 3.1, replaced by {@link #value(DerivativeStructure)}
- */
- @Override
- @Deprecated
- public UnivariateFunction derivative() {
- return FunctionUtils.toDifferentiableUnivariateFunction(this).derivative();
- }
-
- /** {@inheritDoc}
* @since 3.1
*/
@Override
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/function/Tanh.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/function/Tanh.java b/src/main/java/org/apache/commons/math4/analysis/function/Tanh.java
index afe70f9..2769ca5 100644
--- a/src/main/java/org/apache/commons/math4/analysis/function/Tanh.java
+++ b/src/main/java/org/apache/commons/math4/analysis/function/Tanh.java
@@ -17,9 +17,6 @@
package org.apache.commons.math4.analysis.function;
-import org.apache.commons.math4.analysis.DifferentiableUnivariateFunction;
-import org.apache.commons.math4.analysis.FunctionUtils;
-import org.apache.commons.math4.analysis.UnivariateFunction;
import org.apache.commons.math4.analysis.differentiation.DerivativeStructure;
import org.apache.commons.math4.analysis.differentiation.UnivariateDifferentiableFunction;
import org.apache.commons.math4.util.FastMath;
@@ -29,7 +26,7 @@ import org.apache.commons.math4.util.FastMath;
*
* @since 3.0
*/
-public class Tanh implements UnivariateDifferentiableFunction, DifferentiableUnivariateFunction {
+public class Tanh implements UnivariateDifferentiableFunction {
/** {@inheritDoc} */
@Override
public double value(double x) {
@@ -37,15 +34,6 @@ public class Tanh implements UnivariateDifferentiableFunction, DifferentiableUni
}
/** {@inheritDoc}
- * @deprecated as of 3.1, replaced by {@link #value(DerivativeStructure)}
- */
- @Override
- @Deprecated
- public UnivariateFunction derivative() {
- return FunctionUtils.toDifferentiableUnivariateFunction(this).derivative();
- }
-
- /** {@inheritDoc}
* @since 3.1
*/
@Override
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/integration/IterativeLegendreGaussIntegrator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/integration/IterativeLegendreGaussIntegrator.java b/src/main/java/org/apache/commons/math4/analysis/integration/IterativeLegendreGaussIntegrator.java
index 826aabc..eedc41e 100644
--- a/src/main/java/org/apache/commons/math4/analysis/integration/IterativeLegendreGaussIntegrator.java
+++ b/src/main/java/org/apache/commons/math4/analysis/integration/IterativeLegendreGaussIntegrator.java
@@ -158,6 +158,7 @@ public class IterativeLegendreGaussIntegrator
throws TooManyEvaluationsException {
// Function to be integrated is stored in the base class.
final UnivariateFunction f = new UnivariateFunction() {
+ @Override
public double value(double x)
throws MathIllegalArgumentException, TooManyEvaluationsException {
return computeObjectiveValue(x);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/interpolation/AkimaSplineInterpolator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/interpolation/AkimaSplineInterpolator.java b/src/main/java/org/apache/commons/math4/analysis/interpolation/AkimaSplineInterpolator.java
index ac54924..100b927 100644
--- a/src/main/java/org/apache/commons/math4/analysis/interpolation/AkimaSplineInterpolator.java
+++ b/src/main/java/org/apache/commons/math4/analysis/interpolation/AkimaSplineInterpolator.java
@@ -63,6 +63,7 @@ public class AkimaSplineInterpolator
* @throws NumberIsTooSmallException if the size of {@code xvals} is smaller
* than 5.
*/
+ @Override
public PolynomialSplineFunction interpolate(double[] xvals,
double[] yvals)
throws DimensionMismatchException,
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/interpolation/DividedDifferenceInterpolator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/interpolation/DividedDifferenceInterpolator.java b/src/main/java/org/apache/commons/math4/analysis/interpolation/DividedDifferenceInterpolator.java
index 7624298..936ddc5 100644
--- a/src/main/java/org/apache/commons/math4/analysis/interpolation/DividedDifferenceInterpolator.java
+++ b/src/main/java/org/apache/commons/math4/analysis/interpolation/DividedDifferenceInterpolator.java
@@ -52,6 +52,7 @@ public class DividedDifferenceInterpolator
* @throws NonMonotonicSequenceException if {@code x} is not sorted in
* strictly increasing order.
*/
+ @Override
public PolynomialFunctionNewtonForm interpolate(double x[], double y[])
throws DimensionMismatchException,
NumberIsTooSmallException,
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/interpolation/HermiteInterpolator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/interpolation/HermiteInterpolator.java b/src/main/java/org/apache/commons/math4/analysis/interpolation/HermiteInterpolator.java
index 1903579..3aeb135 100644
--- a/src/main/java/org/apache/commons/math4/analysis/interpolation/HermiteInterpolator.java
+++ b/src/main/java/org/apache/commons/math4/analysis/interpolation/HermiteInterpolator.java
@@ -164,8 +164,8 @@ public class HermiteInterpolator implements UnivariateDifferentiableVectorFuncti
* @return interpolated value
* @exception NoDataException if sample is empty
*/
- public double[] value(double x)
- throws NoDataException {
+ @Override
+ public double[] value(double x) throws NoDataException {
// safety check
checkInterpolation();
@@ -196,6 +196,7 @@ public class HermiteInterpolator implements UnivariateDifferentiableVectorFuncti
* @return interpolated value
* @exception NoDataException if sample is empty
*/
+ @Override
public DerivativeStructure[] value(final DerivativeStructure x)
throws NoDataException {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/interpolation/LinearInterpolator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/interpolation/LinearInterpolator.java b/src/main/java/org/apache/commons/math4/analysis/interpolation/LinearInterpolator.java
index 2eb19f0..eb9d078 100644
--- a/src/main/java/org/apache/commons/math4/analysis/interpolation/LinearInterpolator.java
+++ b/src/main/java/org/apache/commons/math4/analysis/interpolation/LinearInterpolator.java
@@ -42,6 +42,7 @@ public class LinearInterpolator implements UnivariateInterpolator {
* @throws NumberIsTooSmallException if the size of {@code x} is smaller
* than 2.
*/
+ @Override
public PolynomialSplineFunction interpolate(double x[], double y[])
throws DimensionMismatchException,
NumberIsTooSmallException,
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/interpolation/LoessInterpolator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/interpolation/LoessInterpolator.java b/src/main/java/org/apache/commons/math4/analysis/interpolation/LoessInterpolator.java
index a362511..f256c17 100644
--- a/src/main/java/org/apache/commons/math4/analysis/interpolation/LoessInterpolator.java
+++ b/src/main/java/org/apache/commons/math4/analysis/interpolation/LoessInterpolator.java
@@ -180,6 +180,7 @@ public class LoessInterpolator
* accomodate the size of the input data (i.e. the bandwidth must be
* larger than 2/n).
*/
+ @Override
public final PolynomialSplineFunction interpolate(final double[] xval,
final double[] yval)
throws NonMonotonicSequenceException,
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/interpolation/MicrosphereInterpolatingFunction.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/interpolation/MicrosphereInterpolatingFunction.java b/src/main/java/org/apache/commons/math4/analysis/interpolation/MicrosphereInterpolatingFunction.java
index a18cbc0..9e754a9 100644
--- a/src/main/java/org/apache/commons/math4/analysis/interpolation/MicrosphereInterpolatingFunction.java
+++ b/src/main/java/org/apache/commons/math4/analysis/interpolation/MicrosphereInterpolatingFunction.java
@@ -194,6 +194,7 @@ public class MicrosphereInterpolatingFunction
* @return the interpolated value.
* @throws DimensionMismatchException if point dimension does not math sample
*/
+ @Override
public double value(double[] point) throws DimensionMismatchException {
final RealVector p = new ArrayRealVector(point);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/interpolation/NevilleInterpolator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/interpolation/NevilleInterpolator.java b/src/main/java/org/apache/commons/math4/analysis/interpolation/NevilleInterpolator.java
index ee39b7f..d214cc8 100644
--- a/src/main/java/org/apache/commons/math4/analysis/interpolation/NevilleInterpolator.java
+++ b/src/main/java/org/apache/commons/math4/analysis/interpolation/NevilleInterpolator.java
@@ -51,6 +51,7 @@ public class NevilleInterpolator implements UnivariateInterpolator,
* @throws NonMonotonicSequenceException if two abscissae have the same
* value.
*/
+ @Override
public PolynomialFunctionLagrangeForm interpolate(double x[], double y[])
throws DimensionMismatchException,
NumberIsTooSmallException,
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/interpolation/SplineInterpolator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/interpolation/SplineInterpolator.java b/src/main/java/org/apache/commons/math4/analysis/interpolation/SplineInterpolator.java
index 393281e..99d725c 100644
--- a/src/main/java/org/apache/commons/math4/analysis/interpolation/SplineInterpolator.java
+++ b/src/main/java/org/apache/commons/math4/analysis/interpolation/SplineInterpolator.java
@@ -62,6 +62,7 @@ public class SplineInterpolator implements UnivariateInterpolator {
* @throws NumberIsTooSmallException if the size of {@code x} is smaller
* than 3.
*/
+ @Override
public PolynomialSplineFunction interpolate(double x[], double y[])
throws DimensionMismatchException,
NumberIsTooSmallException,
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/interpolation/TricubicInterpolatingFunction.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/interpolation/TricubicInterpolatingFunction.java b/src/main/java/org/apache/commons/math4/analysis/interpolation/TricubicInterpolatingFunction.java
index f4f13aa..a9f7c0d 100644
--- a/src/main/java/org/apache/commons/math4/analysis/interpolation/TricubicInterpolatingFunction.java
+++ b/src/main/java/org/apache/commons/math4/analysis/interpolation/TricubicInterpolatingFunction.java
@@ -471,8 +471,8 @@ class TricubicFunction
* @throws OutOfRangeException if {@code x}, {@code y} or
* {@code z} are not in the interval {@code [0, 1]}.
*/
- public double value(double x, double y, double z)
- throws OutOfRangeException {
+ @Override
+ public double value(double x, double y, double z) throws OutOfRangeException {
if (x < 0 || x > 1) {
throw new OutOfRangeException(x, 0, 1);
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/interpolation/UnivariatePeriodicInterpolator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/interpolation/UnivariatePeriodicInterpolator.java b/src/main/java/org/apache/commons/math4/analysis/interpolation/UnivariatePeriodicInterpolator.java
index 2ba29bb..0137397 100644
--- a/src/main/java/org/apache/commons/math4/analysis/interpolation/UnivariatePeriodicInterpolator.java
+++ b/src/main/java/org/apache/commons/math4/analysis/interpolation/UnivariatePeriodicInterpolator.java
@@ -116,6 +116,7 @@ public class UnivariatePeriodicInterpolator
final UnivariateFunction f = interpolator.interpolate(x, y);
return new UnivariateFunction() {
+ @Override
public double value(final double x) throws MathIllegalArgumentException {
return f.value(MathUtils.reduce(x, period, offset));
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/polynomials/PolynomialFunction.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/polynomials/PolynomialFunction.java b/src/main/java/org/apache/commons/math4/analysis/polynomials/PolynomialFunction.java
index 0260f58..5c8c097 100644
--- a/src/main/java/org/apache/commons/math4/analysis/polynomials/PolynomialFunction.java
+++ b/src/main/java/org/apache/commons/math4/analysis/polynomials/PolynomialFunction.java
@@ -19,9 +19,7 @@ package org.apache.commons.math4.analysis.polynomials;
import java.io.Serializable;
import java.util.Arrays;
-import org.apache.commons.math4.analysis.DifferentiableUnivariateFunction;
import org.apache.commons.math4.analysis.ParametricUnivariateFunction;
-import org.apache.commons.math4.analysis.UnivariateFunction;
import org.apache.commons.math4.analysis.differentiation.DerivativeStructure;
import org.apache.commons.math4.analysis.differentiation.UnivariateDifferentiableFunction;
import org.apache.commons.math4.exception.NoDataException;
@@ -37,7 +35,7 @@ import org.apache.commons.math4.util.MathUtils;
* is used to evaluate the function.</p>
*
*/
-public class PolynomialFunction implements UnivariateDifferentiableFunction, DifferentiableUnivariateFunction, Serializable {
+public class PolynomialFunction implements UnivariateDifferentiableFunction, Serializable {
/**
* Serialization identifier
*/
@@ -87,8 +85,10 @@ public class PolynomialFunction implements UnivariateDifferentiableFunction, Dif
*
* @param x Argument for which the function value should be computed.
* @return the value of the polynomial at the given point.
- * @see UnivariateFunction#value(double)
+ * @see {@link org.apache.commons.math4.analysis.UnivariateFunction#value(double)
+ * UnivariateFunction#value(double)}
*/
+ @Override
public double value(double x) {
return evaluate(coefficients, x);
}
@@ -282,15 +282,6 @@ public class PolynomialFunction implements UnivariateDifferentiableFunction, Dif
}
/**
- * Returns the derivative as a {@link UnivariateFunction}.
- *
- * @return the derivative function.
- */
- public UnivariateFunction derivative() {
- return polynomialDerivative();
- }
-
- /**
* Returns a string representation of the polynomial.
*
* <p>The representation is user oriented. Terms are displayed lowest
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/polynomials/PolynomialFunctionLagrangeForm.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/polynomials/PolynomialFunctionLagrangeForm.java b/src/main/java/org/apache/commons/math4/analysis/polynomials/PolynomialFunctionLagrangeForm.java
index b499d44..226cd25 100644
--- a/src/main/java/org/apache/commons/math4/analysis/polynomials/PolynomialFunctionLagrangeForm.java
+++ b/src/main/java/org/apache/commons/math4/analysis/polynomials/PolynomialFunctionLagrangeForm.java
@@ -95,6 +95,7 @@ public class PolynomialFunctionLagrangeForm implements UnivariateFunction {
* @throws NumberIsTooSmallException if the size of {@code x} is less
* than 2.
*/
+ @Override
public double value(double z) {
return evaluateInternal(x, y, z);
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/polynomials/PolynomialFunctionNewtonForm.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/polynomials/PolynomialFunctionNewtonForm.java b/src/main/java/org/apache/commons/math4/analysis/polynomials/PolynomialFunctionNewtonForm.java
index f63359f..09fa2b0 100644
--- a/src/main/java/org/apache/commons/math4/analysis/polynomials/PolynomialFunctionNewtonForm.java
+++ b/src/main/java/org/apache/commons/math4/analysis/polynomials/PolynomialFunctionNewtonForm.java
@@ -92,6 +92,7 @@ public class PolynomialFunctionNewtonForm implements UnivariateDifferentiableFun
* @param z Point at which the function value is to be computed.
* @return the function value.
*/
+ @Override
public double value(double z) {
return evaluate(a, c, z);
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/polynomials/PolynomialSplineFunction.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/polynomials/PolynomialSplineFunction.java b/src/main/java/org/apache/commons/math4/analysis/polynomials/PolynomialSplineFunction.java
index 7e501c2..afa7eef 100644
--- a/src/main/java/org/apache/commons/math4/analysis/polynomials/PolynomialSplineFunction.java
+++ b/src/main/java/org/apache/commons/math4/analysis/polynomials/PolynomialSplineFunction.java
@@ -18,8 +18,6 @@ package org.apache.commons.math4.analysis.polynomials;
import java.util.Arrays;
-import org.apache.commons.math4.analysis.DifferentiableUnivariateFunction;
-import org.apache.commons.math4.analysis.UnivariateFunction;
import org.apache.commons.math4.analysis.differentiation.DerivativeStructure;
import org.apache.commons.math4.analysis.differentiation.UnivariateDifferentiableFunction;
import org.apache.commons.math4.exception.DimensionMismatchException;
@@ -63,7 +61,7 @@ import org.apache.commons.math4.util.MathArrays;
* <code>polynomials[j](x - knot[j])</code></li></ol></p>
*
*/
-public class PolynomialSplineFunction implements UnivariateDifferentiableFunction, DifferentiableUnivariateFunction {
+public class PolynomialSplineFunction implements UnivariateDifferentiableFunction {
/**
* Spline segment interval delimiters (knots).
* Size is n + 1 for n segments.
@@ -132,6 +130,7 @@ public class PolynomialSplineFunction implements UnivariateDifferentiableFunctio
* spline function (smaller than the smallest knot point or larger than the
* largest knot point).
*/
+ @Override
public double value(double v) {
if (v < knots[0] || v > knots[n]) {
throw new OutOfRangeException(v, knots[0], knots[n]);
@@ -154,15 +153,6 @@ public class PolynomialSplineFunction implements UnivariateDifferentiableFunctio
*
* @return the derivative function.
*/
- public UnivariateFunction derivative() {
- return polynomialSplineDerivative();
- }
-
- /**
- * Get the derivative of the polynomial spline function.
- *
- * @return the derivative function.
- */
public PolynomialSplineFunction polynomialSplineDerivative() {
PolynomialFunction derivativePolynomials[] = new PolynomialFunction[n];
for (int i = 0; i < n; i++) {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/solvers/AbstractDifferentiableUnivariateSolver.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/solvers/AbstractDifferentiableUnivariateSolver.java b/src/main/java/org/apache/commons/math4/analysis/solvers/AbstractDifferentiableUnivariateSolver.java
deleted file mode 100644
index 1fba119..0000000
--- a/src/main/java/org/apache/commons/math4/analysis/solvers/AbstractDifferentiableUnivariateSolver.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.commons.math4.analysis.solvers;
-
-import org.apache.commons.math4.analysis.DifferentiableUnivariateFunction;
-import org.apache.commons.math4.analysis.UnivariateFunction;
-import org.apache.commons.math4.exception.TooManyEvaluationsException;
-
-/**
- * Provide a default implementation for several functions useful to generic
- * solvers.
- *
- * @since 3.0
- * @deprecated as of 3.1, replaced by {@link AbstractUnivariateDifferentiableSolver}
- */
-@Deprecated
-public abstract class AbstractDifferentiableUnivariateSolver
- extends BaseAbstractUnivariateSolver<DifferentiableUnivariateFunction>
- implements DifferentiableUnivariateSolver {
- /** Derivative of the function to solve. */
- private UnivariateFunction functionDerivative;
-
- /**
- * Construct a solver with given absolute accuracy.
- *
- * @param absoluteAccuracy Maximum absolute error.
- */
- protected AbstractDifferentiableUnivariateSolver(final double absoluteAccuracy) {
- super(absoluteAccuracy);
- }
-
- /**
- * Construct a solver with given accuracies.
- *
- * @param relativeAccuracy Maximum relative error.
- * @param absoluteAccuracy Maximum absolute error.
- * @param functionValueAccuracy Maximum function value error.
- */
- protected AbstractDifferentiableUnivariateSolver(final double relativeAccuracy,
- final double absoluteAccuracy,
- final double functionValueAccuracy) {
- super(relativeAccuracy, absoluteAccuracy, functionValueAccuracy);
- }
-
- /**
- * Compute the objective function value.
- *
- * @param point Point at which the objective function must be evaluated.
- * @return the objective function value at specified point.
- * @throws TooManyEvaluationsException if the maximal number of evaluations is exceeded.
- */
- protected double computeDerivativeObjectiveValue(double point)
- throws TooManyEvaluationsException {
- incrementEvaluationCount();
- return functionDerivative.value(point);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void setup(int maxEval, DifferentiableUnivariateFunction f,
- double min, double max, double startValue) {
- super.setup(maxEval, f, min, max, startValue);
- functionDerivative = f.derivative();
- }
-}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/solvers/DifferentiableUnivariateSolver.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/solvers/DifferentiableUnivariateSolver.java b/src/main/java/org/apache/commons/math4/analysis/solvers/DifferentiableUnivariateSolver.java
deleted file mode 100644
index 09a1d20..0000000
--- a/src/main/java/org/apache/commons/math4/analysis/solvers/DifferentiableUnivariateSolver.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.math4.analysis.solvers;
-
-import org.apache.commons.math4.analysis.DifferentiableUnivariateFunction;
-
-
-/**
- * Interface for (univariate real) rootfinding algorithms.
- * Implementations will search for only one zero in the given interval.
- *
- * @deprecated as of 3.1, replaced by {@link UnivariateDifferentiableSolver}
- */
-@Deprecated
-public interface DifferentiableUnivariateSolver
- extends BaseUnivariateSolver<DifferentiableUnivariateFunction> {}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/test/java/org/apache/commons/math4/analysis/FunctionUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/analysis/FunctionUtilsTest.java b/src/test/java/org/apache/commons/math4/analysis/FunctionUtilsTest.java
index f1c649a..bfa4340 100644
--- a/src/test/java/org/apache/commons/math4/analysis/FunctionUtilsTest.java
+++ b/src/test/java/org/apache/commons/math4/analysis/FunctionUtilsTest.java
@@ -17,15 +17,7 @@
package org.apache.commons.math4.analysis;
-import org.apache.commons.math4.analysis.BivariateFunction;
-import org.apache.commons.math4.analysis.DifferentiableMultivariateFunction;
-import org.apache.commons.math4.analysis.DifferentiableUnivariateFunction;
-import org.apache.commons.math4.analysis.FunctionUtils;
-import org.apache.commons.math4.analysis.MultivariateFunction;
-import org.apache.commons.math4.analysis.MultivariateVectorFunction;
-import org.apache.commons.math4.analysis.UnivariateFunction;
import org.apache.commons.math4.analysis.differentiation.DerivativeStructure;
-import org.apache.commons.math4.analysis.differentiation.MultivariateDifferentiableFunction;
import org.apache.commons.math4.analysis.differentiation.UnivariateDifferentiableFunction;
import org.apache.commons.math4.analysis.function.Add;
import org.apache.commons.math4.analysis.function.Constant;
@@ -241,116 +233,4 @@ public class FunctionUtilsTest {
}
}
- @Test
- @Deprecated
- public void testToDifferentiableUnivariateFunction() {
-
- // Sin implements both UnivariateDifferentiableFunction and DifferentiableUnivariateFunction
- Sin sin = new Sin();
- DifferentiableUnivariateFunction converted = FunctionUtils.toDifferentiableUnivariateFunction(sin);
- for (double x = 0.1; x < 0.5; x += 0.01) {
- Assert.assertEquals(sin.value(x), converted.value(x), 1.0e-10);
- Assert.assertEquals(sin.derivative().value(x), converted.derivative().value(x), 1.0e-10);
- }
-
- }
-
- @Test
- @Deprecated
- public void testToUnivariateDifferential() {
-
- // Sin implements both UnivariateDifferentiableFunction and DifferentiableUnivariateFunction
- Sin sin = new Sin();
- UnivariateDifferentiableFunction converted = FunctionUtils.toUnivariateDifferential(sin);
- for (double x = 0.1; x < 0.5; x += 0.01) {
- DerivativeStructure t = new DerivativeStructure(2, 1, x, 1.0, 2.0);
- Assert.assertEquals(sin.value(t).getValue(), converted.value(t).getValue(), 1.0e-10);
- Assert.assertEquals(sin.value(t).getPartialDerivative(1, 0),
- converted.value(t).getPartialDerivative(1, 0),
- 1.0e-10);
- Assert.assertEquals(sin.value(t).getPartialDerivative(0, 1),
- converted.value(t).getPartialDerivative(0, 1),
- 1.0e-10);
- }
-
- }
-
- @Test
- @Deprecated
- public void testToDifferentiableMultivariateFunction() {
-
- MultivariateDifferentiableFunction hypot = new MultivariateDifferentiableFunction() {
-
- public double value(double[] point) {
- return FastMath.hypot(point[0], point[1]);
- }
-
- public DerivativeStructure value(DerivativeStructure[] point) {
- return DerivativeStructure.hypot(point[0], point[1]);
- }
- };
-
- DifferentiableMultivariateFunction converted = FunctionUtils.toDifferentiableMultivariateFunction(hypot);
- for (double x = 0.1; x < 0.5; x += 0.01) {
- for (double y = 0.1; y < 0.5; y += 0.01) {
- double[] point = new double[] { x, y };
- Assert.assertEquals(hypot.value(point), converted.value(point), 1.0e-10);
- Assert.assertEquals(x / hypot.value(point), converted.gradient().value(point)[0], 1.0e-10);
- Assert.assertEquals(y / hypot.value(point), converted.gradient().value(point)[1], 1.0e-10);
- }
- }
-
- }
-
- @Test
- @Deprecated
- public void testToMultivariateDifferentiableFunction() {
-
- DifferentiableMultivariateFunction hypot = new DifferentiableMultivariateFunction() {
-
- public double value(double[] point) {
- return FastMath.hypot(point[0], point[1]);
- }
-
- public MultivariateFunction partialDerivative(final int k) {
- return new MultivariateFunction() {
- public double value(double[] point) {
- return point[k] / FastMath.hypot(point[0], point[1]);
- }
- };
- }
-
- public MultivariateVectorFunction gradient() {
- return new MultivariateVectorFunction() {
- public double[] value(double[] point) {
- final double h = FastMath.hypot(point[0], point[1]);
- return new double[] { point[0] / h, point[1] / h };
- }
- };
- }
-
- };
-
- MultivariateDifferentiableFunction converted = FunctionUtils.toMultivariateDifferentiableFunction(hypot);
- for (double x = 0.1; x < 0.5; x += 0.01) {
- for (double y = 0.1; y < 0.5; y += 0.01) {
- DerivativeStructure[] t = new DerivativeStructure[] {
- new DerivativeStructure(3, 1, x, 1.0, 2.0, 3.0 ),
- new DerivativeStructure(3, 1, y, 4.0, 5.0, 6.0 )
- };
- DerivativeStructure h = DerivativeStructure.hypot(t[0], t[1]);
- Assert.assertEquals(h.getValue(), converted.value(t).getValue(), 1.0e-10);
- Assert.assertEquals(h.getPartialDerivative(1, 0, 0),
- converted.value(t).getPartialDerivative(1, 0, 0),
- 1.0e-10);
- Assert.assertEquals(h.getPartialDerivative(0, 1, 0),
- converted.value(t).getPartialDerivative(0, 1, 0),
- 1.0e-10);
- Assert.assertEquals(h.getPartialDerivative(0, 0, 1),
- converted.value(t).getPartialDerivative(0, 0, 1),
- 1.0e-10);
- }
- }
- }
-
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/test/java/org/apache/commons/math4/analysis/MonitoredFunction.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/analysis/MonitoredFunction.java b/src/test/java/org/apache/commons/math4/analysis/MonitoredFunction.java
index b2a9e9d..db4b17b 100644
--- a/src/test/java/org/apache/commons/math4/analysis/MonitoredFunction.java
+++ b/src/test/java/org/apache/commons/math4/analysis/MonitoredFunction.java
@@ -16,7 +16,6 @@
*/
package org.apache.commons.math4.analysis;
-import org.apache.commons.math4.analysis.UnivariateFunction;
/**
* Wrapper class for counting functions calls.
@@ -37,12 +36,13 @@ public class MonitoredFunction implements UnivariateFunction {
return callsCount;
}
+ @Override
public double value(double x) {
++callsCount;
return f.value(x);
}
private int callsCount;
- private UnivariateFunction f;
+ private final UnivariateFunction f;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/test/java/org/apache/commons/math4/analysis/QuinticFunction.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/analysis/QuinticFunction.java b/src/test/java/org/apache/commons/math4/analysis/QuinticFunction.java
index 5339436..e4d0c55 100644
--- a/src/test/java/org/apache/commons/math4/analysis/QuinticFunction.java
+++ b/src/test/java/org/apache/commons/math4/analysis/QuinticFunction.java
@@ -28,10 +28,12 @@ public class QuinticFunction implements UnivariateDifferentiableFunction {
/* Evaluate quintic.
* @see org.apache.commons.math4.UnivariateFunction#value(double)
*/
+ @Override
public double value(double x) {
return (x-1)*(x-0.5)*x*(x+0.5)*(x+1);
}
+ @Override
public DerivativeStructure value(DerivativeStructure t) {
return t.subtract(1).multiply(t.subtract(0.5)).multiply(t).multiply(t.add(0.5)).multiply(t.add(1));
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/test/java/org/apache/commons/math4/analysis/SumSincFunction.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/analysis/SumSincFunction.java b/src/test/java/org/apache/commons/math4/analysis/SumSincFunction.java
index cb44ab2..5fdd866 100644
--- a/src/test/java/org/apache/commons/math4/analysis/SumSincFunction.java
+++ b/src/test/java/org/apache/commons/math4/analysis/SumSincFunction.java
@@ -16,8 +16,6 @@
*/
package org.apache.commons.math4.analysis;
-import org.apache.commons.math4.analysis.MultivariateFunction;
-import org.apache.commons.math4.analysis.UnivariateFunction;
import org.apache.commons.math4.analysis.function.Sinc;
/**
@@ -43,6 +41,7 @@ public class SumSincFunction implements MultivariateFunction {
* @param point Argument.
* @return the value of this function at point {@code x}.
*/
+ @Override
public double value(double[] point) {
double sum = 0;
for (int i = 0, max = point.length; i < max; i++) {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/test/java/org/apache/commons/math4/analysis/XMinus5Function.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/analysis/XMinus5Function.java b/src/test/java/org/apache/commons/math4/analysis/XMinus5Function.java
index 61fdc48..7bbc94f 100644
--- a/src/test/java/org/apache/commons/math4/analysis/XMinus5Function.java
+++ b/src/test/java/org/apache/commons/math4/analysis/XMinus5Function.java
@@ -25,13 +25,15 @@ import org.apache.commons.math4.analysis.differentiation.UnivariateDifferentiabl
*/
public class XMinus5Function implements UnivariateDifferentiableFunction {
- /* Evaluate x - 5 fuction.
+ /* Evaluate x - 5 function.
* @see org.apache.commons.math4.UnivariateFunction#value(double)
*/
+ @Override
public double value(double x) {
return x - 5;
}
+ @Override
public DerivativeStructure value(DerivativeStructure t) {
return t.subtract(5);
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/test/java/org/apache/commons/math4/analysis/differentiation/FiniteDifferencesDifferentiatorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/analysis/differentiation/FiniteDifferencesDifferentiatorTest.java b/src/test/java/org/apache/commons/math4/analysis/differentiation/FiniteDifferencesDifferentiatorTest.java
index acea0d7..b949b24 100644
--- a/src/test/java/org/apache/commons/math4/analysis/differentiation/FiniteDifferencesDifferentiatorTest.java
+++ b/src/test/java/org/apache/commons/math4/analysis/differentiation/FiniteDifferencesDifferentiatorTest.java
@@ -22,12 +22,6 @@ import org.apache.commons.math4.analysis.QuinticFunction;
import org.apache.commons.math4.analysis.UnivariateFunction;
import org.apache.commons.math4.analysis.UnivariateMatrixFunction;
import org.apache.commons.math4.analysis.UnivariateVectorFunction;
-import org.apache.commons.math4.analysis.differentiation.DerivativeStructure;
-import org.apache.commons.math4.analysis.differentiation.FiniteDifferencesDifferentiator;
-import org.apache.commons.math4.analysis.differentiation.UnivariateDifferentiableFunction;
-import org.apache.commons.math4.analysis.differentiation.UnivariateDifferentiableMatrixFunction;
-import org.apache.commons.math4.analysis.differentiation.UnivariateDifferentiableVectorFunction;
-import org.apache.commons.math4.analysis.differentiation.UnivariateFunctionDifferentiator;
import org.apache.commons.math4.analysis.function.Gaussian;
import org.apache.commons.math4.analysis.function.Sin;
import org.apache.commons.math4.exception.MathInternalError;
@@ -69,6 +63,7 @@ public class FiniteDifferencesDifferentiatorTest {
new FiniteDifferencesDifferentiator(5, 0.01);
UnivariateDifferentiableFunction f =
differentiator.differentiate(new UnivariateFunction() {
+ @Override
public double value(double x) {
return 42.0;
}
@@ -87,6 +82,7 @@ public class FiniteDifferencesDifferentiatorTest {
new FiniteDifferencesDifferentiator(5, 0.01);
UnivariateDifferentiableFunction f =
differentiator.differentiate(new UnivariateFunction() {
+ @Override
public double value(double x) {
return 2 - 3 * x;
}
@@ -159,7 +155,7 @@ public class FiniteDifferencesDifferentiatorTest {
// the 1.0e-6 step size is far too small for finite differences in the quintic on this abscissa range for 7 points
// the errors are huge!
final double[] expectedBad = new double[] {
- 2.910e-11, 2.087e-5, 147.7, 3.820e7, 6.354e14, 6.548e19, 1.543e27
+ 2.910e-11, 2.087e-5, 147.7, 3.820e7, 6.354e14, 6.548e19, 1.543e27
};
for (int i = 0; i < maxErrorGood.length; ++i) {
@@ -173,6 +169,7 @@ public class FiniteDifferencesDifferentiatorTest {
public void testWrongOrder() {
UnivariateDifferentiableFunction f =
new FiniteDifferencesDifferentiator(3, 0.01).differentiate(new UnivariateFunction() {
+ @Override
public double value(double x) {
// this exception should not be thrown because wrong order
// should be detected before function call
@@ -186,6 +183,7 @@ public class FiniteDifferencesDifferentiatorTest {
public void testWrongOrderVector() {
UnivariateDifferentiableVectorFunction f =
new FiniteDifferencesDifferentiator(3, 0.01).differentiate(new UnivariateVectorFunction() {
+ @Override
public double[] value(double x) {
// this exception should not be thrown because wrong order
// should be detected before function call
@@ -199,6 +197,7 @@ public class FiniteDifferencesDifferentiatorTest {
public void testWrongOrderMatrix() {
UnivariateDifferentiableMatrixFunction f =
new FiniteDifferencesDifferentiator(3, 0.01).differentiate(new UnivariateMatrixFunction() {
+ @Override
public double[][] value(double x) {
// this exception should not be thrown because wrong order
// should be detected before function call
@@ -218,6 +217,7 @@ public class FiniteDifferencesDifferentiatorTest {
final double slope = 2.5;
UnivariateFunction f = new UnivariateFunction() {
+ @Override
public double value(double x) {
if (x < 0) {
throw new NumberIsTooSmallException(x, 0, true);
@@ -261,11 +261,11 @@ public class FiniteDifferencesDifferentiatorTest {
// here, we did set the bounds, so evaluations are done within domain
// using f(0.0), f(0.1), f(0.2)
Assert.assertEquals(slope, properlyBounded.value(tLow).getPartialDerivative(1), 1.0e-10);
-
+
// here, we did set the bounds, so evaluations are done within domain
// using f(0.8), f(0.9), f(1.0)
Assert.assertEquals(slope, properlyBounded.value(tHigh).getPartialDerivative(1), 1.0e-10);
-
+
}
@Test
@@ -274,6 +274,7 @@ public class FiniteDifferencesDifferentiatorTest {
UnivariateFunctionDifferentiator differentiator =
new FiniteDifferencesDifferentiator(9, 1.0 / 32, 0.0, Double.POSITIVE_INFINITY);
UnivariateDifferentiableFunction sqrt = differentiator.differentiate(new UnivariateFunction() {
+ @Override
public double value(double x) {
return FastMath.sqrt(x);
}
@@ -296,11 +297,12 @@ public class FiniteDifferencesDifferentiatorTest {
new FiniteDifferencesDifferentiator(7, 0.01);
UnivariateDifferentiableVectorFunction f =
differentiator.differentiate(new UnivariateVectorFunction() {
-
+
+ @Override
public double[] value(double x) {
return new double[] { FastMath.cos(x), FastMath.sin(x) };
}
-
+
});
for (double x = -10; x < 10; x += 0.1) {
@@ -331,14 +333,15 @@ public class FiniteDifferencesDifferentiatorTest {
new FiniteDifferencesDifferentiator(7, 0.01);
UnivariateDifferentiableMatrixFunction f =
differentiator.differentiate(new UnivariateMatrixFunction() {
-
+
+ @Override
public double[][] value(double x) {
return new double[][] {
{ FastMath.cos(x), FastMath.sin(x) },
{ FastMath.cosh(x), FastMath.sinh(x) }
};
}
-
+
});
for (double x = -1; x < 1; x += 0.02) {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/test/java/org/apache/commons/math4/analysis/differentiation/GradientFunctionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/analysis/differentiation/GradientFunctionTest.java b/src/test/java/org/apache/commons/math4/analysis/differentiation/GradientFunctionTest.java
index 69372e4..3d7b607 100644
--- a/src/test/java/org/apache/commons/math4/analysis/differentiation/GradientFunctionTest.java
+++ b/src/test/java/org/apache/commons/math4/analysis/differentiation/GradientFunctionTest.java
@@ -18,9 +18,6 @@
package org.apache.commons.math4.analysis.differentiation;
import org.apache.commons.math4.TestUtils;
-import org.apache.commons.math4.analysis.differentiation.DerivativeStructure;
-import org.apache.commons.math4.analysis.differentiation.GradientFunction;
-import org.apache.commons.math4.analysis.differentiation.MultivariateDifferentiableFunction;
import org.apache.commons.math4.exception.DimensionMismatchException;
import org.apache.commons.math4.exception.MathIllegalArgumentException;
import org.apache.commons.math4.util.FastMath;
@@ -59,7 +56,8 @@ public class GradientFunctionTest {
}
private static class EuclideanDistance implements MultivariateDifferentiableFunction {
-
+
+ @Override
public double value(double[] point) {
double d2 = 0;
for (double x : point) {
@@ -67,7 +65,8 @@ public class GradientFunctionTest {
}
return FastMath.sqrt(d2);
}
-
+
+ @Override
public DerivativeStructure value(DerivativeStructure[] point)
throws DimensionMismatchException, MathIllegalArgumentException {
DerivativeStructure d2 = point[0].getField().getZero();
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/test/java/org/apache/commons/math4/analysis/differentiation/JacobianFunctionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/analysis/differentiation/JacobianFunctionTest.java b/src/test/java/org/apache/commons/math4/analysis/differentiation/JacobianFunctionTest.java
index d3359c5..7395767 100644
--- a/src/test/java/org/apache/commons/math4/analysis/differentiation/JacobianFunctionTest.java
+++ b/src/test/java/org/apache/commons/math4/analysis/differentiation/JacobianFunctionTest.java
@@ -17,12 +17,9 @@
package org.apache.commons.math4.analysis.differentiation;
-import org.junit.Assert;
import org.apache.commons.math4.TestUtils;
-import org.apache.commons.math4.analysis.differentiation.DerivativeStructure;
-import org.apache.commons.math4.analysis.differentiation.JacobianFunction;
-import org.apache.commons.math4.analysis.differentiation.MultivariateDifferentiableVectorFunction;
import org.apache.commons.math4.util.FastMath;
+import org.junit.Assert;
import org.junit.Test;
@@ -56,7 +53,8 @@ public class JacobianFunctionTest {
public SphereMapping(final double radius) {
this.radius = radius;
}
-
+
+ @Override
public double[] value(double[] point) {
final double cLat = FastMath.cos(point[0]);
final double sLat = FastMath.sin(point[0]);
@@ -68,7 +66,8 @@ public class JacobianFunctionTest {
radius * sLat
};
}
-
+
+ @Override
public DerivativeStructure[] value(DerivativeStructure[] point) {
final DerivativeStructure cLat = point[0].cos();
final DerivativeStructure sLat = point[0].sin();
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/test/java/org/apache/commons/math4/analysis/differentiation/SparseGradientTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/analysis/differentiation/SparseGradientTest.java b/src/test/java/org/apache/commons/math4/analysis/differentiation/SparseGradientTest.java
index a82a163..fdfe87b 100644
--- a/src/test/java/org/apache/commons/math4/analysis/differentiation/SparseGradientTest.java
+++ b/src/test/java/org/apache/commons/math4/analysis/differentiation/SparseGradientTest.java
@@ -21,7 +21,6 @@ import java.util.List;
import org.apache.commons.math4.ExtendedFieldElementAbstractTest;
import org.apache.commons.math4.TestUtils;
-import org.apache.commons.math4.analysis.differentiation.SparseGradient;
import org.apache.commons.math4.analysis.polynomials.PolynomialFunction;
import org.apache.commons.math4.random.Well1024a;
import org.apache.commons.math4.util.FastMath;
@@ -309,7 +308,7 @@ public class SparseGradientTest extends ExtendedFieldElementAbstractTest<SparseG
Assert.assertEquals(dfdx, sg.getDerivative(0), FastMath.abs(epsilon * dfdx));
}
-
+
}
}
}
@@ -353,7 +352,7 @@ public class SparseGradientTest extends ExtendedFieldElementAbstractTest<SparseG
Assert.assertEquals(dfdz, f.getDerivative(2), FastMath.abs(epsilon * dfdz));
}
}
- }
+ }
}
@Test
@@ -952,7 +951,7 @@ public class SparseGradientTest extends ExtendedFieldElementAbstractTest<SparseG
for (int i = poly.degree(); i >= 0; --i) {
sgY1 = sgY1.multiply(sgX).add(poly.getCoefficients()[i]);
}
- SparseGradient sgY2 = sgX.compose(poly.value(x), poly.derivative().value(x));
+ SparseGradient sgY2 = sgX.compose(poly.value(x), poly.polynomialDerivative().value(x));
SparseGradient zero = sgY1.subtract(sgY2);
checkF0F1(zero, 0.0, 0.0);
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/test/java/org/apache/commons/math4/analysis/function/SincTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/analysis/function/SincTest.java b/src/test/java/org/apache/commons/math4/analysis/function/SincTest.java
index 864f76e..08b49c5 100644
--- a/src/test/java/org/apache/commons/math4/analysis/function/SincTest.java
+++ b/src/test/java/org/apache/commons/math4/analysis/function/SincTest.java
@@ -18,7 +18,6 @@ package org.apache.commons.math4.analysis.function;
import org.apache.commons.math4.analysis.UnivariateFunction;
import org.apache.commons.math4.analysis.differentiation.DerivativeStructure;
-import org.apache.commons.math4.analysis.function.Sinc;
import org.apache.commons.math4.dfp.Dfp;
import org.apache.commons.math4.dfp.DfpField;
import org.apache.commons.math4.dfp.DfpMath;
@@ -32,6 +31,7 @@ public class SincTest {
public void testShortcut() {
final Sinc s = new Sinc();
final UnivariateFunction f = new UnivariateFunction() {
+ @Override
public double value(double x) {
Dfp dfpX = new DfpField(25).newDfp(x);
return DfpMath.sin(dfpX).divide(dfpX).toDouble();
@@ -106,7 +106,8 @@ public class SincTest {
public void testDerivativeShortcut() {
final Sinc sinc = new Sinc();
final UnivariateFunction f = new UnivariateFunction() {
- public double value(double x) {
+ @Override
+ public double value(double x) {
Dfp dfpX = new DfpField(25).newDfp(x);
return DfpMath.cos(dfpX).subtract(DfpMath.sin(dfpX).divide(dfpX)).divide(dfpX).toDouble();
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/test/java/org/apache/commons/math4/analysis/function/SqrtTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/analysis/function/SqrtTest.java b/src/test/java/org/apache/commons/math4/analysis/function/SqrtTest.java
index 04d0769..825f8c7 100644
--- a/src/test/java/org/apache/commons/math4/analysis/function/SqrtTest.java
+++ b/src/test/java/org/apache/commons/math4/analysis/function/SqrtTest.java
@@ -19,20 +19,20 @@ package org.apache.commons.math4.analysis.function;
import org.apache.commons.math4.analysis.UnivariateFunction;
import org.apache.commons.math4.analysis.differentiation.DerivativeStructure;
import org.apache.commons.math4.analysis.differentiation.UnivariateDifferentiableFunction;
-import org.apache.commons.math4.analysis.function.Sqrt;
import org.apache.commons.math4.util.FastMath;
-import org.junit.Test;
import org.junit.Assert;
+import org.junit.Test;
public class SqrtTest {
@Test
public void testComparison() {
final Sqrt s = new Sqrt();
final UnivariateFunction f = new UnivariateFunction() {
- public double value(double x) {
- return FastMath.sqrt(x);
- }
- };
+ @Override
+ public double value(double x) {
+ return FastMath.sqrt(x);
+ }
+ };
for (double x = 1e-30; x < 1e10; x *= 2) {
final double fX = f.value(x);
@@ -45,7 +45,8 @@ public class SqrtTest {
public void testDerivativeComparison() {
final UnivariateDifferentiableFunction sPrime = new Sqrt();
final UnivariateFunction f = new UnivariateFunction() {
- public double value(double x) {
+ @Override
+ public double value(double x) {
return 1 / (2 * FastMath.sqrt(x));
}
};
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/test/java/org/apache/commons/math4/analysis/integration/IterativeLegendreGaussIntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/analysis/integration/IterativeLegendreGaussIntegratorTest.java b/src/test/java/org/apache/commons/math4/analysis/integration/IterativeLegendreGaussIntegratorTest.java
index e59eb94..2f2b467 100644
--- a/src/test/java/org/apache/commons/math4/analysis/integration/IterativeLegendreGaussIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/analysis/integration/IterativeLegendreGaussIntegratorTest.java
@@ -22,9 +22,6 @@ import org.apache.commons.math4.analysis.QuinticFunction;
import org.apache.commons.math4.analysis.UnivariateFunction;
import org.apache.commons.math4.analysis.function.Gaussian;
import org.apache.commons.math4.analysis.function.Sin;
-import org.apache.commons.math4.analysis.integration.BaseAbstractUnivariateIntegrator;
-import org.apache.commons.math4.analysis.integration.IterativeLegendreGaussIntegrator;
-import org.apache.commons.math4.analysis.integration.UnivariateIntegrator;
import org.apache.commons.math4.analysis.polynomials.PolynomialFunction;
import org.apache.commons.math4.exception.TooManyEvaluationsException;
import org.apache.commons.math4.util.FastMath;
@@ -128,6 +125,7 @@ public class IterativeLegendreGaussIntegratorTest {
public void testIssue464() {
final double value = 0.2;
UnivariateFunction f = new UnivariateFunction() {
+ @Override
public double value(double x) {
return (x >= 0 && x <= 5) ? value : 0.0;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/test/java/org/apache/commons/math4/analysis/interpolation/AkimaSplineInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/analysis/interpolation/AkimaSplineInterpolatorTest.java b/src/test/java/org/apache/commons/math4/analysis/interpolation/AkimaSplineInterpolatorTest.java
index 87fd5b9..15e4281 100644
--- a/src/test/java/org/apache/commons/math4/analysis/interpolation/AkimaSplineInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math4/analysis/interpolation/AkimaSplineInterpolatorTest.java
@@ -16,9 +16,10 @@
*/
package org.apache.commons.math4.analysis.interpolation;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import org.apache.commons.math4.analysis.UnivariateFunction;
-import org.apache.commons.math4.analysis.interpolation.AkimaSplineInterpolator;
-import org.apache.commons.math4.analysis.interpolation.UnivariateInterpolator;
import org.apache.commons.math4.distribution.UniformRealDistribution;
import org.apache.commons.math4.exception.DimensionMismatchException;
import org.apache.commons.math4.exception.NonMonotonicSequenceException;
@@ -31,8 +32,6 @@ import org.apache.commons.math4.util.Precision;
import org.junit.Assert;
import org.junit.Test;
-import static org.junit.Assert.*;
-
public class AkimaSplineInterpolatorTest
{
@@ -119,6 +118,7 @@ public class AkimaSplineInterpolatorTest
UnivariateFunction f = new UnivariateFunction()
{
+ @Override
public double value( double x )
{
return 2 * x - 5;
@@ -147,6 +147,7 @@ public class AkimaSplineInterpolatorTest
UnivariateFunction f = new UnivariateFunction()
{
+ @Override
public double value( double x )
{
return ( 3 * x * x ) - ( 5 * x ) + 7;
@@ -174,6 +175,7 @@ public class AkimaSplineInterpolatorTest
UnivariateFunction f = new UnivariateFunction()
{
+ @Override
public double value( double x )
{
return ( 3 * x * x * x ) - ( 0.5 * x * x ) + ( 1 * x ) - 1;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/test/java/org/apache/commons/math4/analysis/interpolation/BicubicInterpolatingFunctionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/analysis/interpolation/BicubicInterpolatingFunctionTest.java b/src/test/java/org/apache/commons/math4/analysis/interpolation/BicubicInterpolatingFunctionTest.java
index dd63a6c..0ec77aa 100644
--- a/src/test/java/org/apache/commons/math4/analysis/interpolation/BicubicInterpolatingFunctionTest.java
+++ b/src/test/java/org/apache/commons/math4/analysis/interpolation/BicubicInterpolatingFunctionTest.java
@@ -17,7 +17,6 @@
package org.apache.commons.math4.analysis.interpolation;
import org.apache.commons.math4.analysis.BivariateFunction;
-import org.apache.commons.math4.analysis.interpolation.BicubicInterpolatingFunction;
import org.apache.commons.math4.distribution.UniformRealDistribution;
import org.apache.commons.math4.exception.DimensionMismatchException;
import org.apache.commons.math4.exception.MathIllegalArgumentException;
@@ -28,7 +27,6 @@ import org.apache.commons.math4.util.FastMath;
import org.apache.commons.math4.util.Precision;
import org.junit.Assert;
import org.junit.Test;
-import org.junit.Ignore;
/**
* Test case for the bicubic function.
@@ -193,21 +191,25 @@ public final class BicubicInterpolatingFunctionTest {
// Function values
BivariateFunction f = new BivariateFunction() {
+ @Override
public double value(double x, double y) {
return 2 * x - 3 * y + 5;
}
};
BivariateFunction dfdx = new BivariateFunction() {
+ @Override
public double value(double x, double y) {
return 2;
}
};
BivariateFunction dfdy = new BivariateFunction() {
+ @Override
public double value(double x, double y) {
return -3;
}
};
BivariateFunction d2fdxdy = new BivariateFunction() {
+ @Override
public double value(double x, double y) {
return 0;
}
@@ -247,21 +249,25 @@ public final class BicubicInterpolatingFunctionTest {
// Function values
BivariateFunction f = new BivariateFunction() {
+ @Override
public double value(double x, double y) {
return 2 * x * x - 3 * y * y + 4 * x * y - 5;
}
};
BivariateFunction dfdx = new BivariateFunction() {
+ @Override
public double value(double x, double y) {
return 4 * (x + y);
}
};
BivariateFunction dfdy = new BivariateFunction() {
+ @Override
public double value(double x, double y) {
return 4 * x - 6 * y;
}
};
BivariateFunction d2fdxdy = new BivariateFunction() {
+ @Override
public double value(double x, double y) {
return 4;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/test/java/org/apache/commons/math4/analysis/interpolation/BicubicInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/analysis/interpolation/BicubicInterpolatorTest.java b/src/test/java/org/apache/commons/math4/analysis/interpolation/BicubicInterpolatorTest.java
index 9d94b03..6a2a9d7 100644
--- a/src/test/java/org/apache/commons/math4/analysis/interpolation/BicubicInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math4/analysis/interpolation/BicubicInterpolatorTest.java
@@ -17,9 +17,6 @@
package org.apache.commons.math4.analysis.interpolation;
import org.apache.commons.math4.analysis.BivariateFunction;
-import org.apache.commons.math4.analysis.interpolation.BicubicInterpolatingFunction;
-import org.apache.commons.math4.analysis.interpolation.BicubicInterpolator;
-import org.apache.commons.math4.analysis.interpolation.BivariateGridInterpolator;
import org.apache.commons.math4.distribution.UniformRealDistribution;
import org.apache.commons.math4.exception.DimensionMismatchException;
import org.apache.commons.math4.exception.MathIllegalArgumentException;
@@ -86,6 +83,7 @@ public final class BicubicInterpolatorTest {
@Test
public void testPlane() {
BivariateFunction f = new BivariateFunction() {
+ @Override
public double value(double x, double y) {
return 2 * x - 3 * y + 5;
}
@@ -105,6 +103,7 @@ public final class BicubicInterpolatorTest {
@Test
public void testParaboloid() {
BivariateFunction f = new BivariateFunction() {
+ @Override
public double value(double x, double y) {
return 2 * x * x - 3 * y * y + 4 * x * y - 5;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/test/java/org/apache/commons/math4/analysis/interpolation/MicrosphereInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/analysis/interpolation/MicrosphereInterpolatorTest.java b/src/test/java/org/apache/commons/math4/analysis/interpolation/MicrosphereInterpolatorTest.java
index 2626869..eab4faa 100644
--- a/src/test/java/org/apache/commons/math4/analysis/interpolation/MicrosphereInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math4/analysis/interpolation/MicrosphereInterpolatorTest.java
@@ -17,8 +17,6 @@
package org.apache.commons.math4.analysis.interpolation;
import org.apache.commons.math4.analysis.MultivariateFunction;
-import org.apache.commons.math4.analysis.interpolation.MicrosphereInterpolator;
-import org.apache.commons.math4.analysis.interpolation.MultivariateInterpolator;
import org.apache.commons.math4.util.FastMath;
import org.junit.Assert;
import org.junit.Test;
@@ -36,13 +34,14 @@ public final class MicrosphereInterpolatorTest {
@Test
public void testLinearFunction2D() {
MultivariateFunction f = new MultivariateFunction() {
- public double value(double[] x) {
- if (x.length != 2) {
- throw new IllegalArgumentException();
- }
- return 2 * x[0] - 3 * x[1] + 5;
+ @Override
+ public double value(double[] x) {
+ if (x.length != 2) {
+ throw new IllegalArgumentException();
}
- };
+ return 2 * x[0] - 3 * x[1] + 5;
+ }
+ };
MultivariateInterpolator interpolator = new MicrosphereInterpolator();
@@ -88,6 +87,7 @@ public final class MicrosphereInterpolatorTest {
@Test
public void testParaboloid2D() {
MultivariateFunction f = new MultivariateFunction() {
+ @Override
public double value(double[] x) {
if (x.length != 2) {
throw new IllegalArgumentException();
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/test/java/org/apache/commons/math4/analysis/interpolation/PiecewiseBicubicSplineInterpolatingFunctionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/analysis/interpolation/PiecewiseBicubicSplineInterpolatingFunctionTest.java b/src/test/java/org/apache/commons/math4/analysis/interpolation/PiecewiseBicubicSplineInterpolatingFunctionTest.java
index c39e644..c6701b3 100644
--- a/src/test/java/org/apache/commons/math4/analysis/interpolation/PiecewiseBicubicSplineInterpolatingFunctionTest.java
+++ b/src/test/java/org/apache/commons/math4/analysis/interpolation/PiecewiseBicubicSplineInterpolatingFunctionTest.java
@@ -17,7 +17,6 @@
package org.apache.commons.math4.analysis.interpolation;
import org.apache.commons.math4.analysis.BivariateFunction;
-import org.apache.commons.math4.analysis.interpolation.PiecewiseBicubicSplineInterpolatingFunction;
import org.apache.commons.math4.distribution.UniformRealDistribution;
import org.apache.commons.math4.exception.DimensionMismatchException;
import org.apache.commons.math4.exception.InsufficientDataException;
@@ -145,6 +144,7 @@ public final class PiecewiseBicubicSplineInterpolatingFunctionTest {
// Function values
BivariateFunction f = new BivariateFunction() {
+ @Override
public double value(double x, double y) {
return 2 * x - 3 * y + 5;
}
@@ -180,6 +180,7 @@ public final class PiecewiseBicubicSplineInterpolatingFunctionTest {
// Function values
BivariateFunction f = new BivariateFunction() {
+ @Override
public double value(double x, double y) {
return 2 * x * x - 3 * y * y + 4 * x * y - 5;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/test/java/org/apache/commons/math4/analysis/interpolation/PiecewiseBicubicSplineInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/analysis/interpolation/PiecewiseBicubicSplineInterpolatorTest.java b/src/test/java/org/apache/commons/math4/analysis/interpolation/PiecewiseBicubicSplineInterpolatorTest.java
index eee82f9..1645294 100644
--- a/src/test/java/org/apache/commons/math4/analysis/interpolation/PiecewiseBicubicSplineInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math4/analysis/interpolation/PiecewiseBicubicSplineInterpolatorTest.java
@@ -17,12 +17,9 @@
package org.apache.commons.math4.analysis.interpolation;
import org.apache.commons.math4.analysis.BivariateFunction;
-import org.apache.commons.math4.analysis.interpolation.BivariateGridInterpolator;
-import org.apache.commons.math4.analysis.interpolation.PiecewiseBicubicSplineInterpolator;
import org.apache.commons.math4.distribution.UniformRealDistribution;
import org.apache.commons.math4.exception.DimensionMismatchException;
import org.apache.commons.math4.exception.InsufficientDataException;
-import org.apache.commons.math4.exception.MathIllegalArgumentException;
import org.apache.commons.math4.exception.NonMonotonicSequenceException;
import org.apache.commons.math4.exception.NullArgumentException;
import org.apache.commons.math4.random.RandomGenerator;
@@ -43,7 +40,6 @@ public final class PiecewiseBicubicSplineInterpolatorTest {
double[] yval = new double[] { -4, -3, -1, 2.5, 3.5 };
double[][] zval = new double[xval.length][yval.length];
- @SuppressWarnings( "unused" )
BivariateGridInterpolator interpolator = new PiecewiseBicubicSplineInterpolator();
try {
@@ -145,6 +141,7 @@ public final class PiecewiseBicubicSplineInterpolatorTest {
// Function values
BivariateFunction f = new BivariateFunction() {
+ @Override
public double value( double x, double y ) {
return 2 * x - 3 * y + 5;
}
@@ -196,6 +193,7 @@ public final class PiecewiseBicubicSplineInterpolatorTest {
// Function values
BivariateFunction f = new BivariateFunction() {
+ @Override
public double value( double x, double y ) {
return 2 * x * x - 3 * y * y + 4 * x * y - 5;
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/test/java/org/apache/commons/math4/analysis/interpolation/SplineInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/analysis/interpolation/SplineInterpolatorTest.java b/src/test/java/org/apache/commons/math4/analysis/interpolation/SplineInterpolatorTest.java
index 46d3455..02c7815 100644
--- a/src/test/java/org/apache/commons/math4/analysis/interpolation/SplineInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math4/analysis/interpolation/SplineInterpolatorTest.java
@@ -18,8 +18,6 @@ package org.apache.commons.math4.analysis.interpolation;
import org.apache.commons.math4.TestUtils;
import org.apache.commons.math4.analysis.UnivariateFunction;
-import org.apache.commons.math4.analysis.interpolation.SplineInterpolator;
-import org.apache.commons.math4.analysis.interpolation.UnivariateInterpolator;
import org.apache.commons.math4.analysis.polynomials.PolynomialFunction;
import org.apache.commons.math4.analysis.polynomials.PolynomialSplineFunction;
import org.apache.commons.math4.exception.DimensionMismatchException;
@@ -215,10 +213,10 @@ public class SplineInterpolatorTest {
for (int i = 1; i < x.length - 2; i++) {
// evaluate polynomials and derivatives at x[i + 1]
Assert.assertEquals(polynomials[i].value(x[i +1] - x[i]), polynomials[i + 1].value(0), 0.1);
- Assert.assertEquals(polynomials[i].derivative().value(x[i +1] - x[i]),
- polynomials[i + 1].derivative().value(0), 0.5);
- Assert.assertEquals(polynomials[i].polynomialDerivative().derivative().value(x[i +1] - x[i]),
- polynomials[i + 1].polynomialDerivative().derivative().value(0), 0.5);
+ Assert.assertEquals(polynomials[i].polynomialDerivative().value(x[i +1] - x[i]),
+ polynomials[i + 1].polynomialDerivative().value(0), 0.5);
+ Assert.assertEquals(polynomials[i].polynomialDerivative().polynomialDerivative().value(x[i +1] - x[i]),
+ polynomials[i + 1].polynomialDerivative().polynomialDerivative().value(0), 0.5);
}
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/test/java/org/apache/commons/math4/analysis/interpolation/TricubicInterpolatingFunctionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/analysis/interpolation/TricubicInterpolatingFunctionTest.java b/src/test/java/org/apache/commons/math4/analysis/interpolation/TricubicInterpolatingFunctionTest.java
index bf3da2a..44f06a0 100644
--- a/src/test/java/org/apache/commons/math4/analysis/interpolation/TricubicInterpolatingFunctionTest.java
+++ b/src/test/java/org/apache/commons/math4/analysis/interpolation/TricubicInterpolatingFunctionTest.java
@@ -17,7 +17,6 @@
package org.apache.commons.math4.analysis.interpolation;
import org.apache.commons.math4.analysis.TrivariateFunction;
-import org.apache.commons.math4.analysis.interpolation.TricubicInterpolatingFunction;
import org.apache.commons.math4.distribution.UniformRealDistribution;
import org.apache.commons.math4.exception.DimensionMismatchException;
import org.apache.commons.math4.exception.MathIllegalArgumentException;
@@ -30,7 +29,6 @@ import org.junit.Test;
/**
* Test case for the bicubic function.
- *
*/
public final class TricubicInterpolatingFunctionTest {
/**
@@ -47,7 +45,7 @@ public final class TricubicInterpolatingFunctionTest {
TrivariateFunction tcf = new TricubicInterpolatingFunction(xval, yval, zval,
fval, fval, fval, fval,
fval, fval, fval, fval);
-
+
double[] wxval = new double[] {3, 2, 5, 6.5};
try {
tcf = new TricubicInterpolatingFunction(wxval, yval, zval,
@@ -420,30 +418,35 @@ public final class TricubicInterpolatingFunctionTest {
@Test
public void testPlane() {
final TrivariateFunction f = new TrivariateFunction() {
+ @Override
public double value(double x, double y, double z) {
return 2 * x - 3 * y - 4 * z + 5;
}
};
final TrivariateFunction dfdx = new TrivariateFunction() {
+ @Override
public double value(double x, double y, double z) {
return 2;
}
};
final TrivariateFunction dfdy = new TrivariateFunction() {
+ @Override
public double value(double x, double y, double z) {
return -3;
}
};
final TrivariateFunction dfdz = new TrivariateFunction() {
+ @Override
public double value(double x, double y, double z) {
return -4;
}
};
final TrivariateFunction zero = new TrivariateFunction() {
+ @Override
public double value(double x, double y, double z) {
return 0;
}
@@ -477,48 +480,56 @@ public final class TricubicInterpolatingFunctionTest {
@Test
public void testQuadric() {
final TrivariateFunction f = new TrivariateFunction() {
+ @Override
public double value(double x, double y, double z) {
return 2 * x * x - 3 * y * y - 4 * z * z + 5 * x * y + 6 * x * z - 2 * y * z + 3;
}
};
final TrivariateFunction dfdx = new TrivariateFunction() {
+ @Override
public double value(double x, double y, double z) {
return 4 * x + 5 * y + 6 * z;
}
};
final TrivariateFunction dfdy = new TrivariateFunction() {
+ @Override
public double value(double x, double y, double z) {
return -6 * y + 5 * x - 2 * z;
}
};
final TrivariateFunction dfdz = new TrivariateFunction() {
+ @Override
public double value(double x, double y, double z) {
return -8 * z + 6 * x - 2 * y;
}
};
final TrivariateFunction d2fdxdy = new TrivariateFunction() {
+ @Override
public double value(double x, double y, double z) {
return 5;
}
};
final TrivariateFunction d2fdxdz = new TrivariateFunction() {
+ @Override
public double value(double x, double y, double z) {
return 6;
}
};
final TrivariateFunction d2fdydz = new TrivariateFunction() {
+ @Override
public double value(double x, double y, double z) {
return -2;
}
};
final TrivariateFunction d3fdxdydz = new TrivariateFunction() {
+ @Override
public double value(double x, double y, double z) {
return 0;
}
@@ -558,54 +569,63 @@ public final class TricubicInterpolatingFunctionTest {
final double ky = 1;
final TrivariateFunction arg = new TrivariateFunction() {
+ @Override
public double value(double x, double y, double z) {
return omega * z - kx * x - ky * y;
}
};
final TrivariateFunction f = new TrivariateFunction() {
+ @Override
public double value(double x, double y, double z) {
return a * FastMath.cos(arg.value(x, y, z));
}
};
final TrivariateFunction dfdx = new TrivariateFunction() {
+ @Override
public double value(double x, double y, double z) {
return kx * a * FastMath.sin(arg.value(x, y, z));
}
};
final TrivariateFunction dfdy = new TrivariateFunction() {
+ @Override
public double value(double x, double y, double z) {
return ky * a * FastMath.sin(arg.value(x, y, z));
}
};
final TrivariateFunction dfdz = new TrivariateFunction() {
+ @Override
public double value(double x, double y, double z) {
return -omega * a * FastMath.sin(arg.value(x, y, z));
}
};
final TrivariateFunction d2fdxdy = new TrivariateFunction() {
+ @Override
public double value(double x, double y, double z) {
return -ky * kx * a * FastMath.cos(arg.value(x, y, z));
}
};
final TrivariateFunction d2fdxdz = new TrivariateFunction() {
+ @Override
public double value(double x, double y, double z) {
return omega * kx * a * FastMath.cos(arg.value(x, y, z));
}
};
final TrivariateFunction d2fdydz = new TrivariateFunction() {
+ @Override
public double value(double x, double y, double z) {
return omega * ky * a * FastMath.cos(arg.value(x, y, z));
}
};
final TrivariateFunction d3fdxdydz = new TrivariateFunction() {
+ @Override
public double value(double x, double y, double z) {
return omega * ky * kx * a * FastMath.sin(arg.value(x, y, z));
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/test/java/org/apache/commons/math4/analysis/interpolation/TricubicInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/analysis/interpolation/TricubicInterpolatorTest.java b/src/test/java/org/apache/commons/math4/analysis/interpolation/TricubicInterpolatorTest.java
index d975c18..a02e7d5 100644
--- a/src/test/java/org/apache/commons/math4/analysis/interpolation/TricubicInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math4/analysis/interpolation/TricubicInterpolatorTest.java
@@ -17,8 +17,6 @@
package org.apache.commons.math4.analysis.interpolation;
import org.apache.commons.math4.analysis.TrivariateFunction;
-import org.apache.commons.math4.analysis.interpolation.TricubicInterpolatingFunction;
-import org.apache.commons.math4.analysis.interpolation.TricubicInterpolator;
import org.apache.commons.math4.exception.DimensionMismatchException;
import org.apache.commons.math4.exception.MathIllegalArgumentException;
import org.apache.commons.math4.util.FastMath;
@@ -127,6 +125,7 @@ public final class TricubicInterpolatorTest {
// Function values
TrivariateFunction f = new TrivariateFunction() {
+ @Override
public double value(double x, double y, double z) {
return 2 * x - 3 * y - 4 * z + 5;
}
@@ -186,6 +185,7 @@ public final class TricubicInterpolatorTest {
// Function values
TrivariateFunction f = new TrivariateFunction() {
+ @Override
public double value(double x, double y, double z) {
return a * FastMath.cos(omega * z - kx * x - ky * y);
}