Repository: commons-math Updated Branches: refs/heads/master eb57d6d45 -> 637ca9113
remove an unused file. Project: http://git-wip-us.apache.org/repos/asf/commons-math/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-math/commit/ff3d3655 Tree: http://git-wip-us.apache.org/repos/asf/commons-math/tree/ff3d3655 Diff: http://git-wip-us.apache.org/repos/asf/commons-math/diff/ff3d3655 Branch: refs/heads/master Commit: ff3d3655acd62b0f71b73679a08d91744b692b09 Parents: f90d292 Author: adrian <adrian...@aporter.org> Authored: Tue May 22 17:34:18 2018 -0400 Committer: adrian <adrian...@aporter.org> Committed: Thu Jun 28 14:40:09 2018 -0400 ---------------------------------------------------------------------- ...ferentiatorMultivariateJacobianFunction.java | 102 ------------------- ...iatorVectorMultivariateJacobianFunction.java | 6 -- 2 files changed, 108 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-math/blob/ff3d3655/src/main/java/org/apache/commons/math4/fitting/leastsquares/DifferentiatorMultivariateJacobianFunction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/fitting/leastsquares/DifferentiatorMultivariateJacobianFunction.java b/src/main/java/org/apache/commons/math4/fitting/leastsquares/DifferentiatorMultivariateJacobianFunction.java deleted file mode 100644 index 12ebcf5..0000000 --- a/src/main/java/org/apache/commons/math4/fitting/leastsquares/DifferentiatorMultivariateJacobianFunction.java +++ /dev/null @@ -1,102 +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.fitting.leastsquares; - -import org.apache.commons.math4.analysis.MultivariateFunction; -import org.apache.commons.math4.analysis.UnivariateFunction; -import org.apache.commons.math4.analysis.differentiation.DerivativeStructure; -import org.apache.commons.math4.analysis.differentiation.UnivariateFunctionDifferentiator; -import org.apache.commons.math4.linear.Array2DRowRealMatrix; -import org.apache.commons.math4.linear.ArrayRealVector; -import org.apache.commons.math4.linear.RealMatrix; -import org.apache.commons.math4.linear.RealVector; -import org.apache.commons.math4.util.Pair; - -/** - * A MultivariateJacobianFunction (a thing that requires a derivative) - * combined with the thing that can find derivatives. - * - * Can be used with a LeastSquaresProblem, a LeastSquaresFactory, or a LeastSquaresBuilder. - * - * This version that works with MultivariateFunction - * @see DifferentiatorVectorMultivariateJacobianFunction for version that works with MultivariateVectorFunction - */ -public class DifferentiatorMultivariateJacobianFunction implements MultivariateJacobianFunction { - /** - * The input function to find a jacobian for. - */ - private final MultivariateFunction function; - /** - * The differentiator to use to find the jacobian. - */ - private final UnivariateFunctionDifferentiator differentiator; - - /** - * Build the jacobian function using a differentiator. - * - * @param function the function to turn into a jacobian - * @param differentiator the differentiator to find the derivative - * - * This version that works with MultivariateFunction - * @see DifferentiatorVectorMultivariateJacobianFunction for version that works with MultivariateVectorFunction - */ - public DifferentiatorMultivariateJacobianFunction(MultivariateFunction function, UnivariateFunctionDifferentiator differentiator) { - this.function = function; - this.differentiator = differentiator; - } - - /** - * @inheritDoc - */ - @Override - public Pair<RealVector, RealMatrix> value(RealVector point) { - double[] testArray = point.toArray(); - ArrayRealVector value = new ArrayRealVector(1); - value.setEntry(0, function.value(testArray)); - RealMatrix jacobian = new Array2DRowRealMatrix(1, point.getDimension()); - - for(int column = 0; column < point.getDimension(); column++) { - final int columnFinal = column; - double originalPoint = point.getEntry(column); - double partialDerivative = getPartialDerivative(testPoint -> { - - testArray[columnFinal] = testPoint; - - return function.value(testArray); - }, originalPoint); - - testArray[column] = originalPoint; //set it back - - jacobian.setEntry(0, column, partialDerivative); - } - - return new Pair<>(value, jacobian); - } - - /** - * Returns first order derivative for the function passed in using a differentiator - * @param univariateFunction the function to differentiate - * @param atParameterValue the point at which to differentiate it at - * @return the slope at that point - */ - private double getPartialDerivative(UnivariateFunction univariateFunction, double atParameterValue) { - return differentiator - .differentiate(univariateFunction) - .value(new DerivativeStructure(1, 1, 0, atParameterValue)) - .getPartialDerivative(1); - } -} http://git-wip-us.apache.org/repos/asf/commons-math/blob/ff3d3655/src/main/java/org/apache/commons/math4/fitting/leastsquares/DifferentiatorVectorMultivariateJacobianFunction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/fitting/leastsquares/DifferentiatorVectorMultivariateJacobianFunction.java b/src/main/java/org/apache/commons/math4/fitting/leastsquares/DifferentiatorVectorMultivariateJacobianFunction.java index 05e1267..25e6d1d 100644 --- a/src/main/java/org/apache/commons/math4/fitting/leastsquares/DifferentiatorVectorMultivariateJacobianFunction.java +++ b/src/main/java/org/apache/commons/math4/fitting/leastsquares/DifferentiatorVectorMultivariateJacobianFunction.java @@ -31,9 +31,6 @@ import org.apache.commons.math4.util.Pair; * combined with the thing that can find derivatives. * * Can be used with a LeastSquaresProblem, a LeastSquaresFactory, or a LeastSquaresBuilder. - * - * This version that works with MultivariateVectorFunction - * @see DifferentiatorMultivariateJacobianFunction for version that works with MultivariateFunction */ public class DifferentiatorVectorMultivariateJacobianFunction implements MultivariateJacobianFunction { /** @@ -50,9 +47,6 @@ public class DifferentiatorVectorMultivariateJacobianFunction implements Multiva * * @param function the function to turn into a jacobian * @param differentiator the differentiator to find the derivative - * - * This version that works with MultivariateVectorFunction - * @see DifferentiatorMultivariateJacobianFunction for version that works with MultivariateFunction */ public DifferentiatorVectorMultivariateJacobianFunction(MultivariateVectorFunction function, UnivariateVectorFunctionDifferentiator differentiator) { this.function = function;
