http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/RandomCirclePointGenerator.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/RandomCirclePointGenerator.java b/src/test/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/RandomCirclePointGenerator.java index fdbe236..3ce415d 100644 --- a/src/test/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/RandomCirclePointGenerator.java +++ b/src/test/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/RandomCirclePointGenerator.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.vector.jacobian; +package org.apache.commons.math4.optim.nonlinear.vector.jacobian; -import org.apache.commons.math3.random.RandomGenerator; -import org.apache.commons.math3.random.Well44497b; -import org.apache.commons.math3.util.MathUtils; -import org.apache.commons.math3.util.FastMath; -import org.apache.commons.math3.distribution.RealDistribution; -import org.apache.commons.math3.distribution.UniformRealDistribution; -import org.apache.commons.math3.distribution.NormalDistribution; -import org.apache.commons.math3.geometry.euclidean.twod.Vector2D; +import org.apache.commons.math4.distribution.NormalDistribution; +import org.apache.commons.math4.distribution.RealDistribution; +import org.apache.commons.math4.distribution.UniformRealDistribution; +import org.apache.commons.math4.geometry.euclidean.twod.Vector2D; +import org.apache.commons.math4.random.RandomGenerator; +import org.apache.commons.math4.random.Well44497b; +import org.apache.commons.math4.util.FastMath; +import org.apache.commons.math4.util.MathUtils; /** * Factory for generating a cloud of points that approximate a circle.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/RandomStraightLinePointGenerator.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/RandomStraightLinePointGenerator.java b/src/test/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/RandomStraightLinePointGenerator.java index 2da67c6..a08b959 100644 --- a/src/test/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/RandomStraightLinePointGenerator.java +++ b/src/test/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/RandomStraightLinePointGenerator.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.apache.commons.math3.optim.nonlinear.vector.jacobian; +package org.apache.commons.math4.optim.nonlinear.vector.jacobian; import java.awt.geom.Point2D; -import org.apache.commons.math3.random.RandomGenerator; -import org.apache.commons.math3.random.Well44497b; -import org.apache.commons.math3.distribution.RealDistribution; -import org.apache.commons.math3.distribution.UniformRealDistribution; -import org.apache.commons.math3.distribution.NormalDistribution; +import org.apache.commons.math4.distribution.NormalDistribution; +import org.apache.commons.math4.distribution.RealDistribution; +import org.apache.commons.math4.distribution.UniformRealDistribution; +import org.apache.commons.math4.random.RandomGenerator; +import org.apache.commons.math4.random.Well44497b; /** * Factory for generating a cloud of points that approximate a straight line. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/StatisticalReferenceDataset.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/StatisticalReferenceDataset.java b/src/test/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/StatisticalReferenceDataset.java index 6fca154..8265215 100644 --- a/src/test/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/StatisticalReferenceDataset.java +++ b/src/test/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/StatisticalReferenceDataset.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.vector.jacobian; +package org.apache.commons.math4.optim.nonlinear.vector.jacobian; import java.io.BufferedReader; import java.io.IOException; import java.util.ArrayList; -import org.apache.commons.math3.analysis.MultivariateVectorFunction; -import org.apache.commons.math3.analysis.MultivariateMatrixFunction; -import org.apache.commons.math3.optim.nonlinear.vector.ModelFunction; -import org.apache.commons.math3.optim.nonlinear.vector.ModelFunctionJacobian; -import org.apache.commons.math3.util.MathArrays; +import org.apache.commons.math4.analysis.MultivariateMatrixFunction; +import org.apache.commons.math4.analysis.MultivariateVectorFunction; +import org.apache.commons.math4.optim.nonlinear.vector.ModelFunction; +import org.apache.commons.math4.optim.nonlinear.vector.ModelFunctionJacobian; +import org.apache.commons.math4.util.MathArrays; /** * This class gives access to the statistical reference datasets provided by the http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/StatisticalReferenceDatasetFactory.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/StatisticalReferenceDatasetFactory.java b/src/test/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/StatisticalReferenceDatasetFactory.java index 2c49165..99995e8 100644 --- a/src/test/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/StatisticalReferenceDatasetFactory.java +++ b/src/test/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/StatisticalReferenceDatasetFactory.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.jacobian; +package org.apache.commons.math4.optim.nonlinear.vector.jacobian; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math4.util.FastMath; /** * A factory to create instances of {@link StatisticalReferenceDataset} from http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/StraightLineProblem.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/StraightLineProblem.java b/src/test/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/StraightLineProblem.java index 092e37f..e93c604 100644 --- a/src/test/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/StraightLineProblem.java +++ b/src/test/java/org/apache/commons/math4/optim/nonlinear/vector/jacobian/StraightLineProblem.java @@ -15,16 +15,16 @@ * 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.ArrayList; -import org.apache.commons.math3.analysis.MultivariateVectorFunction; -import org.apache.commons.math3.analysis.MultivariateMatrixFunction; -import org.apache.commons.math3.analysis.UnivariateFunction; -import org.apache.commons.math3.stat.regression.SimpleRegression; -import org.apache.commons.math3.optim.nonlinear.vector.ModelFunction; -import org.apache.commons.math3.optim.nonlinear.vector.ModelFunctionJacobian; +import org.apache.commons.math4.analysis.MultivariateMatrixFunction; +import org.apache.commons.math4.analysis.MultivariateVectorFunction; +import org.apache.commons.math4.analysis.UnivariateFunction; +import org.apache.commons.math4.optim.nonlinear.vector.ModelFunction; +import org.apache.commons.math4.optim.nonlinear.vector.ModelFunctionJacobian; +import org.apache.commons.math4.stat.regression.SimpleRegression; /** * Class that models a straight line defined as {@code y = a x + b}. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optim/univariate/BracketFinderTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optim/univariate/BracketFinderTest.java b/src/test/java/org/apache/commons/math4/optim/univariate/BracketFinderTest.java index d341949..b7ea9e1 100644 --- a/src/test/java/org/apache/commons/math4/optim/univariate/BracketFinderTest.java +++ b/src/test/java/org/apache/commons/math4/optim/univariate/BracketFinderTest.java @@ -14,10 +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.analysis.UnivariateFunction; -import org.apache.commons.math3.optim.nonlinear.scalar.GoalType; +import org.apache.commons.math4.analysis.UnivariateFunction; +import org.apache.commons.math4.optim.nonlinear.scalar.GoalType; +import org.apache.commons.math4.optim.univariate.BracketFinder; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optim/univariate/BrentOptimizerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optim/univariate/BrentOptimizerTest.java b/src/test/java/org/apache/commons/math4/optim/univariate/BrentOptimizerTest.java index 575eb5c..d5ea82a 100644 --- a/src/test/java/org/apache/commons/math4/optim/univariate/BrentOptimizerTest.java +++ b/src/test/java/org/apache/commons/math4/optim/univariate/BrentOptimizerTest.java @@ -14,22 +14,28 @@ * 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.QuinticFunction; -import org.apache.commons.math3.analysis.UnivariateFunction; -import org.apache.commons.math3.analysis.function.Sin; -import org.apache.commons.math3.analysis.function.StepFunction; -import org.apache.commons.math3.analysis.FunctionUtils; -import org.apache.commons.math3.exception.NumberIsTooLargeException; -import org.apache.commons.math3.exception.NumberIsTooSmallException; -import org.apache.commons.math3.exception.TooManyEvaluationsException; -import org.apache.commons.math3.optim.ConvergenceChecker; -import org.apache.commons.math3.optim.nonlinear.scalar.GoalType; -import org.apache.commons.math3.optim.MaxEval; -import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; -import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math4.analysis.FunctionUtils; +import org.apache.commons.math4.analysis.QuinticFunction; +import org.apache.commons.math4.analysis.UnivariateFunction; +import org.apache.commons.math4.analysis.function.Sin; +import org.apache.commons.math4.analysis.function.StepFunction; +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.optim.ConvergenceChecker; +import org.apache.commons.math4.optim.MaxEval; +import org.apache.commons.math4.optim.nonlinear.scalar.GoalType; +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; +import org.apache.commons.math4.stat.descriptive.DescriptiveStatistics; +import org.apache.commons.math4.util.FastMath; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optim/univariate/MultiStartUnivariateOptimizerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optim/univariate/MultiStartUnivariateOptimizerTest.java b/src/test/java/org/apache/commons/math4/optim/univariate/MultiStartUnivariateOptimizerTest.java index d979c72..4946431 100644 --- a/src/test/java/org/apache/commons/math4/optim/univariate/MultiStartUnivariateOptimizerTest.java +++ b/src/test/java/org/apache/commons/math4/optim/univariate/MultiStartUnivariateOptimizerTest.java @@ -14,16 +14,22 @@ * 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.QuinticFunction; -import org.apache.commons.math3.analysis.UnivariateFunction; -import org.apache.commons.math3.analysis.function.Sin; -import org.apache.commons.math3.optim.nonlinear.scalar.GoalType; -import org.apache.commons.math3.optim.MaxEval; -import org.apache.commons.math3.random.JDKRandomGenerator; -import org.apache.commons.math3.util.FastMath; -import org.apache.commons.math3.exception.MathIllegalStateException; +import org.apache.commons.math4.analysis.QuinticFunction; +import org.apache.commons.math4.analysis.UnivariateFunction; +import org.apache.commons.math4.analysis.function.Sin; +import org.apache.commons.math4.exception.MathIllegalStateException; +import org.apache.commons.math4.optim.MaxEval; +import org.apache.commons.math4.optim.nonlinear.scalar.GoalType; +import org.apache.commons.math4.optim.univariate.BrentOptimizer; +import org.apache.commons.math4.optim.univariate.MultiStartUnivariateOptimizer; +import org.apache.commons.math4.optim.univariate.SearchInterval; +import org.apache.commons.math4.optim.univariate.UnivariateObjectiveFunction; +import org.apache.commons.math4.optim.univariate.UnivariateOptimizer; +import org.apache.commons.math4.optim.univariate.UnivariatePointValuePair; +import org.apache.commons.math4.random.JDKRandomGenerator; +import org.apache.commons.math4.util.FastMath; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optim/univariate/SimpleUnivariateValueCheckerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optim/univariate/SimpleUnivariateValueCheckerTest.java b/src/test/java/org/apache/commons/math4/optim/univariate/SimpleUnivariateValueCheckerTest.java index e7b7904..72c02b1 100644 --- a/src/test/java/org/apache/commons/math4/optim/univariate/SimpleUnivariateValueCheckerTest.java +++ b/src/test/java/org/apache/commons/math4/optim/univariate/SimpleUnivariateValueCheckerTest.java @@ -14,9 +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.exception.NotStrictlyPositiveException; +import org.apache.commons.math4.exception.NotStrictlyPositiveException; +import org.apache.commons.math4.optim.univariate.SimpleUnivariateValueChecker; +import org.apache.commons.math4.optim.univariate.UnivariatePointValuePair; import org.junit.Test; import org.junit.Assert; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/MultivariateDifferentiableMultiStartOptimizerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/MultivariateDifferentiableMultiStartOptimizerTest.java b/src/test/java/org/apache/commons/math4/optimization/MultivariateDifferentiableMultiStartOptimizerTest.java index 9eabe99..60c412e 100644 --- a/src/test/java/org/apache/commons/math4/optimization/MultivariateDifferentiableMultiStartOptimizerTest.java +++ b/src/test/java/org/apache/commons/math4/optimization/MultivariateDifferentiableMultiStartOptimizerTest.java @@ -15,18 +15,24 @@ * 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.geometry.euclidean.twod.Vector2D; -import org.apache.commons.math3.optimization.general.CircleScalar; -import org.apache.commons.math3.optimization.general.ConjugateGradientFormula; -import org.apache.commons.math3.optimization.general.NonLinearConjugateGradientOptimizer; -import org.apache.commons.math3.random.GaussianRandomGenerator; -import org.apache.commons.math3.random.JDKRandomGenerator; -import org.apache.commons.math3.random.RandomVectorGenerator; -import org.apache.commons.math3.random.UncorrelatedRandomVectorGenerator; +import org.apache.commons.math4.analysis.differentiation.MultivariateDifferentiableFunction; +import org.apache.commons.math4.geometry.euclidean.twod.Vector2D; +import org.apache.commons.math4.optimization.ConvergenceChecker; +import org.apache.commons.math4.optimization.GoalType; +import org.apache.commons.math4.optimization.MultivariateDifferentiableMultiStartOptimizer; +import org.apache.commons.math4.optimization.MultivariateDifferentiableOptimizer; +import org.apache.commons.math4.optimization.PointValuePair; +import org.apache.commons.math4.optimization.SimpleValueChecker; +import org.apache.commons.math4.optimization.general.CircleScalar; +import org.apache.commons.math4.optimization.general.ConjugateGradientFormula; +import org.apache.commons.math4.optimization.general.NonLinearConjugateGradientOptimizer; +import org.apache.commons.math4.random.GaussianRandomGenerator; +import org.apache.commons.math4.random.JDKRandomGenerator; +import org.apache.commons.math4.random.RandomVectorGenerator; +import org.apache.commons.math4.random.UncorrelatedRandomVectorGenerator; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/MultivariateDifferentiableVectorMultiStartOptimizerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/MultivariateDifferentiableVectorMultiStartOptimizerTest.java b/src/test/java/org/apache/commons/math4/optimization/MultivariateDifferentiableVectorMultiStartOptimizerTest.java index bdc1c13..f36d364 100644 --- a/src/test/java/org/apache/commons/math4/optimization/MultivariateDifferentiableVectorMultiStartOptimizerTest.java +++ b/src/test/java/org/apache/commons/math4/optimization/MultivariateDifferentiableVectorMultiStartOptimizerTest.java @@ -15,19 +15,24 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization; - - -import org.apache.commons.math3.analysis.differentiation.DerivativeStructure; -import org.apache.commons.math3.analysis.differentiation.MultivariateDifferentiableVectorFunction; -import org.apache.commons.math3.exception.MathIllegalStateException; -import org.apache.commons.math3.linear.BlockRealMatrix; -import org.apache.commons.math3.linear.RealMatrix; -import org.apache.commons.math3.optimization.general.GaussNewtonOptimizer; -import org.apache.commons.math3.random.GaussianRandomGenerator; -import org.apache.commons.math3.random.JDKRandomGenerator; -import org.apache.commons.math3.random.RandomVectorGenerator; -import org.apache.commons.math3.random.UncorrelatedRandomVectorGenerator; +package org.apache.commons.math4.optimization; + + +import org.apache.commons.math4.analysis.differentiation.DerivativeStructure; +import org.apache.commons.math4.analysis.differentiation.MultivariateDifferentiableVectorFunction; +import org.apache.commons.math4.exception.MathIllegalStateException; +import org.apache.commons.math4.linear.BlockRealMatrix; +import org.apache.commons.math4.linear.RealMatrix; +import org.apache.commons.math4.optimization.ConvergenceChecker; +import org.apache.commons.math4.optimization.MultivariateDifferentiableVectorMultiStartOptimizer; +import org.apache.commons.math4.optimization.MultivariateDifferentiableVectorOptimizer; +import org.apache.commons.math4.optimization.PointVectorValuePair; +import org.apache.commons.math4.optimization.SimpleVectorValueChecker; +import org.apache.commons.math4.optimization.general.GaussNewtonOptimizer; +import org.apache.commons.math4.random.GaussianRandomGenerator; +import org.apache.commons.math4.random.JDKRandomGenerator; +import org.apache.commons.math4.random.RandomVectorGenerator; +import org.apache.commons.math4.random.UncorrelatedRandomVectorGenerator; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/MultivariateMultiStartOptimizerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/MultivariateMultiStartOptimizerTest.java b/src/test/java/org/apache/commons/math4/optimization/MultivariateMultiStartOptimizerTest.java index dc52366..f3f4461 100644 --- a/src/test/java/org/apache/commons/math4/optimization/MultivariateMultiStartOptimizerTest.java +++ b/src/test/java/org/apache/commons/math4/optimization/MultivariateMultiStartOptimizerTest.java @@ -15,16 +15,20 @@ * 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.optimization.direct.NelderMeadSimplex; -import org.apache.commons.math3.optimization.direct.SimplexOptimizer; -import org.apache.commons.math3.random.GaussianRandomGenerator; -import org.apache.commons.math3.random.JDKRandomGenerator; -import org.apache.commons.math3.random.RandomVectorGenerator; -import org.apache.commons.math3.random.UncorrelatedRandomVectorGenerator; +import org.apache.commons.math4.analysis.MultivariateFunction; +import org.apache.commons.math4.optimization.GoalType; +import org.apache.commons.math4.optimization.MultivariateMultiStartOptimizer; +import org.apache.commons.math4.optimization.PointValuePair; +import org.apache.commons.math4.optimization.SimpleValueChecker; +import org.apache.commons.math4.optimization.direct.NelderMeadSimplex; +import org.apache.commons.math4.optimization.direct.SimplexOptimizer; +import org.apache.commons.math4.random.GaussianRandomGenerator; +import org.apache.commons.math4.random.JDKRandomGenerator; +import org.apache.commons.math4.random.RandomVectorGenerator; +import org.apache.commons.math4.random.UncorrelatedRandomVectorGenerator; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/PointValuePairTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/PointValuePairTest.java b/src/test/java/org/apache/commons/math4/optimization/PointValuePairTest.java index e683ee6..558541f 100644 --- a/src/test/java/org/apache/commons/math4/optimization/PointValuePairTest.java +++ b/src/test/java/org/apache/commons/math4/optimization/PointValuePairTest.java @@ -15,10 +15,11 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization; +package org.apache.commons.math4.optimization; -import org.apache.commons.math3.TestUtils; +import org.apache.commons.math4.TestUtils; +import org.apache.commons.math4.optimization.PointValuePair; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/PointVectorValuePairTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/PointVectorValuePairTest.java b/src/test/java/org/apache/commons/math4/optimization/PointVectorValuePairTest.java index 153de52..9d59f73 100644 --- a/src/test/java/org/apache/commons/math4/optimization/PointVectorValuePairTest.java +++ b/src/test/java/org/apache/commons/math4/optimization/PointVectorValuePairTest.java @@ -15,10 +15,11 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization; +package org.apache.commons.math4.optimization; -import org.apache.commons.math3.TestUtils; +import org.apache.commons.math4.TestUtils; +import org.apache.commons.math4.optimization.PointVectorValuePair; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/SimplePointCheckerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/SimplePointCheckerTest.java b/src/test/java/org/apache/commons/math4/optimization/SimplePointCheckerTest.java index 5595b11..44238ca 100644 --- a/src/test/java/org/apache/commons/math4/optimization/SimplePointCheckerTest.java +++ b/src/test/java/org/apache/commons/math4/optimization/SimplePointCheckerTest.java @@ -14,9 +14,11 @@ * 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; -import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math4.exception.NotStrictlyPositiveException; +import org.apache.commons.math4.optimization.PointValuePair; +import org.apache.commons.math4.optimization.SimplePointChecker; import org.junit.Test; import org.junit.Assert; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/SimpleValueCheckerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/SimpleValueCheckerTest.java b/src/test/java/org/apache/commons/math4/optimization/SimpleValueCheckerTest.java index baf865f..53b0d13 100644 --- a/src/test/java/org/apache/commons/math4/optimization/SimpleValueCheckerTest.java +++ b/src/test/java/org/apache/commons/math4/optimization/SimpleValueCheckerTest.java @@ -14,9 +14,11 @@ * 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; -import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math4.exception.NotStrictlyPositiveException; +import org.apache.commons.math4.optimization.PointValuePair; +import org.apache.commons.math4.optimization.SimpleValueChecker; import org.junit.Test; import org.junit.Assert; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/SimpleVectorValueCheckerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/SimpleVectorValueCheckerTest.java b/src/test/java/org/apache/commons/math4/optimization/SimpleVectorValueCheckerTest.java index 54ade9f..abe807a 100644 --- a/src/test/java/org/apache/commons/math4/optimization/SimpleVectorValueCheckerTest.java +++ b/src/test/java/org/apache/commons/math4/optimization/SimpleVectorValueCheckerTest.java @@ -14,9 +14,11 @@ * 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; -import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math4.exception.NotStrictlyPositiveException; +import org.apache.commons.math4.optimization.PointVectorValuePair; +import org.apache.commons.math4.optimization.SimpleVectorValueChecker; import org.junit.Test; import org.junit.Assert; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/direct/BOBYQAOptimizerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/direct/BOBYQAOptimizerTest.java b/src/test/java/org/apache/commons/math4/optimization/direct/BOBYQAOptimizerTest.java index a957637..add96f3 100644 --- a/src/test/java/org/apache/commons/math4/optimization/direct/BOBYQAOptimizerTest.java +++ b/src/test/java/org/apache/commons/math4/optimization/direct/BOBYQAOptimizerTest.java @@ -14,21 +14,22 @@ * See the License for the specific language governing permissions and * 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.Random; -import org.apache.commons.math3.analysis.MultivariateFunction; -import org.apache.commons.math3.exception.DimensionMismatchException; -import org.apache.commons.math3.exception.TooManyEvaluationsException; -import org.apache.commons.math3.exception.NumberIsTooLargeException; -import org.apache.commons.math3.exception.NumberIsTooSmallException; -import org.apache.commons.math3.optimization.GoalType; -import org.apache.commons.math3.optimization.PointValuePair; -import org.apache.commons.math3.optimization.InitialGuess; -import org.apache.commons.math3.optimization.SimpleBounds; -import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math4.analysis.MultivariateFunction; +import org.apache.commons.math4.exception.DimensionMismatchException; +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.GoalType; +import org.apache.commons.math4.optimization.InitialGuess; +import org.apache.commons.math4.optimization.PointValuePair; +import org.apache.commons.math4.optimization.SimpleBounds; +import org.apache.commons.math4.optimization.direct.BOBYQAOptimizer; +import org.apache.commons.math4.util.FastMath; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/direct/CMAESOptimizerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/direct/CMAESOptimizerTest.java b/src/test/java/org/apache/commons/math4/optimization/direct/CMAESOptimizerTest.java index 29c3eec..f8587ee 100644 --- a/src/test/java/org/apache/commons/math4/optimization/direct/CMAESOptimizerTest.java +++ b/src/test/java/org/apache/commons/math4/optimization/direct/CMAESOptimizerTest.java @@ -14,25 +14,26 @@ * See the License for the specific language governing permissions and * 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.Random; -import org.apache.commons.math3.Retry; -import org.apache.commons.math3.RetryRunner; -import org.apache.commons.math3.analysis.MultivariateFunction; -import org.apache.commons.math3.exception.NumberIsTooLargeException; -import org.apache.commons.math3.exception.NumberIsTooSmallException; -import org.apache.commons.math3.exception.DimensionMismatchException; -import org.apache.commons.math3.exception.NotPositiveException; -import org.apache.commons.math3.exception.OutOfRangeException; -import org.apache.commons.math3.optimization.GoalType; -import org.apache.commons.math3.optimization.PointValuePair; -import org.apache.commons.math3.optimization.InitialGuess; -import org.apache.commons.math3.optimization.SimpleBounds; -import org.apache.commons.math3.random.MersenneTwister; -import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math4.Retry; +import org.apache.commons.math4.RetryRunner; +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.NumberIsTooLargeException; +import org.apache.commons.math4.exception.NumberIsTooSmallException; +import org.apache.commons.math4.exception.OutOfRangeException; +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; +import org.apache.commons.math4.optimization.direct.CMAESOptimizer; +import org.apache.commons.math4.random.MersenneTwister; +import org.apache.commons.math4.util.FastMath; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/direct/MultivariateFunctionMappingAdapterTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/direct/MultivariateFunctionMappingAdapterTest.java b/src/test/java/org/apache/commons/math4/optimization/direct/MultivariateFunctionMappingAdapterTest.java index 138584a..76d9139 100644 --- a/src/test/java/org/apache/commons/math4/optimization/direct/MultivariateFunctionMappingAdapterTest.java +++ b/src/test/java/org/apache/commons/math4/optimization/direct/MultivariateFunctionMappingAdapterTest.java @@ -15,12 +15,15 @@ * 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.GoalType; -import org.apache.commons.math3.optimization.PointValuePair; +import org.apache.commons.math4.analysis.MultivariateFunction; +import org.apache.commons.math4.optimization.GoalType; +import org.apache.commons.math4.optimization.PointValuePair; +import org.apache.commons.math4.optimization.direct.MultivariateFunctionMappingAdapter; +import org.apache.commons.math4.optimization.direct.NelderMeadSimplex; +import org.apache.commons.math4.optimization.direct.SimplexOptimizer; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/direct/MultivariateFunctionPenaltyAdapterTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/direct/MultivariateFunctionPenaltyAdapterTest.java b/src/test/java/org/apache/commons/math4/optimization/direct/MultivariateFunctionPenaltyAdapterTest.java index 0ad840b..0080bca 100644 --- a/src/test/java/org/apache/commons/math4/optimization/direct/MultivariateFunctionPenaltyAdapterTest.java +++ b/src/test/java/org/apache/commons/math4/optimization/direct/MultivariateFunctionPenaltyAdapterTest.java @@ -15,13 +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.GoalType; -import org.apache.commons.math3.optimization.PointValuePair; -import org.apache.commons.math3.optimization.SimplePointChecker; +import org.apache.commons.math4.analysis.MultivariateFunction; +import org.apache.commons.math4.optimization.GoalType; +import org.apache.commons.math4.optimization.PointValuePair; +import org.apache.commons.math4.optimization.SimplePointChecker; +import org.apache.commons.math4.optimization.direct.MultivariateFunctionPenaltyAdapter; +import org.apache.commons.math4.optimization.direct.NelderMeadSimplex; +import org.apache.commons.math4.optimization.direct.SimplexOptimizer; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/direct/PowellOptimizerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/direct/PowellOptimizerTest.java b/src/test/java/org/apache/commons/math4/optimization/direct/PowellOptimizerTest.java index fcb31fb..227277f 100644 --- a/src/test/java/org/apache/commons/math4/optimization/direct/PowellOptimizerTest.java +++ b/src/test/java/org/apache/commons/math4/optimization/direct/PowellOptimizerTest.java @@ -14,14 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optimization.direct; - -import org.apache.commons.math3.analysis.MultivariateFunction; -import org.apache.commons.math3.analysis.SumSincFunction; -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.util.FastMath; +package org.apache.commons.math4.optimization.direct; + +import org.apache.commons.math4.analysis.MultivariateFunction; +import org.apache.commons.math4.analysis.SumSincFunction; +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.direct.PowellOptimizer; +import org.apache.commons.math4.util.FastMath; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/direct/SimplexOptimizerMultiDirectionalTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/direct/SimplexOptimizerMultiDirectionalTest.java b/src/test/java/org/apache/commons/math4/optimization/direct/SimplexOptimizerMultiDirectionalTest.java index 9dfa46c..2ae7eaf 100644 --- a/src/test/java/org/apache/commons/math4/optimization/direct/SimplexOptimizerMultiDirectionalTest.java +++ b/src/test/java/org/apache/commons/math4/optimization/direct/SimplexOptimizerMultiDirectionalTest.java @@ -15,13 +15,15 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.direct; - -import org.apache.commons.math3.analysis.MultivariateFunction; -import org.apache.commons.math3.optimization.GoalType; -import org.apache.commons.math3.optimization.PointValuePair; -import org.apache.commons.math3.optimization.SimpleValueChecker; -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.optimization.GoalType; +import org.apache.commons.math4.optimization.PointValuePair; +import org.apache.commons.math4.optimization.SimpleValueChecker; +import org.apache.commons.math4.optimization.direct.MultiDirectionalSimplex; +import org.apache.commons.math4.optimization.direct.SimplexOptimizer; +import org.apache.commons.math4.util.FastMath; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/direct/SimplexOptimizerNelderMeadTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/direct/SimplexOptimizerNelderMeadTest.java b/src/test/java/org/apache/commons/math4/optimization/direct/SimplexOptimizerNelderMeadTest.java index 83ba20a..80a8476 100644 --- a/src/test/java/org/apache/commons/math4/optimization/direct/SimplexOptimizerNelderMeadTest.java +++ b/src/test/java/org/apache/commons/math4/optimization/direct/SimplexOptimizerNelderMeadTest.java @@ -15,18 +15,20 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.direct; - - -import org.apache.commons.math3.exception.TooManyEvaluationsException; -import org.apache.commons.math3.analysis.MultivariateFunction; -import org.apache.commons.math3.analysis.MultivariateVectorFunction; -import org.apache.commons.math3.linear.Array2DRowRealMatrix; -import org.apache.commons.math3.linear.RealMatrix; -import org.apache.commons.math3.optimization.GoalType; -import org.apache.commons.math3.optimization.LeastSquaresConverter; -import org.apache.commons.math3.optimization.PointValuePair; -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.analysis.MultivariateVectorFunction; +import org.apache.commons.math4.exception.TooManyEvaluationsException; +import org.apache.commons.math4.linear.Array2DRowRealMatrix; +import org.apache.commons.math4.linear.RealMatrix; +import org.apache.commons.math4.optimization.GoalType; +import org.apache.commons.math4.optimization.LeastSquaresConverter; +import org.apache.commons.math4.optimization.PointValuePair; +import org.apache.commons.math4.optimization.direct.NelderMeadSimplex; +import org.apache.commons.math4.optimization.direct.SimplexOptimizer; +import org.apache.commons.math4.util.FastMath; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/fitting/CurveFitterTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/fitting/CurveFitterTest.java b/src/test/java/org/apache/commons/math4/optimization/fitting/CurveFitterTest.java index eb1bdb7..3857fc7 100644 --- a/src/test/java/org/apache/commons/math4/optimization/fitting/CurveFitterTest.java +++ b/src/test/java/org/apache/commons/math4/optimization/fitting/CurveFitterTest.java @@ -15,11 +15,12 @@ // specific language governing permissions and limitations // under the License. -package org.apache.commons.math3.optimization.fitting; +package org.apache.commons.math4.optimization.fitting; -import org.apache.commons.math3.optimization.general.LevenbergMarquardtOptimizer; -import org.apache.commons.math3.analysis.ParametricUnivariateFunction; -import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math4.analysis.ParametricUnivariateFunction; +import org.apache.commons.math4.optimization.fitting.CurveFitter; +import org.apache.commons.math4.optimization.general.LevenbergMarquardtOptimizer; +import org.apache.commons.math4.util.FastMath; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/fitting/GaussianFitterTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/fitting/GaussianFitterTest.java b/src/test/java/org/apache/commons/math4/optimization/fitting/GaussianFitterTest.java index ddccdb2..ed38f60 100644 --- a/src/test/java/org/apache/commons/math4/optimization/fitting/GaussianFitterTest.java +++ b/src/test/java/org/apache/commons/math4/optimization/fitting/GaussianFitterTest.java @@ -15,10 +15,11 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.fitting; +package org.apache.commons.math4.optimization.fitting; -import org.apache.commons.math3.exception.MathIllegalArgumentException; -import org.apache.commons.math3.optimization.general.LevenbergMarquardtOptimizer; +import org.apache.commons.math4.exception.MathIllegalArgumentException; +import org.apache.commons.math4.optimization.fitting.GaussianFitter; +import org.apache.commons.math4.optimization.general.LevenbergMarquardtOptimizer; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/fitting/HarmonicFitterTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/fitting/HarmonicFitterTest.java b/src/test/java/org/apache/commons/math4/optimization/fitting/HarmonicFitterTest.java index f2c1108..31a9bcc 100644 --- a/src/test/java/org/apache/commons/math4/optimization/fitting/HarmonicFitterTest.java +++ b/src/test/java/org/apache/commons/math4/optimization/fitting/HarmonicFitterTest.java @@ -15,16 +15,18 @@ // specific language governing permissions and limitations // under the License. -package org.apache.commons.math3.optimization.fitting; +package org.apache.commons.math4.optimization.fitting; import java.util.Random; -import org.apache.commons.math3.analysis.function.HarmonicOscillator; -import org.apache.commons.math3.optimization.general.LevenbergMarquardtOptimizer; -import org.apache.commons.math3.exception.NumberIsTooSmallException; -import org.apache.commons.math3.exception.MathIllegalStateException; -import org.apache.commons.math3.util.FastMath; -import org.apache.commons.math3.util.MathUtils; +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.optimization.fitting.HarmonicFitter; +import org.apache.commons.math4.optimization.fitting.WeightedObservedPoint; +import org.apache.commons.math4.optimization.general.LevenbergMarquardtOptimizer; +import org.apache.commons.math4.util.FastMath; +import org.apache.commons.math4.util.MathUtils; import org.junit.Test; import org.junit.Assert; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/fitting/PolynomialFitterTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/fitting/PolynomialFitterTest.java b/src/test/java/org/apache/commons/math4/optimization/fitting/PolynomialFitterTest.java index ad58b80..5f87c6f 100644 --- a/src/test/java/org/apache/commons/math4/optimization/fitting/PolynomialFitterTest.java +++ b/src/test/java/org/apache/commons/math4/optimization/fitting/PolynomialFitterTest.java @@ -15,22 +15,24 @@ // specific language governing permissions and limitations // under the License. -package org.apache.commons.math3.optimization.fitting; +package org.apache.commons.math4.optimization.fitting; import java.util.Random; -import org.apache.commons.math3.analysis.polynomials.PolynomialFunction; -import org.apache.commons.math3.analysis.polynomials.PolynomialFunction.Parametric; -import org.apache.commons.math3.exception.ConvergenceException; -import org.apache.commons.math3.exception.TooManyEvaluationsException; -import org.apache.commons.math3.optimization.DifferentiableMultivariateVectorOptimizer; -import org.apache.commons.math3.optimization.general.GaussNewtonOptimizer; -import org.apache.commons.math3.optimization.general.LevenbergMarquardtOptimizer; -import org.apache.commons.math3.optimization.SimpleVectorValueChecker; -import org.apache.commons.math3.util.FastMath; -import org.apache.commons.math3.distribution.RealDistribution; -import org.apache.commons.math3.distribution.UniformRealDistribution; -import org.apache.commons.math3.TestUtils; +import org.apache.commons.math4.TestUtils; +import org.apache.commons.math4.analysis.polynomials.PolynomialFunction; +import org.apache.commons.math4.analysis.polynomials.PolynomialFunction.Parametric; +import org.apache.commons.math4.distribution.RealDistribution; +import org.apache.commons.math4.distribution.UniformRealDistribution; +import org.apache.commons.math4.exception.ConvergenceException; +import org.apache.commons.math4.exception.TooManyEvaluationsException; +import org.apache.commons.math4.optimization.DifferentiableMultivariateVectorOptimizer; +import org.apache.commons.math4.optimization.SimpleVectorValueChecker; +import org.apache.commons.math4.optimization.fitting.CurveFitter; +import org.apache.commons.math4.optimization.fitting.PolynomialFitter; +import org.apache.commons.math4.optimization.general.GaussNewtonOptimizer; +import org.apache.commons.math4.optimization.general.LevenbergMarquardtOptimizer; +import org.apache.commons.math4.util.FastMath; import org.junit.Test; import org.junit.Assert; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/general/AbstractLeastSquaresOptimizerAbstractTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/general/AbstractLeastSquaresOptimizerAbstractTest.java b/src/test/java/org/apache/commons/math4/optimization/general/AbstractLeastSquaresOptimizerAbstractTest.java index 4dbe17d..3f0f5c1 100644 --- a/src/test/java/org/apache/commons/math4/optimization/general/AbstractLeastSquaresOptimizerAbstractTest.java +++ b/src/test/java/org/apache/commons/math4/optimization/general/AbstractLeastSquaresOptimizerAbstractTest.java @@ -14,22 +14,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optimization.general; +package org.apache.commons.math4.optimization.general; import java.io.IOException; import java.io.Serializable; import java.util.Arrays; -import org.apache.commons.math3.analysis.differentiation.DerivativeStructure; -import org.apache.commons.math3.analysis.differentiation.MultivariateDifferentiableVectorFunction; -import org.apache.commons.math3.exception.ConvergenceException; -import org.apache.commons.math3.exception.DimensionMismatchException; -import org.apache.commons.math3.exception.NumberIsTooSmallException; -import org.apache.commons.math3.geometry.euclidean.twod.Vector2D; -import org.apache.commons.math3.linear.BlockRealMatrix; -import org.apache.commons.math3.linear.RealMatrix; -import org.apache.commons.math3.optimization.PointVectorValuePair; -import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math4.analysis.differentiation.DerivativeStructure; +import org.apache.commons.math4.analysis.differentiation.MultivariateDifferentiableVectorFunction; +import org.apache.commons.math4.exception.ConvergenceException; +import org.apache.commons.math4.exception.DimensionMismatchException; +import org.apache.commons.math4.exception.NumberIsTooSmallException; +import org.apache.commons.math4.geometry.euclidean.twod.Vector2D; +import org.apache.commons.math4.linear.BlockRealMatrix; +import org.apache.commons.math4.linear.RealMatrix; +import org.apache.commons.math4.optimization.PointVectorValuePair; +import org.apache.commons.math4.optimization.general.AbstractLeastSquaresOptimizer; +import org.apache.commons.math4.util.FastMath; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/general/AbstractLeastSquaresOptimizerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/general/AbstractLeastSquaresOptimizerTest.java b/src/test/java/org/apache/commons/math4/optimization/general/AbstractLeastSquaresOptimizerTest.java index 67a2385..e965ac3 100644 --- a/src/test/java/org/apache/commons/math4/optimization/general/AbstractLeastSquaresOptimizerTest.java +++ b/src/test/java/org/apache/commons/math4/optimization/general/AbstractLeastSquaresOptimizerTest.java @@ -11,14 +11,15 @@ * KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -package org.apache.commons.math3.optimization.general; +package org.apache.commons.math4.optimization.general; import java.io.IOException; import java.util.Arrays; import org.junit.Assert; -import org.apache.commons.math3.optimization.PointVectorValuePair; -import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math4.optimization.PointVectorValuePair; +import org.apache.commons.math4.optimization.general.AbstractLeastSquaresOptimizer; +import org.apache.commons.math4.util.FastMath; import org.junit.Test; @Deprecated http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/general/AbstractLeastSquaresOptimizerTestValidation.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/general/AbstractLeastSquaresOptimizerTestValidation.java b/src/test/java/org/apache/commons/math4/optimization/general/AbstractLeastSquaresOptimizerTestValidation.java index 71898fc..da39013 100644 --- a/src/test/java/org/apache/commons/math4/optimization/general/AbstractLeastSquaresOptimizerTestValidation.java +++ b/src/test/java/org/apache/commons/math4/optimization/general/AbstractLeastSquaresOptimizerTestValidation.java @@ -11,17 +11,18 @@ * KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -package org.apache.commons.math3.optimization.general; +package org.apache.commons.math4.optimization.general; import java.util.Arrays; import java.util.List; import java.util.ArrayList; import java.awt.geom.Point2D; -import org.apache.commons.math3.optimization.PointVectorValuePair; -import org.apache.commons.math3.stat.descriptive.SummaryStatistics; -import org.apache.commons.math3.stat.descriptive.StatisticalSummary; -import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math4.optimization.PointVectorValuePair; +import org.apache.commons.math4.optimization.general.AbstractLeastSquaresOptimizer; +import org.apache.commons.math4.stat.descriptive.StatisticalSummary; +import org.apache.commons.math4.stat.descriptive.SummaryStatistics; +import org.apache.commons.math4.util.FastMath; import org.junit.Test; import org.junit.Assert; @@ -29,7 +30,7 @@ import org.junit.Assert; * This class demonstrates the main functionality of the * {@link AbstractLeastSquaresOptimizer}, common to the * optimizer implementations in package - * {@link org.apache.commons.math3.optimization.general}. + * {@link org.apache.commons.math4.optimization.general}. * <br/> * Not enabled by default, as the class name does not end with "Test". * <br/> http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/general/CircleProblem.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/general/CircleProblem.java b/src/test/java/org/apache/commons/math4/optimization/general/CircleProblem.java index feca13e..f4bb05a 100644 --- a/src/test/java/org/apache/commons/math4/optimization/general/CircleProblem.java +++ b/src/test/java/org/apache/commons/math4/optimization/general/CircleProblem.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.general; +package org.apache.commons.math4.optimization.general; import java.util.ArrayList; -import org.apache.commons.math3.analysis.differentiation.DerivativeStructure; -import org.apache.commons.math3.analysis.differentiation.MultivariateDifferentiableVectorFunction; -import org.apache.commons.math3.geometry.euclidean.twod.Vector2D; -import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math4.analysis.differentiation.DerivativeStructure; +import org.apache.commons.math4.analysis.differentiation.MultivariateDifferentiableVectorFunction; +import org.apache.commons.math4.geometry.euclidean.twod.Vector2D; +import org.apache.commons.math4.util.FastMath; /** * Class that models a circle. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/general/CircleScalar.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/general/CircleScalar.java b/src/test/java/org/apache/commons/math4/optimization/general/CircleScalar.java index 6b39b41..2727218 100644 --- a/src/test/java/org/apache/commons/math4/optimization/general/CircleScalar.java +++ b/src/test/java/org/apache/commons/math4/optimization/general/CircleScalar.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.general; +package org.apache.commons.math4.optimization.general; import java.util.ArrayList; -import org.apache.commons.math3.analysis.differentiation.DerivativeStructure; -import org.apache.commons.math3.analysis.differentiation.MultivariateDifferentiableFunction; -import org.apache.commons.math3.geometry.euclidean.twod.Vector2D; +import org.apache.commons.math4.analysis.differentiation.DerivativeStructure; +import org.apache.commons.math4.analysis.differentiation.MultivariateDifferentiableFunction; +import org.apache.commons.math4.geometry.euclidean.twod.Vector2D; /** * Class used in the tests. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/general/CircleVectorial.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/general/CircleVectorial.java b/src/test/java/org/apache/commons/math4/optimization/general/CircleVectorial.java index 7d79e56..b0f4da5 100644 --- a/src/test/java/org/apache/commons/math4/optimization/general/CircleVectorial.java +++ b/src/test/java/org/apache/commons/math4/optimization/general/CircleVectorial.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.general; +package org.apache.commons.math4.optimization.general; import java.util.ArrayList; -import org.apache.commons.math3.analysis.differentiation.DerivativeStructure; -import org.apache.commons.math3.analysis.differentiation.MultivariateDifferentiableVectorFunction; -import org.apache.commons.math3.geometry.euclidean.twod.Vector2D; +import org.apache.commons.math4.analysis.differentiation.DerivativeStructure; +import org.apache.commons.math4.analysis.differentiation.MultivariateDifferentiableVectorFunction; +import org.apache.commons.math4.geometry.euclidean.twod.Vector2D; /** * Class used in the tests. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/general/GaussNewtonOptimizerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/general/GaussNewtonOptimizerTest.java b/src/test/java/org/apache/commons/math4/optimization/general/GaussNewtonOptimizerTest.java index c987e14..88e2f3a 100644 --- a/src/test/java/org/apache/commons/math4/optimization/general/GaussNewtonOptimizerTest.java +++ b/src/test/java/org/apache/commons/math4/optimization/general/GaussNewtonOptimizerTest.java @@ -15,13 +15,15 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.general; +package org.apache.commons.math4.optimization.general; import java.io.IOException; -import org.apache.commons.math3.exception.ConvergenceException; -import org.apache.commons.math3.exception.TooManyEvaluationsException; -import org.apache.commons.math3.optimization.SimpleVectorValueChecker; +import org.apache.commons.math4.exception.ConvergenceException; +import org.apache.commons.math4.exception.TooManyEvaluationsException; +import org.apache.commons.math4.optimization.SimpleVectorValueChecker; +import org.apache.commons.math4.optimization.general.AbstractLeastSquaresOptimizer; +import org.apache.commons.math4.optimization.general.GaussNewtonOptimizer; import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/general/LevenbergMarquardtOptimizerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/general/LevenbergMarquardtOptimizerTest.java b/src/test/java/org/apache/commons/math4/optimization/general/LevenbergMarquardtOptimizerTest.java index 81c2c52..da77546 100644 --- a/src/test/java/org/apache/commons/math4/optimization/general/LevenbergMarquardtOptimizerTest.java +++ b/src/test/java/org/apache/commons/math4/optimization/general/LevenbergMarquardtOptimizerTest.java @@ -15,22 +15,24 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.general; +package org.apache.commons.math4.optimization.general; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import org.apache.commons.math3.analysis.differentiation.DerivativeStructure; -import org.apache.commons.math3.analysis.differentiation.MultivariateDifferentiableVectorFunction; -import org.apache.commons.math3.exception.ConvergenceException; -import org.apache.commons.math3.exception.DimensionMismatchException; -import org.apache.commons.math3.exception.TooManyEvaluationsException; -import org.apache.commons.math3.geometry.euclidean.twod.Vector2D; -import org.apache.commons.math3.linear.SingularMatrixException; -import org.apache.commons.math3.optimization.PointVectorValuePair; -import org.apache.commons.math3.util.FastMath; -import org.apache.commons.math3.util.Precision; +import org.apache.commons.math4.analysis.differentiation.DerivativeStructure; +import org.apache.commons.math4.analysis.differentiation.MultivariateDifferentiableVectorFunction; +import org.apache.commons.math4.exception.ConvergenceException; +import org.apache.commons.math4.exception.DimensionMismatchException; +import org.apache.commons.math4.exception.TooManyEvaluationsException; +import org.apache.commons.math4.geometry.euclidean.twod.Vector2D; +import org.apache.commons.math4.linear.SingularMatrixException; +import org.apache.commons.math4.optimization.PointVectorValuePair; +import org.apache.commons.math4.optimization.general.AbstractLeastSquaresOptimizer; +import org.apache.commons.math4.optimization.general.LevenbergMarquardtOptimizer; +import org.apache.commons.math4.util.FastMath; +import org.apache.commons.math4.util.Precision; import org.junit.Assert; import org.junit.Test; import org.junit.Ignore; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/general/MinpackTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/general/MinpackTest.java b/src/test/java/org/apache/commons/math4/optimization/general/MinpackTest.java index 63432f7..50440c3 100644 --- a/src/test/java/org/apache/commons/math4/optimization/general/MinpackTest.java +++ b/src/test/java/org/apache/commons/math4/optimization/general/MinpackTest.java @@ -15,16 +15,17 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.general; +package org.apache.commons.math4.optimization.general; import java.io.Serializable; import java.util.Arrays; -import org.apache.commons.math3.exception.TooManyEvaluationsException; -import org.apache.commons.math3.analysis.differentiation.DerivativeStructure; -import org.apache.commons.math3.analysis.differentiation.MultivariateDifferentiableVectorFunction; -import org.apache.commons.math3.optimization.PointVectorValuePair; -import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math4.analysis.differentiation.DerivativeStructure; +import org.apache.commons.math4.analysis.differentiation.MultivariateDifferentiableVectorFunction; +import org.apache.commons.math4.exception.TooManyEvaluationsException; +import org.apache.commons.math4.optimization.PointVectorValuePair; +import org.apache.commons.math4.optimization.general.LevenbergMarquardtOptimizer; +import org.apache.commons.math4.util.FastMath; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/general/NonLinearConjugateGradientOptimizerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/general/NonLinearConjugateGradientOptimizerTest.java b/src/test/java/org/apache/commons/math4/optimization/general/NonLinearConjugateGradientOptimizerTest.java index 26091a4..d9000a8 100644 --- a/src/test/java/org/apache/commons/math4/optimization/general/NonLinearConjugateGradientOptimizerTest.java +++ b/src/test/java/org/apache/commons/math4/optimization/general/NonLinearConjugateGradientOptimizerTest.java @@ -15,19 +15,22 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.general; +package org.apache.commons.math4.optimization.general; import java.io.Serializable; -import org.apache.commons.math3.analysis.differentiation.DerivativeStructure; -import org.apache.commons.math3.analysis.differentiation.MultivariateDifferentiableFunction; -import org.apache.commons.math3.analysis.solvers.BrentSolver; -import org.apache.commons.math3.geometry.euclidean.twod.Vector2D; -import org.apache.commons.math3.linear.BlockRealMatrix; -import org.apache.commons.math3.linear.RealMatrix; -import org.apache.commons.math3.optimization.GoalType; -import org.apache.commons.math3.optimization.PointValuePair; -import org.apache.commons.math3.optimization.SimpleValueChecker; +import org.apache.commons.math4.analysis.differentiation.DerivativeStructure; +import org.apache.commons.math4.analysis.differentiation.MultivariateDifferentiableFunction; +import org.apache.commons.math4.analysis.solvers.BrentSolver; +import org.apache.commons.math4.geometry.euclidean.twod.Vector2D; +import org.apache.commons.math4.linear.BlockRealMatrix; +import org.apache.commons.math4.linear.RealMatrix; +import org.apache.commons.math4.optimization.GoalType; +import org.apache.commons.math4.optimization.PointValuePair; +import org.apache.commons.math4.optimization.SimpleValueChecker; +import org.apache.commons.math4.optimization.general.ConjugateGradientFormula; +import org.apache.commons.math4.optimization.general.NonLinearConjugateGradientOptimizer; +import org.apache.commons.math4.optimization.general.Preconditioner; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/general/RandomCirclePointGenerator.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/general/RandomCirclePointGenerator.java b/src/test/java/org/apache/commons/math4/optimization/general/RandomCirclePointGenerator.java index 86f8272..3e3f919 100644 --- a/src/test/java/org/apache/commons/math4/optimization/general/RandomCirclePointGenerator.java +++ b/src/test/java/org/apache/commons/math4/optimization/general/RandomCirclePointGenerator.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.general; +package org.apache.commons.math4.optimization.general; -import org.apache.commons.math3.random.RandomGenerator; -import org.apache.commons.math3.random.Well44497b; -import org.apache.commons.math3.util.MathUtils; -import org.apache.commons.math3.util.FastMath; -import org.apache.commons.math3.distribution.RealDistribution; -import org.apache.commons.math3.distribution.UniformRealDistribution; -import org.apache.commons.math3.distribution.NormalDistribution; -import org.apache.commons.math3.geometry.euclidean.twod.Vector2D; +import org.apache.commons.math4.distribution.NormalDistribution; +import org.apache.commons.math4.distribution.RealDistribution; +import org.apache.commons.math4.distribution.UniformRealDistribution; +import org.apache.commons.math4.geometry.euclidean.twod.Vector2D; +import org.apache.commons.math4.random.RandomGenerator; +import org.apache.commons.math4.random.Well44497b; +import org.apache.commons.math4.util.FastMath; +import org.apache.commons.math4.util.MathUtils; /** * Factory for generating a cloud of points that approximate a circle. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/general/RandomStraightLinePointGenerator.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/general/RandomStraightLinePointGenerator.java b/src/test/java/org/apache/commons/math4/optimization/general/RandomStraightLinePointGenerator.java index db626e8..2a0a970 100644 --- a/src/test/java/org/apache/commons/math4/optimization/general/RandomStraightLinePointGenerator.java +++ b/src/test/java/org/apache/commons/math4/optimization/general/RandomStraightLinePointGenerator.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.general; +package org.apache.commons.math4.optimization.general; import java.awt.geom.Point2D; -import org.apache.commons.math3.random.RandomGenerator; -import org.apache.commons.math3.random.Well44497b; -import org.apache.commons.math3.distribution.RealDistribution; -import org.apache.commons.math3.distribution.UniformRealDistribution; -import org.apache.commons.math3.distribution.NormalDistribution; +import org.apache.commons.math4.distribution.NormalDistribution; +import org.apache.commons.math4.distribution.RealDistribution; +import org.apache.commons.math4.distribution.UniformRealDistribution; +import org.apache.commons.math4.random.RandomGenerator; +import org.apache.commons.math4.random.Well44497b; /** * Factory for generating a cloud of points that approximate a straight line. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/general/StatisticalReferenceDataset.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/general/StatisticalReferenceDataset.java b/src/test/java/org/apache/commons/math4/optimization/general/StatisticalReferenceDataset.java index 1b6c440..2b7f6ca 100644 --- a/src/test/java/org/apache/commons/math4/optimization/general/StatisticalReferenceDataset.java +++ b/src/test/java/org/apache/commons/math4/optimization/general/StatisticalReferenceDataset.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optimization.general; +package org.apache.commons.math4.optimization.general; import java.io.BufferedReader; import java.io.IOException; import java.util.ArrayList; -import org.apache.commons.math3.analysis.differentiation.DerivativeStructure; -import org.apache.commons.math3.analysis.differentiation.MultivariateDifferentiableVectorFunction; -import org.apache.commons.math3.util.MathArrays; +import org.apache.commons.math4.analysis.differentiation.DerivativeStructure; +import org.apache.commons.math4.analysis.differentiation.MultivariateDifferentiableVectorFunction; +import org.apache.commons.math4.util.MathArrays; /** * This class gives access to the statistical reference datasets provided by the http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/general/StatisticalReferenceDatasetFactory.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/general/StatisticalReferenceDatasetFactory.java b/src/test/java/org/apache/commons/math4/optimization/general/StatisticalReferenceDatasetFactory.java index 167c856..f7fa021 100644 --- a/src/test/java/org/apache/commons/math4/optimization/general/StatisticalReferenceDatasetFactory.java +++ b/src/test/java/org/apache/commons/math4/optimization/general/StatisticalReferenceDatasetFactory.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optimization.general; +package org.apache.commons.math4.optimization.general; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import org.apache.commons.math3.analysis.differentiation.DerivativeStructure; +import org.apache.commons.math4.analysis.differentiation.DerivativeStructure; /** * A factory to create instances of {@link StatisticalReferenceDataset} from http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/general/StraightLineProblem.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/general/StraightLineProblem.java b/src/test/java/org/apache/commons/math4/optimization/general/StraightLineProblem.java index 1b7d933..a81da4c 100644 --- a/src/test/java/org/apache/commons/math4/optimization/general/StraightLineProblem.java +++ b/src/test/java/org/apache/commons/math4/optimization/general/StraightLineProblem.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.general; +package org.apache.commons.math4.optimization.general; import java.util.ArrayList; -import org.apache.commons.math3.analysis.differentiation.DerivativeStructure; -import org.apache.commons.math3.analysis.differentiation.MultivariateDifferentiableVectorFunction; -import org.apache.commons.math3.analysis.differentiation.UnivariateDifferentiableFunction; -import org.apache.commons.math3.stat.regression.SimpleRegression; +import org.apache.commons.math4.analysis.differentiation.DerivativeStructure; +import org.apache.commons.math4.analysis.differentiation.MultivariateDifferentiableVectorFunction; +import org.apache.commons.math4.analysis.differentiation.UnivariateDifferentiableFunction; +import org.apache.commons.math4.stat.regression.SimpleRegression; /** * Class that models a straight line defined as {@code y = a x + b}. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/linear/SimplexSolverTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/linear/SimplexSolverTest.java b/src/test/java/org/apache/commons/math4/optimization/linear/SimplexSolverTest.java index 110992a..0331bd8 100644 --- a/src/test/java/org/apache/commons/math4/optimization/linear/SimplexSolverTest.java +++ b/src/test/java/org/apache/commons/math4/optimization/linear/SimplexSolverTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.linear; +package org.apache.commons.math4.optimization.linear; import org.junit.Assert; @@ -23,9 +23,15 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.apache.commons.math3.optimization.GoalType; -import org.apache.commons.math3.optimization.PointValuePair; -import org.apache.commons.math3.util.Precision; +import org.apache.commons.math4.optimization.GoalType; +import org.apache.commons.math4.optimization.PointValuePair; +import org.apache.commons.math4.optimization.linear.LinearConstraint; +import org.apache.commons.math4.optimization.linear.LinearObjectiveFunction; +import org.apache.commons.math4.optimization.linear.NoFeasibleSolutionException; +import org.apache.commons.math4.optimization.linear.Relationship; +import org.apache.commons.math4.optimization.linear.SimplexSolver; +import org.apache.commons.math4.optimization.linear.UnboundedSolutionException; +import org.apache.commons.math4.util.Precision; import org.junit.Test; @Deprecated http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/linear/SimplexTableauTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/linear/SimplexTableauTest.java b/src/test/java/org/apache/commons/math4/optimization/linear/SimplexTableauTest.java index 7fad943..6b642bf 100644 --- a/src/test/java/org/apache/commons/math4/optimization/linear/SimplexTableauTest.java +++ b/src/test/java/org/apache/commons/math4/optimization/linear/SimplexTableauTest.java @@ -15,13 +15,17 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.linear; +package org.apache.commons.math4.optimization.linear; import java.util.ArrayList; import java.util.Collection; -import org.apache.commons.math3.TestUtils; -import org.apache.commons.math3.optimization.GoalType; +import org.apache.commons.math4.TestUtils; +import org.apache.commons.math4.optimization.GoalType; +import org.apache.commons.math4.optimization.linear.LinearConstraint; +import org.apache.commons.math4.optimization.linear.LinearObjectiveFunction; +import org.apache.commons.math4.optimization.linear.Relationship; +import org.apache.commons.math4.optimization.linear.SimplexTableau; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/univariate/BracketFinderTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/univariate/BracketFinderTest.java b/src/test/java/org/apache/commons/math4/optimization/univariate/BracketFinderTest.java index b5783c2..d6e0a31 100644 --- a/src/test/java/org/apache/commons/math4/optimization/univariate/BracketFinderTest.java +++ b/src/test/java/org/apache/commons/math4/optimization/univariate/BracketFinderTest.java @@ -14,10 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optimization.univariate; +package org.apache.commons.math4.optimization.univariate; -import org.apache.commons.math3.analysis.UnivariateFunction; -import org.apache.commons.math3.optimization.GoalType; +import org.apache.commons.math4.analysis.UnivariateFunction; +import org.apache.commons.math4.optimization.GoalType; +import org.apache.commons.math4.optimization.univariate.BracketFinder; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/univariate/BrentOptimizerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/univariate/BrentOptimizerTest.java b/src/test/java/org/apache/commons/math4/optimization/univariate/BrentOptimizerTest.java index 34ee8c7..18f71b9 100644 --- a/src/test/java/org/apache/commons/math4/optimization/univariate/BrentOptimizerTest.java +++ b/src/test/java/org/apache/commons/math4/optimization/univariate/BrentOptimizerTest.java @@ -14,21 +14,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optimization.univariate; - - -import org.apache.commons.math3.analysis.QuinticFunction; -import org.apache.commons.math3.analysis.UnivariateFunction; -import org.apache.commons.math3.analysis.function.Sin; -import org.apache.commons.math3.analysis.function.StepFunction; -import org.apache.commons.math3.analysis.FunctionUtils; -import org.apache.commons.math3.exception.NumberIsTooLargeException; -import org.apache.commons.math3.exception.NumberIsTooSmallException; -import org.apache.commons.math3.exception.TooManyEvaluationsException; -import org.apache.commons.math3.optimization.ConvergenceChecker; -import org.apache.commons.math3.optimization.GoalType; -import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; -import org.apache.commons.math3.util.FastMath; +package org.apache.commons.math4.optimization.univariate; + + +import org.apache.commons.math4.analysis.FunctionUtils; +import org.apache.commons.math4.analysis.QuinticFunction; +import org.apache.commons.math4.analysis.UnivariateFunction; +import org.apache.commons.math4.analysis.function.Sin; +import org.apache.commons.math4.analysis.function.StepFunction; +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.ConvergenceChecker; +import org.apache.commons.math4.optimization.GoalType; +import org.apache.commons.math4.optimization.univariate.BrentOptimizer; +import org.apache.commons.math4.optimization.univariate.SimpleUnivariateValueChecker; +import org.apache.commons.math4.optimization.univariate.UnivariateOptimizer; +import org.apache.commons.math4.optimization.univariate.UnivariatePointValuePair; +import org.apache.commons.math4.stat.descriptive.DescriptiveStatistics; +import org.apache.commons.math4.util.FastMath; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/univariate/SimpleUnivariateValueCheckerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/univariate/SimpleUnivariateValueCheckerTest.java b/src/test/java/org/apache/commons/math4/optimization/univariate/SimpleUnivariateValueCheckerTest.java index 8ad9f66..c9f44ad 100644 --- a/src/test/java/org/apache/commons/math4/optimization/univariate/SimpleUnivariateValueCheckerTest.java +++ b/src/test/java/org/apache/commons/math4/optimization/univariate/SimpleUnivariateValueCheckerTest.java @@ -14,9 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.optimization.univariate; +package org.apache.commons.math4.optimization.univariate; -import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math4.exception.NotStrictlyPositiveException; +import org.apache.commons.math4.optimization.univariate.SimpleUnivariateValueChecker; +import org.apache.commons.math4.optimization.univariate.UnivariatePointValuePair; import org.junit.Test; import org.junit.Assert; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/optimization/univariate/UnivariateMultiStartOptimizerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/optimization/univariate/UnivariateMultiStartOptimizerTest.java b/src/test/java/org/apache/commons/math4/optimization/univariate/UnivariateMultiStartOptimizerTest.java index 18fbdab..ea4b4ab 100644 --- a/src/test/java/org/apache/commons/math4/optimization/univariate/UnivariateMultiStartOptimizerTest.java +++ b/src/test/java/org/apache/commons/math4/optimization/univariate/UnivariateMultiStartOptimizerTest.java @@ -15,14 +15,18 @@ * limitations under the License. */ -package org.apache.commons.math3.optimization.univariate; +package org.apache.commons.math4.optimization.univariate; -import org.apache.commons.math3.analysis.QuinticFunction; -import org.apache.commons.math3.analysis.UnivariateFunction; -import org.apache.commons.math3.analysis.function.Sin; -import org.apache.commons.math3.optimization.GoalType; -import org.apache.commons.math3.random.JDKRandomGenerator; -import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math4.analysis.QuinticFunction; +import org.apache.commons.math4.analysis.UnivariateFunction; +import org.apache.commons.math4.analysis.function.Sin; +import org.apache.commons.math4.optimization.GoalType; +import org.apache.commons.math4.optimization.univariate.BrentOptimizer; +import org.apache.commons.math4.optimization.univariate.UnivariateMultiStartOptimizer; +import org.apache.commons.math4.optimization.univariate.UnivariateOptimizer; +import org.apache.commons.math4.optimization.univariate.UnivariatePointValuePair; +import org.apache.commons.math4.random.JDKRandomGenerator; +import org.apache.commons.math4.util.FastMath; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/primes/PrimesTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/primes/PrimesTest.java b/src/test/java/org/apache/commons/math4/primes/PrimesTest.java index 19eef5d..085dfac 100644 --- a/src/test/java/org/apache/commons/math4/primes/PrimesTest.java +++ b/src/test/java/org/apache/commons/math4/primes/PrimesTest.java @@ -14,14 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.primes; +package org.apache.commons.math4.primes; import java.util.HashSet; import java.util.List; -import org.apache.commons.math3.exception.MathIllegalArgumentException; -import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math4.exception.MathIllegalArgumentException; +import org.apache.commons.math4.exception.util.LocalizedFormats; +import org.apache.commons.math4.primes.Primes; +import org.apache.commons.math4.primes.SmallPrimes; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/random/AbstractRandomGeneratorTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/random/AbstractRandomGeneratorTest.java b/src/test/java/org/apache/commons/math4/random/AbstractRandomGeneratorTest.java index 1f3d2b0..282ec38 100644 --- a/src/test/java/org/apache/commons/math4/random/AbstractRandomGeneratorTest.java +++ b/src/test/java/org/apache/commons/math4/random/AbstractRandomGeneratorTest.java @@ -14,7 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.random; +package org.apache.commons.math4.random; + +import org.apache.commons.math4.random.RandomGenerator; /** * Test cases for the AbstractRandomGenerator class.
