http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/distribution/UniformIntegerDistributionTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/distribution/UniformIntegerDistributionTest.java b/src/test/java/org/apache/commons/math4/distribution/UniformIntegerDistributionTest.java index 63a6eed..3ae15dd 100644 --- a/src/test/java/org/apache/commons/math4/distribution/UniformIntegerDistributionTest.java +++ b/src/test/java/org/apache/commons/math4/distribution/UniformIntegerDistributionTest.java @@ -15,11 +15,13 @@ * limitations under the License. */ -package org.apache.commons.math3.distribution; +package org.apache.commons.math4.distribution; import org.junit.Assert; import org.junit.Test; -import org.apache.commons.math3.exception.NumberIsTooLargeException; +import org.apache.commons.math4.distribution.IntegerDistribution; +import org.apache.commons.math4.distribution.UniformIntegerDistribution; +import org.apache.commons.math4.exception.NumberIsTooLargeException; /** * Test cases for UniformIntegerDistribution. See class javadoc for
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/distribution/UniformRealDistributionTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/distribution/UniformRealDistributionTest.java b/src/test/java/org/apache/commons/math4/distribution/UniformRealDistributionTest.java index 29f6a85..839ae08 100644 --- a/src/test/java/org/apache/commons/math4/distribution/UniformRealDistributionTest.java +++ b/src/test/java/org/apache/commons/math4/distribution/UniformRealDistributionTest.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math3.distribution; +package org.apache.commons.math4.distribution; -import org.apache.commons.math3.exception.NumberIsTooLargeException; +import org.apache.commons.math4.distribution.UniformRealDistribution; +import org.apache.commons.math4.exception.NumberIsTooLargeException; 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/distribution/WeibullDistributionTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/distribution/WeibullDistributionTest.java b/src/test/java/org/apache/commons/math4/distribution/WeibullDistributionTest.java index af4fd6d..78a6113 100644 --- a/src/test/java/org/apache/commons/math4/distribution/WeibullDistributionTest.java +++ b/src/test/java/org/apache/commons/math4/distribution/WeibullDistributionTest.java @@ -15,11 +15,12 @@ * limitations under the License. */ -package org.apache.commons.math3.distribution; +package org.apache.commons.math4.distribution; -import org.apache.commons.math3.special.Gamma; -import org.apache.commons.math3.util.FastMath; -import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math4.distribution.WeibullDistribution; +import org.apache.commons.math4.exception.NotStrictlyPositiveException; +import org.apache.commons.math4.special.Gamma; +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/distribution/ZipfDistributionTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/distribution/ZipfDistributionTest.java b/src/test/java/org/apache/commons/math4/distribution/ZipfDistributionTest.java index 06ec3c4..661eb33 100644 --- a/src/test/java/org/apache/commons/math4/distribution/ZipfDistributionTest.java +++ b/src/test/java/org/apache/commons/math4/distribution/ZipfDistributionTest.java @@ -15,11 +15,12 @@ * limitations under the License. */ -package org.apache.commons.math3.distribution; +package org.apache.commons.math4.distribution; -import org.apache.commons.math3.exception.NotStrictlyPositiveException; - -import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math4.distribution.IntegerDistribution; +import org.apache.commons.math4.distribution.ZipfDistribution; +import org.apache.commons.math4.exception.NotStrictlyPositiveException; +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/distribution/fitting/MultivariateNormalMixtureExpectationMaximizationTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/distribution/fitting/MultivariateNormalMixtureExpectationMaximizationTest.java b/src/test/java/org/apache/commons/math4/distribution/fitting/MultivariateNormalMixtureExpectationMaximizationTest.java index 75328fc..18291eb 100644 --- a/src/test/java/org/apache/commons/math4/distribution/fitting/MultivariateNormalMixtureExpectationMaximizationTest.java +++ b/src/test/java/org/apache/commons/math4/distribution/fitting/MultivariateNormalMixtureExpectationMaximizationTest.java @@ -14,21 +14,22 @@ * License for the specific language governing permissions and limitations under * the License. */ -package org.apache.commons.math3.distribution.fitting; +package org.apache.commons.math4.distribution.fitting; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.commons.math3.distribution.MixtureMultivariateNormalDistribution; -import org.apache.commons.math3.distribution.MultivariateNormalDistribution; -import org.apache.commons.math3.exception.ConvergenceException; -import org.apache.commons.math3.exception.DimensionMismatchException; -import org.apache.commons.math3.exception.NotStrictlyPositiveException; -import org.apache.commons.math3.exception.NumberIsTooSmallException; -import org.apache.commons.math3.linear.Array2DRowRealMatrix; -import org.apache.commons.math3.linear.RealMatrix; -import org.apache.commons.math3.util.Pair; +import org.apache.commons.math4.distribution.MixtureMultivariateNormalDistribution; +import org.apache.commons.math4.distribution.MultivariateNormalDistribution; +import org.apache.commons.math4.distribution.fitting.MultivariateNormalMixtureExpectationMaximization; +import org.apache.commons.math4.exception.ConvergenceException; +import org.apache.commons.math4.exception.DimensionMismatchException; +import org.apache.commons.math4.exception.NotStrictlyPositiveException; +import org.apache.commons.math4.exception.NumberIsTooSmallException; +import org.apache.commons.math4.linear.Array2DRowRealMatrix; +import org.apache.commons.math4.linear.RealMatrix; +import org.apache.commons.math4.util.Pair; 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/exception/DimensionMismatchExceptionTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/exception/DimensionMismatchExceptionTest.java b/src/test/java/org/apache/commons/math4/exception/DimensionMismatchExceptionTest.java index 3ac51e9..263e28d 100644 --- a/src/test/java/org/apache/commons/math4/exception/DimensionMismatchExceptionTest.java +++ b/src/test/java/org/apache/commons/math4/exception/DimensionMismatchExceptionTest.java @@ -14,8 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.exception; +package org.apache.commons.math4.exception; +import org.apache.commons.math4.exception.DimensionMismatchException; 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/exception/MaxCountExceededExceptionTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/exception/MaxCountExceededExceptionTest.java b/src/test/java/org/apache/commons/math4/exception/MaxCountExceededExceptionTest.java index ba0de1e..f0da371 100644 --- a/src/test/java/org/apache/commons/math4/exception/MaxCountExceededExceptionTest.java +++ b/src/test/java/org/apache/commons/math4/exception/MaxCountExceededExceptionTest.java @@ -14,8 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.exception; +package org.apache.commons.math4.exception; +import org.apache.commons.math4.exception.MaxCountExceededException; 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/exception/NonMonotonicSequenceExceptionTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/exception/NonMonotonicSequenceExceptionTest.java b/src/test/java/org/apache/commons/math4/exception/NonMonotonicSequenceExceptionTest.java index 42c5460..6c3b475 100644 --- a/src/test/java/org/apache/commons/math4/exception/NonMonotonicSequenceExceptionTest.java +++ b/src/test/java/org/apache/commons/math4/exception/NonMonotonicSequenceExceptionTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.exception; - -import org.apache.commons.math3.util.MathArrays; +package org.apache.commons.math4.exception; +import org.apache.commons.math4.exception.NonMonotonicSequenceException; +import org.apache.commons.math4.util.MathArrays; 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/exception/NotPositiveExceptionTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/exception/NotPositiveExceptionTest.java b/src/test/java/org/apache/commons/math4/exception/NotPositiveExceptionTest.java index 6e4106c..37276cf 100644 --- a/src/test/java/org/apache/commons/math4/exception/NotPositiveExceptionTest.java +++ b/src/test/java/org/apache/commons/math4/exception/NotPositiveExceptionTest.java @@ -14,8 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.exception; +package org.apache.commons.math4.exception; +import org.apache.commons.math4.exception.NotPositiveException; 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/exception/NotStrictlyPositiveExceptionTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/exception/NotStrictlyPositiveExceptionTest.java b/src/test/java/org/apache/commons/math4/exception/NotStrictlyPositiveExceptionTest.java index e313b15..95748fc 100644 --- a/src/test/java/org/apache/commons/math4/exception/NotStrictlyPositiveExceptionTest.java +++ b/src/test/java/org/apache/commons/math4/exception/NotStrictlyPositiveExceptionTest.java @@ -14,8 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.exception; +package org.apache.commons.math4.exception; +import org.apache.commons.math4.exception.NotStrictlyPositiveException; 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/exception/NumberIsTooLargeExceptionTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/exception/NumberIsTooLargeExceptionTest.java b/src/test/java/org/apache/commons/math4/exception/NumberIsTooLargeExceptionTest.java index 5ebe49d..fea0233 100644 --- a/src/test/java/org/apache/commons/math4/exception/NumberIsTooLargeExceptionTest.java +++ b/src/test/java/org/apache/commons/math4/exception/NumberIsTooLargeExceptionTest.java @@ -14,8 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.exception; +package org.apache.commons.math4.exception; +import org.apache.commons.math4.exception.NumberIsTooLargeException; 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/exception/NumberIsTooSmallExceptionTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/exception/NumberIsTooSmallExceptionTest.java b/src/test/java/org/apache/commons/math4/exception/NumberIsTooSmallExceptionTest.java index b70032f..95935c0 100644 --- a/src/test/java/org/apache/commons/math4/exception/NumberIsTooSmallExceptionTest.java +++ b/src/test/java/org/apache/commons/math4/exception/NumberIsTooSmallExceptionTest.java @@ -14,8 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.exception; +package org.apache.commons.math4.exception; +import org.apache.commons.math4.exception.NumberIsTooSmallException; 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/exception/OutOfRangeExceptionTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/exception/OutOfRangeExceptionTest.java b/src/test/java/org/apache/commons/math4/exception/OutOfRangeExceptionTest.java index deda254..a640443 100644 --- a/src/test/java/org/apache/commons/math4/exception/OutOfRangeExceptionTest.java +++ b/src/test/java/org/apache/commons/math4/exception/OutOfRangeExceptionTest.java @@ -14,8 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.exception; +package org.apache.commons.math4.exception; +import org.apache.commons.math4.exception.OutOfRangeException; 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/exception/TooManyEvaluationsExceptionTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/exception/TooManyEvaluationsExceptionTest.java b/src/test/java/org/apache/commons/math4/exception/TooManyEvaluationsExceptionTest.java index c21775e..0315f26 100644 --- a/src/test/java/org/apache/commons/math4/exception/TooManyEvaluationsExceptionTest.java +++ b/src/test/java/org/apache/commons/math4/exception/TooManyEvaluationsExceptionTest.java @@ -14,10 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.exception; +package org.apache.commons.math4.exception; import java.text.MessageFormat; +import org.apache.commons.math4.exception.TooManyEvaluationsException; 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/exception/util/ArgUtilsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/exception/util/ArgUtilsTest.java b/src/test/java/org/apache/commons/math4/exception/util/ArgUtilsTest.java index d07708f..bb55ac2 100644 --- a/src/test/java/org/apache/commons/math4/exception/util/ArgUtilsTest.java +++ b/src/test/java/org/apache/commons/math4/exception/util/ArgUtilsTest.java @@ -14,11 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.exception.util; +package org.apache.commons.math4.exception.util; import java.util.List; import java.util.ArrayList; +import org.apache.commons.math4.exception.util.ArgUtils; 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/exception/util/ExceptionContextTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/exception/util/ExceptionContextTest.java b/src/test/java/org/apache/commons/math4/exception/util/ExceptionContextTest.java index 91fe804..a9489f8 100644 --- a/src/test/java/org/apache/commons/math4/exception/util/ExceptionContextTest.java +++ b/src/test/java/org/apache/commons/math4/exception/util/ExceptionContextTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.exception.util; +package org.apache.commons.math4.exception.util; import java.util.Locale; import java.util.Arrays; @@ -24,6 +24,8 @@ import java.io.ObjectInputStream; import java.io.ByteArrayOutputStream; import java.io.ByteArrayInputStream; +import org.apache.commons.math4.exception.util.ExceptionContext; +import org.apache.commons.math4.exception.util.LocalizedFormats; 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/exception/util/LocalizedFormatsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/exception/util/LocalizedFormatsTest.java b/src/test/java/org/apache/commons/math4/exception/util/LocalizedFormatsTest.java index 1a51f64..4b169a9 100644 --- a/src/test/java/org/apache/commons/math4/exception/util/LocalizedFormatsTest.java +++ b/src/test/java/org/apache/commons/math4/exception/util/LocalizedFormatsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.exception.util; +package org.apache.commons.math4.exception.util; import java.text.MessageFormat; @@ -22,6 +22,7 @@ import java.util.Enumeration; import java.util.Locale; import java.util.ResourceBundle; +import org.apache.commons.math4.exception.util.LocalizedFormats; 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/filter/KalmanFilterTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/filter/KalmanFilterTest.java b/src/test/java/org/apache/commons/math4/filter/KalmanFilterTest.java index f7a08c8..eeb2aa0 100644 --- a/src/test/java/org/apache/commons/math4/filter/KalmanFilterTest.java +++ b/src/test/java/org/apache/commons/math4/filter/KalmanFilterTest.java @@ -12,20 +12,25 @@ * governing permissions and limitations under the License. */ -package org.apache.commons.math3.filter; - -import org.apache.commons.math3.distribution.NormalDistribution; -import org.apache.commons.math3.linear.Array2DRowRealMatrix; -import org.apache.commons.math3.linear.ArrayRealVector; -import org.apache.commons.math3.linear.MatrixDimensionMismatchException; -import org.apache.commons.math3.linear.MatrixUtils; -import org.apache.commons.math3.linear.RealMatrix; -import org.apache.commons.math3.linear.RealVector; -import org.apache.commons.math3.random.JDKRandomGenerator; -import org.apache.commons.math3.random.RandomGenerator; -import org.apache.commons.math3.random.Well19937c; -import org.apache.commons.math3.util.FastMath; -import org.apache.commons.math3.util.Precision; +package org.apache.commons.math4.filter; + +import org.apache.commons.math4.distribution.NormalDistribution; +import org.apache.commons.math4.filter.DefaultMeasurementModel; +import org.apache.commons.math4.filter.DefaultProcessModel; +import org.apache.commons.math4.filter.KalmanFilter; +import org.apache.commons.math4.filter.MeasurementModel; +import org.apache.commons.math4.filter.ProcessModel; +import org.apache.commons.math4.linear.Array2DRowRealMatrix; +import org.apache.commons.math4.linear.ArrayRealVector; +import org.apache.commons.math4.linear.MatrixDimensionMismatchException; +import org.apache.commons.math4.linear.MatrixUtils; +import org.apache.commons.math4.linear.RealMatrix; +import org.apache.commons.math4.linear.RealVector; +import org.apache.commons.math4.random.JDKRandomGenerator; +import org.apache.commons.math4.random.RandomGenerator; +import org.apache.commons.math4.random.Well19937c; +import org.apache.commons.math4.util.FastMath; +import org.apache.commons.math4.util.Precision; 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/fitting/CurveFitterTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/fitting/CurveFitterTest.java b/src/test/java/org/apache/commons/math4/fitting/CurveFitterTest.java index d08e942..18915e0 100644 --- a/src/test/java/org/apache/commons/math4/fitting/CurveFitterTest.java +++ b/src/test/java/org/apache/commons/math4/fitting/CurveFitterTest.java @@ -14,11 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fitting; +package org.apache.commons.math4.fitting; -import org.apache.commons.math3.optim.nonlinear.vector.jacobian.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.fitting.CurveFitter; +import org.apache.commons.math4.optim.nonlinear.vector.jacobian.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/fitting/GaussianCurveFitterTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/fitting/GaussianCurveFitterTest.java b/src/test/java/org/apache/commons/math4/fitting/GaussianCurveFitterTest.java index 153274b..b14aceb 100644 --- a/src/test/java/org/apache/commons/math4/fitting/GaussianCurveFitterTest.java +++ b/src/test/java/org/apache/commons/math4/fitting/GaussianCurveFitterTest.java @@ -14,10 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fitting; +package org.apache.commons.math4.fitting; -import org.apache.commons.math3.exception.MathIllegalArgumentException; -import org.apache.commons.math3.exception.TooManyIterationsException; +import org.apache.commons.math4.exception.MathIllegalArgumentException; +import org.apache.commons.math4.exception.TooManyIterationsException; +import org.apache.commons.math4.fitting.GaussianCurveFitter; +import org.apache.commons.math4.fitting.WeightedObservedPoints; 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/fitting/GaussianFitterTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/fitting/GaussianFitterTest.java b/src/test/java/org/apache/commons/math4/fitting/GaussianFitterTest.java index ddec57d..a7ca9b2 100644 --- a/src/test/java/org/apache/commons/math4/fitting/GaussianFitterTest.java +++ b/src/test/java/org/apache/commons/math4/fitting/GaussianFitterTest.java @@ -14,10 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fitting; +package org.apache.commons.math4.fitting; -import org.apache.commons.math3.optim.nonlinear.vector.jacobian.LevenbergMarquardtOptimizer; -import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math4.exception.MathIllegalArgumentException; +import org.apache.commons.math4.fitting.GaussianFitter; +import org.apache.commons.math4.optim.nonlinear.vector.jacobian.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/fitting/HarmonicCurveFitterTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/fitting/HarmonicCurveFitterTest.java b/src/test/java/org/apache/commons/math4/fitting/HarmonicCurveFitterTest.java index 9f6a15c..d85588e 100644 --- a/src/test/java/org/apache/commons/math4/fitting/HarmonicCurveFitterTest.java +++ b/src/test/java/org/apache/commons/math4/fitting/HarmonicCurveFitterTest.java @@ -14,17 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fitting; +package org.apache.commons.math4.fitting; import java.util.ArrayList; import java.util.List; import java.util.Random; -import org.apache.commons.math3.analysis.function.HarmonicOscillator; -import org.apache.commons.math3.exception.MathIllegalStateException; -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.function.HarmonicOscillator; +import org.apache.commons.math4.exception.MathIllegalStateException; +import org.apache.commons.math4.exception.NumberIsTooSmallException; +import org.apache.commons.math4.fitting.HarmonicCurveFitter; +import org.apache.commons.math4.fitting.WeightedObservedPoint; +import org.apache.commons.math4.fitting.WeightedObservedPoints; +import org.apache.commons.math4.util.FastMath; +import org.apache.commons.math4.util.MathUtils; 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/fitting/HarmonicFitterTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/fitting/HarmonicFitterTest.java b/src/test/java/org/apache/commons/math4/fitting/HarmonicFitterTest.java index 8a6dcea..328d060 100644 --- a/src/test/java/org/apache/commons/math4/fitting/HarmonicFitterTest.java +++ b/src/test/java/org/apache/commons/math4/fitting/HarmonicFitterTest.java @@ -14,16 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fitting; +package org.apache.commons.math4.fitting; import java.util.Random; -import org.apache.commons.math3.optim.nonlinear.vector.jacobian.LevenbergMarquardtOptimizer; -import org.apache.commons.math3.analysis.function.HarmonicOscillator; -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.fitting.HarmonicFitter; +import org.apache.commons.math4.fitting.WeightedObservedPoint; +import org.apache.commons.math4.optim.nonlinear.vector.jacobian.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/fitting/PolynomialCurveFitterTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/fitting/PolynomialCurveFitterTest.java b/src/test/java/org/apache/commons/math4/fitting/PolynomialCurveFitterTest.java index 6b8dfa2..02c5810 100644 --- a/src/test/java/org/apache/commons/math4/fitting/PolynomialCurveFitterTest.java +++ b/src/test/java/org/apache/commons/math4/fitting/PolynomialCurveFitterTest.java @@ -14,16 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fitting; +package org.apache.commons.math4.fitting; import java.util.Random; -import org.apache.commons.math3.TestUtils; -import org.apache.commons.math3.analysis.polynomials.PolynomialFunction; -import org.apache.commons.math3.distribution.RealDistribution; -import org.apache.commons.math3.distribution.UniformRealDistribution; -import org.apache.commons.math3.exception.ConvergenceException; -import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math4.TestUtils; +import org.apache.commons.math4.analysis.polynomials.PolynomialFunction; +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.fitting.PolynomialCurveFitter; +import org.apache.commons.math4.fitting.WeightedObservedPoints; +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/fitting/PolynomialFitterTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/fitting/PolynomialFitterTest.java b/src/test/java/org/apache/commons/math4/fitting/PolynomialFitterTest.java index a053157..ff543ab 100644 --- a/src/test/java/org/apache/commons/math4/fitting/PolynomialFitterTest.java +++ b/src/test/java/org/apache/commons/math4/fitting/PolynomialFitterTest.java @@ -14,22 +14,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fitting; +package org.apache.commons.math4.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.optim.nonlinear.vector.MultivariateVectorOptimizer; -import org.apache.commons.math3.optim.nonlinear.vector.jacobian.LevenbergMarquardtOptimizer; -import org.apache.commons.math3.optim.nonlinear.vector.jacobian.GaussNewtonOptimizer; -import org.apache.commons.math3.optim.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.fitting.CurveFitter; +import org.apache.commons.math4.fitting.PolynomialFitter; +import org.apache.commons.math4.optim.SimpleVectorValueChecker; +import org.apache.commons.math4.optim.nonlinear.vector.MultivariateVectorOptimizer; +import org.apache.commons.math4.optim.nonlinear.vector.jacobian.GaussNewtonOptimizer; +import org.apache.commons.math4.optim.nonlinear.vector.jacobian.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/fitting/SimpleCurveFitterTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/fitting/SimpleCurveFitterTest.java b/src/test/java/org/apache/commons/math4/fitting/SimpleCurveFitterTest.java index d411d4a..bd2b594 100644 --- a/src/test/java/org/apache/commons/math4/fitting/SimpleCurveFitterTest.java +++ b/src/test/java/org/apache/commons/math4/fitting/SimpleCurveFitterTest.java @@ -14,17 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fitting; +package org.apache.commons.math4.fitting; import java.util.Random; -import org.apache.commons.math3.TestUtils; -import org.apache.commons.math3.analysis.ParametricUnivariateFunction; -import org.apache.commons.math3.analysis.polynomials.PolynomialFunction; -import org.apache.commons.math3.distribution.RealDistribution; -import org.apache.commons.math3.distribution.UniformRealDistribution; -import org.apache.commons.math3.exception.ConvergenceException; -import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math4.TestUtils; +import org.apache.commons.math4.analysis.ParametricUnivariateFunction; +import org.apache.commons.math4.analysis.polynomials.PolynomialFunction; +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.fitting.SimpleCurveFitter; +import org.apache.commons.math4.fitting.WeightedObservedPoints; +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/fitting/WeightedObservedPointsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/fitting/WeightedObservedPointsTest.java b/src/test/java/org/apache/commons/math4/fitting/WeightedObservedPointsTest.java index 6b9e311..773e883 100644 --- a/src/test/java/org/apache/commons/math4/fitting/WeightedObservedPointsTest.java +++ b/src/test/java/org/apache/commons/math4/fitting/WeightedObservedPointsTest.java @@ -14,12 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fitting; +package org.apache.commons.math4.fitting; import java.util.List; + import org.junit.Assert; import org.junit.Test; -import org.apache.commons.math3.util.Precision; +import org.apache.commons.math4.fitting.WeightedObservedPoint; +import org.apache.commons.math4.fitting.WeightedObservedPoints; +import org.apache.commons.math4.util.Precision; /** * Tests {@link WeightedObservedPoints}. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/fitting/leastsquares/AbstractLeastSquaresOptimizerAbstractTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/fitting/leastsquares/AbstractLeastSquaresOptimizerAbstractTest.java b/src/test/java/org/apache/commons/math4/fitting/leastsquares/AbstractLeastSquaresOptimizerAbstractTest.java index bb9c9ac..6880bbe 100644 --- a/src/test/java/org/apache/commons/math4/fitting/leastsquares/AbstractLeastSquaresOptimizerAbstractTest.java +++ b/src/test/java/org/apache/commons/math4/fitting/leastsquares/AbstractLeastSquaresOptimizerAbstractTest.java @@ -14,25 +14,29 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fitting.leastsquares; - -import org.apache.commons.math3.analysis.MultivariateMatrixFunction; -import org.apache.commons.math3.analysis.MultivariateVectorFunction; -import org.apache.commons.math3.exception.ConvergenceException; -import org.apache.commons.math3.exception.DimensionMismatchException; -import org.apache.commons.math3.fitting.leastsquares.LeastSquaresOptimizer.Optimum; -import org.apache.commons.math3.fitting.leastsquares.LeastSquaresProblem.Evaluation; -import org.apache.commons.math3.geometry.euclidean.twod.Vector2D; -import org.apache.commons.math3.linear.Array2DRowRealMatrix; -import org.apache.commons.math3.linear.ArrayRealVector; -import org.apache.commons.math3.linear.BlockRealMatrix; -import org.apache.commons.math3.linear.DiagonalMatrix; -import org.apache.commons.math3.linear.RealMatrix; -import org.apache.commons.math3.linear.RealVector; -import org.apache.commons.math3.optim.ConvergenceChecker; -import org.apache.commons.math3.optim.SimpleVectorValueChecker; -import org.apache.commons.math3.util.FastMath; -import org.apache.commons.math3.util.Pair; +package org.apache.commons.math4.fitting.leastsquares; + +import org.apache.commons.math4.analysis.MultivariateMatrixFunction; +import org.apache.commons.math4.analysis.MultivariateVectorFunction; +import org.apache.commons.math4.exception.ConvergenceException; +import org.apache.commons.math4.exception.DimensionMismatchException; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresBuilder; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresOptimizer; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresProblem; +import org.apache.commons.math4.fitting.leastsquares.MultivariateJacobianFunction; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresOptimizer.Optimum; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresProblem.Evaluation; +import org.apache.commons.math4.geometry.euclidean.twod.Vector2D; +import org.apache.commons.math4.linear.Array2DRowRealMatrix; +import org.apache.commons.math4.linear.ArrayRealVector; +import org.apache.commons.math4.linear.BlockRealMatrix; +import org.apache.commons.math4.linear.DiagonalMatrix; +import org.apache.commons.math4.linear.RealMatrix; +import org.apache.commons.math4.linear.RealVector; +import org.apache.commons.math4.optim.ConvergenceChecker; +import org.apache.commons.math4.optim.SimpleVectorValueChecker; +import org.apache.commons.math4.util.FastMath; +import org.apache.commons.math4.util.Pair; 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/fitting/leastsquares/CircleProblem.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/fitting/leastsquares/CircleProblem.java b/src/test/java/org/apache/commons/math4/fitting/leastsquares/CircleProblem.java index ed637d4..63c817e 100644 --- a/src/test/java/org/apache/commons/math4/fitting/leastsquares/CircleProblem.java +++ b/src/test/java/org/apache/commons/math4/fitting/leastsquares/CircleProblem.java @@ -14,13 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fitting.leastsquares; +package org.apache.commons.math4.fitting.leastsquares; import java.util.ArrayList; -import org.apache.commons.math3.analysis.MultivariateVectorFunction; -import org.apache.commons.math3.analysis.MultivariateMatrixFunction; -import org.apache.commons.math3.util.MathUtils; -import org.apache.commons.math3.util.FastMath; + +import org.apache.commons.math4.analysis.MultivariateMatrixFunction; +import org.apache.commons.math4.analysis.MultivariateVectorFunction; +import org.apache.commons.math4.util.FastMath; +import org.apache.commons.math4.util.MathUtils; /** * Class that models a circle. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/fitting/leastsquares/CircleVectorial.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/fitting/leastsquares/CircleVectorial.java b/src/test/java/org/apache/commons/math4/fitting/leastsquares/CircleVectorial.java index 968bea5..3ba837b 100644 --- a/src/test/java/org/apache/commons/math4/fitting/leastsquares/CircleVectorial.java +++ b/src/test/java/org/apache/commons/math4/fitting/leastsquares/CircleVectorial.java @@ -14,12 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fitting.leastsquares; +package org.apache.commons.math4.fitting.leastsquares; import java.util.ArrayList; -import org.apache.commons.math3.analysis.MultivariateVectorFunction; -import org.apache.commons.math3.analysis.MultivariateMatrixFunction; -import org.apache.commons.math3.geometry.euclidean.twod.Vector2D; + +import org.apache.commons.math4.analysis.MultivariateMatrixFunction; +import org.apache.commons.math4.analysis.MultivariateVectorFunction; +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/fitting/leastsquares/EvaluationRmsCheckerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/fitting/leastsquares/EvaluationRmsCheckerTest.java b/src/test/java/org/apache/commons/math4/fitting/leastsquares/EvaluationRmsCheckerTest.java index 6f5e3df..d98dcaa 100644 --- a/src/test/java/org/apache/commons/math4/fitting/leastsquares/EvaluationRmsCheckerTest.java +++ b/src/test/java/org/apache/commons/math4/fitting/leastsquares/EvaluationRmsCheckerTest.java @@ -14,12 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fitting.leastsquares; +package org.apache.commons.math4.fitting.leastsquares; -import org.apache.commons.math3.fitting.leastsquares.LeastSquaresProblem.Evaluation; -import org.apache.commons.math3.linear.RealMatrix; -import org.apache.commons.math3.linear.RealVector; -import org.apache.commons.math3.optim.ConvergenceChecker; +import org.apache.commons.math4.fitting.leastsquares.EvaluationRmsChecker; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresProblem.Evaluation; +import org.apache.commons.math4.linear.RealMatrix; +import org.apache.commons.math4.linear.RealVector; +import org.apache.commons.math4.optim.ConvergenceChecker; 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/fitting/leastsquares/EvaluationTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/fitting/leastsquares/EvaluationTest.java b/src/test/java/org/apache/commons/math4/fitting/leastsquares/EvaluationTest.java index a53b3f7..b34dcaf 100644 --- a/src/test/java/org/apache/commons/math4/fitting/leastsquares/EvaluationTest.java +++ b/src/test/java/org/apache/commons/math4/fitting/leastsquares/EvaluationTest.java @@ -11,22 +11,27 @@ * KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -package org.apache.commons.math3.fitting.leastsquares; - -import org.apache.commons.math3.exception.MathIllegalStateException; -import org.apache.commons.math3.TestUtils; -import org.apache.commons.math3.analysis.MultivariateMatrixFunction; -import org.apache.commons.math3.analysis.MultivariateVectorFunction; -import org.apache.commons.math3.fitting.leastsquares.LeastSquaresProblem.Evaluation; -import org.apache.commons.math3.linear.ArrayRealVector; -import org.apache.commons.math3.linear.DiagonalMatrix; -import org.apache.commons.math3.linear.MatrixUtils; -import org.apache.commons.math3.linear.RealMatrix; -import org.apache.commons.math3.linear.RealVector; -import org.apache.commons.math3.linear.SingularMatrixException; -import org.apache.commons.math3.util.FastMath; -import org.apache.commons.math3.util.Pair; -import org.apache.commons.math3.util.Precision; +package org.apache.commons.math4.fitting.leastsquares; + +import org.apache.commons.math4.TestUtils; +import org.apache.commons.math4.analysis.MultivariateMatrixFunction; +import org.apache.commons.math4.analysis.MultivariateVectorFunction; +import org.apache.commons.math4.exception.MathIllegalStateException; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresBuilder; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresFactory; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresProblem; +import org.apache.commons.math4.fitting.leastsquares.MultivariateJacobianFunction; +import org.apache.commons.math4.fitting.leastsquares.ValueAndJacobianFunction; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresProblem.Evaluation; +import org.apache.commons.math4.linear.ArrayRealVector; +import org.apache.commons.math4.linear.DiagonalMatrix; +import org.apache.commons.math4.linear.MatrixUtils; +import org.apache.commons.math4.linear.RealMatrix; +import org.apache.commons.math4.linear.RealVector; +import org.apache.commons.math4.linear.SingularMatrixException; +import org.apache.commons.math4.util.FastMath; +import org.apache.commons.math4.util.Pair; +import org.apache.commons.math4.util.Precision; 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/fitting/leastsquares/EvaluationTestValidation.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/fitting/leastsquares/EvaluationTestValidation.java b/src/test/java/org/apache/commons/math4/fitting/leastsquares/EvaluationTestValidation.java index eaa7b8d..6642854 100644 --- a/src/test/java/org/apache/commons/math4/fitting/leastsquares/EvaluationTestValidation.java +++ b/src/test/java/org/apache/commons/math4/fitting/leastsquares/EvaluationTestValidation.java @@ -11,14 +11,16 @@ * KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -package org.apache.commons.math3.fitting.leastsquares; - -import org.apache.commons.math3.linear.ArrayRealVector; -import org.apache.commons.math3.linear.DiagonalMatrix; -import org.apache.commons.math3.linear.RealVector; -import org.apache.commons.math3.stat.descriptive.StatisticalSummary; -import org.apache.commons.math3.stat.descriptive.SummaryStatistics; -import org.apache.commons.math3.util.FastMath; +package org.apache.commons.math4.fitting.leastsquares; + +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresBuilder; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresProblem; +import org.apache.commons.math4.linear.ArrayRealVector; +import org.apache.commons.math4.linear.DiagonalMatrix; +import org.apache.commons.math4.linear.RealVector; +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.Assert; import org.junit.Test; @@ -30,7 +32,7 @@ import java.util.List; * This class demonstrates the main functionality of the * {@link LeastSquaresProblem.Evaluation}, common to the * optimizer implementations in package - * {@link org.apache.commons.math3.fitting.leastsquares}. + * {@link org.apache.commons.math4.fitting.leastsquares}. * <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/fitting/leastsquares/GaussNewtonOptimizerWithCholeskyTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/fitting/leastsquares/GaussNewtonOptimizerWithCholeskyTest.java b/src/test/java/org/apache/commons/math4/fitting/leastsquares/GaussNewtonOptimizerWithCholeskyTest.java index beb59b2..c6d26d4 100644 --- a/src/test/java/org/apache/commons/math4/fitting/leastsquares/GaussNewtonOptimizerWithCholeskyTest.java +++ b/src/test/java/org/apache/commons/math4/fitting/leastsquares/GaussNewtonOptimizerWithCholeskyTest.java @@ -15,12 +15,15 @@ * limitations under the License. */ -package org.apache.commons.math3.fitting.leastsquares; +package org.apache.commons.math4.fitting.leastsquares; -import org.apache.commons.math3.exception.ConvergenceException; -import org.apache.commons.math3.exception.TooManyEvaluationsException; -import org.apache.commons.math3.fitting.leastsquares.GaussNewtonOptimizer.Decomposition; -import org.apache.commons.math3.optim.SimpleVectorValueChecker; +import org.apache.commons.math4.exception.ConvergenceException; +import org.apache.commons.math4.exception.TooManyEvaluationsException; +import org.apache.commons.math4.fitting.leastsquares.GaussNewtonOptimizer; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresOptimizer; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresProblem; +import org.apache.commons.math4.fitting.leastsquares.GaussNewtonOptimizer.Decomposition; +import org.apache.commons.math4.optim.SimpleVectorValueChecker; import org.junit.Test; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/fitting/leastsquares/GaussNewtonOptimizerWithLUTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/fitting/leastsquares/GaussNewtonOptimizerWithLUTest.java b/src/test/java/org/apache/commons/math4/fitting/leastsquares/GaussNewtonOptimizerWithLUTest.java index b3b57cb..f7a5ef9 100644 --- a/src/test/java/org/apache/commons/math4/fitting/leastsquares/GaussNewtonOptimizerWithLUTest.java +++ b/src/test/java/org/apache/commons/math4/fitting/leastsquares/GaussNewtonOptimizerWithLUTest.java @@ -15,12 +15,15 @@ * limitations under the License. */ -package org.apache.commons.math3.fitting.leastsquares; +package org.apache.commons.math4.fitting.leastsquares; -import org.apache.commons.math3.exception.ConvergenceException; -import org.apache.commons.math3.exception.TooManyEvaluationsException; -import org.apache.commons.math3.fitting.leastsquares.GaussNewtonOptimizer.Decomposition; -import org.apache.commons.math3.optim.SimpleVectorValueChecker; +import org.apache.commons.math4.exception.ConvergenceException; +import org.apache.commons.math4.exception.TooManyEvaluationsException; +import org.apache.commons.math4.fitting.leastsquares.GaussNewtonOptimizer; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresOptimizer; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresProblem; +import org.apache.commons.math4.fitting.leastsquares.GaussNewtonOptimizer.Decomposition; +import org.apache.commons.math4.optim.SimpleVectorValueChecker; import org.junit.Test; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/fitting/leastsquares/GaussNewtonOptimizerWithQRTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/fitting/leastsquares/GaussNewtonOptimizerWithQRTest.java b/src/test/java/org/apache/commons/math4/fitting/leastsquares/GaussNewtonOptimizerWithQRTest.java index 31aa8c3..9b9f86c 100644 --- a/src/test/java/org/apache/commons/math4/fitting/leastsquares/GaussNewtonOptimizerWithQRTest.java +++ b/src/test/java/org/apache/commons/math4/fitting/leastsquares/GaussNewtonOptimizerWithQRTest.java @@ -15,12 +15,15 @@ * limitations under the License. */ -package org.apache.commons.math3.fitting.leastsquares; +package org.apache.commons.math4.fitting.leastsquares; -import org.apache.commons.math3.exception.ConvergenceException; -import org.apache.commons.math3.exception.TooManyEvaluationsException; -import org.apache.commons.math3.fitting.leastsquares.GaussNewtonOptimizer.Decomposition; -import org.apache.commons.math3.optim.SimpleVectorValueChecker; +import org.apache.commons.math4.exception.ConvergenceException; +import org.apache.commons.math4.exception.TooManyEvaluationsException; +import org.apache.commons.math4.fitting.leastsquares.GaussNewtonOptimizer; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresOptimizer; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresProblem; +import org.apache.commons.math4.fitting.leastsquares.GaussNewtonOptimizer.Decomposition; +import org.apache.commons.math4.optim.SimpleVectorValueChecker; import org.junit.Test; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/fitting/leastsquares/GaussNewtonOptimizerWithSVDTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/fitting/leastsquares/GaussNewtonOptimizerWithSVDTest.java b/src/test/java/org/apache/commons/math4/fitting/leastsquares/GaussNewtonOptimizerWithSVDTest.java index 4ea760e..3ad564e 100644 --- a/src/test/java/org/apache/commons/math4/fitting/leastsquares/GaussNewtonOptimizerWithSVDTest.java +++ b/src/test/java/org/apache/commons/math4/fitting/leastsquares/GaussNewtonOptimizerWithSVDTest.java @@ -15,16 +15,19 @@ * limitations under the License. */ -package org.apache.commons.math3.fitting.leastsquares; - -import org.apache.commons.math3.exception.ConvergenceException; -import org.apache.commons.math3.exception.TooManyEvaluationsException; -import org.apache.commons.math3.fitting.leastsquares.GaussNewtonOptimizer.Decomposition; -import org.apache.commons.math3.fitting.leastsquares.LeastSquaresOptimizer.Optimum; -import org.apache.commons.math3.geometry.euclidean.threed.Plane; -import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; -import org.apache.commons.math3.optim.SimpleVectorValueChecker; -import org.apache.commons.math3.util.FastMath; +package org.apache.commons.math4.fitting.leastsquares; + +import org.apache.commons.math4.exception.ConvergenceException; +import org.apache.commons.math4.exception.TooManyEvaluationsException; +import org.apache.commons.math4.fitting.leastsquares.GaussNewtonOptimizer; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresOptimizer; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresProblem; +import org.apache.commons.math4.fitting.leastsquares.GaussNewtonOptimizer.Decomposition; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresOptimizer.Optimum; +import org.apache.commons.math4.geometry.euclidean.threed.Plane; +import org.apache.commons.math4.geometry.euclidean.threed.Vector3D; +import org.apache.commons.math4.optim.SimpleVectorValueChecker; +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/fitting/leastsquares/LevenbergMarquardtOptimizerTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/fitting/leastsquares/LevenbergMarquardtOptimizerTest.java b/src/test/java/org/apache/commons/math4/fitting/leastsquares/LevenbergMarquardtOptimizerTest.java index 7dff7a9..73b443d 100644 --- a/src/test/java/org/apache/commons/math4/fitting/leastsquares/LevenbergMarquardtOptimizerTest.java +++ b/src/test/java/org/apache/commons/math4/fitting/leastsquares/LevenbergMarquardtOptimizerTest.java @@ -15,22 +15,27 @@ * limitations under the License. */ -package org.apache.commons.math3.fitting.leastsquares; - -import org.apache.commons.math3.analysis.MultivariateMatrixFunction; -import org.apache.commons.math3.analysis.MultivariateVectorFunction; -import org.apache.commons.math3.exception.DimensionMismatchException; -import org.apache.commons.math3.exception.TooManyEvaluationsException; -import org.apache.commons.math3.fitting.leastsquares.LeastSquaresOptimizer.Optimum; -import org.apache.commons.math3.fitting.leastsquares.LeastSquaresProblem.Evaluation; -import org.apache.commons.math3.geometry.euclidean.twod.Vector2D; -import org.apache.commons.math3.linear.DiagonalMatrix; -import org.apache.commons.math3.linear.RealMatrix; -import org.apache.commons.math3.linear.RealVector; -import org.apache.commons.math3.linear.SingularMatrixException; -import org.apache.commons.math3.optim.ConvergenceChecker; -import org.apache.commons.math3.util.FastMath; -import org.apache.commons.math3.util.Precision; +package org.apache.commons.math4.fitting.leastsquares; + +import org.apache.commons.math4.analysis.MultivariateMatrixFunction; +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.fitting.leastsquares.LeastSquaresBuilder; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresOptimizer; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresProblem; +import org.apache.commons.math4.fitting.leastsquares.LevenbergMarquardtOptimizer; +import org.apache.commons.math4.fitting.leastsquares.ParameterValidator; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresOptimizer.Optimum; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresProblem.Evaluation; +import org.apache.commons.math4.geometry.euclidean.twod.Vector2D; +import org.apache.commons.math4.linear.DiagonalMatrix; +import org.apache.commons.math4.linear.RealMatrix; +import org.apache.commons.math4.linear.RealVector; +import org.apache.commons.math4.linear.SingularMatrixException; +import org.apache.commons.math4.optim.ConvergenceChecker; +import org.apache.commons.math4.util.FastMath; +import org.apache.commons.math4.util.Precision; 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/fitting/leastsquares/MinpackTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/fitting/leastsquares/MinpackTest.java b/src/test/java/org/apache/commons/math4/fitting/leastsquares/MinpackTest.java index b91140b..9fc4504 100644 --- a/src/test/java/org/apache/commons/math4/fitting/leastsquares/MinpackTest.java +++ b/src/test/java/org/apache/commons/math4/fitting/leastsquares/MinpackTest.java @@ -15,15 +15,19 @@ * limitations under the License. */ -package org.apache.commons.math3.fitting.leastsquares; +package org.apache.commons.math4.fitting.leastsquares; import java.util.Arrays; -import org.apache.commons.math3.exception.TooManyEvaluationsException; -import org.apache.commons.math3.analysis.MultivariateVectorFunction; -import org.apache.commons.math3.analysis.MultivariateMatrixFunction; -import org.apache.commons.math3.fitting.leastsquares.LeastSquaresOptimizer.Optimum; -import org.apache.commons.math3.linear.DiagonalMatrix; -import org.apache.commons.math3.util.FastMath; + +import org.apache.commons.math4.analysis.MultivariateMatrixFunction; +import org.apache.commons.math4.analysis.MultivariateVectorFunction; +import org.apache.commons.math4.exception.TooManyEvaluationsException; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresBuilder; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresProblem; +import org.apache.commons.math4.fitting.leastsquares.LevenbergMarquardtOptimizer; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresOptimizer.Optimum; +import org.apache.commons.math4.linear.DiagonalMatrix; +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/fitting/leastsquares/RandomCirclePointGenerator.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/fitting/leastsquares/RandomCirclePointGenerator.java b/src/test/java/org/apache/commons/math4/fitting/leastsquares/RandomCirclePointGenerator.java index 3f9a20d..dc7d3fb 100644 --- a/src/test/java/org/apache/commons/math4/fitting/leastsquares/RandomCirclePointGenerator.java +++ b/src/test/java/org/apache/commons/math4/fitting/leastsquares/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.fitting.leastsquares; +package org.apache.commons.math4.fitting.leastsquares; -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/fitting/leastsquares/RandomStraightLinePointGenerator.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/fitting/leastsquares/RandomStraightLinePointGenerator.java b/src/test/java/org/apache/commons/math4/fitting/leastsquares/RandomStraightLinePointGenerator.java index 1c60cd2..6db49bb 100644 --- a/src/test/java/org/apache/commons/math4/fitting/leastsquares/RandomStraightLinePointGenerator.java +++ b/src/test/java/org/apache/commons/math4/fitting/leastsquares/RandomStraightLinePointGenerator.java @@ -15,14 +15,15 @@ * limitations under the License. */ -package org.apache.commons.math3.fitting.leastsquares; +package org.apache.commons.math4.fitting.leastsquares; 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/fitting/leastsquares/StatisticalReferenceDataset.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/fitting/leastsquares/StatisticalReferenceDataset.java b/src/test/java/org/apache/commons/math4/fitting/leastsquares/StatisticalReferenceDataset.java index 5f3dbba..f78b318 100644 --- a/src/test/java/org/apache/commons/math4/fitting/leastsquares/StatisticalReferenceDataset.java +++ b/src/test/java/org/apache/commons/math4/fitting/leastsquares/StatisticalReferenceDataset.java @@ -14,14 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fitting.leastsquares; +package org.apache.commons.math4.fitting.leastsquares; 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.util.MathArrays; + +import org.apache.commons.math4.analysis.MultivariateMatrixFunction; +import org.apache.commons.math4.analysis.MultivariateVectorFunction; +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/fitting/leastsquares/StatisticalReferenceDatasetFactory.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/fitting/leastsquares/StatisticalReferenceDatasetFactory.java b/src/test/java/org/apache/commons/math4/fitting/leastsquares/StatisticalReferenceDatasetFactory.java index cca7c98..4a4178f 100644 --- a/src/test/java/org/apache/commons/math4/fitting/leastsquares/StatisticalReferenceDatasetFactory.java +++ b/src/test/java/org/apache/commons/math4/fitting/leastsquares/StatisticalReferenceDatasetFactory.java @@ -14,13 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fitting.leastsquares; +package org.apache.commons.math4.fitting.leastsquares; 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/fitting/leastsquares/StraightLineProblem.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/fitting/leastsquares/StraightLineProblem.java b/src/test/java/org/apache/commons/math4/fitting/leastsquares/StraightLineProblem.java index f17c461..b59e703 100644 --- a/src/test/java/org/apache/commons/math4/fitting/leastsquares/StraightLineProblem.java +++ b/src/test/java/org/apache/commons/math4/fitting/leastsquares/StraightLineProblem.java @@ -15,13 +15,14 @@ * limitations under the License. */ -package org.apache.commons.math3.fitting.leastsquares; +package org.apache.commons.math4.fitting.leastsquares; 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.math4.analysis.MultivariateMatrixFunction; +import org.apache.commons.math4.analysis.MultivariateVectorFunction; +import org.apache.commons.math4.analysis.UnivariateFunction; +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/fraction/BigFractionFieldTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/fraction/BigFractionFieldTest.java b/src/test/java/org/apache/commons/math4/fraction/BigFractionFieldTest.java index 7e7b534..ccbd6eb 100644 --- a/src/test/java/org/apache/commons/math4/fraction/BigFractionFieldTest.java +++ b/src/test/java/org/apache/commons/math4/fraction/BigFractionFieldTest.java @@ -14,10 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fraction; +package org.apache.commons.math4.fraction; -import org.apache.commons.math3.TestUtils; +import org.apache.commons.math4.TestUtils; +import org.apache.commons.math4.fraction.BigFraction; +import org.apache.commons.math4.fraction.BigFractionField; 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/fraction/BigFractionFormatTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/fraction/BigFractionFormatTest.java b/src/test/java/org/apache/commons/math4/fraction/BigFractionFormatTest.java index cabff63..a398a80 100644 --- a/src/test/java/org/apache/commons/math4/fraction/BigFractionFormatTest.java +++ b/src/test/java/org/apache/commons/math4/fraction/BigFractionFormatTest.java @@ -15,15 +15,18 @@ * limitations under the License. */ -package org.apache.commons.math3.fraction; +package org.apache.commons.math4.fraction; import java.math.BigDecimal; import java.math.BigInteger; import java.text.NumberFormat; import java.util.Locale; -import org.apache.commons.math3.exception.MathParseException; -import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math4.exception.MathParseException; +import org.apache.commons.math4.fraction.BigFraction; +import org.apache.commons.math4.fraction.BigFractionFormat; +import org.apache.commons.math4.fraction.ProperBigFractionFormat; +import org.apache.commons.math4.util.FastMath; import org.junit.Assert; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/fraction/BigFractionTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/fraction/BigFractionTest.java b/src/test/java/org/apache/commons/math4/fraction/BigFractionTest.java index 229da69..d921026 100644 --- a/src/test/java/org/apache/commons/math4/fraction/BigFractionTest.java +++ b/src/test/java/org/apache/commons/math4/fraction/BigFractionTest.java @@ -14,17 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fraction; +package org.apache.commons.math4.fraction; import java.math.BigDecimal; import java.math.BigInteger; -import org.apache.commons.math3.TestUtils; -import org.apache.commons.math3.exception.ConvergenceException; -import org.apache.commons.math3.exception.MathArithmeticException; -import org.apache.commons.math3.exception.NullArgumentException; -import org.apache.commons.math3.exception.ZeroException; -import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math4.TestUtils; +import org.apache.commons.math4.exception.ConvergenceException; +import org.apache.commons.math4.exception.MathArithmeticException; +import org.apache.commons.math4.exception.NullArgumentException; +import org.apache.commons.math4.exception.ZeroException; +import org.apache.commons.math4.fraction.BigFraction; +import org.apache.commons.math4.fraction.FractionConversionException; +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/fraction/FractionFieldTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/fraction/FractionFieldTest.java b/src/test/java/org/apache/commons/math4/fraction/FractionFieldTest.java index 200bf68..4a85f08 100644 --- a/src/test/java/org/apache/commons/math4/fraction/FractionFieldTest.java +++ b/src/test/java/org/apache/commons/math4/fraction/FractionFieldTest.java @@ -14,10 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fraction; +package org.apache.commons.math4.fraction; -import org.apache.commons.math3.TestUtils; +import org.apache.commons.math4.TestUtils; +import org.apache.commons.math4.fraction.Fraction; +import org.apache.commons.math4.fraction.FractionField; 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/fraction/FractionFormatTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/fraction/FractionFormatTest.java b/src/test/java/org/apache/commons/math4/fraction/FractionFormatTest.java index 4f95147..fc91b6c 100644 --- a/src/test/java/org/apache/commons/math4/fraction/FractionFormatTest.java +++ b/src/test/java/org/apache/commons/math4/fraction/FractionFormatTest.java @@ -15,13 +15,16 @@ * limitations under the License. */ -package org.apache.commons.math3.fraction; +package org.apache.commons.math4.fraction; import java.text.NumberFormat; import java.util.Locale; -import org.apache.commons.math3.exception.MathParseException; -import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math4.exception.MathParseException; +import org.apache.commons.math4.fraction.Fraction; +import org.apache.commons.math4.fraction.FractionFormat; +import org.apache.commons.math4.fraction.ProperFractionFormat; +import org.apache.commons.math4.util.FastMath; import org.junit.Assert; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/fraction/FractionTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/fraction/FractionTest.java b/src/test/java/org/apache/commons/math4/fraction/FractionTest.java index 132fd0c..174fa09 100644 --- a/src/test/java/org/apache/commons/math4/fraction/FractionTest.java +++ b/src/test/java/org/apache/commons/math4/fraction/FractionTest.java @@ -14,13 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fraction; - -import org.apache.commons.math3.exception.ConvergenceException; -import org.apache.commons.math3.exception.MathIllegalArgumentException; -import org.apache.commons.math3.exception.MathArithmeticException; -import org.apache.commons.math3.TestUtils; -import org.apache.commons.math3.util.FastMath; +package org.apache.commons.math4.fraction; + +import org.apache.commons.math4.TestUtils; +import org.apache.commons.math4.exception.ConvergenceException; +import org.apache.commons.math4.exception.MathArithmeticException; +import org.apache.commons.math4.exception.MathIllegalArgumentException; +import org.apache.commons.math4.fraction.Fraction; +import org.apache.commons.math4.fraction.FractionConversionException; +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/genetics/BinaryChromosomeTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/genetics/BinaryChromosomeTest.java b/src/test/java/org/apache/commons/math4/genetics/BinaryChromosomeTest.java index 63c04c3..b846fde 100644 --- a/src/test/java/org/apache/commons/math4/genetics/BinaryChromosomeTest.java +++ b/src/test/java/org/apache/commons/math4/genetics/BinaryChromosomeTest.java @@ -14,9 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.genetics; +package org.apache.commons.math4.genetics; +import org.apache.commons.math4.genetics.BinaryChromosome; +import org.apache.commons.math4.genetics.Chromosome; 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/genetics/BinaryMutationTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/genetics/BinaryMutationTest.java b/src/test/java/org/apache/commons/math4/genetics/BinaryMutationTest.java index 95327fe..5ada12a 100644 --- a/src/test/java/org/apache/commons/math4/genetics/BinaryMutationTest.java +++ b/src/test/java/org/apache/commons/math4/genetics/BinaryMutationTest.java @@ -14,9 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.genetics; +package org.apache.commons.math4.genetics; +import org.apache.commons.math4.genetics.BinaryChromosome; +import org.apache.commons.math4.genetics.BinaryMutation; 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/genetics/ChromosomeTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/genetics/ChromosomeTest.java b/src/test/java/org/apache/commons/math4/genetics/ChromosomeTest.java index 0d08812..126d5c3 100644 --- a/src/test/java/org/apache/commons/math4/genetics/ChromosomeTest.java +++ b/src/test/java/org/apache/commons/math4/genetics/ChromosomeTest.java @@ -14,12 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.genetics; +package org.apache.commons.math4.genetics; import java.util.ArrayList; import java.util.List; +import org.apache.commons.math4.genetics.Chromosome; +import org.apache.commons.math4.genetics.ListPopulation; +import org.apache.commons.math4.genetics.Population; 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/genetics/CycleCrossoverTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/genetics/CycleCrossoverTest.java b/src/test/java/org/apache/commons/math4/genetics/CycleCrossoverTest.java index 7b6e6b8..740091d 100644 --- a/src/test/java/org/apache/commons/math4/genetics/CycleCrossoverTest.java +++ b/src/test/java/org/apache/commons/math4/genetics/CycleCrossoverTest.java @@ -14,10 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.genetics; - -import org.apache.commons.math3.exception.DimensionMismatchException; -import org.apache.commons.math3.exception.MathIllegalArgumentException; +package org.apache.commons.math4.genetics; + +import org.apache.commons.math4.exception.DimensionMismatchException; +import org.apache.commons.math4.exception.MathIllegalArgumentException; +import org.apache.commons.math4.genetics.BinaryChromosome; +import org.apache.commons.math4.genetics.Chromosome; +import org.apache.commons.math4.genetics.ChromosomePair; +import org.apache.commons.math4.genetics.CrossoverPolicy; +import org.apache.commons.math4.genetics.CycleCrossover; 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/genetics/DummyBinaryChromosome.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/genetics/DummyBinaryChromosome.java b/src/test/java/org/apache/commons/math4/genetics/DummyBinaryChromosome.java index e1a4a91..789da5a 100644 --- a/src/test/java/org/apache/commons/math4/genetics/DummyBinaryChromosome.java +++ b/src/test/java/org/apache/commons/math4/genetics/DummyBinaryChromosome.java @@ -14,10 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.genetics; +package org.apache.commons.math4.genetics; import java.util.List; +import org.apache.commons.math4.genetics.AbstractListChromosome; +import org.apache.commons.math4.genetics.BinaryChromosome; + /** * Implementation of BinaryChromosome for testing purposes */ http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/genetics/DummyListChromosome.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/genetics/DummyListChromosome.java b/src/test/java/org/apache/commons/math4/genetics/DummyListChromosome.java index 4831e67..0fd1186 100644 --- a/src/test/java/org/apache/commons/math4/genetics/DummyListChromosome.java +++ b/src/test/java/org/apache/commons/math4/genetics/DummyListChromosome.java @@ -14,11 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.genetics; +package org.apache.commons.math4.genetics; import java.util.Arrays; import java.util.List; +import org.apache.commons.math4.genetics.AbstractListChromosome; +import org.apache.commons.math4.genetics.InvalidRepresentationException; + /** * Implementation of ListChromosome for testing purposes */ http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/genetics/DummyRandomKey.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/genetics/DummyRandomKey.java b/src/test/java/org/apache/commons/math4/genetics/DummyRandomKey.java index 4d671b4..594ebb3 100644 --- a/src/test/java/org/apache/commons/math4/genetics/DummyRandomKey.java +++ b/src/test/java/org/apache/commons/math4/genetics/DummyRandomKey.java @@ -14,10 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.genetics; +package org.apache.commons.math4.genetics; import java.util.List; +import org.apache.commons.math4.genetics.AbstractListChromosome; +import org.apache.commons.math4.genetics.RandomKey; + /** * Implementation of RandomKey for testing purposes */ http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/genetics/ElitisticListPopulationTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/genetics/ElitisticListPopulationTest.java b/src/test/java/org/apache/commons/math4/genetics/ElitisticListPopulationTest.java index dbfc9f1..08dbeb3 100644 --- a/src/test/java/org/apache/commons/math4/genetics/ElitisticListPopulationTest.java +++ b/src/test/java/org/apache/commons/math4/genetics/ElitisticListPopulationTest.java @@ -14,13 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.genetics; +package org.apache.commons.math4.genetics; import java.util.Collections; import java.util.List; -import org.apache.commons.math3.exception.OutOfRangeException; +import org.apache.commons.math4.exception.OutOfRangeException; +import org.apache.commons.math4.genetics.Chromosome; +import org.apache.commons.math4.genetics.ElitisticListPopulation; +import org.apache.commons.math4.genetics.Population; 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/genetics/FitnessCachingTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/genetics/FitnessCachingTest.java b/src/test/java/org/apache/commons/math4/genetics/FitnessCachingTest.java index 1b878f5..71ae818 100644 --- a/src/test/java/org/apache/commons/math4/genetics/FitnessCachingTest.java +++ b/src/test/java/org/apache/commons/math4/genetics/FitnessCachingTest.java @@ -14,12 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.genetics; +package org.apache.commons.math4.genetics; import java.util.LinkedList; import java.util.List; +import org.apache.commons.math4.genetics.BinaryChromosome; +import org.apache.commons.math4.genetics.BinaryMutation; +import org.apache.commons.math4.genetics.Chromosome; +import org.apache.commons.math4.genetics.ElitisticListPopulation; +import org.apache.commons.math4.genetics.FixedGenerationCount; +import org.apache.commons.math4.genetics.GeneticAlgorithm; +import org.apache.commons.math4.genetics.OnePointCrossover; +import org.apache.commons.math4.genetics.Population; +import org.apache.commons.math4.genetics.StoppingCondition; +import org.apache.commons.math4.genetics.TournamentSelection; 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/genetics/FixedElapsedTimeTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/genetics/FixedElapsedTimeTest.java b/src/test/java/org/apache/commons/math4/genetics/FixedElapsedTimeTest.java index 775bebe..75e21bb 100644 --- a/src/test/java/org/apache/commons/math4/genetics/FixedElapsedTimeTest.java +++ b/src/test/java/org/apache/commons/math4/genetics/FixedElapsedTimeTest.java @@ -14,12 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.genetics; +package org.apache.commons.math4.genetics; import java.util.Iterator; import java.util.concurrent.TimeUnit; -import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math4.genetics.Chromosome; +import org.apache.commons.math4.genetics.FixedElapsedTime; +import org.apache.commons.math4.genetics.Population; +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/genetics/FixedGenerationCountTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/math4/genetics/FixedGenerationCountTest.java b/src/test/java/org/apache/commons/math4/genetics/FixedGenerationCountTest.java index 37e03fa..e174879 100644 --- a/src/test/java/org/apache/commons/math4/genetics/FixedGenerationCountTest.java +++ b/src/test/java/org/apache/commons/math4/genetics/FixedGenerationCountTest.java @@ -14,11 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.genetics; +package org.apache.commons.math4.genetics; import java.util.Iterator; +import org.apache.commons.math4.genetics.Chromosome; +import org.apache.commons.math4.genetics.FixedGenerationCount; +import org.apache.commons.math4.genetics.Population; import org.junit.Assert; import org.junit.Test;
