You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by er...@apache.org on 2011/11/28 23:41:47 UTC
svn commit: r1207671 - in /commons/proper/math/trunk/src:
main/java/org/apache/commons/math/analysis/
main/java/org/apache/commons/math/optimization/
main/java/org/apache/commons/math/optimization/direct/
main/java/org/apache/commons/math/optimization/...
Author: erans
Date: Mon Nov 28 22:41:41 2011
New Revision: 1207671
URL: http://svn.apache.org/viewvc?rev=1207671&view=rev
Log:
MATH-707
Changed "...MultivariateVectorialFunction" to "...MultivariateVectorFunction"
(as suggested by Ted Dunning).
Added:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/DifferentiableMultivariateVectorFunction.java
- copied, changed from r1207659, commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/DifferentiableMultivariateVectorialFunction.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/MultivariateVectorFunction.java
- copied, changed from r1207659, commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/MultivariateVectorialFunction.java
Removed:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/DifferentiableMultivariateVectorialFunction.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/MultivariateVectorialFunction.java
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/DifferentiableMultivariateFunction.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultiStartMultivariateVectorialOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateVectorialOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateVectorialOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/LeastSquaresConverter.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateVectorialOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/VectorialPointValuePair.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractVectorialOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/fitting/CurveFitter.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/general/AbstractLeastSquaresOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/general/AbstractScalarDifferentiableOptimizer.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/package-info.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/SumSincFunction.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/BatteryNISTTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateRealOptimizerTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateVectorialOptimizerTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/direct/SimplexOptimizerNelderMeadTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/CircleScalar.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/CircleVectorial.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/GaussNewtonOptimizerTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/LevenbergMarquardtOptimizerTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/MinpackTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizerTest.java
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/DifferentiableMultivariateFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/DifferentiableMultivariateFunction.java?rev=1207671&r1=1207670&r2=1207671&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/DifferentiableMultivariateFunction.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/DifferentiableMultivariateFunction.java Mon Nov 28 22:41:41 2011
@@ -46,6 +46,6 @@ public interface DifferentiableMultivari
* which will compute only the specified component.</p>
* @return the gradient function
*/
- MultivariateVectorialFunction gradient();
+ MultivariateVectorFunction gradient();
}
Copied: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/DifferentiableMultivariateVectorFunction.java (from r1207659, commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/DifferentiableMultivariateVectorialFunction.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/DifferentiableMultivariateVectorFunction.java?p2=commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/DifferentiableMultivariateVectorFunction.java&p1=commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/DifferentiableMultivariateVectorialFunction.java&r1=1207659&r2=1207671&rev=1207671&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/DifferentiableMultivariateVectorialFunction.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/DifferentiableMultivariateVectorFunction.java Mon Nov 28 22:41:41 2011
@@ -19,13 +19,13 @@ package org.apache.commons.math.analysis
/**
- * Extension of {@link MultivariateVectorialFunction} representing a differentiable
+ * Extension of {@link MultivariateVectorFunction} representing a differentiable
* multivariate vectorial function.
* @version $Id$
* @since 2.0
*/
-public interface DifferentiableMultivariateVectorialFunction
- extends MultivariateVectorialFunction {
+public interface DifferentiableMultivariateVectorFunction
+ extends MultivariateVectorFunction {
/**
* Returns the jacobian function.
Copied: commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/MultivariateVectorFunction.java (from r1207659, commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/MultivariateVectorialFunction.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/MultivariateVectorFunction.java?p2=commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/MultivariateVectorFunction.java&p1=commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/MultivariateVectorialFunction.java&r1=1207659&r2=1207671&rev=1207671&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/MultivariateVectorialFunction.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/analysis/MultivariateVectorFunction.java Mon Nov 28 22:41:41 2011
@@ -22,7 +22,7 @@ package org.apache.commons.math.analysis
* @version $Id$
* @since 2.0
*/
-public interface MultivariateVectorialFunction {
+public interface MultivariateVectorFunction {
/**
* Compute the value for the function at the given point.
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultiStartMultivariateVectorialOptimizer.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultiStartMultivariateVectorialOptimizer.java?rev=1207671&r1=1207670&r2=1207671&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultiStartMultivariateVectorialOptimizer.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultiStartMultivariateVectorialOptimizer.java Mon Nov 28 22:41:41 2011
@@ -20,7 +20,7 @@ package org.apache.commons.math.optimiza
import java.util.Arrays;
import java.util.Comparator;
-import org.apache.commons.math.analysis.MultivariateVectorialFunction;
+import org.apache.commons.math.analysis.MultivariateVectorFunction;
import org.apache.commons.math.exception.ConvergenceException;
import org.apache.commons.math.exception.MathIllegalStateException;
import org.apache.commons.math.exception.NotStrictlyPositiveException;
@@ -40,7 +40,7 @@ import org.apache.commons.math.random.Ra
* @version $Id$
* @since 3.0
*/
-public class BaseMultiStartMultivariateVectorialOptimizer<FUNC extends MultivariateVectorialFunction>
+public class BaseMultiStartMultivariateVectorialOptimizer<FUNC extends MultivariateVectorFunction>
implements BaseMultivariateVectorialOptimizer<FUNC> {
/** Underlying classical optimizer. */
private final BaseMultivariateVectorialOptimizer<FUNC> optimizer;
@@ -60,7 +60,7 @@ public class BaseMultiStartMultivariateV
*
* @param optimizer Single-start optimizer to wrap.
* @param starts Number of starts to perform. If {@code starts == 1},
- * the {@link #optimize(int,MultivariateVectorialFunction,double[],double[],double[])
+ * the {@link #optimize(int,MultivariateVectorFunction,double[],double[],double[])
* optimize} will return the same solution as {@code optimizer} would.
* @param generator Random vector generator to use for restarts.
* @throws NullArgumentException if {@code optimizer} or {@code generator}
@@ -85,13 +85,13 @@ public class BaseMultiStartMultivariateV
/**
* Get all the optima found during the last call to {@link
- * #optimize(int,MultivariateVectorialFunction,double[],double[],double[]) optimize}.
+ * #optimize(int,MultivariateVectorFunction,double[],double[],double[]) optimize}.
* The optimizer stores all the optima found during a set of
- * restarts. The {@link #optimize(int,MultivariateVectorialFunction,double[],double[],double[])
+ * restarts. The {@link #optimize(int,MultivariateVectorFunction,double[],double[],double[])
* optimize} method returns the best point only. This method
* returns all the points found at the end of each starts, including
* the best one already returned by the {@link
- * #optimize(int,MultivariateVectorialFunction,double[],double[],double[]) optimize} method.
+ * #optimize(int,MultivariateVectorFunction,double[],double[],double[]) optimize} method.
* <br/>
* The returned array as one element for each start as specified
* in the constructor. It is ordered with the results from the
@@ -100,14 +100,14 @@ public class BaseMultiStartMultivariateV
* descending order if maximizing), followed by and null elements
* corresponding to the runs that did not converge. This means all
* elements will be null if the {@link
- * #optimize(int,MultivariateVectorialFunction,double[],double[],double[]) optimize} method did
+ * #optimize(int,MultivariateVectorFunction,double[],double[],double[]) optimize} method did
* throw a {@link ConvergenceException}). This also means that if
* the first element is not {@code null}, it is the best point found
* across all starts.
*
* @return array containing the optima
* @throws MathIllegalStateException if {@link
- * #optimize(int,MultivariateVectorialFunction,double[],double[],double[]) optimize} has not been
+ * #optimize(int,MultivariateVectorFunction,double[],double[],double[]) optimize} has not been
* called.
*/
public VectorialPointValuePair[] getOptima() {
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateVectorialOptimizer.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateVectorialOptimizer.java?rev=1207671&r1=1207670&r2=1207671&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateVectorialOptimizer.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/BaseMultivariateVectorialOptimizer.java Mon Nov 28 22:41:41 2011
@@ -17,7 +17,7 @@
package org.apache.commons.math.optimization;
-import org.apache.commons.math.analysis.MultivariateVectorialFunction;
+import org.apache.commons.math.analysis.MultivariateVectorFunction;
/**
* This interface is mainly intended to enforce the internal coherence of
@@ -32,7 +32,7 @@ import org.apache.commons.math.analysis.
* @version $Id$
* @since 3.0
*/
-public interface BaseMultivariateVectorialOptimizer<FUNC extends MultivariateVectorialFunction>
+public interface BaseMultivariateVectorialOptimizer<FUNC extends MultivariateVectorFunction>
extends BaseOptimizer<VectorialPointValuePair> {
/**
* Optimize an objective function.
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateVectorialOptimizer.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateVectorialOptimizer.java?rev=1207671&r1=1207670&r2=1207671&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateVectorialOptimizer.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateVectorialOptimizer.java Mon Nov 28 22:41:41 2011
@@ -17,15 +17,15 @@
package org.apache.commons.math.optimization;
-import org.apache.commons.math.analysis.DifferentiableMultivariateVectorialFunction;
+import org.apache.commons.math.analysis.DifferentiableMultivariateVectorFunction;
/**
* This interface represents an optimization algorithm for
- * {@link DifferentiableMultivariateVectorialFunction vectorial differentiable
+ * {@link DifferentiableMultivariateVectorFunction vectorial differentiable
* objective functions}.
*
* @version $Id$
* @since 3.0
*/
public interface DifferentiableMultivariateVectorialOptimizer
- extends BaseMultivariateVectorialOptimizer<DifferentiableMultivariateVectorialFunction> {}
+ extends BaseMultivariateVectorialOptimizer<DifferentiableMultivariateVectorFunction> {}
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/LeastSquaresConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/LeastSquaresConverter.java?rev=1207671&r1=1207670&r2=1207671&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/LeastSquaresConverter.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/LeastSquaresConverter.java Mon Nov 28 22:41:41 2011
@@ -18,11 +18,11 @@
package org.apache.commons.math.optimization;
import org.apache.commons.math.analysis.MultivariateFunction;
-import org.apache.commons.math.analysis.MultivariateVectorialFunction;
+import org.apache.commons.math.analysis.MultivariateVectorFunction;
import org.apache.commons.math.exception.DimensionMismatchException;
import org.apache.commons.math.linear.RealMatrix;
-/** This class converts {@link MultivariateVectorialFunction vectorial
+/** This class converts {@link MultivariateVectorFunction vectorial
* objective functions} to {@link MultivariateFunction scalar objective functions}
* when the goal is to minimize them.
* <p>
@@ -48,7 +48,7 @@ import org.apache.commons.math.linear.Re
* </p>
*
* @see MultivariateFunction
- * @see MultivariateVectorialFunction
+ * @see MultivariateVectorFunction
* @version $Id$
* @since 2.0
*/
@@ -56,7 +56,7 @@ import org.apache.commons.math.linear.Re
public class LeastSquaresConverter implements MultivariateFunction {
/** Underlying vectorial function. */
- private final MultivariateVectorialFunction function;
+ private final MultivariateVectorFunction function;
/** Observations to be compared to objective function to compute residuals. */
private final double[] observations;
@@ -71,7 +71,7 @@ public class LeastSquaresConverter imple
* @param function vectorial residuals function to wrap
* @param observations observations to be compared to objective function to compute residuals
*/
- public LeastSquaresConverter(final MultivariateVectorialFunction function,
+ public LeastSquaresConverter(final MultivariateVectorFunction function,
final double[] observations) {
this.function = function;
this.observations = observations.clone();
@@ -107,7 +107,7 @@ public class LeastSquaresConverter imple
* vector dimensions do not match (objective function dimension is checked only when
* the {@link #value(double[])} method is called)
*/
- public LeastSquaresConverter(final MultivariateVectorialFunction function,
+ public LeastSquaresConverter(final MultivariateVectorFunction function,
final double[] observations, final double[] weights) {
if (observations.length != weights.length) {
throw new DimensionMismatchException(observations.length, weights.length);
@@ -137,7 +137,7 @@ public class LeastSquaresConverter imple
* matrix dimensions do not match (objective function dimension is checked only when
* the {@link #value(double[])} method is called)
*/
- public LeastSquaresConverter(final MultivariateVectorialFunction function,
+ public LeastSquaresConverter(final MultivariateVectorFunction function,
final double[] observations, final RealMatrix scale) {
if (observations.length != scale.getColumnDimension()) {
throw new DimensionMismatchException(observations.length, scale.getColumnDimension());
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateVectorialOptimizer.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateVectorialOptimizer.java?rev=1207671&r1=1207670&r2=1207671&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateVectorialOptimizer.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateVectorialOptimizer.java Mon Nov 28 22:41:41 2011
@@ -17,7 +17,7 @@
package org.apache.commons.math.optimization;
-import org.apache.commons.math.analysis.DifferentiableMultivariateVectorialFunction;
+import org.apache.commons.math.analysis.DifferentiableMultivariateVectorFunction;
import org.apache.commons.math.random.RandomVectorGenerator;
/**
@@ -32,7 +32,7 @@ import org.apache.commons.math.random.Ra
* @since 2.0
*/
public class MultiStartDifferentiableMultivariateVectorialOptimizer
- extends BaseMultiStartMultivariateVectorialOptimizer<DifferentiableMultivariateVectorialFunction>
+ extends BaseMultiStartMultivariateVectorialOptimizer<DifferentiableMultivariateVectorFunction>
implements DifferentiableMultivariateVectorialOptimizer {
/**
* Create a multi-start optimizer from a single-start optimizer.
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/VectorialPointValuePair.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/VectorialPointValuePair.java?rev=1207671&r1=1207670&r2=1207671&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/VectorialPointValuePair.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/VectorialPointValuePair.java Mon Nov 28 22:41:41 2011
@@ -23,7 +23,7 @@ import java.io.Serializable;
* This class holds a point and the vectorial value of an objective function at this point.
* <p>This is a simple immutable container.</p>
* @see RealPointValuePair
- * @see org.apache.commons.math.analysis.MultivariateVectorialFunction
+ * @see org.apache.commons.math.analysis.MultivariateVectorFunction
* @version $Id$
* @since 2.0
*/
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractVectorialOptimizer.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractVectorialOptimizer.java?rev=1207671&r1=1207670&r2=1207671&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractVectorialOptimizer.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractVectorialOptimizer.java Mon Nov 28 22:41:41 2011
@@ -22,7 +22,7 @@ import org.apache.commons.math.exception
import org.apache.commons.math.exception.TooManyEvaluationsException;
import org.apache.commons.math.exception.DimensionMismatchException;
import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.analysis.MultivariateVectorialFunction;
+import org.apache.commons.math.analysis.MultivariateVectorFunction;
import org.apache.commons.math.optimization.BaseMultivariateVectorialOptimizer;
import org.apache.commons.math.optimization.ConvergenceChecker;
import org.apache.commons.math.optimization.VectorialPointValuePair;
@@ -38,7 +38,7 @@ import org.apache.commons.math.optimizat
* @version $Id$
* @since 3.0
*/
-public abstract class BaseAbstractVectorialOptimizer<FUNC extends MultivariateVectorialFunction>
+public abstract class BaseAbstractVectorialOptimizer<FUNC extends MultivariateVectorFunction>
implements BaseMultivariateVectorialOptimizer<FUNC> {
/** Evaluations counter. */
protected final Incrementor evaluations = new Incrementor();
@@ -51,7 +51,7 @@ public abstract class BaseAbstractVector
/** Initial guess. */
private double[] start;
/** Objective function. */
- private MultivariateVectorialFunction function;
+ private MultivariateVectorFunction function;
/**
* Simple constructor with default settings.
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/fitting/CurveFitter.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/fitting/CurveFitter.java?rev=1207671&r1=1207670&r2=1207671&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/fitting/CurveFitter.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/fitting/CurveFitter.java Mon Nov 28 22:41:41 2011
@@ -20,7 +20,7 @@ package org.apache.commons.math.optimiza
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.math.analysis.DifferentiableMultivariateVectorialFunction;
+import org.apache.commons.math.analysis.DifferentiableMultivariateVectorFunction;
import org.apache.commons.math.analysis.ParametricUnivariateFunction;
import org.apache.commons.math.analysis.MultivariateMatrixFunction;
import org.apache.commons.math.optimization.DifferentiableMultivariateVectorialOptimizer;
@@ -164,7 +164,7 @@ public class CurveFitter {
/** Vectorial function computing function theoretical values. */
private class TheoreticalValuesFunction
- implements DifferentiableMultivariateVectorialFunction {
+ implements DifferentiableMultivariateVectorFunction {
/** Function to fit. */
private final ParametricUnivariateFunction f;
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/general/AbstractLeastSquaresOptimizer.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/general/AbstractLeastSquaresOptimizer.java?rev=1207671&r1=1207670&r2=1207671&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/general/AbstractLeastSquaresOptimizer.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/general/AbstractLeastSquaresOptimizer.java Mon Nov 28 22:41:41 2011
@@ -19,7 +19,7 @@ package org.apache.commons.math.optimiza
import org.apache.commons.math.exception.NumberIsTooSmallException;
import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.analysis.DifferentiableMultivariateVectorialFunction;
+import org.apache.commons.math.analysis.DifferentiableMultivariateVectorFunction;
import org.apache.commons.math.analysis.MultivariateMatrixFunction;
import org.apache.commons.math.exception.util.LocalizedFormats;
import org.apache.commons.math.linear.LUDecomposition;
@@ -36,9 +36,9 @@ import org.apache.commons.math.util.Fast
* It handles the boilerplate methods associated to thresholds settings,
* jacobian and error estimation.
* <br/>
- * This class uses the {@link DifferentiableMultivariateVectorialFunction#jacobian()}
+ * This class uses the {@link DifferentiableMultivariateVectorFunction#jacobian()}
* of the function argument in method
- * {@link #optimize(int,DifferentiableMultivariateVectorialFunction,double[],double[],double[])
+ * {@link #optimize(int,DifferentiableMultivariateVectorFunction,double[],double[],double[])
* optimize} and assumes that, in the matrix returned by the
* {@link MultivariateMatrixFunction#value(double[]) value} method, the rows
* iterate on the model functions while the columns iterate on the parameters; thus,
@@ -49,7 +49,7 @@ import org.apache.commons.math.util.Fast
* @since 1.2
*/
public abstract class AbstractLeastSquaresOptimizer
- extends BaseAbstractVectorialOptimizer<DifferentiableMultivariateVectorialFunction>
+ extends BaseAbstractVectorialOptimizer<DifferentiableMultivariateVectorFunction>
implements DifferentiableMultivariateVectorialOptimizer {
/** Singularity threshold (cf. {@link #getCovariances(double)}). */
private static final double DEFAULT_SINGULARITY_THRESHOLD = 1e-14;
@@ -244,7 +244,7 @@ public abstract class AbstractLeastSquar
/** {@inheritDoc} */
@Override
public VectorialPointValuePair optimize(int maxEval,
- final DifferentiableMultivariateVectorialFunction f,
+ final DifferentiableMultivariateVectorFunction f,
final double[] target, final double[] weights,
final double[] startPoint) {
// Reset counter.
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/general/AbstractScalarDifferentiableOptimizer.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/general/AbstractScalarDifferentiableOptimizer.java?rev=1207671&r1=1207670&r2=1207671&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/general/AbstractScalarDifferentiableOptimizer.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/general/AbstractScalarDifferentiableOptimizer.java Mon Nov 28 22:41:41 2011
@@ -18,7 +18,7 @@
package org.apache.commons.math.optimization.general;
import org.apache.commons.math.analysis.DifferentiableMultivariateFunction;
-import org.apache.commons.math.analysis.MultivariateVectorialFunction;
+import org.apache.commons.math.analysis.MultivariateVectorFunction;
import org.apache.commons.math.optimization.DifferentiableMultivariateRealOptimizer;
import org.apache.commons.math.optimization.GoalType;
import org.apache.commons.math.optimization.ConvergenceChecker;
@@ -39,7 +39,7 @@ public abstract class AbstractScalarDiff
/**
* Objective function gradient.
*/
- private MultivariateVectorialFunction gradient;
+ private MultivariateVectorFunction gradient;
/**
* Simple constructor with default settings.
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/package-info.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/package-info.java?rev=1207671&r1=1207670&r2=1207671&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/package-info.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/optimization/package-info.java Mon Nov 28 22:41:41 2011
@@ -44,14 +44,14 @@
* differentiable multivariate real functions}</li>
* <li>{@link org.apache.commons.math.optimization.DifferentiableMultivariateVectorialOptimizer
* DifferentiableMultivariateVectorialOptimizer} for {@link
- * org.apache.commons.math.analysis.DifferentiableMultivariateVectorialFunction
+ * org.apache.commons.math.analysis.DifferentiableMultivariateVectorFunction
* differentiable multivariate vectorial functions}</li>
* </ul>
* </p>
*
* <p>
* Despite there are only four types of supported optimizers, it is possible to optimize a
- * transform a {@link org.apache.commons.math.analysis.MultivariateVectorialFunction
+ * transform a {@link org.apache.commons.math.analysis.MultivariateVectorFunction
* non-differentiable multivariate vectorial function} by converting it to a {@link
* org.apache.commons.math.analysis.MultivariateFunction non-differentiable multivariate
* real function} thanks to the {@link
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/SumSincFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/SumSincFunction.java?rev=1207671&r1=1207670&r2=1207671&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/SumSincFunction.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/analysis/SumSincFunction.java Mon Nov 28 22:41:41 2011
@@ -65,8 +65,8 @@ public class SumSincFunction implements
/**
* {@inheritDoc}
*/
- public MultivariateVectorialFunction gradient() {
- return new MultivariateVectorialFunction() {
+ public MultivariateVectorFunction gradient() {
+ return new MultivariateVectorFunction() {
public double[] value(double[] point) {
final int n = point.length;
final double[] r = new double[n];
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/BatteryNISTTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/BatteryNISTTest.java?rev=1207671&r1=1207670&r2=1207671&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/BatteryNISTTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/BatteryNISTTest.java Mon Nov 28 22:41:41 2011
@@ -21,7 +21,7 @@ import org.apache.commons.math.MathRunti
import org.apache.commons.math.TestUtils;
import org.apache.commons.math.analysis.DifferentiableMultivariateFunction;
import org.apache.commons.math.analysis.MultivariateFunction;
-import org.apache.commons.math.analysis.MultivariateVectorialFunction;
+import org.apache.commons.math.analysis.MultivariateVectorFunction;
import org.apache.commons.math.exception.util.LocalizedFormats;
import org.apache.commons.math.optimization.direct.BOBYQAOptimizer;
import org.apache.commons.math.optimization.direct.PowellOptimizer;
@@ -803,7 +803,7 @@ public class BatteryNISTTest {
/* base objective function class for these tests */
private abstract static class nistMVRF implements DifferentiableMultivariateFunction {
protected final MultivariateFunction[] mrf;
- protected final MultivariateVectorialFunction mvf = new MultivariateVectorialFunction() {
+ protected final MultivariateVectorFunction mvf = new MultivariateVectorFunction() {
public double[] value(double[] point) throws IllegalArgumentException {
return getGradient(point);
@@ -843,7 +843,7 @@ public class BatteryNISTTest {
}
}
- public MultivariateVectorialFunction gradient() {
+ public MultivariateVectorFunction gradient() {
return mvf;
}
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateRealOptimizerTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateRealOptimizerTest.java?rev=1207671&r1=1207670&r2=1207671&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateRealOptimizerTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateRealOptimizerTest.java Mon Nov 28 22:41:41 2011
@@ -23,7 +23,7 @@ import java.util.ArrayList;
import org.apache.commons.math.analysis.DifferentiableMultivariateFunction;
import org.apache.commons.math.analysis.MultivariateFunction;
-import org.apache.commons.math.analysis.MultivariateVectorialFunction;
+import org.apache.commons.math.analysis.MultivariateVectorFunction;
import org.apache.commons.math.optimization.general.ConjugateGradientFormula;
import org.apache.commons.math.optimization.general.NonLinearConjugateGradientOptimizer;
import org.apache.commons.math.random.GaussianRandomGenerator;
@@ -121,8 +121,8 @@ public class MultiStartDifferentiableMul
return sum;
}
- public MultivariateVectorialFunction gradient() {
- return new MultivariateVectorialFunction() {
+ public MultivariateVectorFunction gradient() {
+ return new MultivariateVectorFunction() {
public double[] value(double[] point) {
return gradient(point);
}
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateVectorialOptimizerTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateVectorialOptimizerTest.java?rev=1207671&r1=1207670&r2=1207671&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateVectorialOptimizerTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateVectorialOptimizerTest.java Mon Nov 28 22:41:41 2011
@@ -18,7 +18,7 @@
package org.apache.commons.math.optimization;
-import org.apache.commons.math.analysis.DifferentiableMultivariateVectorialFunction;
+import org.apache.commons.math.analysis.DifferentiableMultivariateVectorFunction;
import org.apache.commons.math.analysis.MultivariateMatrixFunction;
import org.apache.commons.math.exception.MathIllegalStateException;
import org.apache.commons.math.linear.BlockRealMatrix;
@@ -144,7 +144,7 @@ public class MultiStartDifferentiableMul
MultiStartDifferentiableMultivariateVectorialOptimizer optimizer =
new MultiStartDifferentiableMultivariateVectorialOptimizer(underlyingOptimizer,
10, generator);
- optimizer.optimize(100, new DifferentiableMultivariateVectorialFunction() {
+ optimizer.optimize(100, new DifferentiableMultivariateVectorFunction() {
public MultivariateMatrixFunction jacobian() {
return null;
}
@@ -158,7 +158,7 @@ public class MultiStartDifferentiableMul
private static final long serialVersionUID = -7809988995389067683L;
}
- private static class LinearProblem implements DifferentiableMultivariateVectorialFunction {
+ private static class LinearProblem implements DifferentiableMultivariateVectorFunction {
final RealMatrix factors;
final double[] target;
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/direct/SimplexOptimizerNelderMeadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/direct/SimplexOptimizerNelderMeadTest.java?rev=1207671&r1=1207670&r2=1207671&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/direct/SimplexOptimizerNelderMeadTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/direct/SimplexOptimizerNelderMeadTest.java Mon Nov 28 22:41:41 2011
@@ -20,7 +20,7 @@ package org.apache.commons.math.optimiza
import org.apache.commons.math.exception.TooManyEvaluationsException;
import org.apache.commons.math.analysis.MultivariateFunction;
-import org.apache.commons.math.analysis.MultivariateVectorialFunction;
+import org.apache.commons.math.analysis.MultivariateVectorFunction;
import org.apache.commons.math.linear.Array2DRowRealMatrix;
import org.apache.commons.math.linear.RealMatrix;
import org.apache.commons.math.optimization.GoalType;
@@ -130,7 +130,7 @@ public class SimplexOptimizerNelderMeadT
{ 1, 0 },
{ 0, 1 }
}, false);
- LeastSquaresConverter ls = new LeastSquaresConverter(new MultivariateVectorialFunction() {
+ LeastSquaresConverter ls = new LeastSquaresConverter(new MultivariateVectorFunction() {
public double[] value(double[] variables) {
return factors.operate(variables);
}
@@ -154,7 +154,7 @@ public class SimplexOptimizerNelderMeadT
{ 1, 0 },
{ 0, 1 }
}, false);
- LeastSquaresConverter ls = new LeastSquaresConverter(new MultivariateVectorialFunction() {
+ LeastSquaresConverter ls = new LeastSquaresConverter(new MultivariateVectorFunction() {
public double[] value(double[] variables) {
return factors.operate(variables);
}
@@ -178,7 +178,7 @@ public class SimplexOptimizerNelderMeadT
{ 1, 0 },
{ 0, 1 }
}, false);
- LeastSquaresConverter ls = new LeastSquaresConverter(new MultivariateVectorialFunction() {
+ LeastSquaresConverter ls = new LeastSquaresConverter(new MultivariateVectorFunction() {
public double[] value(double[] variables) {
return factors.operate(variables);
}
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/CircleScalar.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/CircleScalar.java?rev=1207671&r1=1207670&r2=1207671&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/CircleScalar.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/CircleScalar.java Mon Nov 28 22:41:41 2011
@@ -21,7 +21,7 @@ import java.awt.geom.Point2D;
import java.util.ArrayList;
import org.apache.commons.math.analysis.DifferentiableMultivariateFunction;
import org.apache.commons.math.analysis.MultivariateFunction;
-import org.apache.commons.math.analysis.MultivariateVectorialFunction;
+import org.apache.commons.math.analysis.MultivariateVectorFunction;
/**
* Class used in the tests.
@@ -77,8 +77,8 @@ class CircleScalar implements Differenti
return sum;
}
- public MultivariateVectorialFunction gradient() {
- return new MultivariateVectorialFunction() {
+ public MultivariateVectorFunction gradient() {
+ return new MultivariateVectorFunction() {
public double[] value(double[] point) {
return gradient(point);
}
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/CircleVectorial.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/CircleVectorial.java?rev=1207671&r1=1207670&r2=1207671&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/CircleVectorial.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/CircleVectorial.java Mon Nov 28 22:41:41 2011
@@ -19,13 +19,13 @@ package org.apache.commons.math.optimiza
import java.awt.geom.Point2D;
import java.util.ArrayList;
-import org.apache.commons.math.analysis.DifferentiableMultivariateVectorialFunction;
+import org.apache.commons.math.analysis.DifferentiableMultivariateVectorFunction;
import org.apache.commons.math.analysis.MultivariateMatrixFunction;
/**
* Class used in the tests.
*/
-class CircleVectorial implements DifferentiableMultivariateVectorialFunction {
+class CircleVectorial implements DifferentiableMultivariateVectorFunction {
private ArrayList<Point2D.Double> points;
public CircleVectorial() {
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/GaussNewtonOptimizerTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/GaussNewtonOptimizerTest.java?rev=1207671&r1=1207670&r2=1207671&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/GaussNewtonOptimizerTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/GaussNewtonOptimizerTest.java Mon Nov 28 22:41:41 2011
@@ -25,7 +25,7 @@ import java.util.Arrays;
import org.apache.commons.math.exception.ConvergenceException;
import org.apache.commons.math.exception.TooManyEvaluationsException;
import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.analysis.DifferentiableMultivariateVectorialFunction;
+import org.apache.commons.math.analysis.DifferentiableMultivariateVectorFunction;
import org.apache.commons.math.analysis.MultivariateMatrixFunction;
import org.apache.commons.math.linear.BlockRealMatrix;
import org.apache.commons.math.linear.RealMatrix;
@@ -446,7 +446,7 @@ public class GaussNewtonOptimizerTest {
Assert.assertEquals(0.04268731682389561, optimizer.getRMS(), 1.0e-8);
}
- private static class LinearProblem implements DifferentiableMultivariateVectorialFunction, Serializable {
+ private static class LinearProblem implements DifferentiableMultivariateVectorFunction, Serializable {
private static final long serialVersionUID = -8804268799379350190L;
final RealMatrix factors;
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/LevenbergMarquardtOptimizerTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/LevenbergMarquardtOptimizerTest.java?rev=1207671&r1=1207670&r2=1207671&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/LevenbergMarquardtOptimizerTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/LevenbergMarquardtOptimizerTest.java Mon Nov 28 22:41:41 2011
@@ -28,7 +28,7 @@ import org.apache.commons.math.exception
import org.apache.commons.math.exception.DimensionMismatchException;
import org.apache.commons.math.exception.TooManyEvaluationsException;
import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.analysis.DifferentiableMultivariateVectorialFunction;
+import org.apache.commons.math.analysis.DifferentiableMultivariateVectorFunction;
import org.apache.commons.math.analysis.MultivariateMatrixFunction;
import org.apache.commons.math.linear.BlockRealMatrix;
import org.apache.commons.math.linear.RealMatrix;
@@ -365,7 +365,7 @@ public class LevenbergMarquardtOptimizer
checkEstimate(circle, 0.1, 20, 1.0e-18, 1.0e-16, 1.0e-10, true);
}
- private void checkEstimate(DifferentiableMultivariateVectorialFunction problem,
+ private void checkEstimate(DifferentiableMultivariateVectorFunction problem,
double initialStepBoundFactor, int maxCostEval,
double costRelativeTolerance, double parRelativeTolerance,
double orthoTolerance, boolean shouldFail) {
@@ -511,7 +511,7 @@ public class LevenbergMarquardtOptimizer
}
}
- private static class LinearProblem implements DifferentiableMultivariateVectorialFunction, Serializable {
+ private static class LinearProblem implements DifferentiableMultivariateVectorFunction, Serializable {
private static final long serialVersionUID = 703247177355019415L;
final RealMatrix factors;
@@ -534,7 +534,7 @@ public class LevenbergMarquardtOptimizer
}
}
- private static class QuadraticProblem implements DifferentiableMultivariateVectorialFunction, Serializable {
+ private static class QuadraticProblem implements DifferentiableMultivariateVectorFunction, Serializable {
private static final long serialVersionUID = 7072187082052755854L;
private List<Double> x;
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/MinpackTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/MinpackTest.java?rev=1207671&r1=1207670&r2=1207671&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/MinpackTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/MinpackTest.java Mon Nov 28 22:41:41 2011
@@ -22,7 +22,7 @@ import java.util.Arrays;
import org.apache.commons.math.exception.TooManyEvaluationsException;
-import org.apache.commons.math.analysis.DifferentiableMultivariateVectorialFunction;
+import org.apache.commons.math.analysis.DifferentiableMultivariateVectorFunction;
import org.apache.commons.math.analysis.MultivariateMatrixFunction;
import org.apache.commons.math.optimization.VectorialPointValuePair;
import org.apache.commons.math.util.FastMath;
@@ -522,7 +522,7 @@ public class MinpackTest {
}
private static abstract class MinpackFunction
- implements DifferentiableMultivariateVectorialFunction, Serializable {
+ implements DifferentiableMultivariateVectorFunction, Serializable {
private static final long serialVersionUID = -6209760235478794233L;
protected int n;
Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizerTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizerTest.java?rev=1207671&r1=1207670&r2=1207671&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizerTest.java (original)
+++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizerTest.java Mon Nov 28 22:41:41 2011
@@ -21,7 +21,7 @@ import java.awt.geom.Point2D;
import java.io.Serializable;
import org.apache.commons.math.analysis.DifferentiableMultivariateFunction;
import org.apache.commons.math.analysis.MultivariateFunction;
-import org.apache.commons.math.analysis.MultivariateVectorialFunction;
+import org.apache.commons.math.analysis.MultivariateVectorFunction;
import org.apache.commons.math.analysis.solvers.BrentSolver;
import org.apache.commons.math.linear.BlockRealMatrix;
import org.apache.commons.math.linear.RealMatrix;
@@ -375,8 +375,8 @@ public class NonLinearConjugateGradientO
return sum;
}
- public MultivariateVectorialFunction gradient() {
- return new MultivariateVectorialFunction() {
+ public MultivariateVectorFunction gradient() {
+ return new MultivariateVectorFunction() {
public double[] value(double[] point) {
return gradient(point);
}