http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/BaseMultivariateSimpleBoundsOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/BaseMultivariateSimpleBoundsOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/BaseMultivariateSimpleBoundsOptimizer.java index b0c8b8a..b237dee 100644 --- a/src/main/java/org/apache/commons/math4/optimization/BaseMultivariateSimpleBoundsOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optimization/BaseMultivariateSimpleBoundsOptimizer.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization; +package org.apache.commons.math4.optimization; -import org.apache.commons.math3.analysis.MultivariateFunction; +import org.apache.commons.math4.analysis.MultivariateFunction; /** * This interface is mainly intended to enforce the internal coherence of * Commons-FastMath. Users of the API are advised to base their code on * the following interfaces: * <ul> - * <li>{@link org.apache.commons.math3.optimization.MultivariateOptimizer}</li> - * <li>{@link org.apache.commons.math3.optimization.MultivariateDifferentiableOptimizer}</li> + * <li>{@link org.apache.commons.math4.optimization.MultivariateOptimizer}</li> + * <li>{@link org.apache.commons.math4.optimization.MultivariateDifferentiableOptimizer}</li> * </ul> * * @param <FUNC> Type of the objective function to be optimized. @@ -48,15 +48,15 @@ public interface BaseMultivariateSimpleBoundsOptimizer<FUNC extends Multivariate * @param upperBound Upper bound for each of the parameters. * @return the point/value pair giving the optimal value for objective * function. - * @throws org.apache.commons.math3.exception.DimensionMismatchException + * @throws org.apache.commons.math4.exception.DimensionMismatchException * if the array sizes are wrong. - * @throws org.apache.commons.math3.exception.TooManyEvaluationsException + * @throws org.apache.commons.math4.exception.TooManyEvaluationsException * if the maximal number of evaluations is exceeded. - * @throws org.apache.commons.math3.exception.NullArgumentException if + * @throws org.apache.commons.math4.exception.NullArgumentException if * {@code f}, {@code goalType} or {@code startPoint} is {@code null}. - * @throws org.apache.commons.math3.exception.NumberIsTooSmallException if any + * @throws org.apache.commons.math4.exception.NumberIsTooSmallException if any * of the initial values is less than its lower bound. - * @throws org.apache.commons.math3.exception.NumberIsTooLargeException if any + * @throws org.apache.commons.math4.exception.NumberIsTooLargeException if any * of the initial values is greater than its upper bound. */ PointValuePair optimize(int maxEval, FUNC f, GoalType goalType,
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/BaseMultivariateVectorMultiStartOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/BaseMultivariateVectorMultiStartOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/BaseMultivariateVectorMultiStartOptimizer.java index d69b13f..f3048d1 100644 --- a/src/main/java/org/apache/commons/math4/optimization/BaseMultivariateVectorMultiStartOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optimization/BaseMultivariateVectorMultiStartOptimizer.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization; +package org.apache.commons.math4.optimization; import java.util.Arrays; import java.util.Comparator; -import org.apache.commons.math3.analysis.MultivariateVectorFunction; -import org.apache.commons.math3.exception.ConvergenceException; -import org.apache.commons.math3.exception.MathIllegalStateException; -import org.apache.commons.math3.exception.NotStrictlyPositiveException; -import org.apache.commons.math3.exception.NullArgumentException; -import org.apache.commons.math3.exception.util.LocalizedFormats; -import org.apache.commons.math3.random.RandomVectorGenerator; +import org.apache.commons.math4.analysis.MultivariateVectorFunction; +import org.apache.commons.math4.exception.ConvergenceException; +import org.apache.commons.math4.exception.MathIllegalStateException; +import org.apache.commons.math4.exception.NotStrictlyPositiveException; +import org.apache.commons.math4.exception.NullArgumentException; +import org.apache.commons.math4.exception.util.LocalizedFormats; +import org.apache.commons.math4.random.RandomVectorGenerator; /** * Base class for all implementations of a multi-start optimizer. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/BaseMultivariateVectorOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/BaseMultivariateVectorOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/BaseMultivariateVectorOptimizer.java index c620da5..34908ec 100644 --- a/src/main/java/org/apache/commons/math4/optimization/BaseMultivariateVectorOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optimization/BaseMultivariateVectorOptimizer.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization; +package org.apache.commons.math4.optimization; -import org.apache.commons.math3.analysis.MultivariateVectorFunction; +import org.apache.commons.math4.analysis.MultivariateVectorFunction; /** * This interface is mainly intended to enforce the internal coherence of * Commons-Math. Users of the API are advised to base their code on * the following interfaces: * <ul> - * <li>{@link org.apache.commons.math3.optimization.DifferentiableMultivariateVectorOptimizer}</li> + * <li>{@link org.apache.commons.math4.optimization.DifferentiableMultivariateVectorOptimizer}</li> * </ul> * * @param <FUNC> Type of the objective function to be optimized. @@ -48,14 +48,14 @@ public interface BaseMultivariateVectorOptimizer<FUNC extends MultivariateVector * @return the point/value pair giving the optimal value for objective * function. * @param maxEval Maximum number of function evaluations. - * @throws org.apache.commons.math3.exception.DimensionMismatchException + * @throws org.apache.commons.math4.exception.DimensionMismatchException * if the start point dimension is wrong. - * @throws org.apache.commons.math3.exception.TooManyEvaluationsException + * @throws org.apache.commons.math4.exception.TooManyEvaluationsException * if the maximal number of evaluations is exceeded. - * @throws org.apache.commons.math3.exception.NullArgumentException if + * @throws org.apache.commons.math4.exception.NullArgumentException if * any argument is {@code null}. * @deprecated As of 3.1. In 4.0, this will be replaced by the declaration - * corresponding to this {@link org.apache.commons.math3.optimization.direct.BaseAbstractMultivariateVectorOptimizer#optimize(int,MultivariateVectorFunction,OptimizationData[]) method}. + * corresponding to this {@link org.apache.commons.math4.optimization.direct.BaseAbstractMultivariateVectorOptimizer#optimize(int,MultivariateVectorFunction,OptimizationData[]) method}. */ @Deprecated PointVectorValuePair optimize(int maxEval, FUNC f, double[] target, http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/BaseOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/BaseOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/BaseOptimizer.java index af93b8b..68c1f87 100644 --- a/src/main/java/org/apache/commons/math4/optimization/BaseOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optimization/BaseOptimizer.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization; +package org.apache.commons.math4.optimization; /** * This interface is mainly intended to enforce the internal coherence of * Commons-Math. Users of the API are advised to base their code on * the following interfaces: * <ul> - * <li>{@link org.apache.commons.math3.optimization.MultivariateOptimizer}</li> - * <li>{@link org.apache.commons.math3.optimization.MultivariateDifferentiableOptimizer}</li> - * <li>{@link org.apache.commons.math3.optimization.MultivariateDifferentiableVectorOptimizer}</li> - * <li>{@link org.apache.commons.math3.optimization.univariate.UnivariateOptimizer}</li> + * <li>{@link org.apache.commons.math4.optimization.MultivariateOptimizer}</li> + * <li>{@link org.apache.commons.math4.optimization.MultivariateDifferentiableOptimizer}</li> + * <li>{@link org.apache.commons.math4.optimization.MultivariateDifferentiableVectorOptimizer}</li> + * <li>{@link org.apache.commons.math4.optimization.univariate.UnivariateOptimizer}</li> * </ul> * * @param <PAIR> Type of the point/objective pair. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/ConvergenceChecker.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/ConvergenceChecker.java b/src/main/java/org/apache/commons/math4/optimization/ConvergenceChecker.java index eb14b3f..3c157dc 100644 --- a/src/main/java/org/apache/commons/math4/optimization/ConvergenceChecker.java +++ b/src/main/java/org/apache/commons/math4/optimization/ConvergenceChecker.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization; +package org.apache.commons.math4.optimization; /** * This interface specifies how to check if an optimization algorithm has @@ -36,9 +36,9 @@ package org.apache.commons.math3.optimization; * * @param <PAIR> Type of the (point, objective value) pair. * - * @see org.apache.commons.math3.optimization.SimplePointChecker - * @see org.apache.commons.math3.optimization.SimpleValueChecker - * @see org.apache.commons.math3.optimization.SimpleVectorValueChecker + * @see org.apache.commons.math4.optimization.SimplePointChecker + * @see org.apache.commons.math4.optimization.SimpleValueChecker + * @see org.apache.commons.math4.optimization.SimpleVectorValueChecker * * @deprecated As of 3.1 (to be removed in 4.0). * @since 3.0 http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/DifferentiableMultivariateMultiStartOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/DifferentiableMultivariateMultiStartOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/DifferentiableMultivariateMultiStartOptimizer.java index a395284..27d2f8c 100644 --- a/src/main/java/org/apache/commons/math4/optimization/DifferentiableMultivariateMultiStartOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optimization/DifferentiableMultivariateMultiStartOptimizer.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization; +package org.apache.commons.math4.optimization; -import org.apache.commons.math3.analysis.DifferentiableMultivariateFunction; -import org.apache.commons.math3.random.RandomVectorGenerator; +import org.apache.commons.math4.analysis.DifferentiableMultivariateFunction; +import org.apache.commons.math4.random.RandomVectorGenerator; /** * Special implementation of the {@link DifferentiableMultivariateOptimizer} http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/DifferentiableMultivariateOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/DifferentiableMultivariateOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/DifferentiableMultivariateOptimizer.java index 4c2e7ec..f1d8da2 100644 --- a/src/main/java/org/apache/commons/math4/optimization/DifferentiableMultivariateOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optimization/DifferentiableMultivariateOptimizer.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization; +package org.apache.commons.math4.optimization; -import org.apache.commons.math3.analysis.DifferentiableMultivariateFunction; +import org.apache.commons.math4.analysis.DifferentiableMultivariateFunction; /** * This interface represents an optimization algorithm for http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/DifferentiableMultivariateVectorMultiStartOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/DifferentiableMultivariateVectorMultiStartOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/DifferentiableMultivariateVectorMultiStartOptimizer.java index 88ed197..b76365e 100644 --- a/src/main/java/org/apache/commons/math4/optimization/DifferentiableMultivariateVectorMultiStartOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optimization/DifferentiableMultivariateVectorMultiStartOptimizer.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization; +package org.apache.commons.math4.optimization; -import org.apache.commons.math3.analysis.DifferentiableMultivariateVectorFunction; -import org.apache.commons.math3.random.RandomVectorGenerator; +import org.apache.commons.math4.analysis.DifferentiableMultivariateVectorFunction; +import org.apache.commons.math4.random.RandomVectorGenerator; /** * Special implementation of the {@link DifferentiableMultivariateVectorOptimizer} http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/DifferentiableMultivariateVectorOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/DifferentiableMultivariateVectorOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/DifferentiableMultivariateVectorOptimizer.java index e3d30ae..d4ecdf5 100644 --- a/src/main/java/org/apache/commons/math4/optimization/DifferentiableMultivariateVectorOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optimization/DifferentiableMultivariateVectorOptimizer.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization; +package org.apache.commons.math4.optimization; -import org.apache.commons.math3.analysis.DifferentiableMultivariateVectorFunction; +import org.apache.commons.math4.analysis.DifferentiableMultivariateVectorFunction; /** * This interface represents an optimization algorithm for http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/GoalType.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/GoalType.java b/src/main/java/org/apache/commons/math4/optimization/GoalType.java index f752397..d61072f 100644 --- a/src/main/java/org/apache/commons/math4/optimization/GoalType.java +++ b/src/main/java/org/apache/commons/math4/optimization/GoalType.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization; +package org.apache.commons.math4.optimization; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/InitialGuess.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/InitialGuess.java b/src/main/java/org/apache/commons/math4/optimization/InitialGuess.java index e319a48..b12680c 100644 --- a/src/main/java/org/apache/commons/math4/optimization/InitialGuess.java +++ b/src/main/java/org/apache/commons/math4/optimization/InitialGuess.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization; +package org.apache.commons.math4.optimization; /** * Starting point (first guess) of the optimization procedure. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/LeastSquaresConverter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/LeastSquaresConverter.java b/src/main/java/org/apache/commons/math4/optimization/LeastSquaresConverter.java index 06d21bf..74ca4ee 100644 --- a/src/main/java/org/apache/commons/math4/optimization/LeastSquaresConverter.java +++ b/src/main/java/org/apache/commons/math4/optimization/LeastSquaresConverter.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization; +package org.apache.commons.math4.optimization; -import org.apache.commons.math3.analysis.MultivariateFunction; -import org.apache.commons.math3.analysis.MultivariateVectorFunction; -import org.apache.commons.math3.exception.DimensionMismatchException; -import org.apache.commons.math3.linear.RealMatrix; +import org.apache.commons.math4.analysis.MultivariateFunction; +import org.apache.commons.math4.analysis.MultivariateVectorFunction; +import org.apache.commons.math4.exception.DimensionMismatchException; +import org.apache.commons.math4.linear.RealMatrix; /** This class converts {@link MultivariateVectorFunction vectorial * objective functions} to {@link MultivariateFunction scalar objective functions} http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/MultivariateDifferentiableMultiStartOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/MultivariateDifferentiableMultiStartOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/MultivariateDifferentiableMultiStartOptimizer.java index fa4d6ef..ca558f0 100644 --- a/src/main/java/org/apache/commons/math4/optimization/MultivariateDifferentiableMultiStartOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optimization/MultivariateDifferentiableMultiStartOptimizer.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization; +package org.apache.commons.math4.optimization; -import org.apache.commons.math3.analysis.differentiation.MultivariateDifferentiableFunction; -import org.apache.commons.math3.random.RandomVectorGenerator; +import org.apache.commons.math4.analysis.differentiation.MultivariateDifferentiableFunction; +import org.apache.commons.math4.random.RandomVectorGenerator; /** * Special implementation of the {@link MultivariateDifferentiableOptimizer} http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/MultivariateDifferentiableOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/MultivariateDifferentiableOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/MultivariateDifferentiableOptimizer.java index 66c0327..67e894e 100644 --- a/src/main/java/org/apache/commons/math4/optimization/MultivariateDifferentiableOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optimization/MultivariateDifferentiableOptimizer.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization; +package org.apache.commons.math4.optimization; -import org.apache.commons.math3.analysis.differentiation.MultivariateDifferentiableFunction; +import org.apache.commons.math4.analysis.differentiation.MultivariateDifferentiableFunction; /** * This interface represents an optimization algorithm for http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/MultivariateDifferentiableVectorMultiStartOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/MultivariateDifferentiableVectorMultiStartOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/MultivariateDifferentiableVectorMultiStartOptimizer.java index 26da7d5..63e8953 100644 --- a/src/main/java/org/apache/commons/math4/optimization/MultivariateDifferentiableVectorMultiStartOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optimization/MultivariateDifferentiableVectorMultiStartOptimizer.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization; +package org.apache.commons.math4.optimization; -import org.apache.commons.math3.analysis.differentiation.MultivariateDifferentiableVectorFunction; -import org.apache.commons.math3.random.RandomVectorGenerator; +import org.apache.commons.math4.analysis.differentiation.MultivariateDifferentiableVectorFunction; +import org.apache.commons.math4.random.RandomVectorGenerator; /** * Special implementation of the {@link MultivariateDifferentiableVectorOptimizer} http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/MultivariateDifferentiableVectorOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/MultivariateDifferentiableVectorOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/MultivariateDifferentiableVectorOptimizer.java index 1abe3bc..569624d 100644 --- a/src/main/java/org/apache/commons/math4/optimization/MultivariateDifferentiableVectorOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optimization/MultivariateDifferentiableVectorOptimizer.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization; +package org.apache.commons.math4.optimization; -import org.apache.commons.math3.analysis.differentiation.MultivariateDifferentiableVectorFunction; +import org.apache.commons.math4.analysis.differentiation.MultivariateDifferentiableVectorFunction; /** * This interface represents an optimization algorithm for http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/MultivariateMultiStartOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/MultivariateMultiStartOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/MultivariateMultiStartOptimizer.java index d33f52a..8c0df54 100644 --- a/src/main/java/org/apache/commons/math4/optimization/MultivariateMultiStartOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optimization/MultivariateMultiStartOptimizer.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization; +package org.apache.commons.math4.optimization; -import org.apache.commons.math3.analysis.MultivariateFunction; -import org.apache.commons.math3.random.RandomVectorGenerator; +import org.apache.commons.math4.analysis.MultivariateFunction; +import org.apache.commons.math4.random.RandomVectorGenerator; /** * Special implementation of the {@link MultivariateOptimizer} interface adding http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/MultivariateOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/MultivariateOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/MultivariateOptimizer.java index b2d3cc2..e0d2715 100644 --- a/src/main/java/org/apache/commons/math4/optimization/MultivariateOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optimization/MultivariateOptimizer.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization; +package org.apache.commons.math4.optimization; -import org.apache.commons.math3.analysis.MultivariateFunction; +import org.apache.commons.math4.analysis.MultivariateFunction; /** * This interface represents an optimization algorithm for {@link MultivariateFunction http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/OptimizationData.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/OptimizationData.java b/src/main/java/org/apache/commons/math4/optimization/OptimizationData.java index e807667..1ddf3c7 100644 --- a/src/main/java/org/apache/commons/math4/optimization/OptimizationData.java +++ b/src/main/java/org/apache/commons/math4/optimization/OptimizationData.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optimization; +package org.apache.commons.math4.optimization; /** * Marker interface. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/PointValuePair.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/PointValuePair.java b/src/main/java/org/apache/commons/math4/optimization/PointValuePair.java index 7db9261..d3831e9 100644 --- a/src/main/java/org/apache/commons/math4/optimization/PointValuePair.java +++ b/src/main/java/org/apache/commons/math4/optimization/PointValuePair.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization; +package org.apache.commons.math4.optimization; import java.io.Serializable; -import org.apache.commons.math3.util.Pair; +import org.apache.commons.math4.util.Pair; /** * This class holds a point and the value of an objective function at * that point. * * @see PointVectorValuePair - * @see org.apache.commons.math3.analysis.MultivariateFunction + * @see org.apache.commons.math4.analysis.MultivariateFunction * @deprecated As of 3.1 (to be removed in 4.0). * @since 3.0 */ http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/PointVectorValuePair.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/PointVectorValuePair.java b/src/main/java/org/apache/commons/math4/optimization/PointVectorValuePair.java index 4c1884d..410ba67 100644 --- a/src/main/java/org/apache/commons/math4/optimization/PointVectorValuePair.java +++ b/src/main/java/org/apache/commons/math4/optimization/PointVectorValuePair.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization; +package org.apache.commons.math4.optimization; import java.io.Serializable; -import org.apache.commons.math3.util.Pair; +import org.apache.commons.math4.util.Pair; /** * This class holds a point and the vectorial value of an objective function at * that point. * * @see PointValuePair - * @see org.apache.commons.math3.analysis.MultivariateVectorFunction + * @see org.apache.commons.math4.analysis.MultivariateVectorFunction * @deprecated As of 3.1 (to be removed in 4.0). * @since 3.0 */ http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/SimpleBounds.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/SimpleBounds.java b/src/main/java/org/apache/commons/math4/optimization/SimpleBounds.java index 505f5ee..097ba8a 100644 --- a/src/main/java/org/apache/commons/math4/optimization/SimpleBounds.java +++ b/src/main/java/org/apache/commons/math4/optimization/SimpleBounds.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization; +package org.apache.commons.math4.optimization; /** * Simple optimization constraints: lower and upper bounds. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/SimplePointChecker.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/SimplePointChecker.java b/src/main/java/org/apache/commons/math4/optimization/SimplePointChecker.java index d1fdb8e..0651725 100644 --- a/src/main/java/org/apache/commons/math4/optimization/SimplePointChecker.java +++ b/src/main/java/org/apache/commons/math4/optimization/SimplePointChecker.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization; +package org.apache.commons.math4.optimization; -import org.apache.commons.math3.util.FastMath; -import org.apache.commons.math3.util.Pair; -import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math4.exception.NotStrictlyPositiveException; +import org.apache.commons.math4.util.FastMath; +import org.apache.commons.math4.util.Pair; /** * Simple implementation of the {@link ConvergenceChecker} interface using http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/SimpleValueChecker.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/SimpleValueChecker.java b/src/main/java/org/apache/commons/math4/optimization/SimpleValueChecker.java index 3ee0a90..45f44ba 100644 --- a/src/main/java/org/apache/commons/math4/optimization/SimpleValueChecker.java +++ b/src/main/java/org/apache/commons/math4/optimization/SimpleValueChecker.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization; +package org.apache.commons.math4.optimization; -import org.apache.commons.math3.util.FastMath; -import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math4.exception.NotStrictlyPositiveException; +import org.apache.commons.math4.util.FastMath; /** * Simple implementation of the {@link ConvergenceChecker} interface using http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/SimpleVectorValueChecker.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/SimpleVectorValueChecker.java b/src/main/java/org/apache/commons/math4/optimization/SimpleVectorValueChecker.java index 8238ff8..8105988 100644 --- a/src/main/java/org/apache/commons/math4/optimization/SimpleVectorValueChecker.java +++ b/src/main/java/org/apache/commons/math4/optimization/SimpleVectorValueChecker.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization; +package org.apache.commons.math4.optimization; -import org.apache.commons.math3.util.FastMath; -import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math4.exception.NotStrictlyPositiveException; +import org.apache.commons.math4.util.FastMath; /** * Simple implementation of the {@link ConvergenceChecker} interface using http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/Target.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/Target.java b/src/main/java/org/apache/commons/math4/optimization/Target.java index 3a0bb44..380d841 100644 --- a/src/main/java/org/apache/commons/math4/optimization/Target.java +++ b/src/main/java/org/apache/commons/math4/optimization/Target.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization; +package org.apache.commons.math4.optimization; /** * Target of the optimization procedure. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/Weight.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/Weight.java b/src/main/java/org/apache/commons/math4/optimization/Weight.java index 012a1fc..e5a3a9e 100644 --- a/src/main/java/org/apache/commons/math4/optimization/Weight.java +++ b/src/main/java/org/apache/commons/math4/optimization/Weight.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization; +package org.apache.commons.math4.optimization; -import org.apache.commons.math3.linear.RealMatrix; -import org.apache.commons.math3.linear.DiagonalMatrix; -import org.apache.commons.math3.linear.NonSquareMatrixException; +import org.apache.commons.math4.linear.DiagonalMatrix; +import org.apache.commons.math4.linear.NonSquareMatrixException; +import org.apache.commons.math4.linear.RealMatrix; /** * Weight matrix of the residuals between model and observations. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/direct/AbstractSimplex.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/direct/AbstractSimplex.java b/src/main/java/org/apache/commons/math4/optimization/direct/AbstractSimplex.java index b229cd1..d30a0c6 100644 --- a/src/main/java/org/apache/commons/math4/optimization/direct/AbstractSimplex.java +++ b/src/main/java/org/apache/commons/math4/optimization/direct/AbstractSimplex.java @@ -15,21 +15,21 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.direct; +package org.apache.commons.math4.optimization.direct; import java.util.Arrays; import java.util.Comparator; -import org.apache.commons.math3.analysis.MultivariateFunction; -import org.apache.commons.math3.exception.NotStrictlyPositiveException; -import org.apache.commons.math3.exception.DimensionMismatchException; -import org.apache.commons.math3.exception.ZeroException; -import org.apache.commons.math3.exception.OutOfRangeException; -import org.apache.commons.math3.exception.NullArgumentException; -import org.apache.commons.math3.exception.MathIllegalArgumentException; -import org.apache.commons.math3.exception.util.LocalizedFormats; -import org.apache.commons.math3.optimization.PointValuePair; -import org.apache.commons.math3.optimization.OptimizationData; +import org.apache.commons.math4.analysis.MultivariateFunction; +import org.apache.commons.math4.exception.DimensionMismatchException; +import org.apache.commons.math4.exception.MathIllegalArgumentException; +import org.apache.commons.math4.exception.NotStrictlyPositiveException; +import org.apache.commons.math4.exception.NullArgumentException; +import org.apache.commons.math4.exception.OutOfRangeException; +import org.apache.commons.math4.exception.ZeroException; +import org.apache.commons.math4.exception.util.LocalizedFormats; +import org.apache.commons.math4.optimization.OptimizationData; +import org.apache.commons.math4.optimization.PointValuePair; /** * This class implements the simplex concept. @@ -201,7 +201,7 @@ public abstract class AbstractSimplex implements OptimizationData { * @param evaluationFunction Evaluation function. * @param comparator Comparator to use to sort simplex vertices from best * to worst. - * @throws org.apache.commons.math3.exception.TooManyEvaluationsException + * @throws org.apache.commons.math4.exception.TooManyEvaluationsException * if the algorithm fails to converge. */ public abstract void iterate(final MultivariateFunction evaluationFunction, @@ -239,7 +239,7 @@ public abstract class AbstractSimplex implements OptimizationData { * * @param evaluationFunction Evaluation function. * @param comparator Comparator to use to sort simplex vertices from best to worst. - * @throws org.apache.commons.math3.exception.TooManyEvaluationsException + * @throws org.apache.commons.math4.exception.TooManyEvaluationsException * if the maximal number of evaluations is exceeded. */ public void evaluate(final MultivariateFunction evaluationFunction, http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/direct/BOBYQAOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/direct/BOBYQAOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/direct/BOBYQAOptimizer.java index 3b02370..487aad6 100644 --- a/src/main/java/org/apache/commons/math4/optimization/direct/BOBYQAOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optimization/direct/BOBYQAOptimizer.java @@ -16,20 +16,20 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.direct; - -import org.apache.commons.math3.analysis.MultivariateFunction; -import org.apache.commons.math3.exception.MathIllegalStateException; -import org.apache.commons.math3.exception.NumberIsTooSmallException; -import org.apache.commons.math3.exception.OutOfRangeException; -import org.apache.commons.math3.exception.util.LocalizedFormats; -import org.apache.commons.math3.linear.Array2DRowRealMatrix; -import org.apache.commons.math3.linear.ArrayRealVector; -import org.apache.commons.math3.linear.RealVector; -import org.apache.commons.math3.optimization.GoalType; -import org.apache.commons.math3.optimization.PointValuePair; -import org.apache.commons.math3.optimization.MultivariateOptimizer; -import org.apache.commons.math3.util.FastMath; +package org.apache.commons.math4.optimization.direct; + +import org.apache.commons.math4.analysis.MultivariateFunction; +import org.apache.commons.math4.exception.MathIllegalStateException; +import org.apache.commons.math4.exception.NumberIsTooSmallException; +import org.apache.commons.math4.exception.OutOfRangeException; +import org.apache.commons.math4.exception.util.LocalizedFormats; +import org.apache.commons.math4.linear.Array2DRowRealMatrix; +import org.apache.commons.math4.linear.ArrayRealVector; +import org.apache.commons.math4.linear.RealVector; +import org.apache.commons.math4.optimization.GoalType; +import org.apache.commons.math4.optimization.MultivariateOptimizer; +import org.apache.commons.math4.optimization.PointValuePair; +import org.apache.commons.math4.util.FastMath; /** * Powell's BOBYQA algorithm. This implementation is translated and http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/direct/BaseAbstractMultivariateOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/direct/BaseAbstractMultivariateOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/direct/BaseAbstractMultivariateOptimizer.java index d148d8c..8af7c47 100644 --- a/src/main/java/org/apache/commons/math4/optimization/direct/BaseAbstractMultivariateOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optimization/direct/BaseAbstractMultivariateOptimizer.java @@ -15,23 +15,23 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.direct; +package org.apache.commons.math4.optimization.direct; -import org.apache.commons.math3.util.Incrementor; -import org.apache.commons.math3.exception.MaxCountExceededException; -import org.apache.commons.math3.exception.TooManyEvaluationsException; -import org.apache.commons.math3.analysis.MultivariateFunction; -import org.apache.commons.math3.optimization.BaseMultivariateOptimizer; -import org.apache.commons.math3.optimization.OptimizationData; -import org.apache.commons.math3.optimization.GoalType; -import org.apache.commons.math3.optimization.InitialGuess; -import org.apache.commons.math3.optimization.SimpleBounds; -import org.apache.commons.math3.optimization.ConvergenceChecker; -import org.apache.commons.math3.optimization.PointValuePair; -import org.apache.commons.math3.optimization.SimpleValueChecker; -import org.apache.commons.math3.exception.DimensionMismatchException; -import org.apache.commons.math3.exception.NumberIsTooSmallException; -import org.apache.commons.math3.exception.NumberIsTooLargeException; +import org.apache.commons.math4.analysis.MultivariateFunction; +import org.apache.commons.math4.exception.DimensionMismatchException; +import org.apache.commons.math4.exception.MaxCountExceededException; +import org.apache.commons.math4.exception.NumberIsTooLargeException; +import org.apache.commons.math4.exception.NumberIsTooSmallException; +import org.apache.commons.math4.exception.TooManyEvaluationsException; +import org.apache.commons.math4.optimization.BaseMultivariateOptimizer; +import org.apache.commons.math4.optimization.ConvergenceChecker; +import org.apache.commons.math4.optimization.GoalType; +import org.apache.commons.math4.optimization.InitialGuess; +import org.apache.commons.math4.optimization.OptimizationData; +import org.apache.commons.math4.optimization.PointValuePair; +import org.apache.commons.math4.optimization.SimpleBounds; +import org.apache.commons.math4.optimization.SimpleValueChecker; +import org.apache.commons.math4.util.Incrementor; /** * Base class for implementing optimizers for multivariate scalar functions. @@ -154,11 +154,11 @@ public abstract class BaseAbstractMultivariateOptimizer<FUNC extends Multivariat * @param maxEval Maximum number of function evaluations. * @return the point/value pair giving the optimal value for objective * function. - * @throws org.apache.commons.math3.exception.DimensionMismatchException + * @throws org.apache.commons.math4.exception.DimensionMismatchException * if the start point dimension is wrong. - * @throws org.apache.commons.math3.exception.TooManyEvaluationsException + * @throws org.apache.commons.math4.exception.TooManyEvaluationsException * if the maximal number of evaluations is exceeded. - * @throws org.apache.commons.math3.exception.NullArgumentException if + * @throws org.apache.commons.math4.exception.NullArgumentException if * any argument is {@code null}. * @deprecated As of 3.1. Please use * {@link #optimize(int,MultivariateFunction,GoalType,OptimizationData[])} http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/direct/BaseAbstractMultivariateSimpleBoundsOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/direct/BaseAbstractMultivariateSimpleBoundsOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/direct/BaseAbstractMultivariateSimpleBoundsOptimizer.java index 67a4296..d179202 100644 --- a/src/main/java/org/apache/commons/math4/optimization/direct/BaseAbstractMultivariateSimpleBoundsOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optimization/direct/BaseAbstractMultivariateSimpleBoundsOptimizer.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.direct; +package org.apache.commons.math4.optimization.direct; -import org.apache.commons.math3.analysis.MultivariateFunction; -import org.apache.commons.math3.optimization.BaseMultivariateOptimizer; -import org.apache.commons.math3.optimization.BaseMultivariateSimpleBoundsOptimizer; -import org.apache.commons.math3.optimization.GoalType; -import org.apache.commons.math3.optimization.InitialGuess; -import org.apache.commons.math3.optimization.SimpleBounds; -import org.apache.commons.math3.optimization.PointValuePair; -import org.apache.commons.math3.optimization.ConvergenceChecker; +import org.apache.commons.math4.analysis.MultivariateFunction; +import org.apache.commons.math4.optimization.BaseMultivariateOptimizer; +import org.apache.commons.math4.optimization.BaseMultivariateSimpleBoundsOptimizer; +import org.apache.commons.math4.optimization.ConvergenceChecker; +import org.apache.commons.math4.optimization.GoalType; +import org.apache.commons.math4.optimization.InitialGuess; +import org.apache.commons.math4.optimization.PointValuePair; +import org.apache.commons.math4.optimization.SimpleBounds; /** * Base class for implementing optimizers for multivariate scalar functions, @@ -48,10 +48,10 @@ public abstract class BaseAbstractMultivariateSimpleBoundsOptimizer<FUNC extends /** * Simple constructor with default settings. * The convergence checker is set to a - * {@link org.apache.commons.math3.optimization.SimpleValueChecker}. + * {@link org.apache.commons.math4.optimization.SimpleValueChecker}. * * @see BaseAbstractMultivariateOptimizer#BaseAbstractMultivariateOptimizer() - * @deprecated See {@link org.apache.commons.math3.optimization.SimpleValueChecker#SimpleValueChecker()} + * @deprecated See {@link org.apache.commons.math4.optimization.SimpleValueChecker#SimpleValueChecker()} */ @Deprecated protected BaseAbstractMultivariateSimpleBoundsOptimizer() {} http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/direct/BaseAbstractMultivariateVectorOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/direct/BaseAbstractMultivariateVectorOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/direct/BaseAbstractMultivariateVectorOptimizer.java index e070632..ccca86e 100644 --- a/src/main/java/org/apache/commons/math4/optimization/direct/BaseAbstractMultivariateVectorOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optimization/direct/BaseAbstractMultivariateVectorOptimizer.java @@ -15,23 +15,23 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.direct; +package org.apache.commons.math4.optimization.direct; -import org.apache.commons.math3.util.Incrementor; -import org.apache.commons.math3.exception.MaxCountExceededException; -import org.apache.commons.math3.exception.TooManyEvaluationsException; -import org.apache.commons.math3.exception.DimensionMismatchException; -import org.apache.commons.math3.exception.NullArgumentException; -import org.apache.commons.math3.analysis.MultivariateVectorFunction; -import org.apache.commons.math3.optimization.OptimizationData; -import org.apache.commons.math3.optimization.InitialGuess; -import org.apache.commons.math3.optimization.Target; -import org.apache.commons.math3.optimization.Weight; -import org.apache.commons.math3.optimization.BaseMultivariateVectorOptimizer; -import org.apache.commons.math3.optimization.ConvergenceChecker; -import org.apache.commons.math3.optimization.PointVectorValuePair; -import org.apache.commons.math3.optimization.SimpleVectorValueChecker; -import org.apache.commons.math3.linear.RealMatrix; +import org.apache.commons.math4.analysis.MultivariateVectorFunction; +import org.apache.commons.math4.exception.DimensionMismatchException; +import org.apache.commons.math4.exception.MaxCountExceededException; +import org.apache.commons.math4.exception.NullArgumentException; +import org.apache.commons.math4.exception.TooManyEvaluationsException; +import org.apache.commons.math4.linear.RealMatrix; +import org.apache.commons.math4.optimization.BaseMultivariateVectorOptimizer; +import org.apache.commons.math4.optimization.ConvergenceChecker; +import org.apache.commons.math4.optimization.InitialGuess; +import org.apache.commons.math4.optimization.OptimizationData; +import org.apache.commons.math4.optimization.PointVectorValuePair; +import org.apache.commons.math4.optimization.SimpleVectorValueChecker; +import org.apache.commons.math4.optimization.Target; +import org.apache.commons.math4.optimization.Weight; +import org.apache.commons.math4.util.Incrementor; /** * Base class for implementing optimizers for multivariate scalar functions. @@ -165,11 +165,11 @@ public abstract class BaseAbstractMultivariateVectorOptimizer<FUNC extends Multi * @return the point/value pair giving the optimal value for objective * function. * @param maxEval Maximum number of function evaluations. - * @throws org.apache.commons.math3.exception.DimensionMismatchException + * @throws org.apache.commons.math4.exception.DimensionMismatchException * if the start point dimension is wrong. - * @throws org.apache.commons.math3.exception.TooManyEvaluationsException + * @throws org.apache.commons.math4.exception.TooManyEvaluationsException * if the maximal number of evaluations is exceeded. - * @throws org.apache.commons.math3.exception.NullArgumentException if + * @throws org.apache.commons.math4.exception.NullArgumentException if * any argument is {@code null}. * @deprecated As of 3.1. Please use * {@link #optimizeInternal(int,MultivariateVectorFunction,OptimizationData[])} http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/direct/CMAESOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/direct/CMAESOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/direct/CMAESOptimizer.java index 661b569..17d84af 100644 --- a/src/main/java/org/apache/commons/math4/optimization/direct/CMAESOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optimization/direct/CMAESOptimizer.java @@ -15,32 +15,32 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.direct; +package org.apache.commons.math4.optimization.direct; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.commons.math3.analysis.MultivariateFunction; -import org.apache.commons.math3.exception.DimensionMismatchException; -import org.apache.commons.math3.exception.NotPositiveException; -import org.apache.commons.math3.exception.NotStrictlyPositiveException; -import org.apache.commons.math3.exception.OutOfRangeException; -import org.apache.commons.math3.exception.TooManyEvaluationsException; -import org.apache.commons.math3.linear.Array2DRowRealMatrix; -import org.apache.commons.math3.linear.EigenDecomposition; -import org.apache.commons.math3.linear.MatrixUtils; -import org.apache.commons.math3.linear.RealMatrix; -import org.apache.commons.math3.optimization.ConvergenceChecker; -import org.apache.commons.math3.optimization.OptimizationData; -import org.apache.commons.math3.optimization.GoalType; -import org.apache.commons.math3.optimization.MultivariateOptimizer; -import org.apache.commons.math3.optimization.PointValuePair; -import org.apache.commons.math3.optimization.SimpleValueChecker; -import org.apache.commons.math3.random.MersenneTwister; -import org.apache.commons.math3.random.RandomGenerator; -import org.apache.commons.math3.util.FastMath; -import org.apache.commons.math3.util.MathArrays; +import org.apache.commons.math4.analysis.MultivariateFunction; +import org.apache.commons.math4.exception.DimensionMismatchException; +import org.apache.commons.math4.exception.NotPositiveException; +import org.apache.commons.math4.exception.NotStrictlyPositiveException; +import org.apache.commons.math4.exception.OutOfRangeException; +import org.apache.commons.math4.exception.TooManyEvaluationsException; +import org.apache.commons.math4.linear.Array2DRowRealMatrix; +import org.apache.commons.math4.linear.EigenDecomposition; +import org.apache.commons.math4.linear.MatrixUtils; +import org.apache.commons.math4.linear.RealMatrix; +import org.apache.commons.math4.optimization.ConvergenceChecker; +import org.apache.commons.math4.optimization.GoalType; +import org.apache.commons.math4.optimization.MultivariateOptimizer; +import org.apache.commons.math4.optimization.OptimizationData; +import org.apache.commons.math4.optimization.PointValuePair; +import org.apache.commons.math4.optimization.SimpleValueChecker; +import org.apache.commons.math4.random.MersenneTwister; +import org.apache.commons.math4.random.RandomGenerator; +import org.apache.commons.math4.util.FastMath; +import org.apache.commons.math4.util.MathArrays; /** * <p>An implementation of the active Covariance Matrix Adaptation Evolution Strategy (CMA-ES) @@ -473,7 +473,7 @@ public class CMAESOptimizer * @param goalType Optimization type. * @param optData Optimization data. The following data will be looked for: * <ul> - * <li>{@link org.apache.commons.math3.optimization.InitialGuess InitialGuess}</li> + * <li>{@link org.apache.commons.math4.optimization.InitialGuess InitialGuess}</li> * <li>{@link Sigma}</li> * <li>{@link PopulationSize}</li> * </ul> http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/direct/MultiDirectionalSimplex.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/direct/MultiDirectionalSimplex.java b/src/main/java/org/apache/commons/math4/optimization/direct/MultiDirectionalSimplex.java index c06bf96..cdc0bab 100644 --- a/src/main/java/org/apache/commons/math4/optimization/direct/MultiDirectionalSimplex.java +++ b/src/main/java/org/apache/commons/math4/optimization/direct/MultiDirectionalSimplex.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.direct; +package org.apache.commons.math4.optimization.direct; import java.util.Comparator; -import org.apache.commons.math3.analysis.MultivariateFunction; -import org.apache.commons.math3.optimization.PointValuePair; +import org.apache.commons.math4.analysis.MultivariateFunction; +import org.apache.commons.math4.optimization.PointValuePair; /** * This class implements the multi-directional direct search method. @@ -138,9 +138,9 @@ public class MultiDirectionalSimplex extends AbstractSimplex { * {@link AbstractSimplex#AbstractSimplex(double[][])}. * @param khi Expansion coefficient. * @param gamma Contraction coefficient. - * @throws org.apache.commons.math3.exception.NotStrictlyPositiveException + * @throws org.apache.commons.math4.exception.NotStrictlyPositiveException * if the reference simplex does not contain at least one point. - * @throws org.apache.commons.math3.exception.DimensionMismatchException + * @throws org.apache.commons.math4.exception.DimensionMismatchException * if there is a dimension mismatch in the reference simplex. */ public MultiDirectionalSimplex(final double[][] referenceSimplex, @@ -189,7 +189,7 @@ public class MultiDirectionalSimplex extends AbstractSimplex { * @param comparator Comparator to use to sort simplex vertices from best * to poorest. * @return the best point in the transformed simplex. - * @throws org.apache.commons.math3.exception.TooManyEvaluationsException + * @throws org.apache.commons.math4.exception.TooManyEvaluationsException * if the maximal number of evaluations is exceeded. */ private PointValuePair evaluateNewSimplex(final MultivariateFunction evaluationFunction, http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/direct/MultivariateFunctionMappingAdapter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/direct/MultivariateFunctionMappingAdapter.java b/src/main/java/org/apache/commons/math4/optimization/direct/MultivariateFunctionMappingAdapter.java index 334138b..d246ed4 100644 --- a/src/main/java/org/apache/commons/math4/optimization/direct/MultivariateFunctionMappingAdapter.java +++ b/src/main/java/org/apache/commons/math4/optimization/direct/MultivariateFunctionMappingAdapter.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.direct; +package org.apache.commons.math4.optimization.direct; -import org.apache.commons.math3.analysis.MultivariateFunction; -import org.apache.commons.math3.analysis.UnivariateFunction; -import org.apache.commons.math3.analysis.function.Logit; -import org.apache.commons.math3.analysis.function.Sigmoid; -import org.apache.commons.math3.exception.DimensionMismatchException; -import org.apache.commons.math3.exception.NumberIsTooSmallException; -import org.apache.commons.math3.util.FastMath; -import org.apache.commons.math3.util.MathUtils; +import org.apache.commons.math4.analysis.MultivariateFunction; +import org.apache.commons.math4.analysis.UnivariateFunction; +import org.apache.commons.math4.analysis.function.Logit; +import org.apache.commons.math4.analysis.function.Sigmoid; +import org.apache.commons.math4.exception.DimensionMismatchException; +import org.apache.commons.math4.exception.NumberIsTooSmallException; +import org.apache.commons.math4.util.FastMath; +import org.apache.commons.math4.util.MathUtils; /** * <p>Adapter for mapping bounded {@link MultivariateFunction} to unbounded ones.</p> @@ -53,8 +53,8 @@ import org.apache.commons.math3.util.MathUtils; * user is responsible for converting his bounded point to unbounded by calling * {@link #boundedToUnbounded(double[])} before providing them to the optimizer. * For the same reason, the point returned by the {@link - * org.apache.commons.math3.optimization.BaseMultivariateOptimizer#optimize(int, - * MultivariateFunction, org.apache.commons.math3.optimization.GoalType, double[])} + * org.apache.commons.math4.optimization.BaseMultivariateOptimizer#optimize(int, + * MultivariateFunction, org.apache.commons.math4.optimization.GoalType, double[])} * method is unbounded. So to convert this point to bounded, users must call * {@link #unboundedToBounded(double[])} by themselves!</p> * <p> http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/direct/MultivariateFunctionPenaltyAdapter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/direct/MultivariateFunctionPenaltyAdapter.java b/src/main/java/org/apache/commons/math4/optimization/direct/MultivariateFunctionPenaltyAdapter.java index 4946487..113ebc8 100644 --- a/src/main/java/org/apache/commons/math4/optimization/direct/MultivariateFunctionPenaltyAdapter.java +++ b/src/main/java/org/apache/commons/math4/optimization/direct/MultivariateFunctionPenaltyAdapter.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.direct; +package org.apache.commons.math4.optimization.direct; -import org.apache.commons.math3.analysis.MultivariateFunction; -import org.apache.commons.math3.exception.DimensionMismatchException; -import org.apache.commons.math3.exception.NumberIsTooSmallException; -import org.apache.commons.math3.util.FastMath; -import org.apache.commons.math3.util.MathUtils; +import org.apache.commons.math4.analysis.MultivariateFunction; +import org.apache.commons.math4.exception.DimensionMismatchException; +import org.apache.commons.math4.exception.NumberIsTooSmallException; +import org.apache.commons.math4.util.FastMath; +import org.apache.commons.math4.util.MathUtils; /** * <p>Adapter extending bounded {@link MultivariateFunction} to an unbouded http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/direct/NelderMeadSimplex.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/direct/NelderMeadSimplex.java b/src/main/java/org/apache/commons/math4/optimization/direct/NelderMeadSimplex.java index a17586b..f193ccf 100644 --- a/src/main/java/org/apache/commons/math4/optimization/direct/NelderMeadSimplex.java +++ b/src/main/java/org/apache/commons/math4/optimization/direct/NelderMeadSimplex.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.direct; +package org.apache.commons.math4.optimization.direct; import java.util.Comparator; -import org.apache.commons.math3.optimization.PointValuePair; -import org.apache.commons.math3.analysis.MultivariateFunction; +import org.apache.commons.math4.analysis.MultivariateFunction; +import org.apache.commons.math4.optimization.PointValuePair; /** * This class implements the Nelder-Mead simplex algorithm. @@ -167,9 +167,9 @@ public class NelderMeadSimplex extends AbstractSimplex { * @param khi Expansion coefficient. * @param gamma Contraction coefficient. * @param sigma Shrinkage coefficient. - * @throws org.apache.commons.math3.exception.NotStrictlyPositiveException + * @throws org.apache.commons.math4.exception.NotStrictlyPositiveException * if the reference simplex does not contain at least one point. - * @throws org.apache.commons.math3.exception.DimensionMismatchException + * @throws org.apache.commons.math4.exception.DimensionMismatchException * if there is a dimension mismatch in the reference simplex. */ public NelderMeadSimplex(final double[][] referenceSimplex, http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/direct/PowellOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/direct/PowellOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/direct/PowellOptimizer.java index 28190e1..a0a396e 100644 --- a/src/main/java/org/apache/commons/math4/optimization/direct/PowellOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optimization/direct/PowellOptimizer.java @@ -15,22 +15,22 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.direct; - -import org.apache.commons.math3.util.FastMath; -import org.apache.commons.math3.util.MathArrays; -import org.apache.commons.math3.analysis.UnivariateFunction; -import org.apache.commons.math3.analysis.MultivariateFunction; -import org.apache.commons.math3.exception.NumberIsTooSmallException; -import org.apache.commons.math3.exception.NotStrictlyPositiveException; -import org.apache.commons.math3.optimization.GoalType; -import org.apache.commons.math3.optimization.PointValuePair; -import org.apache.commons.math3.optimization.ConvergenceChecker; -import org.apache.commons.math3.optimization.MultivariateOptimizer; -import org.apache.commons.math3.optimization.univariate.BracketFinder; -import org.apache.commons.math3.optimization.univariate.BrentOptimizer; -import org.apache.commons.math3.optimization.univariate.UnivariatePointValuePair; -import org.apache.commons.math3.optimization.univariate.SimpleUnivariateValueChecker; +package org.apache.commons.math4.optimization.direct; + +import org.apache.commons.math4.analysis.MultivariateFunction; +import org.apache.commons.math4.analysis.UnivariateFunction; +import org.apache.commons.math4.exception.NotStrictlyPositiveException; +import org.apache.commons.math4.exception.NumberIsTooSmallException; +import org.apache.commons.math4.optimization.ConvergenceChecker; +import org.apache.commons.math4.optimization.GoalType; +import org.apache.commons.math4.optimization.MultivariateOptimizer; +import org.apache.commons.math4.optimization.PointValuePair; +import org.apache.commons.math4.optimization.univariate.BracketFinder; +import org.apache.commons.math4.optimization.univariate.BrentOptimizer; +import org.apache.commons.math4.optimization.univariate.SimpleUnivariateValueChecker; +import org.apache.commons.math4.optimization.univariate.UnivariatePointValuePair; +import org.apache.commons.math4.util.FastMath; +import org.apache.commons.math4.util.MathArrays; /** * Powell algorithm. @@ -324,7 +324,7 @@ public class PowellOptimizer * @param p Starting point. * @param d Search direction. * @return the optimum. - * @throws org.apache.commons.math3.exception.TooManyEvaluationsException + * @throws org.apache.commons.math4.exception.TooManyEvaluationsException * if the number of evaluations is exceeded. */ public UnivariatePointValuePair search(final double[] p, final double[] d) { http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/direct/SimplexOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/direct/SimplexOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/direct/SimplexOptimizer.java index 8333342..0adcdb3 100644 --- a/src/main/java/org/apache/commons/math4/optimization/direct/SimplexOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optimization/direct/SimplexOptimizer.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.direct; +package org.apache.commons.math4.optimization.direct; import java.util.Comparator; -import org.apache.commons.math3.analysis.MultivariateFunction; -import org.apache.commons.math3.exception.NullArgumentException; -import org.apache.commons.math3.optimization.GoalType; -import org.apache.commons.math3.optimization.ConvergenceChecker; -import org.apache.commons.math3.optimization.PointValuePair; -import org.apache.commons.math3.optimization.SimpleValueChecker; -import org.apache.commons.math3.optimization.MultivariateOptimizer; -import org.apache.commons.math3.optimization.OptimizationData; +import org.apache.commons.math4.analysis.MultivariateFunction; +import org.apache.commons.math4.exception.NullArgumentException; +import org.apache.commons.math4.optimization.ConvergenceChecker; +import org.apache.commons.math4.optimization.GoalType; +import org.apache.commons.math4.optimization.MultivariateOptimizer; +import org.apache.commons.math4.optimization.OptimizationData; +import org.apache.commons.math4.optimization.PointValuePair; +import org.apache.commons.math4.optimization.SimpleValueChecker; /** * This class implements simplex-based direct search optimization. @@ -138,7 +138,7 @@ public class SimplexOptimizer * @param goalType Optimization type. * @param optData Optimization data. The following data will be looked for: * <ul> - * <li>{@link org.apache.commons.math3.optimization.InitialGuess InitialGuess}</li> + * <li>{@link org.apache.commons.math4.optimization.InitialGuess InitialGuess}</li> * <li>{@link AbstractSimplex}</li> * </ul> * @return the point/value pair giving the optimal value for objective http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/direct/package-info.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/direct/package-info.java b/src/main/java/org/apache/commons/math4/optimization/direct/package-info.java index a587bcf..57b385d 100644 --- a/src/main/java/org/apache/commons/math4/optimization/direct/package-info.java +++ b/src/main/java/org/apache/commons/math4/optimization/direct/package-info.java @@ -21,4 +21,4 @@ * </p> * */ -package org.apache.commons.math3.optimization.direct; +package org.apache.commons.math4.optimization.direct; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/fitting/CurveFitter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/fitting/CurveFitter.java b/src/main/java/org/apache/commons/math4/optimization/fitting/CurveFitter.java index ad1e025..7b3a429 100644 --- a/src/main/java/org/apache/commons/math4/optimization/fitting/CurveFitter.java +++ b/src/main/java/org/apache/commons/math4/optimization/fitting/CurveFitter.java @@ -15,19 +15,19 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.fitting; +package org.apache.commons.math4.optimization.fitting; import java.util.ArrayList; import java.util.List; -import org.apache.commons.math3.analysis.DifferentiableMultivariateVectorFunction; -import org.apache.commons.math3.analysis.MultivariateMatrixFunction; -import org.apache.commons.math3.analysis.ParametricUnivariateFunction; -import org.apache.commons.math3.analysis.differentiation.DerivativeStructure; -import org.apache.commons.math3.analysis.differentiation.MultivariateDifferentiableVectorFunction; -import org.apache.commons.math3.optimization.DifferentiableMultivariateVectorOptimizer; -import org.apache.commons.math3.optimization.MultivariateDifferentiableVectorOptimizer; -import org.apache.commons.math3.optimization.PointVectorValuePair; +import org.apache.commons.math4.analysis.DifferentiableMultivariateVectorFunction; +import org.apache.commons.math4.analysis.MultivariateMatrixFunction; +import org.apache.commons.math4.analysis.ParametricUnivariateFunction; +import org.apache.commons.math4.analysis.differentiation.DerivativeStructure; +import org.apache.commons.math4.analysis.differentiation.MultivariateDifferentiableVectorFunction; +import org.apache.commons.math4.optimization.DifferentiableMultivariateVectorOptimizer; +import org.apache.commons.math4.optimization.MultivariateDifferentiableVectorOptimizer; +import org.apache.commons.math4.optimization.PointVectorValuePair; /** Fitter for parametric univariate real functions y = f(x). * <br/> @@ -146,7 +146,7 @@ public class CurveFitter<T extends ParametricUnivariateFunction> { * @param f parametric function to fit. * @param initialGuess first guess of the function parameters. * @return the fitted parameters. - * @throws org.apache.commons.math3.exception.DimensionMismatchException + * @throws org.apache.commons.math4.exception.DimensionMismatchException * if the start point dimension is wrong. */ public double[] fit(T f, final double[] initialGuess) { @@ -164,9 +164,9 @@ public class CurveFitter<T extends ParametricUnivariateFunction> { * @param initialGuess first guess of the function parameters. * @param maxEval Maximum number of function evaluations. * @return the fitted parameters. - * @throws org.apache.commons.math3.exception.TooManyEvaluationsException + * @throws org.apache.commons.math4.exception.TooManyEvaluationsException * if the number of allowed evaluations is exceeded. - * @throws org.apache.commons.math3.exception.DimensionMismatchException + * @throws org.apache.commons.math4.exception.DimensionMismatchException * if the start point dimension is wrong. * @since 3.0 */ http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/fitting/GaussianFitter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/fitting/GaussianFitter.java b/src/main/java/org/apache/commons/math4/optimization/fitting/GaussianFitter.java index 1676496..bf0f03d 100644 --- a/src/main/java/org/apache/commons/math4/optimization/fitting/GaussianFitter.java +++ b/src/main/java/org/apache/commons/math4/optimization/fitting/GaussianFitter.java @@ -15,24 +15,24 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.fitting; +package org.apache.commons.math4.optimization.fitting; import java.util.Arrays; import java.util.Comparator; -import org.apache.commons.math3.analysis.function.Gaussian; -import org.apache.commons.math3.exception.NullArgumentException; -import org.apache.commons.math3.exception.NumberIsTooSmallException; -import org.apache.commons.math3.exception.OutOfRangeException; -import org.apache.commons.math3.exception.ZeroException; -import org.apache.commons.math3.exception.NotStrictlyPositiveException; -import org.apache.commons.math3.exception.util.LocalizedFormats; -import org.apache.commons.math3.optimization.DifferentiableMultivariateVectorOptimizer; -import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math4.analysis.function.Gaussian; +import org.apache.commons.math4.exception.NotStrictlyPositiveException; +import org.apache.commons.math4.exception.NullArgumentException; +import org.apache.commons.math4.exception.NumberIsTooSmallException; +import org.apache.commons.math4.exception.OutOfRangeException; +import org.apache.commons.math4.exception.ZeroException; +import org.apache.commons.math4.exception.util.LocalizedFormats; +import org.apache.commons.math4.optimization.DifferentiableMultivariateVectorOptimizer; +import org.apache.commons.math4.util.FastMath; /** * Fits points to a {@link - * org.apache.commons.math3.analysis.function.Gaussian.Parametric Gaussian} function. + * org.apache.commons.math4.analysis.function.Gaussian.Parametric Gaussian} function. * <p> * Usage example: * <pre> @@ -123,7 +123,7 @@ public class GaussianFitter extends CurveFitter<Gaussian.Parametric> { /** * Guesses the parameters {@code norm}, {@code mean}, and {@code sigma} - * of a {@link org.apache.commons.math3.analysis.function.Gaussian.Parametric} + * of a {@link org.apache.commons.math4.analysis.function.Gaussian.Parametric} * based on the specified observed points. */ public static class ParameterGuesser { http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/fitting/HarmonicFitter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/fitting/HarmonicFitter.java b/src/main/java/org/apache/commons/math4/optimization/fitting/HarmonicFitter.java index 85c6d18..938156d 100644 --- a/src/main/java/org/apache/commons/math4/optimization/fitting/HarmonicFitter.java +++ b/src/main/java/org/apache/commons/math4/optimization/fitting/HarmonicFitter.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.fitting; +package org.apache.commons.math4.optimization.fitting; -import org.apache.commons.math3.optimization.DifferentiableMultivariateVectorOptimizer; -import org.apache.commons.math3.analysis.function.HarmonicOscillator; -import org.apache.commons.math3.exception.ZeroException; -import org.apache.commons.math3.exception.NumberIsTooSmallException; -import org.apache.commons.math3.exception.MathIllegalStateException; -import org.apache.commons.math3.exception.util.LocalizedFormats; -import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math4.analysis.function.HarmonicOscillator; +import org.apache.commons.math4.exception.MathIllegalStateException; +import org.apache.commons.math4.exception.NumberIsTooSmallException; +import org.apache.commons.math4.exception.ZeroException; +import org.apache.commons.math4.exception.util.LocalizedFormats; +import org.apache.commons.math4.optimization.DifferentiableMultivariateVectorOptimizer; +import org.apache.commons.math4.util.FastMath; /** * Class that implements a curve fitting specialized for sinusoids. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/fitting/PolynomialFitter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/fitting/PolynomialFitter.java b/src/main/java/org/apache/commons/math4/optimization/fitting/PolynomialFitter.java index dbefcc2..3773acb 100644 --- a/src/main/java/org/apache/commons/math4/optimization/fitting/PolynomialFitter.java +++ b/src/main/java/org/apache/commons/math4/optimization/fitting/PolynomialFitter.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.fitting; +package org.apache.commons.math4.optimization.fitting; -import org.apache.commons.math3.analysis.polynomials.PolynomialFunction; -import org.apache.commons.math3.optimization.DifferentiableMultivariateVectorOptimizer; +import org.apache.commons.math4.analysis.polynomials.PolynomialFunction; +import org.apache.commons.math4.optimization.DifferentiableMultivariateVectorOptimizer; /** * Polynomial fitting is a very simple case of {@link CurveFitter curve fitting}. @@ -67,7 +67,7 @@ public class PolynomialFitter extends CurveFitter<PolynomialFunction.Parametric> * Get the polynomial fitting the weighted (x, y) points. * * @return the coefficients of the polynomial that best fits the observed points. - * @throws org.apache.commons.math3.exception.ConvergenceException + * @throws org.apache.commons.math4.exception.ConvergenceException * if the algorithm failed to converge. * @deprecated Since 3.1 (to be removed in 4.0). Please use {@link #fit(double[])} instead. */ @@ -84,9 +84,9 @@ public class PolynomialFitter extends CurveFitter<PolynomialFunction.Parametric> * increasing order of the polynomial's degree. * @param maxEval Maximum number of evaluations of the polynomial. * @return the coefficients of the polynomial that best fits the observed points. - * @throws org.apache.commons.math3.exception.TooManyEvaluationsException if + * @throws org.apache.commons.math4.exception.TooManyEvaluationsException if * the number of evaluations exceeds {@code maxEval}. - * @throws org.apache.commons.math3.exception.ConvergenceException + * @throws org.apache.commons.math4.exception.ConvergenceException * if the algorithm failed to converge. * @since 3.1 */ @@ -101,7 +101,7 @@ public class PolynomialFitter extends CurveFitter<PolynomialFunction.Parametric> * @param guess First guess for the coefficients. They must be sorted in * increasing order of the polynomial's degree. * @return the coefficients of the polynomial that best fits the observed points. - * @throws org.apache.commons.math3.exception.ConvergenceException + * @throws org.apache.commons.math4.exception.ConvergenceException * if the algorithm failed to converge. * @since 3.1 */ http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/fitting/WeightedObservedPoint.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/fitting/WeightedObservedPoint.java b/src/main/java/org/apache/commons/math4/optimization/fitting/WeightedObservedPoint.java index 899a502..5c2c6d2 100644 --- a/src/main/java/org/apache/commons/math4/optimization/fitting/WeightedObservedPoint.java +++ b/src/main/java/org/apache/commons/math4/optimization/fitting/WeightedObservedPoint.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.fitting; +package org.apache.commons.math4.optimization.fitting; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/fitting/package-info.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/fitting/package-info.java b/src/main/java/org/apache/commons/math4/optimization/fitting/package-info.java index b25e5fd..98683a8 100644 --- a/src/main/java/org/apache/commons/math4/optimization/fitting/package-info.java +++ b/src/main/java/org/apache/commons/math4/optimization/fitting/package-info.java @@ -27,4 +27,4 @@ * * */ -package org.apache.commons.math3.optimization.fitting; +package org.apache.commons.math4.optimization.fitting; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/general/AbstractDifferentiableOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/general/AbstractDifferentiableOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/general/AbstractDifferentiableOptimizer.java index d175863..1fbcbcb 100644 --- a/src/main/java/org/apache/commons/math4/optimization/general/AbstractDifferentiableOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optimization/general/AbstractDifferentiableOptimizer.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.general; +package org.apache.commons.math4.optimization.general; -import org.apache.commons.math3.analysis.MultivariateVectorFunction; -import org.apache.commons.math3.analysis.differentiation.GradientFunction; -import org.apache.commons.math3.analysis.differentiation.MultivariateDifferentiableFunction; -import org.apache.commons.math3.optimization.ConvergenceChecker; -import org.apache.commons.math3.optimization.GoalType; -import org.apache.commons.math3.optimization.OptimizationData; -import org.apache.commons.math3.optimization.InitialGuess; -import org.apache.commons.math3.optimization.PointValuePair; -import org.apache.commons.math3.optimization.direct.BaseAbstractMultivariateOptimizer; +import org.apache.commons.math4.analysis.MultivariateVectorFunction; +import org.apache.commons.math4.analysis.differentiation.GradientFunction; +import org.apache.commons.math4.analysis.differentiation.MultivariateDifferentiableFunction; +import org.apache.commons.math4.optimization.ConvergenceChecker; +import org.apache.commons.math4.optimization.GoalType; +import org.apache.commons.math4.optimization.InitialGuess; +import org.apache.commons.math4.optimization.OptimizationData; +import org.apache.commons.math4.optimization.PointValuePair; +import org.apache.commons.math4.optimization.direct.BaseAbstractMultivariateOptimizer; /** * Base class for implementing optimizers for multivariate scalar
