http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/LineSearch.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/LineSearch.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/LineSearch.java index e4f0c91..dae251f 100644 --- a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/LineSearch.java +++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/LineSearch.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optim.nonlinear.scalar; +package org.apache.commons.math4.optim.nonlinear.scalar; -import org.apache.commons.math3.optim.univariate.UnivariateOptimizer; -import org.apache.commons.math3.optim.univariate.BrentOptimizer; -import org.apache.commons.math3.optim.univariate.BracketFinder; -import org.apache.commons.math3.optim.univariate.UnivariatePointValuePair; -import org.apache.commons.math3.optim.univariate.SimpleUnivariateValueChecker; -import org.apache.commons.math3.optim.univariate.SearchInterval; -import org.apache.commons.math3.optim.univariate.UnivariateObjectiveFunction; -import org.apache.commons.math3.analysis.UnivariateFunction; -import org.apache.commons.math3.optim.MaxEval; +import org.apache.commons.math4.analysis.UnivariateFunction; +import org.apache.commons.math4.optim.MaxEval; +import org.apache.commons.math4.optim.univariate.BracketFinder; +import org.apache.commons.math4.optim.univariate.BrentOptimizer; +import org.apache.commons.math4.optim.univariate.SearchInterval; +import org.apache.commons.math4.optim.univariate.SimpleUnivariateValueChecker; +import org.apache.commons.math4.optim.univariate.UnivariateObjectiveFunction; +import org.apache.commons.math4.optim.univariate.UnivariateOptimizer; +import org.apache.commons.math4.optim.univariate.UnivariatePointValuePair; /** * Class for finding the minimum of the objective function along a given @@ -105,7 +105,7 @@ public class LineSearch { * @param startPoint Starting point. * @param direction 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[] startPoint,
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/MultiStartMultivariateOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/MultiStartMultivariateOptimizer.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/MultiStartMultivariateOptimizer.java index 704c9aa..11ec5df 100644 --- a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/MultiStartMultivariateOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/MultiStartMultivariateOptimizer.java @@ -14,17 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optim.nonlinear.scalar; +package org.apache.commons.math4.optim.nonlinear.scalar; import java.util.Collections; import java.util.List; import java.util.ArrayList; import java.util.Comparator; -import org.apache.commons.math3.exception.NotStrictlyPositiveException; -import org.apache.commons.math3.exception.NullArgumentException; -import org.apache.commons.math3.random.RandomVectorGenerator; -import org.apache.commons.math3.optim.BaseMultiStartMultivariateOptimizer; -import org.apache.commons.math3.optim.PointValuePair; + +import org.apache.commons.math4.exception.NotStrictlyPositiveException; +import org.apache.commons.math4.exception.NullArgumentException; +import org.apache.commons.math4.optim.BaseMultiStartMultivariateOptimizer; +import org.apache.commons.math4.optim.PointValuePair; +import org.apache.commons.math4.random.RandomVectorGenerator; /** * Multi-start optimizer. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateFunctionMappingAdapter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateFunctionMappingAdapter.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateFunctionMappingAdapter.java index 80daace..e2ac975 100644 --- a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateFunctionMappingAdapter.java +++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateFunctionMappingAdapter.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optim.nonlinear.scalar; +package org.apache.commons.math4.optim.nonlinear.scalar; -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> @@ -52,19 +52,19 @@ 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> * This adapter is only a poor man solution to simple bounds optimization constraints * that can be used with simple optimizers like - * {@link org.apache.commons.math3.optim.nonlinear.scalar.noderiv.SimplexOptimizer + * {@link org.apache.commons.math4.optim.nonlinear.scalar.noderiv.SimplexOptimizer * SimplexOptimizer}. * A better solution is to use an optimizer that directly supports simple bounds like - * {@link org.apache.commons.math3.optim.nonlinear.scalar.noderiv.CMAESOptimizer + * {@link org.apache.commons.math4.optim.nonlinear.scalar.noderiv.CMAESOptimizer * CMAESOptimizer} or - * {@link org.apache.commons.math3.optim.nonlinear.scalar.noderiv.BOBYQAOptimizer + * {@link org.apache.commons.math4.optim.nonlinear.scalar.noderiv.BOBYQAOptimizer * BOBYQAOptimizer}. * One caveat of this poor-man's solution is that behavior near the bounds may be * numerically unstable as bounds are mapped from infinite values. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateFunctionPenaltyAdapter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateFunctionPenaltyAdapter.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateFunctionPenaltyAdapter.java index 931f17f..04ca7f5 100644 --- a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateFunctionPenaltyAdapter.java +++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateFunctionPenaltyAdapter.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optim.nonlinear.scalar; +package org.apache.commons.math4.optim.nonlinear.scalar; -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 @@ -48,12 +48,12 @@ import org.apache.commons.math3.util.MathUtils; * <p> * This adapter is only a poor-man's solution to simple bounds optimization * constraints that can be used with simple optimizers like - * {@link org.apache.commons.math3.optim.nonlinear.scalar.noderiv.SimplexOptimizer + * {@link org.apache.commons.math4.optim.nonlinear.scalar.noderiv.SimplexOptimizer * SimplexOptimizer}. * A better solution is to use an optimizer that directly supports simple bounds like - * {@link org.apache.commons.math3.optim.nonlinear.scalar.noderiv.CMAESOptimizer + * {@link org.apache.commons.math4.optim.nonlinear.scalar.noderiv.CMAESOptimizer * CMAESOptimizer} or - * {@link org.apache.commons.math3.optim.nonlinear.scalar.noderiv.BOBYQAOptimizer + * {@link org.apache.commons.math4.optim.nonlinear.scalar.noderiv.BOBYQAOptimizer * BOBYQAOptimizer}. * One caveat of this poor-man's solution is that if start point or start simplex * is completely outside of the allowed range, only the penalty function is used, http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateOptimizer.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateOptimizer.java index bc0bec9..bf645f7 100644 --- a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/MultivariateOptimizer.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optim.nonlinear.scalar; +package org.apache.commons.math4.optim.nonlinear.scalar; -import org.apache.commons.math3.analysis.MultivariateFunction; -import org.apache.commons.math3.optim.BaseMultivariateOptimizer; -import org.apache.commons.math3.optim.OptimizationData; -import org.apache.commons.math3.optim.ConvergenceChecker; -import org.apache.commons.math3.optim.PointValuePair; -import org.apache.commons.math3.exception.TooManyEvaluationsException; +import org.apache.commons.math4.analysis.MultivariateFunction; +import org.apache.commons.math4.exception.TooManyEvaluationsException; +import org.apache.commons.math4.optim.BaseMultivariateOptimizer; +import org.apache.commons.math4.optim.ConvergenceChecker; +import org.apache.commons.math4.optim.OptimizationData; +import org.apache.commons.math4.optim.PointValuePair; /** * Base class for a multivariate scalar function optimizer. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/ObjectiveFunction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/ObjectiveFunction.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/ObjectiveFunction.java index 643cc03..70b7481 100644 --- a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/ObjectiveFunction.java +++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/ObjectiveFunction.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optim.nonlinear.scalar; +package org.apache.commons.math4.optim.nonlinear.scalar; -import org.apache.commons.math3.analysis.MultivariateFunction; -import org.apache.commons.math3.optim.OptimizationData; +import org.apache.commons.math4.analysis.MultivariateFunction; +import org.apache.commons.math4.optim.OptimizationData; /** * Scalar function to be optimized. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/ObjectiveFunctionGradient.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/ObjectiveFunctionGradient.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/ObjectiveFunctionGradient.java index 2fcf2ee..d6807f4 100644 --- a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/ObjectiveFunctionGradient.java +++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/ObjectiveFunctionGradient.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optim.nonlinear.scalar; +package org.apache.commons.math4.optim.nonlinear.scalar; -import org.apache.commons.math3.analysis.MultivariateVectorFunction; -import org.apache.commons.math3.optim.OptimizationData; +import org.apache.commons.math4.analysis.MultivariateVectorFunction; +import org.apache.commons.math4.optim.OptimizationData; /** * Gradient of the scalar function to be optimized. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/gradient/NonLinearConjugateGradientOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/gradient/NonLinearConjugateGradientOptimizer.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/gradient/NonLinearConjugateGradientOptimizer.java index 3e6fa89..4d4e2ce 100644 --- a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/gradient/NonLinearConjugateGradientOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/gradient/NonLinearConjugateGradientOptimizer.java @@ -15,19 +15,19 @@ * limitations under the License. */ -package org.apache.commons.math3.optim.nonlinear.scalar.gradient; - -import org.apache.commons.math3.analysis.solvers.UnivariateSolver; -import org.apache.commons.math3.exception.MathInternalError; -import org.apache.commons.math3.exception.TooManyEvaluationsException; -import org.apache.commons.math3.exception.MathUnsupportedOperationException; -import org.apache.commons.math3.exception.util.LocalizedFormats; -import org.apache.commons.math3.optim.OptimizationData; -import org.apache.commons.math3.optim.PointValuePair; -import org.apache.commons.math3.optim.ConvergenceChecker; -import org.apache.commons.math3.optim.nonlinear.scalar.GoalType; -import org.apache.commons.math3.optim.nonlinear.scalar.GradientMultivariateOptimizer; -import org.apache.commons.math3.optim.nonlinear.scalar.LineSearch; +package org.apache.commons.math4.optim.nonlinear.scalar.gradient; + +import org.apache.commons.math4.analysis.solvers.UnivariateSolver; +import org.apache.commons.math4.exception.MathInternalError; +import org.apache.commons.math4.exception.MathUnsupportedOperationException; +import org.apache.commons.math4.exception.TooManyEvaluationsException; +import org.apache.commons.math4.exception.util.LocalizedFormats; +import org.apache.commons.math4.optim.ConvergenceChecker; +import org.apache.commons.math4.optim.OptimizationData; +import org.apache.commons.math4.optim.PointValuePair; +import org.apache.commons.math4.optim.nonlinear.scalar.GoalType; +import org.apache.commons.math4.optim.nonlinear.scalar.GradientMultivariateOptimizer; +import org.apache.commons.math4.optim.nonlinear.scalar.LineSearch; /** http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/gradient/Preconditioner.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/gradient/Preconditioner.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/gradient/Preconditioner.java index 3c0f8fb..b9de44d 100644 --- a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/gradient/Preconditioner.java +++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/gradient/Preconditioner.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math3.optim.nonlinear.scalar.gradient; +package org.apache.commons.math4.optim.nonlinear.scalar.gradient; /** * This interface represents a preconditioner for differentiable scalar http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/gradient/package-info.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/gradient/package-info.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/gradient/package-info.java index 9dd9c5a..7d8bfed 100644 --- a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/gradient/package-info.java +++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/gradient/package-info.java @@ -18,4 +18,4 @@ /** * This package provides optimization algorithms that require derivatives. */ -package org.apache.commons.math3.optim.nonlinear.scalar.gradient; +package org.apache.commons.math4.optim.nonlinear.scalar.gradient; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/AbstractSimplex.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/AbstractSimplex.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/AbstractSimplex.java index e959787..45da036 100644 --- a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/AbstractSimplex.java +++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/AbstractSimplex.java @@ -15,21 +15,21 @@ * limitations under the License. */ -package org.apache.commons.math3.optim.nonlinear.scalar.noderiv; +package org.apache.commons.math4.optim.nonlinear.scalar.noderiv; 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.optim.PointValuePair; -import org.apache.commons.math3.optim.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.optim.OptimizationData; +import org.apache.commons.math4.optim.PointValuePair; /** * This class implements the simplex concept. @@ -199,7 +199,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, @@ -237,7 +237,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/optim/nonlinear/scalar/noderiv/BOBYQAOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/BOBYQAOptimizer.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/BOBYQAOptimizer.java index 5d3d229..e8487b0 100644 --- a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/BOBYQAOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/BOBYQAOptimizer.java @@ -15,19 +15,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optim.nonlinear.scalar.noderiv; - -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.optim.nonlinear.scalar.GoalType; -import org.apache.commons.math3.optim.PointValuePair; -import org.apache.commons.math3.optim.nonlinear.scalar.MultivariateOptimizer; -import org.apache.commons.math3.util.FastMath; +package org.apache.commons.math4.optim.nonlinear.scalar.noderiv; + +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.optim.PointValuePair; +import org.apache.commons.math4.optim.nonlinear.scalar.GoalType; +import org.apache.commons.math4.optim.nonlinear.scalar.MultivariateOptimizer; +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/optim/nonlinear/scalar/noderiv/CMAESOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/CMAESOptimizer.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/CMAESOptimizer.java index 82cc748..bc1e41e 100644 --- a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/CMAESOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/CMAESOptimizer.java @@ -15,29 +15,29 @@ * limitations under the License. */ -package org.apache.commons.math3.optim.nonlinear.scalar.noderiv; +package org.apache.commons.math4.optim.nonlinear.scalar.noderiv; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -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.optim.ConvergenceChecker; -import org.apache.commons.math3.optim.OptimizationData; -import org.apache.commons.math3.optim.nonlinear.scalar.GoalType; -import org.apache.commons.math3.optim.PointValuePair; -import org.apache.commons.math3.optim.nonlinear.scalar.MultivariateOptimizer; -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.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.optim.ConvergenceChecker; +import org.apache.commons.math4.optim.OptimizationData; +import org.apache.commons.math4.optim.PointValuePair; +import org.apache.commons.math4.optim.nonlinear.scalar.GoalType; +import org.apache.commons.math4.optim.nonlinear.scalar.MultivariateOptimizer; +import org.apache.commons.math4.random.RandomGenerator; +import org.apache.commons.math4.util.FastMath; +import org.apache.commons.math4.util.MathArrays; /** * An implementation of the active Covariance Matrix Adaptation Evolution Strategy (CMA-ES) http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/MultiDirectionalSimplex.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/MultiDirectionalSimplex.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/MultiDirectionalSimplex.java index 7ee3acf..804fe77 100644 --- a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/MultiDirectionalSimplex.java +++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/MultiDirectionalSimplex.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optim.nonlinear.scalar.noderiv; +package org.apache.commons.math4.optim.nonlinear.scalar.noderiv; import java.util.Comparator; -import org.apache.commons.math3.analysis.MultivariateFunction; -import org.apache.commons.math3.optim.PointValuePair; +import org.apache.commons.math4.analysis.MultivariateFunction; +import org.apache.commons.math4.optim.PointValuePair; /** * This class implements the multi-directional direct search method. @@ -135,9 +135,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, @@ -186,7 +186,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/optim/nonlinear/scalar/noderiv/NelderMeadSimplex.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/NelderMeadSimplex.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/NelderMeadSimplex.java index f7015ed..4bfc2d3 100644 --- a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/NelderMeadSimplex.java +++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/NelderMeadSimplex.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optim.nonlinear.scalar.noderiv; +package org.apache.commons.math4.optim.nonlinear.scalar.noderiv; import java.util.Comparator; -import org.apache.commons.math3.optim.PointValuePair; -import org.apache.commons.math3.analysis.MultivariateFunction; +import org.apache.commons.math4.analysis.MultivariateFunction; +import org.apache.commons.math4.optim.PointValuePair; /** * This class implements the Nelder-Mead simplex algorithm. @@ -164,9 +164,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/optim/nonlinear/scalar/noderiv/PowellOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/PowellOptimizer.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/PowellOptimizer.java index afa8426..90d81de 100644 --- a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/PowellOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/PowellOptimizer.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optim.nonlinear.scalar.noderiv; +package org.apache.commons.math4.optim.nonlinear.scalar.noderiv; -import org.apache.commons.math3.util.FastMath; -import org.apache.commons.math3.util.MathArrays; -import org.apache.commons.math3.exception.NumberIsTooSmallException; -import org.apache.commons.math3.exception.NotStrictlyPositiveException; -import org.apache.commons.math3.exception.MathUnsupportedOperationException; -import org.apache.commons.math3.exception.util.LocalizedFormats; -import org.apache.commons.math3.optim.nonlinear.scalar.GoalType; -import org.apache.commons.math3.optim.PointValuePair; -import org.apache.commons.math3.optim.ConvergenceChecker; -import org.apache.commons.math3.optim.nonlinear.scalar.MultivariateOptimizer; -import org.apache.commons.math3.optim.nonlinear.scalar.LineSearch; -import org.apache.commons.math3.optim.univariate.UnivariatePointValuePair; +import org.apache.commons.math4.exception.MathUnsupportedOperationException; +import org.apache.commons.math4.exception.NotStrictlyPositiveException; +import org.apache.commons.math4.exception.NumberIsTooSmallException; +import org.apache.commons.math4.exception.util.LocalizedFormats; +import org.apache.commons.math4.optim.ConvergenceChecker; +import org.apache.commons.math4.optim.PointValuePair; +import org.apache.commons.math4.optim.nonlinear.scalar.GoalType; +import org.apache.commons.math4.optim.nonlinear.scalar.LineSearch; +import org.apache.commons.math4.optim.nonlinear.scalar.MultivariateOptimizer; +import org.apache.commons.math4.optim.univariate.UnivariatePointValuePair; +import org.apache.commons.math4.util.FastMath; +import org.apache.commons.math4.util.MathArrays; /** * Powell's algorithm. @@ -47,9 +47,9 @@ import org.apache.commons.math3.optim.univariate.UnivariatePointValuePair; * {@link MathUnsupportedOperationException} if bounds are passed to it. * In order to impose simple constraints, the objective function must be * wrapped in an adapter like - * {@link org.apache.commons.math3.optim.nonlinear.scalar.MultivariateFunctionMappingAdapter + * {@link org.apache.commons.math4.optim.nonlinear.scalar.MultivariateFunctionMappingAdapter * MultivariateFunctionMappingAdapter} or - * {@link org.apache.commons.math3.optim.nonlinear.scalar.MultivariateFunctionPenaltyAdapter + * {@link org.apache.commons.math4.optim.nonlinear.scalar.MultivariateFunctionPenaltyAdapter * MultivariateFunctionPenaltyAdapter}. * * @since 2.2 http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/SimplexOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/SimplexOptimizer.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/SimplexOptimizer.java index 3b44358..f6eee2f 100644 --- a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/SimplexOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/SimplexOptimizer.java @@ -14,19 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optim.nonlinear.scalar.noderiv; +package org.apache.commons.math4.optim.nonlinear.scalar.noderiv; import java.util.Comparator; -import org.apache.commons.math3.analysis.MultivariateFunction; -import org.apache.commons.math3.exception.NullArgumentException; -import org.apache.commons.math3.exception.MathUnsupportedOperationException; -import org.apache.commons.math3.exception.util.LocalizedFormats; -import org.apache.commons.math3.optim.nonlinear.scalar.GoalType; -import org.apache.commons.math3.optim.ConvergenceChecker; -import org.apache.commons.math3.optim.PointValuePair; -import org.apache.commons.math3.optim.SimpleValueChecker; -import org.apache.commons.math3.optim.OptimizationData; -import org.apache.commons.math3.optim.nonlinear.scalar.MultivariateOptimizer; + +import org.apache.commons.math4.analysis.MultivariateFunction; +import org.apache.commons.math4.exception.MathUnsupportedOperationException; +import org.apache.commons.math4.exception.NullArgumentException; +import org.apache.commons.math4.exception.util.LocalizedFormats; +import org.apache.commons.math4.optim.ConvergenceChecker; +import org.apache.commons.math4.optim.OptimizationData; +import org.apache.commons.math4.optim.PointValuePair; +import org.apache.commons.math4.optim.SimpleValueChecker; +import org.apache.commons.math4.optim.nonlinear.scalar.GoalType; +import org.apache.commons.math4.optim.nonlinear.scalar.MultivariateOptimizer; /** * This class implements simplex-based direct search optimization. @@ -74,9 +75,9 @@ import org.apache.commons.math3.optim.nonlinear.scalar.MultivariateOptimizer; * dedicated algorithm must be used like * {@link CMAESOptimizer} or {@link BOBYQAOptimizer}, or the objective * function must be wrapped in an adapter like - * {@link org.apache.commons.math3.optim.nonlinear.scalar.MultivariateFunctionMappingAdapter + * {@link org.apache.commons.math4.optim.nonlinear.scalar.MultivariateFunctionMappingAdapter * MultivariateFunctionMappingAdapter} or - * {@link org.apache.commons.math3.optim.nonlinear.scalar.MultivariateFunctionPenaltyAdapter + * {@link org.apache.commons.math4.optim.nonlinear.scalar.MultivariateFunctionPenaltyAdapter * MultivariateFunctionPenaltyAdapter}. * <br/> * The call to {@link #optimize(OptimizationData[]) optimize} will throw http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/package-info.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/package-info.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/package-info.java index 4afeb50..0796162 100644 --- a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/package-info.java +++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/noderiv/package-info.java @@ -18,4 +18,4 @@ /** * This package provides optimization algorithms that do not require derivatives. */ -package org.apache.commons.math3.optim.nonlinear.scalar.noderiv; +package org.apache.commons.math4.optim.nonlinear.scalar.noderiv; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/package-info.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/package-info.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/package-info.java index d65533a..1653b4e 100644 --- a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/package-info.java +++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/package-info.java @@ -18,4 +18,4 @@ /** * Algorithms for optimizing a scalar function. */ -package org.apache.commons.math3.optim.nonlinear.scalar; +package org.apache.commons.math4.optim.nonlinear.scalar; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/JacobianMultivariateVectorOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/JacobianMultivariateVectorOptimizer.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/JacobianMultivariateVectorOptimizer.java index 52372c8..da9ad86 100644 --- a/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/JacobianMultivariateVectorOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/JacobianMultivariateVectorOptimizer.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optim.nonlinear.vector; +package org.apache.commons.math4.optim.nonlinear.vector; -import org.apache.commons.math3.analysis.MultivariateMatrixFunction; -import org.apache.commons.math3.optim.ConvergenceChecker; -import org.apache.commons.math3.optim.OptimizationData; -import org.apache.commons.math3.optim.PointVectorValuePair; -import org.apache.commons.math3.exception.TooManyEvaluationsException; -import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math4.analysis.MultivariateMatrixFunction; +import org.apache.commons.math4.exception.DimensionMismatchException; +import org.apache.commons.math4.exception.TooManyEvaluationsException; +import org.apache.commons.math4.optim.ConvergenceChecker; +import org.apache.commons.math4.optim.OptimizationData; +import org.apache.commons.math4.optim.PointVectorValuePair; /** * Base class for implementing optimizers for multivariate vector @@ -31,12 +31,12 @@ import org.apache.commons.math3.exception.DimensionMismatchException; * functions while the columns iterate on the parameters; thus, the numbers * of rows is equal to the dimension of the {@link Target} while the * number of columns is equal to the dimension of the - * {@link org.apache.commons.math3.optim.InitialGuess InitialGuess}. + * {@link org.apache.commons.math4.optim.InitialGuess InitialGuess}. * * @since 3.1 * @deprecated All classes and interfaces in this package are deprecated. * The optimizers that were provided here were moved to the - * {@link org.apache.commons.math3.fitting.leastsquares} package + * {@link org.apache.commons.math4.fitting.leastsquares} package * (cf. MATH-1008). */ @Deprecated http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/ModelFunction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/ModelFunction.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/ModelFunction.java index 73de7d6..b371f13 100644 --- a/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/ModelFunction.java +++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/ModelFunction.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optim.nonlinear.vector; +package org.apache.commons.math4.optim.nonlinear.vector; -import org.apache.commons.math3.analysis.MultivariateVectorFunction; -import org.apache.commons.math3.optim.OptimizationData; +import org.apache.commons.math4.analysis.MultivariateVectorFunction; +import org.apache.commons.math4.optim.OptimizationData; /** * Model (vector) function to be optimized. @@ -25,7 +25,7 @@ import org.apache.commons.math3.optim.OptimizationData; * @since 3.1 * @deprecated All classes and interfaces in this package are deprecated. * The optimizers that were provided here were moved to the - * {@link org.apache.commons.math3.fitting.leastsquares} package + * {@link org.apache.commons.math4.fitting.leastsquares} package * (cf. MATH-1008). */ @Deprecated http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/ModelFunctionJacobian.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/ModelFunctionJacobian.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/ModelFunctionJacobian.java index 72ea4ae..69f7860 100644 --- a/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/ModelFunctionJacobian.java +++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/ModelFunctionJacobian.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optim.nonlinear.vector; +package org.apache.commons.math4.optim.nonlinear.vector; -import org.apache.commons.math3.analysis.MultivariateMatrixFunction; -import org.apache.commons.math3.optim.OptimizationData; +import org.apache.commons.math4.analysis.MultivariateMatrixFunction; +import org.apache.commons.math4.optim.OptimizationData; /** * Jacobian of the model (vector) function to be optimized. @@ -25,7 +25,7 @@ import org.apache.commons.math3.optim.OptimizationData; * @since 3.1 * @deprecated All classes and interfaces in this package are deprecated. * The optimizers that were provided here were moved to the - * {@link org.apache.commons.math3.fitting.leastsquares} package + * {@link org.apache.commons.math4.fitting.leastsquares} package * (cf. MATH-1008). */ @Deprecated http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/MultiStartMultivariateVectorOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/MultiStartMultivariateVectorOptimizer.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/MultiStartMultivariateVectorOptimizer.java index 1095057..2b17932 100644 --- a/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/MultiStartMultivariateVectorOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/MultiStartMultivariateVectorOptimizer.java @@ -14,20 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optim.nonlinear.vector; +package org.apache.commons.math4.optim.nonlinear.vector; import java.util.Collections; import java.util.List; import java.util.ArrayList; import java.util.Comparator; -import org.apache.commons.math3.exception.NotStrictlyPositiveException; -import org.apache.commons.math3.exception.NullArgumentException; -import org.apache.commons.math3.linear.RealMatrix; -import org.apache.commons.math3.linear.RealVector; -import org.apache.commons.math3.linear.ArrayRealVector; -import org.apache.commons.math3.random.RandomVectorGenerator; -import org.apache.commons.math3.optim.BaseMultiStartMultivariateOptimizer; -import org.apache.commons.math3.optim.PointVectorValuePair; + +import org.apache.commons.math4.exception.NotStrictlyPositiveException; +import org.apache.commons.math4.exception.NullArgumentException; +import org.apache.commons.math4.linear.ArrayRealVector; +import org.apache.commons.math4.linear.RealMatrix; +import org.apache.commons.math4.linear.RealVector; +import org.apache.commons.math4.optim.BaseMultiStartMultivariateOptimizer; +import org.apache.commons.math4.optim.PointVectorValuePair; +import org.apache.commons.math4.random.RandomVectorGenerator; /** * Multi-start optimizer for a (vector) model function. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/MultivariateVectorOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/MultivariateVectorOptimizer.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/MultivariateVectorOptimizer.java index c79defa..8485ef3 100644 --- a/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/MultivariateVectorOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/MultivariateVectorOptimizer.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.commons.math3.optim.nonlinear.vector; +package org.apache.commons.math4.optim.nonlinear.vector; -import org.apache.commons.math3.exception.TooManyEvaluationsException; -import org.apache.commons.math3.exception.DimensionMismatchException; -import org.apache.commons.math3.analysis.MultivariateVectorFunction; -import org.apache.commons.math3.optim.OptimizationData; -import org.apache.commons.math3.optim.BaseMultivariateOptimizer; -import org.apache.commons.math3.optim.ConvergenceChecker; -import org.apache.commons.math3.optim.PointVectorValuePair; -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.TooManyEvaluationsException; +import org.apache.commons.math4.linear.RealMatrix; +import org.apache.commons.math4.optim.BaseMultivariateOptimizer; +import org.apache.commons.math4.optim.ConvergenceChecker; +import org.apache.commons.math4.optim.OptimizationData; +import org.apache.commons.math4.optim.PointVectorValuePair; /** * Base class for a multivariate vector function optimizer. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/Target.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/Target.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/Target.java index cd387d5..2937888 100644 --- a/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/Target.java +++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/Target.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optim.nonlinear.vector; +package org.apache.commons.math4.optim.nonlinear.vector; -import org.apache.commons.math3.optim.OptimizationData; +import org.apache.commons.math4.optim.OptimizationData; /** * Target of the optimization procedure. @@ -28,7 +28,7 @@ import org.apache.commons.math3.optim.OptimizationData; * @since 3.1 * @deprecated All classes and interfaces in this package are deprecated. * The optimizers that were provided here were moved to the - * {@link org.apache.commons.math3.fitting.leastsquares} package + * {@link org.apache.commons.math4.fitting.leastsquares} package * (cf. MATH-1008). */ @Deprecated http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/Weight.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/Weight.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/Weight.java index 4d51cd7..a723ae2 100644 --- a/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/Weight.java +++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/Weight.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optim.nonlinear.vector; +package org.apache.commons.math4.optim.nonlinear.vector; -import org.apache.commons.math3.optim.OptimizationData; -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; +import org.apache.commons.math4.optim.OptimizationData; /** * Weight matrix of the residuals between model and observations. @@ -29,7 +29,7 @@ import org.apache.commons.math3.linear.NonSquareMatrixException; * @since 3.1 * @deprecated All classes and interfaces in this package are deprecated. * The optimizers that were provided here were moved to the - * {@link org.apache.commons.math3.fitting.leastsquares} package + * {@link org.apache.commons.math4.fitting.leastsquares} package * (cf. MATH-1008). */ @Deprecated http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/AbstractLeastSquaresOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/AbstractLeastSquaresOptimizer.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/AbstractLeastSquaresOptimizer.java index 67682eb..6c4a2d9 100644 --- a/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/AbstractLeastSquaresOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/AbstractLeastSquaresOptimizer.java @@ -14,23 +14,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optim.nonlinear.vector.jacobian; +package org.apache.commons.math4.optim.nonlinear.vector.jacobian; -import org.apache.commons.math3.exception.DimensionMismatchException; -import org.apache.commons.math3.exception.TooManyEvaluationsException; -import org.apache.commons.math3.linear.ArrayRealVector; -import org.apache.commons.math3.linear.RealMatrix; -import org.apache.commons.math3.linear.DiagonalMatrix; -import org.apache.commons.math3.linear.DecompositionSolver; -import org.apache.commons.math3.linear.MatrixUtils; -import org.apache.commons.math3.linear.QRDecomposition; -import org.apache.commons.math3.linear.EigenDecomposition; -import org.apache.commons.math3.optim.OptimizationData; -import org.apache.commons.math3.optim.ConvergenceChecker; -import org.apache.commons.math3.optim.PointVectorValuePair; -import org.apache.commons.math3.optim.nonlinear.vector.Weight; -import org.apache.commons.math3.optim.nonlinear.vector.JacobianMultivariateVectorOptimizer; -import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math4.exception.DimensionMismatchException; +import org.apache.commons.math4.exception.TooManyEvaluationsException; +import org.apache.commons.math4.linear.ArrayRealVector; +import org.apache.commons.math4.linear.DecompositionSolver; +import org.apache.commons.math4.linear.DiagonalMatrix; +import org.apache.commons.math4.linear.EigenDecomposition; +import org.apache.commons.math4.linear.MatrixUtils; +import org.apache.commons.math4.linear.QRDecomposition; +import org.apache.commons.math4.linear.RealMatrix; +import org.apache.commons.math4.optim.ConvergenceChecker; +import org.apache.commons.math4.optim.OptimizationData; +import org.apache.commons.math4.optim.PointVectorValuePair; +import org.apache.commons.math4.optim.nonlinear.vector.JacobianMultivariateVectorOptimizer; +import org.apache.commons.math4.optim.nonlinear.vector.Weight; +import org.apache.commons.math4.util.FastMath; /** * Base class for implementing least-squares optimizers. @@ -39,7 +39,7 @@ import org.apache.commons.math3.util.FastMath; * @since 3.1 * @deprecated All classes and interfaces in this package are deprecated. * The optimizers that were provided here were moved to the - * {@link org.apache.commons.math3.fitting.leastsquares} package + * {@link org.apache.commons.math4.fitting.leastsquares} package * (cf. MATH-1008). */ @Deprecated @@ -137,7 +137,7 @@ public abstract class AbstractLeastSquaresOptimizer * @param params Model parameters. * @param threshold Singularity threshold. * @return the covariance matrix. - * @throws org.apache.commons.math3.linear.SingularMatrixException + * @throws org.apache.commons.math4.linear.SingularMatrixException * if the covariance matrix cannot be computed (singular problem). */ public double[][] computeCovariances(double[] params, @@ -165,7 +165,7 @@ public abstract class AbstractLeastSquaresOptimizer * @param covarianceSingularityThreshold Singularity threshold (see * {@link #computeCovariances(double[],double) computeCovariances}). * @return an estimate of the standard deviation of the optimized parameters - * @throws org.apache.commons.math3.linear.SingularMatrixException + * @throws org.apache.commons.math4.linear.SingularMatrixException * if the covariance matrix cannot be computed. */ public double[] computeSigma(double[] params, @@ -186,7 +186,7 @@ public abstract class AbstractLeastSquaresOptimizer * {@link JacobianMultivariateVectorOptimizer#parseOptimizationData(OptimizationData[]) * JacobianMultivariateVectorOptimizer}, this method will register the following data: * <ul> - * <li>{@link org.apache.commons.math3.optim.nonlinear.vector.Weight}</li> + * <li>{@link org.apache.commons.math4.optim.nonlinear.vector.Weight}</li> * </ul> * @return {@inheritDoc} * @throws TooManyEvaluationsException if the maximal number of http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/GaussNewtonOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/GaussNewtonOptimizer.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/GaussNewtonOptimizer.java index 0668475..34fb988 100644 --- a/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/GaussNewtonOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/GaussNewtonOptimizer.java @@ -14,22 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optim.nonlinear.vector.jacobian; - -import org.apache.commons.math3.exception.ConvergenceException; -import org.apache.commons.math3.exception.NullArgumentException; -import org.apache.commons.math3.exception.MathInternalError; -import org.apache.commons.math3.exception.MathUnsupportedOperationException; -import org.apache.commons.math3.exception.util.LocalizedFormats; -import org.apache.commons.math3.linear.ArrayRealVector; -import org.apache.commons.math3.linear.BlockRealMatrix; -import org.apache.commons.math3.linear.DecompositionSolver; -import org.apache.commons.math3.linear.LUDecomposition; -import org.apache.commons.math3.linear.QRDecomposition; -import org.apache.commons.math3.linear.RealMatrix; -import org.apache.commons.math3.linear.SingularMatrixException; -import org.apache.commons.math3.optim.ConvergenceChecker; -import org.apache.commons.math3.optim.PointVectorValuePair; +package org.apache.commons.math4.optim.nonlinear.vector.jacobian; + +import org.apache.commons.math4.exception.ConvergenceException; +import org.apache.commons.math4.exception.MathInternalError; +import org.apache.commons.math4.exception.MathUnsupportedOperationException; +import org.apache.commons.math4.exception.NullArgumentException; +import org.apache.commons.math4.exception.util.LocalizedFormats; +import org.apache.commons.math4.linear.ArrayRealVector; +import org.apache.commons.math4.linear.BlockRealMatrix; +import org.apache.commons.math4.linear.DecompositionSolver; +import org.apache.commons.math4.linear.LUDecomposition; +import org.apache.commons.math4.linear.QRDecomposition; +import org.apache.commons.math4.linear.RealMatrix; +import org.apache.commons.math4.linear.SingularMatrixException; +import org.apache.commons.math4.optim.ConvergenceChecker; +import org.apache.commons.math4.optim.PointVectorValuePair; /** * Gauss-Newton least-squares solver. @@ -48,7 +48,7 @@ import org.apache.commons.math3.optim.PointVectorValuePair; * @since 2.0 * @deprecated All classes and interfaces in this package are deprecated. * The optimizers that were provided here were moved to the - * {@link org.apache.commons.math3.fitting.leastsquares} package + * {@link org.apache.commons.math4.fitting.leastsquares} package * (cf. MATH-1008). */ @Deprecated http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/LevenbergMarquardtOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/LevenbergMarquardtOptimizer.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/LevenbergMarquardtOptimizer.java index 05be0d0..b0a2ca3 100644 --- a/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/LevenbergMarquardtOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/LevenbergMarquardtOptimizer.java @@ -14,17 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optim.nonlinear.vector.jacobian; +package org.apache.commons.math4.optim.nonlinear.vector.jacobian; import java.util.Arrays; -import org.apache.commons.math3.exception.ConvergenceException; -import org.apache.commons.math3.exception.MathUnsupportedOperationException; -import org.apache.commons.math3.exception.util.LocalizedFormats; -import org.apache.commons.math3.optim.PointVectorValuePair; -import org.apache.commons.math3.optim.ConvergenceChecker; -import org.apache.commons.math3.linear.RealMatrix; -import org.apache.commons.math3.util.Precision; -import org.apache.commons.math3.util.FastMath; + +import org.apache.commons.math4.exception.ConvergenceException; +import org.apache.commons.math4.exception.MathUnsupportedOperationException; +import org.apache.commons.math4.exception.util.LocalizedFormats; +import org.apache.commons.math4.linear.RealMatrix; +import org.apache.commons.math4.optim.ConvergenceChecker; +import org.apache.commons.math4.optim.PointVectorValuePair; +import org.apache.commons.math4.util.FastMath; +import org.apache.commons.math4.util.Precision; /** @@ -110,7 +111,7 @@ import org.apache.commons.math3.util.FastMath; * @since 2.0 * @deprecated All classes and interfaces in this package are deprecated. * The optimizers that were provided here were moved to the - * {@link org.apache.commons.math3.fitting.leastsquares} package + * {@link org.apache.commons.math4.fitting.leastsquares} package * (cf. MATH-1008). */ @Deprecated http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/package-info.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/package-info.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/package-info.java index 4c844ba..ab06a53 100644 --- a/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/package-info.java +++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/package-info.java @@ -20,7 +20,7 @@ * * @deprecated All classes and interfaces in this package are deprecated. * The optimizers that were provided here were moved to the - * {@link org.apache.commons.math3.fitting.leastsquares} package + * {@link org.apache.commons.math4.fitting.leastsquares} package * (cf. MATH-1008). */ -package org.apache.commons.math3.optim.nonlinear.vector.jacobian; +package org.apache.commons.math4.optim.nonlinear.vector.jacobian; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/package-info.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/package-info.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/package-info.java index 439fc3c..91ac3ff 100644 --- a/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/package-info.java +++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/vector/package-info.java @@ -20,7 +20,7 @@ * * @deprecated All classes and interfaces in this package are deprecated. * The optimizers that were provided here were moved to the - * {@link org.apache.commons.math3.fitting.leastsquares} package + * {@link org.apache.commons.math4.fitting.leastsquares} package * (cf. MATH-1008). */ -package org.apache.commons.math3.optim.nonlinear.vector; +package org.apache.commons.math4.optim.nonlinear.vector; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/package-info.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/package-info.java b/src/main/java/org/apache/commons/math4/optim/package-info.java index b6c9fd7..f49f3f9 100644 --- a/src/main/java/org/apache/commons/math4/optim/package-info.java +++ b/src/main/java/org/apache/commons/math4/optim/package-info.java @@ -18,52 +18,52 @@ /** * <p> * Generally, optimizers are algorithms that will either - * {@link org.apache.commons.math3.optim.nonlinear.scalar.GoalType#MINIMIZE minimize} or - * {@link org.apache.commons.math3.optim.nonlinear.scalar.GoalType#MAXIMIZE maximize} + * {@link org.apache.commons.math4.optim.nonlinear.scalar.GoalType#MINIMIZE minimize} or + * {@link org.apache.commons.math4.optim.nonlinear.scalar.GoalType#MAXIMIZE maximize} * a scalar function, called the - * {@link org.apache.commons.math3.optim.nonlinear.scalar.ObjectiveFunction <em>objective + * {@link org.apache.commons.math4.optim.nonlinear.scalar.ObjectiveFunction <em>objective * function</em>}. * <br/> * For some scalar objective functions the gradient can be computed (analytically * or numerically). Algorithms that use this knowledge are defined in the - * {@link org.apache.commons.math3.optim.nonlinear.scalar.gradient} package. + * {@link org.apache.commons.math4.optim.nonlinear.scalar.gradient} package. * The algorithms that do not need this additional information are located in - * the {@link org.apache.commons.math3.optim.nonlinear.scalar.noderiv} package. + * the {@link org.apache.commons.math4.optim.nonlinear.scalar.noderiv} package. * </p> * * <p> * Some problems are solved more efficiently by algorithms that, instead of an * objective function, need access to a - * {@link org.apache.commons.math3.optim.nonlinear.vector.ModelFunction + * {@link org.apache.commons.math4.optim.nonlinear.vector.ModelFunction * <em>model function</em>}: such a model predicts a set of values which the * algorithm tries to match with a set of given - * {@link org.apache.commons.math3.optim.nonlinear.vector.Target target values}. + * {@link org.apache.commons.math4.optim.nonlinear.vector.Target target values}. * Those algorithms are located in the - * {@link org.apache.commons.math3.optim.nonlinear.vector} package. + * {@link org.apache.commons.math4.optim.nonlinear.vector} package. * <br/> * Algorithms that also require the - * {@link org.apache.commons.math3.optim.nonlinear.vector.ModelFunctionJacobian + * {@link org.apache.commons.math4.optim.nonlinear.vector.ModelFunctionJacobian * Jacobian matrix of the model} are located in the - * {@link org.apache.commons.math3.optim.nonlinear.vector.jacobian} package. + * {@link org.apache.commons.math4.optim.nonlinear.vector.jacobian} package. * <br/> - * The {@link org.apache.commons.math3.optim.nonlinear.vector.jacobian.AbstractLeastSquaresOptimizer + * The {@link org.apache.commons.math4.optim.nonlinear.vector.jacobian.AbstractLeastSquaresOptimizer * non-linear least-squares optimizers} are a specialization of the the latter, * that minimize the distance (called <em>cost</em> or <em>χ<sup>2</sup></em>) * between model and observations. * <br/> * For cases where the Jacobian cannot be provided, a utility class will - * {@link org.apache.commons.math3.optim.nonlinear.scalar.LeastSquaresConverter + * {@link org.apache.commons.math4.optim.nonlinear.scalar.LeastSquaresConverter * convert} a (vector) model into a (scalar) objective function. * </p> * * <p> * This package provides common functionality for the optimization algorithms. - * Abstract classes ({@link org.apache.commons.math3.optim.BaseOptimizer} and - * {@link org.apache.commons.math3.optim.BaseMultivariateOptimizer}) contain - * boiler-plate code for storing {@link org.apache.commons.math3.optim.MaxEval - * evaluations} and {@link org.apache.commons.math3.optim.MaxIter iterations} + * Abstract classes ({@link org.apache.commons.math4.optim.BaseOptimizer} and + * {@link org.apache.commons.math4.optim.BaseMultivariateOptimizer}) contain + * boiler-plate code for storing {@link org.apache.commons.math4.optim.MaxEval + * evaluations} and {@link org.apache.commons.math4.optim.MaxIter iterations} * counters and a user-defined - * {@link org.apache.commons.math3.optim.ConvergenceChecker convergence checker}. + * {@link org.apache.commons.math4.optim.ConvergenceChecker convergence checker}. * </p> * * <p> @@ -74,4 +74,4 @@ * This could be useful to avoid being trapped in a local extremum. * </p> */ -package org.apache.commons.math3.optim; +package org.apache.commons.math4.optim; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/univariate/BracketFinder.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/univariate/BracketFinder.java b/src/main/java/org/apache/commons/math4/optim/univariate/BracketFinder.java index 2653c12..cf05237 100644 --- a/src/main/java/org/apache/commons/math4/optim/univariate/BracketFinder.java +++ b/src/main/java/org/apache/commons/math4/optim/univariate/BracketFinder.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optim.univariate; +package org.apache.commons.math4.optim.univariate; -import org.apache.commons.math3.util.FastMath; -import org.apache.commons.math3.util.Incrementor; -import org.apache.commons.math3.exception.NotStrictlyPositiveException; -import org.apache.commons.math3.exception.TooManyEvaluationsException; -import org.apache.commons.math3.exception.MaxCountExceededException; -import org.apache.commons.math3.analysis.UnivariateFunction; -import org.apache.commons.math3.optim.nonlinear.scalar.GoalType; +import org.apache.commons.math4.analysis.UnivariateFunction; +import org.apache.commons.math4.exception.MaxCountExceededException; +import org.apache.commons.math4.exception.NotStrictlyPositiveException; +import org.apache.commons.math4.exception.TooManyEvaluationsException; +import org.apache.commons.math4.optim.nonlinear.scalar.GoalType; +import org.apache.commons.math4.util.FastMath; +import org.apache.commons.math4.util.Incrementor; /** * Provide an interval that brackets a local optimum of a function. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/univariate/BrentOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/univariate/BrentOptimizer.java b/src/main/java/org/apache/commons/math4/optim/univariate/BrentOptimizer.java index d783405..420a919 100644 --- a/src/main/java/org/apache/commons/math4/optim/univariate/BrentOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optim/univariate/BrentOptimizer.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optim.univariate; +package org.apache.commons.math4.optim.univariate; -import org.apache.commons.math3.util.Precision; -import org.apache.commons.math3.util.FastMath; -import org.apache.commons.math3.exception.NumberIsTooSmallException; -import org.apache.commons.math3.exception.NotStrictlyPositiveException; -import org.apache.commons.math3.optim.ConvergenceChecker; -import org.apache.commons.math3.optim.nonlinear.scalar.GoalType; +import org.apache.commons.math4.exception.NotStrictlyPositiveException; +import org.apache.commons.math4.exception.NumberIsTooSmallException; +import org.apache.commons.math4.optim.ConvergenceChecker; +import org.apache.commons.math4.optim.nonlinear.scalar.GoalType; +import org.apache.commons.math4.util.FastMath; +import org.apache.commons.math4.util.Precision; /** * For a function defined on some interval {@code (lo, hi)}, this class http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/univariate/MultiStartUnivariateOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/univariate/MultiStartUnivariateOptimizer.java b/src/main/java/org/apache/commons/math4/optim/univariate/MultiStartUnivariateOptimizer.java index 07e7daf..cbfa268 100644 --- a/src/main/java/org/apache/commons/math4/optim/univariate/MultiStartUnivariateOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optim/univariate/MultiStartUnivariateOptimizer.java @@ -15,17 +15,18 @@ * limitations under the License. */ -package org.apache.commons.math3.optim.univariate; +package org.apache.commons.math4.optim.univariate; import java.util.Arrays; import java.util.Comparator; -import org.apache.commons.math3.exception.MathIllegalStateException; -import org.apache.commons.math3.exception.NotStrictlyPositiveException; -import org.apache.commons.math3.exception.util.LocalizedFormats; -import org.apache.commons.math3.random.RandomGenerator; -import org.apache.commons.math3.optim.MaxEval; -import org.apache.commons.math3.optim.nonlinear.scalar.GoalType; -import org.apache.commons.math3.optim.OptimizationData; + +import org.apache.commons.math4.exception.MathIllegalStateException; +import org.apache.commons.math4.exception.NotStrictlyPositiveException; +import org.apache.commons.math4.exception.util.LocalizedFormats; +import org.apache.commons.math4.optim.MaxEval; +import org.apache.commons.math4.optim.OptimizationData; +import org.apache.commons.math4.optim.nonlinear.scalar.GoalType; +import org.apache.commons.math4.random.RandomGenerator; /** * Special implementation of the {@link UnivariateOptimizer} interface http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/univariate/SearchInterval.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/univariate/SearchInterval.java b/src/main/java/org/apache/commons/math4/optim/univariate/SearchInterval.java index fa80e64..172cf80 100644 --- a/src/main/java/org/apache/commons/math4/optim/univariate/SearchInterval.java +++ b/src/main/java/org/apache/commons/math4/optim/univariate/SearchInterval.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optim.univariate; +package org.apache.commons.math4.optim.univariate; -import org.apache.commons.math3.optim.OptimizationData; -import org.apache.commons.math3.exception.NumberIsTooLargeException; -import org.apache.commons.math3.exception.OutOfRangeException; +import org.apache.commons.math4.exception.NumberIsTooLargeException; +import org.apache.commons.math4.exception.OutOfRangeException; +import org.apache.commons.math4.optim.OptimizationData; /** * Search interval and (optional) start value. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/univariate/SimpleUnivariateValueChecker.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/univariate/SimpleUnivariateValueChecker.java b/src/main/java/org/apache/commons/math4/optim/univariate/SimpleUnivariateValueChecker.java index 58cc521..935e74b 100644 --- a/src/main/java/org/apache/commons/math4/optim/univariate/SimpleUnivariateValueChecker.java +++ b/src/main/java/org/apache/commons/math4/optim/univariate/SimpleUnivariateValueChecker.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optim.univariate; +package org.apache.commons.math4.optim.univariate; -import org.apache.commons.math3.util.FastMath; -import org.apache.commons.math3.exception.NotStrictlyPositiveException; -import org.apache.commons.math3.optim.AbstractConvergenceChecker; +import org.apache.commons.math4.exception.NotStrictlyPositiveException; +import org.apache.commons.math4.optim.AbstractConvergenceChecker; +import org.apache.commons.math4.util.FastMath; /** * Simple implementation of the - * {@link org.apache.commons.math3.optimization.ConvergenceChecker} interface + * {@link org.apache.commons.math4.optimization.ConvergenceChecker} interface * that uses only objective function values. * * Convergence is considered to have been reached if either the relative http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/univariate/UnivariateObjectiveFunction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/univariate/UnivariateObjectiveFunction.java b/src/main/java/org/apache/commons/math4/optim/univariate/UnivariateObjectiveFunction.java index ad06d84..8190481 100644 --- a/src/main/java/org/apache/commons/math4/optim/univariate/UnivariateObjectiveFunction.java +++ b/src/main/java/org/apache/commons/math4/optim/univariate/UnivariateObjectiveFunction.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optim.univariate; +package org.apache.commons.math4.optim.univariate; -import org.apache.commons.math3.analysis.UnivariateFunction; -import org.apache.commons.math3.optim.OptimizationData; +import org.apache.commons.math4.analysis.UnivariateFunction; +import org.apache.commons.math4.optim.OptimizationData; /** * Scalar function to be optimized. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/univariate/UnivariateOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/univariate/UnivariateOptimizer.java b/src/main/java/org/apache/commons/math4/optim/univariate/UnivariateOptimizer.java index a7512c1..99e1cc4 100644 --- a/src/main/java/org/apache/commons/math4/optim/univariate/UnivariateOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optim/univariate/UnivariateOptimizer.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optim.univariate; +package org.apache.commons.math4.optim.univariate; -import org.apache.commons.math3.analysis.UnivariateFunction; -import org.apache.commons.math3.optim.BaseOptimizer; -import org.apache.commons.math3.optim.OptimizationData; -import org.apache.commons.math3.optim.nonlinear.scalar.GoalType; -import org.apache.commons.math3.optim.ConvergenceChecker; -import org.apache.commons.math3.exception.TooManyEvaluationsException; +import org.apache.commons.math4.analysis.UnivariateFunction; +import org.apache.commons.math4.exception.TooManyEvaluationsException; +import org.apache.commons.math4.optim.BaseOptimizer; +import org.apache.commons.math4.optim.ConvergenceChecker; +import org.apache.commons.math4.optim.OptimizationData; +import org.apache.commons.math4.optim.nonlinear.scalar.GoalType; /** * Base class for a univariate scalar function optimizer. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/univariate/UnivariatePointValuePair.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/univariate/UnivariatePointValuePair.java b/src/main/java/org/apache/commons/math4/optim/univariate/UnivariatePointValuePair.java index 6b2b51a..2a02a86 100644 --- a/src/main/java/org/apache/commons/math4/optim/univariate/UnivariatePointValuePair.java +++ b/src/main/java/org/apache/commons/math4/optim/univariate/UnivariatePointValuePair.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math3.optim.univariate; +package org.apache.commons.math4.optim.univariate; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/univariate/package-info.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optim/univariate/package-info.java b/src/main/java/org/apache/commons/math4/optim/univariate/package-info.java index 2273bab..de322c3 100644 --- a/src/main/java/org/apache/commons/math4/optim/univariate/package-info.java +++ b/src/main/java/org/apache/commons/math4/optim/univariate/package-info.java @@ -18,4 +18,4 @@ /** * One-dimensional optimization algorithms. */ -package org.apache.commons.math3.optim.univariate; +package org.apache.commons.math4.optim.univariate; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/AbstractConvergenceChecker.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/AbstractConvergenceChecker.java b/src/main/java/org/apache/commons/math4/optimization/AbstractConvergenceChecker.java index 09cb1db..9f57533 100644 --- a/src/main/java/org/apache/commons/math4/optimization/AbstractConvergenceChecker.java +++ b/src/main/java/org/apache/commons/math4/optimization/AbstractConvergenceChecker.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.util.Precision; +import org.apache.commons.math4.util.Precision; /** * Base class for all convergence checker implementations. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/BaseMultivariateMultiStartOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/BaseMultivariateMultiStartOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/BaseMultivariateMultiStartOptimizer.java index 53c2a7a..59b8277 100644 --- a/src/main/java/org/apache/commons/math4/optimization/BaseMultivariateMultiStartOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optimization/BaseMultivariateMultiStartOptimizer.java @@ -15,17 +15,17 @@ * 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.MultivariateFunction; -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.MultivariateFunction; +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/BaseMultivariateOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/optimization/BaseMultivariateOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/BaseMultivariateOptimizer.java index 5120ec7..ce156a0 100644 --- a/src/main/java/org/apache/commons/math4/optimization/BaseMultivariateOptimizer.java +++ b/src/main/java/org/apache/commons/math4/optimization/BaseMultivariateOptimizer.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. @@ -46,14 +46,14 @@ public interface BaseMultivariateOptimizer<FUNC extends MultivariateFunction> * @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. In 4.0, it will be replaced by the declaration - * corresponding to this {@link org.apache.commons.math3.optimization.direct.BaseAbstractMultivariateOptimizer#optimize(int,MultivariateFunction,GoalType,OptimizationData[]) method}. + * corresponding to this {@link org.apache.commons.math4.optimization.direct.BaseAbstractMultivariateOptimizer#optimize(int,MultivariateFunction,GoalType,OptimizationData[]) method}. */ @Deprecated PointValuePair optimize(int maxEval, FUNC f, GoalType goalType,
