diff --git a/src/main/java/org/apache/commons/math/ConvergenceException.java b/src/main/java/org/apache/commons/math/ConvergenceException.java index 0c7f9255c..ed13ee51b 100644 --- a/src/main/java/org/apache/commons/math/ConvergenceException.java +++ b/src/main/java/org/apache/commons/math/ConvergenceException.java @@ -16,9 +16,9 @@ */ package org.apache.commons.math; -import org.apache.commons.math.util.DummyLocalizable; -import org.apache.commons.math.util.Localizable; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.DummyLocalizable; +import org.apache.commons.math.exception.Localizable; +import org.apache.commons.math.exception.LocalizedFormats; /** * Error thrown when a numerical computation can not be performed because the diff --git a/src/main/java/org/apache/commons/math/DimensionMismatchException.java b/src/main/java/org/apache/commons/math/DimensionMismatchException.java index c3db815c8..ae30bffa7 100644 --- a/src/main/java/org/apache/commons/math/DimensionMismatchException.java +++ b/src/main/java/org/apache/commons/math/DimensionMismatchException.java @@ -16,7 +16,7 @@ */ package org.apache.commons.math; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Error thrown when two dimensions differ. diff --git a/src/main/java/org/apache/commons/math/DuplicateSampleAbscissaException.java b/src/main/java/org/apache/commons/math/DuplicateSampleAbscissaException.java index 3ce78a091..83e43b7c2 100644 --- a/src/main/java/org/apache/commons/math/DuplicateSampleAbscissaException.java +++ b/src/main/java/org/apache/commons/math/DuplicateSampleAbscissaException.java @@ -16,7 +16,7 @@ */ package org.apache.commons.math; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Exception thrown when a sample contains several entries at the same abscissa. diff --git a/src/main/java/org/apache/commons/math/FunctionEvaluationException.java b/src/main/java/org/apache/commons/math/FunctionEvaluationException.java index 8352d6620..ec1de7c36 100644 --- a/src/main/java/org/apache/commons/math/FunctionEvaluationException.java +++ b/src/main/java/org/apache/commons/math/FunctionEvaluationException.java @@ -16,10 +16,10 @@ */ package org.apache.commons.math; +import org.apache.commons.math.exception.DummyLocalizable; +import org.apache.commons.math.exception.Localizable; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.linear.ArrayRealVector; -import org.apache.commons.math.util.DummyLocalizable; -import org.apache.commons.math.util.Localizable; -import org.apache.commons.math.util.LocalizedFormats; /** * Exception thrown when an error occurs evaluating a function. diff --git a/src/main/java/org/apache/commons/math/MathConfigurationException.java b/src/main/java/org/apache/commons/math/MathConfigurationException.java index 42e8f4b6f..21ee6030e 100644 --- a/src/main/java/org/apache/commons/math/MathConfigurationException.java +++ b/src/main/java/org/apache/commons/math/MathConfigurationException.java @@ -18,8 +18,8 @@ package org.apache.commons.math; import java.io.Serializable; -import org.apache.commons.math.util.DummyLocalizable; -import org.apache.commons.math.util.Localizable; +import org.apache.commons.math.exception.DummyLocalizable; +import org.apache.commons.math.exception.Localizable; /** * Signals a configuration problem with any of the factory methods. diff --git a/src/main/java/org/apache/commons/math/MathException.java b/src/main/java/org/apache/commons/math/MathException.java index 4facae0ea..28b6a04b8 100644 --- a/src/main/java/org/apache/commons/math/MathException.java +++ b/src/main/java/org/apache/commons/math/MathException.java @@ -21,9 +21,9 @@ import java.io.PrintWriter; import java.text.MessageFormat; import java.util.Locale; -import org.apache.commons.math.util.DummyLocalizable; -import org.apache.commons.math.util.Localizable; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.DummyLocalizable; +import org.apache.commons.math.exception.Localizable; +import org.apache.commons.math.exception.LocalizedFormats; /** diff --git a/src/main/java/org/apache/commons/math/MathRuntimeException.java b/src/main/java/org/apache/commons/math/MathRuntimeException.java index 581873086..b2135de56 100644 --- a/src/main/java/org/apache/commons/math/MathRuntimeException.java +++ b/src/main/java/org/apache/commons/math/MathRuntimeException.java @@ -26,9 +26,9 @@ import java.util.ConcurrentModificationException; import java.util.Locale; import java.util.NoSuchElementException; -import org.apache.commons.math.util.DummyLocalizable; -import org.apache.commons.math.util.Localizable; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.DummyLocalizable; +import org.apache.commons.math.exception.Localizable; +import org.apache.commons.math.exception.LocalizedFormats; /** * Base class for commons-math unchecked exceptions. diff --git a/src/main/java/org/apache/commons/math/MaxEvaluationsExceededException.java b/src/main/java/org/apache/commons/math/MaxEvaluationsExceededException.java index d054cb174..02e601fec 100644 --- a/src/main/java/org/apache/commons/math/MaxEvaluationsExceededException.java +++ b/src/main/java/org/apache/commons/math/MaxEvaluationsExceededException.java @@ -18,9 +18,9 @@ package org.apache.commons.math; import org.apache.commons.math.ConvergenceException; -import org.apache.commons.math.util.DummyLocalizable; -import org.apache.commons.math.util.Localizable; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.DummyLocalizable; +import org.apache.commons.math.exception.Localizable; +import org.apache.commons.math.exception.LocalizedFormats; /** * Error thrown when a numerical computation exceeds its allowed diff --git a/src/main/java/org/apache/commons/math/MaxIterationsExceededException.java b/src/main/java/org/apache/commons/math/MaxIterationsExceededException.java index a3ade62d7..dbc809f50 100644 --- a/src/main/java/org/apache/commons/math/MaxIterationsExceededException.java +++ b/src/main/java/org/apache/commons/math/MaxIterationsExceededException.java @@ -18,9 +18,9 @@ package org.apache.commons.math; import org.apache.commons.math.ConvergenceException; -import org.apache.commons.math.util.DummyLocalizable; -import org.apache.commons.math.util.Localizable; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.DummyLocalizable; +import org.apache.commons.math.exception.Localizable; +import org.apache.commons.math.exception.LocalizedFormats; /** * Error thrown when a numerical computation exceeds its allowed diff --git a/src/main/java/org/apache/commons/math/analysis/integration/LegendreGaussIntegrator.java b/src/main/java/org/apache/commons/math/analysis/integration/LegendreGaussIntegrator.java index 894f0711f..352719478 100644 --- a/src/main/java/org/apache/commons/math/analysis/integration/LegendreGaussIntegrator.java +++ b/src/main/java/org/apache/commons/math/analysis/integration/LegendreGaussIntegrator.java @@ -21,7 +21,7 @@ import org.apache.commons.math.FunctionEvaluationException; import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.MaxIterationsExceededException; import org.apache.commons.math.analysis.UnivariateRealFunction; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Implements the diff --git a/src/main/java/org/apache/commons/math/analysis/integration/RombergIntegrator.java b/src/main/java/org/apache/commons/math/analysis/integration/RombergIntegrator.java index 679517ff5..8d4adf090 100644 --- a/src/main/java/org/apache/commons/math/analysis/integration/RombergIntegrator.java +++ b/src/main/java/org/apache/commons/math/analysis/integration/RombergIntegrator.java @@ -20,7 +20,7 @@ import org.apache.commons.math.FunctionEvaluationException; import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.MaxIterationsExceededException; import org.apache.commons.math.analysis.UnivariateRealFunction; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Implements the diff --git a/src/main/java/org/apache/commons/math/analysis/integration/SimpsonIntegrator.java b/src/main/java/org/apache/commons/math/analysis/integration/SimpsonIntegrator.java index 306299c06..6d888030c 100644 --- a/src/main/java/org/apache/commons/math/analysis/integration/SimpsonIntegrator.java +++ b/src/main/java/org/apache/commons/math/analysis/integration/SimpsonIntegrator.java @@ -20,7 +20,7 @@ import org.apache.commons.math.FunctionEvaluationException; import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.MaxIterationsExceededException; import org.apache.commons.math.analysis.UnivariateRealFunction; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Implements the diff --git a/src/main/java/org/apache/commons/math/analysis/integration/TrapezoidIntegrator.java b/src/main/java/org/apache/commons/math/analysis/integration/TrapezoidIntegrator.java index 808143add..8842624e5 100644 --- a/src/main/java/org/apache/commons/math/analysis/integration/TrapezoidIntegrator.java +++ b/src/main/java/org/apache/commons/math/analysis/integration/TrapezoidIntegrator.java @@ -20,7 +20,7 @@ import org.apache.commons.math.FunctionEvaluationException; import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.MaxIterationsExceededException; import org.apache.commons.math.analysis.UnivariateRealFunction; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Implements the diff --git a/src/main/java/org/apache/commons/math/analysis/integration/UnivariateRealIntegratorImpl.java b/src/main/java/org/apache/commons/math/analysis/integration/UnivariateRealIntegratorImpl.java index 0a43c06d6..f384da34e 100644 --- a/src/main/java/org/apache/commons/math/analysis/integration/UnivariateRealIntegratorImpl.java +++ b/src/main/java/org/apache/commons/math/analysis/integration/UnivariateRealIntegratorImpl.java @@ -19,7 +19,7 @@ package org.apache.commons.math.analysis.integration; import org.apache.commons.math.ConvergingAlgorithmImpl; import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.analysis.UnivariateRealFunction; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Provide a default implementation for several generic functions. diff --git a/src/main/java/org/apache/commons/math/analysis/interpolation/LinearInterpolator.java b/src/main/java/org/apache/commons/math/analysis/interpolation/LinearInterpolator.java index 85e0cb39a..d3f0c12f6 100644 --- a/src/main/java/org/apache/commons/math/analysis/interpolation/LinearInterpolator.java +++ b/src/main/java/org/apache/commons/math/analysis/interpolation/LinearInterpolator.java @@ -17,11 +17,11 @@ package org.apache.commons.math.analysis.interpolation; import org.apache.commons.math.exception.DimensionMismatchException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.exception.NumberIsTooSmallException; import org.apache.commons.math.analysis.polynomials.PolynomialFunction; import org.apache.commons.math.analysis.polynomials.PolynomialSplineFunction; import org.apache.commons.math.util.MathUtils; -import org.apache.commons.math.util.LocalizedFormats; /** * Implements a linear function for interpolation of real univariate functions. diff --git a/src/main/java/org/apache/commons/math/analysis/interpolation/LoessInterpolator.java b/src/main/java/org/apache/commons/math/analysis/interpolation/LoessInterpolator.java index 79c81a3a6..1e1a8cd75 100644 --- a/src/main/java/org/apache/commons/math/analysis/interpolation/LoessInterpolator.java +++ b/src/main/java/org/apache/commons/math/analysis/interpolation/LoessInterpolator.java @@ -21,8 +21,8 @@ import java.util.Arrays; import org.apache.commons.math.MathException; import org.apache.commons.math.analysis.polynomials.PolynomialSplineFunction; -import org.apache.commons.math.util.Localizable; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.Localizable; +import org.apache.commons.math.exception.LocalizedFormats; /** * Implements the diff --git a/src/main/java/org/apache/commons/math/analysis/interpolation/SmoothingBicubicSplineInterpolator.java b/src/main/java/org/apache/commons/math/analysis/interpolation/SmoothingBicubicSplineInterpolator.java index f3918af9a..d07507c6b 100644 --- a/src/main/java/org/apache/commons/math/analysis/interpolation/SmoothingBicubicSplineInterpolator.java +++ b/src/main/java/org/apache/commons/math/analysis/interpolation/SmoothingBicubicSplineInterpolator.java @@ -19,11 +19,11 @@ package org.apache.commons.math.analysis.interpolation; import org.apache.commons.math.DimensionMismatchException; import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.MathException; -import org.apache.commons.math.util.LocalizedFormats; import org.apache.commons.math.util.MathUtils; import org.apache.commons.math.util.MathUtils.OrderDirection; import org.apache.commons.math.analysis.UnivariateRealFunction; import org.apache.commons.math.analysis.polynomials.PolynomialSplineFunction; +import org.apache.commons.math.exception.LocalizedFormats; /** * Generates a bicubic interpolation function. diff --git a/src/main/java/org/apache/commons/math/analysis/interpolation/SplineInterpolator.java b/src/main/java/org/apache/commons/math/analysis/interpolation/SplineInterpolator.java index 723d7285b..35bddff54 100644 --- a/src/main/java/org/apache/commons/math/analysis/interpolation/SplineInterpolator.java +++ b/src/main/java/org/apache/commons/math/analysis/interpolation/SplineInterpolator.java @@ -17,11 +17,11 @@ package org.apache.commons.math.analysis.interpolation; import org.apache.commons.math.exception.DimensionMismatchException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.exception.NumberIsTooSmallException; import org.apache.commons.math.analysis.polynomials.PolynomialFunction; import org.apache.commons.math.analysis.polynomials.PolynomialSplineFunction; import org.apache.commons.math.util.MathUtils; -import org.apache.commons.math.util.LocalizedFormats; /** * Computes a natural (also known as "free", "unclamped") cubic spline interpolation for the data set. diff --git a/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunction.java b/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunction.java index e8bb08180..bd57a3b02 100644 --- a/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunction.java +++ b/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunction.java @@ -19,10 +19,10 @@ package org.apache.commons.math.analysis.polynomials; import java.io.Serializable; import java.util.Arrays; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.exception.NoDataException; import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction; import org.apache.commons.math.analysis.UnivariateRealFunction; -import org.apache.commons.math.util.LocalizedFormats; /** * Immutable representation of a real polynomial function with real coefficients. diff --git a/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionLagrangeForm.java b/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionLagrangeForm.java index 0976a9736..ce77ac164 100644 --- a/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionLagrangeForm.java +++ b/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionLagrangeForm.java @@ -20,7 +20,7 @@ import org.apache.commons.math.DuplicateSampleAbscissaException; import org.apache.commons.math.FunctionEvaluationException; import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.analysis.UnivariateRealFunction; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Implements the representation of a real polynomial function in diff --git a/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionNewtonForm.java b/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionNewtonForm.java index b33cc6881..6573285d5 100644 --- a/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionNewtonForm.java +++ b/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionNewtonForm.java @@ -19,7 +19,7 @@ package org.apache.commons.math.analysis.polynomials; import org.apache.commons.math.FunctionEvaluationException; import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.analysis.UnivariateRealFunction; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Implements the representation of a real polynomial function in diff --git a/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunction.java b/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunction.java index f03aec7c4..d32561bbe 100644 --- a/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunction.java +++ b/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunction.java @@ -22,7 +22,7 @@ import org.apache.commons.math.ArgumentOutsideDomainException; import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction; import org.apache.commons.math.analysis.UnivariateRealFunction; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Represents a polynomial spline function. diff --git a/src/main/java/org/apache/commons/math/analysis/solvers/BrentSolver.java b/src/main/java/org/apache/commons/math/analysis/solvers/BrentSolver.java index 430b7747e..70f2b4184 100644 --- a/src/main/java/org/apache/commons/math/analysis/solvers/BrentSolver.java +++ b/src/main/java/org/apache/commons/math/analysis/solvers/BrentSolver.java @@ -21,7 +21,7 @@ import org.apache.commons.math.FunctionEvaluationException; import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.MaxIterationsExceededException; import org.apache.commons.math.analysis.UnivariateRealFunction; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Implements the diff --git a/src/main/java/org/apache/commons/math/analysis/solvers/LaguerreSolver.java b/src/main/java/org/apache/commons/math/analysis/solvers/LaguerreSolver.java index 3d54ad63c..f5650ade5 100644 --- a/src/main/java/org/apache/commons/math/analysis/solvers/LaguerreSolver.java +++ b/src/main/java/org/apache/commons/math/analysis/solvers/LaguerreSolver.java @@ -23,7 +23,7 @@ import org.apache.commons.math.MaxIterationsExceededException; import org.apache.commons.math.analysis.UnivariateRealFunction; import org.apache.commons.math.analysis.polynomials.PolynomialFunction; import org.apache.commons.math.complex.Complex; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Implements the diff --git a/src/main/java/org/apache/commons/math/analysis/solvers/NewtonSolver.java b/src/main/java/org/apache/commons/math/analysis/solvers/NewtonSolver.java index d9a64c589..5b81d1035 100644 --- a/src/main/java/org/apache/commons/math/analysis/solvers/NewtonSolver.java +++ b/src/main/java/org/apache/commons/math/analysis/solvers/NewtonSolver.java @@ -22,7 +22,7 @@ import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.MaxIterationsExceededException; import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction; import org.apache.commons.math.analysis.UnivariateRealFunction; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Implements diff --git a/src/main/java/org/apache/commons/math/analysis/solvers/SecantSolver.java b/src/main/java/org/apache/commons/math/analysis/solvers/SecantSolver.java index dd58b1b8f..8bb7724ef 100644 --- a/src/main/java/org/apache/commons/math/analysis/solvers/SecantSolver.java +++ b/src/main/java/org/apache/commons/math/analysis/solvers/SecantSolver.java @@ -21,7 +21,7 @@ import org.apache.commons.math.FunctionEvaluationException; import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.MaxIterationsExceededException; import org.apache.commons.math.analysis.UnivariateRealFunction; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** diff --git a/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverImpl.java b/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverImpl.java index 83c1fdc7c..5f12cb6ab 100644 --- a/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverImpl.java +++ b/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverImpl.java @@ -21,7 +21,7 @@ import org.apache.commons.math.ConvergingAlgorithmImpl; import org.apache.commons.math.FunctionEvaluationException; import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.analysis.UnivariateRealFunction; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Provide a default implementation for several functions useful to generic diff --git a/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverUtils.java b/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverUtils.java index 576996648..b66a40b92 100644 --- a/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverUtils.java +++ b/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverUtils.java @@ -20,7 +20,7 @@ import org.apache.commons.math.FunctionEvaluationException; import org.apache.commons.math.ConvergenceException; import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.analysis.UnivariateRealFunction; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Utility routines for {@link UnivariateRealSolver} objects. diff --git a/src/main/java/org/apache/commons/math/complex/Complex.java b/src/main/java/org/apache/commons/math/complex/Complex.java index c1c61de90..f2c6a2f6d 100644 --- a/src/main/java/org/apache/commons/math/complex/Complex.java +++ b/src/main/java/org/apache/commons/math/complex/Complex.java @@ -23,7 +23,7 @@ import java.util.List; import org.apache.commons.math.FieldElement; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.util.MathUtils; /** diff --git a/src/main/java/org/apache/commons/math/complex/ComplexFormat.java b/src/main/java/org/apache/commons/math/complex/ComplexFormat.java index 514e974ed..b57062503 100644 --- a/src/main/java/org/apache/commons/math/complex/ComplexFormat.java +++ b/src/main/java/org/apache/commons/math/complex/ComplexFormat.java @@ -24,8 +24,8 @@ import java.text.ParsePosition; import java.util.Locale; import org.apache.commons.math.MathRuntimeException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.util.CompositeFormat; -import org.apache.commons.math.util.LocalizedFormats; /** * Formats a Complex number in cartesian format "Re(c) + Im(c)i". 'i' can diff --git a/src/main/java/org/apache/commons/math/complex/ComplexUtils.java b/src/main/java/org/apache/commons/math/complex/ComplexUtils.java index 160b425f8..346575216 100644 --- a/src/main/java/org/apache/commons/math/complex/ComplexUtils.java +++ b/src/main/java/org/apache/commons/math/complex/ComplexUtils.java @@ -18,7 +18,7 @@ package org.apache.commons.math.complex; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Static implementations of common diff --git a/src/main/java/org/apache/commons/math/distribution/AbstractContinuousDistribution.java b/src/main/java/org/apache/commons/math/distribution/AbstractContinuousDistribution.java index bffff6cec..944997fc8 100644 --- a/src/main/java/org/apache/commons/math/distribution/AbstractContinuousDistribution.java +++ b/src/main/java/org/apache/commons/math/distribution/AbstractContinuousDistribution.java @@ -25,8 +25,8 @@ import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.analysis.UnivariateRealFunction; import org.apache.commons.math.analysis.solvers.BrentSolver; import org.apache.commons.math.analysis.solvers.UnivariateRealSolverUtils; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.random.RandomDataImpl; -import org.apache.commons.math.util.LocalizedFormats; /** * Base class for continuous distributions. Default implementations are diff --git a/src/main/java/org/apache/commons/math/distribution/AbstractDistribution.java b/src/main/java/org/apache/commons/math/distribution/AbstractDistribution.java index 696351c87..de7fe4844 100644 --- a/src/main/java/org/apache/commons/math/distribution/AbstractDistribution.java +++ b/src/main/java/org/apache/commons/math/distribution/AbstractDistribution.java @@ -20,7 +20,7 @@ import java.io.Serializable; import org.apache.commons.math.MathException; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Base class for probability distributions. diff --git a/src/main/java/org/apache/commons/math/distribution/AbstractIntegerDistribution.java b/src/main/java/org/apache/commons/math/distribution/AbstractIntegerDistribution.java index fdd52e2a9..230a121fb 100644 --- a/src/main/java/org/apache/commons/math/distribution/AbstractIntegerDistribution.java +++ b/src/main/java/org/apache/commons/math/distribution/AbstractIntegerDistribution.java @@ -21,8 +21,8 @@ import java.io.Serializable; import org.apache.commons.math.FunctionEvaluationException; import org.apache.commons.math.MathException; import org.apache.commons.math.MathRuntimeException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.random.RandomDataImpl; -import org.apache.commons.math.util.LocalizedFormats; /** diff --git a/src/main/java/org/apache/commons/math/distribution/BetaDistributionImpl.java b/src/main/java/org/apache/commons/math/distribution/BetaDistributionImpl.java index 0d224412b..1d1373dcc 100644 --- a/src/main/java/org/apache/commons/math/distribution/BetaDistributionImpl.java +++ b/src/main/java/org/apache/commons/math/distribution/BetaDistributionImpl.java @@ -18,9 +18,9 @@ package org.apache.commons.math.distribution; import org.apache.commons.math.MathException; import org.apache.commons.math.MathRuntimeException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.special.Gamma; import org.apache.commons.math.special.Beta; -import org.apache.commons.math.util.LocalizedFormats; /** * Implements the Beta distribution. diff --git a/src/main/java/org/apache/commons/math/distribution/BinomialDistributionImpl.java b/src/main/java/org/apache/commons/math/distribution/BinomialDistributionImpl.java index 564b4c01d..700c6feb8 100644 --- a/src/main/java/org/apache/commons/math/distribution/BinomialDistributionImpl.java +++ b/src/main/java/org/apache/commons/math/distribution/BinomialDistributionImpl.java @@ -20,8 +20,8 @@ import java.io.Serializable; import org.apache.commons.math.MathException; import org.apache.commons.math.MathRuntimeException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.special.Beta; -import org.apache.commons.math.util.LocalizedFormats; /** * The default implementation of {@link BinomialDistribution}. diff --git a/src/main/java/org/apache/commons/math/distribution/CauchyDistributionImpl.java b/src/main/java/org/apache/commons/math/distribution/CauchyDistributionImpl.java index 129176412..342b3af5d 100644 --- a/src/main/java/org/apache/commons/math/distribution/CauchyDistributionImpl.java +++ b/src/main/java/org/apache/commons/math/distribution/CauchyDistributionImpl.java @@ -20,7 +20,7 @@ package org.apache.commons.math.distribution; import java.io.Serializable; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Default implementation of diff --git a/src/main/java/org/apache/commons/math/distribution/ExponentialDistributionImpl.java b/src/main/java/org/apache/commons/math/distribution/ExponentialDistributionImpl.java index 80a4f7fed..ff1882d0c 100644 --- a/src/main/java/org/apache/commons/math/distribution/ExponentialDistributionImpl.java +++ b/src/main/java/org/apache/commons/math/distribution/ExponentialDistributionImpl.java @@ -20,7 +20,7 @@ import java.io.Serializable; import org.apache.commons.math.MathException; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * The default implementation of {@link ExponentialDistribution}. diff --git a/src/main/java/org/apache/commons/math/distribution/FDistributionImpl.java b/src/main/java/org/apache/commons/math/distribution/FDistributionImpl.java index 5e88cb853..0b87d110e 100644 --- a/src/main/java/org/apache/commons/math/distribution/FDistributionImpl.java +++ b/src/main/java/org/apache/commons/math/distribution/FDistributionImpl.java @@ -20,8 +20,8 @@ import java.io.Serializable; import org.apache.commons.math.MathException; import org.apache.commons.math.MathRuntimeException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.special.Beta; -import org.apache.commons.math.util.LocalizedFormats; /** * Default implementation of diff --git a/src/main/java/org/apache/commons/math/distribution/GammaDistributionImpl.java b/src/main/java/org/apache/commons/math/distribution/GammaDistributionImpl.java index 7ac64fd10..38607e051 100644 --- a/src/main/java/org/apache/commons/math/distribution/GammaDistributionImpl.java +++ b/src/main/java/org/apache/commons/math/distribution/GammaDistributionImpl.java @@ -20,8 +20,8 @@ import java.io.Serializable; import org.apache.commons.math.MathException; import org.apache.commons.math.MathRuntimeException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.special.Gamma; -import org.apache.commons.math.util.LocalizedFormats; /** * The default implementation of {@link GammaDistribution}. diff --git a/src/main/java/org/apache/commons/math/distribution/HypergeometricDistributionImpl.java b/src/main/java/org/apache/commons/math/distribution/HypergeometricDistributionImpl.java index 6a484bc40..4eb3c749e 100644 --- a/src/main/java/org/apache/commons/math/distribution/HypergeometricDistributionImpl.java +++ b/src/main/java/org/apache/commons/math/distribution/HypergeometricDistributionImpl.java @@ -20,7 +20,7 @@ package org.apache.commons.math.distribution; import java.io.Serializable; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.util.MathUtils; /** diff --git a/src/main/java/org/apache/commons/math/distribution/NormalDistributionImpl.java b/src/main/java/org/apache/commons/math/distribution/NormalDistributionImpl.java index e4b4e663e..db3636e59 100644 --- a/src/main/java/org/apache/commons/math/distribution/NormalDistributionImpl.java +++ b/src/main/java/org/apache/commons/math/distribution/NormalDistributionImpl.java @@ -22,8 +22,8 @@ import java.io.Serializable; import org.apache.commons.math.MathException; import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.MaxIterationsExceededException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.special.Erf; -import org.apache.commons.math.util.LocalizedFormats; /** * Default implementation of diff --git a/src/main/java/org/apache/commons/math/distribution/PascalDistributionImpl.java b/src/main/java/org/apache/commons/math/distribution/PascalDistributionImpl.java index 8a71c137a..0038baa28 100644 --- a/src/main/java/org/apache/commons/math/distribution/PascalDistributionImpl.java +++ b/src/main/java/org/apache/commons/math/distribution/PascalDistributionImpl.java @@ -20,8 +20,8 @@ import java.io.Serializable; import org.apache.commons.math.MathException; import org.apache.commons.math.MathRuntimeException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.special.Beta; -import org.apache.commons.math.util.LocalizedFormats; import org.apache.commons.math.util.MathUtils; /** diff --git a/src/main/java/org/apache/commons/math/distribution/PoissonDistributionImpl.java b/src/main/java/org/apache/commons/math/distribution/PoissonDistributionImpl.java index cdc4f127f..7c4300dca 100644 --- a/src/main/java/org/apache/commons/math/distribution/PoissonDistributionImpl.java +++ b/src/main/java/org/apache/commons/math/distribution/PoissonDistributionImpl.java @@ -20,8 +20,8 @@ import java.io.Serializable; import org.apache.commons.math.MathException; import org.apache.commons.math.MathRuntimeException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.special.Gamma; -import org.apache.commons.math.util.LocalizedFormats; import org.apache.commons.math.util.MathUtils; /** diff --git a/src/main/java/org/apache/commons/math/distribution/TDistributionImpl.java b/src/main/java/org/apache/commons/math/distribution/TDistributionImpl.java index c16186c98..239597d84 100644 --- a/src/main/java/org/apache/commons/math/distribution/TDistributionImpl.java +++ b/src/main/java/org/apache/commons/math/distribution/TDistributionImpl.java @@ -20,9 +20,9 @@ import java.io.Serializable; import org.apache.commons.math.MathException; import org.apache.commons.math.MathRuntimeException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.special.Beta; import org.apache.commons.math.special.Gamma; -import org.apache.commons.math.util.LocalizedFormats; /** * Default implementation of diff --git a/src/main/java/org/apache/commons/math/distribution/WeibullDistributionImpl.java b/src/main/java/org/apache/commons/math/distribution/WeibullDistributionImpl.java index 30cedd3d8..d483c6cf1 100644 --- a/src/main/java/org/apache/commons/math/distribution/WeibullDistributionImpl.java +++ b/src/main/java/org/apache/commons/math/distribution/WeibullDistributionImpl.java @@ -20,7 +20,7 @@ package org.apache.commons.math.distribution; import java.io.Serializable; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Default implementation of diff --git a/src/main/java/org/apache/commons/math/distribution/ZipfDistributionImpl.java b/src/main/java/org/apache/commons/math/distribution/ZipfDistributionImpl.java index 457d8d1ba..db78748cb 100644 --- a/src/main/java/org/apache/commons/math/distribution/ZipfDistributionImpl.java +++ b/src/main/java/org/apache/commons/math/distribution/ZipfDistributionImpl.java @@ -20,7 +20,7 @@ package org.apache.commons.math.distribution; import java.io.Serializable; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Implementation for the {@link ZipfDistribution}. diff --git a/src/main/java/org/apache/commons/math/estimation/AbstractEstimator.java b/src/main/java/org/apache/commons/math/estimation/AbstractEstimator.java index eaefc5783..167b5deee 100644 --- a/src/main/java/org/apache/commons/math/estimation/AbstractEstimator.java +++ b/src/main/java/org/apache/commons/math/estimation/AbstractEstimator.java @@ -19,11 +19,11 @@ package org.apache.commons.math.estimation; import java.util.Arrays; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.linear.InvalidMatrixException; import org.apache.commons.math.linear.LUDecompositionImpl; import org.apache.commons.math.linear.MatrixUtils; import org.apache.commons.math.linear.RealMatrix; -import org.apache.commons.math.util.LocalizedFormats; /** * Base class for implementing estimators. diff --git a/src/main/java/org/apache/commons/math/estimation/EstimationException.java b/src/main/java/org/apache/commons/math/estimation/EstimationException.java index 012fe9947..0ee1e6825 100644 --- a/src/main/java/org/apache/commons/math/estimation/EstimationException.java +++ b/src/main/java/org/apache/commons/math/estimation/EstimationException.java @@ -18,8 +18,8 @@ package org.apache.commons.math.estimation; import org.apache.commons.math.MathException; -import org.apache.commons.math.util.DummyLocalizable; -import org.apache.commons.math.util.Localizable; +import org.apache.commons.math.exception.DummyLocalizable; +import org.apache.commons.math.exception.Localizable; /** * This class represents exceptions thrown by the estimation solvers. diff --git a/src/main/java/org/apache/commons/math/estimation/GaussNewtonEstimator.java b/src/main/java/org/apache/commons/math/estimation/GaussNewtonEstimator.java index 078432b38..3e3ca31f3 100644 --- a/src/main/java/org/apache/commons/math/estimation/GaussNewtonEstimator.java +++ b/src/main/java/org/apache/commons/math/estimation/GaussNewtonEstimator.java @@ -19,13 +19,13 @@ package org.apache.commons.math.estimation; import java.io.Serializable; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.linear.InvalidMatrixException; import org.apache.commons.math.linear.LUDecompositionImpl; import org.apache.commons.math.linear.MatrixUtils; import org.apache.commons.math.linear.RealMatrix; import org.apache.commons.math.linear.RealVector; import org.apache.commons.math.linear.ArrayRealVector; -import org.apache.commons.math.util.LocalizedFormats; /** * This class implements a solver for estimation problems. diff --git a/src/main/java/org/apache/commons/math/estimation/LevenbergMarquardtEstimator.java b/src/main/java/org/apache/commons/math/estimation/LevenbergMarquardtEstimator.java index 44d802b52..1e747f693 100644 --- a/src/main/java/org/apache/commons/math/estimation/LevenbergMarquardtEstimator.java +++ b/src/main/java/org/apache/commons/math/estimation/LevenbergMarquardtEstimator.java @@ -19,7 +19,7 @@ package org.apache.commons.math.estimation; import java.io.Serializable; import java.util.Arrays; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** diff --git a/src/main/java/org/apache/commons/math/exception/DimensionMismatchException.java b/src/main/java/org/apache/commons/math/exception/DimensionMismatchException.java index 91c4ffa8f..70933b1ac 100644 --- a/src/main/java/org/apache/commons/math/exception/DimensionMismatchException.java +++ b/src/main/java/org/apache/commons/math/exception/DimensionMismatchException.java @@ -16,7 +16,6 @@ */ package org.apache.commons.math.exception; -import org.apache.commons.math.util.LocalizedFormats; /** * Exception to be thrown when two dimensions differ. diff --git a/src/main/java/org/apache/commons/math/util/DummyLocalizable.java b/src/main/java/org/apache/commons/math/exception/DummyLocalizable.java similarity index 97% rename from src/main/java/org/apache/commons/math/util/DummyLocalizable.java rename to src/main/java/org/apache/commons/math/exception/DummyLocalizable.java index 9d37f42cc..b51e9d4ac 100644 --- a/src/main/java/org/apache/commons/math/util/DummyLocalizable.java +++ b/src/main/java/org/apache/commons/math/exception/DummyLocalizable.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.util; +package org.apache.commons.math.exception; import java.util.Locale; diff --git a/src/main/java/org/apache/commons/math/util/Localizable.java b/src/main/java/org/apache/commons/math/exception/Localizable.java similarity index 96% rename from src/main/java/org/apache/commons/math/util/Localizable.java rename to src/main/java/org/apache/commons/math/exception/Localizable.java index a3e12fe89..8d754fa27 100644 --- a/src/main/java/org/apache/commons/math/util/Localizable.java +++ b/src/main/java/org/apache/commons/math/exception/Localizable.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.util; +package org.apache.commons.math.exception; import java.io.Serializable; import java.util.Locale; diff --git a/src/main/java/org/apache/commons/math/util/LocalizedFormats.java b/src/main/java/org/apache/commons/math/exception/LocalizedFormats.java similarity index 99% rename from src/main/java/org/apache/commons/math/util/LocalizedFormats.java rename to src/main/java/org/apache/commons/math/exception/LocalizedFormats.java index b6228efb9..a44802531 100644 --- a/src/main/java/org/apache/commons/math/util/LocalizedFormats.java +++ b/src/main/java/org/apache/commons/math/exception/LocalizedFormats.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.util; +package org.apache.commons.math.exception; import java.util.Locale; import java.util.MissingResourceException; diff --git a/src/main/java/org/apache/commons/math/exception/MathIllegalArgumentException.java b/src/main/java/org/apache/commons/math/exception/MathIllegalArgumentException.java index 632d8f6ac..738d82c4d 100644 --- a/src/main/java/org/apache/commons/math/exception/MathIllegalArgumentException.java +++ b/src/main/java/org/apache/commons/math/exception/MathIllegalArgumentException.java @@ -19,7 +19,6 @@ package org.apache.commons.math.exception; import java.util.Locale; import java.util.List; import java.util.ArrayList; -import org.apache.commons.math.util.Localizable; /** * Base class for all preconditions violation exceptions. diff --git a/src/main/java/org/apache/commons/math/exception/MathIllegalNumberException.java b/src/main/java/org/apache/commons/math/exception/MathIllegalNumberException.java index dbba30201..5382630d8 100644 --- a/src/main/java/org/apache/commons/math/exception/MathIllegalNumberException.java +++ b/src/main/java/org/apache/commons/math/exception/MathIllegalNumberException.java @@ -16,7 +16,6 @@ */ package org.apache.commons.math.exception; -import org.apache.commons.math.util.Localizable; /** * Base class for exceptions raised by a wrong number. diff --git a/src/main/java/org/apache/commons/math/exception/MessageFactory.java b/src/main/java/org/apache/commons/math/exception/MessageFactory.java index 9a08cdee1..2d371c7c8 100644 --- a/src/main/java/org/apache/commons/math/exception/MessageFactory.java +++ b/src/main/java/org/apache/commons/math/exception/MessageFactory.java @@ -18,7 +18,6 @@ package org.apache.commons.math.exception; import java.text.MessageFormat; import java.util.Locale; -import org.apache.commons.math.util.Localizable; /** * Class for constructing localized messages. diff --git a/src/main/java/org/apache/commons/math/exception/NoDataException.java b/src/main/java/org/apache/commons/math/exception/NoDataException.java index 6f3a1a0b6..2b14824ca 100644 --- a/src/main/java/org/apache/commons/math/exception/NoDataException.java +++ b/src/main/java/org/apache/commons/math/exception/NoDataException.java @@ -16,8 +16,6 @@ */ package org.apache.commons.math.exception; -import org.apache.commons.math.util.Localizable; -import org.apache.commons.math.util.LocalizedFormats; /** * Exception to be thrown when the required data is missing. diff --git a/src/main/java/org/apache/commons/math/exception/NonMonotonousSequenceException.java b/src/main/java/org/apache/commons/math/exception/NonMonotonousSequenceException.java index 5c902a2dc..d6ae92c78 100644 --- a/src/main/java/org/apache/commons/math/exception/NonMonotonousSequenceException.java +++ b/src/main/java/org/apache/commons/math/exception/NonMonotonousSequenceException.java @@ -16,7 +16,6 @@ */ package org.apache.commons.math.exception; -import org.apache.commons.math.util.LocalizedFormats; import org.apache.commons.math.util.MathUtils; /** diff --git a/src/main/java/org/apache/commons/math/exception/NotPositiveException.java b/src/main/java/org/apache/commons/math/exception/NotPositiveException.java index 20998b202..55b56e844 100644 --- a/src/main/java/org/apache/commons/math/exception/NotPositiveException.java +++ b/src/main/java/org/apache/commons/math/exception/NotPositiveException.java @@ -16,7 +16,6 @@ */ package org.apache.commons.math.exception; -import org.apache.commons.math.util.Localizable; /** * Exception to be thrown when the argument is negative. diff --git a/src/main/java/org/apache/commons/math/exception/NotStrictlyPositiveException.java b/src/main/java/org/apache/commons/math/exception/NotStrictlyPositiveException.java index 3a3e23d8e..70a654205 100644 --- a/src/main/java/org/apache/commons/math/exception/NotStrictlyPositiveException.java +++ b/src/main/java/org/apache/commons/math/exception/NotStrictlyPositiveException.java @@ -16,7 +16,6 @@ */ package org.apache.commons.math.exception; -import org.apache.commons.math.util.Localizable; /** * Exception to be thrown when the argument is negative. diff --git a/src/main/java/org/apache/commons/math/exception/NumberIsTooLargeException.java b/src/main/java/org/apache/commons/math/exception/NumberIsTooLargeException.java index 0b6fba7b1..9c66dc117 100644 --- a/src/main/java/org/apache/commons/math/exception/NumberIsTooLargeException.java +++ b/src/main/java/org/apache/commons/math/exception/NumberIsTooLargeException.java @@ -16,8 +16,6 @@ */ package org.apache.commons.math.exception; -import org.apache.commons.math.util.Localizable; -import org.apache.commons.math.util.LocalizedFormats; /** * Exception to be thrown when a number is too large. diff --git a/src/main/java/org/apache/commons/math/exception/NumberIsTooSmallException.java b/src/main/java/org/apache/commons/math/exception/NumberIsTooSmallException.java index d4833cf98..a846ff4dd 100644 --- a/src/main/java/org/apache/commons/math/exception/NumberIsTooSmallException.java +++ b/src/main/java/org/apache/commons/math/exception/NumberIsTooSmallException.java @@ -16,8 +16,6 @@ */ package org.apache.commons.math.exception; -import org.apache.commons.math.util.Localizable; -import org.apache.commons.math.util.LocalizedFormats; /** * Exception to be thrown when a number is too small. diff --git a/src/main/java/org/apache/commons/math/exception/OutOfRangeException.java b/src/main/java/org/apache/commons/math/exception/OutOfRangeException.java index 59c07d4d3..eecfc6602 100644 --- a/src/main/java/org/apache/commons/math/exception/OutOfRangeException.java +++ b/src/main/java/org/apache/commons/math/exception/OutOfRangeException.java @@ -16,7 +16,6 @@ */ package org.apache.commons.math.exception; -import org.apache.commons.math.util.LocalizedFormats; /** * Exception to be thrown when some argument is out of range. diff --git a/src/main/java/org/apache/commons/math/exception/ZeroNotAllowedException.java b/src/main/java/org/apache/commons/math/exception/ZeroNotAllowedException.java index 126fe53ee..d0a24db8d 100644 --- a/src/main/java/org/apache/commons/math/exception/ZeroNotAllowedException.java +++ b/src/main/java/org/apache/commons/math/exception/ZeroNotAllowedException.java @@ -16,8 +16,6 @@ */ package org.apache.commons.math.exception; -import org.apache.commons.math.util.Localizable; -import org.apache.commons.math.util.LocalizedFormats; /** * Exception to be thrown when zero is provided where it is not allowed. diff --git a/src/main/java/org/apache/commons/math/exception/package.html b/src/main/java/org/apache/commons/math/exception/package.html index c4e29c93d..bbfed051b 100644 --- a/src/main/java/org/apache/commons/math/exception/package.html +++ b/src/main/java/org/apache/commons/math/exception/package.html @@ -17,6 +17,7 @@ --> - Specialized exceptions for algorithms errors. + Specialized exceptions for algorithms errors. The exceptions can be localized + using simple java properties. diff --git a/src/main/java/org/apache/commons/math/fraction/AbstractFormat.java b/src/main/java/org/apache/commons/math/fraction/AbstractFormat.java index ea155e3ee..29dc0afd1 100644 --- a/src/main/java/org/apache/commons/math/fraction/AbstractFormat.java +++ b/src/main/java/org/apache/commons/math/fraction/AbstractFormat.java @@ -24,7 +24,7 @@ import java.text.ParsePosition; import java.util.Locale; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Common part shared by both {@link FractionFormat} and {@link BigFractionFormat}. diff --git a/src/main/java/org/apache/commons/math/fraction/BigFraction.java b/src/main/java/org/apache/commons/math/fraction/BigFraction.java index fdfd180ab..941d09e2c 100644 --- a/src/main/java/org/apache/commons/math/fraction/BigFraction.java +++ b/src/main/java/org/apache/commons/math/fraction/BigFraction.java @@ -22,7 +22,7 @@ import java.math.BigInteger; import org.apache.commons.math.FieldElement; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.util.MathUtils; /** diff --git a/src/main/java/org/apache/commons/math/fraction/BigFractionFormat.java b/src/main/java/org/apache/commons/math/fraction/BigFractionFormat.java index 638731b35..a17f52e16 100644 --- a/src/main/java/org/apache/commons/math/fraction/BigFractionFormat.java +++ b/src/main/java/org/apache/commons/math/fraction/BigFractionFormat.java @@ -26,7 +26,7 @@ import java.text.ParsePosition; import java.util.Locale; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Formats a BigFraction number in proper format or improper format. diff --git a/src/main/java/org/apache/commons/math/fraction/Fraction.java b/src/main/java/org/apache/commons/math/fraction/Fraction.java index 8c614c6b6..67f53e5a3 100644 --- a/src/main/java/org/apache/commons/math/fraction/Fraction.java +++ b/src/main/java/org/apache/commons/math/fraction/Fraction.java @@ -21,7 +21,7 @@ import java.math.BigInteger; import org.apache.commons.math.FieldElement; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.util.MathUtils; /** diff --git a/src/main/java/org/apache/commons/math/fraction/FractionConversionException.java b/src/main/java/org/apache/commons/math/fraction/FractionConversionException.java index 838662320..1d89a66ec 100644 --- a/src/main/java/org/apache/commons/math/fraction/FractionConversionException.java +++ b/src/main/java/org/apache/commons/math/fraction/FractionConversionException.java @@ -18,7 +18,7 @@ package org.apache.commons.math.fraction; import org.apache.commons.math.ConvergenceException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Error thrown when a double value cannot be converted to a fraction diff --git a/src/main/java/org/apache/commons/math/fraction/FractionFormat.java b/src/main/java/org/apache/commons/math/fraction/FractionFormat.java index c019e5e2d..52f0a4f94 100644 --- a/src/main/java/org/apache/commons/math/fraction/FractionFormat.java +++ b/src/main/java/org/apache/commons/math/fraction/FractionFormat.java @@ -25,7 +25,7 @@ import java.util.Locale; import org.apache.commons.math.ConvergenceException; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Formats a Fraction number in proper format or improper format. The number diff --git a/src/main/java/org/apache/commons/math/fraction/ProperBigFractionFormat.java b/src/main/java/org/apache/commons/math/fraction/ProperBigFractionFormat.java index cbaef2c83..d5ad09176 100644 --- a/src/main/java/org/apache/commons/math/fraction/ProperBigFractionFormat.java +++ b/src/main/java/org/apache/commons/math/fraction/ProperBigFractionFormat.java @@ -22,7 +22,7 @@ import java.text.NumberFormat; import java.text.ParsePosition; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Formats a BigFraction number in proper format. The number format for each of diff --git a/src/main/java/org/apache/commons/math/fraction/ProperFractionFormat.java b/src/main/java/org/apache/commons/math/fraction/ProperFractionFormat.java index f40192f19..c83436384 100644 --- a/src/main/java/org/apache/commons/math/fraction/ProperFractionFormat.java +++ b/src/main/java/org/apache/commons/math/fraction/ProperFractionFormat.java @@ -21,7 +21,7 @@ import java.text.NumberFormat; import java.text.ParsePosition; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.util.MathUtils; /** diff --git a/src/main/java/org/apache/commons/math/genetics/ListPopulation.java b/src/main/java/org/apache/commons/math/genetics/ListPopulation.java index 3799e47df..f2c6d6214 100644 --- a/src/main/java/org/apache/commons/math/genetics/ListPopulation.java +++ b/src/main/java/org/apache/commons/math/genetics/ListPopulation.java @@ -20,9 +20,9 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.exception.NotPositiveException; import org.apache.commons.math.exception.NumberIsTooLargeException; -import org.apache.commons.math.util.LocalizedFormats; /** * Population of chromosomes represented by a {@link List}. diff --git a/src/main/java/org/apache/commons/math/genetics/RandomKeyMutation.java b/src/main/java/org/apache/commons/math/genetics/RandomKeyMutation.java index bbb0cb88f..8d7ddf8e4 100644 --- a/src/main/java/org/apache/commons/math/genetics/RandomKeyMutation.java +++ b/src/main/java/org/apache/commons/math/genetics/RandomKeyMutation.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Mutation operator for {@link RandomKey}s. Changes a randomly chosen element diff --git a/src/main/java/org/apache/commons/math/geometry/CardanEulerSingularityException.java b/src/main/java/org/apache/commons/math/geometry/CardanEulerSingularityException.java index 0c6210ed7..43bdcce94 100644 --- a/src/main/java/org/apache/commons/math/geometry/CardanEulerSingularityException.java +++ b/src/main/java/org/apache/commons/math/geometry/CardanEulerSingularityException.java @@ -18,7 +18,7 @@ package org.apache.commons.math.geometry; import org.apache.commons.math.MathException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** This class represents exceptions thrown while extractiong Cardan * or Euler angles from a rotation. diff --git a/src/main/java/org/apache/commons/math/geometry/NotARotationMatrixException.java b/src/main/java/org/apache/commons/math/geometry/NotARotationMatrixException.java index 579b18691..6ec5ac4a3 100644 --- a/src/main/java/org/apache/commons/math/geometry/NotARotationMatrixException.java +++ b/src/main/java/org/apache/commons/math/geometry/NotARotationMatrixException.java @@ -18,7 +18,7 @@ package org.apache.commons.math.geometry; import org.apache.commons.math.MathException; -import org.apache.commons.math.util.Localizable; +import org.apache.commons.math.exception.Localizable; /** * This class represents exceptions thrown while building rotations diff --git a/src/main/java/org/apache/commons/math/geometry/Rotation.java b/src/main/java/org/apache/commons/math/geometry/Rotation.java index a05579431..7cf362a88 100644 --- a/src/main/java/org/apache/commons/math/geometry/Rotation.java +++ b/src/main/java/org/apache/commons/math/geometry/Rotation.java @@ -20,7 +20,7 @@ package org.apache.commons.math.geometry; import java.io.Serializable; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * This class implements rotations in a three-dimensional space. diff --git a/src/main/java/org/apache/commons/math/geometry/Vector3D.java b/src/main/java/org/apache/commons/math/geometry/Vector3D.java index 25e11a014..b8ea63342 100644 --- a/src/main/java/org/apache/commons/math/geometry/Vector3D.java +++ b/src/main/java/org/apache/commons/math/geometry/Vector3D.java @@ -20,7 +20,7 @@ package org.apache.commons.math.geometry; import java.io.Serializable; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.util.MathUtils; /** diff --git a/src/main/java/org/apache/commons/math/geometry/Vector3DFormat.java b/src/main/java/org/apache/commons/math/geometry/Vector3DFormat.java index d4e74bc44..4426c7c9c 100644 --- a/src/main/java/org/apache/commons/math/geometry/Vector3DFormat.java +++ b/src/main/java/org/apache/commons/math/geometry/Vector3DFormat.java @@ -24,8 +24,8 @@ import java.text.ParsePosition; import java.util.Locale; import org.apache.commons.math.MathRuntimeException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.util.CompositeFormat; -import org.apache.commons.math.util.LocalizedFormats; /** * Formats a 3D vector in components list format "{x; y; z}". diff --git a/src/main/java/org/apache/commons/math/linear/AbstractFieldMatrix.java b/src/main/java/org/apache/commons/math/linear/AbstractFieldMatrix.java index a412b4b3a..6f4bc7ca8 100644 --- a/src/main/java/org/apache/commons/math/linear/AbstractFieldMatrix.java +++ b/src/main/java/org/apache/commons/math/linear/AbstractFieldMatrix.java @@ -23,7 +23,7 @@ import java.util.Arrays; import org.apache.commons.math.Field; import org.apache.commons.math.FieldElement; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Basic implementation of {@link FieldMatrix} methods regardless of the underlying storage. diff --git a/src/main/java/org/apache/commons/math/linear/AbstractRealMatrix.java b/src/main/java/org/apache/commons/math/linear/AbstractRealMatrix.java index 45df22629..87c09e59e 100644 --- a/src/main/java/org/apache/commons/math/linear/AbstractRealMatrix.java +++ b/src/main/java/org/apache/commons/math/linear/AbstractRealMatrix.java @@ -18,7 +18,7 @@ package org.apache.commons.math.linear; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.util.MathUtils; /** diff --git a/src/main/java/org/apache/commons/math/linear/AbstractRealVector.java b/src/main/java/org/apache/commons/math/linear/AbstractRealVector.java index 72f4aa177..7f94e7e9a 100644 --- a/src/main/java/org/apache/commons/math/linear/AbstractRealVector.java +++ b/src/main/java/org/apache/commons/math/linear/AbstractRealVector.java @@ -25,7 +25,7 @@ import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.analysis.BinaryFunction; import org.apache.commons.math.analysis.ComposableFunction; import org.apache.commons.math.analysis.UnivariateRealFunction; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * This class provides default basic implementations for many methods in the diff --git a/src/main/java/org/apache/commons/math/linear/Array2DRowFieldMatrix.java b/src/main/java/org/apache/commons/math/linear/Array2DRowFieldMatrix.java index 72bc466a6..a7571af16 100644 --- a/src/main/java/org/apache/commons/math/linear/Array2DRowFieldMatrix.java +++ b/src/main/java/org/apache/commons/math/linear/Array2DRowFieldMatrix.java @@ -22,7 +22,7 @@ import java.io.Serializable; import org.apache.commons.math.Field; import org.apache.commons.math.FieldElement; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Implementation of FieldMatrix using a {@link FieldElement}[][] array to store entries. diff --git a/src/main/java/org/apache/commons/math/linear/Array2DRowRealMatrix.java b/src/main/java/org/apache/commons/math/linear/Array2DRowRealMatrix.java index 94e10d151..3c5dc16e8 100644 --- a/src/main/java/org/apache/commons/math/linear/Array2DRowRealMatrix.java +++ b/src/main/java/org/apache/commons/math/linear/Array2DRowRealMatrix.java @@ -20,7 +20,7 @@ package org.apache.commons.math.linear; import java.io.Serializable; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Implementation of RealMatrix using a double[][] array to store entries and diff --git a/src/main/java/org/apache/commons/math/linear/ArrayFieldVector.java b/src/main/java/org/apache/commons/math/linear/ArrayFieldVector.java index 9b7dbae79..ea638c6d1 100644 --- a/src/main/java/org/apache/commons/math/linear/ArrayFieldVector.java +++ b/src/main/java/org/apache/commons/math/linear/ArrayFieldVector.java @@ -23,7 +23,7 @@ import java.util.Arrays; import org.apache.commons.math.Field; import org.apache.commons.math.FieldElement; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * This class implements the {@link FieldVector} interface with a {@link FieldElement} array. diff --git a/src/main/java/org/apache/commons/math/linear/ArrayRealVector.java b/src/main/java/org/apache/commons/math/linear/ArrayRealVector.java index 5a5123e2a..23356e40b 100644 --- a/src/main/java/org/apache/commons/math/linear/ArrayRealVector.java +++ b/src/main/java/org/apache/commons/math/linear/ArrayRealVector.java @@ -21,7 +21,7 @@ import java.util.Arrays; import java.util.Iterator; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.util.MathUtils; /** diff --git a/src/main/java/org/apache/commons/math/linear/BigMatrixImpl.java b/src/main/java/org/apache/commons/math/linear/BigMatrixImpl.java index 8155fcae6..b303acddd 100644 --- a/src/main/java/org/apache/commons/math/linear/BigMatrixImpl.java +++ b/src/main/java/org/apache/commons/math/linear/BigMatrixImpl.java @@ -20,7 +20,7 @@ import java.io.Serializable; import java.math.BigDecimal; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Implementation of {@link BigMatrix} using a BigDecimal[][] array to store entries diff --git a/src/main/java/org/apache/commons/math/linear/BlockFieldMatrix.java b/src/main/java/org/apache/commons/math/linear/BlockFieldMatrix.java index a2eaea350..7467acd54 100644 --- a/src/main/java/org/apache/commons/math/linear/BlockFieldMatrix.java +++ b/src/main/java/org/apache/commons/math/linear/BlockFieldMatrix.java @@ -22,7 +22,7 @@ import java.io.Serializable; import org.apache.commons.math.Field; import org.apache.commons.math.FieldElement; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Cache-friendly implementation of FieldMatrix using a flat arrays to store diff --git a/src/main/java/org/apache/commons/math/linear/BlockRealMatrix.java b/src/main/java/org/apache/commons/math/linear/BlockRealMatrix.java index 145f88352..e7601f657 100644 --- a/src/main/java/org/apache/commons/math/linear/BlockRealMatrix.java +++ b/src/main/java/org/apache/commons/math/linear/BlockRealMatrix.java @@ -21,7 +21,7 @@ import java.io.Serializable; import java.util.Arrays; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Cache-friendly implementation of RealMatrix using a flat arrays to store diff --git a/src/main/java/org/apache/commons/math/linear/CholeskyDecompositionImpl.java b/src/main/java/org/apache/commons/math/linear/CholeskyDecompositionImpl.java index bed62be26..982115d24 100644 --- a/src/main/java/org/apache/commons/math/linear/CholeskyDecompositionImpl.java +++ b/src/main/java/org/apache/commons/math/linear/CholeskyDecompositionImpl.java @@ -18,7 +18,7 @@ package org.apache.commons.math.linear; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** diff --git a/src/main/java/org/apache/commons/math/linear/EigenDecompositionImpl.java b/src/main/java/org/apache/commons/math/linear/EigenDecompositionImpl.java index a00888659..d1531a812 100644 --- a/src/main/java/org/apache/commons/math/linear/EigenDecompositionImpl.java +++ b/src/main/java/org/apache/commons/math/linear/EigenDecompositionImpl.java @@ -19,7 +19,7 @@ package org.apache.commons.math.linear; import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.MaxIterationsExceededException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.util.MathUtils; /** diff --git a/src/main/java/org/apache/commons/math/linear/FieldLUDecompositionImpl.java b/src/main/java/org/apache/commons/math/linear/FieldLUDecompositionImpl.java index f835c6a73..3c21354d5 100644 --- a/src/main/java/org/apache/commons/math/linear/FieldLUDecompositionImpl.java +++ b/src/main/java/org/apache/commons/math/linear/FieldLUDecompositionImpl.java @@ -22,7 +22,7 @@ import java.lang.reflect.Array; import org.apache.commons.math.Field; import org.apache.commons.math.FieldElement; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Calculates the LUP-decomposition of a square matrix. diff --git a/src/main/java/org/apache/commons/math/linear/InvalidMatrixException.java b/src/main/java/org/apache/commons/math/linear/InvalidMatrixException.java index dcd0bdec8..683a5e9c9 100644 --- a/src/main/java/org/apache/commons/math/linear/InvalidMatrixException.java +++ b/src/main/java/org/apache/commons/math/linear/InvalidMatrixException.java @@ -18,8 +18,8 @@ package org.apache.commons.math.linear; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.DummyLocalizable; -import org.apache.commons.math.util.Localizable; +import org.apache.commons.math.exception.DummyLocalizable; +import org.apache.commons.math.exception.Localizable; /** * Thrown when a system attempts an operation on a matrix, and diff --git a/src/main/java/org/apache/commons/math/linear/LUDecompositionImpl.java b/src/main/java/org/apache/commons/math/linear/LUDecompositionImpl.java index c5bdb07b0..afff790cb 100644 --- a/src/main/java/org/apache/commons/math/linear/LUDecompositionImpl.java +++ b/src/main/java/org/apache/commons/math/linear/LUDecompositionImpl.java @@ -18,7 +18,7 @@ package org.apache.commons.math.linear; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Calculates the LUP-decomposition of a square matrix. diff --git a/src/main/java/org/apache/commons/math/linear/MatrixIndexException.java b/src/main/java/org/apache/commons/math/linear/MatrixIndexException.java index d9cb11d35..c70c3739f 100644 --- a/src/main/java/org/apache/commons/math/linear/MatrixIndexException.java +++ b/src/main/java/org/apache/commons/math/linear/MatrixIndexException.java @@ -18,8 +18,8 @@ package org.apache.commons.math.linear; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.DummyLocalizable; -import org.apache.commons.math.util.Localizable; +import org.apache.commons.math.exception.DummyLocalizable; +import org.apache.commons.math.exception.Localizable; /** * Thrown when an operation addresses a matrix coordinate (row, col) diff --git a/src/main/java/org/apache/commons/math/linear/MatrixUtils.java b/src/main/java/org/apache/commons/math/linear/MatrixUtils.java index 875675223..bd3424e40 100644 --- a/src/main/java/org/apache/commons/math/linear/MatrixUtils.java +++ b/src/main/java/org/apache/commons/math/linear/MatrixUtils.java @@ -27,9 +27,9 @@ import java.util.Arrays; import org.apache.commons.math.Field; import org.apache.commons.math.FieldElement; import org.apache.commons.math.MathRuntimeException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.fraction.BigFraction; import org.apache.commons.math.fraction.Fraction; -import org.apache.commons.math.util.LocalizedFormats; /** * A collection of static methods that operate on or return matrices. diff --git a/src/main/java/org/apache/commons/math/linear/MatrixVisitorException.java b/src/main/java/org/apache/commons/math/linear/MatrixVisitorException.java index 737b50fcd..4696154ce 100644 --- a/src/main/java/org/apache/commons/math/linear/MatrixVisitorException.java +++ b/src/main/java/org/apache/commons/math/linear/MatrixVisitorException.java @@ -18,7 +18,7 @@ package org.apache.commons.math.linear; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.Localizable; +import org.apache.commons.math.exception.Localizable; /** * Thrown when a visitor encounters an error while processing a matrix entry. diff --git a/src/main/java/org/apache/commons/math/linear/NonSquareMatrixException.java b/src/main/java/org/apache/commons/math/linear/NonSquareMatrixException.java index c41e877c8..182967e56 100644 --- a/src/main/java/org/apache/commons/math/linear/NonSquareMatrixException.java +++ b/src/main/java/org/apache/commons/math/linear/NonSquareMatrixException.java @@ -17,7 +17,7 @@ package org.apache.commons.math.linear; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** diff --git a/src/main/java/org/apache/commons/math/linear/NotPositiveDefiniteMatrixException.java b/src/main/java/org/apache/commons/math/linear/NotPositiveDefiniteMatrixException.java index 492f00411..6b88447c1 100644 --- a/src/main/java/org/apache/commons/math/linear/NotPositiveDefiniteMatrixException.java +++ b/src/main/java/org/apache/commons/math/linear/NotPositiveDefiniteMatrixException.java @@ -18,7 +18,7 @@ package org.apache.commons.math.linear; import org.apache.commons.math.MathException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * This class represents exceptions thrown when a matrix expected to diff --git a/src/main/java/org/apache/commons/math/linear/NotSymmetricMatrixException.java b/src/main/java/org/apache/commons/math/linear/NotSymmetricMatrixException.java index 8e66d36ae..741dd159e 100644 --- a/src/main/java/org/apache/commons/math/linear/NotSymmetricMatrixException.java +++ b/src/main/java/org/apache/commons/math/linear/NotSymmetricMatrixException.java @@ -18,7 +18,7 @@ package org.apache.commons.math.linear; import org.apache.commons.math.MathException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * This class represents exceptions thrown when a matrix expected to diff --git a/src/main/java/org/apache/commons/math/linear/OpenMapRealVector.java b/src/main/java/org/apache/commons/math/linear/OpenMapRealVector.java index dc71e17d2..5416fabdf 100644 --- a/src/main/java/org/apache/commons/math/linear/OpenMapRealVector.java +++ b/src/main/java/org/apache/commons/math/linear/OpenMapRealVector.java @@ -19,7 +19,7 @@ package org.apache.commons.math.linear; import java.io.Serializable; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.util.OpenIntToDoubleHashMap; import org.apache.commons.math.util.OpenIntToDoubleHashMap.Iterator; diff --git a/src/main/java/org/apache/commons/math/linear/QRDecompositionImpl.java b/src/main/java/org/apache/commons/math/linear/QRDecompositionImpl.java index 28bf94605..32d82f413 100644 --- a/src/main/java/org/apache/commons/math/linear/QRDecompositionImpl.java +++ b/src/main/java/org/apache/commons/math/linear/QRDecompositionImpl.java @@ -20,7 +20,7 @@ package org.apache.commons.math.linear; import java.util.Arrays; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** diff --git a/src/main/java/org/apache/commons/math/linear/RealMatrixImpl.java b/src/main/java/org/apache/commons/math/linear/RealMatrixImpl.java index 392dee46c..fa0760898 100644 --- a/src/main/java/org/apache/commons/math/linear/RealMatrixImpl.java +++ b/src/main/java/org/apache/commons/math/linear/RealMatrixImpl.java @@ -20,7 +20,7 @@ package org.apache.commons.math.linear; import java.io.Serializable; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Implementation of RealMatrix using a double[][] array to store entries and diff --git a/src/main/java/org/apache/commons/math/linear/RealVectorFormat.java b/src/main/java/org/apache/commons/math/linear/RealVectorFormat.java index 93c23aaae..7a3e980eb 100644 --- a/src/main/java/org/apache/commons/math/linear/RealVectorFormat.java +++ b/src/main/java/org/apache/commons/math/linear/RealVectorFormat.java @@ -26,8 +26,8 @@ import java.util.List; import java.util.Locale; import org.apache.commons.math.MathRuntimeException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.util.CompositeFormat; -import org.apache.commons.math.util.LocalizedFormats; /** * Formats a vector in components list format "{v0; v1; ...; vk-1}". diff --git a/src/main/java/org/apache/commons/math/linear/SingularMatrixException.java b/src/main/java/org/apache/commons/math/linear/SingularMatrixException.java index 88f06f92a..a7f6b6b69 100644 --- a/src/main/java/org/apache/commons/math/linear/SingularMatrixException.java +++ b/src/main/java/org/apache/commons/math/linear/SingularMatrixException.java @@ -17,7 +17,7 @@ package org.apache.commons.math.linear; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** diff --git a/src/main/java/org/apache/commons/math/linear/SingularValueDecompositionImpl.java b/src/main/java/org/apache/commons/math/linear/SingularValueDecompositionImpl.java index 08d5b84ed..3abf3f0d8 100644 --- a/src/main/java/org/apache/commons/math/linear/SingularValueDecompositionImpl.java +++ b/src/main/java/org/apache/commons/math/linear/SingularValueDecompositionImpl.java @@ -18,7 +18,7 @@ package org.apache.commons.math.linear; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Calculates the compact Singular Value Decomposition of a matrix. diff --git a/src/main/java/org/apache/commons/math/linear/SparseFieldVector.java b/src/main/java/org/apache/commons/math/linear/SparseFieldVector.java index 8a087a9a2..22ca828ad 100644 --- a/src/main/java/org/apache/commons/math/linear/SparseFieldVector.java +++ b/src/main/java/org/apache/commons/math/linear/SparseFieldVector.java @@ -22,7 +22,7 @@ import java.lang.reflect.Array; import org.apache.commons.math.Field; import org.apache.commons.math.FieldElement; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.util.OpenIntToFieldHashMap; /** diff --git a/src/main/java/org/apache/commons/math/ode/AbstractIntegrator.java b/src/main/java/org/apache/commons/math/ode/AbstractIntegrator.java index d989e2cfd..422d9c0f9 100644 --- a/src/main/java/org/apache/commons/math/ode/AbstractIntegrator.java +++ b/src/main/java/org/apache/commons/math/ode/AbstractIntegrator.java @@ -22,11 +22,11 @@ import java.util.Collection; import java.util.Collections; import org.apache.commons.math.MaxEvaluationsExceededException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.ode.events.CombinedEventsManager; import org.apache.commons.math.ode.events.EventHandler; import org.apache.commons.math.ode.events.EventState; import org.apache.commons.math.ode.sampling.StepHandler; -import org.apache.commons.math.util.LocalizedFormats; /** * Base class managing common boilerplate for all integrators. diff --git a/src/main/java/org/apache/commons/math/ode/ContinuousOutputModel.java b/src/main/java/org/apache/commons/math/ode/ContinuousOutputModel.java index 02441dbea..8ce6ea0ee 100644 --- a/src/main/java/org/apache/commons/math/ode/ContinuousOutputModel.java +++ b/src/main/java/org/apache/commons/math/ode/ContinuousOutputModel.java @@ -22,9 +22,9 @@ import java.util.List; import java.io.Serializable; import org.apache.commons.math.MathRuntimeException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.ode.sampling.StepHandler; import org.apache.commons.math.ode.sampling.StepInterpolator; -import org.apache.commons.math.util.LocalizedFormats; /** * This class stores all information provided by an ODE integrator diff --git a/src/main/java/org/apache/commons/math/ode/DerivativeException.java b/src/main/java/org/apache/commons/math/ode/DerivativeException.java index 468c1684e..b233fb40b 100644 --- a/src/main/java/org/apache/commons/math/ode/DerivativeException.java +++ b/src/main/java/org/apache/commons/math/ode/DerivativeException.java @@ -18,8 +18,8 @@ package org.apache.commons.math.ode; import org.apache.commons.math.MathException; -import org.apache.commons.math.util.DummyLocalizable; -import org.apache.commons.math.util.Localizable; +import org.apache.commons.math.exception.DummyLocalizable; +import org.apache.commons.math.exception.Localizable; /** * This exception is made available to users to report diff --git a/src/main/java/org/apache/commons/math/ode/IntegratorException.java b/src/main/java/org/apache/commons/math/ode/IntegratorException.java index 75d65a47a..e489c2b48 100644 --- a/src/main/java/org/apache/commons/math/ode/IntegratorException.java +++ b/src/main/java/org/apache/commons/math/ode/IntegratorException.java @@ -18,7 +18,7 @@ package org.apache.commons.math.ode; import org.apache.commons.math.MathException; -import org.apache.commons.math.util.Localizable; +import org.apache.commons.math.exception.Localizable; /** * This exception is made available to users to report diff --git a/src/main/java/org/apache/commons/math/ode/MultistepIntegrator.java b/src/main/java/org/apache/commons/math/ode/MultistepIntegrator.java index 836b897ea..3ab0b7c53 100644 --- a/src/main/java/org/apache/commons/math/ode/MultistepIntegrator.java +++ b/src/main/java/org/apache/commons/math/ode/MultistepIntegrator.java @@ -18,13 +18,13 @@ package org.apache.commons.math.ode; import org.apache.commons.math.MathRuntimeException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.linear.Array2DRowRealMatrix; import org.apache.commons.math.linear.RealMatrix; import org.apache.commons.math.ode.nonstiff.AdaptiveStepsizeIntegrator; import org.apache.commons.math.ode.nonstiff.DormandPrince853Integrator; import org.apache.commons.math.ode.sampling.StepHandler; import org.apache.commons.math.ode.sampling.StepInterpolator; -import org.apache.commons.math.util.LocalizedFormats; /** * This class is the base class for multistep integrators for Ordinary diff --git a/src/main/java/org/apache/commons/math/ode/events/EventException.java b/src/main/java/org/apache/commons/math/ode/events/EventException.java index 3d62ef0e2..4165ee6c7 100644 --- a/src/main/java/org/apache/commons/math/ode/events/EventException.java +++ b/src/main/java/org/apache/commons/math/ode/events/EventException.java @@ -18,7 +18,7 @@ package org.apache.commons.math.ode.events; import org.apache.commons.math.MathException; -import org.apache.commons.math.util.Localizable; +import org.apache.commons.math.exception.Localizable; /** * This exception is made available to users to report diff --git a/src/main/java/org/apache/commons/math/ode/jacobians/FirstOrderIntegratorWithJacobians.java b/src/main/java/org/apache/commons/math/ode/jacobians/FirstOrderIntegratorWithJacobians.java index 3e193b114..98bcf15b0 100644 --- a/src/main/java/org/apache/commons/math/ode/jacobians/FirstOrderIntegratorWithJacobians.java +++ b/src/main/java/org/apache/commons/math/ode/jacobians/FirstOrderIntegratorWithJacobians.java @@ -26,6 +26,7 @@ import java.util.Collection; import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.MaxEvaluationsExceededException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.ode.DerivativeException; import org.apache.commons.math.ode.ExtendedFirstOrderDifferentialEquations; import org.apache.commons.math.ode.FirstOrderIntegrator; @@ -34,7 +35,6 @@ import org.apache.commons.math.ode.events.EventException; import org.apache.commons.math.ode.events.EventHandler; import org.apache.commons.math.ode.sampling.StepHandler; import org.apache.commons.math.ode.sampling.StepInterpolator; -import org.apache.commons.math.util.LocalizedFormats; /** This class enhances a first order integrator for differential equations to * compute also partial derivatives of the solution with respect to initial state diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/AdaptiveStepsizeIntegrator.java b/src/main/java/org/apache/commons/math/ode/nonstiff/AdaptiveStepsizeIntegrator.java index 46f47b9a7..647f3cae3 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/AdaptiveStepsizeIntegrator.java +++ b/src/main/java/org/apache/commons/math/ode/nonstiff/AdaptiveStepsizeIntegrator.java @@ -17,12 +17,12 @@ package org.apache.commons.math.ode.nonstiff; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.ode.AbstractIntegrator; import org.apache.commons.math.ode.DerivativeException; import org.apache.commons.math.ode.ExtendedFirstOrderDifferentialEquations; import org.apache.commons.math.ode.FirstOrderDifferentialEquations; import org.apache.commons.math.ode.IntegratorException; -import org.apache.commons.math.util.LocalizedFormats; /** * This abstract class holds the common part of all adaptive diff --git a/src/main/java/org/apache/commons/math/optimization/LeastSquaresConverter.java b/src/main/java/org/apache/commons/math/optimization/LeastSquaresConverter.java index 8ef7fc89a..1dc808e0d 100644 --- a/src/main/java/org/apache/commons/math/optimization/LeastSquaresConverter.java +++ b/src/main/java/org/apache/commons/math/optimization/LeastSquaresConverter.java @@ -21,8 +21,8 @@ import org.apache.commons.math.FunctionEvaluationException; import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.analysis.MultivariateRealFunction; import org.apache.commons.math.analysis.MultivariateVectorialFunction; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.linear.RealMatrix; -import org.apache.commons.math.util.LocalizedFormats; /** This class converts {@link MultivariateVectorialFunction vectorial * objective functions} to {@link MultivariateRealFunction scalar objective functions} diff --git a/src/main/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateRealOptimizer.java b/src/main/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateRealOptimizer.java index ea8768317..00fe80e50 100644 --- a/src/main/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateRealOptimizer.java +++ b/src/main/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateRealOptimizer.java @@ -23,8 +23,8 @@ import java.util.Comparator; import org.apache.commons.math.FunctionEvaluationException; import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.analysis.DifferentiableMultivariateRealFunction; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.random.RandomVectorGenerator; -import org.apache.commons.math.util.LocalizedFormats; /** * Special implementation of the {@link DifferentiableMultivariateRealOptimizer} interface adding diff --git a/src/main/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateVectorialOptimizer.java b/src/main/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateVectorialOptimizer.java index 12519e439..b1e598e5b 100644 --- a/src/main/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateVectorialOptimizer.java +++ b/src/main/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateVectorialOptimizer.java @@ -23,8 +23,8 @@ import java.util.Comparator; import org.apache.commons.math.FunctionEvaluationException; import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.analysis.DifferentiableMultivariateVectorialFunction; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.random.RandomVectorGenerator; -import org.apache.commons.math.util.LocalizedFormats; /** * Special implementation of the {@link DifferentiableMultivariateVectorialOptimizer} interface adding diff --git a/src/main/java/org/apache/commons/math/optimization/MultiStartMultivariateRealOptimizer.java b/src/main/java/org/apache/commons/math/optimization/MultiStartMultivariateRealOptimizer.java index 1354d713e..c594c77b0 100644 --- a/src/main/java/org/apache/commons/math/optimization/MultiStartMultivariateRealOptimizer.java +++ b/src/main/java/org/apache/commons/math/optimization/MultiStartMultivariateRealOptimizer.java @@ -23,8 +23,8 @@ import java.util.Comparator; import org.apache.commons.math.FunctionEvaluationException; import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.analysis.MultivariateRealFunction; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.random.RandomVectorGenerator; -import org.apache.commons.math.util.LocalizedFormats; /** * Special implementation of the {@link MultivariateRealOptimizer} interface adding diff --git a/src/main/java/org/apache/commons/math/optimization/MultiStartUnivariateRealOptimizer.java b/src/main/java/org/apache/commons/math/optimization/MultiStartUnivariateRealOptimizer.java index 26fd5e0ac..067675f95 100644 --- a/src/main/java/org/apache/commons/math/optimization/MultiStartUnivariateRealOptimizer.java +++ b/src/main/java/org/apache/commons/math/optimization/MultiStartUnivariateRealOptimizer.java @@ -21,8 +21,8 @@ import org.apache.commons.math.ConvergenceException; import org.apache.commons.math.FunctionEvaluationException; import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.analysis.UnivariateRealFunction; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.random.RandomGenerator; -import org.apache.commons.math.util.LocalizedFormats; /** * Special implementation of the {@link UnivariateRealOptimizer} interface adding diff --git a/src/main/java/org/apache/commons/math/optimization/OptimizationException.java b/src/main/java/org/apache/commons/math/optimization/OptimizationException.java index 81ca5e30c..ae85c0c7f 100644 --- a/src/main/java/org/apache/commons/math/optimization/OptimizationException.java +++ b/src/main/java/org/apache/commons/math/optimization/OptimizationException.java @@ -18,8 +18,8 @@ package org.apache.commons.math.optimization; import org.apache.commons.math.ConvergenceException; -import org.apache.commons.math.util.DummyLocalizable; -import org.apache.commons.math.util.Localizable; +import org.apache.commons.math.exception.DummyLocalizable; +import org.apache.commons.math.exception.Localizable; /** * This class represents exceptions thrown by optimizers. diff --git a/src/main/java/org/apache/commons/math/optimization/direct/DirectSearchOptimizer.java b/src/main/java/org/apache/commons/math/optimization/direct/DirectSearchOptimizer.java index 14a70c177..96dfea2a1 100644 --- a/src/main/java/org/apache/commons/math/optimization/direct/DirectSearchOptimizer.java +++ b/src/main/java/org/apache/commons/math/optimization/direct/DirectSearchOptimizer.java @@ -25,13 +25,13 @@ import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.MaxEvaluationsExceededException; import org.apache.commons.math.MaxIterationsExceededException; import org.apache.commons.math.analysis.MultivariateRealFunction; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.optimization.GoalType; import org.apache.commons.math.optimization.MultivariateRealOptimizer; import org.apache.commons.math.optimization.OptimizationException; import org.apache.commons.math.optimization.RealConvergenceChecker; import org.apache.commons.math.optimization.RealPointValuePair; import org.apache.commons.math.optimization.SimpleScalarValueChecker; -import org.apache.commons.math.util.LocalizedFormats; /** * This class implements simplex-based direct search optimization diff --git a/src/main/java/org/apache/commons/math/optimization/fitting/GaussianDerivativeFunction.java b/src/main/java/org/apache/commons/math/optimization/fitting/GaussianDerivativeFunction.java index ddab3484c..4a7580f46 100644 --- a/src/main/java/org/apache/commons/math/optimization/fitting/GaussianDerivativeFunction.java +++ b/src/main/java/org/apache/commons/math/optimization/fitting/GaussianDerivativeFunction.java @@ -23,8 +23,8 @@ import org.apache.commons.math.FunctionEvaluationException; import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.analysis.UnivariateRealFunction; import org.apache.commons.math.exception.DimensionMismatchException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.exception.ZeroNotAllowedException; -import org.apache.commons.math.util.LocalizedFormats; /** * The derivative of {@link GaussianFunction}. Specifically: diff --git a/src/main/java/org/apache/commons/math/optimization/fitting/GaussianFunction.java b/src/main/java/org/apache/commons/math/optimization/fitting/GaussianFunction.java index a685053bd..7a7144218 100644 --- a/src/main/java/org/apache/commons/math/optimization/fitting/GaussianFunction.java +++ b/src/main/java/org/apache/commons/math/optimization/fitting/GaussianFunction.java @@ -24,8 +24,8 @@ import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.analysis.DifferentiableUnivariateRealFunction; import org.apache.commons.math.analysis.UnivariateRealFunction; import org.apache.commons.math.exception.DimensionMismatchException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.exception.ZeroNotAllowedException; -import org.apache.commons.math.util.LocalizedFormats; /** * A Gaussian function. Specifically: diff --git a/src/main/java/org/apache/commons/math/optimization/fitting/GaussianParametersGuesser.java b/src/main/java/org/apache/commons/math/optimization/fitting/GaussianParametersGuesser.java index 5e0e1a8db..5d6f58947 100644 --- a/src/main/java/org/apache/commons/math/optimization/fitting/GaussianParametersGuesser.java +++ b/src/main/java/org/apache/commons/math/optimization/fitting/GaussianParametersGuesser.java @@ -21,10 +21,10 @@ import java.util.Arrays; import java.util.Comparator; import org.apache.commons.math.MathRuntimeException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.exception.NumberIsTooSmallException; import org.apache.commons.math.exception.OutOfRangeException; import org.apache.commons.math.exception.ZeroNotAllowedException; -import org.apache.commons.math.util.LocalizedFormats; /** * Guesses the parameters (a, b, c, and d) diff --git a/src/main/java/org/apache/commons/math/optimization/fitting/HarmonicCoefficientsGuesser.java b/src/main/java/org/apache/commons/math/optimization/fitting/HarmonicCoefficientsGuesser.java index e4d222e59..a41c32356 100644 --- a/src/main/java/org/apache/commons/math/optimization/fitting/HarmonicCoefficientsGuesser.java +++ b/src/main/java/org/apache/commons/math/optimization/fitting/HarmonicCoefficientsGuesser.java @@ -17,8 +17,8 @@ package org.apache.commons.math.optimization.fitting; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.optimization.OptimizationException; -import org.apache.commons.math.util.LocalizedFormats; /** This class guesses harmonic coefficients from a sample. diff --git a/src/main/java/org/apache/commons/math/optimization/fitting/HarmonicFitter.java b/src/main/java/org/apache/commons/math/optimization/fitting/HarmonicFitter.java index 039971cf7..94130f5da 100644 --- a/src/main/java/org/apache/commons/math/optimization/fitting/HarmonicFitter.java +++ b/src/main/java/org/apache/commons/math/optimization/fitting/HarmonicFitter.java @@ -19,9 +19,9 @@ package org.apache.commons.math.optimization.fitting; import org.apache.commons.math.FunctionEvaluationException; import org.apache.commons.math.MathRuntimeException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.optimization.DifferentiableMultivariateVectorialOptimizer; import org.apache.commons.math.optimization.OptimizationException; -import org.apache.commons.math.util.LocalizedFormats; /** This class implements a curve fitting specialized for sinusoids. *

Harmonic fitting is a very simple case of curve fitting. The diff --git a/src/main/java/org/apache/commons/math/optimization/fitting/ParametricGaussianFunction.java b/src/main/java/org/apache/commons/math/optimization/fitting/ParametricGaussianFunction.java index 6f49c80e4..936d9e0d1 100644 --- a/src/main/java/org/apache/commons/math/optimization/fitting/ParametricGaussianFunction.java +++ b/src/main/java/org/apache/commons/math/optimization/fitting/ParametricGaussianFunction.java @@ -22,9 +22,9 @@ import java.io.Serializable; import org.apache.commons.math.FunctionEvaluationException; import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.exception.DimensionMismatchException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.exception.ZeroNotAllowedException; import org.apache.commons.math.optimization.fitting.ParametricRealFunction; -import org.apache.commons.math.util.LocalizedFormats; /** * A Gaussian function. Specifically: diff --git a/src/main/java/org/apache/commons/math/optimization/general/AbstractLeastSquaresOptimizer.java b/src/main/java/org/apache/commons/math/optimization/general/AbstractLeastSquaresOptimizer.java index f6cea19ad..10f776263 100644 --- a/src/main/java/org/apache/commons/math/optimization/general/AbstractLeastSquaresOptimizer.java +++ b/src/main/java/org/apache/commons/math/optimization/general/AbstractLeastSquaresOptimizer.java @@ -22,6 +22,7 @@ import org.apache.commons.math.MaxEvaluationsExceededException; import org.apache.commons.math.MaxIterationsExceededException; import org.apache.commons.math.analysis.DifferentiableMultivariateVectorialFunction; import org.apache.commons.math.analysis.MultivariateMatrixFunction; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.linear.InvalidMatrixException; import org.apache.commons.math.linear.LUDecompositionImpl; import org.apache.commons.math.linear.MatrixUtils; @@ -31,7 +32,6 @@ import org.apache.commons.math.optimization.SimpleVectorialValueChecker; import org.apache.commons.math.optimization.VectorialConvergenceChecker; import org.apache.commons.math.optimization.DifferentiableMultivariateVectorialOptimizer; import org.apache.commons.math.optimization.VectorialPointValuePair; -import org.apache.commons.math.util.LocalizedFormats; /** * Base class for implementing least squares optimizers. diff --git a/src/main/java/org/apache/commons/math/optimization/general/GaussNewtonOptimizer.java b/src/main/java/org/apache/commons/math/optimization/general/GaussNewtonOptimizer.java index df856592c..dddca71d7 100644 --- a/src/main/java/org/apache/commons/math/optimization/general/GaussNewtonOptimizer.java +++ b/src/main/java/org/apache/commons/math/optimization/general/GaussNewtonOptimizer.java @@ -18,6 +18,7 @@ package org.apache.commons.math.optimization.general; import org.apache.commons.math.FunctionEvaluationException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.linear.BlockRealMatrix; import org.apache.commons.math.linear.DecompositionSolver; import org.apache.commons.math.linear.InvalidMatrixException; @@ -26,7 +27,6 @@ import org.apache.commons.math.linear.QRDecompositionImpl; import org.apache.commons.math.linear.RealMatrix; import org.apache.commons.math.optimization.OptimizationException; import org.apache.commons.math.optimization.VectorialPointValuePair; -import org.apache.commons.math.util.LocalizedFormats; /** * Gauss-Newton least-squares solver. diff --git a/src/main/java/org/apache/commons/math/optimization/general/LevenbergMarquardtOptimizer.java b/src/main/java/org/apache/commons/math/optimization/general/LevenbergMarquardtOptimizer.java index 56cc3ce7b..0c4f39f71 100644 --- a/src/main/java/org/apache/commons/math/optimization/general/LevenbergMarquardtOptimizer.java +++ b/src/main/java/org/apache/commons/math/optimization/general/LevenbergMarquardtOptimizer.java @@ -19,9 +19,9 @@ package org.apache.commons.math.optimization.general; import java.util.Arrays; import org.apache.commons.math.FunctionEvaluationException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.optimization.OptimizationException; import org.apache.commons.math.optimization.VectorialPointValuePair; -import org.apache.commons.math.util.LocalizedFormats; import org.apache.commons.math.util.MathUtils; diff --git a/src/main/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizer.java b/src/main/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizer.java index 0c5d1713b..9a461c953 100644 --- a/src/main/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizer.java +++ b/src/main/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizer.java @@ -22,10 +22,10 @@ import org.apache.commons.math.FunctionEvaluationException; import org.apache.commons.math.analysis.UnivariateRealFunction; import org.apache.commons.math.analysis.solvers.BrentSolver; import org.apache.commons.math.analysis.solvers.UnivariateRealSolver; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.optimization.GoalType; import org.apache.commons.math.optimization.OptimizationException; import org.apache.commons.math.optimization.RealPointValuePair; -import org.apache.commons.math.util.LocalizedFormats; /** * Non-linear conjugate gradient optimizer. diff --git a/src/main/java/org/apache/commons/math/optimization/linear/NoFeasibleSolutionException.java b/src/main/java/org/apache/commons/math/optimization/linear/NoFeasibleSolutionException.java index fbd5ef5f2..766de2990 100644 --- a/src/main/java/org/apache/commons/math/optimization/linear/NoFeasibleSolutionException.java +++ b/src/main/java/org/apache/commons/math/optimization/linear/NoFeasibleSolutionException.java @@ -17,8 +17,8 @@ package org.apache.commons.math.optimization.linear; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.optimization.OptimizationException; -import org.apache.commons.math.util.LocalizedFormats; /** * This class represents exceptions thrown by optimizers when no solution diff --git a/src/main/java/org/apache/commons/math/optimization/linear/UnboundedSolutionException.java b/src/main/java/org/apache/commons/math/optimization/linear/UnboundedSolutionException.java index 4d1659a4d..fd3066299 100644 --- a/src/main/java/org/apache/commons/math/optimization/linear/UnboundedSolutionException.java +++ b/src/main/java/org/apache/commons/math/optimization/linear/UnboundedSolutionException.java @@ -17,8 +17,8 @@ package org.apache.commons.math.optimization.linear; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.optimization.OptimizationException; -import org.apache.commons.math.util.LocalizedFormats; /** * This class represents exceptions thrown by optimizers when a solution diff --git a/src/main/java/org/apache/commons/math/random/EmpiricalDistributionImpl.java b/src/main/java/org/apache/commons/math/random/EmpiricalDistributionImpl.java index 8c40e4f18..09a0d2fdc 100644 --- a/src/main/java/org/apache/commons/math/random/EmpiricalDistributionImpl.java +++ b/src/main/java/org/apache/commons/math/random/EmpiricalDistributionImpl.java @@ -28,9 +28,9 @@ import java.util.ArrayList; import java.util.List; import org.apache.commons.math.MathRuntimeException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.stat.descriptive.StatisticalSummary; import org.apache.commons.math.stat.descriptive.SummaryStatistics; -import org.apache.commons.math.util.LocalizedFormats; /** * Implements EmpiricalDistribution interface. This implementation diff --git a/src/main/java/org/apache/commons/math/random/RandomDataImpl.java b/src/main/java/org/apache/commons/math/random/RandomDataImpl.java index c138376ee..15f53895b 100644 --- a/src/main/java/org/apache/commons/math/random/RandomDataImpl.java +++ b/src/main/java/org/apache/commons/math/random/RandomDataImpl.java @@ -26,6 +26,7 @@ import java.util.Collection; import org.apache.commons.math.MathException; import org.apache.commons.math.MathRuntimeException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.exception.NotStrictlyPositiveException; import org.apache.commons.math.exception.NumberIsTooLargeException; import org.apache.commons.math.distribution.BetaDistributionImpl; @@ -41,7 +42,6 @@ import org.apache.commons.math.distribution.PascalDistributionImpl; import org.apache.commons.math.distribution.TDistributionImpl; import org.apache.commons.math.distribution.WeibullDistributionImpl; import org.apache.commons.math.distribution.ZipfDistributionImpl; -import org.apache.commons.math.util.LocalizedFormats; import org.apache.commons.math.util.MathUtils; /** diff --git a/src/main/java/org/apache/commons/math/random/ValueServer.java b/src/main/java/org/apache/commons/math/random/ValueServer.java index 7305060f1..7c343d753 100644 --- a/src/main/java/org/apache/commons/math/random/ValueServer.java +++ b/src/main/java/org/apache/commons/math/random/ValueServer.java @@ -23,7 +23,7 @@ import java.net.MalformedURLException; import java.net.URL; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Generates values for use in simulation applications. diff --git a/src/main/java/org/apache/commons/math/stat/Frequency.java b/src/main/java/org/apache/commons/math/stat/Frequency.java index 461cb6a9f..01faf7378 100644 --- a/src/main/java/org/apache/commons/math/stat/Frequency.java +++ b/src/main/java/org/apache/commons/math/stat/Frequency.java @@ -23,7 +23,7 @@ import java.util.Comparator; import java.util.TreeMap; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Maintains a frequency distribution. diff --git a/src/main/java/org/apache/commons/math/stat/StatUtils.java b/src/main/java/org/apache/commons/math/stat/StatUtils.java index b86508163..18812a991 100644 --- a/src/main/java/org/apache/commons/math/stat/StatUtils.java +++ b/src/main/java/org/apache/commons/math/stat/StatUtils.java @@ -17,6 +17,7 @@ package org.apache.commons.math.stat; import org.apache.commons.math.MathRuntimeException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.stat.descriptive.UnivariateStatistic; import org.apache.commons.math.stat.descriptive.moment.GeometricMean; import org.apache.commons.math.stat.descriptive.moment.Mean; @@ -28,7 +29,6 @@ import org.apache.commons.math.stat.descriptive.summary.Product; import org.apache.commons.math.stat.descriptive.summary.Sum; import org.apache.commons.math.stat.descriptive.summary.SumOfLogs; import org.apache.commons.math.stat.descriptive.summary.SumOfSquares; -import org.apache.commons.math.util.LocalizedFormats; /** * StatUtils provides static methods for computing statistics based on data diff --git a/src/main/java/org/apache/commons/math/stat/correlation/Covariance.java b/src/main/java/org/apache/commons/math/stat/correlation/Covariance.java index e83600dc9..e8d9fc72f 100644 --- a/src/main/java/org/apache/commons/math/stat/correlation/Covariance.java +++ b/src/main/java/org/apache/commons/math/stat/correlation/Covariance.java @@ -17,11 +17,11 @@ package org.apache.commons.math.stat.correlation; import org.apache.commons.math.MathRuntimeException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.linear.RealMatrix; import org.apache.commons.math.linear.BlockRealMatrix; import org.apache.commons.math.stat.descriptive.moment.Mean; import org.apache.commons.math.stat.descriptive.moment.Variance; -import org.apache.commons.math.util.LocalizedFormats; /** * Computes covariances for pairs of arrays or columns of a matrix. diff --git a/src/main/java/org/apache/commons/math/stat/correlation/PearsonsCorrelation.java b/src/main/java/org/apache/commons/math/stat/correlation/PearsonsCorrelation.java index 7b56dd328..0a2859f63 100644 --- a/src/main/java/org/apache/commons/math/stat/correlation/PearsonsCorrelation.java +++ b/src/main/java/org/apache/commons/math/stat/correlation/PearsonsCorrelation.java @@ -20,10 +20,10 @@ import org.apache.commons.math.MathException; import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.distribution.TDistribution; import org.apache.commons.math.distribution.TDistributionImpl; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.linear.RealMatrix; import org.apache.commons.math.linear.BlockRealMatrix; import org.apache.commons.math.stat.regression.SimpleRegression; -import org.apache.commons.math.util.LocalizedFormats; /** * Computes Pearson's product-moment correlation coefficients for pairs of arrays diff --git a/src/main/java/org/apache/commons/math/stat/correlation/SpearmansCorrelation.java b/src/main/java/org/apache/commons/math/stat/correlation/SpearmansCorrelation.java index fa8cdd8d6..9d031b470 100644 --- a/src/main/java/org/apache/commons/math/stat/correlation/SpearmansCorrelation.java +++ b/src/main/java/org/apache/commons/math/stat/correlation/SpearmansCorrelation.java @@ -18,11 +18,11 @@ package org.apache.commons.math.stat.correlation; import org.apache.commons.math.MathRuntimeException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.linear.BlockRealMatrix; import org.apache.commons.math.linear.RealMatrix; import org.apache.commons.math.stat.ranking.NaturalRanking; import org.apache.commons.math.stat.ranking.RankingAlgorithm; -import org.apache.commons.math.util.LocalizedFormats; /** *

Spearman's rank correlation. This implementation performs a rank diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/AbstractStorelessUnivariateStatistic.java b/src/main/java/org/apache/commons/math/stat/descriptive/AbstractStorelessUnivariateStatistic.java index 0588540c0..bb6eaf991 100644 --- a/src/main/java/org/apache/commons/math/stat/descriptive/AbstractStorelessUnivariateStatistic.java +++ b/src/main/java/org/apache/commons/math/stat/descriptive/AbstractStorelessUnivariateStatistic.java @@ -17,7 +17,7 @@ package org.apache.commons.math.stat.descriptive; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.util.MathUtils; /** diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/AbstractUnivariateStatistic.java b/src/main/java/org/apache/commons/math/stat/descriptive/AbstractUnivariateStatistic.java index 05d7c6ce8..29d0992c9 100644 --- a/src/main/java/org/apache/commons/math/stat/descriptive/AbstractUnivariateStatistic.java +++ b/src/main/java/org/apache/commons/math/stat/descriptive/AbstractUnivariateStatistic.java @@ -17,7 +17,7 @@ package org.apache.commons.math.stat.descriptive; import org.apache.commons.math.MathRuntimeException; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Abstract base class for all implementations of the diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/DescriptiveStatistics.java b/src/main/java/org/apache/commons/math/stat/descriptive/DescriptiveStatistics.java index a338d9f88..a2a040a39 100644 --- a/src/main/java/org/apache/commons/math/stat/descriptive/DescriptiveStatistics.java +++ b/src/main/java/org/apache/commons/math/stat/descriptive/DescriptiveStatistics.java @@ -21,6 +21,7 @@ import java.lang.reflect.InvocationTargetException; import java.util.Arrays; import org.apache.commons.math.MathRuntimeException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.stat.descriptive.moment.GeometricMean; import org.apache.commons.math.stat.descriptive.moment.Kurtosis; import org.apache.commons.math.stat.descriptive.moment.Mean; @@ -31,7 +32,6 @@ import org.apache.commons.math.stat.descriptive.rank.Min; import org.apache.commons.math.stat.descriptive.rank.Percentile; import org.apache.commons.math.stat.descriptive.summary.Sum; import org.apache.commons.math.stat.descriptive.summary.SumOfSquares; -import org.apache.commons.math.util.LocalizedFormats; import org.apache.commons.math.util.ResizableDoubleArray; diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/MultivariateSummaryStatistics.java b/src/main/java/org/apache/commons/math/stat/descriptive/MultivariateSummaryStatistics.java index 766954ea1..75466c3bf 100644 --- a/src/main/java/org/apache/commons/math/stat/descriptive/MultivariateSummaryStatistics.java +++ b/src/main/java/org/apache/commons/math/stat/descriptive/MultivariateSummaryStatistics.java @@ -21,6 +21,7 @@ import java.util.Arrays; import org.apache.commons.math.DimensionMismatchException; import org.apache.commons.math.MathRuntimeException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.linear.RealMatrix; import org.apache.commons.math.stat.descriptive.moment.GeometricMean; import org.apache.commons.math.stat.descriptive.moment.Mean; @@ -30,7 +31,6 @@ import org.apache.commons.math.stat.descriptive.rank.Min; import org.apache.commons.math.stat.descriptive.summary.Sum; import org.apache.commons.math.stat.descriptive.summary.SumOfLogs; import org.apache.commons.math.stat.descriptive.summary.SumOfSquares; -import org.apache.commons.math.util.LocalizedFormats; import org.apache.commons.math.util.MathUtils; /** diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/SummaryStatistics.java b/src/main/java/org/apache/commons/math/stat/descriptive/SummaryStatistics.java index 2d8b5bd74..002277b8f 100644 --- a/src/main/java/org/apache/commons/math/stat/descriptive/SummaryStatistics.java +++ b/src/main/java/org/apache/commons/math/stat/descriptive/SummaryStatistics.java @@ -19,6 +19,7 @@ package org.apache.commons.math.stat.descriptive; import java.io.Serializable; import org.apache.commons.math.MathRuntimeException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.stat.descriptive.moment.GeometricMean; import org.apache.commons.math.stat.descriptive.moment.Mean; import org.apache.commons.math.stat.descriptive.moment.SecondMoment; @@ -28,7 +29,6 @@ import org.apache.commons.math.stat.descriptive.rank.Min; import org.apache.commons.math.stat.descriptive.summary.Sum; import org.apache.commons.math.stat.descriptive.summary.SumOfLogs; import org.apache.commons.math.stat.descriptive.summary.SumOfSquares; -import org.apache.commons.math.util.LocalizedFormats; import org.apache.commons.math.util.MathUtils; /** diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/moment/GeometricMean.java b/src/main/java/org/apache/commons/math/stat/descriptive/moment/GeometricMean.java index be1c31bde..8787eddfc 100644 --- a/src/main/java/org/apache/commons/math/stat/descriptive/moment/GeometricMean.java +++ b/src/main/java/org/apache/commons/math/stat/descriptive/moment/GeometricMean.java @@ -19,10 +19,10 @@ package org.apache.commons.math.stat.descriptive.moment; import java.io.Serializable; import org.apache.commons.math.MathRuntimeException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.stat.descriptive.AbstractStorelessUnivariateStatistic; import org.apache.commons.math.stat.descriptive.StorelessUnivariateStatistic; import org.apache.commons.math.stat.descriptive.summary.SumOfLogs; -import org.apache.commons.math.util.LocalizedFormats; /** * Returns the diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/moment/Kurtosis.java b/src/main/java/org/apache/commons/math/stat/descriptive/moment/Kurtosis.java index 5b488756a..6a8745cf5 100644 --- a/src/main/java/org/apache/commons/math/stat/descriptive/moment/Kurtosis.java +++ b/src/main/java/org/apache/commons/math/stat/descriptive/moment/Kurtosis.java @@ -19,8 +19,8 @@ package org.apache.commons.math.stat.descriptive.moment; import java.io.Serializable; import org.apache.commons.math.MathRuntimeException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.stat.descriptive.AbstractStorelessUnivariateStatistic; -import org.apache.commons.math.util.LocalizedFormats; /** diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/moment/SemiVariance.java b/src/main/java/org/apache/commons/math/stat/descriptive/moment/SemiVariance.java index 3a219b496..6df2b45e4 100644 --- a/src/main/java/org/apache/commons/math/stat/descriptive/moment/SemiVariance.java +++ b/src/main/java/org/apache/commons/math/stat/descriptive/moment/SemiVariance.java @@ -19,8 +19,8 @@ package org.apache.commons.math.stat.descriptive.moment; import java.io.Serializable; import org.apache.commons.math.MathRuntimeException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.stat.descriptive.AbstractUnivariateStatistic; -import org.apache.commons.math.util.LocalizedFormats; /** *

Computes the semivariance of a set of values with respect to a given cutoff value. diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/moment/Variance.java b/src/main/java/org/apache/commons/math/stat/descriptive/moment/Variance.java index 1a0e43758..375cc1f19 100644 --- a/src/main/java/org/apache/commons/math/stat/descriptive/moment/Variance.java +++ b/src/main/java/org/apache/commons/math/stat/descriptive/moment/Variance.java @@ -19,9 +19,9 @@ package org.apache.commons.math.stat.descriptive.moment; import java.io.Serializable; import org.apache.commons.math.MathRuntimeException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.stat.descriptive.WeightedEvaluation; import org.apache.commons.math.stat.descriptive.AbstractStorelessUnivariateStatistic; -import org.apache.commons.math.util.LocalizedFormats; /** * Computes the variance of the available values. By default, the unbiased diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/rank/Percentile.java b/src/main/java/org/apache/commons/math/stat/descriptive/rank/Percentile.java index 06597769d..845141d4d 100644 --- a/src/main/java/org/apache/commons/math/stat/descriptive/rank/Percentile.java +++ b/src/main/java/org/apache/commons/math/stat/descriptive/rank/Percentile.java @@ -20,8 +20,8 @@ import java.io.Serializable; import java.util.Arrays; import org.apache.commons.math.MathRuntimeException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.stat.descriptive.AbstractUnivariateStatistic; -import org.apache.commons.math.util.LocalizedFormats; /** * Provides percentile computation. diff --git a/src/main/java/org/apache/commons/math/stat/inference/ChiSquareTestImpl.java b/src/main/java/org/apache/commons/math/stat/inference/ChiSquareTestImpl.java index fa4263ae8..249f2ccfd 100644 --- a/src/main/java/org/apache/commons/math/stat/inference/ChiSquareTestImpl.java +++ b/src/main/java/org/apache/commons/math/stat/inference/ChiSquareTestImpl.java @@ -20,7 +20,7 @@ import org.apache.commons.math.MathException; import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.distribution.ChiSquaredDistribution; import org.apache.commons.math.distribution.ChiSquaredDistributionImpl; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Implements Chi-Square test statistics defined in the diff --git a/src/main/java/org/apache/commons/math/stat/inference/OneWayAnovaImpl.java b/src/main/java/org/apache/commons/math/stat/inference/OneWayAnovaImpl.java index 1e3862822..41c02cf7f 100644 --- a/src/main/java/org/apache/commons/math/stat/inference/OneWayAnovaImpl.java +++ b/src/main/java/org/apache/commons/math/stat/inference/OneWayAnovaImpl.java @@ -22,9 +22,9 @@ import org.apache.commons.math.MathException; import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.distribution.FDistribution; import org.apache.commons.math.distribution.FDistributionImpl; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.stat.descriptive.summary.Sum; import org.apache.commons.math.stat.descriptive.summary.SumOfSquares; -import org.apache.commons.math.util.LocalizedFormats; /** diff --git a/src/main/java/org/apache/commons/math/stat/inference/TTestImpl.java b/src/main/java/org/apache/commons/math/stat/inference/TTestImpl.java index 2c552e1c5..14d542009 100644 --- a/src/main/java/org/apache/commons/math/stat/inference/TTestImpl.java +++ b/src/main/java/org/apache/commons/math/stat/inference/TTestImpl.java @@ -20,9 +20,9 @@ import org.apache.commons.math.MathException; import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.distribution.TDistribution; import org.apache.commons.math.distribution.TDistributionImpl; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.stat.StatUtils; import org.apache.commons.math.stat.descriptive.StatisticalSummary; -import org.apache.commons.math.util.LocalizedFormats; /** * Implements t-test statistics defined in the {@link TTest} interface. diff --git a/src/main/java/org/apache/commons/math/stat/regression/AbstractMultipleLinearRegression.java b/src/main/java/org/apache/commons/math/stat/regression/AbstractMultipleLinearRegression.java index d8e68aadd..c9650cfd8 100644 --- a/src/main/java/org/apache/commons/math/stat/regression/AbstractMultipleLinearRegression.java +++ b/src/main/java/org/apache/commons/math/stat/regression/AbstractMultipleLinearRegression.java @@ -17,11 +17,11 @@ package org.apache.commons.math.stat.regression; import org.apache.commons.math.MathRuntimeException; +import org.apache.commons.math.exception.LocalizedFormats; import org.apache.commons.math.linear.RealMatrix; import org.apache.commons.math.linear.Array2DRowRealMatrix; import org.apache.commons.math.linear.RealVector; import org.apache.commons.math.linear.ArrayRealVector; -import org.apache.commons.math.util.LocalizedFormats; /** * Abstract base class for implementations of MultipleLinearRegression. diff --git a/src/main/java/org/apache/commons/math/stat/regression/SimpleRegression.java b/src/main/java/org/apache/commons/math/stat/regression/SimpleRegression.java index f941c6e23..d6a71ccd3 100644 --- a/src/main/java/org/apache/commons/math/stat/regression/SimpleRegression.java +++ b/src/main/java/org/apache/commons/math/stat/regression/SimpleRegression.java @@ -22,7 +22,7 @@ import org.apache.commons.math.MathException; import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.distribution.TDistribution; import org.apache.commons.math.distribution.TDistributionImpl; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Estimates an ordinary least squares regression model diff --git a/src/main/java/org/apache/commons/math/transform/FastCosineTransformer.java b/src/main/java/org/apache/commons/math/transform/FastCosineTransformer.java index 9e9c1e6eb..b2a4c8b5f 100644 --- a/src/main/java/org/apache/commons/math/transform/FastCosineTransformer.java +++ b/src/main/java/org/apache/commons/math/transform/FastCosineTransformer.java @@ -20,7 +20,7 @@ import org.apache.commons.math.FunctionEvaluationException; import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.analysis.UnivariateRealFunction; import org.apache.commons.math.complex.Complex; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Implements the diff --git a/src/main/java/org/apache/commons/math/transform/FastHadamardTransformer.java b/src/main/java/org/apache/commons/math/transform/FastHadamardTransformer.java index c6a2c59d3..71573f25a 100644 --- a/src/main/java/org/apache/commons/math/transform/FastHadamardTransformer.java +++ b/src/main/java/org/apache/commons/math/transform/FastHadamardTransformer.java @@ -19,7 +19,7 @@ package org.apache.commons.math.transform; import org.apache.commons.math.FunctionEvaluationException; import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.analysis.UnivariateRealFunction; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Implements the Fast Hadamard Transform (FHT). diff --git a/src/main/java/org/apache/commons/math/transform/FastSineTransformer.java b/src/main/java/org/apache/commons/math/transform/FastSineTransformer.java index e71385568..4da853273 100644 --- a/src/main/java/org/apache/commons/math/transform/FastSineTransformer.java +++ b/src/main/java/org/apache/commons/math/transform/FastSineTransformer.java @@ -20,7 +20,7 @@ import org.apache.commons.math.FunctionEvaluationException; import org.apache.commons.math.MathRuntimeException; import org.apache.commons.math.analysis.UnivariateRealFunction; import org.apache.commons.math.complex.Complex; -import org.apache.commons.math.util.LocalizedFormats; +import org.apache.commons.math.exception.LocalizedFormats; /** * Implements the