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:35 UTC
[3/3] [math] Remove deprecated interfaces/classes/methods in analysis
package.
Remove deprecated interfaces/classes/methods in analysis package.
Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/306fa746
Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/306fa746
Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/306fa746
Branch: refs/heads/master
Commit: 306fa74602973d8e6a5d542d43b13c9630408288
Parents: 8e4e522
Author: Thomas Neidhart <th...@gmail.com>
Authored: Sat Apr 11 15:47:35 2015 +0200
Committer: Thomas Neidhart <th...@gmail.com>
Committed: Sat Apr 11 15:47:35 2015 +0200
----------------------------------------------------------------------
.../DifferentiableMultivariateFunction.java | 52 --
...ifferentiableMultivariateVectorFunction.java | 36 --
.../DifferentiableUnivariateFunction.java | 35 --
.../DifferentiableUnivariateMatrixFunction.java | 36 --
.../DifferentiableUnivariateVectorFunction.java | 36 --
.../commons/math4/analysis/FunctionUtils.java | 492 -------------------
.../differentiation/DerivativeStructure.java | 1 +
.../differentiation/SparseGradient.java | 1 +
.../commons/math4/analysis/function/Acos.java | 14 +-
.../commons/math4/analysis/function/Acosh.java | 14 +-
.../commons/math4/analysis/function/Asin.java | 14 +-
.../commons/math4/analysis/function/Asinh.java | 14 +-
.../commons/math4/analysis/function/Atan.java | 14 +-
.../commons/math4/analysis/function/Atanh.java | 14 +-
.../commons/math4/analysis/function/Cbrt.java | 14 +-
.../math4/analysis/function/Constant.java | 12 +-
.../commons/math4/analysis/function/Cos.java | 14 +-
.../commons/math4/analysis/function/Cosh.java | 12 +-
.../commons/math4/analysis/function/Exp.java | 14 +-
.../commons/math4/analysis/function/Expm1.java | 14 +-
.../math4/analysis/function/Gaussian.java | 16 +-
.../analysis/function/HarmonicOscillator.java | 16 +-
.../math4/analysis/function/Identity.java | 12 +-
.../math4/analysis/function/Inverse.java | 14 +-
.../commons/math4/analysis/function/Log.java | 14 +-
.../commons/math4/analysis/function/Log10.java | 14 +-
.../commons/math4/analysis/function/Log1p.java | 14 +-
.../math4/analysis/function/Logistic.java | 16 +-
.../commons/math4/analysis/function/Logit.java | 16 +-
.../commons/math4/analysis/function/Minus.java | 12 +-
.../commons/math4/analysis/function/Power.java | 14 +-
.../math4/analysis/function/Sigmoid.java | 16 +-
.../commons/math4/analysis/function/Sin.java | 12 +-
.../commons/math4/analysis/function/Sinc.java | 14 +-
.../commons/math4/analysis/function/Sinh.java | 12 +-
.../commons/math4/analysis/function/Sqrt.java | 14 +-
.../commons/math4/analysis/function/Tan.java | 14 +-
.../commons/math4/analysis/function/Tanh.java | 14 +-
.../IterativeLegendreGaussIntegrator.java | 1 +
.../interpolation/AkimaSplineInterpolator.java | 1 +
.../DividedDifferenceInterpolator.java | 1 +
.../interpolation/HermiteInterpolator.java | 5 +-
.../interpolation/LinearInterpolator.java | 1 +
.../interpolation/LoessInterpolator.java | 1 +
.../MicrosphereInterpolatingFunction.java | 1 +
.../interpolation/NevilleInterpolator.java | 1 +
.../interpolation/SplineInterpolator.java | 1 +
.../TricubicInterpolatingFunction.java | 4 +-
.../UnivariatePeriodicInterpolator.java | 1 +
.../polynomials/PolynomialFunction.java | 17 +-
.../PolynomialFunctionLagrangeForm.java | 1 +
.../PolynomialFunctionNewtonForm.java | 1 +
.../polynomials/PolynomialSplineFunction.java | 14 +-
.../AbstractDifferentiableUnivariateSolver.java | 82 ----
.../solvers/DifferentiableUnivariateSolver.java | 30 --
.../math4/analysis/FunctionUtilsTest.java | 120 -----
.../math4/analysis/MonitoredFunction.java | 4 +-
.../commons/math4/analysis/QuinticFunction.java | 2 +
.../commons/math4/analysis/SumSincFunction.java | 3 +-
.../commons/math4/analysis/XMinus5Function.java | 4 +-
.../FiniteDifferencesDifferentiatorTest.java | 29 +-
.../differentiation/GradientFunctionTest.java | 9 +-
.../differentiation/JacobianFunctionTest.java | 11 +-
.../differentiation/SparseGradientTest.java | 7 +-
.../math4/analysis/function/SincTest.java | 5 +-
.../math4/analysis/function/SqrtTest.java | 15 +-
.../IterativeLegendreGaussIntegratorTest.java | 4 +-
.../AkimaSplineInterpolatorTest.java | 10 +-
.../BicubicInterpolatingFunctionTest.java | 10 +-
.../interpolation/BicubicInterpolatorTest.java | 5 +-
.../MicrosphereInterpolatorTest.java | 16 +-
...eBicubicSplineInterpolatingFunctionTest.java | 3 +-
.../PiecewiseBicubicSplineInterpolatorTest.java | 6 +-
.../interpolation/SplineInterpolatorTest.java | 10 +-
.../TricubicInterpolatingFunctionTest.java | 26 +-
.../interpolation/TricubicInterpolatorTest.java | 4 +-
.../polynomials/PolynomialFunctionTest.java | 37 +-
.../PolynomialSplineFunctionTest.java | 6 +-
.../polynomials/PolynomialsUtilsTest.java | 10 +-
79 files changed, 196 insertions(+), 1430 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/DifferentiableMultivariateFunction.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/DifferentiableMultivariateFunction.java b/src/main/java/org/apache/commons/math4/analysis/DifferentiableMultivariateFunction.java
deleted file mode 100644
index 8ca1ab9..0000000
--- a/src/main/java/org/apache/commons/math4/analysis/DifferentiableMultivariateFunction.java
+++ /dev/null
@@ -1,52 +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;
-
-/**
- * Extension of {@link MultivariateFunction} representing a differentiable
- * multivariate real function.
- * @since 2.0
- * @deprecated as of 3.1 replaced by {@link org.apache.commons.math4.analysis.differentiation.MultivariateDifferentiableFunction}
- */
-@Deprecated
-public interface DifferentiableMultivariateFunction extends MultivariateFunction {
-
- /**
- * Returns the partial derivative of the function with respect to a point coordinate.
- * <p>
- * The partial derivative is defined with respect to point coordinate
- * x<sub>k</sub>. If the partial derivatives with respect to all coordinates are
- * needed, it may be more efficient to use the {@link #gradient()} method which will
- * compute them all at once.
- * </p>
- * @param k index of the coordinate with respect to which the partial
- * derivative is computed
- * @return the partial derivative function with respect to k<sup>th</sup> point coordinate
- */
- MultivariateFunction partialDerivative(int k);
-
- /**
- * Returns the gradient function.
- * <p>If only one partial derivative with respect to a specific coordinate is
- * needed, it may be more efficient to use the {@link #partialDerivative(int)} method
- * which will compute only the specified component.</p>
- * @return the gradient function
- */
- MultivariateVectorFunction gradient();
-
-}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/DifferentiableMultivariateVectorFunction.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/DifferentiableMultivariateVectorFunction.java b/src/main/java/org/apache/commons/math4/analysis/DifferentiableMultivariateVectorFunction.java
deleted file mode 100644
index 7cc7688..0000000
--- a/src/main/java/org/apache/commons/math4/analysis/DifferentiableMultivariateVectorFunction.java
+++ /dev/null
@@ -1,36 +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;
-
-/**
- * Extension of {@link MultivariateVectorFunction} representing a differentiable
- * multivariate vectorial function.
- * @since 2.0
- * @deprecated as of 3.1 replaced by {@link org.apache.commons.math4.analysis.differentiation.MultivariateDifferentiableVectorFunction}
- */
-@Deprecated
-public interface DifferentiableMultivariateVectorFunction
- extends MultivariateVectorFunction {
-
- /**
- * Returns the jacobian function.
- * @return the jacobian function
- */
- MultivariateMatrixFunction jacobian();
-
-}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/DifferentiableUnivariateFunction.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/DifferentiableUnivariateFunction.java b/src/main/java/org/apache/commons/math4/analysis/DifferentiableUnivariateFunction.java
deleted file mode 100644
index a59f23f..0000000
--- a/src/main/java/org/apache/commons/math4/analysis/DifferentiableUnivariateFunction.java
+++ /dev/null
@@ -1,35 +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;
-
-/**
- * Extension of {@link UnivariateFunction} representing a differentiable univariate real function.
- *
- * @deprecated as of 3.1 replaced by {@link org.apache.commons.math4.analysis.differentiation.UnivariateDifferentiableFunction}
- */
-@Deprecated
-public interface DifferentiableUnivariateFunction
- extends UnivariateFunction {
-
- /**
- * Returns the derivative of the function
- *
- * @return the derivative function
- */
- UnivariateFunction derivative();
-
-}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/DifferentiableUnivariateMatrixFunction.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/DifferentiableUnivariateMatrixFunction.java b/src/main/java/org/apache/commons/math4/analysis/DifferentiableUnivariateMatrixFunction.java
deleted file mode 100644
index 7a6c688..0000000
--- a/src/main/java/org/apache/commons/math4/analysis/DifferentiableUnivariateMatrixFunction.java
+++ /dev/null
@@ -1,36 +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;
-
-/**
- * Extension of {@link UnivariateMatrixFunction} representing a differentiable univariate matrix function.
- *
- * @since 2.0
- * @deprecated as of 3.1 replaced by {@link org.apache.commons.math4.analysis.differentiation.UnivariateDifferentiableMatrixFunction}
- */
-@Deprecated
-public interface DifferentiableUnivariateMatrixFunction
- extends UnivariateMatrixFunction {
-
- /**
- * Returns the derivative of the function
- *
- * @return the derivative function
- */
- UnivariateMatrixFunction derivative();
-
-}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/DifferentiableUnivariateVectorFunction.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/DifferentiableUnivariateVectorFunction.java b/src/main/java/org/apache/commons/math4/analysis/DifferentiableUnivariateVectorFunction.java
deleted file mode 100644
index 9b9a371..0000000
--- a/src/main/java/org/apache/commons/math4/analysis/DifferentiableUnivariateVectorFunction.java
+++ /dev/null
@@ -1,36 +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;
-
-/**
- * Extension of {@link UnivariateVectorFunction} representing a differentiable univariate vectorial function.
- *
- * @since 2.0
- * @deprecated as of 3.1 replaced by {@link org.apache.commons.math4.analysis.differentiation.UnivariateDifferentiableVectorFunction}
- */
-@Deprecated
-public interface DifferentiableUnivariateVectorFunction
- extends UnivariateVectorFunction {
-
- /**
- * Returns the derivative of the function
- *
- * @return the derivative function
- */
- UnivariateVectorFunction derivative();
-
-}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/FunctionUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/FunctionUtils.java b/src/main/java/org/apache/commons/math4/analysis/FunctionUtils.java
index 77555d3..dca2e8a 100644
--- a/src/main/java/org/apache/commons/math4/analysis/FunctionUtils.java
+++ b/src/main/java/org/apache/commons/math4/analysis/FunctionUtils.java
@@ -18,8 +18,6 @@
package org.apache.commons.math4.analysis;
import org.apache.commons.math4.analysis.differentiation.DerivativeStructure;
-import org.apache.commons.math4.analysis.differentiation.MultivariateDifferentiableFunction;
-import org.apache.commons.math4.analysis.differentiation.MultivariateDifferentiableVectorFunction;
import org.apache.commons.math4.analysis.differentiation.UnivariateDifferentiableFunction;
import org.apache.commons.math4.analysis.function.Identity;
import org.apache.commons.math4.exception.DimensionMismatchException;
@@ -98,49 +96,6 @@ public class FunctionUtils {
}
/**
- * Composes functions.
- * <br/>
- * The functions in the argument list are composed sequentially, in the
- * given order. For example, compose(f1,f2,f3) acts like f1(f2(f3(x))).
- *
- * @param f List of functions.
- * @return the composite function.
- * @deprecated as of 3.1 replaced by {@link #compose(UnivariateDifferentiableFunction...)}
- */
- @Deprecated
- public static DifferentiableUnivariateFunction compose(final DifferentiableUnivariateFunction ... f) {
- return new DifferentiableUnivariateFunction() {
- /** {@inheritDoc} */
- @Override
- public double value(double x) {
- double r = x;
- for (int i = f.length - 1; i >= 0; i--) {
- r = f[i].value(r);
- }
- return r;
- }
-
- /** {@inheritDoc} */
- @Override
- public UnivariateFunction derivative() {
- return new UnivariateFunction() {
- /** {@inheritDoc} */
- @Override
- public double value(double x) {
- double p = 1;
- double r = x;
- for (int i = f.length - 1; i >= 0; i--) {
- p *= f[i].derivative().value(r);
- r = f[i].value(r);
- }
- return p;
- }
- };
- }
- };
- }
-
- /**
* Adds functions.
*
* @param f List of functions.
@@ -197,44 +152,6 @@ public class FunctionUtils {
}
/**
- * Adds functions.
- *
- * @param f List of functions.
- * @return a function that computes the sum of the functions.
- * @deprecated as of 3.1 replaced by {@link #add(UnivariateDifferentiableFunction...)}
- */
- @Deprecated
- public static DifferentiableUnivariateFunction add(final DifferentiableUnivariateFunction ... f) {
- return new DifferentiableUnivariateFunction() {
- /** {@inheritDoc} */
- @Override
- public double value(double x) {
- double r = f[0].value(x);
- for (int i = 1; i < f.length; i++) {
- r += f[i].value(x);
- }
- return r;
- }
-
- /** {@inheritDoc} */
- @Override
- public UnivariateFunction derivative() {
- return new UnivariateFunction() {
- /** {@inheritDoc} */
- @Override
- public double value(double x) {
- double r = f[0].derivative().value(x);
- for (int i = 1; i < f.length; i++) {
- r += f[i].derivative().value(x);
- }
- return r;
- }
- };
- }
- };
- }
-
- /**
* Multiplies functions.
*
* @param f List of functions.
@@ -288,50 +205,6 @@ public class FunctionUtils {
}
/**
- * Multiplies functions.
- *
- * @param f List of functions.
- * @return a function that computes the product of the functions.
- * @deprecated as of 3.1 replaced by {@link #multiply(UnivariateDifferentiableFunction...)}
- */
- @Deprecated
- public static DifferentiableUnivariateFunction multiply(final DifferentiableUnivariateFunction ... f) {
- return new DifferentiableUnivariateFunction() {
- /** {@inheritDoc} */
- @Override
- public double value(double x) {
- double r = f[0].value(x);
- for (int i = 1; i < f.length; i++) {
- r *= f[i].value(x);
- }
- return r;
- }
-
- /** {@inheritDoc} */
- @Override
- public UnivariateFunction derivative() {
- return new UnivariateFunction() {
- /** {@inheritDoc} */
- @Override
- public double value(double x) {
- double sum = 0;
- for (int i = 0; i < f.length; i++) {
- double prod = f[i].derivative().value(x);
- for (int j = 0; j < f.length; j++) {
- if (i != j) {
- prod *= f[j].value(x);
- }
- }
- sum += prod;
- }
- return sum;
- }
- };
- }
- };
- }
-
- /**
* Returns the univariate function <br/>
* {@code h(x) = combiner(f(x), g(x))}.
*
@@ -464,369 +337,4 @@ public class FunctionUtils {
return s;
}
- /** Convert a {@link UnivariateDifferentiableFunction} into a {@link DifferentiableUnivariateFunction}.
- * @param f function to convert
- * @return converted function
- * @deprecated this conversion method is temporary in version 3.1, as the {@link
- * DifferentiableUnivariateFunction} interface itself is deprecated
- */
- @Deprecated
- public static DifferentiableUnivariateFunction toDifferentiableUnivariateFunction(final UnivariateDifferentiableFunction f) {
- return new DifferentiableUnivariateFunction() {
-
- /** {@inheritDoc} */
- @Override
- public double value(final double x) {
- return f.value(x);
- }
-
- /** {@inheritDoc} */
- @Override
- public UnivariateFunction derivative() {
- return new UnivariateFunction() {
- /** {@inheritDoc} */
- @Override
- public double value(final double x) {
- return f.value(new DerivativeStructure(1, 1, 0, x)).getPartialDerivative(1);
- }
- };
- }
-
- };
- }
-
- /** Convert a {@link DifferentiableUnivariateFunction} into a {@link UnivariateDifferentiableFunction}.
- * <p>
- * Note that the converted function is able to handle {@link DerivativeStructure} up to order one.
- * If the function is called with higher order, a {@link NumberIsTooLargeException} will be thrown.
- * </p>
- * @param f function to convert
- * @return converted function
- * @deprecated this conversion method is temporary in version 3.1, as the {@link
- * DifferentiableUnivariateFunction} interface itself is deprecated
- */
- @Deprecated
- public static UnivariateDifferentiableFunction toUnivariateDifferential(final DifferentiableUnivariateFunction f) {
- return new UnivariateDifferentiableFunction() {
-
- /** {@inheritDoc} */
- @Override
- public double value(final double x) {
- return f.value(x);
- }
-
- /** {@inheritDoc}
- * @exception NumberIsTooLargeException if derivation order is greater than 1
- */
- @Override
- public DerivativeStructure value(final DerivativeStructure t)
- throws NumberIsTooLargeException {
- switch (t.getOrder()) {
- case 0 :
- return new DerivativeStructure(t.getFreeParameters(), 0, f.value(t.getValue()));
- case 1 : {
- final int parameters = t.getFreeParameters();
- final double[] derivatives = new double[parameters + 1];
- derivatives[0] = f.value(t.getValue());
- final double fPrime = f.derivative().value(t.getValue());
- int[] orders = new int[parameters];
- for (int i = 0; i < parameters; ++i) {
- orders[i] = 1;
- derivatives[i + 1] = fPrime * t.getPartialDerivative(orders);
- orders[i] = 0;
- }
- return new DerivativeStructure(parameters, 1, derivatives);
- }
- default :
- throw new NumberIsTooLargeException(t.getOrder(), 1, true);
- }
- }
-
- };
- }
-
- /** Convert a {@link MultivariateDifferentiableFunction} into a {@link DifferentiableMultivariateFunction}.
- * @param f function to convert
- * @return converted function
- * @deprecated this conversion method is temporary in version 3.1, as the {@link
- * DifferentiableMultivariateFunction} interface itself is deprecated
- */
- @Deprecated
- public static DifferentiableMultivariateFunction toDifferentiableMultivariateFunction(final MultivariateDifferentiableFunction f) {
- return new DifferentiableMultivariateFunction() {
-
- /** {@inheritDoc} */
- @Override
- public double value(final double[] x) {
- return f.value(x);
- }
-
- /** {@inheritDoc} */
- @Override
- public MultivariateFunction partialDerivative(final int k) {
- return new MultivariateFunction() {
- /** {@inheritDoc} */
- @Override
- public double value(final double[] x) {
-
- final int n = x.length;
-
- // delegate computation to underlying function
- final DerivativeStructure[] dsX = new DerivativeStructure[n];
- for (int i = 0; i < n; ++i) {
- if (i == k) {
- dsX[i] = new DerivativeStructure(1, 1, 0, x[i]);
- } else {
- dsX[i] = new DerivativeStructure(1, 1, x[i]);
- }
- }
- final DerivativeStructure y = f.value(dsX);
-
- // extract partial derivative
- return y.getPartialDerivative(1);
-
- }
- };
- }
-
- public MultivariateVectorFunction gradient() {
- return new MultivariateVectorFunction() {
- /** {@inheritDoc} */
- @Override
- public double[] value(final double[] x) {
-
- final int n = x.length;
-
- // delegate computation to underlying function
- final DerivativeStructure[] dsX = new DerivativeStructure[n];
- for (int i = 0; i < n; ++i) {
- dsX[i] = new DerivativeStructure(n, 1, i, x[i]);
- }
- final DerivativeStructure y = f.value(dsX);
-
- // extract gradient
- final double[] gradient = new double[n];
- final int[] orders = new int[n];
- for (int i = 0; i < n; ++i) {
- orders[i] = 1;
- gradient[i] = y.getPartialDerivative(orders);
- orders[i] = 0;
- }
-
- return gradient;
-
- }
- };
- }
-
- };
- }
-
- /** Convert a {@link DifferentiableMultivariateFunction} into a {@link MultivariateDifferentiableFunction}.
- * <p>
- * Note that the converted function is able to handle {@link DerivativeStructure} elements
- * that all have the same number of free parameters and order, and with order at most 1.
- * If the function is called with inconsistent numbers of free parameters or higher order, a
- * {@link DimensionMismatchException} or a {@link NumberIsTooLargeException} will be thrown.
- * </p>
- * @param f function to convert
- * @return converted function
- * @deprecated this conversion method is temporary in version 3.1, as the {@link
- * DifferentiableMultivariateFunction} interface itself is deprecated
- */
- @Deprecated
- public static MultivariateDifferentiableFunction toMultivariateDifferentiableFunction(final DifferentiableMultivariateFunction f) {
- return new MultivariateDifferentiableFunction() {
-
- /** {@inheritDoc} */
- @Override
- public double value(final double[] x) {
- return f.value(x);
- }
-
- /** {@inheritDoc}
- * @exception NumberIsTooLargeException if derivation order is higher than 1
- * @exception DimensionMismatchException if numbers of free parameters are inconsistent
- */
- @Override
- public DerivativeStructure value(final DerivativeStructure[] t)
- throws DimensionMismatchException, NumberIsTooLargeException {
-
- // check parameters and orders limits
- final int parameters = t[0].getFreeParameters();
- final int order = t[0].getOrder();
- final int n = t.length;
- if (order > 1) {
- throw new NumberIsTooLargeException(order, 1, true);
- }
-
- // check all elements in the array are consistent
- for (int i = 0; i < n; ++i) {
- if (t[i].getFreeParameters() != parameters) {
- throw new DimensionMismatchException(t[i].getFreeParameters(), parameters);
- }
-
- if (t[i].getOrder() != order) {
- throw new DimensionMismatchException(t[i].getOrder(), order);
- }
- }
-
- // delegate computation to underlying function
- final double[] point = new double[n];
- for (int i = 0; i < n; ++i) {
- point[i] = t[i].getValue();
- }
- final double value = f.value(point);
- final double[] gradient = f.gradient().value(point);
-
- // merge value and gradient into one DerivativeStructure
- final double[] derivatives = new double[parameters + 1];
- derivatives[0] = value;
- final int[] orders = new int[parameters];
- for (int i = 0; i < parameters; ++i) {
- orders[i] = 1;
- for (int j = 0; j < n; ++j) {
- derivatives[i + 1] += gradient[j] * t[j].getPartialDerivative(orders);
- }
- orders[i] = 0;
- }
-
- return new DerivativeStructure(parameters, order, derivatives);
-
- }
-
- };
- }
-
- /** Convert a {@link MultivariateDifferentiableVectorFunction} into a {@link DifferentiableMultivariateVectorFunction}.
- * @param f function to convert
- * @return converted function
- * @deprecated this conversion method is temporary in version 3.1, as the {@link
- * DifferentiableMultivariateVectorFunction} interface itself is deprecated
- */
- @Deprecated
- public static DifferentiableMultivariateVectorFunction toDifferentiableMultivariateVectorFunction(final MultivariateDifferentiableVectorFunction f) {
- return new DifferentiableMultivariateVectorFunction() {
-
- /** {@inheritDoc} */
- @Override
- public double[] value(final double[] x) {
- return f.value(x);
- }
-
- public MultivariateMatrixFunction jacobian() {
- return new MultivariateMatrixFunction() {
- /** {@inheritDoc} */
- @Override
- public double[][] value(final double[] x) {
-
- final int n = x.length;
-
- // delegate computation to underlying function
- final DerivativeStructure[] dsX = new DerivativeStructure[n];
- for (int i = 0; i < n; ++i) {
- dsX[i] = new DerivativeStructure(n, 1, i, x[i]);
- }
- final DerivativeStructure[] y = f.value(dsX);
-
- // extract Jacobian
- final double[][] jacobian = new double[y.length][n];
- final int[] orders = new int[n];
- for (int i = 0; i < y.length; ++i) {
- for (int j = 0; j < n; ++j) {
- orders[j] = 1;
- jacobian[i][j] = y[i].getPartialDerivative(orders);
- orders[j] = 0;
- }
- }
-
- return jacobian;
-
- }
- };
- }
-
- };
- }
-
- /** Convert a {@link DifferentiableMultivariateVectorFunction} into a {@link MultivariateDifferentiableVectorFunction}.
- * <p>
- * Note that the converted function is able to handle {@link DerivativeStructure} elements
- * that all have the same number of free parameters and order, and with order at most 1.
- * If the function is called with inconsistent numbers of free parameters or higher order, a
- * {@link DimensionMismatchException} or a {@link NumberIsTooLargeException} will be thrown.
- * </p>
- * @param f function to convert
- * @return converted function
- * @deprecated this conversion method is temporary in version 3.1, as the {@link
- * DifferentiableMultivariateFunction} interface itself is deprecated
- */
- @Deprecated
- public static MultivariateDifferentiableVectorFunction toMultivariateDifferentiableVectorFunction(final DifferentiableMultivariateVectorFunction f) {
- return new MultivariateDifferentiableVectorFunction() {
-
- /** {@inheritDoc} */
- @Override
- public double[] value(final double[] x) {
- return f.value(x);
- }
-
- /** {@inheritDoc}
- * @exception NumberIsTooLargeException if derivation order is higher than 1
- * @exception DimensionMismatchException if numbers of free parameters are inconsistent
- */
- @Override
- public DerivativeStructure[] value(final DerivativeStructure[] t)
- throws DimensionMismatchException, NumberIsTooLargeException {
-
- // check parameters and orders limits
- final int parameters = t[0].getFreeParameters();
- final int order = t[0].getOrder();
- final int n = t.length;
- if (order > 1) {
- throw new NumberIsTooLargeException(order, 1, true);
- }
-
- // check all elements in the array are consistent
- for (int i = 0; i < n; ++i) {
- if (t[i].getFreeParameters() != parameters) {
- throw new DimensionMismatchException(t[i].getFreeParameters(), parameters);
- }
-
- if (t[i].getOrder() != order) {
- throw new DimensionMismatchException(t[i].getOrder(), order);
- }
- }
-
- // delegate computation to underlying function
- final double[] point = new double[n];
- for (int i = 0; i < n; ++i) {
- point[i] = t[i].getValue();
- }
- final double[] value = f.value(point);
- final double[][] jacobian = f.jacobian().value(point);
-
- // merge value and Jacobian into a DerivativeStructure array
- final DerivativeStructure[] merged = new DerivativeStructure[value.length];
- for (int k = 0; k < merged.length; ++k) {
- final double[] derivatives = new double[parameters + 1];
- derivatives[0] = value[k];
- final int[] orders = new int[parameters];
- for (int i = 0; i < parameters; ++i) {
- orders[i] = 1;
- for (int j = 0; j < n; ++j) {
- derivatives[i + 1] += jacobian[k][j] * t[j].getPartialDerivative(orders);
- }
- orders[i] = 0;
- }
- merged[k] = new DerivativeStructure(parameters, order, derivatives);
- }
-
- return merged;
-
- }
-
- };
- }
-
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/differentiation/DerivativeStructure.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/differentiation/DerivativeStructure.java b/src/main/java/org/apache/commons/math4/analysis/differentiation/DerivativeStructure.java
index 3c9a48c..b4f1457 100644
--- a/src/main/java/org/apache/commons/math4/analysis/differentiation/DerivativeStructure.java
+++ b/src/main/java/org/apache/commons/math4/analysis/differentiation/DerivativeStructure.java
@@ -764,6 +764,7 @@ public class DerivativeStructure implements RealFieldElement<DerivativeStructure
/** Base 10 logarithm.
* @return base 10 logarithm of the instance
*/
+ @Override
public DerivativeStructure log10() {
final DerivativeStructure result = new DerivativeStructure(compiler);
compiler.log10(data, 0, result.data, 0);
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/differentiation/SparseGradient.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/differentiation/SparseGradient.java b/src/main/java/org/apache/commons/math4/analysis/differentiation/SparseGradient.java
index 4e82d08..c590fbf 100644
--- a/src/main/java/org/apache/commons/math4/analysis/differentiation/SparseGradient.java
+++ b/src/main/java/org/apache/commons/math4/analysis/differentiation/SparseGradient.java
@@ -573,6 +573,7 @@ public class SparseGradient implements RealFieldElement<SparseGradient>, Seriali
/** Base 10 logarithm.
* @return base 10 logarithm of the instance
*/
+ @Override
public SparseGradient log10() {
return new SparseGradient(FastMath.log10(value), 1.0 / (FastMath.log(10.0) * value), derivatives);
}
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/function/Acos.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/function/Acos.java b/src/main/java/org/apache/commons/math4/analysis/function/Acos.java
index 6733822..2d9a3dd 100644
--- a/src/main/java/org/apache/commons/math4/analysis/function/Acos.java
+++ b/src/main/java/org/apache/commons/math4/analysis/function/Acos.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 Acos implements UnivariateDifferentiableFunction, DifferentiableUnivariateFunction {
+public class Acos implements UnivariateDifferentiableFunction {
/** {@inheritDoc} */
@Override
public double value(double x) {
@@ -37,15 +34,6 @@ public class Acos implements UnivariateDifferentiableFunction, DifferentiableUni
}
/** {@inheritDoc}
- * @deprecated as of 3.1, replaced by {@link #value(DerivativeStructure)}
- */
- @Deprecated
- @Override
- 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/Acosh.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/function/Acosh.java b/src/main/java/org/apache/commons/math4/analysis/function/Acosh.java
index fb78cd5..29c325d 100644
--- a/src/main/java/org/apache/commons/math4/analysis/function/Acosh.java
+++ b/src/main/java/org/apache/commons/math4/analysis/function/Acosh.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 Acosh implements UnivariateDifferentiableFunction, DifferentiableUnivariateFunction {
+public class Acosh implements UnivariateDifferentiableFunction {
/** {@inheritDoc} */
@Override
public double value(double x) {
@@ -37,15 +34,6 @@ public class Acosh implements UnivariateDifferentiableFunction, DifferentiableUn
}
/** {@inheritDoc}
- * @deprecated as of 3.1, replaced by {@link #value(DerivativeStructure)}
- */
- @Deprecated
- @Override
- 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/Asin.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/function/Asin.java b/src/main/java/org/apache/commons/math4/analysis/function/Asin.java
index ee6a66c..56c1b93 100644
--- a/src/main/java/org/apache/commons/math4/analysis/function/Asin.java
+++ b/src/main/java/org/apache/commons/math4/analysis/function/Asin.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 Asin implements UnivariateDifferentiableFunction, DifferentiableUnivariateFunction {
+public class Asin implements UnivariateDifferentiableFunction {
/** {@inheritDoc} */
@Override
public double value(double x) {
@@ -37,15 +34,6 @@ public class Asin implements UnivariateDifferentiableFunction, DifferentiableUni
}
/** {@inheritDoc}
- * @deprecated as of 3.1, replaced by {@link #value(DerivativeStructure)}
- */
- @Deprecated
- @Override
- 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/Asinh.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/function/Asinh.java b/src/main/java/org/apache/commons/math4/analysis/function/Asinh.java
index 21184cd..a4e5d3f 100644
--- a/src/main/java/org/apache/commons/math4/analysis/function/Asinh.java
+++ b/src/main/java/org/apache/commons/math4/analysis/function/Asinh.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 Asinh implements UnivariateDifferentiableFunction, DifferentiableUnivariateFunction {
+public class Asinh implements UnivariateDifferentiableFunction {
/** {@inheritDoc} */
@Override
public double value(double x) {
@@ -37,15 +34,6 @@ public class Asinh implements UnivariateDifferentiableFunction, DifferentiableUn
}
/** {@inheritDoc}
- * @deprecated as of 3.1, replaced by {@link #value(DerivativeStructure)}
- */
- @Deprecated
- @Override
- 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/Atan.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/function/Atan.java b/src/main/java/org/apache/commons/math4/analysis/function/Atan.java
index 1227905..25f8208 100644
--- a/src/main/java/org/apache/commons/math4/analysis/function/Atan.java
+++ b/src/main/java/org/apache/commons/math4/analysis/function/Atan.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 Atan implements UnivariateDifferentiableFunction, DifferentiableUnivariateFunction {
+public class Atan implements UnivariateDifferentiableFunction {
/** {@inheritDoc} */
@Override
public double value(double x) {
@@ -37,15 +34,6 @@ public class Atan implements UnivariateDifferentiableFunction, DifferentiableUni
}
/** {@inheritDoc}
- * @deprecated as of 3.1, replaced by {@link #value(DerivativeStructure)}
- */
- @Deprecated
- @Override
- 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/Atanh.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/function/Atanh.java b/src/main/java/org/apache/commons/math4/analysis/function/Atanh.java
index 1f573bf..ea284bd 100644
--- a/src/main/java/org/apache/commons/math4/analysis/function/Atanh.java
+++ b/src/main/java/org/apache/commons/math4/analysis/function/Atanh.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 Atanh implements UnivariateDifferentiableFunction, DifferentiableUnivariateFunction {
+public class Atanh implements UnivariateDifferentiableFunction {
/** {@inheritDoc} */
@Override
public double value(double x) {
@@ -37,15 +34,6 @@ public class Atanh implements UnivariateDifferentiableFunction, DifferentiableUn
}
/** {@inheritDoc}
- * @deprecated as of 3.1, replaced by {@link #value(DerivativeStructure)}
- */
- @Deprecated
- @Override
- 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/Cbrt.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/function/Cbrt.java b/src/main/java/org/apache/commons/math4/analysis/function/Cbrt.java
index dc7cdcc..6d08743 100644
--- a/src/main/java/org/apache/commons/math4/analysis/function/Cbrt.java
+++ b/src/main/java/org/apache/commons/math4/analysis/function/Cbrt.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 Cbrt implements UnivariateDifferentiableFunction, DifferentiableUnivariateFunction {
+public class Cbrt implements UnivariateDifferentiableFunction {
/** {@inheritDoc} */
@Override
public double value(double x) {
@@ -37,15 +34,6 @@ public class Cbrt implements UnivariateDifferentiableFunction, DifferentiableUni
}
/** {@inheritDoc}
- * @deprecated as of 3.1, replaced by {@link #value(DerivativeStructure)}
- */
- @Deprecated
- @Override
- 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/Constant.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/function/Constant.java b/src/main/java/org/apache/commons/math4/analysis/function/Constant.java
index acd9681..5b612f5 100644
--- a/src/main/java/org/apache/commons/math4/analysis/function/Constant.java
+++ b/src/main/java/org/apache/commons/math4/analysis/function/Constant.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;
@@ -26,7 +25,7 @@ import org.apache.commons.math4.analysis.differentiation.UnivariateDifferentiabl
*
* @since 3.0
*/
-public class Constant implements UnivariateDifferentiableFunction, DifferentiableUnivariateFunction {
+public class Constant implements UnivariateDifferentiableFunction {
/** Constant. */
private final double c;
@@ -44,15 +43,6 @@ public class Constant implements UnivariateDifferentiableFunction, Differentiabl
}
/** {@inheritDoc}
- * @deprecated as of 3.1, replaced by {@link #value(DerivativeStructure)}
- */
- @Deprecated
- @Override
- public DifferentiableUnivariateFunction derivative() {
- return new Constant(0);
- }
-
- /** {@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/Cos.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/function/Cos.java b/src/main/java/org/apache/commons/math4/analysis/function/Cos.java
index 8f38070..3f992c2 100644
--- a/src/main/java/org/apache/commons/math4/analysis/function/Cos.java
+++ b/src/main/java/org/apache/commons/math4/analysis/function/Cos.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 Cos implements UnivariateDifferentiableFunction, DifferentiableUnivariateFunction {
+public class Cos implements UnivariateDifferentiableFunction {
/** {@inheritDoc} */
@Override
public double value(double x) {
@@ -37,15 +34,6 @@ public class Cos implements UnivariateDifferentiableFunction, DifferentiableUniv
}
/** {@inheritDoc}
- * @deprecated as of 3.1, replaced by {@link #value(DerivativeStructure)}
- */
- @Deprecated
- @Override
- 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/Cosh.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/function/Cosh.java b/src/main/java/org/apache/commons/math4/analysis/function/Cosh.java
index 4bdcad5..5678612 100644
--- a/src/main/java/org/apache/commons/math4/analysis/function/Cosh.java
+++ b/src/main/java/org/apache/commons/math4/analysis/function/Cosh.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 Cosh implements UnivariateDifferentiableFunction, DifferentiableUnivariateFunction {
+public class Cosh implements UnivariateDifferentiableFunction {
/** {@inheritDoc} */
@Override
public double value(double x) {
@@ -35,15 +34,6 @@ public class Cosh implements UnivariateDifferentiableFunction, DifferentiableUni
}
/** {@inheritDoc}
- * @deprecated as of 3.1, replaced by {@link #value(DerivativeStructure)}
- */
- @Deprecated
- @Override
- public DifferentiableUnivariateFunction derivative() {
- return new Sinh();
- }
-
- /** {@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/Exp.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/function/Exp.java b/src/main/java/org/apache/commons/math4/analysis/function/Exp.java
index 7baf535..abee43e 100644
--- a/src/main/java/org/apache/commons/math4/analysis/function/Exp.java
+++ b/src/main/java/org/apache/commons/math4/analysis/function/Exp.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 Exp implements UnivariateDifferentiableFunction, DifferentiableUnivariateFunction {
+public class Exp implements UnivariateDifferentiableFunction {
/** {@inheritDoc} */
@Override
public double value(double x) {
@@ -37,15 +34,6 @@ public class Exp 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/Expm1.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/function/Expm1.java b/src/main/java/org/apache/commons/math4/analysis/function/Expm1.java
index 1b0c61d..aba08f1 100644
--- a/src/main/java/org/apache/commons/math4/analysis/function/Expm1.java
+++ b/src/main/java/org/apache/commons/math4/analysis/function/Expm1.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 Expm1 implements UnivariateDifferentiableFunction, DifferentiableUnivariateFunction {
+public class Expm1 implements UnivariateDifferentiableFunction {
/** {@inheritDoc} */
@Override
public double value(double x) {
@@ -37,15 +34,6 @@ public class Expm1 implements UnivariateDifferentiableFunction, DifferentiableUn
}
/** {@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/Gaussian.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/function/Gaussian.java b/src/main/java/org/apache/commons/math4/analysis/function/Gaussian.java
index 1b04a34..e703ed3 100644
--- a/src/main/java/org/apache/commons/math4/analysis/function/Gaussian.java
+++ b/src/main/java/org/apache/commons/math4/analysis/function/Gaussian.java
@@ -19,10 +19,7 @@ package org.apache.commons.math4.analysis.function;
import java.util.Arrays;
-import org.apache.commons.math4.analysis.DifferentiableUnivariateFunction;
-import org.apache.commons.math4.analysis.FunctionUtils;
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.DimensionMismatchException;
@@ -37,7 +34,7 @@ import org.apache.commons.math4.util.Precision;
*
* @since 3.0
*/
-public class Gaussian implements UnivariateDifferentiableFunction, DifferentiableUnivariateFunction {
+public class Gaussian implements UnivariateDifferentiableFunction {
/** Mean. */
private final double mean;
/** Inverse of the standard deviation. */
@@ -95,15 +92,6 @@ public class Gaussian implements UnivariateDifferentiableFunction, Differentiabl
return value(x - mean, norm, i2s2);
}
- /** {@inheritDoc}
- * @deprecated as of 3.1, replaced by {@link #value(DerivativeStructure)}
- */
- @Override
- @Deprecated
- public UnivariateFunction derivative() {
- return FunctionUtils.toDifferentiableUnivariateFunction(this).derivative();
- }
-
/**
* Parametric function where the input array contains the parameters of
* the Gaussian, ordered as follows:
@@ -125,6 +113,7 @@ public class Gaussian implements UnivariateDifferentiableFunction, Differentiabl
* not 3.
* @throws NotStrictlyPositiveException if {@code param[2]} is negative.
*/
+ @Override
public double value(double x, double ... param)
throws NullArgumentException,
DimensionMismatchException,
@@ -150,6 +139,7 @@ public class Gaussian implements UnivariateDifferentiableFunction, Differentiabl
* not 3.
* @throws NotStrictlyPositiveException if {@code param[2]} is negative.
*/
+ @Override
public double[] gradient(double x, double ... param)
throws NullArgumentException,
DimensionMismatchException,
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/function/HarmonicOscillator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/function/HarmonicOscillator.java b/src/main/java/org/apache/commons/math4/analysis/function/HarmonicOscillator.java
index b07ac66..6207d00 100644
--- a/src/main/java/org/apache/commons/math4/analysis/function/HarmonicOscillator.java
+++ b/src/main/java/org/apache/commons/math4/analysis/function/HarmonicOscillator.java
@@ -17,10 +17,7 @@
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.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.DimensionMismatchException;
@@ -33,7 +30,7 @@ import org.apache.commons.math4.util.FastMath;
*
* @since 3.0
*/
-public class HarmonicOscillator implements UnivariateDifferentiableFunction, DifferentiableUnivariateFunction {
+public class HarmonicOscillator implements UnivariateDifferentiableFunction {
/** Amplitude. */
private final double amplitude;
/** Angular frequency. */
@@ -62,15 +59,6 @@ public class HarmonicOscillator implements UnivariateDifferentiableFunction, Dif
return value(omega * x + phase, amplitude);
}
- /** {@inheritDoc}
- * @deprecated as of 3.1, replaced by {@link #value(DerivativeStructure)}
- */
- @Override
- @Deprecated
- public UnivariateFunction derivative() {
- return FunctionUtils.toDifferentiableUnivariateFunction(this).derivative();
- }
-
/**
* Parametric function where the input array contains the parameters of
* the harmonic oscillator function, ordered as follows:
@@ -91,6 +79,7 @@ public class HarmonicOscillator implements UnivariateDifferentiableFunction, Dif
* @throws DimensionMismatchException if the size of {@code param} is
* not 3.
*/
+ @Override
public double value(double x, double ... param)
throws NullArgumentException,
DimensionMismatchException {
@@ -111,6 +100,7 @@ public class HarmonicOscillator implements UnivariateDifferentiableFunction, Dif
* @throws DimensionMismatchException if the size of {@code param} is
* not 3.
*/
+ @Override
public double[] gradient(double x, double ... param)
throws NullArgumentException,
DimensionMismatchException {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/function/Identity.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/function/Identity.java b/src/main/java/org/apache/commons/math4/analysis/function/Identity.java
index dd0c84b..56567d4 100644
--- a/src/main/java/org/apache/commons/math4/analysis/function/Identity.java
+++ b/src/main/java/org/apache/commons/math4/analysis/function/Identity.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;
@@ -26,7 +25,7 @@ import org.apache.commons.math4.analysis.differentiation.UnivariateDifferentiabl
*
* @since 3.0
*/
-public class Identity implements UnivariateDifferentiableFunction, DifferentiableUnivariateFunction {
+public class Identity implements UnivariateDifferentiableFunction {
/** {@inheritDoc} */
@Override
public double value(double x) {
@@ -34,15 +33,6 @@ public class Identity implements UnivariateDifferentiableFunction, Differentiabl
}
/** {@inheritDoc}
- * @deprecated as of 3.1, replaced by {@link #value(DerivativeStructure)}
- */
- @Override
- @Deprecated
- public DifferentiableUnivariateFunction derivative() {
- return new Constant(1);
- }
-
- /** {@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/Inverse.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/function/Inverse.java b/src/main/java/org/apache/commons/math4/analysis/function/Inverse.java
index 77df37b..5004962 100644
--- a/src/main/java/org/apache/commons/math4/analysis/function/Inverse.java
+++ b/src/main/java/org/apache/commons/math4/analysis/function/Inverse.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;
@@ -28,7 +25,7 @@ import org.apache.commons.math4.analysis.differentiation.UnivariateDifferentiabl
*
* @since 3.0
*/
-public class Inverse implements UnivariateDifferentiableFunction, DifferentiableUnivariateFunction {
+public class Inverse implements UnivariateDifferentiableFunction {
/** {@inheritDoc} */
@Override
public double value(double x) {
@@ -36,15 +33,6 @@ public class Inverse implements UnivariateDifferentiableFunction, Differentiable
}
/** {@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/Log.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/function/Log.java b/src/main/java/org/apache/commons/math4/analysis/function/Log.java
index 028890c..5f11466 100644
--- a/src/main/java/org/apache/commons/math4/analysis/function/Log.java
+++ b/src/main/java/org/apache/commons/math4/analysis/function/Log.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 Log implements UnivariateDifferentiableFunction, DifferentiableUnivariateFunction {
+public class Log implements UnivariateDifferentiableFunction {
/** {@inheritDoc} */
@Override
public double value(double x) {
@@ -37,15 +34,6 @@ public class Log 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/Log10.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/function/Log10.java b/src/main/java/org/apache/commons/math4/analysis/function/Log10.java
index cb8184c..e0ad0b4 100644
--- a/src/main/java/org/apache/commons/math4/analysis/function/Log10.java
+++ b/src/main/java/org/apache/commons/math4/analysis/function/Log10.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 Log10 implements UnivariateDifferentiableFunction, DifferentiableUnivariateFunction {
+public class Log10 implements UnivariateDifferentiableFunction {
/** {@inheritDoc} */
@Override
@@ -38,15 +35,6 @@ public class Log10 implements UnivariateDifferentiableFunction, DifferentiableUn
}
/** {@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/Log1p.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/function/Log1p.java b/src/main/java/org/apache/commons/math4/analysis/function/Log1p.java
index 5f223fa..f95c970 100644
--- a/src/main/java/org/apache/commons/math4/analysis/function/Log1p.java
+++ b/src/main/java/org/apache/commons/math4/analysis/function/Log1p.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 Log1p implements UnivariateDifferentiableFunction, DifferentiableUnivariateFunction {
+public class Log1p implements UnivariateDifferentiableFunction {
/** {@inheritDoc} */
@Override
public double value(double x) {
@@ -37,15 +34,6 @@ public class Log1p implements UnivariateDifferentiableFunction, DifferentiableUn
}
/** {@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/Logistic.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/function/Logistic.java b/src/main/java/org/apache/commons/math4/analysis/function/Logistic.java
index 701b3cf..c5ff5e0 100644
--- a/src/main/java/org/apache/commons/math4/analysis/function/Logistic.java
+++ b/src/main/java/org/apache/commons/math4/analysis/function/Logistic.java
@@ -17,10 +17,7 @@
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.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.DimensionMismatchException;
@@ -34,7 +31,7 @@ import org.apache.commons.math4.util.FastMath;
*
* @since 3.0
*/
-public class Logistic implements UnivariateDifferentiableFunction, DifferentiableUnivariateFunction {
+public class Logistic implements UnivariateDifferentiableFunction {
/** Lower asymptote. */
private final double a;
/** Upper asymptote. */
@@ -86,15 +83,6 @@ public class Logistic implements UnivariateDifferentiableFunction, Differentiabl
return value(m - x, k, b, q, a, oneOverN);
}
- /** {@inheritDoc}
- * @deprecated as of 3.1, replaced by {@link #value(DerivativeStructure)}
- */
- @Override
- @Deprecated
- public UnivariateFunction derivative() {
- return FunctionUtils.toDifferentiableUnivariateFunction(this).derivative();
- }
-
/**
* Parametric function where the input array contains the parameters of
* the {@link Logistic#Logistic(double,double,double,double,double,double)
@@ -121,6 +109,7 @@ public class Logistic implements UnivariateDifferentiableFunction, Differentiabl
* not 6.
* @throws NotStrictlyPositiveException if {@code param[5] <= 0}.
*/
+ @Override
public double value(double x, double ... param)
throws NullArgumentException,
DimensionMismatchException,
@@ -146,6 +135,7 @@ public class Logistic implements UnivariateDifferentiableFunction, Differentiabl
* not 6.
* @throws NotStrictlyPositiveException if {@code param[5] <= 0}.
*/
+ @Override
public double[] gradient(double x, double ... param)
throws NullArgumentException,
DimensionMismatchException,
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/function/Logit.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/function/Logit.java b/src/main/java/org/apache/commons/math4/analysis/function/Logit.java
index 24ad0d1..55b1fd9 100644
--- a/src/main/java/org/apache/commons/math4/analysis/function/Logit.java
+++ b/src/main/java/org/apache/commons/math4/analysis/function/Logit.java
@@ -17,10 +17,7 @@
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.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.DimensionMismatchException;
@@ -35,7 +32,7 @@ import org.apache.commons.math4.util.FastMath;
*
* @since 3.0
*/
-public class Logit implements UnivariateDifferentiableFunction, DifferentiableUnivariateFunction {
+public class Logit implements UnivariateDifferentiableFunction {
/** Lower bound. */
private final double lo;
/** Higher bound. */
@@ -68,15 +65,6 @@ public class Logit implements UnivariateDifferentiableFunction, DifferentiableUn
return value(x, lo, hi);
}
- /** {@inheritDoc}
- * @deprecated as of 3.1, replaced by {@link #value(DerivativeStructure)}
- */
- @Override
- @Deprecated
- public UnivariateFunction derivative() {
- return FunctionUtils.toDifferentiableUnivariateFunction(this).derivative();
- }
-
/**
* Parametric function where the input array contains the parameters of
* the logit function, ordered as follows:
@@ -96,6 +84,7 @@ public class Logit implements UnivariateDifferentiableFunction, DifferentiableUn
* @throws DimensionMismatchException if the size of {@code param} is
* not 2.
*/
+ @Override
public double value(double x, double ... param)
throws NullArgumentException,
DimensionMismatchException {
@@ -116,6 +105,7 @@ public class Logit implements UnivariateDifferentiableFunction, DifferentiableUn
* @throws DimensionMismatchException if the size of {@code param} is
* not 2.
*/
+ @Override
public double[] gradient(double x, double ... param)
throws NullArgumentException,
DimensionMismatchException {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/function/Minus.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/function/Minus.java b/src/main/java/org/apache/commons/math4/analysis/function/Minus.java
index 61f847a..714de04 100644
--- a/src/main/java/org/apache/commons/math4/analysis/function/Minus.java
+++ b/src/main/java/org/apache/commons/math4/analysis/function/Minus.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;
@@ -26,7 +25,7 @@ import org.apache.commons.math4.analysis.differentiation.UnivariateDifferentiabl
*
* @since 3.0
*/
-public class Minus implements UnivariateDifferentiableFunction, DifferentiableUnivariateFunction {
+public class Minus implements UnivariateDifferentiableFunction {
/** {@inheritDoc} */
@Override
public double value(double x) {
@@ -34,15 +33,6 @@ public class Minus implements UnivariateDifferentiableFunction, DifferentiableUn
}
/** {@inheritDoc}
- * @deprecated as of 3.1, replaced by {@link #value(DerivativeStructure)}
- */
- @Override
- @Deprecated
- public DifferentiableUnivariateFunction derivative() {
- return new Constant(-1);
- }
-
- /** {@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/Power.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/function/Power.java b/src/main/java/org/apache/commons/math4/analysis/function/Power.java
index 4ded52a..f605c93 100644
--- a/src/main/java/org/apache/commons/math4/analysis/function/Power.java
+++ b/src/main/java/org/apache/commons/math4/analysis/function/Power.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 Power implements UnivariateDifferentiableFunction, DifferentiableUnivariateFunction {
+public class Power implements UnivariateDifferentiableFunction {
/** Power. */
private final double p;
@@ -47,15 +44,6 @@ public class Power implements UnivariateDifferentiableFunction, DifferentiableUn
}
/** {@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/Sigmoid.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/function/Sigmoid.java b/src/main/java/org/apache/commons/math4/analysis/function/Sigmoid.java
index 577728e..52d5825 100644
--- a/src/main/java/org/apache/commons/math4/analysis/function/Sigmoid.java
+++ b/src/main/java/org/apache/commons/math4/analysis/function/Sigmoid.java
@@ -19,10 +19,7 @@ package org.apache.commons.math4.analysis.function;
import java.util.Arrays;
-import org.apache.commons.math4.analysis.DifferentiableUnivariateFunction;
-import org.apache.commons.math4.analysis.FunctionUtils;
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.DimensionMismatchException;
@@ -38,7 +35,7 @@ import org.apache.commons.math4.util.FastMath;
*
* @since 3.0
*/
-public class Sigmoid implements UnivariateDifferentiableFunction, DifferentiableUnivariateFunction {
+public class Sigmoid implements UnivariateDifferentiableFunction {
/** Lower asymptote. */
private final double lo;
/** Higher asymptote. */
@@ -64,15 +61,6 @@ public class Sigmoid implements UnivariateDifferentiableFunction, Differentiable
this.hi = hi;
}
- /** {@inheritDoc}
- * @deprecated as of 3.1, replaced by {@link #value(DerivativeStructure)}
- */
- @Override
- @Deprecated
- public UnivariateFunction derivative() {
- return FunctionUtils.toDifferentiableUnivariateFunction(this).derivative();
- }
-
/** {@inheritDoc} */
@Override
public double value(double x) {
@@ -99,6 +87,7 @@ public class Sigmoid implements UnivariateDifferentiableFunction, Differentiable
* @throws DimensionMismatchException if the size of {@code param} is
* not 2.
*/
+ @Override
public double value(double x, double ... param)
throws NullArgumentException,
DimensionMismatchException {
@@ -119,6 +108,7 @@ public class Sigmoid implements UnivariateDifferentiableFunction, Differentiable
* @throws DimensionMismatchException if the size of {@code param} is
* not 2.
*/
+ @Override
public double[] gradient(double x, double ... param)
throws NullArgumentException,
DimensionMismatchException {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/306fa746/src/main/java/org/apache/commons/math4/analysis/function/Sin.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/analysis/function/Sin.java b/src/main/java/org/apache/commons/math4/analysis/function/Sin.java
index 4d57d9a..08e9581 100644
--- a/src/main/java/org/apache/commons/math4/analysis/function/Sin.java
+++ b/src/main/java/org/apache/commons/math4/analysis/function/Sin.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 Sin implements UnivariateDifferentiableFunction, DifferentiableUnivariateFunction {
+public class Sin implements UnivariateDifferentiableFunction {
/** {@inheritDoc} */
@Override
public double value(double x) {
@@ -35,15 +34,6 @@ public class Sin implements UnivariateDifferentiableFunction, DifferentiableUniv
}
/** {@inheritDoc}
- * @deprecated as of 3.1, replaced by {@link #value(DerivativeStructure)}
- */
- @Override
- @Deprecated
- public DifferentiableUnivariateFunction derivative() {
- return new Cos();
- }
-
- /** {@inheritDoc}
* @since 3.1
*/
@Override