diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/util/Pair.java b/commons-math-legacy-core/src/main/java/org/apache/commons/math4/legacy/core/Pair.java similarity index 98% rename from commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/util/Pair.java rename to commons-math-legacy-core/src/main/java/org/apache/commons/math4/legacy/core/Pair.java index ea6a138d8..8e5620d83 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/util/Pair.java +++ b/commons-math-legacy-core/src/main/java/org/apache/commons/math4/legacy/core/Pair.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math4.legacy.util; +package org.apache.commons.math4.legacy.core; /** * Generic pair. diff --git a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/util/PairTest.java b/commons-math-legacy-core/src/test/java/org/apache/commons/math4/legacy/core/PairTest.java similarity index 98% rename from commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/util/PairTest.java rename to commons-math-legacy-core/src/test/java/org/apache/commons/math4/legacy/core/PairTest.java index 347a00856..316227f6d 100644 --- a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/util/PairTest.java +++ b/commons-math-legacy-core/src/test/java/org/apache/commons/math4/legacy/core/PairTest.java @@ -11,7 +11,7 @@ * KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -package org.apache.commons.math4.legacy.util; +package org.apache.commons.math4.legacy.core; import org.junit.Assert; import org.junit.Test; diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/gauss/BaseRuleFactory.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/gauss/BaseRuleFactory.java index 4c479bc33..f36fdbd52 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/gauss/BaseRuleFactory.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/gauss/BaseRuleFactory.java @@ -22,7 +22,7 @@ import java.util.TreeMap; import org.apache.commons.math4.legacy.exception.DimensionMismatchException; import org.apache.commons.math4.legacy.exception.NotStrictlyPositiveException; import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; -import org.apache.commons.math4.legacy.util.Pair; +import org.apache.commons.math4.legacy.core.Pair; /** * Base class for rules that determines the integration nodes and their diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/gauss/GaussIntegrator.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/gauss/GaussIntegrator.java index 616b48b47..8494a8789 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/gauss/GaussIntegrator.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/gauss/GaussIntegrator.java @@ -19,7 +19,7 @@ package org.apache.commons.math4.legacy.analysis.integration.gauss; import org.apache.commons.math4.legacy.analysis.UnivariateFunction; import org.apache.commons.math4.legacy.exception.DimensionMismatchException; import org.apache.commons.math4.legacy.core.MathArrays; -import org.apache.commons.math4.legacy.util.Pair; +import org.apache.commons.math4.legacy.core.Pair; /** * Class that implements the Gaussian rule for diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/gauss/GaussIntegratorFactory.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/gauss/GaussIntegratorFactory.java index 21e878399..0d65941ff 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/gauss/GaussIntegratorFactory.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/gauss/GaussIntegratorFactory.java @@ -16,7 +16,7 @@ */ package org.apache.commons.math4.legacy.analysis.integration.gauss; -import org.apache.commons.math4.legacy.util.Pair; +import org.apache.commons.math4.legacy.core.Pair; import java.math.BigDecimal; /** diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/gauss/HermiteRuleFactory.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/gauss/HermiteRuleFactory.java index edc5a9438..fddf69591 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/gauss/HermiteRuleFactory.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/gauss/HermiteRuleFactory.java @@ -17,7 +17,7 @@ package org.apache.commons.math4.legacy.analysis.integration.gauss; import org.apache.commons.math4.legacy.core.jdkmath.AccurateMath; -import org.apache.commons.math4.legacy.util.Pair; +import org.apache.commons.math4.legacy.core.Pair; /** * Factory that creates a diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/gauss/LaguerreRuleFactory.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/gauss/LaguerreRuleFactory.java index 9b28a3166..76fd2c31f 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/gauss/LaguerreRuleFactory.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/gauss/LaguerreRuleFactory.java @@ -23,7 +23,7 @@ import org.apache.commons.math4.legacy.analysis.polynomials.PolynomialsUtils; import org.apache.commons.math4.legacy.linear.EigenDecomposition; import org.apache.commons.math4.legacy.linear.MatrixUtils; import org.apache.commons.math4.legacy.linear.RealMatrix; -import org.apache.commons.math4.legacy.util.Pair; +import org.apache.commons.math4.legacy.core.Pair; /** * Factory that creates Gauss-type quadrature rule using Laguerre polynomials. diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/gauss/LegendreHighPrecisionRuleFactory.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/gauss/LegendreHighPrecisionRuleFactory.java index db9960096..7ce9734d7 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/gauss/LegendreHighPrecisionRuleFactory.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/gauss/LegendreHighPrecisionRuleFactory.java @@ -19,7 +19,7 @@ package org.apache.commons.math4.legacy.analysis.integration.gauss; import java.math.BigDecimal; import java.math.MathContext; -import org.apache.commons.math4.legacy.util.Pair; +import org.apache.commons.math4.legacy.core.Pair; /** * Factory that creates Gauss-type quadrature rule using Legendre polynomials. diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/gauss/LegendreRuleFactory.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/gauss/LegendreRuleFactory.java index a1548bd2a..b4aecba6b 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/gauss/LegendreRuleFactory.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/gauss/LegendreRuleFactory.java @@ -16,7 +16,7 @@ */ package org.apache.commons.math4.legacy.analysis.integration.gauss; -import org.apache.commons.math4.legacy.util.Pair; +import org.apache.commons.math4.legacy.core.Pair; /** * Factory that creates Gauss-type quadrature rule using Legendre polynomials. diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/gauss/SymmetricGaussIntegrator.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/gauss/SymmetricGaussIntegrator.java index a441e0c4d..b12177bad 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/gauss/SymmetricGaussIntegrator.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/gauss/SymmetricGaussIntegrator.java @@ -17,7 +17,7 @@ package org.apache.commons.math4.legacy.analysis.integration.gauss; import org.apache.commons.math4.legacy.analysis.UnivariateFunction; -import org.apache.commons.math4.legacy.util.Pair; +import org.apache.commons.math4.legacy.core.Pair; /** * This class's implements {@link #integrate(UnivariateFunction) integrate} diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/EnumeratedDistribution.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/EnumeratedDistribution.java index a7d4d9358..d7dc9d883 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/EnumeratedDistribution.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/EnumeratedDistribution.java @@ -31,7 +31,7 @@ import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; import org.apache.commons.rng.UniformRandomProvider; import org.apache.commons.rng.sampling.DiscreteProbabilityCollectionSampler; import org.apache.commons.math4.legacy.core.MathArrays; -import org.apache.commons.math4.legacy.util.Pair; +import org.apache.commons.math4.legacy.core.Pair; /** *

A generic implementation of a diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/EnumeratedIntegerDistribution.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/EnumeratedIntegerDistribution.java index c6447d8cb..52e0534bb 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/EnumeratedIntegerDistribution.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/EnumeratedIntegerDistribution.java @@ -29,7 +29,7 @@ import org.apache.commons.math4.legacy.exception.NotANumberException; import org.apache.commons.math4.legacy.exception.NotFiniteNumberException; import org.apache.commons.math4.legacy.exception.NotPositiveException; import org.apache.commons.rng.UniformRandomProvider; -import org.apache.commons.math4.legacy.util.Pair; +import org.apache.commons.math4.legacy.core.Pair; /** *

Implementation of an integer-valued {@link EnumeratedDistribution}.

diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/EnumeratedRealDistribution.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/EnumeratedRealDistribution.java index 4ec81a8ce..bf7126112 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/EnumeratedRealDistribution.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/EnumeratedRealDistribution.java @@ -31,7 +31,7 @@ import org.apache.commons.math4.legacy.exception.NotFiniteNumberException; import org.apache.commons.math4.legacy.exception.NotPositiveException; import org.apache.commons.math4.legacy.exception.OutOfRangeException; import org.apache.commons.rng.UniformRandomProvider; -import org.apache.commons.math4.legacy.util.Pair; +import org.apache.commons.math4.legacy.core.Pair; /** *

Implementation of a real-valued {@link EnumeratedDistribution}. diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/MixtureMultivariateNormalDistribution.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/MixtureMultivariateNormalDistribution.java index 487a5a495..b93fdc3bf 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/MixtureMultivariateNormalDistribution.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/MixtureMultivariateNormalDistribution.java @@ -21,7 +21,7 @@ import java.util.List; import org.apache.commons.math4.legacy.exception.DimensionMismatchException; import org.apache.commons.math4.legacy.exception.NotPositiveException; -import org.apache.commons.math4.legacy.util.Pair; +import org.apache.commons.math4.legacy.core.Pair; /** * Multivariate normal mixture distribution. diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/MixtureMultivariateRealDistribution.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/MixtureMultivariateRealDistribution.java index e05cc40ef..086df0a79 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/MixtureMultivariateRealDistribution.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/MixtureMultivariateRealDistribution.java @@ -24,7 +24,7 @@ import org.apache.commons.math4.legacy.exception.MathArithmeticException; import org.apache.commons.math4.legacy.exception.NotPositiveException; import org.apache.commons.math4.legacy.exception.util.LocalizedFormats; import org.apache.commons.rng.UniformRandomProvider; -import org.apache.commons.math4.legacy.util.Pair; +import org.apache.commons.math4.legacy.core.Pair; /** * Class for representing diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/fitting/MultivariateNormalMixtureExpectationMaximization.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/fitting/MultivariateNormalMixtureExpectationMaximization.java index c5b2c3abd..450a1ba3b 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/fitting/MultivariateNormalMixtureExpectationMaximization.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/distribution/fitting/MultivariateNormalMixtureExpectationMaximization.java @@ -34,7 +34,7 @@ import org.apache.commons.math4.legacy.linear.SingularMatrixException; import org.apache.commons.math4.legacy.stat.correlation.Covariance; import org.apache.commons.math4.legacy.core.jdkmath.AccurateMath; import org.apache.commons.math4.legacy.core.MathArrays; -import org.apache.commons.math4.legacy.util.Pair; +import org.apache.commons.math4.legacy.core.Pair; /** * Expectation-Maximization algorithm for fitting the parameters of diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/fitting/leastsquares/DifferentiatorVectorMultivariateJacobianFunction.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/fitting/leastsquares/DifferentiatorVectorMultivariateJacobianFunction.java index ad9de46d5..34ce3bb26 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/fitting/leastsquares/DifferentiatorVectorMultivariateJacobianFunction.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/fitting/leastsquares/DifferentiatorVectorMultivariateJacobianFunction.java @@ -24,7 +24,7 @@ import org.apache.commons.math4.legacy.linear.Array2DRowRealMatrix; import org.apache.commons.math4.legacy.linear.ArrayRealVector; import org.apache.commons.math4.legacy.linear.RealMatrix; import org.apache.commons.math4.legacy.linear.RealVector; -import org.apache.commons.math4.legacy.util.Pair; +import org.apache.commons.math4.legacy.core.Pair; import java.util.Arrays; diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/fitting/leastsquares/GaussNewtonOptimizer.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/fitting/leastsquares/GaussNewtonOptimizer.java index f052a4b72..a4d38db25 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/fitting/leastsquares/GaussNewtonOptimizer.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/fitting/leastsquares/GaussNewtonOptimizer.java @@ -32,7 +32,7 @@ import org.apache.commons.math4.legacy.linear.SingularMatrixException; import org.apache.commons.math4.legacy.linear.SingularValueDecomposition; import org.apache.commons.math4.legacy.optim.ConvergenceChecker; import org.apache.commons.math4.legacy.core.IntegerSequence; -import org.apache.commons.math4.legacy.util.Pair; +import org.apache.commons.math4.legacy.core.Pair; /** * Gauss-Newton least-squares solver. diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/fitting/leastsquares/LeastSquaresFactory.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/fitting/leastsquares/LeastSquaresFactory.java index 9283baeb1..9400e8b88 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/fitting/leastsquares/LeastSquaresFactory.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/fitting/leastsquares/LeastSquaresFactory.java @@ -32,7 +32,7 @@ import org.apache.commons.math4.legacy.optim.ConvergenceChecker; import org.apache.commons.math4.legacy.optim.PointVectorValuePair; import org.apache.commons.math4.legacy.core.jdkmath.AccurateMath; import org.apache.commons.math4.legacy.core.IntegerSequence; -import org.apache.commons.math4.legacy.util.Pair; +import org.apache.commons.math4.legacy.core.Pair; /** * A Factory for creating {@link LeastSquaresProblem}s. diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/fitting/leastsquares/MultivariateJacobianFunction.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/fitting/leastsquares/MultivariateJacobianFunction.java index 7a8cbe1e8..9926893f6 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/fitting/leastsquares/MultivariateJacobianFunction.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/fitting/leastsquares/MultivariateJacobianFunction.java @@ -18,7 +18,7 @@ package org.apache.commons.math4.legacy.fitting.leastsquares; import org.apache.commons.math4.legacy.linear.RealMatrix; import org.apache.commons.math4.legacy.linear.RealVector; -import org.apache.commons.math4.legacy.util.Pair; +import org.apache.commons.math4.legacy.core.Pair; /** * A interface for functions that compute a vector of values and can compute their diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ml/clustering/MiniBatchKMeansClusterer.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ml/clustering/MiniBatchKMeansClusterer.java index a18b892d9..73ae3dbb6 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ml/clustering/MiniBatchKMeansClusterer.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ml/clustering/MiniBatchKMeansClusterer.java @@ -20,7 +20,7 @@ package org.apache.commons.math4.legacy.ml.clustering; import org.apache.commons.math4.legacy.exception.NullArgumentException; import org.apache.commons.math4.legacy.exception.NumberIsTooSmallException; import org.apache.commons.math4.legacy.ml.distance.DistanceMeasure; -import org.apache.commons.math4.legacy.util.Pair; +import org.apache.commons.math4.legacy.core.Pair; import org.apache.commons.rng.UniformRandomProvider; import org.apache.commons.rng.sampling.ListSampler; diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/PointValuePair.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/PointValuePair.java index 112604c6e..6019e465b 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/PointValuePair.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/PointValuePair.java @@ -18,7 +18,7 @@ package org.apache.commons.math4.legacy.optim; import java.io.Serializable; -import org.apache.commons.math4.legacy.util.Pair; +import org.apache.commons.math4.legacy.core.Pair; /** * This class holds a point and the value of an objective function at diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/PointVectorValuePair.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/PointVectorValuePair.java index 15194213e..f77532dcf 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/PointVectorValuePair.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/PointVectorValuePair.java @@ -18,7 +18,7 @@ package org.apache.commons.math4.legacy.optim; import java.io.Serializable; -import org.apache.commons.math4.legacy.util.Pair; +import org.apache.commons.math4.legacy.core.Pair; /** * This class holds a point and the vectorial value of an objective function at diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/SimplePointChecker.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/SimplePointChecker.java index d6125d195..7906dda3f 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/SimplePointChecker.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/SimplePointChecker.java @@ -18,7 +18,7 @@ package org.apache.commons.math4.legacy.optim; import org.apache.commons.math4.legacy.exception.NotStrictlyPositiveException; import org.apache.commons.math4.legacy.core.jdkmath.AccurateMath; -import org.apache.commons.math4.legacy.util.Pair; +import org.apache.commons.math4.legacy.core.Pair; /** * Simple implementation of the {@link ConvergenceChecker} interface using diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/correlation/KendallsCorrelation.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/correlation/KendallsCorrelation.java index 794742369..ecc126d0f 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/correlation/KendallsCorrelation.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/stat/correlation/KendallsCorrelation.java @@ -24,7 +24,7 @@ import org.apache.commons.math4.legacy.linear.BlockRealMatrix; import org.apache.commons.math4.legacy.linear.MatrixUtils; import org.apache.commons.math4.legacy.linear.RealMatrix; import org.apache.commons.math4.legacy.core.jdkmath.AccurateMath; -import org.apache.commons.math4.legacy.util.Pair; +import org.apache.commons.math4.legacy.core.Pair; /** * Implementation of Kendall's Tau-b rank correlation. diff --git a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/analysis/integration/gauss/BaseRuleFactoryTest.java b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/analysis/integration/gauss/BaseRuleFactoryTest.java index ff42f92c1..42948ead2 100644 --- a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/analysis/integration/gauss/BaseRuleFactoryTest.java +++ b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/analysis/integration/gauss/BaseRuleFactoryTest.java @@ -26,7 +26,7 @@ import java.util.concurrent.Future; import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.commons.math4.legacy.util.Pair; +import org.apache.commons.math4.legacy.core.Pair; import org.junit.Test; import org.junit.Assert; diff --git a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/analysis/integration/gauss/GaussIntegratorTest.java b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/analysis/integration/gauss/GaussIntegratorTest.java index a815ecdc2..c0779a844 100644 --- a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/analysis/integration/gauss/GaussIntegratorTest.java +++ b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/analysis/integration/gauss/GaussIntegratorTest.java @@ -18,7 +18,7 @@ package org.apache.commons.math4.legacy.analysis.integration.gauss; import org.apache.commons.math4.legacy.analysis.UnivariateFunction; import org.apache.commons.math4.legacy.analysis.function.Constant; -import org.apache.commons.math4.legacy.util.Pair; +import org.apache.commons.math4.legacy.core.Pair; import org.junit.Test; import org.junit.Assert; diff --git a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/distribution/EnumeratedRealDistributionTest.java b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/distribution/EnumeratedRealDistributionTest.java index 9c678309d..96414d16e 100644 --- a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/distribution/EnumeratedRealDistributionTest.java +++ b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/distribution/EnumeratedRealDistributionTest.java @@ -28,7 +28,7 @@ import org.apache.commons.math4.legacy.exception.NotANumberException; import org.apache.commons.math4.legacy.exception.NotFiniteNumberException; import org.apache.commons.math4.legacy.exception.NotPositiveException; import org.apache.commons.math4.legacy.core.jdkmath.AccurateMath; -import org.apache.commons.math4.legacy.util.Pair; +import org.apache.commons.math4.legacy.core.Pair; import org.apache.commons.rng.UniformRandomProvider; import org.apache.commons.rng.simple.RandomSource; import org.junit.Assert; diff --git a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/distribution/MixtureMultivariateNormalDistributionTest.java b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/distribution/MixtureMultivariateNormalDistributionTest.java index b64c37a21..d50c1590f 100644 --- a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/distribution/MixtureMultivariateNormalDistributionTest.java +++ b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/distribution/MixtureMultivariateNormalDistributionTest.java @@ -21,7 +21,7 @@ import java.util.List; import org.apache.commons.math4.legacy.exception.MathArithmeticException; import org.apache.commons.math4.legacy.exception.NotPositiveException; import org.apache.commons.rng.simple.RandomSource; -import org.apache.commons.math4.legacy.util.Pair; +import org.apache.commons.math4.legacy.core.Pair; import org.junit.Assert; import org.junit.Test; import org.junit.Ignore; diff --git a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/distribution/fitting/MultivariateNormalMixtureExpectationMaximizationTest.java b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/distribution/fitting/MultivariateNormalMixtureExpectationMaximizationTest.java index 6fe5b56bb..d8e7291fc 100644 --- a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/distribution/fitting/MultivariateNormalMixtureExpectationMaximizationTest.java +++ b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/distribution/fitting/MultivariateNormalMixtureExpectationMaximizationTest.java @@ -28,7 +28,7 @@ import org.apache.commons.math4.legacy.exception.NotStrictlyPositiveException; import org.apache.commons.math4.legacy.exception.NumberIsTooSmallException; import org.apache.commons.math4.legacy.linear.Array2DRowRealMatrix; import org.apache.commons.math4.legacy.linear.RealMatrix; -import org.apache.commons.math4.legacy.util.Pair; +import org.apache.commons.math4.legacy.core.Pair; import org.junit.Assert; import org.junit.Test; diff --git a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/field/linalg/FP64FieldDenseMatrixTest.java b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/field/linalg/FP64FieldDenseMatrixTest.java index 9b99518a1..4df3fa456 100644 --- a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/field/linalg/FP64FieldDenseMatrixTest.java +++ b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/field/linalg/FP64FieldDenseMatrixTest.java @@ -20,9 +20,9 @@ import org.junit.Assert; import org.junit.Test; import org.apache.commons.numbers.field.FP64; import org.apache.commons.numbers.field.FP64Field; -import org.apache.commons.math3.linear.RealMatrix; -import org.apache.commons.math3.linear.Array2DRowRealMatrix; -import org.apache.commons.math3.util.Pair; +import org.apache.commons.math4.legacy.core.Pair; +import org.apache.commons.math4.legacy.linear.RealMatrix; +import org.apache.commons.math4.legacy.linear.Array2DRowRealMatrix; /** * Tests for {@link FieldDenseMatrix} (using {@link FP64} as field elements). diff --git a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/fitting/leastsquares/AbstractLeastSquaresOptimizerAbstractTest.java b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/fitting/leastsquares/AbstractLeastSquaresOptimizerAbstractTest.java index a5a858020..bd0aed48e 100644 --- a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/fitting/leastsquares/AbstractLeastSquaresOptimizerAbstractTest.java +++ b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/fitting/leastsquares/AbstractLeastSquaresOptimizerAbstractTest.java @@ -32,7 +32,7 @@ import org.apache.commons.math4.legacy.linear.RealVector; import org.apache.commons.math4.legacy.optim.ConvergenceChecker; import org.apache.commons.math4.legacy.optim.SimpleVectorValueChecker; import org.apache.commons.math4.legacy.core.jdkmath.AccurateMath; -import org.apache.commons.math4.legacy.util.Pair; +import org.apache.commons.math4.legacy.core.Pair; import org.junit.Assert; import org.junit.Test; diff --git a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/fitting/leastsquares/EvaluationTest.java b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/fitting/leastsquares/EvaluationTest.java index 7ba0218c5..e319785a1 100644 --- a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/fitting/leastsquares/EvaluationTest.java +++ b/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/fitting/leastsquares/EvaluationTest.java @@ -25,7 +25,7 @@ import org.apache.commons.math4.legacy.linear.RealMatrix; import org.apache.commons.math4.legacy.linear.RealVector; import org.apache.commons.math4.legacy.linear.SingularMatrixException; import org.apache.commons.math4.legacy.core.jdkmath.AccurateMath; -import org.apache.commons.math4.legacy.util.Pair; +import org.apache.commons.math4.legacy.core.Pair; import org.apache.commons.numbers.core.Precision; import org.junit.Assert; import org.junit.Test;