From 02d14e67916d740304885a67a4e8e0cebc5e42f6 Mon Sep 17 00:00:00 2001 From: Gilles Sadowski Date: Tue, 1 Jun 2021 17:17:51 +0200 Subject: [PATCH] Utility class moved to module "commons-math-legacy-core". --- .../org/apache/commons/math4/legacy/core}/IntegerSequence.java | 2 +- .../apache/commons/math4/legacy/core}/IntegerSequenceTest.java | 2 +- .../analysis/integration/BaseAbstractUnivariateIntegrator.java | 2 +- .../legacy/analysis/solvers/BaseAbstractUnivariateSolver.java | 2 +- .../analysis/solvers/FieldBracketingNthOrderBrentSolver.java | 2 +- .../math4/legacy/fitting/leastsquares/GaussNewtonOptimizer.java | 2 +- .../math4/legacy/fitting/leastsquares/LeastSquaresAdapter.java | 2 +- .../math4/legacy/fitting/leastsquares/LeastSquaresFactory.java | 2 +- .../fitting/leastsquares/LevenbergMarquardtOptimizer.java | 2 +- .../apache/commons/math4/legacy/linear/IterationManager.java | 2 +- .../commons/math4/legacy/linear/IterativeLinearSolver.java | 2 +- .../legacy/linear/PreconditionedIterativeLinearSolver.java | 2 +- .../java/org/apache/commons/math4/legacy/linear/SymmLQ.java | 2 +- .../commons/math4/legacy/ode/AbstractFieldIntegrator.java | 2 +- .../org/apache/commons/math4/legacy/ode/AbstractIntegrator.java | 2 +- .../commons/math4/legacy/optim/AbstractOptimizationProblem.java | 2 +- .../org/apache/commons/math4/legacy/optim/BaseOptimizer.java | 2 +- .../apache/commons/math4/legacy/optim/OptimizationProblem.java | 2 +- .../commons/math4/legacy/optim/univariate/BracketFinder.java | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) rename {commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/util => commons-math-legacy-core/src/main/java/org/apache/commons/math4/legacy/core}/IntegerSequence.java (99%) rename {commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/util => commons-math-legacy-core/src/test/java/org/apache/commons/math4/legacy/core}/IntegerSequenceTest.java (99%) diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/util/IntegerSequence.java b/commons-math-legacy-core/src/main/java/org/apache/commons/math4/legacy/core/IntegerSequence.java similarity index 99% rename from commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/util/IntegerSequence.java rename to commons-math-legacy-core/src/main/java/org/apache/commons/math4/legacy/core/IntegerSequence.java index c41ff6a5d..1e2d88a9f 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/util/IntegerSequence.java +++ b/commons-math-legacy-core/src/main/java/org/apache/commons/math4/legacy/core/IntegerSequence.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; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/util/IntegerSequenceTest.java b/commons-math-legacy-core/src/test/java/org/apache/commons/math4/legacy/core/IntegerSequenceTest.java similarity index 99% rename from commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/util/IntegerSequenceTest.java rename to commons-math-legacy-core/src/test/java/org/apache/commons/math4/legacy/core/IntegerSequenceTest.java index b862b1db1..11e84e8c9 100644 --- a/commons-math-legacy/src/test/java/org/apache/commons/math4/legacy/util/IntegerSequenceTest.java +++ b/commons-math-legacy-core/src/test/java/org/apache/commons/math4/legacy/core/IntegerSequenceTest.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 java.util.List; import java.util.ArrayList; diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/BaseAbstractUnivariateIntegrator.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/BaseAbstractUnivariateIntegrator.java index 8c9e75044..b4f4345e8 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/BaseAbstractUnivariateIntegrator.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/integration/BaseAbstractUnivariateIntegrator.java @@ -23,7 +23,7 @@ import org.apache.commons.math4.legacy.exception.MaxCountExceededException; import org.apache.commons.math4.legacy.exception.NotStrictlyPositiveException; import org.apache.commons.math4.legacy.exception.NumberIsTooSmallException; import org.apache.commons.math4.legacy.exception.TooManyEvaluationsException; -import org.apache.commons.math4.legacy.util.IntegerSequence; +import org.apache.commons.math4.legacy.core.IntegerSequence; /** * Provide a default implementation for several generic functions. diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/solvers/BaseAbstractUnivariateSolver.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/solvers/BaseAbstractUnivariateSolver.java index 5585beb33..d8e5629c2 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/solvers/BaseAbstractUnivariateSolver.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/solvers/BaseAbstractUnivariateSolver.java @@ -21,7 +21,7 @@ import org.apache.commons.math4.legacy.analysis.UnivariateFunction; import org.apache.commons.math4.legacy.exception.NullArgumentException; import org.apache.commons.math4.legacy.exception.MaxCountExceededException; import org.apache.commons.math4.legacy.exception.TooManyEvaluationsException; -import org.apache.commons.math4.legacy.util.IntegerSequence; +import org.apache.commons.math4.legacy.core.IntegerSequence; /** * Provide a default implementation for several functions useful to generic diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/solvers/FieldBracketingNthOrderBrentSolver.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/solvers/FieldBracketingNthOrderBrentSolver.java index 05d0ef017..de9176aa4 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/solvers/FieldBracketingNthOrderBrentSolver.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/analysis/solvers/FieldBracketingNthOrderBrentSolver.java @@ -24,7 +24,7 @@ import org.apache.commons.math4.legacy.exception.MathInternalError; import org.apache.commons.math4.legacy.exception.NoBracketingException; import org.apache.commons.math4.legacy.exception.NullArgumentException; import org.apache.commons.math4.legacy.exception.NumberIsTooSmallException; -import org.apache.commons.math4.legacy.util.IntegerSequence; +import org.apache.commons.math4.legacy.core.IntegerSequence; import org.apache.commons.math4.legacy.core.MathArrays; import org.apache.commons.numbers.core.Precision; 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 27c546acf..f052a4b72 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 @@ -31,7 +31,7 @@ import org.apache.commons.math4.legacy.linear.RealVector; 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.util.IntegerSequence; +import org.apache.commons.math4.legacy.core.IntegerSequence; import org.apache.commons.math4.legacy.util.Pair; /** diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/fitting/leastsquares/LeastSquaresAdapter.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/fitting/leastsquares/LeastSquaresAdapter.java index 906104324..74228a074 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/fitting/leastsquares/LeastSquaresAdapter.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/fitting/leastsquares/LeastSquaresAdapter.java @@ -18,7 +18,7 @@ package org.apache.commons.math4.legacy.fitting.leastsquares; import org.apache.commons.math4.legacy.linear.RealVector; import org.apache.commons.math4.legacy.optim.ConvergenceChecker; -import org.apache.commons.math4.legacy.util.IntegerSequence; +import org.apache.commons.math4.legacy.core.IntegerSequence; /** * An adapter that delegates to another implementation of {@link LeastSquaresProblem}. 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 07af54297..9283baeb1 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 @@ -31,7 +31,7 @@ import org.apache.commons.math4.legacy.optim.AbstractOptimizationProblem; 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.util.IntegerSequence; +import org.apache.commons.math4.legacy.core.IntegerSequence; import org.apache.commons.math4.legacy.util.Pair; /** diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/fitting/leastsquares/LevenbergMarquardtOptimizer.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/fitting/leastsquares/LevenbergMarquardtOptimizer.java index a44caad2c..2ca7e2ce1 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/fitting/leastsquares/LevenbergMarquardtOptimizer.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/fitting/leastsquares/LevenbergMarquardtOptimizer.java @@ -25,7 +25,7 @@ import org.apache.commons.math4.legacy.linear.ArrayRealVector; import org.apache.commons.math4.legacy.linear.RealMatrix; import org.apache.commons.math4.legacy.optim.ConvergenceChecker; import org.apache.commons.math4.legacy.core.jdkmath.AccurateMath; -import org.apache.commons.math4.legacy.util.IntegerSequence; +import org.apache.commons.math4.legacy.core.IntegerSequence; import org.apache.commons.numbers.core.Precision; diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/IterationManager.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/IterationManager.java index 38844e72f..fb56695de 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/IterationManager.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/IterationManager.java @@ -16,7 +16,7 @@ */ package org.apache.commons.math4.legacy.linear; -import org.apache.commons.math4.legacy.util.IntegerSequence; +import org.apache.commons.math4.legacy.core.IntegerSequence; import java.util.Collection; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/IterativeLinearSolver.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/IterativeLinearSolver.java index caf6a3a16..fd07c332e 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/IterativeLinearSolver.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/IterativeLinearSolver.java @@ -19,7 +19,7 @@ package org.apache.commons.math4.legacy.linear; import org.apache.commons.math4.legacy.exception.DimensionMismatchException; import org.apache.commons.math4.legacy.exception.MaxCountExceededException; import org.apache.commons.math4.legacy.exception.NullArgumentException; -import org.apache.commons.math4.legacy.util.IntegerSequence; +import org.apache.commons.math4.legacy.core.IntegerSequence; /** * This abstract class defines an iterative solver for the linear system A diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/PreconditionedIterativeLinearSolver.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/PreconditionedIterativeLinearSolver.java index d8aad6480..0c5502c85 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/PreconditionedIterativeLinearSolver.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/PreconditionedIterativeLinearSolver.java @@ -19,7 +19,7 @@ package org.apache.commons.math4.legacy.linear; import org.apache.commons.math4.legacy.exception.DimensionMismatchException; import org.apache.commons.math4.legacy.exception.MaxCountExceededException; import org.apache.commons.math4.legacy.exception.NullArgumentException; -import org.apache.commons.math4.legacy.util.IntegerSequence; +import org.apache.commons.math4.legacy.core.IntegerSequence; /** *

diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/SymmLQ.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/SymmLQ.java index ce31ce3f7..adea2e23f 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/SymmLQ.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/linear/SymmLQ.java @@ -21,7 +21,7 @@ import org.apache.commons.math4.legacy.exception.MaxCountExceededException; import org.apache.commons.math4.legacy.exception.NullArgumentException; import org.apache.commons.math4.legacy.exception.util.ExceptionContext; import org.apache.commons.math4.legacy.core.jdkmath.AccurateMath; -import org.apache.commons.math4.legacy.util.IntegerSequence; +import org.apache.commons.math4.legacy.core.IntegerSequence; /** *

diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/AbstractFieldIntegrator.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/AbstractFieldIntegrator.java index 0781387d7..8b7ba2933 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/AbstractFieldIntegrator.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/AbstractFieldIntegrator.java @@ -40,7 +40,7 @@ import org.apache.commons.math4.legacy.ode.events.FieldEventState; import org.apache.commons.math4.legacy.ode.sampling.AbstractFieldStepInterpolator; import org.apache.commons.math4.legacy.ode.sampling.FieldStepHandler; import org.apache.commons.math4.legacy.core.jdkmath.AccurateMath; -import org.apache.commons.math4.legacy.util.IntegerSequence; +import org.apache.commons.math4.legacy.core.IntegerSequence; /** * Base class managing common boilerplate for all integrators. diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/AbstractIntegrator.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/AbstractIntegrator.java index af2e3a350..25f1c1615 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/AbstractIntegrator.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/ode/AbstractIntegrator.java @@ -38,7 +38,7 @@ import org.apache.commons.math4.legacy.ode.events.EventState; import org.apache.commons.math4.legacy.ode.sampling.AbstractStepInterpolator; import org.apache.commons.math4.legacy.ode.sampling.StepHandler; import org.apache.commons.math4.legacy.core.jdkmath.AccurateMath; -import org.apache.commons.math4.legacy.util.IntegerSequence; +import org.apache.commons.math4.legacy.core.IntegerSequence; import org.apache.commons.numbers.core.Precision; /** diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/AbstractOptimizationProblem.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/AbstractOptimizationProblem.java index 4e736b8b4..aeb254059 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/AbstractOptimizationProblem.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/AbstractOptimizationProblem.java @@ -18,7 +18,7 @@ package org.apache.commons.math4.legacy.optim; import org.apache.commons.math4.legacy.exception.TooManyEvaluationsException; import org.apache.commons.math4.legacy.exception.TooManyIterationsException; -import org.apache.commons.math4.legacy.util.IntegerSequence; +import org.apache.commons.math4.legacy.core.IntegerSequence; /** * Base class for implementing optimization problems. It contains the boiler-plate code diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/BaseOptimizer.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/BaseOptimizer.java index 19a4e2cc2..70e816a5a 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/BaseOptimizer.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/BaseOptimizer.java @@ -18,7 +18,7 @@ package org.apache.commons.math4.legacy.optim; import org.apache.commons.math4.legacy.exception.TooManyEvaluationsException; import org.apache.commons.math4.legacy.exception.TooManyIterationsException; -import org.apache.commons.math4.legacy.util.IntegerSequence; +import org.apache.commons.math4.legacy.core.IntegerSequence; /** * Base class for implementing optimizers. diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/OptimizationProblem.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/OptimizationProblem.java index df71d08fb..ebadb5c4f 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/OptimizationProblem.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/OptimizationProblem.java @@ -16,7 +16,7 @@ */ package org.apache.commons.math4.legacy.optim; -import org.apache.commons.math4.legacy.util.IntegerSequence; +import org.apache.commons.math4.legacy.core.IntegerSequence; /** * Common settings for all optimization problems. Includes divergence and convergence diff --git a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/univariate/BracketFinder.java b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/univariate/BracketFinder.java index 4aff72ed0..7dd4c2e3c 100644 --- a/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/univariate/BracketFinder.java +++ b/commons-math-legacy/src/main/java/org/apache/commons/math4/legacy/optim/univariate/BracketFinder.java @@ -22,7 +22,7 @@ import org.apache.commons.math4.legacy.exception.NotStrictlyPositiveException; import org.apache.commons.math4.legacy.exception.TooManyEvaluationsException; import org.apache.commons.math4.legacy.optim.nonlinear.scalar.GoalType; import org.apache.commons.math4.legacy.core.jdkmath.AccurateMath; -import org.apache.commons.math4.legacy.util.IntegerSequence.Incrementor; +import org.apache.commons.math4.legacy.core.IntegerSequence.Incrementor; /** * Provide an interval that brackets a local optimum of a function.