diff --git a/LICENSE.txt b/LICENSE.txt index 275e288fc..2e8e2d75f 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -212,7 +212,7 @@ are reproduced below. =============================================================================== For the lmder, lmpar and qrsolv Fortran routine from minpack and translated in the LevenbergMarquardtOptimizer class in package -org.apache.commons.math.optimization.general +org.apache.commons.math3.optimization.general Original source copyright and license statement: Minpack Copyright Notice (1999) University of Chicago. All rights reserved @@ -270,7 +270,7 @@ POSSIBILITY OF SUCH LOSS OR DAMAGES. Copyright and license statement for the odex Fortran routine developed by E. Hairer and G. Wanner and translated in GraggBulirschStoerIntegrator class -in package org.apache.commons.math.ode.nonstiff: +in package org.apache.commons.math3.ode.nonstiff: Copyright (c) 2004, Ernst Hairer @@ -301,7 +301,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Copyright and license statement for the original lapack fortran routines translated in EigenDecompositionImpl class in package -org.apache.commons.math.linear: +org.apache.commons.math3.linear: Copyright (c) 1992-2008 The University of Tennessee. All rights reserved. @@ -342,7 +342,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Copyright and license statement for the original Mersenne twister C routines translated in MersenneTwister class in package -org.apache.commons.math.random: +org.apache.commons.math3.random: Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura, All rights reserved. diff --git a/NOTICE.txt b/NOTICE.txt index d1f0fc0a3..0f5ce720b 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -6,8 +6,8 @@ The Apache Software Foundation (http://www.apache.org/). =============================================================================== -The BracketFinder (package org.apache.commons.math.optimization.univariate) -and PowellOptimizer (package org.apache.commons.math.optimization.general) +The BracketFinder (package org.apache.commons.math3.optimization.univariate) +and PowellOptimizer (package org.apache.commons.math3.optimization.general) classes are based on the Python code in module "optimize.py" (version 0.5) developed by Travis E. Oliphant for the SciPy library (http://www.scipy.org/) Copyright © 2003-2009 SciPy Developers. @@ -15,7 +15,7 @@ Copyright © 2003-2009 SciPy Developers. The LinearConstraint, LinearObjectiveFunction, LinearOptimizer, RelationShip, SimplexSolver and SimplexTableau classes in package -org.apache.commons.math.optimization.linear include software developed by +org.apache.commons.math3.optimization.linear include software developed by Benjamin McCann (http://www.benmccann.com) and distributed with the following copyright: Copyright 2009 Google Inc. =============================================================================== @@ -24,26 +24,26 @@ This product includes software developed by the University of Chicago, as Operator of Argonne National Laboratory. The LevenbergMarquardtOptimizer class in package -org.apache.commons.math.optimization.general includes software +org.apache.commons.math3.optimization.general includes software translated from the lmder, lmpar and qrsolv Fortran routines from the Minpack package Minpack Copyright Notice (1999) University of Chicago. All rights reserved =============================================================================== The GraggBulirschStoerIntegrator class in package -org.apache.commons.math.ode.nonstiff includes software translated +org.apache.commons.math3.ode.nonstiff includes software translated from the odex Fortran routine developed by E. Hairer and G. Wanner. Original source copyright: Copyright (c) 2004, Ernst Hairer =============================================================================== The EigenDecompositionImpl class in package -org.apache.commons.math.linear includes software translated +org.apache.commons.math3.linear includes software translated from some LAPACK Fortran routines. Original source copyright: Copyright (c) 1992-2008 The University of Tennessee. All rights reserved. =============================================================================== -The MersenneTwister class in package org.apache.commons.math.random +The MersenneTwister class in package org.apache.commons.math3.random includes software translated from the 2002-01-26 version of the Mersenne-Twister generator written in C by Makoto Matsumoto and Takuji Nishimura. Original source copyright: diff --git a/build.xml b/build.xml index 7b0cbc393..d378cb2ba 100644 --- a/build.xml +++ b/build.xml @@ -46,7 +46,7 @@ - + @@ -200,7 +200,7 @@ diff --git a/findbugs-exclude-filter.xml b/findbugs-exclude-filter.xml index afeacf6a7..e270a22c7 100644 --- a/findbugs-exclude-filter.xml +++ b/findbugs-exclude-filter.xml @@ -26,7 +26,7 @@ - + @@ -34,31 +34,31 @@ - + - + - + - + - + @@ -66,65 +66,65 @@ - - - + + + - + - + - + - + - + - + - + - + - + @@ -132,17 +132,17 @@ - + - + - + @@ -150,67 +150,67 @@ - - + + - + - - + + - - + + - + - + - + - + - - + + - - + + - - + + - + - + @@ -218,52 +218,52 @@ - + - - + + - + - + - + - + - + - + - + diff --git a/src/main/java/org/apache/commons/math/Field.java b/src/main/java/org/apache/commons/math3/Field.java similarity index 98% rename from src/main/java/org/apache/commons/math/Field.java rename to src/main/java/org/apache/commons/math3/Field.java index 15927db3b..bdd26e333 100644 --- a/src/main/java/org/apache/commons/math/Field.java +++ b/src/main/java/org/apache/commons/math3/Field.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math; +package org.apache.commons.math3; /** * Interface representing a field. diff --git a/src/main/java/org/apache/commons/math/FieldElement.java b/src/main/java/org/apache/commons/math3/FieldElement.java similarity index 98% rename from src/main/java/org/apache/commons/math/FieldElement.java rename to src/main/java/org/apache/commons/math3/FieldElement.java index b08ee5278..3c4f58615 100644 --- a/src/main/java/org/apache/commons/math/FieldElement.java +++ b/src/main/java/org/apache/commons/math3/FieldElement.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math; +package org.apache.commons.math3; /** diff --git a/src/main/java/org/apache/commons/math/analysis/BivariateFunction.java b/src/main/java/org/apache/commons/math3/analysis/BivariateFunction.java similarity index 96% rename from src/main/java/org/apache/commons/math/analysis/BivariateFunction.java rename to src/main/java/org/apache/commons/math3/analysis/BivariateFunction.java index 2674e34e8..8ae0573ac 100644 --- a/src/main/java/org/apache/commons/math/analysis/BivariateFunction.java +++ b/src/main/java/org/apache/commons/math3/analysis/BivariateFunction.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.analysis; +package org.apache.commons.math3.analysis; /** * An interface representing a bivariate real function. diff --git a/src/main/java/org/apache/commons/math/analysis/DifferentiableMultivariateFunction.java b/src/main/java/org/apache/commons/math3/analysis/DifferentiableMultivariateFunction.java similarity index 97% rename from src/main/java/org/apache/commons/math/analysis/DifferentiableMultivariateFunction.java rename to src/main/java/org/apache/commons/math3/analysis/DifferentiableMultivariateFunction.java index 780410654..1de86b986 100644 --- a/src/main/java/org/apache/commons/math/analysis/DifferentiableMultivariateFunction.java +++ b/src/main/java/org/apache/commons/math3/analysis/DifferentiableMultivariateFunction.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.analysis; +package org.apache.commons.math3.analysis; /** * Extension of {@link MultivariateFunction} representing a differentiable diff --git a/src/main/java/org/apache/commons/math/analysis/DifferentiableMultivariateVectorFunction.java b/src/main/java/org/apache/commons/math3/analysis/DifferentiableMultivariateVectorFunction.java similarity index 96% rename from src/main/java/org/apache/commons/math/analysis/DifferentiableMultivariateVectorFunction.java rename to src/main/java/org/apache/commons/math3/analysis/DifferentiableMultivariateVectorFunction.java index f4baba7f3..fa1f2ae3d 100644 --- a/src/main/java/org/apache/commons/math/analysis/DifferentiableMultivariateVectorFunction.java +++ b/src/main/java/org/apache/commons/math3/analysis/DifferentiableMultivariateVectorFunction.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.analysis; +package org.apache.commons.math3.analysis; /** diff --git a/src/main/java/org/apache/commons/math/analysis/DifferentiableUnivariateFunction.java b/src/main/java/org/apache/commons/math3/analysis/DifferentiableUnivariateFunction.java similarity index 96% rename from src/main/java/org/apache/commons/math/analysis/DifferentiableUnivariateFunction.java rename to src/main/java/org/apache/commons/math3/analysis/DifferentiableUnivariateFunction.java index 5a82bd829..4975f2d34 100644 --- a/src/main/java/org/apache/commons/math/analysis/DifferentiableUnivariateFunction.java +++ b/src/main/java/org/apache/commons/math3/analysis/DifferentiableUnivariateFunction.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis; +package org.apache.commons.math3.analysis; /** * Extension of {@link UnivariateFunction} representing a differentiable univariate real function. diff --git a/src/main/java/org/apache/commons/math/analysis/DifferentiableUnivariateMatrixFunction.java b/src/main/java/org/apache/commons/math3/analysis/DifferentiableUnivariateMatrixFunction.java similarity index 96% rename from src/main/java/org/apache/commons/math/analysis/DifferentiableUnivariateMatrixFunction.java rename to src/main/java/org/apache/commons/math3/analysis/DifferentiableUnivariateMatrixFunction.java index a628db331..2ddfc9027 100644 --- a/src/main/java/org/apache/commons/math/analysis/DifferentiableUnivariateMatrixFunction.java +++ b/src/main/java/org/apache/commons/math3/analysis/DifferentiableUnivariateMatrixFunction.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis; +package org.apache.commons.math3.analysis; /** * Extension of {@link UnivariateMatrixFunction} representing a differentiable univariate matrix function. diff --git a/src/main/java/org/apache/commons/math/analysis/DifferentiableUnivariateVectorFunction.java b/src/main/java/org/apache/commons/math3/analysis/DifferentiableUnivariateVectorFunction.java similarity index 96% rename from src/main/java/org/apache/commons/math/analysis/DifferentiableUnivariateVectorFunction.java rename to src/main/java/org/apache/commons/math3/analysis/DifferentiableUnivariateVectorFunction.java index 2f3f01625..03c93b252 100644 --- a/src/main/java/org/apache/commons/math/analysis/DifferentiableUnivariateVectorFunction.java +++ b/src/main/java/org/apache/commons/math3/analysis/DifferentiableUnivariateVectorFunction.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis; +package org.apache.commons.math3.analysis; /** * Extension of {@link UnivariateVectorFunction} representing a differentiable univariate vectorial function. diff --git a/src/main/java/org/apache/commons/math/analysis/FunctionUtils.java b/src/main/java/org/apache/commons/math3/analysis/FunctionUtils.java similarity index 97% rename from src/main/java/org/apache/commons/math/analysis/FunctionUtils.java rename to src/main/java/org/apache/commons/math3/analysis/FunctionUtils.java index b45cc8915..b7841a0ec 100644 --- a/src/main/java/org/apache/commons/math/analysis/FunctionUtils.java +++ b/src/main/java/org/apache/commons/math3/analysis/FunctionUtils.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.commons.math.analysis; +package org.apache.commons.math3.analysis; -import org.apache.commons.math.analysis.function.Identity; -import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.exception.NumberIsTooLargeException; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.analysis.function.Identity; +import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math3.exception.NumberIsTooLargeException; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** * Utilities for manipulating function objects. diff --git a/src/main/java/org/apache/commons/math/analysis/MultivariateFunction.java b/src/main/java/org/apache/commons/math3/analysis/MultivariateFunction.java similarity index 89% rename from src/main/java/org/apache/commons/math/analysis/MultivariateFunction.java rename to src/main/java/org/apache/commons/math3/analysis/MultivariateFunction.java index b8346c761..0e0ec099e 100644 --- a/src/main/java/org/apache/commons/math/analysis/MultivariateFunction.java +++ b/src/main/java/org/apache/commons/math3/analysis/MultivariateFunction.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.analysis; +package org.apache.commons.math3.analysis; /** * An interface representing a multivariate real function. @@ -30,9 +30,9 @@ public interface MultivariateFunction { * * @param point Point at which the function must be evaluated. * @return the function value for the given point. - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if the parameter's dimension is wrong for the function being evaluated. - * @throws org.apache.commons.math.exception.MathIllegalArgumentException + * @throws org.apache.commons.math3.exception.MathIllegalArgumentException * when the activated method itself can ascertain that preconditions, * specified in the API expressed at the level of the activated method, * have been violated. In the vast majority of cases where Commons Math diff --git a/src/main/java/org/apache/commons/math/analysis/MultivariateMatrixFunction.java b/src/main/java/org/apache/commons/math3/analysis/MultivariateMatrixFunction.java similarity index 96% rename from src/main/java/org/apache/commons/math/analysis/MultivariateMatrixFunction.java rename to src/main/java/org/apache/commons/math3/analysis/MultivariateMatrixFunction.java index 2e485cf4e..94508694d 100644 --- a/src/main/java/org/apache/commons/math/analysis/MultivariateMatrixFunction.java +++ b/src/main/java/org/apache/commons/math3/analysis/MultivariateMatrixFunction.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.analysis; +package org.apache.commons.math3.analysis; /** * An interface representing a multivariate matrix function. diff --git a/src/main/java/org/apache/commons/math/analysis/MultivariateVectorFunction.java b/src/main/java/org/apache/commons/math3/analysis/MultivariateVectorFunction.java similarity index 96% rename from src/main/java/org/apache/commons/math/analysis/MultivariateVectorFunction.java rename to src/main/java/org/apache/commons/math3/analysis/MultivariateVectorFunction.java index a194e5293..ada575cfb 100644 --- a/src/main/java/org/apache/commons/math/analysis/MultivariateVectorFunction.java +++ b/src/main/java/org/apache/commons/math3/analysis/MultivariateVectorFunction.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.analysis; +package org.apache.commons.math3.analysis; /** * An interface representing a multivariate vectorial function. diff --git a/src/main/java/org/apache/commons/math/analysis/ParametricUnivariateFunction.java b/src/main/java/org/apache/commons/math3/analysis/ParametricUnivariateFunction.java similarity index 97% rename from src/main/java/org/apache/commons/math/analysis/ParametricUnivariateFunction.java rename to src/main/java/org/apache/commons/math3/analysis/ParametricUnivariateFunction.java index 37e2aeed9..f12b57739 100644 --- a/src/main/java/org/apache/commons/math/analysis/ParametricUnivariateFunction.java +++ b/src/main/java/org/apache/commons/math3/analysis/ParametricUnivariateFunction.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.analysis; +package org.apache.commons.math3.analysis; /** * An interface representing a real function that depends on one independent diff --git a/src/main/java/org/apache/commons/math/analysis/TrivariateFunction.java b/src/main/java/org/apache/commons/math3/analysis/TrivariateFunction.java similarity index 96% rename from src/main/java/org/apache/commons/math/analysis/TrivariateFunction.java rename to src/main/java/org/apache/commons/math3/analysis/TrivariateFunction.java index 84b9795ff..c9044bed8 100644 --- a/src/main/java/org/apache/commons/math/analysis/TrivariateFunction.java +++ b/src/main/java/org/apache/commons/math3/analysis/TrivariateFunction.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.analysis; +package org.apache.commons.math3.analysis; /** * An interface representing a trivariate real function. diff --git a/src/main/java/org/apache/commons/math/analysis/UnivariateFunction.java b/src/main/java/org/apache/commons/math3/analysis/UnivariateFunction.java similarity index 98% rename from src/main/java/org/apache/commons/math/analysis/UnivariateFunction.java rename to src/main/java/org/apache/commons/math3/analysis/UnivariateFunction.java index c002d47c9..6cd048803 100644 --- a/src/main/java/org/apache/commons/math/analysis/UnivariateFunction.java +++ b/src/main/java/org/apache/commons/math3/analysis/UnivariateFunction.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis; +package org.apache.commons.math3.analysis; /** * An interface representing a univariate real function. diff --git a/src/main/java/org/apache/commons/math/analysis/UnivariateMatrixFunction.java b/src/main/java/org/apache/commons/math3/analysis/UnivariateMatrixFunction.java similarity index 96% rename from src/main/java/org/apache/commons/math/analysis/UnivariateMatrixFunction.java rename to src/main/java/org/apache/commons/math3/analysis/UnivariateMatrixFunction.java index 5df26ed5a..3b2ebd6a9 100644 --- a/src/main/java/org/apache/commons/math/analysis/UnivariateMatrixFunction.java +++ b/src/main/java/org/apache/commons/math3/analysis/UnivariateMatrixFunction.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis; +package org.apache.commons.math3.analysis; /** * An interface representing a univariate matrix function. diff --git a/src/main/java/org/apache/commons/math/analysis/UnivariateVectorFunction.java b/src/main/java/org/apache/commons/math3/analysis/UnivariateVectorFunction.java similarity index 96% rename from src/main/java/org/apache/commons/math/analysis/UnivariateVectorFunction.java rename to src/main/java/org/apache/commons/math3/analysis/UnivariateVectorFunction.java index b4e9954ea..e7a373b2d 100644 --- a/src/main/java/org/apache/commons/math/analysis/UnivariateVectorFunction.java +++ b/src/main/java/org/apache/commons/math3/analysis/UnivariateVectorFunction.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis; +package org.apache.commons.math3.analysis; /** * An interface representing a univariate vectorial function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Abs.java b/src/main/java/org/apache/commons/math3/analysis/function/Abs.java similarity index 86% rename from src/main/java/org/apache/commons/math/analysis/function/Abs.java rename to src/main/java/org/apache/commons/math3/analysis/function/Abs.java index c7cafad2d..758c30cc6 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Abs.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Abs.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.util.FastMath; /** * Absolute value function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Acos.java b/src/main/java/org/apache/commons/math3/analysis/function/Acos.java similarity index 84% rename from src/main/java/org/apache/commons/math/analysis/function/Acos.java rename to src/main/java/org/apache/commons/math3/analysis/function/Acos.java index bc2796a86..caf8606c2 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Acos.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Acos.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.util.FastMath; /** * Arc-cosine function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Acosh.java b/src/main/java/org/apache/commons/math3/analysis/function/Acosh.java similarity index 84% rename from src/main/java/org/apache/commons/math/analysis/function/Acosh.java rename to src/main/java/org/apache/commons/math3/analysis/function/Acosh.java index 1e8425fe5..9a891bbcc 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Acosh.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Acosh.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.util.FastMath; /** * Hyperbolic arc-cosine function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Add.java b/src/main/java/org/apache/commons/math3/analysis/function/Add.java similarity index 90% rename from src/main/java/org/apache/commons/math/analysis/function/Add.java rename to src/main/java/org/apache/commons/math3/analysis/function/Add.java index 301b645ec..09fa77792 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Add.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Add.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.BivariateFunction; +import org.apache.commons.math3.analysis.BivariateFunction; /** * Add the two operands. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Asin.java b/src/main/java/org/apache/commons/math3/analysis/function/Asin.java similarity index 84% rename from src/main/java/org/apache/commons/math/analysis/function/Asin.java rename to src/main/java/org/apache/commons/math3/analysis/function/Asin.java index fae122ffd..c3db51407 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Asin.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Asin.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.util.FastMath; /** * Arc-sine function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Asinh.java b/src/main/java/org/apache/commons/math3/analysis/function/Asinh.java similarity index 84% rename from src/main/java/org/apache/commons/math/analysis/function/Asinh.java rename to src/main/java/org/apache/commons/math3/analysis/function/Asinh.java index 069424808..df68956c8 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Asinh.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Asinh.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.util.FastMath; /** * Hyperbolic arc-sine function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Atan.java b/src/main/java/org/apache/commons/math3/analysis/function/Atan.java similarity index 84% rename from src/main/java/org/apache/commons/math/analysis/function/Atan.java rename to src/main/java/org/apache/commons/math3/analysis/function/Atan.java index b48946689..edae9f4b2 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Atan.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Atan.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.util.FastMath; /** * Arc-tangent function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Atan2.java b/src/main/java/org/apache/commons/math3/analysis/function/Atan2.java similarity index 86% rename from src/main/java/org/apache/commons/math/analysis/function/Atan2.java rename to src/main/java/org/apache/commons/math3/analysis/function/Atan2.java index 21ffced48..0f555f35b 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Atan2.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Atan2.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.BivariateFunction; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.BivariateFunction; +import org.apache.commons.math3.util.FastMath; /** * Arc-tangent function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Atanh.java b/src/main/java/org/apache/commons/math3/analysis/function/Atanh.java similarity index 84% rename from src/main/java/org/apache/commons/math/analysis/function/Atanh.java rename to src/main/java/org/apache/commons/math3/analysis/function/Atanh.java index 96ef8a705..7a794250c 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Atanh.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Atanh.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.util.FastMath; /** * Hyperbolic arc-tangent function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Cbrt.java b/src/main/java/org/apache/commons/math3/analysis/function/Cbrt.java similarity index 84% rename from src/main/java/org/apache/commons/math/analysis/function/Cbrt.java rename to src/main/java/org/apache/commons/math3/analysis/function/Cbrt.java index f1e3f794d..fb21ade22 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Cbrt.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Cbrt.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.util.FastMath; /** * Cube root function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Ceil.java b/src/main/java/org/apache/commons/math3/analysis/function/Ceil.java similarity index 86% rename from src/main/java/org/apache/commons/math/analysis/function/Ceil.java rename to src/main/java/org/apache/commons/math3/analysis/function/Ceil.java index 59cfc127d..ef836d0ab 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Ceil.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Ceil.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.util.FastMath; /** * {@code ceil} function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Constant.java b/src/main/java/org/apache/commons/math3/analysis/function/Constant.java similarity index 91% rename from src/main/java/org/apache/commons/math/analysis/function/Constant.java rename to src/main/java/org/apache/commons/math3/analysis/function/Constant.java index ced18b70d..1c24f1ffe 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Constant.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Constant.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; /** * Constant function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Cos.java b/src/main/java/org/apache/commons/math3/analysis/function/Cos.java similarity index 84% rename from src/main/java/org/apache/commons/math/analysis/function/Cos.java rename to src/main/java/org/apache/commons/math3/analysis/function/Cos.java index 23e919461..5c17debb9 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Cos.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Cos.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.util.FastMath; /** * Cosine function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Cosh.java b/src/main/java/org/apache/commons/math3/analysis/function/Cosh.java similarity index 86% rename from src/main/java/org/apache/commons/math/analysis/function/Cosh.java rename to src/main/java/org/apache/commons/math3/analysis/function/Cosh.java index f11ff42d3..bd3a82a33 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Cosh.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Cosh.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.util.FastMath; /** * Hyperbolic cosine function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Divide.java b/src/main/java/org/apache/commons/math3/analysis/function/Divide.java similarity index 90% rename from src/main/java/org/apache/commons/math/analysis/function/Divide.java rename to src/main/java/org/apache/commons/math3/analysis/function/Divide.java index 37102313c..107fa5b9f 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Divide.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Divide.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.BivariateFunction; +import org.apache.commons.math3.analysis.BivariateFunction; /** * Divide the first operand by the second. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Exp.java b/src/main/java/org/apache/commons/math3/analysis/function/Exp.java similarity index 84% rename from src/main/java/org/apache/commons/math/analysis/function/Exp.java rename to src/main/java/org/apache/commons/math3/analysis/function/Exp.java index 5fe0897bf..2bbd5ee11 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Exp.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Exp.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.util.FastMath; /** * Exponential function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Expm1.java b/src/main/java/org/apache/commons/math3/analysis/function/Expm1.java similarity index 84% rename from src/main/java/org/apache/commons/math/analysis/function/Expm1.java rename to src/main/java/org/apache/commons/math3/analysis/function/Expm1.java index 02279c014..ea48d7628 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Expm1.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Expm1.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.util.FastMath; /** * ex-1 function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Floor.java b/src/main/java/org/apache/commons/math3/analysis/function/Floor.java similarity index 86% rename from src/main/java/org/apache/commons/math/analysis/function/Floor.java rename to src/main/java/org/apache/commons/math3/analysis/function/Floor.java index 1337b9042..8e9a95496 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Floor.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Floor.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.util.FastMath; /** * {@code floor} function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Gaussian.java b/src/main/java/org/apache/commons/math3/analysis/function/Gaussian.java similarity index 92% rename from src/main/java/org/apache/commons/math/analysis/function/Gaussian.java rename to src/main/java/org/apache/commons/math3/analysis/function/Gaussian.java index 3fa4b1d22..88f18ed2f 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Gaussian.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Gaussian.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; -import org.apache.commons.math.analysis.ParametricUnivariateFunction; -import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.analysis.ParametricUnivariateFunction; +import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.util.FastMath; /** * diff --git a/src/main/java/org/apache/commons/math/analysis/function/HarmonicOscillator.java b/src/main/java/org/apache/commons/math3/analysis/function/HarmonicOscillator.java similarity index 92% rename from src/main/java/org/apache/commons/math/analysis/function/HarmonicOscillator.java rename to src/main/java/org/apache/commons/math3/analysis/function/HarmonicOscillator.java index a70c7893a..3a264d558 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/HarmonicOscillator.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/HarmonicOscillator.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; -import org.apache.commons.math.analysis.ParametricUnivariateFunction; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.analysis.ParametricUnivariateFunction; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.util.FastMath; /** * diff --git a/src/main/java/org/apache/commons/math/analysis/function/Identity.java b/src/main/java/org/apache/commons/math3/analysis/function/Identity.java similarity index 90% rename from src/main/java/org/apache/commons/math/analysis/function/Identity.java rename to src/main/java/org/apache/commons/math3/analysis/function/Identity.java index b63f812f3..cd51bbaf1 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Identity.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Identity.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; /** * Identity function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Inverse.java b/src/main/java/org/apache/commons/math3/analysis/function/Inverse.java similarity index 87% rename from src/main/java/org/apache/commons/math/analysis/function/Inverse.java rename to src/main/java/org/apache/commons/math3/analysis/function/Inverse.java index 999a0b0e0..169799f3a 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Inverse.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Inverse.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; /** * Inverse function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Log.java b/src/main/java/org/apache/commons/math3/analysis/function/Log.java similarity index 84% rename from src/main/java/org/apache/commons/math/analysis/function/Log.java rename to src/main/java/org/apache/commons/math3/analysis/function/Log.java index b979a26d5..26d05db93 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Log.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Log.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.util.FastMath; /** * Natural logarithm function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Log10.java b/src/main/java/org/apache/commons/math3/analysis/function/Log10.java similarity index 85% rename from src/main/java/org/apache/commons/math/analysis/function/Log10.java rename to src/main/java/org/apache/commons/math3/analysis/function/Log10.java index bbbef8bde..4cb1230f5 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Log10.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Log10.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.util.FastMath; /** * Base 10 logarithm function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Log1p.java b/src/main/java/org/apache/commons/math3/analysis/function/Log1p.java similarity index 84% rename from src/main/java/org/apache/commons/math/analysis/function/Log1p.java rename to src/main/java/org/apache/commons/math3/analysis/function/Log1p.java index adc1b1091..298b0bfeb 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Log1p.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Log1p.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.util.FastMath; /** * log(1 + p) function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Logistic.java b/src/main/java/org/apache/commons/math3/analysis/function/Logistic.java similarity index 93% rename from src/main/java/org/apache/commons/math/analysis/function/Logistic.java rename to src/main/java/org/apache/commons/math3/analysis/function/Logistic.java index 8dab5485d..f7981b7d4 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Logistic.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Logistic.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; -import org.apache.commons.math.analysis.ParametricUnivariateFunction; -import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.analysis.ParametricUnivariateFunction; +import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.util.FastMath; /** * diff --git a/src/main/java/org/apache/commons/math/analysis/function/Logit.java b/src/main/java/org/apache/commons/math3/analysis/function/Logit.java similarity index 90% rename from src/main/java/org/apache/commons/math/analysis/function/Logit.java rename to src/main/java/org/apache/commons/math3/analysis/function/Logit.java index e1d90aeab..1388c119f 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Logit.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Logit.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; -import org.apache.commons.math.analysis.ParametricUnivariateFunction; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.OutOfRangeException; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.analysis.ParametricUnivariateFunction; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.OutOfRangeException; +import org.apache.commons.math3.util.FastMath; /** * diff --git a/src/main/java/org/apache/commons/math/analysis/function/Max.java b/src/main/java/org/apache/commons/math3/analysis/function/Max.java similarity index 86% rename from src/main/java/org/apache/commons/math/analysis/function/Max.java rename to src/main/java/org/apache/commons/math3/analysis/function/Max.java index 19801fa73..3ec68ffc7 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Max.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Max.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.BivariateFunction; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.BivariateFunction; +import org.apache.commons.math3.util.FastMath; /** * Maximum function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Min.java b/src/main/java/org/apache/commons/math3/analysis/function/Min.java similarity index 86% rename from src/main/java/org/apache/commons/math/analysis/function/Min.java rename to src/main/java/org/apache/commons/math3/analysis/function/Min.java index 12ab98fb3..3f691df97 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Min.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Min.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.BivariateFunction; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.BivariateFunction; +import org.apache.commons.math3.util.FastMath; /** * Minimum function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Minus.java b/src/main/java/org/apache/commons/math3/analysis/function/Minus.java similarity index 90% rename from src/main/java/org/apache/commons/math/analysis/function/Minus.java rename to src/main/java/org/apache/commons/math3/analysis/function/Minus.java index e78a15c4f..12346b9eb 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Minus.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Minus.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; /** * Minus function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Multiply.java b/src/main/java/org/apache/commons/math3/analysis/function/Multiply.java similarity index 90% rename from src/main/java/org/apache/commons/math/analysis/function/Multiply.java rename to src/main/java/org/apache/commons/math3/analysis/function/Multiply.java index 47c265308..291154508 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Multiply.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Multiply.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.BivariateFunction; +import org.apache.commons.math3.analysis.BivariateFunction; /** * Multiply the two operands. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Pow.java b/src/main/java/org/apache/commons/math3/analysis/function/Pow.java similarity index 86% rename from src/main/java/org/apache/commons/math/analysis/function/Pow.java rename to src/main/java/org/apache/commons/math3/analysis/function/Pow.java index 101967516..7a1428b30 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Pow.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Pow.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.BivariateFunction; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.BivariateFunction; +import org.apache.commons.math3.util.FastMath; /** * Power function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Power.java b/src/main/java/org/apache/commons/math3/analysis/function/Power.java similarity index 86% rename from src/main/java/org/apache/commons/math/analysis/function/Power.java rename to src/main/java/org/apache/commons/math3/analysis/function/Power.java index eaa1c083a..907cb7b7d 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Power.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Power.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.util.FastMath; /** * Power function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Rint.java b/src/main/java/org/apache/commons/math3/analysis/function/Rint.java similarity index 86% rename from src/main/java/org/apache/commons/math/analysis/function/Rint.java rename to src/main/java/org/apache/commons/math3/analysis/function/Rint.java index 37019e722..628152707 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Rint.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Rint.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.util.FastMath; /** * {@code rint} function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Sigmoid.java b/src/main/java/org/apache/commons/math3/analysis/function/Sigmoid.java similarity index 92% rename from src/main/java/org/apache/commons/math/analysis/function/Sigmoid.java rename to src/main/java/org/apache/commons/math3/analysis/function/Sigmoid.java index 3b9799be2..3695697fe 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Sigmoid.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Sigmoid.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; -import org.apache.commons.math.analysis.ParametricUnivariateFunction; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.analysis.ParametricUnivariateFunction; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.util.FastMath; /** * diff --git a/src/main/java/org/apache/commons/math/analysis/function/Signum.java b/src/main/java/org/apache/commons/math3/analysis/function/Signum.java similarity index 86% rename from src/main/java/org/apache/commons/math/analysis/function/Signum.java rename to src/main/java/org/apache/commons/math3/analysis/function/Signum.java index 9f8e4dfbb..f39331545 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Signum.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Signum.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.util.FastMath; /** * {@code signum} function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Sin.java b/src/main/java/org/apache/commons/math3/analysis/function/Sin.java similarity index 86% rename from src/main/java/org/apache/commons/math/analysis/function/Sin.java rename to src/main/java/org/apache/commons/math3/analysis/function/Sin.java index cd586ba97..8096e846a 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Sin.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Sin.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.util.FastMath; /** * Sine function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Sinc.java b/src/main/java/org/apache/commons/math3/analysis/function/Sinc.java similarity index 93% rename from src/main/java/org/apache/commons/math/analysis/function/Sinc.java rename to src/main/java/org/apache/commons/math3/analysis/function/Sinc.java index 1c69ce078..10634edfb 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Sinc.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Sinc.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.util.FastMath; /** * Sinc function, diff --git a/src/main/java/org/apache/commons/math/analysis/function/Sinh.java b/src/main/java/org/apache/commons/math3/analysis/function/Sinh.java similarity index 86% rename from src/main/java/org/apache/commons/math/analysis/function/Sinh.java rename to src/main/java/org/apache/commons/math3/analysis/function/Sinh.java index a4a8c61ce..93445f91f 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Sinh.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Sinh.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.util.FastMath; /** * Hyperbolic sine function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Sqrt.java b/src/main/java/org/apache/commons/math3/analysis/function/Sqrt.java similarity index 84% rename from src/main/java/org/apache/commons/math/analysis/function/Sqrt.java rename to src/main/java/org/apache/commons/math3/analysis/function/Sqrt.java index 558587161..e71980a5d 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Sqrt.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Sqrt.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.util.FastMath; /** * Square-root function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/StepFunction.java b/src/main/java/org/apache/commons/math3/analysis/function/StepFunction.java similarity index 87% rename from src/main/java/org/apache/commons/math/analysis/function/StepFunction.java rename to src/main/java/org/apache/commons/math3/analysis/function/StepFunction.java index 0ee066cea..f06682f46 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/StepFunction.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/StepFunction.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; import java.util.Arrays; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.exception.NoDataException; -import org.apache.commons.math.util.MathArrays; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.exception.NoDataException; +import org.apache.commons.math3.util.MathArrays; /** * @@ -50,7 +50,7 @@ public class StepFunction implements UnivariateFunction { * * @param x Domain values where the function changes value. * @param y Values of the function. - * @throws org.apache.commons.math.exception.NonMonotonicSequenceException + * @throws org.apache.commons.math3.exception.NonMonotonicSequenceException * if the {@code x} array is not sorted in strictly increasing order. * @throws NullArgumentException if {@code x} or {@code y} are {@code null}. * @throws NoDataException if {@code x} or {@code y} are zero-length. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Subtract.java b/src/main/java/org/apache/commons/math3/analysis/function/Subtract.java similarity index 90% rename from src/main/java/org/apache/commons/math/analysis/function/Subtract.java rename to src/main/java/org/apache/commons/math3/analysis/function/Subtract.java index 392ea11cd..01ee5211a 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Subtract.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Subtract.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.BivariateFunction; +import org.apache.commons.math3.analysis.BivariateFunction; /** * Subtract the second operand from the first. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Tan.java b/src/main/java/org/apache/commons/math3/analysis/function/Tan.java similarity index 85% rename from src/main/java/org/apache/commons/math/analysis/function/Tan.java rename to src/main/java/org/apache/commons/math3/analysis/function/Tan.java index 8e4fc39f2..34b90a017 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Tan.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Tan.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.util.FastMath; /** * Tangent function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Tanh.java b/src/main/java/org/apache/commons/math3/analysis/function/Tanh.java similarity index 85% rename from src/main/java/org/apache/commons/math/analysis/function/Tanh.java rename to src/main/java/org/apache/commons/math3/analysis/function/Tanh.java index 43920365c..c9662e58f 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Tanh.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Tanh.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.util.FastMath; /** * Hyperbolic tangent function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/Ulp.java b/src/main/java/org/apache/commons/math3/analysis/function/Ulp.java similarity index 86% rename from src/main/java/org/apache/commons/math/analysis/function/Ulp.java rename to src/main/java/org/apache/commons/math3/analysis/function/Ulp.java index 4740835bc..8f1399596 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/Ulp.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/Ulp.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.util.FastMath; /** * {@code ulp} function. diff --git a/src/main/java/org/apache/commons/math/analysis/function/package-info.java b/src/main/java/org/apache/commons/math3/analysis/function/package-info.java similarity index 95% rename from src/main/java/org/apache/commons/math/analysis/function/package-info.java rename to src/main/java/org/apache/commons/math3/analysis/function/package-info.java index 148939c4a..cb24544a9 100644 --- a/src/main/java/org/apache/commons/math/analysis/function/package-info.java +++ b/src/main/java/org/apache/commons/math3/analysis/function/package-info.java @@ -23,4 +23,4 @@ *

* */ -package org.apache.commons.math.analysis.function; +package org.apache.commons.math3.analysis.function; diff --git a/src/main/java/org/apache/commons/math/analysis/integration/BaseAbstractUnivariateIntegrator.java b/src/main/java/org/apache/commons/math3/analysis/integration/BaseAbstractUnivariateIntegrator.java similarity index 92% rename from src/main/java/org/apache/commons/math/analysis/integration/BaseAbstractUnivariateIntegrator.java rename to src/main/java/org/apache/commons/math3/analysis/integration/BaseAbstractUnivariateIntegrator.java index d4fa43a1c..fe5acee79 100644 --- a/src/main/java/org/apache/commons/math/analysis/integration/BaseAbstractUnivariateIntegrator.java +++ b/src/main/java/org/apache/commons/math3/analysis/integration/BaseAbstractUnivariateIntegrator.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.integration; +package org.apache.commons.math3.analysis.integration; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.analysis.solvers.UnivariateSolverUtils; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.MaxCountExceededException; -import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.exception.NumberIsTooSmallException; -import org.apache.commons.math.exception.TooManyEvaluationsException; -import org.apache.commons.math.util.Incrementor; -import org.apache.commons.math.util.MathUtils; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.solvers.UnivariateSolverUtils; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.MaxCountExceededException; +import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.exception.NumberIsTooSmallException; +import org.apache.commons.math3.exception.TooManyEvaluationsException; +import org.apache.commons.math3.util.Incrementor; +import org.apache.commons.math3.util.MathUtils; /** * Provide a default implementation for several generic functions. @@ -81,7 +81,7 @@ public abstract class BaseAbstractUnivariateIntegrator implements UnivariateInte * achieved due to large values or short mantissa length. If this * should be the primary criterion for convergence rather then a * safety measure, set the absolute accuracy to a ridiculously small value, - * like {@link org.apache.commons.math.util.Precision#SAFE_MIN Precision.SAFE_MIN}. + * like {@link org.apache.commons.math3.util.Precision#SAFE_MIN Precision.SAFE_MIN}. *
  • absolute accuracy: * The default is usually chosen so that results in the interval * -10..-0.1 and +0.1..+10 can be found with a reasonable accuracy. If the diff --git a/src/main/java/org/apache/commons/math/analysis/integration/LegendreGaussIntegrator.java b/src/main/java/org/apache/commons/math3/analysis/integration/LegendreGaussIntegrator.java similarity index 94% rename from src/main/java/org/apache/commons/math/analysis/integration/LegendreGaussIntegrator.java rename to src/main/java/org/apache/commons/math3/analysis/integration/LegendreGaussIntegrator.java index d5850e194..8b4b99673 100644 --- a/src/main/java/org/apache/commons/math/analysis/integration/LegendreGaussIntegrator.java +++ b/src/main/java/org/apache/commons/math3/analysis/integration/LegendreGaussIntegrator.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.integration; +package org.apache.commons.math3.analysis.integration; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.MaxCountExceededException; -import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.exception.NumberIsTooSmallException; -import org.apache.commons.math.exception.TooManyEvaluationsException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.MaxCountExceededException; +import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math3.exception.NumberIsTooSmallException; +import org.apache.commons.math3.exception.TooManyEvaluationsException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.util.FastMath; /** * Implements the diff --git a/src/main/java/org/apache/commons/math/analysis/integration/RombergIntegrator.java b/src/main/java/org/apache/commons/math3/analysis/integration/RombergIntegrator.java similarity index 93% rename from src/main/java/org/apache/commons/math/analysis/integration/RombergIntegrator.java rename to src/main/java/org/apache/commons/math3/analysis/integration/RombergIntegrator.java index 841c2a7b9..fd2f07e33 100644 --- a/src/main/java/org/apache/commons/math/analysis/integration/RombergIntegrator.java +++ b/src/main/java/org/apache/commons/math3/analysis/integration/RombergIntegrator.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.integration; +package org.apache.commons.math3.analysis.integration; -import org.apache.commons.math.exception.MaxCountExceededException; -import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.exception.NumberIsTooLargeException; -import org.apache.commons.math.exception.NumberIsTooSmallException; -import org.apache.commons.math.exception.TooManyEvaluationsException; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.MaxCountExceededException; +import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math3.exception.NumberIsTooLargeException; +import org.apache.commons.math3.exception.NumberIsTooSmallException; +import org.apache.commons.math3.exception.TooManyEvaluationsException; +import org.apache.commons.math3.util.FastMath; /** * Implements the diff --git a/src/main/java/org/apache/commons/math/analysis/integration/SimpsonIntegrator.java b/src/main/java/org/apache/commons/math3/analysis/integration/SimpsonIntegrator.java similarity index 92% rename from src/main/java/org/apache/commons/math/analysis/integration/SimpsonIntegrator.java rename to src/main/java/org/apache/commons/math3/analysis/integration/SimpsonIntegrator.java index 0bbb748a7..160b2527e 100644 --- a/src/main/java/org/apache/commons/math/analysis/integration/SimpsonIntegrator.java +++ b/src/main/java/org/apache/commons/math3/analysis/integration/SimpsonIntegrator.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.integration; +package org.apache.commons.math3.analysis.integration; -import org.apache.commons.math.exception.MaxCountExceededException; -import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.exception.NumberIsTooLargeException; -import org.apache.commons.math.exception.NumberIsTooSmallException; -import org.apache.commons.math.exception.TooManyEvaluationsException; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.MaxCountExceededException; +import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math3.exception.NumberIsTooLargeException; +import org.apache.commons.math3.exception.NumberIsTooSmallException; +import org.apache.commons.math3.exception.TooManyEvaluationsException; +import org.apache.commons.math3.util.FastMath; /** * Implements diff --git a/src/main/java/org/apache/commons/math/analysis/integration/TrapezoidIntegrator.java b/src/main/java/org/apache/commons/math3/analysis/integration/TrapezoidIntegrator.java similarity index 93% rename from src/main/java/org/apache/commons/math/analysis/integration/TrapezoidIntegrator.java rename to src/main/java/org/apache/commons/math3/analysis/integration/TrapezoidIntegrator.java index 3f7d817b7..265327472 100644 --- a/src/main/java/org/apache/commons/math/analysis/integration/TrapezoidIntegrator.java +++ b/src/main/java/org/apache/commons/math3/analysis/integration/TrapezoidIntegrator.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.integration; +package org.apache.commons.math3.analysis.integration; -import org.apache.commons.math.exception.MaxCountExceededException; -import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.exception.NumberIsTooLargeException; -import org.apache.commons.math.exception.NumberIsTooSmallException; -import org.apache.commons.math.exception.TooManyEvaluationsException; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.MaxCountExceededException; +import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math3.exception.NumberIsTooLargeException; +import org.apache.commons.math3.exception.NumberIsTooSmallException; +import org.apache.commons.math3.exception.TooManyEvaluationsException; +import org.apache.commons.math3.util.FastMath; /** * Implements the diff --git a/src/main/java/org/apache/commons/math/analysis/integration/UnivariateIntegrator.java b/src/main/java/org/apache/commons/math3/analysis/integration/UnivariateIntegrator.java similarity index 88% rename from src/main/java/org/apache/commons/math/analysis/integration/UnivariateIntegrator.java rename to src/main/java/org/apache/commons/math3/analysis/integration/UnivariateIntegrator.java index 1252248c4..65bcad183 100644 --- a/src/main/java/org/apache/commons/math/analysis/integration/UnivariateIntegrator.java +++ b/src/main/java/org/apache/commons/math3/analysis/integration/UnivariateIntegrator.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.integration; +package org.apache.commons.math3.analysis.integration; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.MaxCountExceededException; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.exception.TooManyEvaluationsException; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.MaxCountExceededException; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.exception.TooManyEvaluationsException; /** * Interface for univariate real integration algorithms. diff --git a/src/main/java/org/apache/commons/math/analysis/integration/package-info.java b/src/main/java/org/apache/commons/math3/analysis/integration/package-info.java similarity index 94% rename from src/main/java/org/apache/commons/math/analysis/integration/package-info.java rename to src/main/java/org/apache/commons/math3/analysis/integration/package-info.java index a2d2d94b0..f4df3ba66 100644 --- a/src/main/java/org/apache/commons/math/analysis/integration/package-info.java +++ b/src/main/java/org/apache/commons/math3/analysis/integration/package-info.java @@ -19,4 +19,4 @@ * Numerical integration (quadrature) algorithms for univariate real functions. * */ -package org.apache.commons.math.analysis.integration; +package org.apache.commons.math3.analysis.integration; diff --git a/src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolatingFunction.java b/src/main/java/org/apache/commons/math3/analysis/interpolation/BicubicSplineInterpolatingFunction.java similarity index 97% rename from src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolatingFunction.java rename to src/main/java/org/apache/commons/math3/analysis/interpolation/BicubicSplineInterpolatingFunction.java index 33f91ada4..58044a50a 100644 --- a/src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolatingFunction.java +++ b/src/main/java/org/apache/commons/math3/analysis/interpolation/BicubicSplineInterpolatingFunction.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.interpolation; +package org.apache.commons.math3.analysis.interpolation; -import org.apache.commons.math.analysis.BivariateFunction; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.NoDataException; -import org.apache.commons.math.exception.OutOfRangeException; -import org.apache.commons.math.util.MathArrays; +import org.apache.commons.math3.analysis.BivariateFunction; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.NoDataException; +import org.apache.commons.math3.exception.OutOfRangeException; +import org.apache.commons.math3.util.MathArrays; /** * Function that implements the @@ -84,7 +84,7 @@ public class BicubicSplineInterpolatingFunction * every grid point. * @throws DimensionMismatchException if the various arrays do not contain * the expected number of elements. - * @throws org.apache.commons.math.exception.NonMonotonicSequenceException + * @throws org.apache.commons.math3.exception.NonMonotonicSequenceException * if {@code x} or {@code y} are not strictly increasing. * @throws NoDataException if any of the arrays has zero length. */ diff --git a/src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolator.java b/src/main/java/org/apache/commons/math3/analysis/interpolation/BicubicSplineInterpolator.java similarity index 93% rename from src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolator.java rename to src/main/java/org/apache/commons/math3/analysis/interpolation/BicubicSplineInterpolator.java index 7d71c3992..9f14a730f 100644 --- a/src/main/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolator.java +++ b/src/main/java/org/apache/commons/math3/analysis/interpolation/BicubicSplineInterpolator.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.interpolation; +package org.apache.commons.math3.analysis.interpolation; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.analysis.polynomials.PolynomialSplineFunction; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.NoDataException; -import org.apache.commons.math.util.MathArrays; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.polynomials.PolynomialSplineFunction; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.NoDataException; +import org.apache.commons.math3.util.MathArrays; /** * Generates a bicubic interpolating function. diff --git a/src/main/java/org/apache/commons/math/analysis/interpolation/BivariateGridInterpolator.java b/src/main/java/org/apache/commons/math3/analysis/interpolation/BivariateGridInterpolator.java similarity index 86% rename from src/main/java/org/apache/commons/math/analysis/interpolation/BivariateGridInterpolator.java rename to src/main/java/org/apache/commons/math3/analysis/interpolation/BivariateGridInterpolator.java index 735a33d21..6e1029745 100644 --- a/src/main/java/org/apache/commons/math/analysis/interpolation/BivariateGridInterpolator.java +++ b/src/main/java/org/apache/commons/math3/analysis/interpolation/BivariateGridInterpolator.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.interpolation; +package org.apache.commons.math3.analysis.interpolation; -import org.apache.commons.math.analysis.BivariateFunction; +import org.apache.commons.math3.analysis.BivariateFunction; /** * Interface representing a bivariate real interpolating function where the @@ -35,9 +35,9 @@ public interface BivariateGridInterpolator { * @param fval The values of the interpolation points on all the grid knots: * {@code fval[i][j] = f(xval[i], yval[j])}. * @return a function which interpolates the dataset. - * @throws org.apache.commons.math.exception.NoDataException if any of + * @throws org.apache.commons.math3.exception.NoDataException if any of * the arrays has zero length. - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if the array lengths are inconsistent. */ BivariateFunction interpolate(double[] xval, double[] yval, diff --git a/src/main/java/org/apache/commons/math/analysis/interpolation/DividedDifferenceInterpolator.java b/src/main/java/org/apache/commons/math3/analysis/interpolation/DividedDifferenceInterpolator.java similarity index 85% rename from src/main/java/org/apache/commons/math/analysis/interpolation/DividedDifferenceInterpolator.java rename to src/main/java/org/apache/commons/math3/analysis/interpolation/DividedDifferenceInterpolator.java index 10b27bbb2..afc94c50d 100644 --- a/src/main/java/org/apache/commons/math/analysis/interpolation/DividedDifferenceInterpolator.java +++ b/src/main/java/org/apache/commons/math3/analysis/interpolation/DividedDifferenceInterpolator.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.interpolation; +package org.apache.commons.math3.analysis.interpolation; import java.io.Serializable; -import org.apache.commons.math.analysis.polynomials.PolynomialFunctionLagrangeForm; -import org.apache.commons.math.analysis.polynomials.PolynomialFunctionNewtonForm; +import org.apache.commons.math3.analysis.polynomials.PolynomialFunctionLagrangeForm; +import org.apache.commons.math3.analysis.polynomials.PolynomialFunctionNewtonForm; /** * Implements the @@ -160,18 +160,18 @@ public class LoessInterpolator * Compute an interpolating function by performing a loess fit * on the data at the original abscissae and then building a cubic spline * with a - * {@link org.apache.commons.math.analysis.interpolation.SplineInterpolator} + * {@link org.apache.commons.math3.analysis.interpolation.SplineInterpolator} * on the resulting fit. * * @param xval the arguments for the interpolation points * @param yval the values for the interpolation points * @return A cubic spline built upon a loess fit to the data at the original abscissae - * @throws org.apache.commons.math.exception.NonMonotonicSequenceException + * @throws org.apache.commons.math3.exception.NonMonotonicSequenceException * if {@code xval} not sorted in strictly increasing order. * @throws DimensionMismatchException if {@code xval} and {@code yval} have * different sizes. * @throws NoDataException if {@code xval} or {@code yval} has zero size. - * @throws org.apache.commons.math.exception.NotFiniteNumberException if + * @throws org.apache.commons.math3.exception.NotFiniteNumberException if * any of the arguments and values are not finite real numbers. * @throws NumberIsTooSmallException if the bandwidth is too small to * accomodate the size of the input data (i.e. the bandwidth must be @@ -189,12 +189,12 @@ public class LoessInterpolator * @param weights point weights: coefficients by which the robustness weight * of a point is multiplied. * @return the values of the loess fit at corresponding original abscissae. - * @throws org.apache.commons.math.exception.NonMonotonicSequenceException + * @throws org.apache.commons.math3.exception.NonMonotonicSequenceException * if {@code xval} not sorted in strictly increasing order. * @throws DimensionMismatchException if {@code xval} and {@code yval} have * different sizes. * @throws NoDataException if {@code xval} or {@code yval} has zero size. - * @throws org.apache.commons.math.exception.NotFiniteNumberException if + * @throws org.apache.commons.math3.exception.NotFiniteNumberException if * any of the arguments and values are not finite real numbers. * @throws NumberIsTooSmallException if the bandwidth is too small to * accomodate the size of the input data (i.e. the bandwidth must be @@ -353,12 +353,12 @@ public class LoessInterpolator * @param xval the arguments for the interpolation points * @param yval the values for the interpolation points * @return values of the loess fit at corresponding original abscissae - * @throws org.apache.commons.math.exception.NonMonotonicSequenceException + * @throws org.apache.commons.math3.exception.NonMonotonicSequenceException * if {@code xval} not sorted in strictly increasing order. * @throws DimensionMismatchException if {@code xval} and {@code yval} have * different sizes. * @throws NoDataException if {@code xval} or {@code yval} has zero size. - * @throws org.apache.commons.math.exception.NotFiniteNumberException if + * @throws org.apache.commons.math3.exception.NotFiniteNumberException if * any of the arguments and values are not finite real numbers. * @throws NumberIsTooSmallException if the bandwidth is too small to * accomodate the size of the input data (i.e. the bandwidth must be @@ -443,7 +443,7 @@ public class LoessInterpolator * Check that all elements of an array are finite real numbers. * * @param values Values array. - * @throws org.apache.commons.math.exception.NotFiniteNumberException + * @throws org.apache.commons.math3.exception.NotFiniteNumberException * if one of the values is not a finite real number. */ private static void checkAllFiniteReal(final double[] values) { diff --git a/src/main/java/org/apache/commons/math/analysis/interpolation/MicrosphereInterpolatingFunction.java b/src/main/java/org/apache/commons/math3/analysis/interpolation/MicrosphereInterpolatingFunction.java similarity index 94% rename from src/main/java/org/apache/commons/math/analysis/interpolation/MicrosphereInterpolatingFunction.java rename to src/main/java/org/apache/commons/math3/analysis/interpolation/MicrosphereInterpolatingFunction.java index bc6bc629c..ee6112698 100644 --- a/src/main/java/org/apache/commons/math/analysis/interpolation/MicrosphereInterpolatingFunction.java +++ b/src/main/java/org/apache/commons/math3/analysis/interpolation/MicrosphereInterpolatingFunction.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.interpolation; +package org.apache.commons.math3.analysis.interpolation; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.math.analysis.MultivariateFunction; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.NoDataException; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.linear.ArrayRealVector; -import org.apache.commons.math.linear.RealVector; -import org.apache.commons.math.random.UnitSphereRandomVectorGenerator; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.MultivariateFunction; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.NoDataException; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.linear.ArrayRealVector; +import org.apache.commons.math3.linear.RealVector; +import org.apache.commons.math3.random.UnitSphereRandomVectorGenerator; +import org.apache.commons.math3.util.FastMath; /** * Interpolating function that implements the diff --git a/src/main/java/org/apache/commons/math/analysis/interpolation/MicrosphereInterpolator.java b/src/main/java/org/apache/commons/math3/analysis/interpolation/MicrosphereInterpolator.java similarity index 91% rename from src/main/java/org/apache/commons/math/analysis/interpolation/MicrosphereInterpolator.java rename to src/main/java/org/apache/commons/math3/analysis/interpolation/MicrosphereInterpolator.java index 53dfd479d..31dec099d 100644 --- a/src/main/java/org/apache/commons/math/analysis/interpolation/MicrosphereInterpolator.java +++ b/src/main/java/org/apache/commons/math3/analysis/interpolation/MicrosphereInterpolator.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.interpolation; +package org.apache.commons.math3.analysis.interpolation; -import org.apache.commons.math.analysis.MultivariateFunction; -import org.apache.commons.math.exception.NotPositiveException; -import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.random.UnitSphereRandomVectorGenerator; +import org.apache.commons.math3.analysis.MultivariateFunction; +import org.apache.commons.math3.exception.NotPositiveException; +import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math3.random.UnitSphereRandomVectorGenerator; /** * Interpolator that implements the algorithm described in diff --git a/src/main/java/org/apache/commons/math/analysis/interpolation/MultivariateInterpolator.java b/src/main/java/org/apache/commons/math3/analysis/interpolation/MultivariateInterpolator.java similarity index 80% rename from src/main/java/org/apache/commons/math/analysis/interpolation/MultivariateInterpolator.java rename to src/main/java/org/apache/commons/math3/analysis/interpolation/MultivariateInterpolator.java index 261b3075a..39239567f 100644 --- a/src/main/java/org/apache/commons/math/analysis/interpolation/MultivariateInterpolator.java +++ b/src/main/java/org/apache/commons/math3/analysis/interpolation/MultivariateInterpolator.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.interpolation; +package org.apache.commons.math3.analysis.interpolation; -import org.apache.commons.math.analysis.MultivariateFunction; +import org.apache.commons.math3.analysis.MultivariateFunction; /** * Interface representing a univariate real interpolating function. @@ -36,14 +36,14 @@ public interface MultivariateInterpolator { * point (where {@code d} is thus the dimension of the space). * @param yval the values for the interpolation points * @return a function which interpolates the data set - * @throws org.apache.commons.math.exception.MathIllegalArgumentException + * @throws org.apache.commons.math3.exception.MathIllegalArgumentException * if the arguments violate assumptions made by the interpolation * algorithm. - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * when the array dimensions are not consistent. - * @throws org.apache.commons.math.exception.NoDataException if an + * @throws org.apache.commons.math3.exception.NoDataException if an * array has zero-length. - * @throws org.apache.commons.math.exception.NullArgumentException if + * @throws org.apache.commons.math3.exception.NullArgumentException if * the arguments are {@code null}. */ MultivariateFunction interpolate(double[][] xval, double[] yval); diff --git a/src/main/java/org/apache/commons/math/analysis/interpolation/NevilleInterpolator.java b/src/main/java/org/apache/commons/math3/analysis/interpolation/NevilleInterpolator.java similarity index 83% rename from src/main/java/org/apache/commons/math/analysis/interpolation/NevilleInterpolator.java rename to src/main/java/org/apache/commons/math3/analysis/interpolation/NevilleInterpolator.java index 9fc8b62be..e4986a596 100644 --- a/src/main/java/org/apache/commons/math/analysis/interpolation/NevilleInterpolator.java +++ b/src/main/java/org/apache/commons/math3/analysis/interpolation/NevilleInterpolator.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.interpolation; +package org.apache.commons.math3.analysis.interpolation; import java.io.Serializable; -import org.apache.commons.math.analysis.polynomials.PolynomialFunctionLagrangeForm; +import org.apache.commons.math3.analysis.polynomials.PolynomialFunctionLagrangeForm; /** * Implements the @@ -44,11 +44,11 @@ public class NevilleInterpolator implements UnivariateInterpolator, * @param x the interpolating points array * @param y the interpolating values array * @return a function which interpolates the data set - * @throws org.apache.commons.math.exception.DimensionMismatchException if + * @throws org.apache.commons.math3.exception.DimensionMismatchException if * the array lengths are different. - * @throws org.apache.commons.math.exception.NumberIsTooSmallException if + * @throws org.apache.commons.math3.exception.NumberIsTooSmallException if * the number of points is less than 2. - * @throws org.apache.commons.math.exception.NonMonotonicSequenceException + * @throws org.apache.commons.math3.exception.NonMonotonicSequenceException * if two abscissae have the same value. */ public PolynomialFunctionLagrangeForm interpolate(double x[], double y[]) { diff --git a/src/main/java/org/apache/commons/math/analysis/interpolation/SmoothingPolynomialBicubicSplineInterpolator.java b/src/main/java/org/apache/commons/math3/analysis/interpolation/SmoothingPolynomialBicubicSplineInterpolator.java similarity index 91% rename from src/main/java/org/apache/commons/math/analysis/interpolation/SmoothingPolynomialBicubicSplineInterpolator.java rename to src/main/java/org/apache/commons/math3/analysis/interpolation/SmoothingPolynomialBicubicSplineInterpolator.java index 87e88b6ba..4047226e3 100644 --- a/src/main/java/org/apache/commons/math/analysis/interpolation/SmoothingPolynomialBicubicSplineInterpolator.java +++ b/src/main/java/org/apache/commons/math3/analysis/interpolation/SmoothingPolynomialBicubicSplineInterpolator.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.interpolation; +package org.apache.commons.math3.analysis.interpolation; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.NoDataException; -import org.apache.commons.math.util.MathArrays; -import org.apache.commons.math.optimization.general.GaussNewtonOptimizer; -import org.apache.commons.math.optimization.fitting.PolynomialFitter; -import org.apache.commons.math.analysis.polynomials.PolynomialFunction; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.NoDataException; +import org.apache.commons.math3.util.MathArrays; +import org.apache.commons.math3.optimization.general.GaussNewtonOptimizer; +import org.apache.commons.math3.optimization.fitting.PolynomialFitter; +import org.apache.commons.math3.analysis.polynomials.PolynomialFunction; /** * 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/math3/analysis/interpolation/SplineInterpolator.java similarity index 90% rename from src/main/java/org/apache/commons/math/analysis/interpolation/SplineInterpolator.java rename to src/main/java/org/apache/commons/math3/analysis/interpolation/SplineInterpolator.java index 7fce2eda2..d16bd42e6 100644 --- a/src/main/java/org/apache/commons/math/analysis/interpolation/SplineInterpolator.java +++ b/src/main/java/org/apache/commons/math3/analysis/interpolation/SplineInterpolator.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.interpolation; +package org.apache.commons.math3.analysis.interpolation; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.util.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.MathArrays; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.NumberIsTooSmallException; +import org.apache.commons.math3.analysis.polynomials.PolynomialFunction; +import org.apache.commons.math3.analysis.polynomials.PolynomialSplineFunction; +import org.apache.commons.math3.util.MathArrays; /** * Computes a natural (also known as "free", "unclamped") cubic spline interpolation for the data set. @@ -59,7 +59,7 @@ public class SplineInterpolator implements UnivariateInterpolator { * @return a function which interpolates the data set * @throws DimensionMismatchException if {@code x} and {@code y} * have different sizes. - * @throws org.apache.commons.math.exception.NonMonotonicSequenceException + * @throws org.apache.commons.math3.exception.NonMonotonicSequenceException * if {@code x} is not sorted in strict increasing order. * @throws NumberIsTooSmallException if the size of {@code x} is smaller * than 3. diff --git a/src/main/java/org/apache/commons/math/analysis/interpolation/TricubicSplineInterpolatingFunction.java b/src/main/java/org/apache/commons/math3/analysis/interpolation/TricubicSplineInterpolatingFunction.java similarity index 98% rename from src/main/java/org/apache/commons/math/analysis/interpolation/TricubicSplineInterpolatingFunction.java rename to src/main/java/org/apache/commons/math3/analysis/interpolation/TricubicSplineInterpolatingFunction.java index 14c481572..7a71778cf 100644 --- a/src/main/java/org/apache/commons/math/analysis/interpolation/TricubicSplineInterpolatingFunction.java +++ b/src/main/java/org/apache/commons/math3/analysis/interpolation/TricubicSplineInterpolatingFunction.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.interpolation; +package org.apache.commons.math3.analysis.interpolation; -import org.apache.commons.math.analysis.TrivariateFunction; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.NoDataException; -import org.apache.commons.math.exception.OutOfRangeException; -import org.apache.commons.math.util.MathArrays; +import org.apache.commons.math3.analysis.TrivariateFunction; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.NoDataException; +import org.apache.commons.math3.exception.OutOfRangeException; +import org.apache.commons.math3.util.MathArrays; /** * Function that implements the diff --git a/src/main/java/org/apache/commons/math/analysis/interpolation/TricubicSplineInterpolator.java b/src/main/java/org/apache/commons/math3/analysis/interpolation/TricubicSplineInterpolator.java similarity index 97% rename from src/main/java/org/apache/commons/math/analysis/interpolation/TricubicSplineInterpolator.java rename to src/main/java/org/apache/commons/math3/analysis/interpolation/TricubicSplineInterpolator.java index cba5733f2..7c5876dd6 100644 --- a/src/main/java/org/apache/commons/math/analysis/interpolation/TricubicSplineInterpolator.java +++ b/src/main/java/org/apache/commons/math3/analysis/interpolation/TricubicSplineInterpolator.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.interpolation; +package org.apache.commons.math3.analysis.interpolation; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.NoDataException; -import org.apache.commons.math.util.MathArrays; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.NoDataException; +import org.apache.commons.math3.util.MathArrays; /** * Generates a tricubic interpolating function. diff --git a/src/main/java/org/apache/commons/math/analysis/interpolation/TrivariateGridInterpolator.java b/src/main/java/org/apache/commons/math3/analysis/interpolation/TrivariateGridInterpolator.java similarity index 87% rename from src/main/java/org/apache/commons/math/analysis/interpolation/TrivariateGridInterpolator.java rename to src/main/java/org/apache/commons/math3/analysis/interpolation/TrivariateGridInterpolator.java index 34bfe6e49..767753215 100644 --- a/src/main/java/org/apache/commons/math/analysis/interpolation/TrivariateGridInterpolator.java +++ b/src/main/java/org/apache/commons/math3/analysis/interpolation/TrivariateGridInterpolator.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.interpolation; +package org.apache.commons.math3.analysis.interpolation; -import org.apache.commons.math.analysis.TrivariateFunction; +import org.apache.commons.math3.analysis.TrivariateFunction; /** * Interface representing a trivariate real interpolating function where the @@ -38,9 +38,9 @@ public interface TrivariateGridInterpolator { * @param fval the values of the interpolation points on all the grid knots: * {@code fval[i][j][k] = f(xval[i], yval[j], zval[k])}. * @return a function that interpolates the data set. - * @throws org.apache.commons.math.exception.NoDataException if any of + * @throws org.apache.commons.math3.exception.NoDataException if any of * the arrays has zero length. - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if the array lengths are inconsistent. */ TrivariateFunction interpolate(double[] xval, double[] yval, double[] zval, diff --git a/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariateInterpolator.java b/src/main/java/org/apache/commons/math3/analysis/interpolation/UnivariateInterpolator.java similarity index 87% rename from src/main/java/org/apache/commons/math/analysis/interpolation/UnivariateInterpolator.java rename to src/main/java/org/apache/commons/math3/analysis/interpolation/UnivariateInterpolator.java index f74ca439c..e32acd64b 100644 --- a/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariateInterpolator.java +++ b/src/main/java/org/apache/commons/math3/analysis/interpolation/UnivariateInterpolator.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.interpolation; +package org.apache.commons.math3.analysis.interpolation; -import org.apache.commons.math.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.UnivariateFunction; /** * Interface representing a univariate real interpolating function. @@ -30,7 +30,7 @@ public interface UnivariateInterpolator { * @param xval Arguments for the interpolation points. * @param yval Values for the interpolation points. * @return a function which interpolates the dataset. - * @throws org.apache.commons.math.exception.MathIllegalArgumentException + * @throws org.apache.commons.math3.exception.MathIllegalArgumentException * if the arguments violate assumptions made by the interpolation * algorithm. */ diff --git a/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariatePeriodicInterpolator.java b/src/main/java/org/apache/commons/math3/analysis/interpolation/UnivariatePeriodicInterpolator.java similarity index 93% rename from src/main/java/org/apache/commons/math/analysis/interpolation/UnivariatePeriodicInterpolator.java rename to src/main/java/org/apache/commons/math3/analysis/interpolation/UnivariatePeriodicInterpolator.java index 79f7c02ab..2ad4be977 100644 --- a/src/main/java/org/apache/commons/math/analysis/interpolation/UnivariatePeriodicInterpolator.java +++ b/src/main/java/org/apache/commons/math3/analysis/interpolation/UnivariatePeriodicInterpolator.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.interpolation; +package org.apache.commons.math3.analysis.interpolation; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.util.MathUtils; -import org.apache.commons.math.util.MathArrays; -import org.apache.commons.math.exception.NumberIsTooSmallException; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.util.MathUtils; +import org.apache.commons.math3.util.MathArrays; +import org.apache.commons.math3.exception.NumberIsTooSmallException; /** * Adapter for classes implementing the {@link UnivariateInterpolator} diff --git a/src/main/java/org/apache/commons/math/analysis/interpolation/package-info.java b/src/main/java/org/apache/commons/math3/analysis/interpolation/package-info.java similarity index 93% rename from src/main/java/org/apache/commons/math/analysis/interpolation/package-info.java rename to src/main/java/org/apache/commons/math3/analysis/interpolation/package-info.java index d0d5d409a..b4b25dd11 100644 --- a/src/main/java/org/apache/commons/math/analysis/interpolation/package-info.java +++ b/src/main/java/org/apache/commons/math3/analysis/interpolation/package-info.java @@ -19,4 +19,4 @@ * Univariate real functions interpolation algorithms. * */ -package org.apache.commons.math.analysis.interpolation; +package org.apache.commons.math3.analysis.interpolation; diff --git a/src/main/java/org/apache/commons/math/analysis/package-info.java b/src/main/java/org/apache/commons/math3/analysis/package-info.java similarity index 97% rename from src/main/java/org/apache/commons/math/analysis/package-info.java rename to src/main/java/org/apache/commons/math3/analysis/package-info.java index 259c7ee6c..dedbf0b7a 100644 --- a/src/main/java/org/apache/commons/math/analysis/package-info.java +++ b/src/main/java/org/apache/commons/math3/analysis/package-info.java @@ -30,4 +30,4 @@ *

    * */ -package org.apache.commons.math.analysis; +package org.apache.commons.math3.analysis; diff --git a/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunction.java b/src/main/java/org/apache/commons/math3/analysis/polynomials/PolynomialFunction.java similarity index 96% rename from src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunction.java rename to src/main/java/org/apache/commons/math3/analysis/polynomials/PolynomialFunction.java index 16bfb3068..3089bacaa 100644 --- a/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunction.java +++ b/src/main/java/org/apache/commons/math3/analysis/polynomials/PolynomialFunction.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.polynomials; +package org.apache.commons.math3.analysis.polynomials; import java.io.Serializable; import java.util.Arrays; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.exception.NoDataException; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.analysis.ParametricUnivariateFunction; -import org.apache.commons.math.util.FastMath; -import org.apache.commons.math.util.MathUtils; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.NoDataException; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.ParametricUnivariateFunction; +import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math3.util.MathUtils; /** * 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/math3/analysis/polynomials/PolynomialFunctionLagrangeForm.java similarity index 93% rename from src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionLagrangeForm.java rename to src/main/java/org/apache/commons/math3/analysis/polynomials/PolynomialFunctionLagrangeForm.java index 116c37ffe..aa05628a6 100644 --- a/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionLagrangeForm.java +++ b/src/main/java/org/apache/commons/math3/analysis/polynomials/PolynomialFunctionLagrangeForm.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.polynomials; +package org.apache.commons.math3.analysis.polynomials; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.util.FastMath; -import org.apache.commons.math.util.MathArrays; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.NumberIsTooSmallException; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math3.util.MathArrays; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.NumberIsTooSmallException; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** * Implements the representation of a real polynomial function in @@ -65,7 +65,7 @@ public class PolynomialFunctionLagrangeForm implements UnivariateFunction { * @param y function values at interpolating points * @throws DimensionMismatchException if the array lengths are different. * @throws NumberIsTooSmallException if the number of points is less than 2. - * @throws org.apache.commons.math.exception.NonMonotonicSequenceException + * @throws org.apache.commons.math3.exception.NonMonotonicSequenceException * if two abscissae have the same value. */ public PolynomialFunctionLagrangeForm(double x[], double y[]) { @@ -89,7 +89,7 @@ public class PolynomialFunctionLagrangeForm implements UnivariateFunction { * @return the function value. * @throws DimensionMismatchException if {@code x} and {@code y} have * different lengths. - * @throws org.apache.commons.math.exception.NonMonotonicSequenceException + * @throws org.apache.commons.math3.exception.NonMonotonicSequenceException * if {@code x} is not sorted in strictly increasing order. * @throws NumberIsTooSmallException if the size of {@code x} is less * than 2. @@ -163,7 +163,7 @@ public class PolynomialFunctionLagrangeForm implements UnivariateFunction { * @return the function value. * @throws DimensionMismatchException if {@code x} and {@code y} have * different lengths. - * @throws org.apache.commons.math.exception.NonMonotonicSequenceException + * @throws org.apache.commons.math3.exception.NonMonotonicSequenceException * if {@code x} is not sorted in strictly increasing order. * @throws NumberIsTooSmallException if the size of {@code x} is less * than 2. @@ -196,7 +196,7 @@ public class PolynomialFunctionLagrangeForm implements UnivariateFunction { * @return the function value. * @throws DimensionMismatchException if {@code x} and {@code y} have * different lengths. - * @throws org.apache.commons.math.exception.NonMonotonicSequenceException + * @throws org.apache.commons.math3.exception.NonMonotonicSequenceException * if {@code x} is not sorted in strictly increasing order. * @throws NumberIsTooSmallException if the size of {@code x} is less * than 2. @@ -302,7 +302,7 @@ public class PolynomialFunctionLagrangeForm implements UnivariateFunction { * @param abort Whether to throw an exception if {@code x} is not sorted. * @throws DimensionMismatchException if the array lengths are different. * @throws NumberIsTooSmallException if the number of points is less than 2. - * @throws org.apache.commons.math.exception.NonMonotonicSequenceException + * @throws org.apache.commons.math3.exception.NonMonotonicSequenceException * if {@code x} is not sorted in strictly increasing order and {@code abort} * is {@code true}. * @return {@code false} if the {@code x} is not sorted in increasing order, diff --git a/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionNewtonForm.java b/src/main/java/org/apache/commons/math3/analysis/polynomials/PolynomialFunctionNewtonForm.java similarity index 91% rename from src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionNewtonForm.java rename to src/main/java/org/apache/commons/math3/analysis/polynomials/PolynomialFunctionNewtonForm.java index 9f9c002f6..a18958003 100644 --- a/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionNewtonForm.java +++ b/src/main/java/org/apache/commons/math3/analysis/polynomials/PolynomialFunctionNewtonForm.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.polynomials; +package org.apache.commons.math3.analysis.polynomials; -import org.apache.commons.math.exception.NoDataException; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.NoDataException; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** * Implements the representation of a real polynomial function in @@ -68,7 +68,7 @@ public class PolynomialFunctionNewtonForm implements UnivariateFunction { * * @param a Coefficients in Newton form formula. * @param c Centers. - * @throws org.apache.commons.math.exception.NullArgumentException if + * @throws org.apache.commons.math3.exception.NullArgumentException if * any argument is {@code null}. * @throws NoDataException if any array has zero length. * @throws DimensionMismatchException if the size difference between @@ -154,7 +154,7 @@ public class PolynomialFunctionNewtonForm implements UnivariateFunction { * @param c Centers. * @param z Point at which the function value is to be computed. * @return the function value. - * @throws org.apache.commons.math.exception.NullArgumentException if + * @throws org.apache.commons.math3.exception.NullArgumentException if * any argument is {@code null}. * @throws NoDataException if any array has zero length. * @throws DimensionMismatchException if the size difference between @@ -203,12 +203,12 @@ public class PolynomialFunctionNewtonForm implements UnivariateFunction { * * @param a the coefficients in Newton form formula * @param c the centers - * @throws org.apache.commons.math.exception.NullArgumentException if + * @throws org.apache.commons.math3.exception.NullArgumentException if * any argument is {@code null}. * @throws NoDataException if any array has zero length. * @throws DimensionMismatchException if the size difference between * {@code a} and {@code c} is not equal to 1. - * @see org.apache.commons.math.analysis.interpolation.DividedDifferenceInterpolator#computeDividedDifference(double[], + * @see org.apache.commons.math3.analysis.interpolation.DividedDifferenceInterpolator#computeDividedDifference(double[], * double[]) */ protected static void verifyInputArray(double a[], double c[]) { diff --git a/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunction.java b/src/main/java/org/apache/commons/math3/analysis/polynomials/PolynomialSplineFunction.java similarity index 92% rename from src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunction.java rename to src/main/java/org/apache/commons/math3/analysis/polynomials/PolynomialSplineFunction.java index d72fae9fe..b25ac2d53 100644 --- a/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunction.java +++ b/src/main/java/org/apache/commons/math3/analysis/polynomials/PolynomialSplineFunction.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.polynomials; +package org.apache.commons.math3.analysis.polynomials; import java.util.Arrays; -import org.apache.commons.math.util.MathArrays; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.exception.OutOfRangeException; -import org.apache.commons.math.exception.NumberIsTooSmallException; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.util.MathArrays; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.exception.OutOfRangeException; +import org.apache.commons.math3.exception.NumberIsTooSmallException; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** * Represents a polynomial spline function. @@ -93,7 +93,7 @@ public class PolynomialSplineFunction implements DifferentiableUnivariateFunctio * @throws NullArgumentException if either of the input arrays is {@code null}. * @throws NumberIsTooSmallException if knots has length less than 2. * @throws DimensionMismatchException if {@code polynomials.length != knots.length - 1}. - * @throws org.apache.commons.math.exception.NonMonotonicSequenceException if + * @throws org.apache.commons.math3.exception.NonMonotonicSequenceException if * the {@code knots} array is not strictly increasing. * */ diff --git a/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialsUtils.java b/src/main/java/org/apache/commons/math3/analysis/polynomials/PolynomialsUtils.java similarity index 98% rename from src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialsUtils.java rename to src/main/java/org/apache/commons/math3/analysis/polynomials/PolynomialsUtils.java index 11fb8ea99..f4c7ee905 100644 --- a/src/main/java/org/apache/commons/math/analysis/polynomials/PolynomialsUtils.java +++ b/src/main/java/org/apache/commons/math3/analysis/polynomials/PolynomialsUtils.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.polynomials; +package org.apache.commons.math3.analysis.polynomials; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.math.fraction.BigFraction; -import org.apache.commons.math.util.ArithmeticUtils; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.fraction.BigFraction; +import org.apache.commons.math3.util.ArithmeticUtils; +import org.apache.commons.math3.util.FastMath; /** * A collection of static methods that operate on or return polynomials. diff --git a/src/main/java/org/apache/commons/math/analysis/polynomials/package-info.java b/src/main/java/org/apache/commons/math3/analysis/polynomials/package-info.java similarity index 94% rename from src/main/java/org/apache/commons/math/analysis/polynomials/package-info.java rename to src/main/java/org/apache/commons/math3/analysis/polynomials/package-info.java index cb7801f28..85b99f75e 100644 --- a/src/main/java/org/apache/commons/math/analysis/polynomials/package-info.java +++ b/src/main/java/org/apache/commons/math3/analysis/polynomials/package-info.java @@ -20,4 +20,4 @@ * univariate real functions. * */ -package org.apache.commons.math.analysis.polynomials; +package org.apache.commons.math3.analysis.polynomials; diff --git a/src/main/java/org/apache/commons/math/analysis/solvers/AbstractDifferentiableUnivariateSolver.java b/src/main/java/org/apache/commons/math3/analysis/solvers/AbstractDifferentiableUnivariateSolver.java similarity index 91% rename from src/main/java/org/apache/commons/math/analysis/solvers/AbstractDifferentiableUnivariateSolver.java rename to src/main/java/org/apache/commons/math3/analysis/solvers/AbstractDifferentiableUnivariateSolver.java index f7b6ebcdb..4210443a0 100644 --- a/src/main/java/org/apache/commons/math/analysis/solvers/AbstractDifferentiableUnivariateSolver.java +++ b/src/main/java/org/apache/commons/math3/analysis/solvers/AbstractDifferentiableUnivariateSolver.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.solvers; +package org.apache.commons.math3.analysis.solvers; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; -import org.apache.commons.math.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.analysis.UnivariateFunction; /** * Provide a default implementation for several functions useful to generic @@ -60,7 +60,7 @@ public abstract class AbstractDifferentiableUnivariateSolver * * @param point Point at which the objective function must be evaluated. * @return the objective function value at specified point. - * @throws org.apache.commons.math.exception.TooManyEvaluationsException + * @throws org.apache.commons.math3.exception.TooManyEvaluationsException * if the maximal number of evaluations is exceeded. */ protected double computeDerivativeObjectiveValue(double point) { diff --git a/src/main/java/org/apache/commons/math/analysis/solvers/AbstractPolynomialSolver.java b/src/main/java/org/apache/commons/math3/analysis/solvers/AbstractPolynomialSolver.java similarity index 95% rename from src/main/java/org/apache/commons/math/analysis/solvers/AbstractPolynomialSolver.java rename to src/main/java/org/apache/commons/math3/analysis/solvers/AbstractPolynomialSolver.java index 197a19a2f..915062360 100644 --- a/src/main/java/org/apache/commons/math/analysis/solvers/AbstractPolynomialSolver.java +++ b/src/main/java/org/apache/commons/math3/analysis/solvers/AbstractPolynomialSolver.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.solvers; +package org.apache.commons.math3.analysis.solvers; -import org.apache.commons.math.analysis.polynomials.PolynomialFunction; +import org.apache.commons.math3.analysis.polynomials.PolynomialFunction; /** * Base class for solvers. diff --git a/src/main/java/org/apache/commons/math/analysis/solvers/AbstractUnivariateSolver.java b/src/main/java/org/apache/commons/math3/analysis/solvers/AbstractUnivariateSolver.java similarity index 95% rename from src/main/java/org/apache/commons/math/analysis/solvers/AbstractUnivariateSolver.java rename to src/main/java/org/apache/commons/math3/analysis/solvers/AbstractUnivariateSolver.java index 55776c4e9..bd83d8c40 100644 --- a/src/main/java/org/apache/commons/math/analysis/solvers/AbstractUnivariateSolver.java +++ b/src/main/java/org/apache/commons/math3/analysis/solvers/AbstractUnivariateSolver.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.solvers; +package org.apache.commons.math3.analysis.solvers; -import org.apache.commons.math.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.UnivariateFunction; /** * Base class for solvers. diff --git a/src/main/java/org/apache/commons/math/analysis/solvers/AllowedSolution.java b/src/main/java/org/apache/commons/math3/analysis/solvers/AllowedSolution.java similarity index 94% rename from src/main/java/org/apache/commons/math/analysis/solvers/AllowedSolution.java rename to src/main/java/org/apache/commons/math3/analysis/solvers/AllowedSolution.java index e3a9b6c2b..82f45c9dd 100644 --- a/src/main/java/org/apache/commons/math/analysis/solvers/AllowedSolution.java +++ b/src/main/java/org/apache/commons/math3/analysis/solvers/AllowedSolution.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.solvers; +package org.apache.commons.math3.analysis.solvers; /** The kinds of solutions that a {@link BracketedUnivariateSolver @@ -29,8 +29,8 @@ package org.apache.commons.math.analysis.solvers; * or slightly larger than the actual root. Root-finding algorithms generally * only guarantee that the returned solution is within the requested * tolerances. In certain cases however, in particular for - * {@link org.apache.commons.math.ode.events.EventHandler state events} of - * {@link org.apache.commons.math.ode.ODEIntegrator ODE solvers}, it + * {@link org.apache.commons.math3.ode.events.EventHandler state events} of + * {@link org.apache.commons.math3.ode.ODEIntegrator ODE solvers}, it * may be necessary to guarantee that a solution is returned that lies on a * specific side the solution.

    * diff --git a/src/main/java/org/apache/commons/math/analysis/solvers/BaseAbstractUnivariateSolver.java b/src/main/java/org/apache/commons/math3/analysis/solvers/BaseAbstractUnivariateSolver.java similarity index 93% rename from src/main/java/org/apache/commons/math/analysis/solvers/BaseAbstractUnivariateSolver.java rename to src/main/java/org/apache/commons/math3/analysis/solvers/BaseAbstractUnivariateSolver.java index 2630cfb21..bf884136e 100644 --- a/src/main/java/org/apache/commons/math/analysis/solvers/BaseAbstractUnivariateSolver.java +++ b/src/main/java/org/apache/commons/math3/analysis/solvers/BaseAbstractUnivariateSolver.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.solvers; +package org.apache.commons.math3.analysis.solvers; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.exception.MaxCountExceededException; -import org.apache.commons.math.exception.NoBracketingException; -import org.apache.commons.math.exception.TooManyEvaluationsException; -import org.apache.commons.math.util.Incrementor; -import org.apache.commons.math.util.MathUtils; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.exception.MaxCountExceededException; +import org.apache.commons.math3.exception.NoBracketingException; +import org.apache.commons.math3.exception.TooManyEvaluationsException; +import org.apache.commons.math3.util.Incrementor; +import org.apache.commons.math3.util.MathUtils; /** * Provide a default implementation for several functions useful to generic @@ -245,7 +245,7 @@ public abstract class BaseAbstractUnivariateSolver= upper}. */ protected void verifyInterval(final double lower, @@ -259,7 +259,7 @@ public abstract class BaseAbstractUnivariateSolver= initial} or {@code initial >= upper}. */ protected void verifySequence(final double lower, @@ -274,7 +274,7 @@ public abstract class BaseAbstractUnivariateSolverSecant-based methods for root-finding diff --git a/src/main/java/org/apache/commons/math/analysis/solvers/BaseUnivariateSolver.java b/src/main/java/org/apache/commons/math3/analysis/solvers/BaseUnivariateSolver.java similarity index 89% rename from src/main/java/org/apache/commons/math/analysis/solvers/BaseUnivariateSolver.java rename to src/main/java/org/apache/commons/math3/analysis/solvers/BaseUnivariateSolver.java index 3419f7a6d..ecc560fcd 100644 --- a/src/main/java/org/apache/commons/math/analysis/solvers/BaseUnivariateSolver.java +++ b/src/main/java/org/apache/commons/math3/analysis/solvers/BaseUnivariateSolver.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.solvers; +package org.apache.commons.math3.analysis.solvers; -import org.apache.commons.math.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.UnivariateFunction; /** @@ -97,9 +97,9 @@ public interface BaseUnivariateSolver { * @param min Lower bound for the interval. * @param max Upper bound for the interval. * @return a value where the function is zero. - * @throws org.apache.commons.math.exception.MathIllegalArgumentException + * @throws org.apache.commons.math3.exception.MathIllegalArgumentException * if the arguments do not satisfy the requirements specified by the solver. - * @throws org.apache.commons.math.exception.TooManyEvaluationsException if + * @throws org.apache.commons.math3.exception.TooManyEvaluationsException if * the allowed number of evaluations is exceeded. */ double solve(int maxEval, FUNC f, double min, double max); @@ -116,9 +116,9 @@ public interface BaseUnivariateSolver { * @param max Upper bound for the interval. * @param startValue Start value to use. * @return a value where the function is zero. - * @throws org.apache.commons.math.exception.MathIllegalArgumentException + * @throws org.apache.commons.math3.exception.MathIllegalArgumentException * if the arguments do not satisfy the requirements specified by the solver. - * @throws org.apache.commons.math.exception.TooManyEvaluationsException if + * @throws org.apache.commons.math3.exception.TooManyEvaluationsException if * the allowed number of evaluations is exceeded. */ double solve(int maxEval, FUNC f, double min, double max, double startValue); @@ -130,9 +130,9 @@ public interface BaseUnivariateSolver { * @param startValue Start value to use. * @return a value where the function is zero. * @param maxEval Maximum number of evaluations. - * @throws org.apache.commons.math.exception.MathIllegalArgumentException + * @throws org.apache.commons.math3.exception.MathIllegalArgumentException * if the arguments do not satisfy the requirements specified by the solver. - * @throws org.apache.commons.math.exception.TooManyEvaluationsException if + * @throws org.apache.commons.math3.exception.TooManyEvaluationsException if * the allowed number of evaluations is exceeded. */ double solve(int maxEval, FUNC f, double startValue); diff --git a/src/main/java/org/apache/commons/math/analysis/solvers/BisectionSolver.java b/src/main/java/org/apache/commons/math3/analysis/solvers/BisectionSolver.java similarity index 96% rename from src/main/java/org/apache/commons/math/analysis/solvers/BisectionSolver.java rename to src/main/java/org/apache/commons/math3/analysis/solvers/BisectionSolver.java index b9fc936f3..8724316de 100644 --- a/src/main/java/org/apache/commons/math/analysis/solvers/BisectionSolver.java +++ b/src/main/java/org/apache/commons/math3/analysis/solvers/BisectionSolver.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.solvers; +package org.apache.commons.math3.analysis.solvers; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.util.FastMath; /** * Implements the     diff --git a/src/main/java/org/apache/commons/math/analysis/solvers/BracketedUnivariateSolver.java b/src/main/java/org/apache/commons/math3/analysis/solvers/BracketedUnivariateSolver.java similarity index 90% rename from src/main/java/org/apache/commons/math/analysis/solvers/BracketedUnivariateSolver.java rename to src/main/java/org/apache/commons/math3/analysis/solvers/BracketedUnivariateSolver.java index fd3693fe8..ba405378d 100644 --- a/src/main/java/org/apache/commons/math/analysis/solvers/BracketedUnivariateSolver.java +++ b/src/main/java/org/apache/commons/math3/analysis/solvers/BracketedUnivariateSolver.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.solvers; +package org.apache.commons.math3.analysis.solvers; -import org.apache.commons.math.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.UnivariateFunction; /** Interface for {@link UnivariateSolver (univariate real) root-finding * algorithms} that maintain a bracketed solution. There are several advantages @@ -60,9 +60,9 @@ public interface BracketedUnivariateSolver * @param allowedSolution The kind of solutions that the root-finding algorithm may * accept as solutions. * @return A value where the function is zero. - * @throws org.apache.commons.math.exception.MathIllegalArgumentException + * @throws org.apache.commons.math3.exception.MathIllegalArgumentException * if the arguments do not satisfy the requirements specified by the solver. - * @throws org.apache.commons.math.exception.TooManyEvaluationsException if + * @throws org.apache.commons.math3.exception.TooManyEvaluationsException if * the allowed number of evaluations is exceeded. */ double solve(int maxEval, FUNC f, double min, double max, @@ -82,9 +82,9 @@ public interface BracketedUnivariateSolver * @param allowedSolution The kind of solutions that the root-finding algorithm may * accept as solutions. * @return A value where the function is zero. - * @throws org.apache.commons.math.exception.MathIllegalArgumentException + * @throws org.apache.commons.math3.exception.MathIllegalArgumentException * if the arguments do not satisfy the requirements specified by the solver. - * @throws org.apache.commons.math.exception.TooManyEvaluationsException if + * @throws org.apache.commons.math3.exception.TooManyEvaluationsException if * the allowed number of evaluations is exceeded. */ double solve(int maxEval, FUNC f, double min, double max, double startValue, diff --git a/src/main/java/org/apache/commons/math/analysis/solvers/BracketingNthOrderBrentSolver.java b/src/main/java/org/apache/commons/math3/analysis/solvers/BracketingNthOrderBrentSolver.java similarity index 97% rename from src/main/java/org/apache/commons/math/analysis/solvers/BracketingNthOrderBrentSolver.java rename to src/main/java/org/apache/commons/math3/analysis/solvers/BracketingNthOrderBrentSolver.java index cfa430706..5f3f3d3f9 100644 --- a/src/main/java/org/apache/commons/math/analysis/solvers/BracketingNthOrderBrentSolver.java +++ b/src/main/java/org/apache/commons/math3/analysis/solvers/BracketingNthOrderBrentSolver.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.solvers; +package org.apache.commons.math3.analysis.solvers; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.exception.MathInternalError; -import org.apache.commons.math.exception.NoBracketingException; -import org.apache.commons.math.exception.NumberIsTooSmallException; -import org.apache.commons.math.util.FastMath; -import org.apache.commons.math.util.Precision; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.exception.MathInternalError; +import org.apache.commons.math3.exception.NoBracketingException; +import org.apache.commons.math3.exception.NumberIsTooSmallException; +import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math3.util.Precision; /** * This class implements a modification of the diff --git a/src/main/java/org/apache/commons/math/analysis/solvers/DifferentiableUnivariateSolver.java b/src/main/java/org/apache/commons/math3/analysis/solvers/DifferentiableUnivariateSolver.java similarity index 89% rename from src/main/java/org/apache/commons/math/analysis/solvers/DifferentiableUnivariateSolver.java rename to src/main/java/org/apache/commons/math3/analysis/solvers/DifferentiableUnivariateSolver.java index fc4aab28e..5015605e0 100644 --- a/src/main/java/org/apache/commons/math/analysis/solvers/DifferentiableUnivariateSolver.java +++ b/src/main/java/org/apache/commons/math3/analysis/solvers/DifferentiableUnivariateSolver.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.solvers; +package org.apache.commons.math3.analysis.solvers; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; /** diff --git a/src/main/java/org/apache/commons/math/analysis/solvers/IllinoisSolver.java b/src/main/java/org/apache/commons/math3/analysis/solvers/IllinoisSolver.java similarity index 98% rename from src/main/java/org/apache/commons/math/analysis/solvers/IllinoisSolver.java rename to src/main/java/org/apache/commons/math3/analysis/solvers/IllinoisSolver.java index 47c340c01..4b139966b 100644 --- a/src/main/java/org/apache/commons/math/analysis/solvers/IllinoisSolver.java +++ b/src/main/java/org/apache/commons/math3/analysis/solvers/IllinoisSolver.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.solvers; +package org.apache.commons.math3.analysis.solvers; /** diff --git a/src/main/java/org/apache/commons/math/analysis/solvers/LaguerreSolver.java b/src/main/java/org/apache/commons/math3/analysis/solvers/LaguerreSolver.java similarity index 95% rename from src/main/java/org/apache/commons/math/analysis/solvers/LaguerreSolver.java rename to src/main/java/org/apache/commons/math3/analysis/solvers/LaguerreSolver.java index c1b1187cf..459f2678c 100644 --- a/src/main/java/org/apache/commons/math/analysis/solvers/LaguerreSolver.java +++ b/src/main/java/org/apache/commons/math3/analysis/solvers/LaguerreSolver.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.solvers; +package org.apache.commons.math3.analysis.solvers; -import org.apache.commons.math.complex.Complex; -import org.apache.commons.math.exception.NoBracketingException; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.exception.NoDataException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.complex.Complex; +import org.apache.commons.math3.exception.NoBracketingException; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.exception.NoDataException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.util.FastMath; /** * Implements the @@ -196,7 +196,7 @@ public class LaguerreSolver extends AbstractPolynomialSolver { * @param coefficients Polynomial coefficients. * @param initial Start value. * @return the point at which the function value is zero. - * @throws org.apache.commons.math.exception.TooManyEvaluationsException + * @throws org.apache.commons.math3.exception.TooManyEvaluationsException * if the maximum number of evaluations is exceeded. * @throws NullArgumentException if the {@code coefficients} is * {@code null}. @@ -242,7 +242,7 @@ public class LaguerreSolver extends AbstractPolynomialSolver { * @param coefficients Polynomial coefficients. * @param initial Start value. * @return the point at which the function value is zero. - * @throws org.apache.commons.math.exception.TooManyEvaluationsException + * @throws org.apache.commons.math3.exception.TooManyEvaluationsException * if the maximum number of evaluations is exceeded. * @throws NullArgumentException if the {@code coefficients} is * {@code null}. diff --git a/src/main/java/org/apache/commons/math/analysis/solvers/MullerSolver.java b/src/main/java/org/apache/commons/math3/analysis/solvers/MullerSolver.java similarity index 98% rename from src/main/java/org/apache/commons/math/analysis/solvers/MullerSolver.java rename to src/main/java/org/apache/commons/math3/analysis/solvers/MullerSolver.java index 080016630..377f10f88 100644 --- a/src/main/java/org/apache/commons/math/analysis/solvers/MullerSolver.java +++ b/src/main/java/org/apache/commons/math3/analysis/solvers/MullerSolver.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.solvers; +package org.apache.commons.math3.analysis.solvers; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.util.FastMath; /** * This class implements the diff --git a/src/main/java/org/apache/commons/math/analysis/solvers/MullerSolver2.java b/src/main/java/org/apache/commons/math3/analysis/solvers/MullerSolver2.java similarity index 97% rename from src/main/java/org/apache/commons/math/analysis/solvers/MullerSolver2.java rename to src/main/java/org/apache/commons/math3/analysis/solvers/MullerSolver2.java index 5a26ce158..512c1ea65 100644 --- a/src/main/java/org/apache/commons/math/analysis/solvers/MullerSolver2.java +++ b/src/main/java/org/apache/commons/math3/analysis/solvers/MullerSolver2.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.solvers; +package org.apache.commons.math3.analysis.solvers; -import org.apache.commons.math.exception.NoBracketingException; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.NoBracketingException; +import org.apache.commons.math3.util.FastMath; /** * This class implements the diff --git a/src/main/java/org/apache/commons/math/analysis/solvers/NewtonSolver.java b/src/main/java/org/apache/commons/math3/analysis/solvers/NewtonSolver.java similarity index 89% rename from src/main/java/org/apache/commons/math/analysis/solvers/NewtonSolver.java rename to src/main/java/org/apache/commons/math3/analysis/solvers/NewtonSolver.java index 1098d1437..77f3d6722 100644 --- a/src/main/java/org/apache/commons/math/analysis/solvers/NewtonSolver.java +++ b/src/main/java/org/apache/commons/math3/analysis/solvers/NewtonSolver.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.solvers; +package org.apache.commons.math3.analysis.solvers; -import org.apache.commons.math.analysis.DifferentiableUnivariateFunction; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction; +import org.apache.commons.math3.util.FastMath; /** * Implements @@ -55,9 +55,9 @@ public class NewtonSolver extends AbstractDifferentiableUnivariateSolver { * @param max Upper bound for the interval. * @param maxEval Maximum number of evaluations. * @return the value where the function is zero. - * @throws org.apache.commons.math.exception.TooManyEvaluationsException + * @throws org.apache.commons.math3.exception.TooManyEvaluationsException * if the maximum evaluation count is exceeded. - * @throws org.apache.commons.math.exception.NumberIsTooLargeException + * @throws org.apache.commons.math3.exception.NumberIsTooLargeException * if {@code min >= max}. */ @Override diff --git a/src/main/java/org/apache/commons/math/analysis/solvers/PegasusSolver.java b/src/main/java/org/apache/commons/math3/analysis/solvers/PegasusSolver.java similarity index 98% rename from src/main/java/org/apache/commons/math/analysis/solvers/PegasusSolver.java rename to src/main/java/org/apache/commons/math3/analysis/solvers/PegasusSolver.java index 457c9580d..3553aeac2 100644 --- a/src/main/java/org/apache/commons/math/analysis/solvers/PegasusSolver.java +++ b/src/main/java/org/apache/commons/math3/analysis/solvers/PegasusSolver.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.solvers; +package org.apache.commons.math3.analysis.solvers; /** * Implements the Pegasus method for root-finding (approximating diff --git a/src/main/java/org/apache/commons/math/analysis/solvers/PolynomialSolver.java b/src/main/java/org/apache/commons/math3/analysis/solvers/PolynomialSolver.java similarity index 89% rename from src/main/java/org/apache/commons/math/analysis/solvers/PolynomialSolver.java rename to src/main/java/org/apache/commons/math3/analysis/solvers/PolynomialSolver.java index 012f828a0..bee8cfca3 100644 --- a/src/main/java/org/apache/commons/math/analysis/solvers/PolynomialSolver.java +++ b/src/main/java/org/apache/commons/math3/analysis/solvers/PolynomialSolver.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.solvers; +package org.apache.commons.math3.analysis.solvers; -import org.apache.commons.math.analysis.polynomials.PolynomialFunction; +import org.apache.commons.math3.analysis.polynomials.PolynomialFunction; /** * Interface for (polynomial) root-finding algorithms. diff --git a/src/main/java/org/apache/commons/math/analysis/solvers/RegulaFalsiSolver.java b/src/main/java/org/apache/commons/math3/analysis/solvers/RegulaFalsiSolver.java similarity index 98% rename from src/main/java/org/apache/commons/math/analysis/solvers/RegulaFalsiSolver.java rename to src/main/java/org/apache/commons/math3/analysis/solvers/RegulaFalsiSolver.java index 71224a0da..145f3c7c3 100644 --- a/src/main/java/org/apache/commons/math/analysis/solvers/RegulaFalsiSolver.java +++ b/src/main/java/org/apache/commons/math3/analysis/solvers/RegulaFalsiSolver.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.solvers; +package org.apache.commons.math3.analysis.solvers; /** * Implements the Regula Falsi or False position method for diff --git a/src/main/java/org/apache/commons/math/analysis/solvers/RiddersSolver.java b/src/main/java/org/apache/commons/math3/analysis/solvers/RiddersSolver.java similarity index 98% rename from src/main/java/org/apache/commons/math/analysis/solvers/RiddersSolver.java rename to src/main/java/org/apache/commons/math3/analysis/solvers/RiddersSolver.java index 8f229bafa..4cd6c106f 100644 --- a/src/main/java/org/apache/commons/math/analysis/solvers/RiddersSolver.java +++ b/src/main/java/org/apache/commons/math3/analysis/solvers/RiddersSolver.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.solvers; +package org.apache.commons.math3.analysis.solvers; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.util.FastMath; /** * Implements the diff --git a/src/main/java/org/apache/commons/math/analysis/solvers/SecantSolver.java b/src/main/java/org/apache/commons/math3/analysis/solvers/SecantSolver.java similarity index 97% rename from src/main/java/org/apache/commons/math/analysis/solvers/SecantSolver.java rename to src/main/java/org/apache/commons/math3/analysis/solvers/SecantSolver.java index aa46ec562..3b007929e 100644 --- a/src/main/java/org/apache/commons/math/analysis/solvers/SecantSolver.java +++ b/src/main/java/org/apache/commons/math3/analysis/solvers/SecantSolver.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.analysis.solvers; +package org.apache.commons.math3.analysis.solvers; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.util.FastMath; /** * Implements the Secant method for root-finding (approximating a diff --git a/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateSolver.java b/src/main/java/org/apache/commons/math3/analysis/solvers/UnivariateSolver.java similarity index 90% rename from src/main/java/org/apache/commons/math/analysis/solvers/UnivariateSolver.java rename to src/main/java/org/apache/commons/math3/analysis/solvers/UnivariateSolver.java index 0d4b24bfb..ad52c6ac1 100644 --- a/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateSolver.java +++ b/src/main/java/org/apache/commons/math3/analysis/solvers/UnivariateSolver.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.solvers; +package org.apache.commons.math3.analysis.solvers; -import org.apache.commons.math.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.UnivariateFunction; /** diff --git a/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateSolverUtils.java b/src/main/java/org/apache/commons/math3/analysis/solvers/UnivariateSolverUtils.java similarity index 96% rename from src/main/java/org/apache/commons/math/analysis/solvers/UnivariateSolverUtils.java rename to src/main/java/org/apache/commons/math3/analysis/solvers/UnivariateSolverUtils.java index 3e0e70241..a8d9507c0 100644 --- a/src/main/java/org/apache/commons/math/analysis/solvers/UnivariateSolverUtils.java +++ b/src/main/java/org/apache/commons/math3/analysis/solvers/UnivariateSolverUtils.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.analysis.solvers; +package org.apache.commons.math3.analysis.solvers; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.exception.NoBracketingException; -import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.exception.NumberIsTooLargeException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.exception.NoBracketingException; +import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.exception.NumberIsTooLargeException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.util.FastMath; /** * Utility routines for {@link UnivariateSolver} objects. diff --git a/src/main/java/org/apache/commons/math/analysis/solvers/package-info.java b/src/main/java/org/apache/commons/math3/analysis/solvers/package-info.java similarity index 94% rename from src/main/java/org/apache/commons/math/analysis/solvers/package-info.java rename to src/main/java/org/apache/commons/math3/analysis/solvers/package-info.java index 09845f361..eb15fbcb3 100644 --- a/src/main/java/org/apache/commons/math/analysis/solvers/package-info.java +++ b/src/main/java/org/apache/commons/math3/analysis/solvers/package-info.java @@ -19,4 +19,4 @@ * Root finding algorithms, for univariate real functions. * */ -package org.apache.commons.math.analysis.solvers; +package org.apache.commons.math3.analysis.solvers; diff --git a/src/main/java/org/apache/commons/math/complex/Complex.java b/src/main/java/org/apache/commons/math3/complex/Complex.java similarity index 98% rename from src/main/java/org/apache/commons/math/complex/Complex.java rename to src/main/java/org/apache/commons/math3/complex/Complex.java index ed76a2950..75c4a1b8b 100644 --- a/src/main/java/org/apache/commons/math/complex/Complex.java +++ b/src/main/java/org/apache/commons/math3/complex/Complex.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package org.apache.commons.math.complex; +package org.apache.commons.math3.complex; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import org.apache.commons.math.FieldElement; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.exception.NotPositiveException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.util.MathUtils; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.FieldElement; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.exception.NotPositiveException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.util.MathUtils; +import org.apache.commons.math3.util.FastMath; /** * Representation of a Complex number, i.e. a number which has both a @@ -45,8 +45,8 @@ import org.apache.commons.math.util.FastMath; * Note that this is in contradiction with the IEEE-754 standard for floating * point numbers (according to which the test {@code x == x} must fail if * {@code x} is {@code NaN}). The method - * {@link org.apache.commons.math.util.Precision#equals(double,double,int) - * equals for primitive double} in {@link org.apache.commons.math.util.Precision} + * {@link org.apache.commons.math3.util.Precision#equals(double,double,int) + * equals for primitive double} in {@link org.apache.commons.math3.util.Precision} * conforms with IEEE-754 while this class conforms with the standard behavior * for Java object types. *
    diff --git a/src/main/java/org/apache/commons/math/complex/ComplexField.java b/src/main/java/org/apache/commons/math3/complex/ComplexField.java similarity index 94% rename from src/main/java/org/apache/commons/math/complex/ComplexField.java rename to src/main/java/org/apache/commons/math3/complex/ComplexField.java index 0708dd066..af583dc04 100644 --- a/src/main/java/org/apache/commons/math/complex/ComplexField.java +++ b/src/main/java/org/apache/commons/math3/complex/ComplexField.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.commons.math.complex; +package org.apache.commons.math3.complex; import java.io.Serializable; -import org.apache.commons.math.Field; -import org.apache.commons.math.FieldElement; +import org.apache.commons.math3.Field; +import org.apache.commons.math3.FieldElement; /** * Representation of the complex numbers field. diff --git a/src/main/java/org/apache/commons/math/complex/ComplexFormat.java b/src/main/java/org/apache/commons/math3/complex/ComplexFormat.java similarity index 96% rename from src/main/java/org/apache/commons/math/complex/ComplexFormat.java rename to src/main/java/org/apache/commons/math3/complex/ComplexFormat.java index f3d56096d..f33804e27 100644 --- a/src/main/java/org/apache/commons/math/complex/ComplexFormat.java +++ b/src/main/java/org/apache/commons/math3/complex/ComplexFormat.java @@ -15,20 +15,20 @@ * limitations under the License. */ -package org.apache.commons.math.complex; +package org.apache.commons.math3.complex; import java.text.FieldPosition; import java.text.NumberFormat; import java.text.ParsePosition; import java.util.Locale; -import org.apache.commons.math.util.CompositeFormat; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.exception.MathParseException; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.MathInternalError; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.exception.NoDataException; +import org.apache.commons.math3.util.CompositeFormat; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.MathParseException; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.MathInternalError; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.exception.NoDataException; /** * 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/math3/complex/ComplexUtils.java similarity index 89% rename from src/main/java/org/apache/commons/math/complex/ComplexUtils.java rename to src/main/java/org/apache/commons/math3/complex/ComplexUtils.java index b91073ff0..a0f59d63f 100644 --- a/src/main/java/org/apache/commons/math/complex/ComplexUtils.java +++ b/src/main/java/org/apache/commons/math3/complex/ComplexUtils.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.apache.commons.math.complex; +package org.apache.commons.math3.complex; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.util.FastMath; /** * Static implementations of common - * {@link org.apache.commons.math.complex.Complex} utilities functions. + * {@link org.apache.commons.math3.complex.Complex} utilities functions. * * @version $Id$ */ diff --git a/src/main/java/org/apache/commons/math/complex/RootsOfUnity.java b/src/main/java/org/apache/commons/math3/complex/RootsOfUnity.java similarity index 94% rename from src/main/java/org/apache/commons/math/complex/RootsOfUnity.java rename to src/main/java/org/apache/commons/math3/complex/RootsOfUnity.java index c210dc00b..a3270e8a6 100644 --- a/src/main/java/org/apache/commons/math/complex/RootsOfUnity.java +++ b/src/main/java/org/apache/commons/math3/complex/RootsOfUnity.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.complex; +package org.apache.commons.math3.complex; import java.io.Serializable; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.MathIllegalStateException; -import org.apache.commons.math.exception.OutOfRangeException; -import org.apache.commons.math.exception.ZeroException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.MathIllegalStateException; +import org.apache.commons.math3.exception.OutOfRangeException; +import org.apache.commons.math3.exception.ZeroException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.util.FastMath; /** * A helper class for the computation and caching of the {@code n}-th roots of diff --git a/src/main/java/org/apache/commons/math/complex/package-info.java b/src/main/java/org/apache/commons/math3/complex/package-info.java similarity index 95% rename from src/main/java/org/apache/commons/math/complex/package-info.java rename to src/main/java/org/apache/commons/math3/complex/package-info.java index 9c5d74f2b..818806d9f 100644 --- a/src/main/java/org/apache/commons/math/complex/package-info.java +++ b/src/main/java/org/apache/commons/math3/complex/package-info.java @@ -20,4 +20,4 @@ * functions. * */ -package org.apache.commons.math.complex; +package org.apache.commons.math3.complex; diff --git a/src/main/java/org/apache/commons/math/dfp/BracketingNthOrderBrentSolverDFP.java b/src/main/java/org/apache/commons/math3/dfp/BracketingNthOrderBrentSolverDFP.java similarity index 95% rename from src/main/java/org/apache/commons/math/dfp/BracketingNthOrderBrentSolverDFP.java rename to src/main/java/org/apache/commons/math3/dfp/BracketingNthOrderBrentSolverDFP.java index e9522f893..7eb2e91af 100644 --- a/src/main/java/org/apache/commons/math/dfp/BracketingNthOrderBrentSolverDFP.java +++ b/src/main/java/org/apache/commons/math3/dfp/BracketingNthOrderBrentSolverDFP.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.dfp; +package org.apache.commons.math3.dfp; -import org.apache.commons.math.analysis.solvers.AllowedSolution; -import org.apache.commons.math.exception.MathInternalError; -import org.apache.commons.math.exception.NoBracketingException; -import org.apache.commons.math.exception.NumberIsTooSmallException; -import org.apache.commons.math.util.Incrementor; -import org.apache.commons.math.util.MathUtils; +import org.apache.commons.math3.analysis.solvers.AllowedSolution; +import org.apache.commons.math3.exception.MathInternalError; +import org.apache.commons.math3.exception.NoBracketingException; +import org.apache.commons.math3.exception.NumberIsTooSmallException; +import org.apache.commons.math3.util.Incrementor; +import org.apache.commons.math3.util.MathUtils; /** * This class implements a modification of the     { return field.newDfp(sig, code); } - /** Get the {@link org.apache.commons.math.Field Field} (really a {@link DfpField}) to which the instance belongs. + /** Get the {@link org.apache.commons.math3.Field Field} (really a {@link DfpField}) to which the instance belongs. *

    * The field is linked to the number of digits and acts as a factory * for {@link Dfp} instances. *

    - * @return {@link org.apache.commons.math.Field Field} (really a {@link DfpField}) to which the instance belongs + * @return {@link org.apache.commons.math3.Field Field} (really a {@link DfpField}) to which the instance belongs */ public DfpField getField() { return field; diff --git a/src/main/java/org/apache/commons/math/dfp/DfpDec.java b/src/main/java/org/apache/commons/math3/dfp/DfpDec.java similarity index 99% rename from src/main/java/org/apache/commons/math/dfp/DfpDec.java rename to src/main/java/org/apache/commons/math3/dfp/DfpDec.java index 2a13ddbfc..fb4656436 100644 --- a/src/main/java/org/apache/commons/math/dfp/DfpDec.java +++ b/src/main/java/org/apache/commons/math3/dfp/DfpDec.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.dfp; +package org.apache.commons.math3.dfp; /** Subclass of {@link Dfp} which hides the radix-10000 artifacts of the superclass. * This should give outward appearances of being a decimal number with DIGITS*4-3 diff --git a/src/main/java/org/apache/commons/math/dfp/DfpField.java b/src/main/java/org/apache/commons/math3/dfp/DfpField.java similarity index 99% rename from src/main/java/org/apache/commons/math/dfp/DfpField.java rename to src/main/java/org/apache/commons/math3/dfp/DfpField.java index 853c8d4cb..860b27753 100644 --- a/src/main/java/org/apache/commons/math/dfp/DfpField.java +++ b/src/main/java/org/apache/commons/math3/dfp/DfpField.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.dfp; +package org.apache.commons.math3.dfp; -import org.apache.commons.math.Field; -import org.apache.commons.math.FieldElement; +import org.apache.commons.math3.Field; +import org.apache.commons.math3.FieldElement; /** Field for Decimal floating point instances. * @version $Id$ diff --git a/src/main/java/org/apache/commons/math/dfp/DfpMath.java b/src/main/java/org/apache/commons/math3/dfp/DfpMath.java similarity index 99% rename from src/main/java/org/apache/commons/math/dfp/DfpMath.java rename to src/main/java/org/apache/commons/math3/dfp/DfpMath.java index e3ccb24ae..bc36b9796 100644 --- a/src/main/java/org/apache/commons/math/dfp/DfpMath.java +++ b/src/main/java/org/apache/commons/math3/dfp/DfpMath.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.dfp; +package org.apache.commons.math3.dfp; /** Mathematical routines for use with {@link Dfp}. * The constants are defined in {@link DfpField} diff --git a/src/main/java/org/apache/commons/math/dfp/UnivariateDfpFunction.java b/src/main/java/org/apache/commons/math3/dfp/UnivariateDfpFunction.java similarity index 97% rename from src/main/java/org/apache/commons/math/dfp/UnivariateDfpFunction.java rename to src/main/java/org/apache/commons/math3/dfp/UnivariateDfpFunction.java index eb0949b72..99fd5678f 100644 --- a/src/main/java/org/apache/commons/math/dfp/UnivariateDfpFunction.java +++ b/src/main/java/org/apache/commons/math3/dfp/UnivariateDfpFunction.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.dfp; +package org.apache.commons.math3.dfp; /** * An interface representing a univariate {@link Dfp} function. diff --git a/src/main/java/org/apache/commons/math/dfp/package-info.java b/src/main/java/org/apache/commons/math3/dfp/package-info.java similarity index 99% rename from src/main/java/org/apache/commons/math/dfp/package-info.java rename to src/main/java/org/apache/commons/math3/dfp/package-info.java index 45d69605c..42a4b4829 100644 --- a/src/main/java/org/apache/commons/math/dfp/package-info.java +++ b/src/main/java/org/apache/commons/math3/dfp/package-info.java @@ -85,4 +85,4 @@ * this can be rendered invisible by a subclass.

    * */ -package org.apache.commons.math.dfp; +package org.apache.commons.math3.dfp; diff --git a/src/main/java/org/apache/commons/math/distribution/AbstractIntegerDistribution.java b/src/main/java/org/apache/commons/math3/distribution/AbstractIntegerDistribution.java similarity index 93% rename from src/main/java/org/apache/commons/math/distribution/AbstractIntegerDistribution.java rename to src/main/java/org/apache/commons/math3/distribution/AbstractIntegerDistribution.java index 7f87f3664..24d8635b5 100644 --- a/src/main/java/org/apache/commons/math/distribution/AbstractIntegerDistribution.java +++ b/src/main/java/org/apache/commons/math3/distribution/AbstractIntegerDistribution.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.distribution; +package org.apache.commons.math3.distribution; import java.io.Serializable; -import org.apache.commons.math.exception.MathInternalError; -import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.exception.NumberIsTooLargeException; -import org.apache.commons.math.exception.OutOfRangeException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.random.RandomDataImpl; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.MathInternalError; +import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math3.exception.NumberIsTooLargeException; +import org.apache.commons.math3.exception.OutOfRangeException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.random.RandomDataImpl; +import org.apache.commons.math3.util.FastMath; /** * Base class for integer-valued discrete distributions. Default diff --git a/src/main/java/org/apache/commons/math/distribution/AbstractRealDistribution.java b/src/main/java/org/apache/commons/math3/distribution/AbstractRealDistribution.java similarity index 93% rename from src/main/java/org/apache/commons/math/distribution/AbstractRealDistribution.java rename to src/main/java/org/apache/commons/math3/distribution/AbstractRealDistribution.java index 07686b603..f3872b960 100644 --- a/src/main/java/org/apache/commons/math/distribution/AbstractRealDistribution.java +++ b/src/main/java/org/apache/commons/math3/distribution/AbstractRealDistribution.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.distribution; +package org.apache.commons.math3.distribution; import java.io.Serializable; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.analysis.solvers.UnivariateSolverUtils; -import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.exception.NumberIsTooLargeException; -import org.apache.commons.math.exception.OutOfRangeException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.random.RandomDataImpl; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.solvers.UnivariateSolverUtils; +import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math3.exception.NumberIsTooLargeException; +import org.apache.commons.math3.exception.OutOfRangeException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.random.RandomDataImpl; +import org.apache.commons.math3.util.FastMath; /** * Base class for probability distributions on the reals. diff --git a/src/main/java/org/apache/commons/math/distribution/BetaDistribution.java b/src/main/java/org/apache/commons/math3/distribution/BetaDistribution.java similarity index 95% rename from src/main/java/org/apache/commons/math/distribution/BetaDistribution.java rename to src/main/java/org/apache/commons/math3/distribution/BetaDistribution.java index e43eac6fe..806ffb987 100644 --- a/src/main/java/org/apache/commons/math/distribution/BetaDistribution.java +++ b/src/main/java/org/apache/commons/math3/distribution/BetaDistribution.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.distribution; +package org.apache.commons.math3.distribution; -import org.apache.commons.math.exception.NumberIsTooSmallException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.special.Gamma; -import org.apache.commons.math.special.Beta; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.NumberIsTooSmallException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.special.Gamma; +import org.apache.commons.math3.special.Beta; +import org.apache.commons.math3.util.FastMath; /** * Implements the Beta distribution. diff --git a/src/main/java/org/apache/commons/math/distribution/BinomialDistribution.java b/src/main/java/org/apache/commons/math3/distribution/BinomialDistribution.java similarity index 93% rename from src/main/java/org/apache/commons/math/distribution/BinomialDistribution.java rename to src/main/java/org/apache/commons/math3/distribution/BinomialDistribution.java index 906592b56..505b93f3b 100644 --- a/src/main/java/org/apache/commons/math/distribution/BinomialDistribution.java +++ b/src/main/java/org/apache/commons/math3/distribution/BinomialDistribution.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.distribution; +package org.apache.commons.math3.distribution; -import org.apache.commons.math.exception.OutOfRangeException; -import org.apache.commons.math.exception.NotPositiveException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.special.Beta; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.OutOfRangeException; +import org.apache.commons.math3.exception.NotPositiveException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.special.Beta; +import org.apache.commons.math3.util.FastMath; /** * Implementation of the binomial distribution. diff --git a/src/main/java/org/apache/commons/math/distribution/CauchyDistribution.java b/src/main/java/org/apache/commons/math3/distribution/CauchyDistribution.java similarity index 95% rename from src/main/java/org/apache/commons/math/distribution/CauchyDistribution.java rename to src/main/java/org/apache/commons/math3/distribution/CauchyDistribution.java index f62bb5bd2..c470d1cb8 100644 --- a/src/main/java/org/apache/commons/math/distribution/CauchyDistribution.java +++ b/src/main/java/org/apache/commons/math3/distribution/CauchyDistribution.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.distribution; +package org.apache.commons.math3.distribution; -import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.exception.OutOfRangeException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math3.exception.OutOfRangeException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.util.FastMath; /** * Implementation of the Cauchy distribution. diff --git a/src/main/java/org/apache/commons/math/distribution/ChiSquaredDistribution.java b/src/main/java/org/apache/commons/math3/distribution/ChiSquaredDistribution.java similarity index 99% rename from src/main/java/org/apache/commons/math/distribution/ChiSquaredDistribution.java rename to src/main/java/org/apache/commons/math3/distribution/ChiSquaredDistribution.java index 771b44493..647d22645 100644 --- a/src/main/java/org/apache/commons/math/distribution/ChiSquaredDistribution.java +++ b/src/main/java/org/apache/commons/math3/distribution/ChiSquaredDistribution.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.distribution; +package org.apache.commons.math3.distribution; /** * Implementation of the chi-squared distribution. diff --git a/src/main/java/org/apache/commons/math/distribution/ExponentialDistribution.java b/src/main/java/org/apache/commons/math3/distribution/ExponentialDistribution.java similarity index 95% rename from src/main/java/org/apache/commons/math/distribution/ExponentialDistribution.java rename to src/main/java/org/apache/commons/math3/distribution/ExponentialDistribution.java index 6edcb5a39..31feeebee 100644 --- a/src/main/java/org/apache/commons/math/distribution/ExponentialDistribution.java +++ b/src/main/java/org/apache/commons/math3/distribution/ExponentialDistribution.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.distribution; +package org.apache.commons.math3.distribution; -import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.exception.OutOfRangeException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math3.exception.OutOfRangeException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.util.FastMath; /** * Implementation of the exponential distribution. diff --git a/src/main/java/org/apache/commons/math/distribution/FDistribution.java b/src/main/java/org/apache/commons/math3/distribution/FDistribution.java similarity index 97% rename from src/main/java/org/apache/commons/math/distribution/FDistribution.java rename to src/main/java/org/apache/commons/math3/distribution/FDistribution.java index 6680aab58..7592bfca7 100644 --- a/src/main/java/org/apache/commons/math/distribution/FDistribution.java +++ b/src/main/java/org/apache/commons/math3/distribution/FDistribution.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.commons.math.distribution; +package org.apache.commons.math3.distribution; -import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.special.Beta; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.special.Beta; +import org.apache.commons.math3.util.FastMath; /** * Implementation of the F-distribution. diff --git a/src/main/java/org/apache/commons/math/distribution/GammaDistribution.java b/src/main/java/org/apache/commons/math3/distribution/GammaDistribution.java similarity index 95% rename from src/main/java/org/apache/commons/math/distribution/GammaDistribution.java rename to src/main/java/org/apache/commons/math3/distribution/GammaDistribution.java index 12a6029d4..5f61a2333 100644 --- a/src/main/java/org/apache/commons/math/distribution/GammaDistribution.java +++ b/src/main/java/org/apache/commons/math3/distribution/GammaDistribution.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.distribution; +package org.apache.commons.math3.distribution; -import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.special.Gamma; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.special.Gamma; +import org.apache.commons.math3.util.FastMath; /** * Implementation of the Gamma distribution. diff --git a/src/main/java/org/apache/commons/math/distribution/HypergeometricDistribution.java b/src/main/java/org/apache/commons/math3/distribution/HypergeometricDistribution.java similarity index 96% rename from src/main/java/org/apache/commons/math/distribution/HypergeometricDistribution.java rename to src/main/java/org/apache/commons/math3/distribution/HypergeometricDistribution.java index 0217c9651..aa187545a 100644 --- a/src/main/java/org/apache/commons/math/distribution/HypergeometricDistribution.java +++ b/src/main/java/org/apache/commons/math3/distribution/HypergeometricDistribution.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.commons.math.distribution; +package org.apache.commons.math3.distribution; -import org.apache.commons.math.exception.NotPositiveException; -import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.exception.NumberIsTooLargeException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.util.ArithmeticUtils; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.NotPositiveException; +import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math3.exception.NumberIsTooLargeException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.util.ArithmeticUtils; +import org.apache.commons.math3.util.FastMath; /** * Implementation of the hypergeometric distribution. diff --git a/src/main/java/org/apache/commons/math/distribution/IntegerDistribution.java b/src/main/java/org/apache/commons/math3/distribution/IntegerDistribution.java similarity index 95% rename from src/main/java/org/apache/commons/math/distribution/IntegerDistribution.java rename to src/main/java/org/apache/commons/math3/distribution/IntegerDistribution.java index c18d38144..de2ebdb7c 100644 --- a/src/main/java/org/apache/commons/math/distribution/IntegerDistribution.java +++ b/src/main/java/org/apache/commons/math3/distribution/IntegerDistribution.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.distribution; +package org.apache.commons.math3.distribution; -import org.apache.commons.math.exception.NumberIsTooLargeException; -import org.apache.commons.math.exception.OutOfRangeException; +import org.apache.commons.math3.exception.NumberIsTooLargeException; +import org.apache.commons.math3.exception.OutOfRangeException; /** * Interface for distributions on the integers. @@ -148,7 +148,7 @@ public interface IntegerDistribution { * * @param sampleSize the number of random values to generate * @return an array representing the random sample - * @throws org.apache.commons.math.exception.NotStrictlyPositiveException + * @throws org.apache.commons.math3.exception.NotStrictlyPositiveException * if {@code sampleSize} is not positive * @since 3.0 */ diff --git a/src/main/java/org/apache/commons/math/distribution/KolmogorovSmirnovDistribution.java b/src/main/java/org/apache/commons/math3/distribution/KolmogorovSmirnovDistribution.java similarity index 89% rename from src/main/java/org/apache/commons/math/distribution/KolmogorovSmirnovDistribution.java rename to src/main/java/org/apache/commons/math3/distribution/KolmogorovSmirnovDistribution.java index 6e901c4c9..52748aa15 100644 --- a/src/main/java/org/apache/commons/math/distribution/KolmogorovSmirnovDistribution.java +++ b/src/main/java/org/apache/commons/math3/distribution/KolmogorovSmirnovDistribution.java @@ -15,22 +15,22 @@ * limitations under the License. */ -package org.apache.commons.math.distribution; +package org.apache.commons.math3.distribution; import java.io.Serializable; import java.math.BigDecimal; -import org.apache.commons.math.exception.MathArithmeticException; -import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.exception.NumberIsTooLargeException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.fraction.BigFraction; -import org.apache.commons.math.fraction.BigFractionField; -import org.apache.commons.math.fraction.FractionConversionException; -import org.apache.commons.math.linear.Array2DRowFieldMatrix; -import org.apache.commons.math.linear.Array2DRowRealMatrix; -import org.apache.commons.math.linear.FieldMatrix; -import org.apache.commons.math.linear.RealMatrix; +import org.apache.commons.math3.exception.MathArithmeticException; +import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math3.exception.NumberIsTooLargeException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.fraction.BigFraction; +import org.apache.commons.math3.fraction.BigFractionField; +import org.apache.commons.math3.fraction.FractionConversionException; +import org.apache.commons.math3.linear.Array2DRowFieldMatrix; +import org.apache.commons.math3.linear.Array2DRowRealMatrix; +import org.apache.commons.math3.linear.FieldMatrix; +import org.apache.commons.math3.linear.RealMatrix; /** * Implementation of the Kolmogorov-Smirnov distribution. @@ -96,12 +96,12 @@ public class KolmogorovSmirnovDistribution implements Serializable { * exact as with * {@link KolmogorovSmirnovDistribution#cdfExact(double)} because * calculations are based on {@code double} rather than - * {@link org.apache.commons.math.fraction.BigFraction}. + * {@link org.apache.commons.math3.fraction.BigFraction}. * * @param d statistic * @return the two-sided probability of {@code P(D_n < d)} * @throws MathArithmeticException if algorithm fails to convert {@code h} - * to a {@link org.apache.commons.math.fraction.BigFraction} in expressing + * to a {@link org.apache.commons.math3.fraction.BigFraction} in expressing * {@code d} as {@code (k - h) / m} for integer {@code k, m} and * {@code 0 <= h < 1}. */ @@ -121,7 +121,7 @@ public class KolmogorovSmirnovDistribution implements Serializable { * @param d statistic * @return the two-sided probability of {@code P(D_n < d)} * @throws MathArithmeticException if algorithm fails to convert {@code h} - * to a {@link org.apache.commons.math.fraction.BigFraction} in expressing + * to a {@link org.apache.commons.math3.fraction.BigFraction} in expressing * {@code d} as {@code (k - h) / m} for integer {@code k, m} and * {@code 0 <= h < 1}. */ @@ -135,14 +135,14 @@ public class KolmogorovSmirnovDistribution implements Serializable { * * @param d statistic * @param exact whether the probability should be calculated exact using - * {@link org.apache.commons.math.fraction.BigFraction} everywhere at the + * {@link org.apache.commons.math3.fraction.BigFraction} everywhere at the * expense of very slow execution time, or if {@code double} should be used * convenient places to gain speed. Almost never choose {@code true} in real * applications unless you are very sure; {@code true} is almost solely for * verification purposes. * @return the two-sided probability of {@code P(D_n < d)} * @throws MathArithmeticException if algorithm fails to convert {@code h} - * to a {@link org.apache.commons.math.fraction.BigFraction} in expressing + * to a {@link org.apache.commons.math3.fraction.BigFraction} in expressing * {@code d} as {@code (k - h) / m} for integer {@code k, m} and * {@code 0 <= h < 1}. */ @@ -181,13 +181,13 @@ public class KolmogorovSmirnovDistribution implements Serializable { /** * Calculates the exact value of {@code P(D_n < d)} using method described - * in [1] and {@link org.apache.commons.math.fraction.BigFraction} (see + * in [1] and {@link org.apache.commons.math3.fraction.BigFraction} (see * above). * * @param d statistic * @return the two-sided probability of {@code P(D_n < d)} * @throws MathArithmeticException if algorithm fails to convert {@code h} - * to a {@link org.apache.commons.math.fraction.BigFraction} in expressing + * to a {@link org.apache.commons.math3.fraction.BigFraction} in expressing * {@code d} as {@code (k - h) / m} for integer {@code k, m} and * {@code 0 <= h < 1}. */ @@ -219,7 +219,7 @@ public class KolmogorovSmirnovDistribution implements Serializable { * @param d statistic * @return the two-sided probability of {@code P(D_n < d)} * @throws MathArithmeticException if algorithm fails to convert {@code h} - * to a {@link org.apache.commons.math.fraction.BigFraction} in expressing + * to a {@link org.apache.commons.math3.fraction.BigFraction} in expressing * {@code d} as {@code (k - h) / m} for integer {@code k, m} and * {@code 0 <= h < 1}. */ @@ -259,7 +259,7 @@ public class KolmogorovSmirnovDistribution implements Serializable { * @return H matrix * @throws NumberIsTooLargeException if fractional part is greater than 1 * @throws FractionConversionException if algorithm fails to convert - * {@code h} to a {@link org.apache.commons.math.fraction.BigFraction} in + * {@code h} to a {@link org.apache.commons.math3.fraction.BigFraction} in * expressing {@code d} as {@code (k - h) / m} for integer {@code k, m} and * {@code 0 <= h < 1}. */ diff --git a/src/main/java/org/apache/commons/math/distribution/LogNormalDistribution.java b/src/main/java/org/apache/commons/math3/distribution/LogNormalDistribution.java similarity index 96% rename from src/main/java/org/apache/commons/math/distribution/LogNormalDistribution.java rename to src/main/java/org/apache/commons/math3/distribution/LogNormalDistribution.java index d9c09e1a6..6e76f777f 100644 --- a/src/main/java/org/apache/commons/math/distribution/LogNormalDistribution.java +++ b/src/main/java/org/apache/commons/math3/distribution/LogNormalDistribution.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.commons.math.distribution; +package org.apache.commons.math3.distribution; -import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.exception.NumberIsTooLargeException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.special.Erf; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math3.exception.NumberIsTooLargeException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.special.Erf; +import org.apache.commons.math3.util.FastMath; /** * Implementation of the log-normal (gaussian) distribution. diff --git a/src/main/java/org/apache/commons/math/distribution/NormalDistribution.java b/src/main/java/org/apache/commons/math3/distribution/NormalDistribution.java similarity index 95% rename from src/main/java/org/apache/commons/math/distribution/NormalDistribution.java rename to src/main/java/org/apache/commons/math3/distribution/NormalDistribution.java index d092aa322..510f122b2 100644 --- a/src/main/java/org/apache/commons/math/distribution/NormalDistribution.java +++ b/src/main/java/org/apache/commons/math3/distribution/NormalDistribution.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.commons.math.distribution; +package org.apache.commons.math3.distribution; -import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.exception.NumberIsTooLargeException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.special.Erf; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math3.exception.NumberIsTooLargeException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.special.Erf; +import org.apache.commons.math3.util.FastMath; /** * Implementation of the normal (gaussian) distribution. diff --git a/src/main/java/org/apache/commons/math/distribution/PascalDistribution.java b/src/main/java/org/apache/commons/math3/distribution/PascalDistribution.java similarity index 94% rename from src/main/java/org/apache/commons/math/distribution/PascalDistribution.java rename to src/main/java/org/apache/commons/math3/distribution/PascalDistribution.java index 57d79f714..6a7afe4f6 100644 --- a/src/main/java/org/apache/commons/math/distribution/PascalDistribution.java +++ b/src/main/java/org/apache/commons/math3/distribution/PascalDistribution.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.distribution; +package org.apache.commons.math3.distribution; -import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.exception.OutOfRangeException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.special.Beta; -import org.apache.commons.math.util.ArithmeticUtils; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math3.exception.OutOfRangeException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.special.Beta; +import org.apache.commons.math3.util.ArithmeticUtils; +import org.apache.commons.math3.util.FastMath; /** *

    diff --git a/src/main/java/org/apache/commons/math/distribution/PoissonDistribution.java b/src/main/java/org/apache/commons/math3/distribution/PoissonDistribution.java similarity index 96% rename from src/main/java/org/apache/commons/math/distribution/PoissonDistribution.java rename to src/main/java/org/apache/commons/math3/distribution/PoissonDistribution.java index 0fafe65ee..9fe269cb5 100644 --- a/src/main/java/org/apache/commons/math/distribution/PoissonDistribution.java +++ b/src/main/java/org/apache/commons/math3/distribution/PoissonDistribution.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.distribution; +package org.apache.commons.math3.distribution; -import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.special.Gamma; -import org.apache.commons.math.util.MathUtils; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.special.Gamma; +import org.apache.commons.math3.util.MathUtils; +import org.apache.commons.math3.util.FastMath; /** * Implementation of the Poisson distribution. diff --git a/src/main/java/org/apache/commons/math/distribution/RealDistribution.java b/src/main/java/org/apache/commons/math3/distribution/RealDistribution.java similarity index 96% rename from src/main/java/org/apache/commons/math/distribution/RealDistribution.java rename to src/main/java/org/apache/commons/math3/distribution/RealDistribution.java index ca817633d..d7d5dd0b9 100644 --- a/src/main/java/org/apache/commons/math/distribution/RealDistribution.java +++ b/src/main/java/org/apache/commons/math3/distribution/RealDistribution.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.distribution; +package org.apache.commons.math3.distribution; -import org.apache.commons.math.exception.NumberIsTooLargeException; -import org.apache.commons.math.exception.OutOfRangeException; +import org.apache.commons.math3.exception.NumberIsTooLargeException; +import org.apache.commons.math3.exception.OutOfRangeException; /** * Base interface for distributions on the reals. @@ -176,7 +176,7 @@ public interface RealDistribution { * * @param sampleSize the number of random values to generate * @return an array representing the random sample - * @throws org.apache.commons.math.exception.NotStrictlyPositiveException + * @throws org.apache.commons.math3.exception.NotStrictlyPositiveException * if {@code sampleSize} is not positive */ double[] sample(int sampleSize); diff --git a/src/main/java/org/apache/commons/math/distribution/SaddlePointExpansion.java b/src/main/java/org/apache/commons/math3/distribution/SaddlePointExpansion.java similarity index 97% rename from src/main/java/org/apache/commons/math/distribution/SaddlePointExpansion.java rename to src/main/java/org/apache/commons/math3/distribution/SaddlePointExpansion.java index 165de794b..e83336862 100644 --- a/src/main/java/org/apache/commons/math/distribution/SaddlePointExpansion.java +++ b/src/main/java/org/apache/commons/math3/distribution/SaddlePointExpansion.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.distribution; +package org.apache.commons.math3.distribution; -import org.apache.commons.math.special.Gamma; -import org.apache.commons.math.util.FastMath; -import org.apache.commons.math.util.MathUtils; +import org.apache.commons.math3.special.Gamma; +import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math3.util.MathUtils; /** *

    diff --git a/src/main/java/org/apache/commons/math/distribution/TDistribution.java b/src/main/java/org/apache/commons/math3/distribution/TDistribution.java similarity index 95% rename from src/main/java/org/apache/commons/math/distribution/TDistribution.java rename to src/main/java/org/apache/commons/math3/distribution/TDistribution.java index 77829ab03..635b8ea9f 100644 --- a/src/main/java/org/apache/commons/math/distribution/TDistribution.java +++ b/src/main/java/org/apache/commons/math3/distribution/TDistribution.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.distribution; +package org.apache.commons.math3.distribution; -import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.special.Beta; -import org.apache.commons.math.special.Gamma; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.special.Beta; +import org.apache.commons.math3.special.Gamma; +import org.apache.commons.math3.util.FastMath; /** * Implementation of Student's t-distribution. diff --git a/src/main/java/org/apache/commons/math/distribution/TriangularDistribution.java b/src/main/java/org/apache/commons/math3/distribution/TriangularDistribution.java similarity index 95% rename from src/main/java/org/apache/commons/math/distribution/TriangularDistribution.java rename to src/main/java/org/apache/commons/math3/distribution/TriangularDistribution.java index 4d04bd8bf..44482ed35 100644 --- a/src/main/java/org/apache/commons/math/distribution/TriangularDistribution.java +++ b/src/main/java/org/apache/commons/math3/distribution/TriangularDistribution.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.commons.math.distribution; +package org.apache.commons.math3.distribution; -import org.apache.commons.math.exception.NumberIsTooLargeException; -import org.apache.commons.math.exception.NumberIsTooSmallException; -import org.apache.commons.math.exception.OutOfRangeException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.NumberIsTooLargeException; +import org.apache.commons.math3.exception.NumberIsTooSmallException; +import org.apache.commons.math3.exception.OutOfRangeException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.util.FastMath; /** * Implementation of the triangular real distribution. diff --git a/src/main/java/org/apache/commons/math/distribution/UniformIntegerDistribution.java b/src/main/java/org/apache/commons/math3/distribution/UniformIntegerDistribution.java similarity index 95% rename from src/main/java/org/apache/commons/math/distribution/UniformIntegerDistribution.java rename to src/main/java/org/apache/commons/math3/distribution/UniformIntegerDistribution.java index a6dd99a70..29f5211d9 100644 --- a/src/main/java/org/apache/commons/math/distribution/UniformIntegerDistribution.java +++ b/src/main/java/org/apache/commons/math3/distribution/UniformIntegerDistribution.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.distribution; +package org.apache.commons.math3.distribution; -import org.apache.commons.math.exception.NumberIsTooLargeException; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.NumberIsTooLargeException; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** * Implementation of the uniform integer distribution. diff --git a/src/main/java/org/apache/commons/math/distribution/UniformRealDistribution.java b/src/main/java/org/apache/commons/math3/distribution/UniformRealDistribution.java similarity index 96% rename from src/main/java/org/apache/commons/math/distribution/UniformRealDistribution.java rename to src/main/java/org/apache/commons/math3/distribution/UniformRealDistribution.java index 896389ae2..c99d09e23 100644 --- a/src/main/java/org/apache/commons/math/distribution/UniformRealDistribution.java +++ b/src/main/java/org/apache/commons/math3/distribution/UniformRealDistribution.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.distribution; +package org.apache.commons.math3.distribution; -import org.apache.commons.math.exception.NumberIsTooLargeException; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.NumberIsTooLargeException; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** * Implementation of the uniform real distribution. diff --git a/src/main/java/org/apache/commons/math/distribution/WeibullDistribution.java b/src/main/java/org/apache/commons/math3/distribution/WeibullDistribution.java similarity index 96% rename from src/main/java/org/apache/commons/math/distribution/WeibullDistribution.java rename to src/main/java/org/apache/commons/math3/distribution/WeibullDistribution.java index 36b367b92..4b0904f50 100644 --- a/src/main/java/org/apache/commons/math/distribution/WeibullDistribution.java +++ b/src/main/java/org/apache/commons/math3/distribution/WeibullDistribution.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.commons.math.distribution; +package org.apache.commons.math3.distribution; -import org.apache.commons.math.exception.OutOfRangeException; -import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.special.Gamma; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.OutOfRangeException; +import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.special.Gamma; +import org.apache.commons.math3.util.FastMath; /** * Implementation of the Weibull distribution. This implementation uses the diff --git a/src/main/java/org/apache/commons/math/distribution/ZipfDistribution.java b/src/main/java/org/apache/commons/math3/distribution/ZipfDistribution.java similarity index 96% rename from src/main/java/org/apache/commons/math/distribution/ZipfDistribution.java rename to src/main/java/org/apache/commons/math3/distribution/ZipfDistribution.java index dfa34417f..dfd29b72d 100644 --- a/src/main/java/org/apache/commons/math/distribution/ZipfDistribution.java +++ b/src/main/java/org/apache/commons/math3/distribution/ZipfDistribution.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.math.distribution; +package org.apache.commons.math3.distribution; -import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.util.FastMath; /** * Implementation of the Zipf distribution. diff --git a/src/main/java/org/apache/commons/math/distribution/package-info.java b/src/main/java/org/apache/commons/math3/distribution/package-info.java similarity index 94% rename from src/main/java/org/apache/commons/math/distribution/package-info.java rename to src/main/java/org/apache/commons/math3/distribution/package-info.java index e26ba37a5..4e111964d 100644 --- a/src/main/java/org/apache/commons/math/distribution/package-info.java +++ b/src/main/java/org/apache/commons/math3/distribution/package-info.java @@ -17,4 +17,4 @@ /** * Implementations of common discrete and continuous distributions. */ -package org.apache.commons.math.distribution; +package org.apache.commons.math3.distribution; diff --git a/src/main/java/org/apache/commons/math/exception/ConvergenceException.java b/src/main/java/org/apache/commons/math3/exception/ConvergenceException.java similarity index 90% rename from src/main/java/org/apache/commons/math/exception/ConvergenceException.java rename to src/main/java/org/apache/commons/math3/exception/ConvergenceException.java index d7a744c88..63c07845e 100644 --- a/src/main/java/org/apache/commons/math/exception/ConvergenceException.java +++ b/src/main/java/org/apache/commons/math3/exception/ConvergenceException.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.exception; +package org.apache.commons.math3.exception; -import org.apache.commons.math.exception.util.Localizable; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.util.Localizable; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** * Error thrown when a numerical computation can not be performed because the diff --git a/src/main/java/org/apache/commons/math/exception/DimensionMismatchException.java b/src/main/java/org/apache/commons/math3/exception/DimensionMismatchException.java similarity index 92% rename from src/main/java/org/apache/commons/math/exception/DimensionMismatchException.java rename to src/main/java/org/apache/commons/math3/exception/DimensionMismatchException.java index 34e887d3e..675934a00 100644 --- a/src/main/java/org/apache/commons/math/exception/DimensionMismatchException.java +++ b/src/main/java/org/apache/commons/math3/exception/DimensionMismatchException.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.exception; +package org.apache.commons.math3.exception; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.exception.util.Localizable; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.util.Localizable; /** * Exception to be thrown when two dimensions differ. diff --git a/src/main/java/org/apache/commons/math/exception/MathArithmeticException.java b/src/main/java/org/apache/commons/math3/exception/MathArithmeticException.java similarity index 88% rename from src/main/java/org/apache/commons/math/exception/MathArithmeticException.java rename to src/main/java/org/apache/commons/math3/exception/MathArithmeticException.java index 44e73c3af..fe19f7a20 100644 --- a/src/main/java/org/apache/commons/math/exception/MathArithmeticException.java +++ b/src/main/java/org/apache/commons/math3/exception/MathArithmeticException.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.exception; +package org.apache.commons.math3.exception; -import org.apache.commons.math.exception.util.Localizable; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.exception.util.ExceptionContext; -import org.apache.commons.math.exception.util.ExceptionContextProvider; +import org.apache.commons.math3.exception.util.Localizable; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.util.ExceptionContext; +import org.apache.commons.math3.exception.util.ExceptionContextProvider; /** * Base class for arithmetic exceptions. diff --git a/src/main/java/org/apache/commons/math/exception/MathIllegalArgumentException.java b/src/main/java/org/apache/commons/math3/exception/MathIllegalArgumentException.java similarity index 89% rename from src/main/java/org/apache/commons/math/exception/MathIllegalArgumentException.java rename to src/main/java/org/apache/commons/math3/exception/MathIllegalArgumentException.java index f78687193..e1b85ee10 100644 --- a/src/main/java/org/apache/commons/math/exception/MathIllegalArgumentException.java +++ b/src/main/java/org/apache/commons/math3/exception/MathIllegalArgumentException.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.exception; +package org.apache.commons.math3.exception; -import org.apache.commons.math.exception.util.Localizable; -import org.apache.commons.math.exception.util.ExceptionContext; -import org.apache.commons.math.exception.util.ExceptionContextProvider; +import org.apache.commons.math3.exception.util.Localizable; +import org.apache.commons.math3.exception.util.ExceptionContext; +import org.apache.commons.math3.exception.util.ExceptionContextProvider; /** * 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/math3/exception/MathIllegalNumberException.java similarity index 94% rename from src/main/java/org/apache/commons/math/exception/MathIllegalNumberException.java rename to src/main/java/org/apache/commons/math3/exception/MathIllegalNumberException.java index 7fd94ea9c..788102f21 100644 --- a/src/main/java/org/apache/commons/math/exception/MathIllegalNumberException.java +++ b/src/main/java/org/apache/commons/math3/exception/MathIllegalNumberException.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.exception; +package org.apache.commons.math3.exception; -import org.apache.commons.math.exception.util.Localizable; +import org.apache.commons.math3.exception.util.Localizable; /** * Base class for exceptions raised by a wrong number. diff --git a/src/main/java/org/apache/commons/math/exception/MathIllegalStateException.java b/src/main/java/org/apache/commons/math3/exception/MathIllegalStateException.java similarity index 89% rename from src/main/java/org/apache/commons/math/exception/MathIllegalStateException.java rename to src/main/java/org/apache/commons/math3/exception/MathIllegalStateException.java index b11e32744..c2a8e4cd8 100644 --- a/src/main/java/org/apache/commons/math/exception/MathIllegalStateException.java +++ b/src/main/java/org/apache/commons/math3/exception/MathIllegalStateException.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.exception; +package org.apache.commons.math3.exception; -import org.apache.commons.math.exception.util.Localizable; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.exception.util.ExceptionContext; -import org.apache.commons.math.exception.util.ExceptionContextProvider; +import org.apache.commons.math3.exception.util.Localizable; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.util.ExceptionContext; +import org.apache.commons.math3.exception.util.ExceptionContextProvider; /** * Base class for all exceptions that signal a mismatch between the diff --git a/src/main/java/org/apache/commons/math/exception/MathInternalError.java b/src/main/java/org/apache/commons/math3/exception/MathInternalError.java similarity index 91% rename from src/main/java/org/apache/commons/math/exception/MathInternalError.java rename to src/main/java/org/apache/commons/math3/exception/MathInternalError.java index 239bf8847..b3050d260 100644 --- a/src/main/java/org/apache/commons/math/exception/MathInternalError.java +++ b/src/main/java/org/apache/commons/math3/exception/MathInternalError.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.exception; +package org.apache.commons.math3.exception; -import org.apache.commons.math.exception.util.Localizable; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.util.Localizable; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** * Exception triggered when something that shouldn't happen does happen. diff --git a/src/main/java/org/apache/commons/math/exception/MathParseException.java b/src/main/java/org/apache/commons/math3/exception/MathParseException.java similarity index 91% rename from src/main/java/org/apache/commons/math/exception/MathParseException.java rename to src/main/java/org/apache/commons/math3/exception/MathParseException.java index 121f370be..4ee0b8760 100644 --- a/src/main/java/org/apache/commons/math/exception/MathParseException.java +++ b/src/main/java/org/apache/commons/math3/exception/MathParseException.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.exception; +package org.apache.commons.math3.exception; -import org.apache.commons.math.exception.util.ExceptionContextProvider; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.util.ExceptionContextProvider; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** * Class to signal parse failures. diff --git a/src/main/java/org/apache/commons/math/exception/MathUnsupportedOperationException.java b/src/main/java/org/apache/commons/math3/exception/MathUnsupportedOperationException.java similarity index 87% rename from src/main/java/org/apache/commons/math/exception/MathUnsupportedOperationException.java rename to src/main/java/org/apache/commons/math3/exception/MathUnsupportedOperationException.java index 2d4268bd7..fdd6f60c8 100644 --- a/src/main/java/org/apache/commons/math/exception/MathUnsupportedOperationException.java +++ b/src/main/java/org/apache/commons/math3/exception/MathUnsupportedOperationException.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.exception; +package org.apache.commons.math3.exception; -import org.apache.commons.math.exception.util.Localizable; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.exception.util.ExceptionContext; -import org.apache.commons.math.exception.util.ExceptionContextProvider; +import org.apache.commons.math3.exception.util.Localizable; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.util.ExceptionContext; +import org.apache.commons.math3.exception.util.ExceptionContextProvider; /** * Base class for all unsupported features. diff --git a/src/main/java/org/apache/commons/math/exception/MaxCountExceededException.java b/src/main/java/org/apache/commons/math3/exception/MaxCountExceededException.java similarity index 92% rename from src/main/java/org/apache/commons/math/exception/MaxCountExceededException.java rename to src/main/java/org/apache/commons/math3/exception/MaxCountExceededException.java index 7b6a91bc5..425b9662e 100644 --- a/src/main/java/org/apache/commons/math/exception/MaxCountExceededException.java +++ b/src/main/java/org/apache/commons/math3/exception/MaxCountExceededException.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.exception; +package org.apache.commons.math3.exception; -import org.apache.commons.math.exception.util.Localizable; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.util.Localizable; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** * Exception to be thrown when some counter maximum value is exceeded. diff --git a/src/main/java/org/apache/commons/math/exception/MultiDimensionMismatchException.java b/src/main/java/org/apache/commons/math3/exception/MultiDimensionMismatchException.java similarity index 94% rename from src/main/java/org/apache/commons/math/exception/MultiDimensionMismatchException.java rename to src/main/java/org/apache/commons/math3/exception/MultiDimensionMismatchException.java index 5eaa5d64d..33bbc7cda 100644 --- a/src/main/java/org/apache/commons/math/exception/MultiDimensionMismatchException.java +++ b/src/main/java/org/apache/commons/math3/exception/MultiDimensionMismatchException.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.exception; +package org.apache.commons.math3.exception; -import org.apache.commons.math.exception.util.Localizable; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.util.Localizable; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** * Exception to be thrown when two sets of dimensions differ. diff --git a/src/main/java/org/apache/commons/math/exception/NoBracketingException.java b/src/main/java/org/apache/commons/math3/exception/NoBracketingException.java similarity index 95% rename from src/main/java/org/apache/commons/math/exception/NoBracketingException.java rename to src/main/java/org/apache/commons/math3/exception/NoBracketingException.java index 89f515ebd..73152f3c6 100644 --- a/src/main/java/org/apache/commons/math/exception/NoBracketingException.java +++ b/src/main/java/org/apache/commons/math3/exception/NoBracketingException.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.exception; +package org.apache.commons.math3.exception; -import org.apache.commons.math.exception.util.Localizable; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.util.Localizable; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** * Exception to be thrown when function values have the same sign at both diff --git a/src/main/java/org/apache/commons/math/exception/NoDataException.java b/src/main/java/org/apache/commons/math3/exception/NoDataException.java similarity index 89% rename from src/main/java/org/apache/commons/math/exception/NoDataException.java rename to src/main/java/org/apache/commons/math3/exception/NoDataException.java index 6e0e83040..cdc870b70 100644 --- a/src/main/java/org/apache/commons/math/exception/NoDataException.java +++ b/src/main/java/org/apache/commons/math3/exception/NoDataException.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.exception; +package org.apache.commons.math3.exception; -import org.apache.commons.math.exception.util.Localizable; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.util.Localizable; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** * Exception to be thrown when the required data is missing. diff --git a/src/main/java/org/apache/commons/math/exception/NonMonotonicSequenceException.java b/src/main/java/org/apache/commons/math3/exception/NonMonotonicSequenceException.java similarity index 96% rename from src/main/java/org/apache/commons/math/exception/NonMonotonicSequenceException.java rename to src/main/java/org/apache/commons/math3/exception/NonMonotonicSequenceException.java index 3f276984c..79c60549d 100644 --- a/src/main/java/org/apache/commons/math/exception/NonMonotonicSequenceException.java +++ b/src/main/java/org/apache/commons/math3/exception/NonMonotonicSequenceException.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.exception; +package org.apache.commons.math3.exception; -import org.apache.commons.math.util.MathArrays; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.util.MathArrays; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** * Exception to be thrown when the a sequence of values is not monotonically diff --git a/src/main/java/org/apache/commons/math/exception/NotFiniteNumberException.java b/src/main/java/org/apache/commons/math3/exception/NotFiniteNumberException.java similarity index 91% rename from src/main/java/org/apache/commons/math/exception/NotFiniteNumberException.java rename to src/main/java/org/apache/commons/math3/exception/NotFiniteNumberException.java index 55ff5b230..5a60954da 100644 --- a/src/main/java/org/apache/commons/math/exception/NotFiniteNumberException.java +++ b/src/main/java/org/apache/commons/math3/exception/NotFiniteNumberException.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.exception; +package org.apache.commons.math3.exception; -import org.apache.commons.math.exception.util.Localizable; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.util.Localizable; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** * Exception to be thrown when a number is not finite. diff --git a/src/main/java/org/apache/commons/math/exception/NotPositiveException.java b/src/main/java/org/apache/commons/math3/exception/NotPositiveException.java similarity index 93% rename from src/main/java/org/apache/commons/math/exception/NotPositiveException.java rename to src/main/java/org/apache/commons/math3/exception/NotPositiveException.java index bcc8b2811..604e7e991 100644 --- a/src/main/java/org/apache/commons/math/exception/NotPositiveException.java +++ b/src/main/java/org/apache/commons/math3/exception/NotPositiveException.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.exception; +package org.apache.commons.math3.exception; -import org.apache.commons.math.exception.util.Localizable; +import org.apache.commons.math3.exception.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/math3/exception/NotStrictlyPositiveException.java similarity index 93% rename from src/main/java/org/apache/commons/math/exception/NotStrictlyPositiveException.java rename to src/main/java/org/apache/commons/math3/exception/NotStrictlyPositiveException.java index 1f928e6c8..11c595d8e 100644 --- a/src/main/java/org/apache/commons/math/exception/NotStrictlyPositiveException.java +++ b/src/main/java/org/apache/commons/math3/exception/NotStrictlyPositiveException.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.exception; +package org.apache.commons.math3.exception; -import org.apache.commons.math.exception.util.Localizable; +import org.apache.commons.math3.exception.util.Localizable; /** * Exception to be thrown when the argument is negative. diff --git a/src/main/java/org/apache/commons/math/exception/NullArgumentException.java b/src/main/java/org/apache/commons/math3/exception/NullArgumentException.java similarity index 91% rename from src/main/java/org/apache/commons/math/exception/NullArgumentException.java rename to src/main/java/org/apache/commons/math3/exception/NullArgumentException.java index 23309b636..4ddc1cb99 100644 --- a/src/main/java/org/apache/commons/math/exception/NullArgumentException.java +++ b/src/main/java/org/apache/commons/math3/exception/NullArgumentException.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.exception; +package org.apache.commons.math3.exception; -import org.apache.commons.math.exception.util.Localizable; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.util.Localizable; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** * All conditions checks that fail due to a {@code null} argument must throw diff --git a/src/main/java/org/apache/commons/math/exception/NumberIsTooLargeException.java b/src/main/java/org/apache/commons/math3/exception/NumberIsTooLargeException.java similarity index 94% rename from src/main/java/org/apache/commons/math/exception/NumberIsTooLargeException.java rename to src/main/java/org/apache/commons/math3/exception/NumberIsTooLargeException.java index 094b092d9..8a5d645f6 100644 --- a/src/main/java/org/apache/commons/math/exception/NumberIsTooLargeException.java +++ b/src/main/java/org/apache/commons/math3/exception/NumberIsTooLargeException.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.exception; +package org.apache.commons.math3.exception; -import org.apache.commons.math.exception.util.Localizable; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.util.Localizable; +import org.apache.commons.math3.exception.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/math3/exception/NumberIsTooSmallException.java similarity index 94% rename from src/main/java/org/apache/commons/math/exception/NumberIsTooSmallException.java rename to src/main/java/org/apache/commons/math3/exception/NumberIsTooSmallException.java index c340356e3..d4746a294 100644 --- a/src/main/java/org/apache/commons/math/exception/NumberIsTooSmallException.java +++ b/src/main/java/org/apache/commons/math3/exception/NumberIsTooSmallException.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.exception; +package org.apache.commons.math3.exception; -import org.apache.commons.math.exception.util.Localizable; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.util.Localizable; +import org.apache.commons.math3.exception.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/math3/exception/OutOfRangeException.java similarity index 93% rename from src/main/java/org/apache/commons/math/exception/OutOfRangeException.java rename to src/main/java/org/apache/commons/math3/exception/OutOfRangeException.java index 12d4e1cf1..b8cb7b89c 100644 --- a/src/main/java/org/apache/commons/math/exception/OutOfRangeException.java +++ b/src/main/java/org/apache/commons/math3/exception/OutOfRangeException.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.exception; +package org.apache.commons.math3.exception; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.exception.util.Localizable; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.util.Localizable; /** * Exception to be thrown when some argument is out of range. diff --git a/src/main/java/org/apache/commons/math/exception/TooManyEvaluationsException.java b/src/main/java/org/apache/commons/math3/exception/TooManyEvaluationsException.java similarity index 92% rename from src/main/java/org/apache/commons/math/exception/TooManyEvaluationsException.java rename to src/main/java/org/apache/commons/math3/exception/TooManyEvaluationsException.java index 196d3377a..39e32771c 100644 --- a/src/main/java/org/apache/commons/math/exception/TooManyEvaluationsException.java +++ b/src/main/java/org/apache/commons/math3/exception/TooManyEvaluationsException.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.exception; +package org.apache.commons.math3.exception; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** * Exception to be thrown when the maximal number of evaluations is exceeded. diff --git a/src/main/java/org/apache/commons/math/exception/ZeroException.java b/src/main/java/org/apache/commons/math3/exception/ZeroException.java similarity index 89% rename from src/main/java/org/apache/commons/math/exception/ZeroException.java rename to src/main/java/org/apache/commons/math3/exception/ZeroException.java index d82d3836f..81d910046 100644 --- a/src/main/java/org/apache/commons/math/exception/ZeroException.java +++ b/src/main/java/org/apache/commons/math3/exception/ZeroException.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.exception; +package org.apache.commons.math3.exception; -import org.apache.commons.math.exception.util.Localizable; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.util.Localizable; +import org.apache.commons.math3.exception.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-info.java b/src/main/java/org/apache/commons/math3/exception/package-info.java similarity index 95% rename from src/main/java/org/apache/commons/math/exception/package-info.java rename to src/main/java/org/apache/commons/math3/exception/package-info.java index e42b8fe82..f6e7319e5 100644 --- a/src/main/java/org/apache/commons/math/exception/package-info.java +++ b/src/main/java/org/apache/commons/math3/exception/package-info.java @@ -20,4 +20,4 @@ * using simple java properties. * */ -package org.apache.commons.math.exception; +package org.apache.commons.math3.exception; diff --git a/src/main/java/org/apache/commons/math/exception/util/ArgUtils.java b/src/main/java/org/apache/commons/math3/exception/util/ArgUtils.java similarity index 97% rename from src/main/java/org/apache/commons/math/exception/util/ArgUtils.java rename to src/main/java/org/apache/commons/math3/exception/util/ArgUtils.java index acd2de4c8..f62009a24 100644 --- a/src/main/java/org/apache/commons/math/exception/util/ArgUtils.java +++ b/src/main/java/org/apache/commons/math3/exception/util/ArgUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.exception.util; +package org.apache.commons.math3.exception.util; import java.util.List; import java.util.ArrayList; diff --git a/src/main/java/org/apache/commons/math/exception/util/DummyLocalizable.java b/src/main/java/org/apache/commons/math3/exception/util/DummyLocalizable.java similarity index 97% rename from src/main/java/org/apache/commons/math/exception/util/DummyLocalizable.java rename to src/main/java/org/apache/commons/math3/exception/util/DummyLocalizable.java index 07f5c01c6..e945d37e8 100644 --- a/src/main/java/org/apache/commons/math/exception/util/DummyLocalizable.java +++ b/src/main/java/org/apache/commons/math3/exception/util/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.exception.util; +package org.apache.commons.math3.exception.util; import java.util.Locale; diff --git a/src/main/java/org/apache/commons/math/exception/util/ExceptionContext.java b/src/main/java/org/apache/commons/math3/exception/util/ExceptionContext.java similarity index 99% rename from src/main/java/org/apache/commons/math/exception/util/ExceptionContext.java rename to src/main/java/org/apache/commons/math3/exception/util/ExceptionContext.java index 7b42fff9e..ce7a8733a 100644 --- a/src/main/java/org/apache/commons/math/exception/util/ExceptionContext.java +++ b/src/main/java/org/apache/commons/math3/exception/util/ExceptionContext.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.exception.util; +package org.apache.commons.math3.exception.util; import java.util.List; import java.util.ArrayList; diff --git a/src/main/java/org/apache/commons/math/exception/util/ExceptionContextProvider.java b/src/main/java/org/apache/commons/math3/exception/util/ExceptionContextProvider.java similarity index 96% rename from src/main/java/org/apache/commons/math/exception/util/ExceptionContextProvider.java rename to src/main/java/org/apache/commons/math3/exception/util/ExceptionContextProvider.java index 8c3ed13a4..d408d14cb 100644 --- a/src/main/java/org/apache/commons/math/exception/util/ExceptionContextProvider.java +++ b/src/main/java/org/apache/commons/math3/exception/util/ExceptionContextProvider.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.exception.util; +package org.apache.commons.math3.exception.util; /** * Interface for accessing the context data structure stored in Commons Math diff --git a/src/main/java/org/apache/commons/math/exception/util/Localizable.java b/src/main/java/org/apache/commons/math3/exception/util/Localizable.java similarity index 96% rename from src/main/java/org/apache/commons/math/exception/util/Localizable.java rename to src/main/java/org/apache/commons/math3/exception/util/Localizable.java index fd37ffd9b..da6e4eece 100644 --- a/src/main/java/org/apache/commons/math/exception/util/Localizable.java +++ b/src/main/java/org/apache/commons/math3/exception/util/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.exception.util; +package org.apache.commons.math3.exception.util; import java.io.Serializable; import java.util.Locale; diff --git a/src/main/java/org/apache/commons/math/exception/util/LocalizedFormats.java b/src/main/java/org/apache/commons/math3/exception/util/LocalizedFormats.java similarity index 99% rename from src/main/java/org/apache/commons/math/exception/util/LocalizedFormats.java rename to src/main/java/org/apache/commons/math3/exception/util/LocalizedFormats.java index 2a5436752..622c8b334 100644 --- a/src/main/java/org/apache/commons/math/exception/util/LocalizedFormats.java +++ b/src/main/java/org/apache/commons/math3/exception/util/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.exception.util; +package org.apache.commons.math3.exception.util; import java.util.Locale; import java.util.MissingResourceException; diff --git a/src/main/java/org/apache/commons/math/exception/util/package-info.java b/src/main/java/org/apache/commons/math3/exception/util/package-info.java similarity index 94% rename from src/main/java/org/apache/commons/math/exception/util/package-info.java rename to src/main/java/org/apache/commons/math3/exception/util/package-info.java index 871bef298..6439a8dfe 100644 --- a/src/main/java/org/apache/commons/math/exception/util/package-info.java +++ b/src/main/java/org/apache/commons/math3/exception/util/package-info.java @@ -19,4 +19,4 @@ * Classes supporting exception localization. * */ -package org.apache.commons.math.exception.util; +package org.apache.commons.math3.exception.util; diff --git a/src/main/java/org/apache/commons/math/filter/DefaultMeasurementModel.java b/src/main/java/org/apache/commons/math3/filter/DefaultMeasurementModel.java similarity index 94% rename from src/main/java/org/apache/commons/math/filter/DefaultMeasurementModel.java rename to src/main/java/org/apache/commons/math3/filter/DefaultMeasurementModel.java index 7ce703c6e..286dd9626 100644 --- a/src/main/java/org/apache/commons/math/filter/DefaultMeasurementModel.java +++ b/src/main/java/org/apache/commons/math3/filter/DefaultMeasurementModel.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.filter; +package org.apache.commons.math3.filter; -import org.apache.commons.math.linear.Array2DRowRealMatrix; -import org.apache.commons.math.linear.RealMatrix; +import org.apache.commons.math3.linear.Array2DRowRealMatrix; +import org.apache.commons.math3.linear.RealMatrix; /** * Default implementation of a {@link MeasurementModel} for the use with a diff --git a/src/main/java/org/apache/commons/math/filter/DefaultProcessModel.java b/src/main/java/org/apache/commons/math3/filter/DefaultProcessModel.java similarity index 95% rename from src/main/java/org/apache/commons/math/filter/DefaultProcessModel.java rename to src/main/java/org/apache/commons/math3/filter/DefaultProcessModel.java index 38473f485..191e3274a 100644 --- a/src/main/java/org/apache/commons/math/filter/DefaultProcessModel.java +++ b/src/main/java/org/apache/commons/math3/filter/DefaultProcessModel.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.filter; +package org.apache.commons.math3.filter; -import org.apache.commons.math.linear.Array2DRowRealMatrix; -import org.apache.commons.math.linear.ArrayRealVector; -import org.apache.commons.math.linear.RealMatrix; -import org.apache.commons.math.linear.RealVector; +import org.apache.commons.math3.linear.Array2DRowRealMatrix; +import org.apache.commons.math3.linear.ArrayRealVector; +import org.apache.commons.math3.linear.RealMatrix; +import org.apache.commons.math3.linear.RealVector; /** * Default implementation of a {@link ProcessModel} for the use with a diff --git a/src/main/java/org/apache/commons/math/filter/KalmanFilter.java b/src/main/java/org/apache/commons/math3/filter/KalmanFilter.java similarity index 93% rename from src/main/java/org/apache/commons/math/filter/KalmanFilter.java rename to src/main/java/org/apache/commons/math3/filter/KalmanFilter.java index 4c70ddac7..10496ef22 100644 --- a/src/main/java/org/apache/commons/math/filter/KalmanFilter.java +++ b/src/main/java/org/apache/commons/math3/filter/KalmanFilter.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.filter; +package org.apache.commons.math3.filter; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.linear.Array2DRowRealMatrix; -import org.apache.commons.math.linear.ArrayRealVector; -import org.apache.commons.math.linear.CholeskyDecomposition; -import org.apache.commons.math.linear.DecompositionSolver; -import org.apache.commons.math.linear.MatrixDimensionMismatchException; -import org.apache.commons.math.linear.MatrixUtils; -import org.apache.commons.math.linear.NonSquareMatrixException; -import org.apache.commons.math.linear.RealMatrix; -import org.apache.commons.math.linear.RealVector; -import org.apache.commons.math.util.MathUtils; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.linear.Array2DRowRealMatrix; +import org.apache.commons.math3.linear.ArrayRealVector; +import org.apache.commons.math3.linear.CholeskyDecomposition; +import org.apache.commons.math3.linear.DecompositionSolver; +import org.apache.commons.math3.linear.MatrixDimensionMismatchException; +import org.apache.commons.math3.linear.MatrixUtils; +import org.apache.commons.math3.linear.NonSquareMatrixException; +import org.apache.commons.math3.linear.RealMatrix; +import org.apache.commons.math3.linear.RealVector; +import org.apache.commons.math3.util.MathUtils; /** * Implementation of a Kalman filter to estimate the state xk @@ -109,7 +109,7 @@ public class KalmanFilter { * the model defining the underlying process dynamics * @param measurement * the model defining the given measurement characteristics - * @throws org.apache.commons.math.exception.NullArgumentException + * @throws org.apache.commons.math3.exception.NullArgumentException * if any of the given inputs is null (except for the control * matrix) * @throws NonSquareMatrixException @@ -321,7 +321,7 @@ public class KalmanFilter { * @param z the measurement vector * @throws DimensionMismatchException * if the dimension of the measurement vector does not fit - * @throws org.apache.commons.math.linear.SingularMatrixException + * @throws org.apache.commons.math3.linear.SingularMatrixException * if the covariance matrix could not be inverted */ public void correct(final double[] z) { @@ -334,7 +334,7 @@ public class KalmanFilter { * @param z the measurement vector * @throws DimensionMismatchException if the dimension of the * measurement vector does not fit - * @throws org.apache.commons.math.linear.SingularMatrixException + * @throws org.apache.commons.math3.linear.SingularMatrixException * if the covariance matrix could not be inverted */ public void correct(final RealVector z) { diff --git a/src/main/java/org/apache/commons/math/filter/MeasurementModel.java b/src/main/java/org/apache/commons/math3/filter/MeasurementModel.java similarity index 89% rename from src/main/java/org/apache/commons/math/filter/MeasurementModel.java rename to src/main/java/org/apache/commons/math3/filter/MeasurementModel.java index 026b0da4a..95013b8cd 100644 --- a/src/main/java/org/apache/commons/math/filter/MeasurementModel.java +++ b/src/main/java/org/apache/commons/math3/filter/MeasurementModel.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.filter; +package org.apache.commons.math3.filter; -import org.apache.commons.math.linear.RealMatrix; +import org.apache.commons.math3.linear.RealMatrix; /** * Defines the measurement model for the use with a {@link KalmanFilter}. @@ -40,7 +40,7 @@ public interface MeasurementModel { * * @return the measurement noise matrix * @see KalmanFilter#correct(double[]) - * @see KalmanFilter#correct(org.apache.commons.math.linear.RealVector) + * @see KalmanFilter#correct(org.apache.commons.math3.linear.RealVector) */ RealMatrix getMeasurementNoise(); } diff --git a/src/main/java/org/apache/commons/math/filter/ProcessModel.java b/src/main/java/org/apache/commons/math3/filter/ProcessModel.java similarity index 94% rename from src/main/java/org/apache/commons/math/filter/ProcessModel.java rename to src/main/java/org/apache/commons/math3/filter/ProcessModel.java index b097a080a..dc8708ca9 100644 --- a/src/main/java/org/apache/commons/math/filter/ProcessModel.java +++ b/src/main/java/org/apache/commons/math3/filter/ProcessModel.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.filter; +package org.apache.commons.math3.filter; -import org.apache.commons.math.linear.RealMatrix; -import org.apache.commons.math.linear.RealVector; +import org.apache.commons.math3.linear.RealMatrix; +import org.apache.commons.math3.linear.RealVector; /** * Defines the process dynamics model for the use with a {@link KalmanFilter}. diff --git a/src/main/java/org/apache/commons/math/filter/package-info.java b/src/main/java/org/apache/commons/math3/filter/package-info.java similarity index 95% rename from src/main/java/org/apache/commons/math/filter/package-info.java rename to src/main/java/org/apache/commons/math3/filter/package-info.java index 0c7fa6625..4e7653664 100644 --- a/src/main/java/org/apache/commons/math/filter/package-info.java +++ b/src/main/java/org/apache/commons/math3/filter/package-info.java @@ -17,4 +17,4 @@ /** * Implementations of common discrete-time linear filters. */ -package org.apache.commons.math.filter; +package org.apache.commons.math3.filter; diff --git a/src/main/java/org/apache/commons/math/fraction/AbstractFormat.java b/src/main/java/org/apache/commons/math3/fraction/AbstractFormat.java similarity index 97% rename from src/main/java/org/apache/commons/math/fraction/AbstractFormat.java rename to src/main/java/org/apache/commons/math3/fraction/AbstractFormat.java index 50641e378..34261301f 100644 --- a/src/main/java/org/apache/commons/math/fraction/AbstractFormat.java +++ b/src/main/java/org/apache/commons/math3/fraction/AbstractFormat.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.fraction; +package org.apache.commons.math3.fraction; import java.io.Serializable; import java.text.FieldPosition; @@ -23,8 +23,8 @@ import java.text.NumberFormat; import java.text.ParsePosition; import java.util.Locale; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.exception.util.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/math3/fraction/BigFraction.java similarity index 98% rename from src/main/java/org/apache/commons/math/fraction/BigFraction.java rename to src/main/java/org/apache/commons/math3/fraction/BigFraction.java index 24cd7cf62..5a44b4f42 100644 --- a/src/main/java/org/apache/commons/math/fraction/BigFraction.java +++ b/src/main/java/org/apache/commons/math3/fraction/BigFraction.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.fraction; +package org.apache.commons.math3.fraction; import java.io.Serializable; import java.math.BigDecimal; import java.math.BigInteger; -import org.apache.commons.math.FieldElement; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.exception.ZeroException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.util.FastMath; -import org.apache.commons.math.util.MathUtils; -import org.apache.commons.math.util.ArithmeticUtils; +import org.apache.commons.math3.FieldElement; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.exception.ZeroException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math3.util.MathUtils; +import org.apache.commons.math3.util.ArithmeticUtils; /** * Representation of a rational number without any overflow. This class is diff --git a/src/main/java/org/apache/commons/math/fraction/BigFractionField.java b/src/main/java/org/apache/commons/math3/fraction/BigFractionField.java similarity index 94% rename from src/main/java/org/apache/commons/math/fraction/BigFractionField.java rename to src/main/java/org/apache/commons/math3/fraction/BigFractionField.java index 9403e5382..04645cc37 100644 --- a/src/main/java/org/apache/commons/math/fraction/BigFractionField.java +++ b/src/main/java/org/apache/commons/math3/fraction/BigFractionField.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.commons.math.fraction; +package org.apache.commons.math3.fraction; import java.io.Serializable; -import org.apache.commons.math.Field; -import org.apache.commons.math.FieldElement; +import org.apache.commons.math3.Field; +import org.apache.commons.math3.FieldElement; /** * Representation of the fractional numbers without any overflow field. diff --git a/src/main/java/org/apache/commons/math/fraction/BigFractionFormat.java b/src/main/java/org/apache/commons/math3/fraction/BigFractionFormat.java similarity index 97% rename from src/main/java/org/apache/commons/math/fraction/BigFractionFormat.java rename to src/main/java/org/apache/commons/math3/fraction/BigFractionFormat.java index 079e2752e..fc3d1ff49 100644 --- a/src/main/java/org/apache/commons/math/fraction/BigFractionFormat.java +++ b/src/main/java/org/apache/commons/math3/fraction/BigFractionFormat.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.fraction; +package org.apache.commons.math3.fraction; import java.io.Serializable; import java.math.BigInteger; @@ -24,9 +24,9 @@ import java.text.NumberFormat; import java.text.ParsePosition; import java.util.Locale; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.MathParseException; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.MathParseException; +import org.apache.commons.math3.exception.util.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/math3/fraction/Fraction.java similarity index 98% rename from src/main/java/org/apache/commons/math/fraction/Fraction.java rename to src/main/java/org/apache/commons/math3/fraction/Fraction.java index c8f0201ca..f84218ebd 100644 --- a/src/main/java/org/apache/commons/math/fraction/Fraction.java +++ b/src/main/java/org/apache/commons/math3/fraction/Fraction.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.fraction; +package org.apache.commons.math3.fraction; import java.io.Serializable; import java.math.BigInteger; -import org.apache.commons.math.FieldElement; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.exception.MathArithmeticException; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.util.ArithmeticUtils; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.FieldElement; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.MathArithmeticException; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.util.ArithmeticUtils; +import org.apache.commons.math3.util.FastMath; /** * Representation of a rational number. diff --git a/src/main/java/org/apache/commons/math/fraction/FractionConversionException.java b/src/main/java/org/apache/commons/math3/fraction/FractionConversionException.java similarity index 92% rename from src/main/java/org/apache/commons/math/fraction/FractionConversionException.java rename to src/main/java/org/apache/commons/math3/fraction/FractionConversionException.java index 560e0f998..ba7fe1717 100644 --- a/src/main/java/org/apache/commons/math/fraction/FractionConversionException.java +++ b/src/main/java/org/apache/commons/math3/fraction/FractionConversionException.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.fraction; +package org.apache.commons.math3.fraction; -import org.apache.commons.math.exception.ConvergenceException; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.ConvergenceException; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** * Error thrown when a double value cannot be converted to a fraction diff --git a/src/main/java/org/apache/commons/math/fraction/FractionField.java b/src/main/java/org/apache/commons/math3/fraction/FractionField.java similarity index 94% rename from src/main/java/org/apache/commons/math/fraction/FractionField.java rename to src/main/java/org/apache/commons/math3/fraction/FractionField.java index c77b9d70b..190ef02e5 100644 --- a/src/main/java/org/apache/commons/math/fraction/FractionField.java +++ b/src/main/java/org/apache/commons/math3/fraction/FractionField.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.commons.math.fraction; +package org.apache.commons.math3.fraction; import java.io.Serializable; -import org.apache.commons.math.Field; -import org.apache.commons.math.FieldElement; +import org.apache.commons.math3.Field; +import org.apache.commons.math3.FieldElement; /** * Representation of the fractional numbers field. diff --git a/src/main/java/org/apache/commons/math/fraction/FractionFormat.java b/src/main/java/org/apache/commons/math3/fraction/FractionFormat.java similarity index 97% rename from src/main/java/org/apache/commons/math/fraction/FractionFormat.java rename to src/main/java/org/apache/commons/math3/fraction/FractionFormat.java index d1bde186b..2118cf703 100644 --- a/src/main/java/org/apache/commons/math/fraction/FractionFormat.java +++ b/src/main/java/org/apache/commons/math3/fraction/FractionFormat.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.commons.math.fraction; +package org.apache.commons.math3.fraction; import java.text.FieldPosition; import java.text.NumberFormat; import java.text.ParsePosition; import java.util.Locale; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.MathParseException; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.MathParseException; +import org.apache.commons.math3.exception.util.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/math3/fraction/ProperBigFractionFormat.java similarity index 97% rename from src/main/java/org/apache/commons/math/fraction/ProperBigFractionFormat.java rename to src/main/java/org/apache/commons/math3/fraction/ProperBigFractionFormat.java index 0c0104fea..e8159b689 100644 --- a/src/main/java/org/apache/commons/math/fraction/ProperBigFractionFormat.java +++ b/src/main/java/org/apache/commons/math3/fraction/ProperBigFractionFormat.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.fraction; +package org.apache.commons.math3.fraction; import java.math.BigInteger; import java.text.FieldPosition; import java.text.NumberFormat; import java.text.ParsePosition; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.exception.NullArgumentException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.NullArgumentException; /** * 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/math3/fraction/ProperFractionFormat.java similarity index 97% rename from src/main/java/org/apache/commons/math/fraction/ProperFractionFormat.java rename to src/main/java/org/apache/commons/math3/fraction/ProperFractionFormat.java index f25184bc8..4b1a8bc4d 100644 --- a/src/main/java/org/apache/commons/math/fraction/ProperFractionFormat.java +++ b/src/main/java/org/apache/commons/math3/fraction/ProperFractionFormat.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.fraction; +package org.apache.commons.math3.fraction; import java.text.FieldPosition; import java.text.NumberFormat; import java.text.ParsePosition; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.util.MathUtils; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.util.MathUtils; /** * Formats a Fraction number in proper format. The number format for each of diff --git a/src/main/java/org/apache/commons/math/fraction/package-info.java b/src/main/java/org/apache/commons/math3/fraction/package-info.java similarity index 95% rename from src/main/java/org/apache/commons/math/fraction/package-info.java rename to src/main/java/org/apache/commons/math3/fraction/package-info.java index 59c86fac0..f5425c632 100644 --- a/src/main/java/org/apache/commons/math/fraction/package-info.java +++ b/src/main/java/org/apache/commons/math3/fraction/package-info.java @@ -19,4 +19,4 @@ * Fraction number type and fraction number formatting. * */ -package org.apache.commons.math.fraction; +package org.apache.commons.math3.fraction; diff --git a/src/main/java/org/apache/commons/math/genetics/AbstractListChromosome.java b/src/main/java/org/apache/commons/math3/genetics/AbstractListChromosome.java similarity index 98% rename from src/main/java/org/apache/commons/math/genetics/AbstractListChromosome.java rename to src/main/java/org/apache/commons/math3/genetics/AbstractListChromosome.java index 0b76f4c6d..d42c5117b 100644 --- a/src/main/java/org/apache/commons/math/genetics/AbstractListChromosome.java +++ b/src/main/java/org/apache/commons/math3/genetics/AbstractListChromosome.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.genetics; +package org.apache.commons.math3.genetics; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/org/apache/commons/math/genetics/BinaryChromosome.java b/src/main/java/org/apache/commons/math3/genetics/BinaryChromosome.java similarity index 96% rename from src/main/java/org/apache/commons/math/genetics/BinaryChromosome.java rename to src/main/java/org/apache/commons/math3/genetics/BinaryChromosome.java index 54c7172ec..f79444529 100644 --- a/src/main/java/org/apache/commons/math/genetics/BinaryChromosome.java +++ b/src/main/java/org/apache/commons/math3/genetics/BinaryChromosome.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.genetics; +package org.apache.commons.math3.genetics; import java.util.ArrayList; import java.util.List; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** diff --git a/src/main/java/org/apache/commons/math/genetics/BinaryMutation.java b/src/main/java/org/apache/commons/math3/genetics/BinaryMutation.java similarity index 91% rename from src/main/java/org/apache/commons/math/genetics/BinaryMutation.java rename to src/main/java/org/apache/commons/math3/genetics/BinaryMutation.java index bfb306ffd..e6bc1b025 100644 --- a/src/main/java/org/apache/commons/math/genetics/BinaryMutation.java +++ b/src/main/java/org/apache/commons/math3/genetics/BinaryMutation.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.genetics; +package org.apache.commons.math3.genetics; import java.util.ArrayList; import java.util.List; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** * Mutation for {@link BinaryChromosome}s. Randomly changes one gene. diff --git a/src/main/java/org/apache/commons/math/genetics/Chromosome.java b/src/main/java/org/apache/commons/math3/genetics/Chromosome.java similarity index 98% rename from src/main/java/org/apache/commons/math/genetics/Chromosome.java rename to src/main/java/org/apache/commons/math3/genetics/Chromosome.java index 7ab8b1b52..5b333e8d0 100644 --- a/src/main/java/org/apache/commons/math/genetics/Chromosome.java +++ b/src/main/java/org/apache/commons/math3/genetics/Chromosome.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.genetics; +package org.apache.commons.math3.genetics; /** * Individual in a population. Chromosomes are compared based on their fitness. diff --git a/src/main/java/org/apache/commons/math/genetics/ChromosomePair.java b/src/main/java/org/apache/commons/math3/genetics/ChromosomePair.java similarity index 97% rename from src/main/java/org/apache/commons/math/genetics/ChromosomePair.java rename to src/main/java/org/apache/commons/math3/genetics/ChromosomePair.java index ba1c7d7b3..5377a43d7 100644 --- a/src/main/java/org/apache/commons/math/genetics/ChromosomePair.java +++ b/src/main/java/org/apache/commons/math3/genetics/ChromosomePair.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.genetics; +package org.apache.commons.math3.genetics; /** * A pair of {@link Chromosome} objects. diff --git a/src/main/java/org/apache/commons/math/genetics/CrossoverPolicy.java b/src/main/java/org/apache/commons/math3/genetics/CrossoverPolicy.java similarity index 96% rename from src/main/java/org/apache/commons/math/genetics/CrossoverPolicy.java rename to src/main/java/org/apache/commons/math3/genetics/CrossoverPolicy.java index 00f9bdcde..99ea71221 100644 --- a/src/main/java/org/apache/commons/math/genetics/CrossoverPolicy.java +++ b/src/main/java/org/apache/commons/math3/genetics/CrossoverPolicy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.genetics; +package org.apache.commons.math3.genetics; /** * Policy used to create a pair of new chromosomes by performing a crossover diff --git a/src/main/java/org/apache/commons/math/genetics/ElitisticListPopulation.java b/src/main/java/org/apache/commons/math3/genetics/ElitisticListPopulation.java similarity index 94% rename from src/main/java/org/apache/commons/math/genetics/ElitisticListPopulation.java rename to src/main/java/org/apache/commons/math3/genetics/ElitisticListPopulation.java index ff687dc2d..8113f4ef9 100644 --- a/src/main/java/org/apache/commons/math/genetics/ElitisticListPopulation.java +++ b/src/main/java/org/apache/commons/math3/genetics/ElitisticListPopulation.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.genetics; +package org.apache.commons.math3.genetics; import java.util.Collections; import java.util.List; -import org.apache.commons.math.exception.OutOfRangeException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.OutOfRangeException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.util.FastMath; /** * Population of chromosomes which uses elitism (certain percentace of the best diff --git a/src/main/java/org/apache/commons/math/genetics/Fitness.java b/src/main/java/org/apache/commons/math3/genetics/Fitness.java similarity index 96% rename from src/main/java/org/apache/commons/math/genetics/Fitness.java rename to src/main/java/org/apache/commons/math3/genetics/Fitness.java index c1d70800c..e829eb4c4 100644 --- a/src/main/java/org/apache/commons/math/genetics/Fitness.java +++ b/src/main/java/org/apache/commons/math3/genetics/Fitness.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.genetics; +package org.apache.commons.math3.genetics; /** * Fitness of a chromosome. diff --git a/src/main/java/org/apache/commons/math/genetics/FixedGenerationCount.java b/src/main/java/org/apache/commons/math3/genetics/FixedGenerationCount.java similarity index 95% rename from src/main/java/org/apache/commons/math/genetics/FixedGenerationCount.java rename to src/main/java/org/apache/commons/math3/genetics/FixedGenerationCount.java index 4bcb22ac5..07d80a3b2 100644 --- a/src/main/java/org/apache/commons/math/genetics/FixedGenerationCount.java +++ b/src/main/java/org/apache/commons/math3/genetics/FixedGenerationCount.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.genetics; +package org.apache.commons.math3.genetics; -import org.apache.commons.math.exception.NumberIsTooSmallException; +import org.apache.commons.math3.exception.NumberIsTooSmallException; /** * Stops after a fixed number of generations. Each time diff --git a/src/main/java/org/apache/commons/math/genetics/GeneticAlgorithm.java b/src/main/java/org/apache/commons/math3/genetics/GeneticAlgorithm.java similarity index 96% rename from src/main/java/org/apache/commons/math/genetics/GeneticAlgorithm.java rename to src/main/java/org/apache/commons/math3/genetics/GeneticAlgorithm.java index 41701ceff..327a4c1ae 100644 --- a/src/main/java/org/apache/commons/math/genetics/GeneticAlgorithm.java +++ b/src/main/java/org/apache/commons/math3/genetics/GeneticAlgorithm.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.genetics; +package org.apache.commons.math3.genetics; -import org.apache.commons.math.exception.OutOfRangeException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.random.RandomGenerator; -import org.apache.commons.math.random.JDKRandomGenerator; +import org.apache.commons.math3.exception.OutOfRangeException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.random.RandomGenerator; +import org.apache.commons.math3.random.JDKRandomGenerator; /** * Implementation of a genetic algorithm. All factors that govern the operation diff --git a/src/main/java/org/apache/commons/math/genetics/InvalidRepresentationException.java b/src/main/java/org/apache/commons/math3/genetics/InvalidRepresentationException.java similarity index 88% rename from src/main/java/org/apache/commons/math/genetics/InvalidRepresentationException.java rename to src/main/java/org/apache/commons/math3/genetics/InvalidRepresentationException.java index 8e7febf04..a01492cdb 100644 --- a/src/main/java/org/apache/commons/math/genetics/InvalidRepresentationException.java +++ b/src/main/java/org/apache/commons/math3/genetics/InvalidRepresentationException.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.genetics; +package org.apache.commons.math3.genetics; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.util.Localizable; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.util.Localizable; /** * Exception indicating that the representation of a chromosome is not valid. diff --git a/src/main/java/org/apache/commons/math/genetics/ListPopulation.java b/src/main/java/org/apache/commons/math3/genetics/ListPopulation.java similarity index 95% rename from src/main/java/org/apache/commons/math/genetics/ListPopulation.java rename to src/main/java/org/apache/commons/math3/genetics/ListPopulation.java index e2a92c939..4f112c801 100644 --- a/src/main/java/org/apache/commons/math/genetics/ListPopulation.java +++ b/src/main/java/org/apache/commons/math3/genetics/ListPopulation.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.genetics; +package org.apache.commons.math3.genetics; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.exception.NotPositiveException; -import org.apache.commons.math.exception.NumberIsTooLargeException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.NotPositiveException; +import org.apache.commons.math3.exception.NumberIsTooLargeException; /** * Population of chromosomes represented by a {@link List}. diff --git a/src/main/java/org/apache/commons/math/genetics/MutationPolicy.java b/src/main/java/org/apache/commons/math3/genetics/MutationPolicy.java similarity index 96% rename from src/main/java/org/apache/commons/math/genetics/MutationPolicy.java rename to src/main/java/org/apache/commons/math3/genetics/MutationPolicy.java index 8483f4698..374d8a024 100644 --- a/src/main/java/org/apache/commons/math/genetics/MutationPolicy.java +++ b/src/main/java/org/apache/commons/math3/genetics/MutationPolicy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.genetics; +package org.apache.commons.math3.genetics; /** * Algorithm used to mutate a chromosome. diff --git a/src/main/java/org/apache/commons/math/genetics/OnePointCrossover.java b/src/main/java/org/apache/commons/math3/genetics/OnePointCrossover.java similarity index 95% rename from src/main/java/org/apache/commons/math/genetics/OnePointCrossover.java rename to src/main/java/org/apache/commons/math3/genetics/OnePointCrossover.java index 096057205..d7616e2aa 100644 --- a/src/main/java/org/apache/commons/math/genetics/OnePointCrossover.java +++ b/src/main/java/org/apache/commons/math3/genetics/OnePointCrossover.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.genetics; +package org.apache.commons.math3.genetics; import java.util.ArrayList; import java.util.List; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** diff --git a/src/main/java/org/apache/commons/math/genetics/PermutationChromosome.java b/src/main/java/org/apache/commons/math3/genetics/PermutationChromosome.java similarity index 97% rename from src/main/java/org/apache/commons/math/genetics/PermutationChromosome.java rename to src/main/java/org/apache/commons/math3/genetics/PermutationChromosome.java index 52b9b688d..d4332f94c 100644 --- a/src/main/java/org/apache/commons/math/genetics/PermutationChromosome.java +++ b/src/main/java/org/apache/commons/math3/genetics/PermutationChromosome.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.genetics; +package org.apache.commons.math3.genetics; import java.util.List; diff --git a/src/main/java/org/apache/commons/math/genetics/Population.java b/src/main/java/org/apache/commons/math3/genetics/Population.java similarity index 97% rename from src/main/java/org/apache/commons/math/genetics/Population.java rename to src/main/java/org/apache/commons/math3/genetics/Population.java index 7722f27e3..5b7b2d26d 100644 --- a/src/main/java/org/apache/commons/math/genetics/Population.java +++ b/src/main/java/org/apache/commons/math3/genetics/Population.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.genetics; +package org.apache.commons.math3.genetics; /** * A collection of chromosomes that facilitates generational evolution. diff --git a/src/main/java/org/apache/commons/math/genetics/RandomKey.java b/src/main/java/org/apache/commons/math3/genetics/RandomKey.java similarity index 97% rename from src/main/java/org/apache/commons/math/genetics/RandomKey.java rename to src/main/java/org/apache/commons/math3/genetics/RandomKey.java index 9f5d840a6..66b50140b 100644 --- a/src/main/java/org/apache/commons/math/genetics/RandomKey.java +++ b/src/main/java/org/apache/commons/math3/genetics/RandomKey.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.genetics; +package org.apache.commons.math3.genetics; import java.util.ArrayList; import java.util.Arrays; @@ -22,9 +22,9 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** *

    diff --git a/src/main/java/org/apache/commons/math/genetics/RandomKeyMutation.java b/src/main/java/org/apache/commons/math3/genetics/RandomKeyMutation.java similarity index 91% rename from src/main/java/org/apache/commons/math/genetics/RandomKeyMutation.java rename to src/main/java/org/apache/commons/math3/genetics/RandomKeyMutation.java index 5d69cef97..9f4ed1ce9 100644 --- a/src/main/java/org/apache/commons/math/genetics/RandomKeyMutation.java +++ b/src/main/java/org/apache/commons/math3/genetics/RandomKeyMutation.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.genetics; +package org.apache.commons.math3.genetics; import java.util.ArrayList; import java.util.List; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** * Mutation operator for {@link RandomKey}s. Changes a randomly chosen element diff --git a/src/main/java/org/apache/commons/math/genetics/SelectionPolicy.java b/src/main/java/org/apache/commons/math3/genetics/SelectionPolicy.java similarity index 96% rename from src/main/java/org/apache/commons/math/genetics/SelectionPolicy.java rename to src/main/java/org/apache/commons/math3/genetics/SelectionPolicy.java index c7f4513be..ef1d8cc5a 100644 --- a/src/main/java/org/apache/commons/math/genetics/SelectionPolicy.java +++ b/src/main/java/org/apache/commons/math3/genetics/SelectionPolicy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.genetics; +package org.apache.commons.math3.genetics; /** * Algorithm used to select a chromosome pair from a population. diff --git a/src/main/java/org/apache/commons/math/genetics/StoppingCondition.java b/src/main/java/org/apache/commons/math3/genetics/StoppingCondition.java similarity index 96% rename from src/main/java/org/apache/commons/math/genetics/StoppingCondition.java rename to src/main/java/org/apache/commons/math3/genetics/StoppingCondition.java index 583151c32..34a918afa 100644 --- a/src/main/java/org/apache/commons/math/genetics/StoppingCondition.java +++ b/src/main/java/org/apache/commons/math3/genetics/StoppingCondition.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.genetics; +package org.apache.commons.math3.genetics; /** * Algorithm used to determine when to stop evolution. diff --git a/src/main/java/org/apache/commons/math/genetics/TournamentSelection.java b/src/main/java/org/apache/commons/math3/genetics/TournamentSelection.java similarity index 95% rename from src/main/java/org/apache/commons/math/genetics/TournamentSelection.java rename to src/main/java/org/apache/commons/math3/genetics/TournamentSelection.java index 92f3fa3a4..d936e9c70 100644 --- a/src/main/java/org/apache/commons/math/genetics/TournamentSelection.java +++ b/src/main/java/org/apache/commons/math3/genetics/TournamentSelection.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.genetics; +package org.apache.commons.math3.genetics; import java.util.ArrayList; import java.util.List; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** * Tournament selection scheme. Each of the two selected chromosomes is selected diff --git a/src/main/java/org/apache/commons/math/genetics/package-info.java b/src/main/java/org/apache/commons/math3/genetics/package-info.java similarity index 95% rename from src/main/java/org/apache/commons/math/genetics/package-info.java rename to src/main/java/org/apache/commons/math3/genetics/package-info.java index affd773aa..20b796121 100644 --- a/src/main/java/org/apache/commons/math/genetics/package-info.java +++ b/src/main/java/org/apache/commons/math3/genetics/package-info.java @@ -21,4 +21,4 @@ *

    * */ -package org.apache.commons.math.genetics; +package org.apache.commons.math3.genetics; diff --git a/src/main/java/org/apache/commons/math/geometry/Space.java b/src/main/java/org/apache/commons/math3/geometry/Space.java similarity index 96% rename from src/main/java/org/apache/commons/math/geometry/Space.java rename to src/main/java/org/apache/commons/math3/geometry/Space.java index e486826cb..40cd687b2 100644 --- a/src/main/java/org/apache/commons/math/geometry/Space.java +++ b/src/main/java/org/apache/commons/math3/geometry/Space.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry; +package org.apache.commons.math3.geometry; import java.io.Serializable; diff --git a/src/main/java/org/apache/commons/math/geometry/Vector.java b/src/main/java/org/apache/commons/math3/geometry/Vector.java similarity index 99% rename from src/main/java/org/apache/commons/math/geometry/Vector.java rename to src/main/java/org/apache/commons/math3/geometry/Vector.java index 566e3c942..bb0717926 100644 --- a/src/main/java/org/apache/commons/math/geometry/Vector.java +++ b/src/main/java/org/apache/commons/math3/geometry/Vector.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry; +package org.apache.commons.math3.geometry; import java.io.Serializable; import java.text.NumberFormat; diff --git a/src/main/java/org/apache/commons/math/geometry/VectorFormat.java b/src/main/java/org/apache/commons/math3/geometry/VectorFormat.java similarity index 98% rename from src/main/java/org/apache/commons/math/geometry/VectorFormat.java rename to src/main/java/org/apache/commons/math3/geometry/VectorFormat.java index 3b05ff7bd..35a0a9487 100644 --- a/src/main/java/org/apache/commons/math/geometry/VectorFormat.java +++ b/src/main/java/org/apache/commons/math3/geometry/VectorFormat.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.apache.commons.math.geometry; +package org.apache.commons.math3.geometry; import java.text.FieldPosition; import java.text.NumberFormat; import java.text.ParsePosition; import java.util.Locale; -import org.apache.commons.math.util.CompositeFormat; -import org.apache.commons.math.exception.MathParseException; +import org.apache.commons.math3.util.CompositeFormat; +import org.apache.commons.math3.exception.MathParseException; /** * Formats a vector in components list format "{x; y; ...}". diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/oned/Euclidean1D.java b/src/main/java/org/apache/commons/math3/geometry/euclidean/oned/Euclidean1D.java similarity index 90% rename from src/main/java/org/apache/commons/math/geometry/euclidean/oned/Euclidean1D.java rename to src/main/java/org/apache/commons/math3/geometry/euclidean/oned/Euclidean1D.java index e06312642..86525c424 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/oned/Euclidean1D.java +++ b/src/main/java/org/apache/commons/math3/geometry/euclidean/oned/Euclidean1D.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.oned; +package org.apache.commons.math3.geometry.euclidean.oned; import java.io.Serializable; -import org.apache.commons.math.exception.MathUnsupportedOperationException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.geometry.Space; +import org.apache.commons.math3.exception.MathUnsupportedOperationException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.geometry.Space; /** * This class implements a one-dimensional space. diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/oned/Interval.java b/src/main/java/org/apache/commons/math3/geometry/euclidean/oned/Interval.java similarity index 97% rename from src/main/java/org/apache/commons/math/geometry/euclidean/oned/Interval.java rename to src/main/java/org/apache/commons/math3/geometry/euclidean/oned/Interval.java index 4b66d5c9b..1e1fd5471 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/oned/Interval.java +++ b/src/main/java/org/apache/commons/math3/geometry/euclidean/oned/Interval.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.oned; +package org.apache.commons.math3.geometry.euclidean.oned; /** This class represents a 1D interval. diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/oned/IntervalsSet.java b/src/main/java/org/apache/commons/math3/geometry/euclidean/oned/IntervalsSet.java similarity index 96% rename from src/main/java/org/apache/commons/math/geometry/euclidean/oned/IntervalsSet.java rename to src/main/java/org/apache/commons/math3/geometry/euclidean/oned/IntervalsSet.java index 191af4890..97278a93e 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/oned/IntervalsSet.java +++ b/src/main/java/org/apache/commons/math3/geometry/euclidean/oned/IntervalsSet.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.oned; +package org.apache.commons.math3.geometry.euclidean.oned; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.apache.commons.math.geometry.partitioning.AbstractRegion; -import org.apache.commons.math.geometry.partitioning.BSPTree; -import org.apache.commons.math.geometry.partitioning.SubHyperplane; +import org.apache.commons.math3.geometry.partitioning.AbstractRegion; +import org.apache.commons.math3.geometry.partitioning.BSPTree; +import org.apache.commons.math3.geometry.partitioning.SubHyperplane; /** This class represents a 1D region: a set of intervals. * @version $Id$ @@ -72,7 +72,7 @@ public class IntervalsSet extends AbstractRegion { * boundary does not really separate an inside open from an outside * open (open having here its topological meaning), then subsequent * calls to the {@link - * org.apache.commons.math.geometry.partitioning.Region#checkPoint(org.apache.commons.math.geometry.Vector) + * org.apache.commons.math3.geometry.partitioning.Region#checkPoint(org.apache.commons.math3.geometry.Vector) * checkPoint} method will not be meaningful anymore.

    *

    If the boundary is empty, the region will represent the whole * space.

    diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/oned/OrientedPoint.java b/src/main/java/org/apache/commons/math3/geometry/euclidean/oned/OrientedPoint.java similarity index 91% rename from src/main/java/org/apache/commons/math/geometry/euclidean/oned/OrientedPoint.java rename to src/main/java/org/apache/commons/math3/geometry/euclidean/oned/OrientedPoint.java index 31cd4a0dd..dbab1a272 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/oned/OrientedPoint.java +++ b/src/main/java/org/apache/commons/math3/geometry/euclidean/oned/OrientedPoint.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.oned; +package org.apache.commons.math3.geometry.euclidean.oned; -import org.apache.commons.math.geometry.Vector; -import org.apache.commons.math.geometry.partitioning.Hyperplane; +import org.apache.commons.math3.geometry.Vector; +import org.apache.commons.math3.geometry.partitioning.Hyperplane; /** This class represents a 1D oriented hyperplane. *

    An hyperplane in 1D is a simple point, its orientation being a @@ -63,10 +63,10 @@ public class OrientedPoint implements Hyperplane { *

    Since this class represent zero dimension spaces which does * not have lower dimension sub-spaces, this method returns a dummy * implementation of a {@link - * org.apache.commons.math.geometry.partitioning.Region Region} + * org.apache.commons.math3.geometry.partitioning.Region Region} * (always the same instance). This implementation is only used to * allow the {@link - * org.apache.commons.math.geometry.partitioning.SubHyperplane + * org.apache.commons.math3.geometry.partitioning.SubHyperplane * SubHyperplane} class implementation to work properly, it should * not be used otherwise.

    * @return a dummy region diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/oned/SubOrientedPoint.java b/src/main/java/org/apache/commons/math3/geometry/euclidean/oned/SubOrientedPoint.java similarity index 89% rename from src/main/java/org/apache/commons/math/geometry/euclidean/oned/SubOrientedPoint.java rename to src/main/java/org/apache/commons/math3/geometry/euclidean/oned/SubOrientedPoint.java index b62d7340a..22a554bd9 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/oned/SubOrientedPoint.java +++ b/src/main/java/org/apache/commons/math3/geometry/euclidean/oned/SubOrientedPoint.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.oned; +package org.apache.commons.math3.geometry.euclidean.oned; -import org.apache.commons.math.geometry.partitioning.AbstractSubHyperplane; -import org.apache.commons.math.geometry.partitioning.Hyperplane; -import org.apache.commons.math.geometry.partitioning.Region; -import org.apache.commons.math.geometry.partitioning.Side; +import org.apache.commons.math3.geometry.partitioning.AbstractSubHyperplane; +import org.apache.commons.math3.geometry.partitioning.Hyperplane; +import org.apache.commons.math3.geometry.partitioning.Region; +import org.apache.commons.math3.geometry.partitioning.Side; /** This class represents sub-hyperplane for {@link OrientedPoint}. *

    An hyperplane in 1D is a simple point, its orientation being a diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/oned/Vector1D.java b/src/main/java/org/apache/commons/math3/geometry/euclidean/oned/Vector1D.java similarity index 96% rename from src/main/java/org/apache/commons/math/geometry/euclidean/oned/Vector1D.java rename to src/main/java/org/apache/commons/math3/geometry/euclidean/oned/Vector1D.java index 712333451..3b34ba1f7 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/oned/Vector1D.java +++ b/src/main/java/org/apache/commons/math3/geometry/euclidean/oned/Vector1D.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.oned; +package org.apache.commons.math3.geometry.euclidean.oned; import java.text.NumberFormat; -import org.apache.commons.math.exception.MathArithmeticException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.geometry.Space; -import org.apache.commons.math.geometry.Vector; -import org.apache.commons.math.util.FastMath; -import org.apache.commons.math.util.MathUtils; +import org.apache.commons.math3.exception.MathArithmeticException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.geometry.Space; +import org.apache.commons.math3.geometry.Vector; +import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math3.util.MathUtils; /** This class represents a 1D vector. *

    Instances of this class are guaranteed to be immutable.

    diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/oned/Vector1DFormat.java b/src/main/java/org/apache/commons/math3/geometry/euclidean/oned/Vector1DFormat.java similarity index 94% rename from src/main/java/org/apache/commons/math/geometry/euclidean/oned/Vector1DFormat.java rename to src/main/java/org/apache/commons/math3/geometry/euclidean/oned/Vector1DFormat.java index f037d0af3..c43ce0514 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/oned/Vector1DFormat.java +++ b/src/main/java/org/apache/commons/math3/geometry/euclidean/oned/Vector1DFormat.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.oned; +package org.apache.commons.math3.geometry.euclidean.oned; import java.text.FieldPosition; import java.text.NumberFormat; import java.text.ParsePosition; import java.util.Locale; -import org.apache.commons.math.exception.MathParseException; -import org.apache.commons.math.geometry.Vector; -import org.apache.commons.math.geometry.VectorFormat; -import org.apache.commons.math.util.CompositeFormat; +import org.apache.commons.math3.exception.MathParseException; +import org.apache.commons.math3.geometry.Vector; +import org.apache.commons.math3.geometry.VectorFormat; +import org.apache.commons.math3.util.CompositeFormat; /** * Formats a 1D vector in components list format "{x}". diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/oned/package-info.java b/src/main/java/org/apache/commons/math3/geometry/euclidean/oned/package-info.java similarity index 93% rename from src/main/java/org/apache/commons/math/geometry/euclidean/oned/package-info.java rename to src/main/java/org/apache/commons/math3/geometry/euclidean/oned/package-info.java index 83ccf22f5..0fa3788ed 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/oned/package-info.java +++ b/src/main/java/org/apache/commons/math3/geometry/euclidean/oned/package-info.java @@ -21,4 +21,4 @@ *

    * */ -package org.apache.commons.math.geometry.euclidean.oned; +package org.apache.commons.math3.geometry.euclidean.oned; diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/threed/CardanEulerSingularityException.java b/src/main/java/org/apache/commons/math3/geometry/euclidean/threed/CardanEulerSingularityException.java similarity index 88% rename from src/main/java/org/apache/commons/math/geometry/euclidean/threed/CardanEulerSingularityException.java rename to src/main/java/org/apache/commons/math3/geometry/euclidean/threed/CardanEulerSingularityException.java index dc4a1fb97..2f913c372 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/threed/CardanEulerSingularityException.java +++ b/src/main/java/org/apache/commons/math3/geometry/euclidean/threed/CardanEulerSingularityException.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.threed; +package org.apache.commons.math3.geometry.euclidean.threed; -import org.apache.commons.math.exception.MathIllegalStateException; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.MathIllegalStateException; +import org.apache.commons.math3.exception.util.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/euclidean/threed/Euclidean3D.java b/src/main/java/org/apache/commons/math3/geometry/euclidean/threed/Euclidean3D.java similarity index 92% rename from src/main/java/org/apache/commons/math/geometry/euclidean/threed/Euclidean3D.java rename to src/main/java/org/apache/commons/math3/geometry/euclidean/threed/Euclidean3D.java index c104a02bf..5969713f0 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/threed/Euclidean3D.java +++ b/src/main/java/org/apache/commons/math3/geometry/euclidean/threed/Euclidean3D.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.threed; +package org.apache.commons.math3.geometry.euclidean.threed; import java.io.Serializable; -import org.apache.commons.math.geometry.Space; -import org.apache.commons.math.geometry.euclidean.twod.Euclidean2D; +import org.apache.commons.math3.geometry.Space; +import org.apache.commons.math3.geometry.euclidean.twod.Euclidean2D; /** * This class implements a three-dimensional space. diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/threed/Line.java b/src/main/java/org/apache/commons/math3/geometry/euclidean/threed/Line.java similarity index 92% rename from src/main/java/org/apache/commons/math/geometry/euclidean/threed/Line.java rename to src/main/java/org/apache/commons/math3/geometry/euclidean/threed/Line.java index 5b11ec2a5..32b09b3ec 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/threed/Line.java +++ b/src/main/java/org/apache/commons/math3/geometry/euclidean/threed/Line.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.threed; +package org.apache.commons.math3.geometry.euclidean.threed; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.geometry.Vector; -import org.apache.commons.math.geometry.euclidean.oned.Euclidean1D; -import org.apache.commons.math.geometry.euclidean.oned.IntervalsSet; -import org.apache.commons.math.geometry.euclidean.oned.Vector1D; -import org.apache.commons.math.geometry.partitioning.Embedding; -import org.apache.commons.math.util.FastMath; -import org.apache.commons.math.util.Precision; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.geometry.Vector; +import org.apache.commons.math3.geometry.euclidean.oned.Euclidean1D; +import org.apache.commons.math3.geometry.euclidean.oned.IntervalsSet; +import org.apache.commons.math3.geometry.euclidean.oned.Vector1D; +import org.apache.commons.math3.geometry.partitioning.Embedding; +import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math3.util.Precision; /** The class represent lines in a three dimensional space. diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/threed/NotARotationMatrixException.java b/src/main/java/org/apache/commons/math3/geometry/euclidean/threed/NotARotationMatrixException.java similarity index 88% rename from src/main/java/org/apache/commons/math/geometry/euclidean/threed/NotARotationMatrixException.java rename to src/main/java/org/apache/commons/math3/geometry/euclidean/threed/NotARotationMatrixException.java index 7265a6c6f..82ea3482a 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/threed/NotARotationMatrixException.java +++ b/src/main/java/org/apache/commons/math3/geometry/euclidean/threed/NotARotationMatrixException.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.threed; +package org.apache.commons.math3.geometry.euclidean.threed; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.util.Localizable; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.util.Localizable; /** * This class represents exceptions thrown while building rotations diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/threed/OutlineExtractor.java b/src/main/java/org/apache/commons/math3/geometry/euclidean/threed/OutlineExtractor.java similarity index 88% rename from src/main/java/org/apache/commons/math/geometry/euclidean/threed/OutlineExtractor.java rename to src/main/java/org/apache/commons/math3/geometry/euclidean/threed/OutlineExtractor.java index 3eb4be0d7..3d9eaeb2b 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/threed/OutlineExtractor.java +++ b/src/main/java/org/apache/commons/math3/geometry/euclidean/threed/OutlineExtractor.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.threed; +package org.apache.commons.math3.geometry.euclidean.threed; import java.util.ArrayList; -import org.apache.commons.math.geometry.euclidean.twod.Euclidean2D; -import org.apache.commons.math.geometry.euclidean.twod.PolygonsSet; -import org.apache.commons.math.geometry.euclidean.twod.Vector2D; -import org.apache.commons.math.geometry.partitioning.AbstractSubHyperplane; -import org.apache.commons.math.geometry.partitioning.BSPTree; -import org.apache.commons.math.geometry.partitioning.BSPTreeVisitor; -import org.apache.commons.math.geometry.partitioning.BoundaryAttribute; -import org.apache.commons.math.geometry.partitioning.RegionFactory; -import org.apache.commons.math.geometry.partitioning.SubHyperplane; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.geometry.euclidean.twod.Euclidean2D; +import org.apache.commons.math3.geometry.euclidean.twod.PolygonsSet; +import org.apache.commons.math3.geometry.euclidean.twod.Vector2D; +import org.apache.commons.math3.geometry.partitioning.AbstractSubHyperplane; +import org.apache.commons.math3.geometry.partitioning.BSPTree; +import org.apache.commons.math3.geometry.partitioning.BSPTreeVisitor; +import org.apache.commons.math3.geometry.partitioning.BoundaryAttribute; +import org.apache.commons.math3.geometry.partitioning.RegionFactory; +import org.apache.commons.math3.geometry.partitioning.SubHyperplane; +import org.apache.commons.math3.util.FastMath; /** Extractor for {@link PolygonsSet polyhedrons sets} outlines. *

    This class extracts the 2D outlines from {{@link PolygonsSet @@ -208,16 +208,16 @@ public class OutlineExtractor { final Vector3D current3D = plane.toSpace(loop[current]); final Vector2D cPoint = new Vector2D(current3D.dotProduct(u), current3D.dotProduct(v)); - final org.apache.commons.math.geometry.euclidean.twod.Line line = - new org.apache.commons.math.geometry.euclidean.twod.Line(pPoint, cPoint); + final org.apache.commons.math3.geometry.euclidean.twod.Line line = + new org.apache.commons.math3.geometry.euclidean.twod.Line(pPoint, cPoint); SubHyperplane edge = line.wholeHyperplane(); if (closed || (previous != 1)) { // the previous point is a real vertex // it defines one bounding point of the edge final double angle = line.getAngle() + 0.5 * FastMath.PI; - final org.apache.commons.math.geometry.euclidean.twod.Line l = - new org.apache.commons.math.geometry.euclidean.twod.Line(pPoint, angle); + final org.apache.commons.math3.geometry.euclidean.twod.Line l = + new org.apache.commons.math3.geometry.euclidean.twod.Line(pPoint, angle); edge = edge.split(l).getPlus(); } @@ -225,8 +225,8 @@ public class OutlineExtractor { // the current point is a real vertex // it defines one bounding point of the edge final double angle = line.getAngle() + 0.5 * FastMath.PI; - final org.apache.commons.math.geometry.euclidean.twod.Line l = - new org.apache.commons.math.geometry.euclidean.twod.Line(cPoint, angle); + final org.apache.commons.math3.geometry.euclidean.twod.Line l = + new org.apache.commons.math3.geometry.euclidean.twod.Line(cPoint, angle); edge = edge.split(l).getMinus(); } diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/threed/Plane.java b/src/main/java/org/apache/commons/math3/geometry/euclidean/threed/Plane.java similarity index 94% rename from src/main/java/org/apache/commons/math/geometry/euclidean/threed/Plane.java rename to src/main/java/org/apache/commons/math3/geometry/euclidean/threed/Plane.java index cb5eadb8d..1b9c67164 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/threed/Plane.java +++ b/src/main/java/org/apache/commons/math3/geometry/euclidean/threed/Plane.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.threed; +package org.apache.commons.math3.geometry.euclidean.threed; -import org.apache.commons.math.exception.MathArithmeticException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.geometry.Vector; -import org.apache.commons.math.geometry.euclidean.oned.Vector1D; -import org.apache.commons.math.geometry.euclidean.twod.Euclidean2D; -import org.apache.commons.math.geometry.euclidean.twod.Vector2D; -import org.apache.commons.math.geometry.euclidean.twod.PolygonsSet; -import org.apache.commons.math.geometry.partitioning.Embedding; -import org.apache.commons.math.geometry.partitioning.Hyperplane; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.MathArithmeticException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.geometry.Vector; +import org.apache.commons.math3.geometry.euclidean.oned.Vector1D; +import org.apache.commons.math3.geometry.euclidean.twod.Euclidean2D; +import org.apache.commons.math3.geometry.euclidean.twod.Vector2D; +import org.apache.commons.math3.geometry.euclidean.twod.PolygonsSet; +import org.apache.commons.math3.geometry.partitioning.Embedding; +import org.apache.commons.math3.geometry.partitioning.Hyperplane; +import org.apache.commons.math3.util.FastMath; /** The class represent planes in a three dimensional space. * @version $Id$ @@ -218,7 +218,7 @@ public class Plane implements Hyperplane, Embedding point) { @@ -227,7 +227,7 @@ public class Plane implements Hyperplane, Embedding { tP00.getX(), tP00.getY()); cachedOriginal = (Plane) original; - cachedTransform = org.apache.commons.math.geometry.euclidean.twod.Line.getTransform(at); + cachedTransform = org.apache.commons.math3.geometry.euclidean.twod.Line.getTransform(at); } return ((SubLine) sub).applyTransform(cachedTransform); @@ -415,7 +415,7 @@ public class PolyhedronsSet extends AbstractRegion { cachedOriginal = (Plane) original; cachedTransform = - org.apache.commons.math.geometry.euclidean.twod.Line.getTransform(at); + org.apache.commons.math3.geometry.euclidean.twod.Line.getTransform(at); } diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/threed/Rotation.java b/src/main/java/org/apache/commons/math3/geometry/euclidean/threed/Rotation.java similarity index 99% rename from src/main/java/org/apache/commons/math/geometry/euclidean/threed/Rotation.java rename to src/main/java/org/apache/commons/math3/geometry/euclidean/threed/Rotation.java index 0792a86c9..d5cfb9b5d 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/threed/Rotation.java +++ b/src/main/java/org/apache/commons/math3/geometry/euclidean/threed/Rotation.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.threed; +package org.apache.commons.math3.geometry.euclidean.threed; import java.io.Serializable; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.util.FastMath; /** * This class implements rotations in a three-dimensional space. diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/threed/RotationOrder.java b/src/main/java/org/apache/commons/math3/geometry/euclidean/threed/RotationOrder.java similarity index 98% rename from src/main/java/org/apache/commons/math/geometry/euclidean/threed/RotationOrder.java rename to src/main/java/org/apache/commons/math3/geometry/euclidean/threed/RotationOrder.java index 706b1f800..477c20bb9 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/threed/RotationOrder.java +++ b/src/main/java/org/apache/commons/math3/geometry/euclidean/threed/RotationOrder.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.threed; +package org.apache.commons.math3.geometry.euclidean.threed; /** * This class is a utility representing a rotation order specification diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/threed/Segment.java b/src/main/java/org/apache/commons/math3/geometry/euclidean/threed/Segment.java similarity index 96% rename from src/main/java/org/apache/commons/math/geometry/euclidean/threed/Segment.java rename to src/main/java/org/apache/commons/math3/geometry/euclidean/threed/Segment.java index 740ad8762..9ee741bb9 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/threed/Segment.java +++ b/src/main/java/org/apache/commons/math3/geometry/euclidean/threed/Segment.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.threed; +package org.apache.commons.math3.geometry.euclidean.threed; /** Simple container for a two-points segment. diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/threed/SubLine.java b/src/main/java/org/apache/commons/math3/geometry/euclidean/threed/SubLine.java similarity index 94% rename from src/main/java/org/apache/commons/math/geometry/euclidean/threed/SubLine.java rename to src/main/java/org/apache/commons/math3/geometry/euclidean/threed/SubLine.java index 9d2dbea9e..923e6b2f0 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/threed/SubLine.java +++ b/src/main/java/org/apache/commons/math3/geometry/euclidean/threed/SubLine.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.threed; +package org.apache.commons.math3.geometry.euclidean.threed; import java.util.ArrayList; import java.util.List; -import org.apache.commons.math.geometry.euclidean.oned.Interval; -import org.apache.commons.math.geometry.euclidean.oned.IntervalsSet; -import org.apache.commons.math.geometry.euclidean.oned.Vector1D; -import org.apache.commons.math.geometry.partitioning.Region.Location; +import org.apache.commons.math3.geometry.euclidean.oned.Interval; +import org.apache.commons.math3.geometry.euclidean.oned.IntervalsSet; +import org.apache.commons.math3.geometry.euclidean.oned.Vector1D; +import org.apache.commons.math3.geometry.partitioning.Region.Location; /** This class represents a subset of a {@link Line}. * @version $Id$ diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/threed/SubPlane.java b/src/main/java/org/apache/commons/math3/geometry/euclidean/threed/SubPlane.java similarity index 84% rename from src/main/java/org/apache/commons/math/geometry/euclidean/threed/SubPlane.java rename to src/main/java/org/apache/commons/math3/geometry/euclidean/threed/SubPlane.java index a344a65cc..51e7778c0 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/threed/SubPlane.java +++ b/src/main/java/org/apache/commons/math3/geometry/euclidean/threed/SubPlane.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.threed; +package org.apache.commons.math3.geometry.euclidean.threed; -import org.apache.commons.math.geometry.euclidean.oned.Vector1D; -import org.apache.commons.math.geometry.euclidean.twod.Euclidean2D; -import org.apache.commons.math.geometry.euclidean.twod.Vector2D; -import org.apache.commons.math.geometry.euclidean.twod.PolygonsSet; -import org.apache.commons.math.geometry.partitioning.AbstractSubHyperplane; -import org.apache.commons.math.geometry.partitioning.BSPTree; -import org.apache.commons.math.geometry.partitioning.Hyperplane; -import org.apache.commons.math.geometry.partitioning.Region; -import org.apache.commons.math.geometry.partitioning.Side; -import org.apache.commons.math.geometry.partitioning.SubHyperplane; +import org.apache.commons.math3.geometry.euclidean.oned.Vector1D; +import org.apache.commons.math3.geometry.euclidean.twod.Euclidean2D; +import org.apache.commons.math3.geometry.euclidean.twod.Vector2D; +import org.apache.commons.math3.geometry.euclidean.twod.PolygonsSet; +import org.apache.commons.math3.geometry.partitioning.AbstractSubHyperplane; +import org.apache.commons.math3.geometry.partitioning.BSPTree; +import org.apache.commons.math3.geometry.partitioning.Hyperplane; +import org.apache.commons.math3.geometry.partitioning.Region; +import org.apache.commons.math3.geometry.partitioning.Side; +import org.apache.commons.math3.geometry.partitioning.SubHyperplane; /** This class represents a sub-hyperplane for {@link Plane}. * @version $Id$ @@ -79,8 +79,8 @@ public class SubPlane extends AbstractSubHyperplane { p = q; q = tmp; } - final org.apache.commons.math.geometry.euclidean.twod.Line line2D = - new org.apache.commons.math.geometry.euclidean.twod.Line(p, q); + final org.apache.commons.math3.geometry.euclidean.twod.Line line2D = + new org.apache.commons.math3.geometry.euclidean.twod.Line(p, q); // check the side on the 2D plane return getRemainingRegion().side(line2D); @@ -118,9 +118,9 @@ public class SubPlane extends AbstractSubHyperplane { q = tmp; } final SubHyperplane l2DMinus = - new org.apache.commons.math.geometry.euclidean.twod.Line(p, q).wholeHyperplane(); + new org.apache.commons.math3.geometry.euclidean.twod.Line(p, q).wholeHyperplane(); final SubHyperplane l2DPlus = - new org.apache.commons.math.geometry.euclidean.twod.Line(q, p).wholeHyperplane(); + new org.apache.commons.math3.geometry.euclidean.twod.Line(q, p).wholeHyperplane(); final BSPTree splitTree = getRemainingRegion().getTree(false).split(l2DMinus); final BSPTree plusTree = getRemainingRegion().isEmpty(splitTree.getPlus()) ? diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/threed/Vector3D.java b/src/main/java/org/apache/commons/math3/geometry/euclidean/threed/Vector3D.java similarity index 97% rename from src/main/java/org/apache/commons/math/geometry/euclidean/threed/Vector3D.java rename to src/main/java/org/apache/commons/math3/geometry/euclidean/threed/Vector3D.java index 26cc4cf02..690225429 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/threed/Vector3D.java +++ b/src/main/java/org/apache/commons/math3/geometry/euclidean/threed/Vector3D.java @@ -15,19 +15,19 @@ * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.threed; +package org.apache.commons.math3.geometry.euclidean.threed; import java.io.Serializable; import java.text.NumberFormat; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.MathArithmeticException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.geometry.Vector; -import org.apache.commons.math.geometry.Space; -import org.apache.commons.math.util.FastMath; -import org.apache.commons.math.util.MathUtils; -import org.apache.commons.math.util.MathArrays; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.MathArithmeticException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.geometry.Vector; +import org.apache.commons.math3.geometry.Space; +import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math3.util.MathUtils; +import org.apache.commons.math3.util.MathArrays; /** * This class implements vectors in a three-dimensional space. diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/threed/Vector3DFormat.java b/src/main/java/org/apache/commons/math3/geometry/euclidean/threed/Vector3DFormat.java similarity index 95% rename from src/main/java/org/apache/commons/math/geometry/euclidean/threed/Vector3DFormat.java rename to src/main/java/org/apache/commons/math3/geometry/euclidean/threed/Vector3DFormat.java index 14c77f8f2..6fe26120c 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/threed/Vector3DFormat.java +++ b/src/main/java/org/apache/commons/math3/geometry/euclidean/threed/Vector3DFormat.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.threed; +package org.apache.commons.math3.geometry.euclidean.threed; import java.text.FieldPosition; import java.text.NumberFormat; import java.text.ParsePosition; import java.util.Locale; -import org.apache.commons.math.exception.MathParseException; -import org.apache.commons.math.geometry.Vector; -import org.apache.commons.math.geometry.VectorFormat; -import org.apache.commons.math.util.CompositeFormat; +import org.apache.commons.math3.exception.MathParseException; +import org.apache.commons.math3.geometry.Vector; +import org.apache.commons.math3.geometry.VectorFormat; +import org.apache.commons.math3.util.CompositeFormat; /** * Formats a 3D vector in components list format "{x; y; z}". diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/threed/package-info.java b/src/main/java/org/apache/commons/math3/geometry/euclidean/threed/package-info.java similarity index 93% rename from src/main/java/org/apache/commons/math/geometry/euclidean/threed/package-info.java rename to src/main/java/org/apache/commons/math3/geometry/euclidean/threed/package-info.java index 5537b96cf..eaa3c6a34 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/threed/package-info.java +++ b/src/main/java/org/apache/commons/math3/geometry/euclidean/threed/package-info.java @@ -21,4 +21,4 @@ *

    * */ -package org.apache.commons.math.geometry.euclidean.threed; +package org.apache.commons.math3.geometry.euclidean.threed; diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/twod/Euclidean2D.java b/src/main/java/org/apache/commons/math3/geometry/euclidean/twod/Euclidean2D.java similarity index 92% rename from src/main/java/org/apache/commons/math/geometry/euclidean/twod/Euclidean2D.java rename to src/main/java/org/apache/commons/math3/geometry/euclidean/twod/Euclidean2D.java index b9f141bd3..02c457a05 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/twod/Euclidean2D.java +++ b/src/main/java/org/apache/commons/math3/geometry/euclidean/twod/Euclidean2D.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.twod; +package org.apache.commons.math3.geometry.euclidean.twod; import java.io.Serializable; -import org.apache.commons.math.geometry.Space; -import org.apache.commons.math.geometry.euclidean.oned.Euclidean1D; +import org.apache.commons.math3.geometry.Space; +import org.apache.commons.math3.geometry.euclidean.oned.Euclidean1D; /** * This class implements a three-dimensional space. diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/twod/Line.java b/src/main/java/org/apache/commons/math3/geometry/euclidean/twod/Line.java similarity index 93% rename from src/main/java/org/apache/commons/math/geometry/euclidean/twod/Line.java rename to src/main/java/org/apache/commons/math3/geometry/euclidean/twod/Line.java index 297b218cf..f12fa86f9 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/twod/Line.java +++ b/src/main/java/org/apache/commons/math3/geometry/euclidean/twod/Line.java @@ -14,23 +14,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.twod; +package org.apache.commons.math3.geometry.euclidean.twod; import java.awt.geom.AffineTransform; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.geometry.Vector; -import org.apache.commons.math.geometry.euclidean.oned.Euclidean1D; -import org.apache.commons.math.geometry.euclidean.oned.IntervalsSet; -import org.apache.commons.math.geometry.euclidean.oned.OrientedPoint; -import org.apache.commons.math.geometry.euclidean.oned.Vector1D; -import org.apache.commons.math.geometry.partitioning.Embedding; -import org.apache.commons.math.geometry.partitioning.Hyperplane; -import org.apache.commons.math.geometry.partitioning.SubHyperplane; -import org.apache.commons.math.geometry.partitioning.Transform; -import org.apache.commons.math.util.FastMath; -import org.apache.commons.math.util.MathUtils; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.geometry.Vector; +import org.apache.commons.math3.geometry.euclidean.oned.Euclidean1D; +import org.apache.commons.math3.geometry.euclidean.oned.IntervalsSet; +import org.apache.commons.math3.geometry.euclidean.oned.OrientedPoint; +import org.apache.commons.math3.geometry.euclidean.oned.Vector1D; +import org.apache.commons.math3.geometry.partitioning.Embedding; +import org.apache.commons.math3.geometry.partitioning.Hyperplane; +import org.apache.commons.math3.geometry.partitioning.SubHyperplane; +import org.apache.commons.math3.geometry.partitioning.Transform; +import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math3.util.MathUtils; /** This class represents an oriented line in the 2D plane. @@ -309,16 +309,16 @@ public class Line implements Hyperplane, Embedding { * boundary does not really separate an inside open from an outside * open (open having here its topological meaning), then subsequent * calls to the {@link - * org.apache.commons.math.geometry.partitioning.Region#checkPoint(org.apache.commons.math.geometry.Vector) + * org.apache.commons.math3.geometry.partitioning.Region#checkPoint(org.apache.commons.math3.geometry.Vector) * checkPoint} method will not be meaningful anymore.

    *

    If the boundary is empty, the region will represent the whole * space.

    diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/twod/Segment.java b/src/main/java/org/apache/commons/math3/geometry/euclidean/twod/Segment.java similarity index 97% rename from src/main/java/org/apache/commons/math/geometry/euclidean/twod/Segment.java rename to src/main/java/org/apache/commons/math3/geometry/euclidean/twod/Segment.java index ce4ecc1e2..2fa74934d 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/twod/Segment.java +++ b/src/main/java/org/apache/commons/math3/geometry/euclidean/twod/Segment.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.twod; +package org.apache.commons.math3.geometry.euclidean.twod; /** Simple container for a two-points segment. diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/twod/SubLine.java b/src/main/java/org/apache/commons/math3/geometry/euclidean/twod/SubLine.java similarity index 90% rename from src/main/java/org/apache/commons/math/geometry/euclidean/twod/SubLine.java rename to src/main/java/org/apache/commons/math3/geometry/euclidean/twod/SubLine.java index 97e2ff0e9..cf47f88a3 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/twod/SubLine.java +++ b/src/main/java/org/apache/commons/math3/geometry/euclidean/twod/SubLine.java @@ -14,24 +14,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.twod; +package org.apache.commons.math3.geometry.euclidean.twod; import java.util.ArrayList; import java.util.List; -import org.apache.commons.math.geometry.euclidean.oned.Euclidean1D; -import org.apache.commons.math.geometry.euclidean.oned.Interval; -import org.apache.commons.math.geometry.euclidean.oned.IntervalsSet; -import org.apache.commons.math.geometry.euclidean.oned.OrientedPoint; -import org.apache.commons.math.geometry.euclidean.oned.Vector1D; -import org.apache.commons.math.geometry.partitioning.AbstractSubHyperplane; -import org.apache.commons.math.geometry.partitioning.BSPTree; -import org.apache.commons.math.geometry.partitioning.Hyperplane; -import org.apache.commons.math.geometry.partitioning.Region; -import org.apache.commons.math.geometry.partitioning.Region.Location; -import org.apache.commons.math.geometry.partitioning.Side; -import org.apache.commons.math.geometry.partitioning.SubHyperplane; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.geometry.euclidean.oned.Euclidean1D; +import org.apache.commons.math3.geometry.euclidean.oned.Interval; +import org.apache.commons.math3.geometry.euclidean.oned.IntervalsSet; +import org.apache.commons.math3.geometry.euclidean.oned.OrientedPoint; +import org.apache.commons.math3.geometry.euclidean.oned.Vector1D; +import org.apache.commons.math3.geometry.partitioning.AbstractSubHyperplane; +import org.apache.commons.math3.geometry.partitioning.BSPTree; +import org.apache.commons.math3.geometry.partitioning.Hyperplane; +import org.apache.commons.math3.geometry.partitioning.Region; +import org.apache.commons.math3.geometry.partitioning.Region.Location; +import org.apache.commons.math3.geometry.partitioning.Side; +import org.apache.commons.math3.geometry.partitioning.SubHyperplane; +import org.apache.commons.math3.util.FastMath; /** This class represents a sub-hyperplane for {@link Line}. * @version $Id$ diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/twod/Vector2D.java b/src/main/java/org/apache/commons/math3/geometry/euclidean/twod/Vector2D.java similarity index 96% rename from src/main/java/org/apache/commons/math/geometry/euclidean/twod/Vector2D.java rename to src/main/java/org/apache/commons/math3/geometry/euclidean/twod/Vector2D.java index 7669e809e..88f7859cb 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/twod/Vector2D.java +++ b/src/main/java/org/apache/commons/math3/geometry/euclidean/twod/Vector2D.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.twod; +package org.apache.commons.math3.geometry.euclidean.twod; import java.text.NumberFormat; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.MathArithmeticException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.geometry.Space; -import org.apache.commons.math.geometry.Vector; -import org.apache.commons.math.util.FastMath; -import org.apache.commons.math.util.MathUtils; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.MathArithmeticException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.geometry.Space; +import org.apache.commons.math3.geometry.Vector; +import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math3.util.MathUtils; /** This class represents a 2D vector. *

    Instances of this class are guaranteed to be immutable.

    diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/twod/Vector2DFormat.java b/src/main/java/org/apache/commons/math3/geometry/euclidean/twod/Vector2DFormat.java similarity index 94% rename from src/main/java/org/apache/commons/math/geometry/euclidean/twod/Vector2DFormat.java rename to src/main/java/org/apache/commons/math3/geometry/euclidean/twod/Vector2DFormat.java index 4350559ed..ea9807801 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/twod/Vector2DFormat.java +++ b/src/main/java/org/apache/commons/math3/geometry/euclidean/twod/Vector2DFormat.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.apache.commons.math.geometry.euclidean.twod; +package org.apache.commons.math3.geometry.euclidean.twod; import java.text.FieldPosition; import java.text.NumberFormat; import java.text.ParsePosition; import java.util.Locale; -import org.apache.commons.math.exception.MathParseException; -import org.apache.commons.math.geometry.Vector; -import org.apache.commons.math.geometry.VectorFormat; -import org.apache.commons.math.util.CompositeFormat; +import org.apache.commons.math3.exception.MathParseException; +import org.apache.commons.math3.geometry.Vector; +import org.apache.commons.math3.geometry.VectorFormat; +import org.apache.commons.math3.util.CompositeFormat; /** * Formats a 2D vector in components list format "{x; y}". diff --git a/src/main/java/org/apache/commons/math/geometry/euclidean/twod/package-info.java b/src/main/java/org/apache/commons/math3/geometry/euclidean/twod/package-info.java similarity index 93% rename from src/main/java/org/apache/commons/math/geometry/euclidean/twod/package-info.java rename to src/main/java/org/apache/commons/math3/geometry/euclidean/twod/package-info.java index 13aaf016c..feb43b136 100644 --- a/src/main/java/org/apache/commons/math/geometry/euclidean/twod/package-info.java +++ b/src/main/java/org/apache/commons/math3/geometry/euclidean/twod/package-info.java @@ -21,4 +21,4 @@ *

    * */ -package org.apache.commons.math.geometry.euclidean.twod; +package org.apache.commons.math3.geometry.euclidean.twod; diff --git a/src/main/java/org/apache/commons/math/geometry/package-info.java b/src/main/java/org/apache/commons/math3/geometry/package-info.java similarity index 95% rename from src/main/java/org/apache/commons/math/geometry/package-info.java rename to src/main/java/org/apache/commons/math3/geometry/package-info.java index 97c179226..31929e2d6 100644 --- a/src/main/java/org/apache/commons/math/geometry/package-info.java +++ b/src/main/java/org/apache/commons/math3/geometry/package-info.java @@ -22,4 +22,4 @@ *

    * */ -package org.apache.commons.math.geometry; +package org.apache.commons.math3.geometry; diff --git a/src/main/java/org/apache/commons/math/geometry/partitioning/AbstractRegion.java b/src/main/java/org/apache/commons/math3/geometry/partitioning/AbstractRegion.java similarity index 99% rename from src/main/java/org/apache/commons/math/geometry/partitioning/AbstractRegion.java rename to src/main/java/org/apache/commons/math3/geometry/partitioning/AbstractRegion.java index 2fa1cc112..2a3d0c677 100644 --- a/src/main/java/org/apache/commons/math/geometry/partitioning/AbstractRegion.java +++ b/src/main/java/org/apache/commons/math3/geometry/partitioning/AbstractRegion.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.partitioning; +package org.apache.commons.math3.geometry.partitioning; import java.util.ArrayList; import java.util.Collection; @@ -22,8 +22,8 @@ import java.util.Comparator; import java.util.Iterator; import java.util.TreeSet; -import org.apache.commons.math.geometry.Space; -import org.apache.commons.math.geometry.Vector; +import org.apache.commons.math3.geometry.Space; +import org.apache.commons.math3.geometry.Vector; /** Abstract class for all regions, independently of geometry type or dimension. diff --git a/src/main/java/org/apache/commons/math/geometry/partitioning/AbstractSubHyperplane.java b/src/main/java/org/apache/commons/math3/geometry/partitioning/AbstractSubHyperplane.java similarity index 97% rename from src/main/java/org/apache/commons/math/geometry/partitioning/AbstractSubHyperplane.java rename to src/main/java/org/apache/commons/math3/geometry/partitioning/AbstractSubHyperplane.java index 3665de895..e2a3b0185 100644 --- a/src/main/java/org/apache/commons/math/geometry/partitioning/AbstractSubHyperplane.java +++ b/src/main/java/org/apache/commons/math3/geometry/partitioning/AbstractSubHyperplane.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.partitioning; +package org.apache.commons.math3.geometry.partitioning; -import org.apache.commons.math.geometry.Space; -import org.apache.commons.math.geometry.partitioning.SubHyperplane; +import org.apache.commons.math3.geometry.Space; +import org.apache.commons.math3.geometry.partitioning.SubHyperplane; /** This class implements the dimension-independent parts of {@link SubHyperplane}. diff --git a/src/main/java/org/apache/commons/math/geometry/partitioning/BSPTree.java b/src/main/java/org/apache/commons/math3/geometry/partitioning/BSPTree.java similarity index 99% rename from src/main/java/org/apache/commons/math/geometry/partitioning/BSPTree.java rename to src/main/java/org/apache/commons/math3/geometry/partitioning/BSPTree.java index 65703b390..60427dea1 100644 --- a/src/main/java/org/apache/commons/math/geometry/partitioning/BSPTree.java +++ b/src/main/java/org/apache/commons/math3/geometry/partitioning/BSPTree.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.partitioning; +package org.apache.commons.math3.geometry.partitioning; -import org.apache.commons.math.geometry.Vector; -import org.apache.commons.math.geometry.Space; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.geometry.Vector; +import org.apache.commons.math3.geometry.Space; +import org.apache.commons.math3.util.FastMath; /** This class represent a Binary Space Partition tree. diff --git a/src/main/java/org/apache/commons/math/geometry/partitioning/BSPTreeVisitor.java b/src/main/java/org/apache/commons/math3/geometry/partitioning/BSPTreeVisitor.java similarity index 97% rename from src/main/java/org/apache/commons/math/geometry/partitioning/BSPTreeVisitor.java rename to src/main/java/org/apache/commons/math3/geometry/partitioning/BSPTreeVisitor.java index 39af008df..462780dde 100644 --- a/src/main/java/org/apache/commons/math/geometry/partitioning/BSPTreeVisitor.java +++ b/src/main/java/org/apache/commons/math3/geometry/partitioning/BSPTreeVisitor.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.partitioning; +package org.apache.commons.math3.geometry.partitioning; -import org.apache.commons.math.geometry.Space; +import org.apache.commons.math3.geometry.Space; /** This interface is used to visit {@link BSPTree BSP tree} nodes. diff --git a/src/main/java/org/apache/commons/math/geometry/partitioning/BoundaryAttribute.java b/src/main/java/org/apache/commons/math3/geometry/partitioning/BoundaryAttribute.java similarity index 96% rename from src/main/java/org/apache/commons/math/geometry/partitioning/BoundaryAttribute.java rename to src/main/java/org/apache/commons/math3/geometry/partitioning/BoundaryAttribute.java index 7cd790a84..4f93e2be5 100644 --- a/src/main/java/org/apache/commons/math/geometry/partitioning/BoundaryAttribute.java +++ b/src/main/java/org/apache/commons/math3/geometry/partitioning/BoundaryAttribute.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.partitioning; +package org.apache.commons.math3.geometry.partitioning; -import org.apache.commons.math.geometry.Space; +import org.apache.commons.math3.geometry.Space; /** Class holding boundary attributes. *

    This class is used for the attributes associated with the diff --git a/src/main/java/org/apache/commons/math/geometry/partitioning/BoundarySizeVisitor.java b/src/main/java/org/apache/commons/math3/geometry/partitioning/BoundarySizeVisitor.java similarity index 95% rename from src/main/java/org/apache/commons/math/geometry/partitioning/BoundarySizeVisitor.java rename to src/main/java/org/apache/commons/math3/geometry/partitioning/BoundarySizeVisitor.java index a49dbe3db..4c9ed7662 100644 --- a/src/main/java/org/apache/commons/math/geometry/partitioning/BoundarySizeVisitor.java +++ b/src/main/java/org/apache/commons/math3/geometry/partitioning/BoundarySizeVisitor.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.partitioning; +package org.apache.commons.math3.geometry.partitioning; -import org.apache.commons.math.geometry.Space; +import org.apache.commons.math3.geometry.Space; /** Visitor computing the boundary size. * @param Type of the space. diff --git a/src/main/java/org/apache/commons/math/geometry/partitioning/Characterization.java b/src/main/java/org/apache/commons/math3/geometry/partitioning/Characterization.java similarity index 96% rename from src/main/java/org/apache/commons/math/geometry/partitioning/Characterization.java rename to src/main/java/org/apache/commons/math3/geometry/partitioning/Characterization.java index 98bf31742..4399a44de 100644 --- a/src/main/java/org/apache/commons/math/geometry/partitioning/Characterization.java +++ b/src/main/java/org/apache/commons/math3/geometry/partitioning/Characterization.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.partitioning; +package org.apache.commons.math3.geometry.partitioning; -import org.apache.commons.math.geometry.Space; +import org.apache.commons.math3.geometry.Space; /** Characterization of a sub-hyperplane. * @param Type of the space. diff --git a/src/main/java/org/apache/commons/math/geometry/partitioning/Embedding.java b/src/main/java/org/apache/commons/math3/geometry/partitioning/Embedding.java similarity index 84% rename from src/main/java/org/apache/commons/math/geometry/partitioning/Embedding.java rename to src/main/java/org/apache/commons/math3/geometry/partitioning/Embedding.java index b168744ea..098122611 100644 --- a/src/main/java/org/apache/commons/math/geometry/partitioning/Embedding.java +++ b/src/main/java/org/apache/commons/math3/geometry/partitioning/Embedding.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.partitioning; +package org.apache.commons.math3.geometry.partitioning; -import org.apache.commons.math.geometry.Vector; -import org.apache.commons.math.geometry.Space; +import org.apache.commons.math3.geometry.Vector; +import org.apache.commons.math3.geometry.Space; /** This interface defines mappers between a space and one of its sub-spaces. @@ -25,10 +25,10 @@ import org.apache.commons.math.geometry.Space; * space. The (n-1)-dimension sub-spaces are specific sub-spaces known * as {@link Hyperplane hyperplanes}. This interface can be used regardless * of the dimensions differences. As an example, {@link - * org.apache.commons.math.geometry.euclidean.threed.Line Line} in 3D + * org.apache.commons.math3.geometry.euclidean.threed.Line Line} in 3D * implements Embedding<{@link - * org.apache.commons.math.geometry.euclidean.threed.Vector3D Vector3D}, {link - * org.apache.commons.math.geometry.euclidean.oned.Vector1D Vector1D>, i.e. it + * org.apache.commons.math3.geometry.euclidean.threed.Vector3D Vector3D}, {link + * org.apache.commons.math3.geometry.euclidean.oned.Vector1D Vector1D>, i.e. it * maps directly dimensions 3 and 1.

    *

    In the 3D euclidean space, hyperplanes are 2D planes, and the 1D diff --git a/src/main/java/org/apache/commons/math/geometry/partitioning/Hyperplane.java b/src/main/java/org/apache/commons/math3/geometry/partitioning/Hyperplane.java similarity index 95% rename from src/main/java/org/apache/commons/math/geometry/partitioning/Hyperplane.java rename to src/main/java/org/apache/commons/math3/geometry/partitioning/Hyperplane.java index ff490e161..f1a774c76 100644 --- a/src/main/java/org/apache/commons/math/geometry/partitioning/Hyperplane.java +++ b/src/main/java/org/apache/commons/math3/geometry/partitioning/Hyperplane.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.partitioning; +package org.apache.commons.math3.geometry.partitioning; -import org.apache.commons.math.geometry.Vector; -import org.apache.commons.math.geometry.Space; +import org.apache.commons.math3.geometry.Vector; +import org.apache.commons.math3.geometry.Space; /** This interface represents an hyperplane of a space. diff --git a/src/main/java/org/apache/commons/math/geometry/partitioning/Region.java b/src/main/java/org/apache/commons/math3/geometry/partitioning/Region.java similarity index 98% rename from src/main/java/org/apache/commons/math/geometry/partitioning/Region.java rename to src/main/java/org/apache/commons/math3/geometry/partitioning/Region.java index 79ee5a7b4..3a348e6f1 100644 --- a/src/main/java/org/apache/commons/math/geometry/partitioning/Region.java +++ b/src/main/java/org/apache/commons/math3/geometry/partitioning/Region.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.partitioning; +package org.apache.commons.math3.geometry.partitioning; -import org.apache.commons.math.geometry.Space; -import org.apache.commons.math.geometry.Vector; +import org.apache.commons.math3.geometry.Space; +import org.apache.commons.math3.geometry.Vector; /** This interface represents a region of a space as a partition. diff --git a/src/main/java/org/apache/commons/math/geometry/partitioning/RegionFactory.java b/src/main/java/org/apache/commons/math3/geometry/partitioning/RegionFactory.java similarity index 98% rename from src/main/java/org/apache/commons/math/geometry/partitioning/RegionFactory.java rename to src/main/java/org/apache/commons/math3/geometry/partitioning/RegionFactory.java index 257cef2ce..0b94b5dcd 100644 --- a/src/main/java/org/apache/commons/math/geometry/partitioning/RegionFactory.java +++ b/src/main/java/org/apache/commons/math3/geometry/partitioning/RegionFactory.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.partitioning; +package org.apache.commons.math3.geometry.partitioning; -import org.apache.commons.math.geometry.Space; +import org.apache.commons.math3.geometry.Space; /** This class is a factory for {@link Region}. diff --git a/src/main/java/org/apache/commons/math/geometry/partitioning/Side.java b/src/main/java/org/apache/commons/math3/geometry/partitioning/Side.java similarity index 95% rename from src/main/java/org/apache/commons/math/geometry/partitioning/Side.java rename to src/main/java/org/apache/commons/math3/geometry/partitioning/Side.java index 2d0bd7484..323f8ad08 100644 --- a/src/main/java/org/apache/commons/math/geometry/partitioning/Side.java +++ b/src/main/java/org/apache/commons/math3/geometry/partitioning/Side.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.partitioning; +package org.apache.commons.math3.geometry.partitioning; /** Enumerate representing the location of an element with respect to an * {@link Hyperplane hyperplane} of a space. diff --git a/src/main/java/org/apache/commons/math/geometry/partitioning/SubHyperplane.java b/src/main/java/org/apache/commons/math3/geometry/partitioning/SubHyperplane.java similarity index 97% rename from src/main/java/org/apache/commons/math/geometry/partitioning/SubHyperplane.java rename to src/main/java/org/apache/commons/math3/geometry/partitioning/SubHyperplane.java index 05c6ddff2..dc92d1b6a 100644 --- a/src/main/java/org/apache/commons/math/geometry/partitioning/SubHyperplane.java +++ b/src/main/java/org/apache/commons/math3/geometry/partitioning/SubHyperplane.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.partitioning; +package org.apache.commons.math3.geometry.partitioning; -import org.apache.commons.math.geometry.Space; +import org.apache.commons.math3.geometry.Space; /** This interface represents the remaining parts of an hyperplane after * other parts have been chopped off. diff --git a/src/main/java/org/apache/commons/math/geometry/partitioning/Transform.java b/src/main/java/org/apache/commons/math3/geometry/partitioning/Transform.java similarity index 95% rename from src/main/java/org/apache/commons/math/geometry/partitioning/Transform.java rename to src/main/java/org/apache/commons/math3/geometry/partitioning/Transform.java index 24c674088..b0fccf1f4 100644 --- a/src/main/java/org/apache/commons/math/geometry/partitioning/Transform.java +++ b/src/main/java/org/apache/commons/math3/geometry/partitioning/Transform.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.partitioning; +package org.apache.commons.math3.geometry.partitioning; -import org.apache.commons.math.geometry.Vector; -import org.apache.commons.math.geometry.Space; +import org.apache.commons.math3.geometry.Vector; +import org.apache.commons.math3.geometry.Space; /** This interface represents an inversible affine transform in a space. diff --git a/src/main/java/org/apache/commons/math/geometry/partitioning/package-info.java b/src/main/java/org/apache/commons/math3/geometry/partitioning/package-info.java similarity index 94% rename from src/main/java/org/apache/commons/math/geometry/partitioning/package-info.java rename to src/main/java/org/apache/commons/math3/geometry/partitioning/package-info.java index f4e4bd94d..486752bc4 100644 --- a/src/main/java/org/apache/commons/math/geometry/partitioning/package-info.java +++ b/src/main/java/org/apache/commons/math3/geometry/partitioning/package-info.java @@ -19,7 +19,7 @@ * This package provides classes to implement Binary Space Partition trees. * *

    - * {@link org.apache.commons.math.geometry.partitioning.BSPTree BSP trees} + * {@link org.apache.commons.math3.geometry.partitioning.BSPTree BSP trees} * are an efficient way to represent parts of space and in particular * polytopes (line segments in 1D, polygons in 2D and polyhedrons in 3D) * and to operate on them. The main principle is to recursively subdivide @@ -52,9 +52,9 @@ * single part, but by several convex ones. This is the property that * allows BSP-trees to represent non-convex polytopes despites all parts * are convex. The {@link - * org.apache.commons.math.geometry.partitioning.Region Region} class is + * org.apache.commons.math3.geometry.partitioning.Region Region} class is * devoted to this representation, it is build on top of the {@link - * org.apache.commons.math.geometry.partitioning.BSPTree BSPTree} class using + * org.apache.commons.math3.geometry.partitioning.BSPTree BSPTree} class using * boolean objects as the leaf nodes attributes to represent the * inside/outside property of each leaf part, and also adds various * methods dealing with boundaries (i.e. the separation between the @@ -105,4 +105,4 @@ * * */ -package org.apache.commons.math.geometry.partitioning; +package org.apache.commons.math3.geometry.partitioning; diff --git a/src/main/java/org/apache/commons/math/geometry/partitioning/utilities/AVLTree.java b/src/main/java/org/apache/commons/math3/geometry/partitioning/utilities/AVLTree.java similarity index 99% rename from src/main/java/org/apache/commons/math/geometry/partitioning/utilities/AVLTree.java rename to src/main/java/org/apache/commons/math3/geometry/partitioning/utilities/AVLTree.java index f9473f162..3e5e0e077 100644 --- a/src/main/java/org/apache/commons/math/geometry/partitioning/utilities/AVLTree.java +++ b/src/main/java/org/apache/commons/math3/geometry/partitioning/utilities/AVLTree.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.partitioning.utilities; +package org.apache.commons.math3.geometry.partitioning.utilities; /** This class implements AVL trees. diff --git a/src/main/java/org/apache/commons/math/geometry/partitioning/utilities/OrderedTuple.java b/src/main/java/org/apache/commons/math3/geometry/partitioning/utilities/OrderedTuple.java similarity index 99% rename from src/main/java/org/apache/commons/math/geometry/partitioning/utilities/OrderedTuple.java rename to src/main/java/org/apache/commons/math3/geometry/partitioning/utilities/OrderedTuple.java index fc0b25b0f..21db7634b 100644 --- a/src/main/java/org/apache/commons/math/geometry/partitioning/utilities/OrderedTuple.java +++ b/src/main/java/org/apache/commons/math3/geometry/partitioning/utilities/OrderedTuple.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.geometry.partitioning.utilities; +package org.apache.commons.math3.geometry.partitioning.utilities; import java.util.Arrays; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.util.FastMath; /** This class implements an ordering operation for T-uples. diff --git a/src/main/java/org/apache/commons/math/geometry/partitioning/utilities/doc-files/OrderedTuple.png b/src/main/java/org/apache/commons/math3/geometry/partitioning/utilities/doc-files/OrderedTuple.png similarity index 100% rename from src/main/java/org/apache/commons/math/geometry/partitioning/utilities/doc-files/OrderedTuple.png rename to src/main/java/org/apache/commons/math3/geometry/partitioning/utilities/doc-files/OrderedTuple.png diff --git a/src/main/java/org/apache/commons/math/geometry/partitioning/utilities/package-info.java b/src/main/java/org/apache/commons/math3/geometry/partitioning/utilities/package-info.java similarity index 93% rename from src/main/java/org/apache/commons/math/geometry/partitioning/utilities/package-info.java rename to src/main/java/org/apache/commons/math3/geometry/partitioning/utilities/package-info.java index 01f655850..31f57f15c 100644 --- a/src/main/java/org/apache/commons/math/geometry/partitioning/utilities/package-info.java +++ b/src/main/java/org/apache/commons/math3/geometry/partitioning/utilities/package-info.java @@ -21,4 +21,4 @@ *

    * */ -package org.apache.commons.math.geometry.partitioning.utilities; +package org.apache.commons.math3.geometry.partitioning.utilities; diff --git a/src/main/java/org/apache/commons/math/linear/AbstractFieldMatrix.java b/src/main/java/org/apache/commons/math3/linear/AbstractFieldMatrix.java similarity index 98% rename from src/main/java/org/apache/commons/math/linear/AbstractFieldMatrix.java rename to src/main/java/org/apache/commons/math3/linear/AbstractFieldMatrix.java index 1cdf74e46..3e533c1be 100644 --- a/src/main/java/org/apache/commons/math/linear/AbstractFieldMatrix.java +++ b/src/main/java/org/apache/commons/math3/linear/AbstractFieldMatrix.java @@ -15,21 +15,21 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; import java.lang.reflect.Array; import java.util.ArrayList; import java.util.Arrays; -import org.apache.commons.math.Field; -import org.apache.commons.math.FieldElement; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.NoDataException; -import org.apache.commons.math.exception.OutOfRangeException; -import org.apache.commons.math.exception.NumberIsTooSmallException; -import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.Field; +import org.apache.commons.math3.FieldElement; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.NoDataException; +import org.apache.commons.math3.exception.OutOfRangeException; +import org.apache.commons.math3.exception.NumberIsTooSmallException; +import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.exception.util.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/math3/linear/AbstractRealMatrix.java similarity index 98% rename from src/main/java/org/apache/commons/math/linear/AbstractRealMatrix.java rename to src/main/java/org/apache/commons/math3/linear/AbstractRealMatrix.java index 1500a8bee..e7fe8c59b 100644 --- a/src/main/java/org/apache/commons/math/linear/AbstractRealMatrix.java +++ b/src/main/java/org/apache/commons/math3/linear/AbstractRealMatrix.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; import java.util.ArrayList; -import org.apache.commons.math.exception.NoDataException; -import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.util.MathUtils; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.NoDataException; +import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.util.MathUtils; +import org.apache.commons.math3.util.FastMath; /** * Basic implementation of RealMatrix methods regardless of the underlying storage. diff --git a/src/main/java/org/apache/commons/math/linear/AnyMatrix.java b/src/main/java/org/apache/commons/math3/linear/AnyMatrix.java similarity index 97% rename from src/main/java/org/apache/commons/math/linear/AnyMatrix.java rename to src/main/java/org/apache/commons/math3/linear/AnyMatrix.java index 22997e4d3..4f77cf311 100644 --- a/src/main/java/org/apache/commons/math/linear/AnyMatrix.java +++ b/src/main/java/org/apache/commons/math3/linear/AnyMatrix.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; /** diff --git a/src/main/java/org/apache/commons/math/linear/Array2DRowFieldMatrix.java b/src/main/java/org/apache/commons/math3/linear/Array2DRowFieldMatrix.java similarity index 95% rename from src/main/java/org/apache/commons/math/linear/Array2DRowFieldMatrix.java rename to src/main/java/org/apache/commons/math3/linear/Array2DRowFieldMatrix.java index 7255e0f63..ff314b6d0 100644 --- a/src/main/java/org/apache/commons/math/linear/Array2DRowFieldMatrix.java +++ b/src/main/java/org/apache/commons/math3/linear/Array2DRowFieldMatrix.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; import java.io.Serializable; -import org.apache.commons.math.Field; -import org.apache.commons.math.FieldElement; -import org.apache.commons.math.exception.NoDataException; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.MathIllegalStateException; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.util.MathUtils; +import org.apache.commons.math3.Field; +import org.apache.commons.math3.FieldElement; +import org.apache.commons.math3.exception.NoDataException; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.MathIllegalStateException; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.util.MathUtils; /** * Implementation of FieldMatrix using a {@link FieldElement}[][] array to store entries. @@ -61,7 +61,7 @@ public class Array2DRowFieldMatrix> * @param field Field to which the elements belong. * @param rowDimension Number of rows in the new matrix. * @param columnDimension Number of columns in the new matrix. - * @throws org.apache.commons.math.exception.NotStrictlyPositiveException + * @throws org.apache.commons.math3.exception.NotStrictlyPositiveException * if row or column dimension is not positive. */ public Array2DRowFieldMatrix(final Field field, @@ -80,7 +80,7 @@ public class Array2DRowFieldMatrix> * * @param d Data for the new matrix. * @throws DimensionMismatchException if {@code d} is not rectangular. - * @throws org.apache.commons.math.exception.NullArgumentException if + * @throws org.apache.commons.math3.exception.NullArgumentException if * {@code d} is {@code null}. * @throws NoDataException if there are not at least one row and one column. * @see #Array2DRowFieldMatrix(FieldElement[][], boolean) @@ -99,7 +99,7 @@ public class Array2DRowFieldMatrix> * @param field Field to which the elements belong. * @param d Data for the new matrix. * @throws DimensionMismatchException if {@code d} is not rectangular. - * @throws org.apache.commons.math.exception.NullArgumentException if + * @throws org.apache.commons.math3.exception.NullArgumentException if * {@code d} is {@code null}. * @throws NoDataException if there are not at least one row and one column. * @see #Array2DRowFieldMatrix(FieldElement[][], boolean) @@ -121,7 +121,7 @@ public class Array2DRowFieldMatrix> * @param copyArray Whether to copy or reference the input array. * @throws DimensionMismatchException if {@code d} is not rectangular. * @throws NoDataException if there are not at least one row and one column. - * @throws org.apache.commons.math.exception.NullArgumentException + * @throws org.apache.commons.math3.exception.NullArgumentException * if {@code d} is {@code null}. * @see #Array2DRowFieldMatrix(FieldElement[][]) */ @@ -580,7 +580,7 @@ public class Array2DRowFieldMatrix> * @param in Data to copy. * @throws NoDataException if the input array is empty. * @throws DimensionMismatchException if the input array is not rectangular. - * @throws org.apache.commons.math.exception.NullArgumentException if + * @throws org.apache.commons.math3.exception.NullArgumentException if * the input array is {@code null}. */ private void copyIn(final T[][] in) { diff --git a/src/main/java/org/apache/commons/math/linear/Array2DRowRealMatrix.java b/src/main/java/org/apache/commons/math3/linear/Array2DRowRealMatrix.java similarity index 97% rename from src/main/java/org/apache/commons/math/linear/Array2DRowRealMatrix.java rename to src/main/java/org/apache/commons/math3/linear/Array2DRowRealMatrix.java index 8d448dc50..cb4091319 100644 --- a/src/main/java/org/apache/commons/math/linear/Array2DRowRealMatrix.java +++ b/src/main/java/org/apache/commons/math3/linear/Array2DRowRealMatrix.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; import java.io.Serializable; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.exception.NoDataException; -import org.apache.commons.math.exception.MathIllegalStateException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.util.MathUtils; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.exception.NoDataException; +import org.apache.commons.math3.exception.MathIllegalStateException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.util.MathUtils; /** * Implementation of {@link RealMatrix} using a {@code double[][]} array to @@ -48,7 +48,7 @@ public class Array2DRowRealMatrix extends AbstractRealMatrix implements Serializ * * @param rowDimension Number of rows in the new matrix. * @param columnDimension Number of columns in the new matrix. - * @throws org.apache.commons.math.exception.NotStrictlyPositiveException + * @throws org.apache.commons.math3.exception.NotStrictlyPositiveException * if the row or column dimension is not positive. */ public Array2DRowRealMatrix(final int rowDimension, final int columnDimension) { diff --git a/src/main/java/org/apache/commons/math/linear/ArrayFieldVector.java b/src/main/java/org/apache/commons/math3/linear/ArrayFieldVector.java similarity index 98% rename from src/main/java/org/apache/commons/math/linear/ArrayFieldVector.java rename to src/main/java/org/apache/commons/math3/linear/ArrayFieldVector.java index f62d6b16d..d8c549183 100644 --- a/src/main/java/org/apache/commons/math/linear/ArrayFieldVector.java +++ b/src/main/java/org/apache/commons/math3/linear/ArrayFieldVector.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; import java.io.Serializable; import java.lang.reflect.Array; import java.util.Arrays; -import org.apache.commons.math.Field; -import org.apache.commons.math.FieldElement; -import org.apache.commons.math.exception.ZeroException; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.exception.OutOfRangeException; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.NumberIsTooLargeException; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.Field; +import org.apache.commons.math3.FieldElement; +import org.apache.commons.math3.exception.ZeroException; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.exception.OutOfRangeException; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.NumberIsTooLargeException; +import org.apache.commons.math3.exception.util.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/math3/linear/ArrayRealVector.java similarity index 97% rename from src/main/java/org/apache/commons/math/linear/ArrayRealVector.java rename to src/main/java/org/apache/commons/math3/linear/ArrayRealVector.java index 52101396a..ef6eca13e 100644 --- a/src/main/java/org/apache/commons/math/linear/ArrayRealVector.java +++ b/src/main/java/org/apache/commons/math3/linear/ArrayRealVector.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; import java.io.Serializable; import java.util.Arrays; import java.util.Iterator; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.NumberIsTooLargeException; -import org.apache.commons.math.exception.MathArithmeticException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.util.MathUtils; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.NumberIsTooLargeException; +import org.apache.commons.math3.exception.MathArithmeticException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.util.MathUtils; +import org.apache.commons.math3.util.FastMath; /** * This class implements the {@link RealVector} interface with a double array. @@ -708,7 +708,7 @@ public class ArrayRealVector extends RealVector implements Serializable { * * @param index Index of first element to be set. * @param v Vector containing the values to set. - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the index is inconsistent with the vector size. */ public void setSubVector(int index, double[] v) { diff --git a/src/main/java/org/apache/commons/math/linear/BiDiagonalTransformer.java b/src/main/java/org/apache/commons/math3/linear/BiDiagonalTransformer.java similarity index 99% rename from src/main/java/org/apache/commons/math/linear/BiDiagonalTransformer.java rename to src/main/java/org/apache/commons/math3/linear/BiDiagonalTransformer.java index 1884746a0..c2c500272 100644 --- a/src/main/java/org/apache/commons/math/linear/BiDiagonalTransformer.java +++ b/src/main/java/org/apache/commons/math3/linear/BiDiagonalTransformer.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.util.FastMath; /** diff --git a/src/main/java/org/apache/commons/math/linear/BlockFieldMatrix.java b/src/main/java/org/apache/commons/math3/linear/BlockFieldMatrix.java similarity index 99% rename from src/main/java/org/apache/commons/math/linear/BlockFieldMatrix.java rename to src/main/java/org/apache/commons/math3/linear/BlockFieldMatrix.java index 8e9378317..d26fc5b53 100644 --- a/src/main/java/org/apache/commons/math/linear/BlockFieldMatrix.java +++ b/src/main/java/org/apache/commons/math3/linear/BlockFieldMatrix.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; import java.io.Serializable; -import org.apache.commons.math.Field; -import org.apache.commons.math.FieldElement; -import org.apache.commons.math.exception.NoDataException; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.util.FastMath; -import org.apache.commons.math.util.MathUtils; +import org.apache.commons.math3.Field; +import org.apache.commons.math3.FieldElement; +import org.apache.commons.math3.exception.NoDataException; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math3.util.MathUtils; /** * Cache-friendly implementation of FieldMatrix using a flat arrays to store @@ -89,7 +89,7 @@ public class BlockFieldMatrix> extends AbstractFieldMa * @param field Field to which the elements belong. * @param rows Number of rows in the new matrix. * @param columns Number of columns in the new matrix. - * @throws org.apache.commons.math.exception.NotStrictlyPositiveException + * @throws org.apache.commons.math3.exception.NotStrictlyPositiveException * if row or column dimension is not positive. */ public BlockFieldMatrix(final Field field, final int rows, final int columns) { @@ -853,7 +853,7 @@ public class BlockFieldMatrix> extends AbstractFieldMa * @param row the row to be set * @param matrix row matrix (must have one row and the same number of columns * as the instance) - * @throws org.apache.commons.math.exception.OutOfRangeException if the + * @throws org.apache.commons.math3.exception.OutOfRangeException if the * specified row index is invalid. * @throws MatrixDimensionMismatchException if the matrix dimensions do * not match one instance row. @@ -935,7 +935,7 @@ public class BlockFieldMatrix> extends AbstractFieldMa * @param column Column to be set. * @param matrix Column matrix (must have one column and the same number of rows * as the instance). - * @throws org.apache.commons.math.exception.OutOfRangeException if + * @throws org.apache.commons.math3.exception.OutOfRangeException if * the specified column index is invalid. * @throws MatrixDimensionMismatchException if the matrix dimensions do * not match one instance column. diff --git a/src/main/java/org/apache/commons/math/linear/BlockRealMatrix.java b/src/main/java/org/apache/commons/math3/linear/BlockRealMatrix.java similarity index 99% rename from src/main/java/org/apache/commons/math/linear/BlockRealMatrix.java rename to src/main/java/org/apache/commons/math3/linear/BlockRealMatrix.java index b466fb6bd..04ba0b2e0 100644 --- a/src/main/java/org/apache/commons/math/linear/BlockRealMatrix.java +++ b/src/main/java/org/apache/commons/math3/linear/BlockRealMatrix.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; import java.io.Serializable; import java.util.Arrays; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.NoDataException; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.util.FastMath; -import org.apache.commons.math.util.MathUtils; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.NoDataException; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math3.util.MathUtils; /** * Cache-friendly implementation of RealMatrix using a flat arrays to store @@ -87,7 +87,7 @@ public class BlockRealMatrix extends AbstractRealMatrix implements Serializable * * @param rows the number of rows in the new matrix * @param columns the number of columns in the new matrix - * @throws org.apache.commons.math.exception.NotStrictlyPositiveException + * @throws org.apache.commons.math3.exception.NotStrictlyPositiveException * if row or column dimension is not positive. */ public BlockRealMatrix(final int rows, final int columns) { @@ -862,7 +862,7 @@ public class BlockRealMatrix extends AbstractRealMatrix implements Serializable * @param row the row to be set * @param matrix row matrix (must have one row and the same number of columns * as the instance) - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the specified row index is invalid. * @throws MatrixDimensionMismatchException if the matrix dimensions do * not match one instance row. @@ -944,7 +944,7 @@ public class BlockRealMatrix extends AbstractRealMatrix implements Serializable * @param column the column to be set * @param matrix column matrix (must have one column and the same number of rows * as the instance) - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the specified column index is invalid. * @throws MatrixDimensionMismatchException if the matrix dimensions do * not match one instance column. diff --git a/src/main/java/org/apache/commons/math/linear/CholeskyDecomposition.java b/src/main/java/org/apache/commons/math3/linear/CholeskyDecomposition.java similarity index 98% rename from src/main/java/org/apache/commons/math/linear/CholeskyDecomposition.java rename to src/main/java/org/apache/commons/math3/linear/CholeskyDecomposition.java index 715e9e962..f03ba0e72 100644 --- a/src/main/java/org/apache/commons/math/linear/CholeskyDecomposition.java +++ b/src/main/java/org/apache/commons/math3/linear/CholeskyDecomposition.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.util.FastMath; /** diff --git a/src/main/java/org/apache/commons/math/linear/ConjugateGradient.java b/src/main/java/org/apache/commons/math3/linear/ConjugateGradient.java similarity index 96% rename from src/main/java/org/apache/commons/math/linear/ConjugateGradient.java rename to src/main/java/org/apache/commons/math3/linear/ConjugateGradient.java index a28e91ba0..c5269d919 100644 --- a/src/main/java/org/apache/commons/math/linear/ConjugateGradient.java +++ b/src/main/java/org/apache/commons/math3/linear/ConjugateGradient.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.MaxCountExceededException; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.exception.util.ExceptionContext; -import org.apache.commons.math.util.IterationManager; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.MaxCountExceededException; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.exception.util.ExceptionContext; +import org.apache.commons.math3.util.IterationManager; /** *

    diff --git a/src/main/java/org/apache/commons/math/linear/DecompositionSolver.java b/src/main/java/org/apache/commons/math3/linear/DecompositionSolver.java similarity index 93% rename from src/main/java/org/apache/commons/math/linear/DecompositionSolver.java rename to src/main/java/org/apache/commons/math3/linear/DecompositionSolver.java index 8e3604270..6437629b1 100644 --- a/src/main/java/org/apache/commons/math/linear/DecompositionSolver.java +++ b/src/main/java/org/apache/commons/math3/linear/DecompositionSolver.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; @@ -40,7 +40,7 @@ public interface DecompositionSolver { * decomposition algorithm.

    * @param b right-hand side of the equation A × X = B * @return a vector X that minimizes the two norm of A × X - B - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if the matrices dimensions do not match. * @throws SingularMatrixException * if the decomposed matrix is singular. @@ -52,7 +52,7 @@ public interface DecompositionSolver { * decomposition algorithm.

    * @param b right-hand side of the equation A × X = B * @return a matrix X that minimizes the two norm of A × X - B - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if the matrices dimensions do not match. * @throws SingularMatrixException * if the decomposed matrix is singular. diff --git a/src/main/java/org/apache/commons/math/linear/DefaultFieldMatrixChangingVisitor.java b/src/main/java/org/apache/commons/math3/linear/DefaultFieldMatrixChangingVisitor.java similarity index 95% rename from src/main/java/org/apache/commons/math/linear/DefaultFieldMatrixChangingVisitor.java rename to src/main/java/org/apache/commons/math3/linear/DefaultFieldMatrixChangingVisitor.java index ed2b3bcfe..9cde41a88 100644 --- a/src/main/java/org/apache/commons/math/linear/DefaultFieldMatrixChangingVisitor.java +++ b/src/main/java/org/apache/commons/math3/linear/DefaultFieldMatrixChangingVisitor.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; -import org.apache.commons.math.FieldElement; +import org.apache.commons.math3.FieldElement; /** * Default implementation of the {@link FieldMatrixChangingVisitor} interface. diff --git a/src/main/java/org/apache/commons/math/linear/DefaultFieldMatrixPreservingVisitor.java b/src/main/java/org/apache/commons/math3/linear/DefaultFieldMatrixPreservingVisitor.java similarity index 95% rename from src/main/java/org/apache/commons/math/linear/DefaultFieldMatrixPreservingVisitor.java rename to src/main/java/org/apache/commons/math3/linear/DefaultFieldMatrixPreservingVisitor.java index 0a31dd570..5d06a09ca 100644 --- a/src/main/java/org/apache/commons/math/linear/DefaultFieldMatrixPreservingVisitor.java +++ b/src/main/java/org/apache/commons/math3/linear/DefaultFieldMatrixPreservingVisitor.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; -import org.apache.commons.math.FieldElement; +import org.apache.commons.math3.FieldElement; /** * Default implementation of the {@link FieldMatrixPreservingVisitor} interface. diff --git a/src/main/java/org/apache/commons/math/linear/DefaultIterativeLinearSolverEvent.java b/src/main/java/org/apache/commons/math3/linear/DefaultIterativeLinearSolverEvent.java similarity index 97% rename from src/main/java/org/apache/commons/math/linear/DefaultIterativeLinearSolverEvent.java rename to src/main/java/org/apache/commons/math3/linear/DefaultIterativeLinearSolverEvent.java index 24ed370e5..8eb388742 100644 --- a/src/main/java/org/apache/commons/math/linear/DefaultIterativeLinearSolverEvent.java +++ b/src/main/java/org/apache/commons/math3/linear/DefaultIterativeLinearSolverEvent.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; -import org.apache.commons.math.exception.MathUnsupportedOperationException; +import org.apache.commons.math3.exception.MathUnsupportedOperationException; /** * A default concrete implementation of the abstract class diff --git a/src/main/java/org/apache/commons/math/linear/DefaultRealMatrixChangingVisitor.java b/src/main/java/org/apache/commons/math3/linear/DefaultRealMatrixChangingVisitor.java similarity index 97% rename from src/main/java/org/apache/commons/math/linear/DefaultRealMatrixChangingVisitor.java rename to src/main/java/org/apache/commons/math3/linear/DefaultRealMatrixChangingVisitor.java index ad2798c93..882a6a016 100644 --- a/src/main/java/org/apache/commons/math/linear/DefaultRealMatrixChangingVisitor.java +++ b/src/main/java/org/apache/commons/math3/linear/DefaultRealMatrixChangingVisitor.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; /** * Default implementation of the {@link RealMatrixChangingVisitor} interface. diff --git a/src/main/java/org/apache/commons/math/linear/DefaultRealMatrixPreservingVisitor.java b/src/main/java/org/apache/commons/math3/linear/DefaultRealMatrixPreservingVisitor.java similarity index 97% rename from src/main/java/org/apache/commons/math/linear/DefaultRealMatrixPreservingVisitor.java rename to src/main/java/org/apache/commons/math3/linear/DefaultRealMatrixPreservingVisitor.java index a10f0ae37..68336bac1 100644 --- a/src/main/java/org/apache/commons/math/linear/DefaultRealMatrixPreservingVisitor.java +++ b/src/main/java/org/apache/commons/math3/linear/DefaultRealMatrixPreservingVisitor.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; /** * Default implementation of the {@link RealMatrixPreservingVisitor} interface. diff --git a/src/main/java/org/apache/commons/math/linear/EigenDecomposition.java b/src/main/java/org/apache/commons/math3/linear/EigenDecomposition.java similarity index 98% rename from src/main/java/org/apache/commons/math/linear/EigenDecomposition.java rename to src/main/java/org/apache/commons/math3/linear/EigenDecomposition.java index 09c1718b1..884cfaee2 100644 --- a/src/main/java/org/apache/commons/math/linear/EigenDecomposition.java +++ b/src/main/java/org/apache/commons/math3/linear/EigenDecomposition.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; -import org.apache.commons.math.exception.MaxCountExceededException; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.util.Precision; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.MaxCountExceededException; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.util.Precision; +import org.apache.commons.math3.util.FastMath; /** * Calculates the eigen decomposition of a real symmetric diff --git a/src/main/java/org/apache/commons/math/linear/FieldDecompositionSolver.java b/src/main/java/org/apache/commons/math3/linear/FieldDecompositionSolver.java similarity index 92% rename from src/main/java/org/apache/commons/math/linear/FieldDecompositionSolver.java rename to src/main/java/org/apache/commons/math3/linear/FieldDecompositionSolver.java index f78af242d..0ebe72bfd 100644 --- a/src/main/java/org/apache/commons/math/linear/FieldDecompositionSolver.java +++ b/src/main/java/org/apache/commons/math3/linear/FieldDecompositionSolver.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; -import org.apache.commons.math.FieldElement; +import org.apache.commons.math3.FieldElement; /** @@ -42,7 +42,7 @@ public interface FieldDecompositionSolver> { * decomposition algorithm.

    * @param b right-hand side of the equation A × X = B * @return a vector X that minimizes the two norm of A × X - B - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if the matrices dimensions do not match. * @throws SingularMatrixException * if the decomposed matrix is singular. @@ -54,7 +54,7 @@ public interface FieldDecompositionSolver> { * decomposition algorithm.

    * @param b right-hand side of the equation A × X = B * @return a matrix X that minimizes the two norm of A × X - B - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if the matrices dimensions do not match. * @throws SingularMatrixException * if the decomposed matrix is singular. diff --git a/src/main/java/org/apache/commons/math/linear/FieldLUDecomposition.java b/src/main/java/org/apache/commons/math3/linear/FieldLUDecomposition.java similarity index 98% rename from src/main/java/org/apache/commons/math/linear/FieldLUDecomposition.java rename to src/main/java/org/apache/commons/math3/linear/FieldLUDecomposition.java index 2e4461eb1..fc28b2f08 100644 --- a/src/main/java/org/apache/commons/math/linear/FieldLUDecomposition.java +++ b/src/main/java/org/apache/commons/math3/linear/FieldLUDecomposition.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; import java.lang.reflect.Array; -import org.apache.commons.math.Field; -import org.apache.commons.math.FieldElement; -import org.apache.commons.math.exception.DimensionMismatchException; +import org.apache.commons.math3.Field; +import org.apache.commons.math3.FieldElement; +import org.apache.commons.math3.exception.DimensionMismatchException; /** * Calculates the LUP-decomposition of a square matrix. diff --git a/src/main/java/org/apache/commons/math/linear/FieldMatrix.java b/src/main/java/org/apache/commons/math3/linear/FieldMatrix.java similarity index 93% rename from src/main/java/org/apache/commons/math/linear/FieldMatrix.java rename to src/main/java/org/apache/commons/math3/linear/FieldMatrix.java index 50cb85f5d..fc0110b7a 100644 --- a/src/main/java/org/apache/commons/math/linear/FieldMatrix.java +++ b/src/main/java/org/apache/commons/math3/linear/FieldMatrix.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; -import org.apache.commons.math.Field; -import org.apache.commons.math.FieldElement; +import org.apache.commons.math3.Field; +import org.apache.commons.math3.FieldElement; /** * Interface defining field-valued matrix with basic algebraic operations. @@ -45,7 +45,7 @@ public interface FieldMatrix> extends AnyMatrix { * @param rowDimension the number of rows in the new matrix * @param columnDimension the number of columns in the new matrix * @return a new matrix of the same type as the instance - * @throws org.apache.commons.math.exception.NotStrictlyPositiveException + * @throws org.apache.commons.math3.exception.NotStrictlyPositiveException * if row or column dimension is not positive. * @since 2.0 */ @@ -109,7 +109,7 @@ public interface FieldMatrix> extends AnyMatrix { * * @param m Matrix to premultiply by. * @return {@code m} * {@code this}. - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if the number of columns of {@code m} differ from the number of rows * of this matrix. */ @@ -143,7 +143,7 @@ public interface FieldMatrix> extends AnyMatrix { * @param endColumn Final column index (inclusive) * @return the matrix containing the data of the * specified rows and columns. - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the indices are not valid. */ FieldMatrix getSubMatrix(int startRow, int endRow, int startColumn, int endColumn); @@ -156,7 +156,7 @@ public interface FieldMatrix> extends AnyMatrix { * @param selectedColumns Array of column indices. * @return the matrix containing the data in the * specified rows and columns. - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if row or column selections are not valid. */ FieldMatrix getSubMatrix(int[] selectedRows, int[] selectedColumns); @@ -171,7 +171,7 @@ public interface FieldMatrix> extends AnyMatrix { * @param endColumn Final column index (inclusive). * @param destination The arrays where the submatrix data should be copied * (if larger than rows/columns counts, only the upper-left part will be used). - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the indices are not valid. * @exception IllegalArgumentException if the destination array is too small. */ @@ -186,7 +186,7 @@ public interface FieldMatrix> extends AnyMatrix { * @param selectedColumns Array of column indices. * @param destination Arrays where the submatrix data should be copied * (if larger than rows/columns counts, only the upper-left part will be used) - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the indices are not valid. * @exception IllegalArgumentException if the destination array is too small */ @@ -215,12 +215,12 @@ public interface FieldMatrix> extends AnyMatrix { * @throws MatrixDimensionMismatchException * if {@code subMatrix} does not fit into this matrix from element in * {@code (row, column)}. - * @throws org.apache.commons.math.exception.ZeroException if a row or column + * @throws org.apache.commons.math3.exception.ZeroException if a row or column * of {@code subMatrix} is empty. - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if {@code subMatrix} is not rectangular (not all rows have the same * length). - * @throws org.apache.commons.math.exception.NullArgumentException + * @throws org.apache.commons.math3.exception.NullArgumentException * if {@code subMatrix} is {@code null}. * @since 2.0 */ @@ -232,7 +232,7 @@ public interface FieldMatrix> extends AnyMatrix { * * @param row Row to be fetched. * @return a row matrix. - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the specified row index is invalid. */ FieldMatrix getRowMatrix(int row); @@ -244,7 +244,7 @@ public interface FieldMatrix> extends AnyMatrix { * @param row Row to be set. * @param matrix Row matrix (must have one row and the same number * of columns as the instance). - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the specified row index is invalid. * @throws MatrixDimensionMismatchException * if the matrix dimensions do not match one instance row. @@ -257,7 +257,7 @@ public interface FieldMatrix> extends AnyMatrix { * * @param column Column to be fetched. * @return a column matrix. - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the specified column index is invalid. */ FieldMatrix getColumnMatrix(int column); @@ -269,7 +269,7 @@ public interface FieldMatrix> extends AnyMatrix { * @param column Column to be set. * @param matrix column matrix (must have one column and the same * number of rows as the instance). - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the specified column index is invalid. * @throws MatrixDimensionMismatchException * if the matrix dimensions do not match one instance column. @@ -282,7 +282,7 @@ public interface FieldMatrix> extends AnyMatrix { * * @param row Row to be fetched * @return a row vector. - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the specified row index is invalid. */ FieldVector getRowVector(int row); @@ -294,7 +294,7 @@ public interface FieldMatrix> extends AnyMatrix { * @param row Row to be set. * @param vector row vector (must have the same number of columns * as the instance). - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the specified row index is invalid. * @throws MatrixDimensionMismatchException * if the vector dimension does not match one instance row. @@ -307,7 +307,7 @@ public interface FieldMatrix> extends AnyMatrix { * * @param column Column to be fetched. * @return a column vector. - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the specified column index is invalid. */ FieldVector getColumnVector(int column); @@ -319,7 +319,7 @@ public interface FieldMatrix> extends AnyMatrix { * @param column Column to be set. * @param vector Column vector (must have the same number of rows * as the instance). - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the specified column index is invalid. * @throws MatrixDimensionMismatchException * if the vector dimension does not match one instance column. @@ -331,7 +331,7 @@ public interface FieldMatrix> extends AnyMatrix { * * @param row Row to be fetched. * @return array of entries in the row. - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the specified row index is not valid. */ T[] getRow(int row); @@ -343,7 +343,7 @@ public interface FieldMatrix> extends AnyMatrix { * @param row Row to be set. * @param array Row matrix (must have the same number of columns as * the instance). - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the specified row index is invalid. * @throws MatrixDimensionMismatchException * if the array size does not match one instance row. @@ -355,7 +355,7 @@ public interface FieldMatrix> extends AnyMatrix { * * @param column the column to be fetched * @return array of entries in the column - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the specified column index is not valid. */ T[] getColumn(int column); @@ -366,7 +366,7 @@ public interface FieldMatrix> extends AnyMatrix { * * @param column the column to be set * @param array column array (must have the same number of rows as the instance) - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the specified column index is invalid. * @throws MatrixDimensionMismatchException * if the array size does not match one instance column. @@ -379,7 +379,7 @@ public interface FieldMatrix> extends AnyMatrix { * @param row row location of entry to be fetched * @param column column location of entry to be fetched * @return matrix entry in row,column - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the row or column index is not valid. */ T getEntry(int row, int column); @@ -390,7 +390,7 @@ public interface FieldMatrix> extends AnyMatrix { * @param row row location of entry to be set * @param column column location of entry to be set * @param value matrix entry to be set in row,column - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the row or column index is not valid. * @since 2.0 */ @@ -403,7 +403,7 @@ public interface FieldMatrix> extends AnyMatrix { * @param column Column location of entry to be set. * @param increment Value to add to the current matrix entry in * {@code (row, column)}. - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the row or column index is not valid. * @since 2.0 */ @@ -416,7 +416,7 @@ public interface FieldMatrix> extends AnyMatrix { * @param column Column location of entry to be set. * @param factor Multiplication factor for the current matrix entry * in {@code (row,column)} - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the row or column index is not valid. * @since 2.0 */ @@ -529,7 +529,7 @@ public interface FieldMatrix> extends AnyMatrix { * @param endRow Final row index (inclusive) * @param startColumn Initial column index * @param endColumn Final column index - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the indices are not valid. * @see #walkInRowOrder(FieldMatrixChangingVisitor) * @see #walkInRowOrder(FieldMatrixPreservingVisitor) @@ -558,7 +558,7 @@ public interface FieldMatrix> extends AnyMatrix { * @param endRow Final row index (inclusive) * @param startColumn Initial column index * @param endColumn Final column index - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the indices are not valid. * @see #walkInRowOrder(FieldMatrixChangingVisitor) * @see #walkInRowOrder(FieldMatrixPreservingVisitor) @@ -631,7 +631,7 @@ public interface FieldMatrix> extends AnyMatrix { * @param endRow Final row index (inclusive) * @param startColumn Initial column index * @param endColumn Final column index - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the indices are not valid. * @see #walkInRowOrder(FieldMatrixChangingVisitor) * @see #walkInRowOrder(FieldMatrixPreservingVisitor) @@ -660,7 +660,7 @@ public interface FieldMatrix> extends AnyMatrix { * @param endRow Final row index (inclusive) * @param startColumn Initial column index * @param endColumn Final column index - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the indices are not valid. * @see #walkInRowOrder(FieldMatrixChangingVisitor) * @see #walkInRowOrder(FieldMatrixPreservingVisitor) @@ -730,7 +730,7 @@ public interface FieldMatrix> extends AnyMatrix { * @param endRow Final row index (inclusive) * @param startColumn Initial column index * @param endColumn Final column index (inclusive) - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the indices are not valid. * @see #walkInRowOrder(FieldMatrixChangingVisitor) * @see #walkInRowOrder(FieldMatrixPreservingVisitor) @@ -758,7 +758,7 @@ public interface FieldMatrix> extends AnyMatrix { * @param endRow Final row index (inclusive) * @param startColumn Initial column index * @param endColumn Final column index (inclusive) - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the indices are not valid. * @see #walkInRowOrder(FieldMatrixChangingVisitor) * @see #walkInRowOrder(FieldMatrixPreservingVisitor) diff --git a/src/main/java/org/apache/commons/math/linear/FieldMatrixChangingVisitor.java b/src/main/java/org/apache/commons/math3/linear/FieldMatrixChangingVisitor.java similarity index 95% rename from src/main/java/org/apache/commons/math/linear/FieldMatrixChangingVisitor.java rename to src/main/java/org/apache/commons/math3/linear/FieldMatrixChangingVisitor.java index 4624bea9f..baca8d5ee 100644 --- a/src/main/java/org/apache/commons/math/linear/FieldMatrixChangingVisitor.java +++ b/src/main/java/org/apache/commons/math3/linear/FieldMatrixChangingVisitor.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; -import org.apache.commons.math.FieldElement; +import org.apache.commons.math3.FieldElement; /** * Interface defining a visitor for matrix entries. diff --git a/src/main/java/org/apache/commons/math/linear/FieldMatrixPreservingVisitor.java b/src/main/java/org/apache/commons/math3/linear/FieldMatrixPreservingVisitor.java similarity index 95% rename from src/main/java/org/apache/commons/math/linear/FieldMatrixPreservingVisitor.java rename to src/main/java/org/apache/commons/math3/linear/FieldMatrixPreservingVisitor.java index cedc5ec67..d3d3f6ea2 100644 --- a/src/main/java/org/apache/commons/math/linear/FieldMatrixPreservingVisitor.java +++ b/src/main/java/org/apache/commons/math3/linear/FieldMatrixPreservingVisitor.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; -import org.apache.commons.math.FieldElement; +import org.apache.commons.math3.FieldElement; /** * Interface defining a visitor for matrix entries. diff --git a/src/main/java/org/apache/commons/math/linear/FieldVector.java b/src/main/java/org/apache/commons/math3/linear/FieldVector.java similarity index 95% rename from src/main/java/org/apache/commons/math/linear/FieldVector.java rename to src/main/java/org/apache/commons/math3/linear/FieldVector.java index 69acb9c6f..e367d1d14 100644 --- a/src/main/java/org/apache/commons/math/linear/FieldVector.java +++ b/src/main/java/org/apache/commons/math3/linear/FieldVector.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; -import org.apache.commons.math.Field; -import org.apache.commons.math.FieldElement; +import org.apache.commons.math3.Field; +import org.apache.commons.math3.FieldElement; /** * Interface defining a field-valued vector with basic algebraic operations. @@ -199,7 +199,7 @@ public interface FieldVector> { * * @param index Index location of entry to be fetched. * @return the vector entry at {@code index}. - * @throws org.apache.commons.math.exception.OutOfRangeException if the + * @throws org.apache.commons.math3.exception.OutOfRangeException if the * index is not valid. * @see #setEntry(int, FieldElement) */ @@ -209,7 +209,7 @@ public interface FieldVector> { * Set a single element. * @param index element index. * @param value new value for the element. - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the index is inconsistent with vector size. * @see #getEntry(int) */ @@ -240,7 +240,7 @@ public interface FieldVector> { * @param index index of first element. * @param n number of elements to be retrieved. * @return a vector containing n elements. - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the index is inconsistent with vector size. */ FieldVector getSubVector(int index, int n); @@ -249,7 +249,7 @@ public interface FieldVector> { * Set a set of consecutive elements. * @param index index of first element to be set. * @param v vector containing the values to set. - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the index is inconsistent with vector size. */ void setSubVector(int index, FieldVector v); diff --git a/src/main/java/org/apache/commons/math/linear/IllConditionedOperatorException.java b/src/main/java/org/apache/commons/math3/linear/IllConditionedOperatorException.java similarity index 89% rename from src/main/java/org/apache/commons/math/linear/IllConditionedOperatorException.java rename to src/main/java/org/apache/commons/math3/linear/IllConditionedOperatorException.java index 8c3b54c2d..02cc52b7a 100644 --- a/src/main/java/org/apache/commons/math/linear/IllConditionedOperatorException.java +++ b/src/main/java/org/apache/commons/math3/linear/IllConditionedOperatorException.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** * An exception to be thrown when the condition number of a diff --git a/src/main/java/org/apache/commons/math/linear/IterativeLinearSolver.java b/src/main/java/org/apache/commons/math3/linear/IterativeLinearSolver.java similarity index 91% rename from src/main/java/org/apache/commons/math/linear/IterativeLinearSolver.java rename to src/main/java/org/apache/commons/math3/linear/IterativeLinearSolver.java index d884883f7..556920a58 100644 --- a/src/main/java/org/apache/commons/math/linear/IterativeLinearSolver.java +++ b/src/main/java/org/apache/commons/math3/linear/IterativeLinearSolver.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.MaxCountExceededException; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.util.IterationManager; -import org.apache.commons.math.util.MathUtils; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.MaxCountExceededException; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.util.IterationManager; +import org.apache.commons.math3.util.MathUtils; /** * This abstract class defines an iterative solver for the linear system A @@ -114,7 +114,7 @@ public abstract class IterativeLinearSolver { * inconsistent with {@code a} * @throws MaxCountExceededException at exhaustion of the iteration count, * unless a custom - * {@link org.apache.commons.math.util.Incrementor.MaxCountExceededCallback callback} + * {@link org.apache.commons.math3.util.Incrementor.MaxCountExceededCallback callback} * has been set at construction */ public RealVector solve(final RealLinearOperator a, final RealVector b) @@ -140,7 +140,7 @@ public abstract class IterativeLinearSolver { * dimensions inconsistent with {@code a} * @throws MaxCountExceededException at exhaustion of the iteration count, * unless a custom - * {@link org.apache.commons.math.util.Incrementor.MaxCountExceededCallback callback} + * {@link org.apache.commons.math3.util.Incrementor.MaxCountExceededCallback callback} * has been set at construction */ public RealVector solve(RealLinearOperator a, RealVector b, RealVector x0) @@ -165,7 +165,7 @@ public abstract class IterativeLinearSolver { * dimensions inconsistent with {@code a} * @throws MaxCountExceededException at exhaustion of the iteration count, * unless a custom - * {@link org.apache.commons.math.util.Incrementor.MaxCountExceededCallback callback} + * {@link org.apache.commons.math3.util.Incrementor.MaxCountExceededCallback callback} * has been set at construction */ public abstract RealVector solveInPlace(RealLinearOperator a, RealVector b, diff --git a/src/main/java/org/apache/commons/math/linear/IterativeLinearSolverEvent.java b/src/main/java/org/apache/commons/math3/linear/IterativeLinearSolverEvent.java similarity index 96% rename from src/main/java/org/apache/commons/math/linear/IterativeLinearSolverEvent.java rename to src/main/java/org/apache/commons/math3/linear/IterativeLinearSolverEvent.java index 227101e0e..d0288fe3a 100644 --- a/src/main/java/org/apache/commons/math/linear/IterativeLinearSolverEvent.java +++ b/src/main/java/org/apache/commons/math3/linear/IterativeLinearSolverEvent.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; -import org.apache.commons.math.util.IterationEvent; -import org.apache.commons.math.exception.MathUnsupportedOperationException; +import org.apache.commons.math3.util.IterationEvent; +import org.apache.commons.math3.exception.MathUnsupportedOperationException; /** * This is the base class for all events occuring during the iterations of a diff --git a/src/main/java/org/apache/commons/math/linear/JacobiPreconditioner.java b/src/main/java/org/apache/commons/math3/linear/JacobiPreconditioner.java similarity index 98% rename from src/main/java/org/apache/commons/math/linear/JacobiPreconditioner.java rename to src/main/java/org/apache/commons/math3/linear/JacobiPreconditioner.java index 32ba7e6b6..0ed1dd1d4 100644 --- a/src/main/java/org/apache/commons/math/linear/JacobiPreconditioner.java +++ b/src/main/java/org/apache/commons/math3/linear/JacobiPreconditioner.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; /** * This class implements the standard Jacobi (diagonal) preconditioner. For a diff --git a/src/main/java/org/apache/commons/math/linear/LUDecomposition.java b/src/main/java/org/apache/commons/math3/linear/LUDecomposition.java similarity index 98% rename from src/main/java/org/apache/commons/math/linear/LUDecomposition.java rename to src/main/java/org/apache/commons/math3/linear/LUDecomposition.java index e583099cd..65185d356 100644 --- a/src/main/java/org/apache/commons/math/linear/LUDecomposition.java +++ b/src/main/java/org/apache/commons/math3/linear/LUDecomposition.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.util.FastMath; /** * Calculates the LUP-decomposition of a square matrix. diff --git a/src/main/java/org/apache/commons/math/linear/MatrixDimensionMismatchException.java b/src/main/java/org/apache/commons/math3/linear/MatrixDimensionMismatchException.java similarity index 93% rename from src/main/java/org/apache/commons/math/linear/MatrixDimensionMismatchException.java rename to src/main/java/org/apache/commons/math3/linear/MatrixDimensionMismatchException.java index 71b1b802f..218a21186 100644 --- a/src/main/java/org/apache/commons/math/linear/MatrixDimensionMismatchException.java +++ b/src/main/java/org/apache/commons/math3/linear/MatrixDimensionMismatchException.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; -import org.apache.commons.math.exception.MultiDimensionMismatchException; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.MultiDimensionMismatchException; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** * Exception to be thrown when either the number of rows or the number of diff --git a/src/main/java/org/apache/commons/math/linear/MatrixUtils.java b/src/main/java/org/apache/commons/math3/linear/MatrixUtils.java similarity index 97% rename from src/main/java/org/apache/commons/math/linear/MatrixUtils.java rename to src/main/java/org/apache/commons/math3/linear/MatrixUtils.java index 3afcd1dbd..cb4240c50 100644 --- a/src/main/java/org/apache/commons/math/linear/MatrixUtils.java +++ b/src/main/java/org/apache/commons/math3/linear/MatrixUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; import java.io.IOException; import java.io.ObjectInputStream; @@ -23,21 +23,21 @@ import java.io.ObjectOutputStream; import java.lang.reflect.Array; import java.util.Arrays; -import org.apache.commons.math.Field; -import org.apache.commons.math.FieldElement; -import org.apache.commons.math.exception.MathArithmeticException; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.OutOfRangeException; -import org.apache.commons.math.exception.NoDataException; -import org.apache.commons.math.exception.NumberIsTooSmallException; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.ZeroException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.fraction.BigFraction; -import org.apache.commons.math.fraction.Fraction; -import org.apache.commons.math.util.FastMath; -import org.apache.commons.math.util.Precision; +import org.apache.commons.math3.Field; +import org.apache.commons.math3.FieldElement; +import org.apache.commons.math3.exception.MathArithmeticException; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.OutOfRangeException; +import org.apache.commons.math3.exception.NoDataException; +import org.apache.commons.math3.exception.NumberIsTooSmallException; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.ZeroException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.fraction.BigFraction; +import org.apache.commons.math3.fraction.Fraction; +import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math3.util.Precision; /** * A collection of static methods that operate on or return matrices. @@ -105,7 +105,7 @@ public class MatrixUtils { * * @param data input array * @return RealMatrix containing the values of the array - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if {@code data} is not rectangular (not all rows have the same length). * @throws NoDataException if a row or column is empty. * @throws NullArgumentException if either {@code data} or {@code data[0]} @@ -132,7 +132,7 @@ public class MatrixUtils { * @param the type of the field elements * @param data input array * @return a matrix containing the values of the array. - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if {@code data} is not rectangular (not all rows have the same length). * @throws NoDataException if a row or column is empty. * @throws NullArgumentException if either {@code data} or {@code data[0]} diff --git a/src/main/java/org/apache/commons/math/linear/NonPositiveDefiniteMatrixException.java b/src/main/java/org/apache/commons/math3/linear/NonPositiveDefiniteMatrixException.java similarity index 90% rename from src/main/java/org/apache/commons/math/linear/NonPositiveDefiniteMatrixException.java rename to src/main/java/org/apache/commons/math3/linear/NonPositiveDefiniteMatrixException.java index ee79ae722..f578ba2b3 100644 --- a/src/main/java/org/apache/commons/math/linear/NonPositiveDefiniteMatrixException.java +++ b/src/main/java/org/apache/commons/math3/linear/NonPositiveDefiniteMatrixException.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; -import org.apache.commons.math.exception.NumberIsTooSmallException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.exception.util.ExceptionContext; +import org.apache.commons.math3.exception.NumberIsTooSmallException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.util.ExceptionContext; /** * Exception to be thrown when a positive definite matrix is expected. diff --git a/src/main/java/org/apache/commons/math/linear/NonPositiveDefiniteOperatorException.java b/src/main/java/org/apache/commons/math3/linear/NonPositiveDefiniteOperatorException.java similarity index 90% rename from src/main/java/org/apache/commons/math/linear/NonPositiveDefiniteOperatorException.java rename to src/main/java/org/apache/commons/math3/linear/NonPositiveDefiniteOperatorException.java index b1942dec6..8d23ae650 100644 --- a/src/main/java/org/apache/commons/math/linear/NonPositiveDefiniteOperatorException.java +++ b/src/main/java/org/apache/commons/math3/linear/NonPositiveDefiniteOperatorException.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** * Exception to be thrown when a symmetric, definite positive diff --git a/src/main/java/org/apache/commons/math/linear/NonSelfAdjointOperatorException.java b/src/main/java/org/apache/commons/math3/linear/NonSelfAdjointOperatorException.java similarity index 90% rename from src/main/java/org/apache/commons/math/linear/NonSelfAdjointOperatorException.java rename to src/main/java/org/apache/commons/math3/linear/NonSelfAdjointOperatorException.java index 9b06cad63..6b2bdced5 100644 --- a/src/main/java/org/apache/commons/math/linear/NonSelfAdjointOperatorException.java +++ b/src/main/java/org/apache/commons/math3/linear/NonSelfAdjointOperatorException.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** * Exception to be thrown when a self-adjoint {@link RealLinearOperator} diff --git a/src/main/java/org/apache/commons/math/linear/NonSquareMatrixException.java b/src/main/java/org/apache/commons/math3/linear/NonSquareMatrixException.java similarity index 89% rename from src/main/java/org/apache/commons/math/linear/NonSquareMatrixException.java rename to src/main/java/org/apache/commons/math3/linear/NonSquareMatrixException.java index a22d74322..a6a5bbf75 100644 --- a/src/main/java/org/apache/commons/math/linear/NonSquareMatrixException.java +++ b/src/main/java/org/apache/commons/math3/linear/NonSquareMatrixException.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** * Exception to be thrown when a square matrix is expected. diff --git a/src/main/java/org/apache/commons/math/linear/NonSquareOperatorException.java b/src/main/java/org/apache/commons/math3/linear/NonSquareOperatorException.java similarity index 88% rename from src/main/java/org/apache/commons/math/linear/NonSquareOperatorException.java rename to src/main/java/org/apache/commons/math3/linear/NonSquareOperatorException.java index 452bfb4e0..446122637 100644 --- a/src/main/java/org/apache/commons/math/linear/NonSquareOperatorException.java +++ b/src/main/java/org/apache/commons/math3/linear/NonSquareOperatorException.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** * Exception to be thrown when a square linear operator is expected. diff --git a/src/main/java/org/apache/commons/math/linear/NonSymmetricMatrixException.java b/src/main/java/org/apache/commons/math3/linear/NonSymmetricMatrixException.java similarity index 92% rename from src/main/java/org/apache/commons/math/linear/NonSymmetricMatrixException.java rename to src/main/java/org/apache/commons/math3/linear/NonSymmetricMatrixException.java index 6af8bcb18..510dc7039 100644 --- a/src/main/java/org/apache/commons/math/linear/NonSymmetricMatrixException.java +++ b/src/main/java/org/apache/commons/math3/linear/NonSymmetricMatrixException.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** * Exception to be thrown when a symmetric matrix is expected. diff --git a/src/main/java/org/apache/commons/math/linear/OpenMapRealMatrix.java b/src/main/java/org/apache/commons/math3/linear/OpenMapRealMatrix.java similarity index 96% rename from src/main/java/org/apache/commons/math/linear/OpenMapRealMatrix.java rename to src/main/java/org/apache/commons/math3/linear/OpenMapRealMatrix.java index 7fe692dae..6c7bf51a4 100644 --- a/src/main/java/org/apache/commons/math/linear/OpenMapRealMatrix.java +++ b/src/main/java/org/apache/commons/math3/linear/OpenMapRealMatrix.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; import java.io.Serializable; -import org.apache.commons.math.exception.NumberIsTooLargeException; -import org.apache.commons.math.util.OpenIntToDoubleHashMap; +import org.apache.commons.math3.exception.NumberIsTooLargeException; +import org.apache.commons.math3.util.OpenIntToDoubleHashMap; /** * Sparse matrix implementation based on an open addressed map. @@ -91,7 +91,7 @@ public class OpenMapRealMatrix extends AbstractRealMatrix * * @param m Matrix to be added. * @return {@code this} + {@code m}. - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if {@code m} is not the same size as this matrix. */ public OpenMapRealMatrix add(OpenMapRealMatrix m) { @@ -126,7 +126,7 @@ public class OpenMapRealMatrix extends AbstractRealMatrix * * @param m Matrix to be subtracted. * @return {@code this} - {@code m}. - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if {@code m} is not the same size as this matrix. */ public OpenMapRealMatrix subtract(OpenMapRealMatrix m) { diff --git a/src/main/java/org/apache/commons/math/linear/OpenMapRealVector.java b/src/main/java/org/apache/commons/math3/linear/OpenMapRealVector.java similarity index 97% rename from src/main/java/org/apache/commons/math/linear/OpenMapRealVector.java rename to src/main/java/org/apache/commons/math3/linear/OpenMapRealVector.java index 1c9c7d28e..13ada786c 100644 --- a/src/main/java/org/apache/commons/math/linear/OpenMapRealVector.java +++ b/src/main/java/org/apache/commons/math3/linear/OpenMapRealVector.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; import java.io.Serializable; -import org.apache.commons.math.exception.MathArithmeticException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.util.OpenIntToDoubleHashMap; -import org.apache.commons.math.util.OpenIntToDoubleHashMap.Iterator; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.MathArithmeticException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.util.OpenIntToDoubleHashMap; +import org.apache.commons.math3.util.OpenIntToDoubleHashMap.Iterator; +import org.apache.commons.math3.util.FastMath; /** * This class implements the {@link RealVector} interface with a @@ -236,7 +236,7 @@ public class OpenMapRealVector extends SparseRealVector * * @param v Vector to add. * @return the sum of {@code this} and {@code v}. - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if the dimensions do not match. */ public OpenMapRealVector add(OpenMapRealVector v) { @@ -309,7 +309,7 @@ public class OpenMapRealVector extends SparseRealVector * * @param v Cector to compute the dot product with. * @return the dot product of {@code this} and {@code v}. - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if the dimensions do not match. */ public double dotProduct(OpenMapRealVector v) { @@ -390,7 +390,7 @@ public class OpenMapRealVector extends SparseRealVector * * @param v Vector to compute distance to. * @return the distance from {@code this} and {@code v}. - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if the dimensions do not match. */ public double getDistance(OpenMapRealVector v) { @@ -600,7 +600,7 @@ public class OpenMapRealVector extends SparseRealVector * * @param v Vector to subtract from {@code this}. * @return the difference of {@code this} and {@code v}. - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if the dimensions do not match. */ public OpenMapRealVector subtract(OpenMapRealVector v) { diff --git a/src/main/java/org/apache/commons/math/linear/PivotingQRDecomposition.java b/src/main/java/org/apache/commons/math3/linear/PivotingQRDecomposition.java similarity index 97% rename from src/main/java/org/apache/commons/math/linear/PivotingQRDecomposition.java rename to src/main/java/org/apache/commons/math3/linear/PivotingQRDecomposition.java index dfa4fbb51..3d0bf9d65 100644 --- a/src/main/java/org/apache/commons/math/linear/PivotingQRDecomposition.java +++ b/src/main/java/org/apache/commons/math3/linear/PivotingQRDecomposition.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; import java.util.Arrays; -import org.apache.commons.math.util.MathArrays; -import org.apache.commons.math.exception.ConvergenceException; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.util.MathArrays; +import org.apache.commons.math3.exception.ConvergenceException; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.util.FastMath; /** * diff --git a/src/main/java/org/apache/commons/math/linear/PreconditionedIterativeLinearSolver.java b/src/main/java/org/apache/commons/math3/linear/PreconditionedIterativeLinearSolver.java similarity index 93% rename from src/main/java/org/apache/commons/math/linear/PreconditionedIterativeLinearSolver.java rename to src/main/java/org/apache/commons/math3/linear/PreconditionedIterativeLinearSolver.java index 303249999..a7c145181 100644 --- a/src/main/java/org/apache/commons/math/linear/PreconditionedIterativeLinearSolver.java +++ b/src/main/java/org/apache/commons/math3/linear/PreconditionedIterativeLinearSolver.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.MaxCountExceededException; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.util.IterationManager; -import org.apache.commons.math.util.MathUtils; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.MaxCountExceededException; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.util.IterationManager; +import org.apache.commons.math3.util.MathUtils; /** *

    @@ -80,7 +80,7 @@ public abstract class PreconditionedIterativeLinearSolver * {@code x0} have dimensions inconsistent with {@code a} * @throws MaxCountExceededException at exhaustion of the iteration count, * unless a custom - * {@link org.apache.commons.math.util.Incrementor.MaxCountExceededCallback callback} + * {@link org.apache.commons.math3.util.Incrementor.MaxCountExceededCallback callback} * has been set at construction */ public RealVector solve(final RealLinearOperator a, @@ -163,7 +163,7 @@ public abstract class PreconditionedIterativeLinearSolver * dimensions inconsistent with {@code a} * @throws MaxCountExceededException at exhaustion of the iteration count, * unless a custom - * {@link org.apache.commons.math.util.Incrementor.MaxCountExceededCallback callback} + * {@link org.apache.commons.math3.util.Incrementor.MaxCountExceededCallback callback} * has been set at construction */ public RealVector solve(RealLinearOperator a, RealLinearOperator minv, @@ -192,7 +192,7 @@ public abstract class PreconditionedIterativeLinearSolver * {@code x0} have dimensions inconsistent with {@code a} * @throws MaxCountExceededException at exhaustion of the iteration count, * unless a custom - * {@link org.apache.commons.math.util.Incrementor.MaxCountExceededCallback callback} + * {@link org.apache.commons.math3.util.Incrementor.MaxCountExceededCallback callback} * has been set at construction. */ public abstract RealVector solveInPlace(RealLinearOperator a, diff --git a/src/main/java/org/apache/commons/math/linear/QRDecomposition.java b/src/main/java/org/apache/commons/math3/linear/QRDecomposition.java similarity index 99% rename from src/main/java/org/apache/commons/math/linear/QRDecomposition.java rename to src/main/java/org/apache/commons/math3/linear/QRDecomposition.java index e498e97bf..8fa37c2f4 100644 --- a/src/main/java/org/apache/commons/math/linear/QRDecomposition.java +++ b/src/main/java/org/apache/commons/math3/linear/QRDecomposition.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; import java.util.Arrays; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.util.FastMath; /** diff --git a/src/main/java/org/apache/commons/math/linear/RealLinearOperator.java b/src/main/java/org/apache/commons/math3/linear/RealLinearOperator.java similarity index 93% rename from src/main/java/org/apache/commons/math/linear/RealLinearOperator.java rename to src/main/java/org/apache/commons/math3/linear/RealLinearOperator.java index 4ea99a14a..ada9873f4 100644 --- a/src/main/java/org/apache/commons/math/linear/RealLinearOperator.java +++ b/src/main/java/org/apache/commons/math3/linear/RealLinearOperator.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; -import org.apache.commons.math.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.DimensionMismatchException; /** * This class defines a linear operator operating on real ({@code double}) @@ -70,7 +70,7 @@ public abstract class RealLinearOperator { * * @param x the vector to operate on * @return the product of {@code this} instance with {@code x} - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if the column dimension does not match the size of {@code x} */ public abstract RealVector operate(final RealVector x); @@ -84,7 +84,7 @@ public abstract class RealLinearOperator { * @param x the vector to operate on * @return the product of the transpose of {@code this} instance with * {@code x} - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if the row dimension does not match the size of {@code x} * @throws UnsupportedOperationException if this operation is not supported * by {@code this} operator diff --git a/src/main/java/org/apache/commons/math/linear/RealMatrix.java b/src/main/java/org/apache/commons/math3/linear/RealMatrix.java similarity index 93% rename from src/main/java/org/apache/commons/math/linear/RealMatrix.java rename to src/main/java/org/apache/commons/math3/linear/RealMatrix.java index 3f4ac508d..b414a3409 100644 --- a/src/main/java/org/apache/commons/math/linear/RealMatrix.java +++ b/src/main/java/org/apache/commons/math3/linear/RealMatrix.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.exception.OutOfRangeException; -import org.apache.commons.math.exception.ZeroException; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.exception.OutOfRangeException; +import org.apache.commons.math3.exception.ZeroException; /** * Interface defining a real-valued matrix with basic algebraic operations. @@ -38,7 +38,7 @@ public interface RealMatrix extends AnyMatrix { * @param rowDimension the number of rows in the new matrix * @param columnDimension the number of columns in the new matrix * @return a new matrix of the same type as the instance - * @throws org.apache.commons.math.exception.NotStrictlyPositiveException + * @throws org.apache.commons.math3.exception.NotStrictlyPositiveException * if row or column dimension is not positive. * @since 2.0 */ @@ -147,7 +147,7 @@ public interface RealMatrix extends AnyMatrix { * @param endColumn Final column index (inclusive) * @return The subMatrix containing the data of the * specified rows and columns - * @throws org.apache.commons.math.exception.OutOfRangeException if + * @throws org.apache.commons.math3.exception.OutOfRangeException if * the indices are not valid. */ RealMatrix getSubMatrix(int startRow, int endRow, int startColumn, int endColumn); @@ -160,7 +160,7 @@ public interface RealMatrix extends AnyMatrix { * @param selectedColumns Array of column indices. * @return The subMatrix containing the data in the * specified rows and columns - * @throws org.apache.commons.math.exception.OutOfRangeException if + * @throws org.apache.commons.math3.exception.OutOfRangeException if * the indices are not valid. */ RealMatrix getSubMatrix(int[] selectedRows, int[] selectedColumns); @@ -175,7 +175,7 @@ public interface RealMatrix extends AnyMatrix { * @param endColumn Final column index (inclusive) * @param destination The arrays where the submatrix data should be copied * (if larger than rows/columns counts, only the upper-left part will be used) - * @throws org.apache.commons.math.exception.OutOfRangeException if the + * @throws org.apache.commons.math3.exception.OutOfRangeException if the * indices are not valid. * @exception IllegalArgumentException if the destination array is too small */ @@ -189,7 +189,7 @@ public interface RealMatrix extends AnyMatrix { * @param selectedColumns Array of column indices. * @param destination The arrays where the submatrix data should be copied * (if larger than rows/columns counts, only the upper-left part will be used) - * @throws org.apache.commons.math.exception.OutOfRangeException if the + * @throws org.apache.commons.math3.exception.OutOfRangeException if the * indices are not valid. * @exception IllegalArgumentException if the destination array is too small */ @@ -232,7 +232,7 @@ public interface RealMatrix extends AnyMatrix { * * @param row Row to be fetched. * @return row Matrix. - * @throws org.apache.commons.math.exception.OutOfRangeException if + * @throws org.apache.commons.math3.exception.OutOfRangeException if * the specified row index is invalid. */ RealMatrix getRowMatrix(int row); @@ -244,7 +244,7 @@ public interface RealMatrix extends AnyMatrix { * @param row Row to be set. * @param matrix Row matrix (must have one row and the same number of * columns as the instance). - * @throws org.apache.commons.math.exception.OutOfRangeException if the + * @throws org.apache.commons.math3.exception.OutOfRangeException if the * specified row index is invalid. * @throws MatrixDimensionMismatchException * if the matrix dimensions do not match one instance row. @@ -257,7 +257,7 @@ public interface RealMatrix extends AnyMatrix { * * @param column Column to be fetched. * @return column Matrix. - * @throws org.apache.commons.math.exception.OutOfRangeException if + * @throws org.apache.commons.math3.exception.OutOfRangeException if * the specified column index is invalid. */ RealMatrix getColumnMatrix(int column); @@ -269,7 +269,7 @@ public interface RealMatrix extends AnyMatrix { * @param column Column to be set. * @param matrix Column matrix (must have one column and the same number * of rows as the instance). - * @throws org.apache.commons.math.exception.OutOfRangeException if + * @throws org.apache.commons.math3.exception.OutOfRangeException if * the specified column index is invalid. * @throws MatrixDimensionMismatchException * if the {@code matrix} dimensions do not match one instance column. @@ -282,7 +282,7 @@ public interface RealMatrix extends AnyMatrix { * * @param row Row to be fetched. * @return a row vector. - * @throws org.apache.commons.math.exception.OutOfRangeException if + * @throws org.apache.commons.math3.exception.OutOfRangeException if * the specified row index is invalid. */ RealVector getRowVector(int row); @@ -294,7 +294,7 @@ public interface RealMatrix extends AnyMatrix { * @param row Row to be set. * @param vector row vector (must have the same number of columns * as the instance). - * @throws org.apache.commons.math.exception.OutOfRangeException if + * @throws org.apache.commons.math3.exception.OutOfRangeException if * the specified row index is invalid. * @throws MatrixDimensionMismatchException * if the vector dimension does not match one instance row. @@ -307,7 +307,7 @@ public interface RealMatrix extends AnyMatrix { * * @param column Column to be fetched. * @return a column vector. - * @throws org.apache.commons.math.exception.OutOfRangeException if + * @throws org.apache.commons.math3.exception.OutOfRangeException if * the specified column index is invalid */ RealVector getColumnVector(int column); @@ -319,7 +319,7 @@ public interface RealMatrix extends AnyMatrix { * @param column Column to be set. * @param vector column vector (must have the same number of rows as * the instance). - * @throws org.apache.commons.math.exception.OutOfRangeException if the + * @throws org.apache.commons.math3.exception.OutOfRangeException if the * specified column index is invalid. * @throws MatrixDimensionMismatchException * if the vector dimension does not match one instance column. @@ -332,7 +332,7 @@ public interface RealMatrix extends AnyMatrix { * * @param row Row to be fetched. * @return the array of entries in the row. - * @throws org.apache.commons.math.exception.OutOfRangeException if the + * @throws org.apache.commons.math3.exception.OutOfRangeException if the * specified row index is not valid. */ double[] getRow(int row); @@ -344,7 +344,7 @@ public interface RealMatrix extends AnyMatrix { * @param row Row to be set. * @param array Row matrix (must have the same number of columns as * the instance) - * @throws org.apache.commons.math.exception.OutOfRangeException if the + * @throws org.apache.commons.math3.exception.OutOfRangeException if the * specified row index is invalid. * @throws MatrixDimensionMismatchException * if the array size does not match one instance row. @@ -357,7 +357,7 @@ public interface RealMatrix extends AnyMatrix { * * @param column Column to be fetched. * @return the array of entries in the column. - * @throws org.apache.commons.math.exception.OutOfRangeException if the + * @throws org.apache.commons.math3.exception.OutOfRangeException if the * specified column index is not valid. */ double[] getColumn(int column); @@ -369,7 +369,7 @@ public interface RealMatrix extends AnyMatrix { * @param column Column to be set. * @param array Column array (must have the same number of rows as * the instance). - * @throws org.apache.commons.math.exception.OutOfRangeException if the + * @throws org.apache.commons.math3.exception.OutOfRangeException if the * specified column index is invalid. * @throws MatrixDimensionMismatchException * if the array size does not match one instance column. @@ -383,7 +383,7 @@ public interface RealMatrix extends AnyMatrix { * @param row Row location of entry to be fetched. * @param column Column location of entry to be fetched. * @return the matrix entry at {@code (row, column)}. - * @throws org.apache.commons.math.exception.OutOfRangeException if the + * @throws org.apache.commons.math3.exception.OutOfRangeException if the * row or column index is not valid. */ double getEntry(int row, int column); @@ -395,7 +395,7 @@ public interface RealMatrix extends AnyMatrix { * @param row Row location of entry to be set. * @param column Column location of entry to be set. * @param value matrix entry to be set. - * @throws org.apache.commons.math.exception.OutOfRangeException if + * @throws org.apache.commons.math3.exception.OutOfRangeException if * the row or column index is not valid * @since 2.0 */ @@ -408,7 +408,7 @@ public interface RealMatrix extends AnyMatrix { * @param row Row location of entry to be set. * @param column Column location of entry to be set. * @param increment value to add to the matrix entry. - * @throws org.apache.commons.math.exception.OutOfRangeException if + * @throws org.apache.commons.math3.exception.OutOfRangeException if * the row or column index is not valid. * @since 2.0 */ @@ -421,7 +421,7 @@ public interface RealMatrix extends AnyMatrix { * @param row Row location of entry to be set. * @param column Column location of entry to be set. * @param factor Multiplication factor for the matrix entry. - * @throws org.apache.commons.math.exception.OutOfRangeException if + * @throws org.apache.commons.math3.exception.OutOfRangeException if * the row or column index is not valid. * @since 2.0 */ @@ -534,7 +534,7 @@ public interface RealMatrix extends AnyMatrix { * @param endRow Final row index (inclusive) * @param startColumn Initial column index * @param endColumn Final column index - * @throws org.apache.commons.math.exception.OutOfRangeException if + * @throws org.apache.commons.math3.exception.OutOfRangeException if * the indices are not valid. * @see #walkInRowOrder(RealMatrixChangingVisitor) * @see #walkInRowOrder(RealMatrixPreservingVisitor) @@ -563,7 +563,7 @@ public interface RealMatrix extends AnyMatrix { * @param endRow Final row index (inclusive) * @param startColumn Initial column index * @param endColumn Final column index - * @throws org.apache.commons.math.exception.OutOfRangeException if + * @throws org.apache.commons.math3.exception.OutOfRangeException if * the indices are not valid. * @see #walkInRowOrder(RealMatrixChangingVisitor) * @see #walkInRowOrder(RealMatrixPreservingVisitor) @@ -636,7 +636,7 @@ public interface RealMatrix extends AnyMatrix { * @param endRow Final row index (inclusive) * @param startColumn Initial column index * @param endColumn Final column index - * @throws org.apache.commons.math.exception.OutOfRangeException if + * @throws org.apache.commons.math3.exception.OutOfRangeException if * the indices are not valid. * @see #walkInRowOrder(RealMatrixChangingVisitor) * @see #walkInRowOrder(RealMatrixPreservingVisitor) @@ -665,7 +665,7 @@ public interface RealMatrix extends AnyMatrix { * @param endRow Final row index (inclusive) * @param startColumn Initial column index * @param endColumn Final column index - * @throws org.apache.commons.math.exception.OutOfRangeException if + * @throws org.apache.commons.math3.exception.OutOfRangeException if * the indices are not valid. * @see #walkInRowOrder(RealMatrixChangingVisitor) * @see #walkInRowOrder(RealMatrixPreservingVisitor) @@ -735,7 +735,7 @@ public interface RealMatrix extends AnyMatrix { * @param endRow Final row index (inclusive) * @param startColumn Initial column index * @param endColumn Final column index (inclusive) - * @throws org.apache.commons.math.exception.OutOfRangeException if + * @throws org.apache.commons.math3.exception.OutOfRangeException if * the indices are not valid. * @see #walkInRowOrder(RealMatrixChangingVisitor) * @see #walkInRowOrder(RealMatrixPreservingVisitor) @@ -763,7 +763,7 @@ public interface RealMatrix extends AnyMatrix { * @param endRow Final row index (inclusive) * @param startColumn Initial column index * @param endColumn Final column index (inclusive) - * @throws org.apache.commons.math.exception.OutOfRangeException if the + * @throws org.apache.commons.math3.exception.OutOfRangeException if the * indices are not valid. * @see #walkInRowOrder(RealMatrixChangingVisitor) * @see #walkInRowOrder(RealMatrixPreservingVisitor) diff --git a/src/main/java/org/apache/commons/math/linear/RealMatrixChangingVisitor.java b/src/main/java/org/apache/commons/math3/linear/RealMatrixChangingVisitor.java similarity index 98% rename from src/main/java/org/apache/commons/math/linear/RealMatrixChangingVisitor.java rename to src/main/java/org/apache/commons/math3/linear/RealMatrixChangingVisitor.java index 1f9f88ecc..f335bb1ee 100644 --- a/src/main/java/org/apache/commons/math/linear/RealMatrixChangingVisitor.java +++ b/src/main/java/org/apache/commons/math3/linear/RealMatrixChangingVisitor.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; /** * Interface defining a visitor for matrix entries. diff --git a/src/main/java/org/apache/commons/math/linear/RealMatrixPreservingVisitor.java b/src/main/java/org/apache/commons/math3/linear/RealMatrixPreservingVisitor.java similarity index 97% rename from src/main/java/org/apache/commons/math/linear/RealMatrixPreservingVisitor.java rename to src/main/java/org/apache/commons/math3/linear/RealMatrixPreservingVisitor.java index dbae91e4a..0d485c362 100644 --- a/src/main/java/org/apache/commons/math/linear/RealMatrixPreservingVisitor.java +++ b/src/main/java/org/apache/commons/math3/linear/RealMatrixPreservingVisitor.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; /** * Interface defining a visitor for matrix entries. diff --git a/src/main/java/org/apache/commons/math/linear/RealVector.java b/src/main/java/org/apache/commons/math3/linear/RealVector.java similarity index 95% rename from src/main/java/org/apache/commons/math/linear/RealVector.java rename to src/main/java/org/apache/commons/math3/linear/RealVector.java index 886ddbc25..91b089e03 100644 --- a/src/main/java/org/apache/commons/math/linear/RealVector.java +++ b/src/main/java/org/apache/commons/math3/linear/RealVector.java @@ -15,22 +15,22 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; import java.util.Iterator; import java.util.NoSuchElementException; -import org.apache.commons.math.exception.MathUnsupportedOperationException; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.OutOfRangeException; -import org.apache.commons.math.exception.MathArithmeticException; -import org.apache.commons.math.analysis.FunctionUtils; -import org.apache.commons.math.analysis.function.Add; -import org.apache.commons.math.analysis.function.Multiply; -import org.apache.commons.math.analysis.function.Divide; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.MathUnsupportedOperationException; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.OutOfRangeException; +import org.apache.commons.math3.exception.MathArithmeticException; +import org.apache.commons.math3.analysis.FunctionUtils; +import org.apache.commons.math3.analysis.function.Add; +import org.apache.commons.math3.analysis.function.Multiply; +import org.apache.commons.math3.analysis.function.Divide; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.util.FastMath; /** * Class defining a real-valued vector with basic algebraic operations. @@ -68,7 +68,7 @@ public abstract class RealVector { * * @param index Index location of entry to be fetched. * @return the vector entry at {@code index}. - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the index is not valid. * @see #setEntry(int, double) */ @@ -79,7 +79,7 @@ public abstract class RealVector { * * @param index element index. * @param value new value for the element. - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the index is not valid. * @see #getEntry(int) */ @@ -90,7 +90,7 @@ public abstract class RealVector { * * @param index Index location of entry to be set. * @param increment Value to add to the vector entry. - * @throws org.apache.commons.math.exception.OutOfRangeException if + * @throws org.apache.commons.math3.exception.OutOfRangeException if * the index is not valid. * @since 3.0 */ @@ -120,7 +120,7 @@ public abstract class RealVector { * @param index index of first element. * @param n number of elements to be retrieved. * @return a vector containing n elements. - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the index is not valid. */ public abstract RealVector getSubVector(int index, int n); @@ -130,7 +130,7 @@ public abstract class RealVector { * * @param index index of first element to be set. * @param v vector containing the values to set. - * @throws org.apache.commons.math.exception.OutOfRangeException + * @throws org.apache.commons.math3.exception.OutOfRangeException * if the index is not valid. */ public abstract void setSubVector(int index, RealVector v); @@ -196,7 +196,7 @@ public abstract class RealVector { * * @param v Vector to be added. * @return {@code this} + {@code v}. - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if {@code v} is not the same size as this vector. */ public RealVector add(RealVector v) { @@ -216,7 +216,7 @@ public abstract class RealVector { * * @param v Vector to be subtracted. * @return {@code this} - {@code v}. - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if {@code v} is not the same size as this vector. */ public RealVector subtract(RealVector v) { @@ -267,7 +267,7 @@ public abstract class RealVector { * * @param v Vector with which dot product should be computed * @return the scalar dot product between this instance and {@code v}. - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if {@code v} is not the same size as this vector. */ public double dotProduct(RealVector v) { @@ -304,7 +304,7 @@ public abstract class RealVector { * * @param v Vector by which instance elements must be divided. * @return a vector containing this[i] / v[i] for all i. - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if {@code v} is not the same size as this vector. */ public abstract RealVector ebeDivide(RealVector v); @@ -314,7 +314,7 @@ public abstract class RealVector { * * @param v Vector by which instance elements must be multiplied * @return a vector containing this[i] * v[i] for all i. - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if {@code v} is not the same size as this vector. */ public abstract RealVector ebeMultiply(RealVector v); @@ -327,7 +327,7 @@ public abstract class RealVector { * * @param v Vector to which distance is requested. * @return the distance between two vectors. - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if {@code v} is not the same size as this vector. * @see #getL1Distance(RealVector) * @see #getLInfDistance(RealVector) @@ -414,7 +414,7 @@ public abstract class RealVector { * * @param v Vector to which distance is requested. * @return the distance between two vectors. - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if {@code v} is not the same size as this vector. */ public double getL1Distance(RealVector v) { @@ -436,7 +436,7 @@ public abstract class RealVector { * * @param v Vector to which distance is requested. * @return the distance between two vectors. - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if {@code v} is not the same size as this vector. * @see #getDistance(RealVector) * @see #getL1Distance(RealVector) @@ -617,7 +617,7 @@ public abstract class RealVector { * * @param v vector onto which instance must be projected. * @return projection of the instance onto {@code v}. - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if {@code v} is not the same size as this vector. */ public abstract RealVector projection(RealVector v); @@ -668,7 +668,7 @@ public abstract class RealVector { * Converts this vector into a unit vector. * The instance itself is changed by this method. * - * @throws org.apache.commons.math.exception.MathArithmeticException + * @throws org.apache.commons.math3.exception.MathArithmeticException * if the norm is zero. */ public void unitize() { @@ -770,7 +770,7 @@ public abstract class RealVector { * @param y Vector with which {@code this} is linearly combined. * @return a vector containing {@code a * this[i] + b * y[i]} for all * {@code i}. - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if {@code y} is not the same size as this vector. */ public RealVector combine(double a, double b, RealVector y) { @@ -786,7 +786,7 @@ public abstract class RealVector { * @param y Vector with which {@code this} is linearly combined. * @return {@code this}, with components equal to * {@code a * this[i] + b * y[i]} for all {@code i}. - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if {@code y} is not the same size as this vector. */ public RealVector combineToSelf(double a, double b, RealVector y) { diff --git a/src/main/java/org/apache/commons/math/linear/RealVectorFormat.java b/src/main/java/org/apache/commons/math3/linear/RealVectorFormat.java similarity index 98% rename from src/main/java/org/apache/commons/math/linear/RealVectorFormat.java rename to src/main/java/org/apache/commons/math3/linear/RealVectorFormat.java index 97ab5968e..f1039a04d 100644 --- a/src/main/java/org/apache/commons/math/linear/RealVectorFormat.java +++ b/src/main/java/org/apache/commons/math3/linear/RealVectorFormat.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; import java.text.FieldPosition; import java.text.NumberFormat; @@ -24,8 +24,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import org.apache.commons.math.exception.MathParseException; -import org.apache.commons.math.util.CompositeFormat; +import org.apache.commons.math3.exception.MathParseException; +import org.apache.commons.math3.util.CompositeFormat; /** * Formats a vector in components list format "{v0; v1; ...; vk-1}". diff --git a/src/main/java/org/apache/commons/math/linear/RectangularCholeskyDecomposition.java b/src/main/java/org/apache/commons/math3/linear/RectangularCholeskyDecomposition.java similarity index 97% rename from src/main/java/org/apache/commons/math/linear/RectangularCholeskyDecomposition.java rename to src/main/java/org/apache/commons/math3/linear/RectangularCholeskyDecomposition.java index 24a91e174..38584d420 100644 --- a/src/main/java/org/apache/commons/math/linear/RectangularCholeskyDecomposition.java +++ b/src/main/java/org/apache/commons/math3/linear/RectangularCholeskyDecomposition.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.util.FastMath; /** * Calculates the rectangular Cholesky decomposition of a matrix. @@ -29,7 +29,7 @@ import org.apache.commons.math.util.FastMath; * is that rows/columns may be permuted (hence the rectangular shape instead * of the traditional triangular shape) and there is a threshold to ignore * small diagonal elements. This is used for example to generate {@link - * org.apache.commons.math.random.CorrelatedRandomVectorGenerator correlated + * org.apache.commons.math3.random.CorrelatedRandomVectorGenerator correlated * random n-dimensions vectors} in a p-dimension subspace (p < n). * In other words, it allows generating random vectors from a covariance * matrix that is only positive semidefinite, and not positive definite.

    diff --git a/src/main/java/org/apache/commons/math/linear/SingularMatrixException.java b/src/main/java/org/apache/commons/math3/linear/SingularMatrixException.java similarity index 87% rename from src/main/java/org/apache/commons/math/linear/SingularMatrixException.java rename to src/main/java/org/apache/commons/math3/linear/SingularMatrixException.java index 868d09df1..2f18eee12 100644 --- a/src/main/java/org/apache/commons/math/linear/SingularMatrixException.java +++ b/src/main/java/org/apache/commons/math3/linear/SingularMatrixException.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** * Exception to be thrown when a non-singular matrix is expected. diff --git a/src/main/java/org/apache/commons/math/linear/SingularOperatorException.java b/src/main/java/org/apache/commons/math3/linear/SingularOperatorException.java similarity index 87% rename from src/main/java/org/apache/commons/math/linear/SingularOperatorException.java rename to src/main/java/org/apache/commons/math3/linear/SingularOperatorException.java index 55b1e5fa0..3bd7ba958 100644 --- a/src/main/java/org/apache/commons/math/linear/SingularOperatorException.java +++ b/src/main/java/org/apache/commons/math3/linear/SingularOperatorException.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** * Exception to be thrown when trying to invert a singular operator. diff --git a/src/main/java/org/apache/commons/math/linear/SingularValueDecomposition.java b/src/main/java/org/apache/commons/math3/linear/SingularValueDecomposition.java similarity index 98% rename from src/main/java/org/apache/commons/math/linear/SingularValueDecomposition.java rename to src/main/java/org/apache/commons/math3/linear/SingularValueDecomposition.java index c80c22e9f..ba2ed14c3 100644 --- a/src/main/java/org/apache/commons/math/linear/SingularValueDecomposition.java +++ b/src/main/java/org/apache/commons/math3/linear/SingularValueDecomposition.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; -import org.apache.commons.math.exception.NumberIsTooLargeException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.util.FastMath; -import org.apache.commons.math.util.Precision; +import org.apache.commons.math3.exception.NumberIsTooLargeException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math3.util.Precision; /** * Calculates the compact Singular Value Decomposition of a matrix. @@ -692,7 +692,7 @@ public class SingularValueDecomposition { *

    * @param b Right-hand side of the equation A × X = B * @return a vector X that minimizes the two norm of A × X - B - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if the matrices dimensions do not match. */ public RealVector solve(final RealVector b) { @@ -708,7 +708,7 @@ public class SingularValueDecomposition { * * @param b Right-hand side of the equation A × X = B * @return a matrix X that minimizes the two norm of A × X - B - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if the matrices dimensions do not match. */ public RealMatrix solve(final RealMatrix b) { diff --git a/src/main/java/org/apache/commons/math/linear/SparseFieldMatrix.java b/src/main/java/org/apache/commons/math3/linear/SparseFieldMatrix.java similarity index 95% rename from src/main/java/org/apache/commons/math/linear/SparseFieldMatrix.java rename to src/main/java/org/apache/commons/math3/linear/SparseFieldMatrix.java index acf8c0ae5..73a425906 100644 --- a/src/main/java/org/apache/commons/math/linear/SparseFieldMatrix.java +++ b/src/main/java/org/apache/commons/math3/linear/SparseFieldMatrix.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; -import org.apache.commons.math.Field; -import org.apache.commons.math.FieldElement; -import org.apache.commons.math.util.OpenIntToFieldHashMap; +import org.apache.commons.math3.Field; +import org.apache.commons.math3.FieldElement; +import org.apache.commons.math3.util.OpenIntToFieldHashMap; /** * Sparse matrix implementation based on an open addressed map. @@ -55,7 +55,7 @@ public class SparseFieldMatrix> extends AbstractFieldM * @param field Field to which the elements belong. * @param rowDimension Number of rows in the new matrix. * @param columnDimension Number of columns in the new matrix. - * @throws org.apache.commons.math.exception.NotStrictlyPositiveException + * @throws org.apache.commons.math3.exception.NotStrictlyPositiveException * if row or column dimension is not positive. */ public SparseFieldMatrix(final Field field, diff --git a/src/main/java/org/apache/commons/math/linear/SparseFieldVector.java b/src/main/java/org/apache/commons/math3/linear/SparseFieldVector.java similarity index 98% rename from src/main/java/org/apache/commons/math/linear/SparseFieldVector.java rename to src/main/java/org/apache/commons/math3/linear/SparseFieldVector.java index d3d84e92c..99bb9ab7b 100644 --- a/src/main/java/org/apache/commons/math/linear/SparseFieldVector.java +++ b/src/main/java/org/apache/commons/math3/linear/SparseFieldVector.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; import java.io.Serializable; import java.lang.reflect.Array; -import org.apache.commons.math.Field; -import org.apache.commons.math.FieldElement; -import org.apache.commons.math.exception.OutOfRangeException; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.util.OpenIntToFieldHashMap; +import org.apache.commons.math3.Field; +import org.apache.commons.math3.FieldElement; +import org.apache.commons.math3.exception.OutOfRangeException; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.util.OpenIntToFieldHashMap; /** * This class implements the {@link FieldVector} interface with a {@link OpenIntToFieldHashMap} backing store. diff --git a/src/main/java/org/apache/commons/math/linear/SparseRealMatrix.java b/src/main/java/org/apache/commons/math3/linear/SparseRealMatrix.java similarity index 96% rename from src/main/java/org/apache/commons/math/linear/SparseRealMatrix.java rename to src/main/java/org/apache/commons/math3/linear/SparseRealMatrix.java index 7976730fd..0f4af780b 100644 --- a/src/main/java/org/apache/commons/math/linear/SparseRealMatrix.java +++ b/src/main/java/org/apache/commons/math3/linear/SparseRealMatrix.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; /** * Marker interface for {@link RealMatrix} implementations that require sparse backing storage diff --git a/src/main/java/org/apache/commons/math/linear/SparseRealVector.java b/src/main/java/org/apache/commons/math3/linear/SparseRealVector.java similarity index 95% rename from src/main/java/org/apache/commons/math/linear/SparseRealVector.java rename to src/main/java/org/apache/commons/math3/linear/SparseRealVector.java index b2c9cc90c..388f527a7 100644 --- a/src/main/java/org/apache/commons/math/linear/SparseRealVector.java +++ b/src/main/java/org/apache/commons/math3/linear/SparseRealVector.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; /** * Marker class for RealVectors that require sparse backing storage diff --git a/src/main/java/org/apache/commons/math/linear/SymmLQ.java b/src/main/java/org/apache/commons/math3/linear/SymmLQ.java similarity index 98% rename from src/main/java/org/apache/commons/math/linear/SymmLQ.java rename to src/main/java/org/apache/commons/math3/linear/SymmLQ.java index 77f65f651..f27d27078 100644 --- a/src/main/java/org/apache/commons/math/linear/SymmLQ.java +++ b/src/main/java/org/apache/commons/math3/linear/SymmLQ.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.MaxCountExceededException; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.exception.util.ExceptionContext; -import org.apache.commons.math.util.FastMath; -import org.apache.commons.math.util.IterationManager; -import org.apache.commons.math.util.MathUtils; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.MaxCountExceededException; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.exception.util.ExceptionContext; +import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math3.util.IterationManager; +import org.apache.commons.math3.util.MathUtils; /** *

    @@ -932,7 +932,7 @@ public class SymmLQ * dimensions inconsistent with {@code a} * @throws MaxCountExceededException at exhaustion of the iteration count, * unless a custom - * {@link org.apache.commons.math.util.Incrementor.MaxCountExceededCallback callback} + * {@link org.apache.commons.math3.util.Incrementor.MaxCountExceededCallback callback} * has been set at construction * @throws NonSelfAdjointOperatorException if {@link #getCheck()} is * {@code true}, and {@code a} or {@code minv} is not self-adjoint @@ -1020,7 +1020,7 @@ public class SymmLQ * inconsistent with {@code a} * @throws MaxCountExceededException at exhaustion of the iteration count, * unless a custom - * {@link org.apache.commons.math.util.Incrementor.MaxCountExceededCallback callback} + * {@link org.apache.commons.math3.util.Incrementor.MaxCountExceededCallback callback} * has been set at construction * @throws NonSelfAdjointOperatorException if {@link #getCheck()} is * {@code true}, and {@code a} is not self-adjoint @@ -1112,7 +1112,7 @@ public class SymmLQ * {@code x} have dimensions inconsistent with {@code a}. * @throws MaxCountExceededException at exhaustion of the iteration count, * unless a custom - * {@link org.apache.commons.math.util.Incrementor.MaxCountExceededCallback callback} + * {@link org.apache.commons.math3.util.Incrementor.MaxCountExceededCallback callback} * has been set at construction * @throws NonSelfAdjointOperatorException if {@link #getCheck()} is * {@code true}, and {@code a} or {@code minv} is not self-adjoint diff --git a/src/main/java/org/apache/commons/math/linear/TriDiagonalTransformer.java b/src/main/java/org/apache/commons/math3/linear/TriDiagonalTransformer.java similarity index 99% rename from src/main/java/org/apache/commons/math/linear/TriDiagonalTransformer.java rename to src/main/java/org/apache/commons/math3/linear/TriDiagonalTransformer.java index bf9b51376..601682567 100644 --- a/src/main/java/org/apache/commons/math/linear/TriDiagonalTransformer.java +++ b/src/main/java/org/apache/commons/math3/linear/TriDiagonalTransformer.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; import java.util.Arrays; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.util.FastMath; /** diff --git a/src/main/java/org/apache/commons/math/linear/package-info.java b/src/main/java/org/apache/commons/math3/linear/package-info.java similarity index 95% rename from src/main/java/org/apache/commons/math/linear/package-info.java rename to src/main/java/org/apache/commons/math3/linear/package-info.java index 4250cc372..4c989b8b5 100644 --- a/src/main/java/org/apache/commons/math/linear/package-info.java +++ b/src/main/java/org/apache/commons/math3/linear/package-info.java @@ -17,4 +17,4 @@ /** * Linear algebra support. */ -package org.apache.commons.math.linear; +package org.apache.commons.math3.linear; diff --git a/src/main/java/org/apache/commons/math/ode/AbstractIntegrator.java b/src/main/java/org/apache/commons/math3/ode/AbstractIntegrator.java similarity index 93% rename from src/main/java/org/apache/commons/math/ode/AbstractIntegrator.java rename to src/main/java/org/apache/commons/math3/ode/AbstractIntegrator.java index 9d38c2afc..0aadb15ad 100644 --- a/src/main/java/org/apache/commons/math/ode/AbstractIntegrator.java +++ b/src/main/java/org/apache/commons/math3/ode/AbstractIntegrator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.ode; +package org.apache.commons.math3.ode; import java.util.ArrayList; import java.util.Collection; @@ -26,21 +26,21 @@ import java.util.List; import java.util.SortedSet; import java.util.TreeSet; -import org.apache.commons.math.analysis.solvers.BracketingNthOrderBrentSolver; -import org.apache.commons.math.analysis.solvers.UnivariateSolver; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.MathIllegalStateException; -import org.apache.commons.math.exception.MaxCountExceededException; -import org.apache.commons.math.exception.NumberIsTooSmallException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.ode.events.EventHandler; -import org.apache.commons.math.ode.events.EventState; -import org.apache.commons.math.ode.sampling.AbstractStepInterpolator; -import org.apache.commons.math.ode.sampling.StepHandler; -import org.apache.commons.math.util.FastMath; -import org.apache.commons.math.util.Incrementor; -import org.apache.commons.math.util.Precision; +import org.apache.commons.math3.analysis.solvers.BracketingNthOrderBrentSolver; +import org.apache.commons.math3.analysis.solvers.UnivariateSolver; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.MathIllegalStateException; +import org.apache.commons.math3.exception.MaxCountExceededException; +import org.apache.commons.math3.exception.NumberIsTooSmallException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.ode.events.EventHandler; +import org.apache.commons.math3.ode.events.EventState; +import org.apache.commons.math3.ode.sampling.AbstractStepInterpolator; +import org.apache.commons.math3.ode.sampling.StepHandler; +import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math3.util.Incrementor; +import org.apache.commons.math3.util.Precision; /** * Base class managing common boilerplate for all integrators. diff --git a/src/main/java/org/apache/commons/math/ode/AbstractParameterizable.java b/src/main/java/org/apache/commons/math3/ode/AbstractParameterizable.java similarity index 93% rename from src/main/java/org/apache/commons/math/ode/AbstractParameterizable.java rename to src/main/java/org/apache/commons/math3/ode/AbstractParameterizable.java index 4766aa23e..644592408 100644 --- a/src/main/java/org/apache/commons/math/ode/AbstractParameterizable.java +++ b/src/main/java/org/apache/commons/math3/ode/AbstractParameterizable.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.ode; +package org.apache.commons.math3.ode; import java.util.ArrayList; import java.util.Collection; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** This abstract class provides boilerplate parameters list. * diff --git a/src/main/java/org/apache/commons/math/ode/ContinuousOutputModel.java b/src/main/java/org/apache/commons/math3/ode/ContinuousOutputModel.java similarity index 96% rename from src/main/java/org/apache/commons/math/ode/ContinuousOutputModel.java rename to src/main/java/org/apache/commons/math3/ode/ContinuousOutputModel.java index b240206d8..4ea4e458b 100644 --- a/src/main/java/org/apache/commons/math/ode/ContinuousOutputModel.java +++ b/src/main/java/org/apache/commons/math3/ode/ContinuousOutputModel.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package org.apache.commons.math.ode; +package org.apache.commons.math3.ode; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.ode.sampling.StepHandler; -import org.apache.commons.math.ode.sampling.StepInterpolator; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.ode.sampling.StepHandler; +import org.apache.commons.math3.ode.sampling.StepInterpolator; +import org.apache.commons.math3.util.FastMath; /** * This class stores all information provided by an ODE integrator @@ -77,7 +77,7 @@ import org.apache.commons.math.util.FastMath; * ContinuousOutputModel instance can be important if the state vector * is large, if the integration interval is long or if the steps are * small (which can result from small tolerance settings in {@link - * org.apache.commons.math.ode.nonstiff.AdaptiveStepsizeIntegrator adaptive + * org.apache.commons.math3.ode.nonstiff.AdaptiveStepsizeIntegrator adaptive * step size integrators}).

    * * @see StepHandler diff --git a/src/main/java/org/apache/commons/math/ode/EquationsMapper.java b/src/main/java/org/apache/commons/math3/ode/EquationsMapper.java similarity index 97% rename from src/main/java/org/apache/commons/math/ode/EquationsMapper.java rename to src/main/java/org/apache/commons/math3/ode/EquationsMapper.java index 5972c669b..a5289dc4a 100644 --- a/src/main/java/org/apache/commons/math/ode/EquationsMapper.java +++ b/src/main/java/org/apache/commons/math3/ode/EquationsMapper.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.math.ode; +package org.apache.commons.math3.ode; import java.io.Serializable; -import org.apache.commons.math.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.DimensionMismatchException; /** * Class mapping the part of a complete state or derivative that pertains diff --git a/src/main/java/org/apache/commons/math/ode/ExpandableStatefulODE.java b/src/main/java/org/apache/commons/math3/ode/ExpandableStatefulODE.java similarity index 99% rename from src/main/java/org/apache/commons/math/ode/ExpandableStatefulODE.java rename to src/main/java/org/apache/commons/math3/ode/ExpandableStatefulODE.java index e05770564..167f87a06 100644 --- a/src/main/java/org/apache/commons/math/ode/ExpandableStatefulODE.java +++ b/src/main/java/org/apache/commons/math3/ode/ExpandableStatefulODE.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.ode; +package org.apache.commons.math3.ode; import java.util.ArrayList; import java.util.List; -import org.apache.commons.math.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.DimensionMismatchException; /** diff --git a/src/main/java/org/apache/commons/math/ode/FirstOrderConverter.java b/src/main/java/org/apache/commons/math3/ode/FirstOrderConverter.java similarity index 99% rename from src/main/java/org/apache/commons/math/ode/FirstOrderConverter.java rename to src/main/java/org/apache/commons/math3/ode/FirstOrderConverter.java index 709dc2c73..e47be5dd4 100644 --- a/src/main/java/org/apache/commons/math/ode/FirstOrderConverter.java +++ b/src/main/java/org/apache/commons/math3/ode/FirstOrderConverter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.ode; +package org.apache.commons.math3.ode; /** This class converts second order differential equations to first diff --git a/src/main/java/org/apache/commons/math/ode/FirstOrderDifferentialEquations.java b/src/main/java/org/apache/commons/math3/ode/FirstOrderDifferentialEquations.java similarity index 98% rename from src/main/java/org/apache/commons/math/ode/FirstOrderDifferentialEquations.java rename to src/main/java/org/apache/commons/math3/ode/FirstOrderDifferentialEquations.java index 54b965fab..0c76a1866 100644 --- a/src/main/java/org/apache/commons/math/ode/FirstOrderDifferentialEquations.java +++ b/src/main/java/org/apache/commons/math3/ode/FirstOrderDifferentialEquations.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.ode; +package org.apache.commons.math3.ode; diff --git a/src/main/java/org/apache/commons/math/ode/FirstOrderIntegrator.java b/src/main/java/org/apache/commons/math3/ode/FirstOrderIntegrator.java similarity index 87% rename from src/main/java/org/apache/commons/math/ode/FirstOrderIntegrator.java rename to src/main/java/org/apache/commons/math3/ode/FirstOrderIntegrator.java index b2e01a13b..38bbf4d9e 100644 --- a/src/main/java/org/apache/commons/math/ode/FirstOrderIntegrator.java +++ b/src/main/java/org/apache/commons/math3/ode/FirstOrderIntegrator.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.ode; +package org.apache.commons.math3.ode; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.MathIllegalStateException; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.MathIllegalStateException; /** This interface represents a first order integrator for * differential equations. @@ -29,8 +29,8 @@ import org.apache.commons.math.exception.MathIllegalStateException; * FirstOrderDifferentialEquations} interface.

    * * @see FirstOrderDifferentialEquations - * @see org.apache.commons.math.ode.sampling.StepHandler - * @see org.apache.commons.math.ode.events.EventHandler + * @see org.apache.commons.math3.ode.sampling.StepHandler + * @see org.apache.commons.math3.ode.events.EventHandler * @version $Id$ * @since 1.2 */ @@ -51,7 +51,7 @@ public interface FirstOrderIntegrator extends ODEIntegrator { * step (and hence at the end of integration), can be the same object as y0 * @return stop time, will be the same as target time if integration reached its * target, but may be different if some {@link - * org.apache.commons.math.ode.events.EventHandler} stops it at some point. + * org.apache.commons.math3.ode.events.EventHandler} stops it at some point. * @throws MathIllegalStateException if the integrator cannot perform integration * @throws MathIllegalArgumentException if integration parameters are wrong (typically * too small integration span) diff --git a/src/main/java/org/apache/commons/math/ode/JacobianMatrices.java b/src/main/java/org/apache/commons/math3/ode/JacobianMatrices.java similarity index 98% rename from src/main/java/org/apache/commons/math/ode/JacobianMatrices.java rename to src/main/java/org/apache/commons/math3/ode/JacobianMatrices.java index 03aceb1e4..fd7c1139d 100644 --- a/src/main/java/org/apache/commons/math/ode/JacobianMatrices.java +++ b/src/main/java/org/apache/commons/math3/ode/JacobianMatrices.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.ode; +package org.apache.commons.math3.ode; import java.lang.reflect.Array; import java.util.ArrayList; import java.util.List; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** * This class defines a set of {@link SecondaryEquations secondary equations} to diff --git a/src/main/java/org/apache/commons/math/ode/MainStateJacobianProvider.java b/src/main/java/org/apache/commons/math3/ode/MainStateJacobianProvider.java similarity index 97% rename from src/main/java/org/apache/commons/math/ode/MainStateJacobianProvider.java rename to src/main/java/org/apache/commons/math3/ode/MainStateJacobianProvider.java index 10b43e7a4..516acc130 100644 --- a/src/main/java/org/apache/commons/math/ode/MainStateJacobianProvider.java +++ b/src/main/java/org/apache/commons/math3/ode/MainStateJacobianProvider.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.ode; +package org.apache.commons.math3.ode; /** Interface expanding {@link FirstOrderDifferentialEquations first order * differential equations} in order to compute exactly the main state jacobian diff --git a/src/main/java/org/apache/commons/math/ode/MultistepIntegrator.java b/src/main/java/org/apache/commons/math3/ode/MultistepIntegrator.java similarity index 95% rename from src/main/java/org/apache/commons/math/ode/MultistepIntegrator.java rename to src/main/java/org/apache/commons/math3/ode/MultistepIntegrator.java index f284a932d..87252baea 100644 --- a/src/main/java/org/apache/commons/math/ode/MultistepIntegrator.java +++ b/src/main/java/org/apache/commons/math3/ode/MultistepIntegrator.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.apache.commons.math.ode; +package org.apache.commons.math3.ode; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.MathIllegalStateException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.linear.Array2DRowRealMatrix; -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.FastMath; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.MathIllegalStateException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.linear.Array2DRowRealMatrix; +import org.apache.commons.math3.ode.nonstiff.AdaptiveStepsizeIntegrator; +import org.apache.commons.math3.ode.nonstiff.DormandPrince853Integrator; +import org.apache.commons.math3.ode.sampling.StepHandler; +import org.apache.commons.math3.ode.sampling.StepInterpolator; +import org.apache.commons.math3.util.FastMath; /** * This class is the base class for multistep integrators for Ordinary @@ -53,8 +53,8 @@ import org.apache.commons.math.util.FastMath; * factor is therefore set to a quite low value: 21/order. *

    * - * @see org.apache.commons.math.ode.nonstiff.AdamsBashforthIntegrator - * @see org.apache.commons.math.ode.nonstiff.AdamsMoultonIntegrator + * @see org.apache.commons.math3.ode.nonstiff.AdamsBashforthIntegrator + * @see org.apache.commons.math3.ode.nonstiff.AdamsMoultonIntegrator * @version $Id$ * @since 2.0 */ diff --git a/src/main/java/org/apache/commons/math/ode/ODEIntegrator.java b/src/main/java/org/apache/commons/math3/ode/ODEIntegrator.java similarity index 96% rename from src/main/java/org/apache/commons/math/ode/ODEIntegrator.java rename to src/main/java/org/apache/commons/math3/ode/ODEIntegrator.java index 99acc3448..f5a231174 100644 --- a/src/main/java/org/apache/commons/math/ode/ODEIntegrator.java +++ b/src/main/java/org/apache/commons/math3/ode/ODEIntegrator.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.commons.math.ode; +package org.apache.commons.math3.ode; import java.util.Collection; -import org.apache.commons.math.analysis.solvers.UnivariateSolver; -import org.apache.commons.math.ode.events.EventHandler; -import org.apache.commons.math.ode.sampling.StepHandler; +import org.apache.commons.math3.analysis.solvers.UnivariateSolver; +import org.apache.commons.math3.ode.events.EventHandler; +import org.apache.commons.math3.ode.sampling.StepHandler; /** * This interface defines the common parts shared by integrators diff --git a/src/main/java/org/apache/commons/math/ode/ParameterConfiguration.java b/src/main/java/org/apache/commons/math3/ode/ParameterConfiguration.java similarity index 98% rename from src/main/java/org/apache/commons/math/ode/ParameterConfiguration.java rename to src/main/java/org/apache/commons/math3/ode/ParameterConfiguration.java index 0ffc7abce..b6da40a8c 100644 --- a/src/main/java/org/apache/commons/math/ode/ParameterConfiguration.java +++ b/src/main/java/org/apache/commons/math3/ode/ParameterConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.ode; +package org.apache.commons.math3.ode; import java.io.Serializable; diff --git a/src/main/java/org/apache/commons/math/ode/ParameterJacobianProvider.java b/src/main/java/org/apache/commons/math3/ode/ParameterJacobianProvider.java similarity index 94% rename from src/main/java/org/apache/commons/math/ode/ParameterJacobianProvider.java rename to src/main/java/org/apache/commons/math3/ode/ParameterJacobianProvider.java index 778582907..0e964a937 100644 --- a/src/main/java/org/apache/commons/math/ode/ParameterJacobianProvider.java +++ b/src/main/java/org/apache/commons/math3/ode/ParameterJacobianProvider.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.ode; +package org.apache.commons.math3.ode; -import org.apache.commons.math.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.MathIllegalArgumentException; /** Interface to compute exactly Jacobian matrix for some parameter * when computing {@link JacobianMatrices partial derivatives equations}. diff --git a/src/main/java/org/apache/commons/math/ode/ParameterJacobianWrapper.java b/src/main/java/org/apache/commons/math3/ode/ParameterJacobianWrapper.java similarity index 98% rename from src/main/java/org/apache/commons/math/ode/ParameterJacobianWrapper.java rename to src/main/java/org/apache/commons/math3/ode/ParameterJacobianWrapper.java index f87e1cf47..53d6f2608 100644 --- a/src/main/java/org/apache/commons/math/ode/ParameterJacobianWrapper.java +++ b/src/main/java/org/apache/commons/math3/ode/ParameterJacobianWrapper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.ode; +package org.apache.commons.math3.ode; import java.util.Collection; import java.util.HashMap; diff --git a/src/main/java/org/apache/commons/math/ode/Parameterizable.java b/src/main/java/org/apache/commons/math3/ode/Parameterizable.java similarity index 97% rename from src/main/java/org/apache/commons/math/ode/Parameterizable.java rename to src/main/java/org/apache/commons/math3/ode/Parameterizable.java index f3dad46b5..4793026dc 100644 --- a/src/main/java/org/apache/commons/math/ode/Parameterizable.java +++ b/src/main/java/org/apache/commons/math3/ode/Parameterizable.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.ode; +package org.apache.commons.math3.ode; import java.util.Collection; diff --git a/src/main/java/org/apache/commons/math/ode/ParameterizedODE.java b/src/main/java/org/apache/commons/math3/ode/ParameterizedODE.java similarity index 97% rename from src/main/java/org/apache/commons/math/ode/ParameterizedODE.java rename to src/main/java/org/apache/commons/math3/ode/ParameterizedODE.java index df29f3e20..f18f95a28 100644 --- a/src/main/java/org/apache/commons/math/ode/ParameterizedODE.java +++ b/src/main/java/org/apache/commons/math3/ode/ParameterizedODE.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.ode; +package org.apache.commons.math3.ode; /** Interface to compute by finite difference Jacobian matrix for some parameter * when computing {@link JacobianMatrices partial derivatives equations}. diff --git a/src/main/java/org/apache/commons/math/ode/ParameterizedWrapper.java b/src/main/java/org/apache/commons/math3/ode/ParameterizedWrapper.java similarity index 93% rename from src/main/java/org/apache/commons/math/ode/ParameterizedWrapper.java rename to src/main/java/org/apache/commons/math3/ode/ParameterizedWrapper.java index ef8fa4bc2..61d73acf9 100644 --- a/src/main/java/org/apache/commons/math/ode/ParameterizedWrapper.java +++ b/src/main/java/org/apache/commons/math3/ode/ParameterizedWrapper.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math.ode; +package org.apache.commons.math3.ode; import java.util.ArrayList; import java.util.Collection; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.util.LocalizedFormats; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.util.LocalizedFormats; /** Wrapper class enabling {@link FirstOrderDifferentialEquations basic simple} * ODE instances to be used when processing {@link JacobianMatrices}. diff --git a/src/main/java/org/apache/commons/math/ode/SecondOrderDifferentialEquations.java b/src/main/java/org/apache/commons/math3/ode/SecondOrderDifferentialEquations.java similarity index 98% rename from src/main/java/org/apache/commons/math/ode/SecondOrderDifferentialEquations.java rename to src/main/java/org/apache/commons/math3/ode/SecondOrderDifferentialEquations.java index db1e0b252..44985896b 100644 --- a/src/main/java/org/apache/commons/math/ode/SecondOrderDifferentialEquations.java +++ b/src/main/java/org/apache/commons/math3/ode/SecondOrderDifferentialEquations.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.ode; +package org.apache.commons.math3.ode; /** This interface represents a second order differential equations set. diff --git a/src/main/java/org/apache/commons/math/ode/SecondOrderIntegrator.java b/src/main/java/org/apache/commons/math3/ode/SecondOrderIntegrator.java similarity index 93% rename from src/main/java/org/apache/commons/math/ode/SecondOrderIntegrator.java rename to src/main/java/org/apache/commons/math3/ode/SecondOrderIntegrator.java index 73d4cf91b..76bec0383 100644 --- a/src/main/java/org/apache/commons/math/ode/SecondOrderIntegrator.java +++ b/src/main/java/org/apache/commons/math3/ode/SecondOrderIntegrator.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.ode; +package org.apache.commons.math3.ode; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.MathIllegalStateException; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.MathIllegalStateException; /** This interface represents a second order integrator for diff --git a/src/main/java/org/apache/commons/math/ode/SecondaryEquations.java b/src/main/java/org/apache/commons/math3/ode/SecondaryEquations.java similarity index 98% rename from src/main/java/org/apache/commons/math/ode/SecondaryEquations.java rename to src/main/java/org/apache/commons/math3/ode/SecondaryEquations.java index 6c1193a30..13f960007 100644 --- a/src/main/java/org/apache/commons/math/ode/SecondaryEquations.java +++ b/src/main/java/org/apache/commons/math3/ode/SecondaryEquations.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.ode; +package org.apache.commons.math3.ode; /** * This interface allows users to add secondary differential equations to a primary diff --git a/src/main/java/org/apache/commons/math/ode/events/EventHandler.java b/src/main/java/org/apache/commons/math3/ode/events/EventHandler.java similarity index 91% rename from src/main/java/org/apache/commons/math/ode/events/EventHandler.java rename to src/main/java/org/apache/commons/math3/ode/events/EventHandler.java index 83e7f6054..53cd38455 100644 --- a/src/main/java/org/apache/commons/math/ode/events/EventHandler.java +++ b/src/main/java/org/apache/commons/math3/ode/events/EventHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.ode.events; +package org.apache.commons.math3.ode.events; /** This interface represents a handler for discrete events triggered * during ODE integration. @@ -73,7 +73,7 @@ public interface EventHandler { * #eventOccurred eventOccurred} method when the integration should * go on after the event ending the current step, with a new derivatives * vector (which will be retrieved thanks to the {@link - * org.apache.commons.math.ode.FirstOrderDifferentialEquations#computeDerivatives} + * org.apache.commons.math3.ode.FirstOrderDifferentialEquations#computeDerivatives} * method).

    */ RESET_DERIVATIVES, @@ -121,7 +121,7 @@ public interface EventHandler { * the step handler itself is called (see below for scheduling). It * allows the user to update his internal data to acknowledge the fact * the event has been handled (for example setting a flag in the {@link - * org.apache.commons.math.ode.FirstOrderDifferentialEquations + * org.apache.commons.math3.ode.FirstOrderDifferentialEquations * differential equations} to switch the derivatives computation in * case of discontinuity), or to direct the integrator to either stop * or continue integration, possibly with a reset state or derivatives.

    @@ -129,7 +129,7 @@ public interface EventHandler { *
      *
    • if {@link Action#STOP} is returned, the step handler will be called * with the isLast flag of the {@link - * org.apache.commons.math.ode.sampling.StepHandler#handleStep handleStep} + * org.apache.commons.math3.ode.sampling.StepHandler#handleStep handleStep} * method set to true and the integration will be stopped,
      • *
    • if {@link Action#RESET_STATE} is returned, the {@link #resetState * resetState} method will be called once the step handler has @@ -143,28 +143,28 @@ public interface EventHandler { *
    *

    The scheduling between this method and the {@link - * org.apache.commons.math.ode.sampling.StepHandler StepHandler} method {@link - * org.apache.commons.math.ode.sampling.StepHandler#handleStep( - * org.apache.commons.math.ode.sampling.StepInterpolator, boolean) + * org.apache.commons.math3.ode.sampling.StepHandler StepHandler} method {@link + * org.apache.commons.math3.ode.sampling.StepHandler#handleStep( + * org.apache.commons.math3.ode.sampling.StepInterpolator, boolean) * handleStep(interpolator, isLast)} is to call this method first and * handleStep afterwards. This scheduling allows the integrator to * pass true as the isLast parameter to the step * handler to make it aware the step will be the last one if this method * returns {@link Action#STOP}. As the interpolator may be used to navigate back * throughout the last step (as {@link - * org.apache.commons.math.ode.sampling.StepNormalizer StepNormalizer} + * org.apache.commons.math3.ode.sampling.StepNormalizer StepNormalizer} * does for example), user code called by this method and user * code called by step handlers may experience apparently out of order values * of the independent time variable. As an example, if the same user object * implements both this {@link EventHandler EventHandler} interface and the - * {@link org.apache.commons.math.ode.sampling.FixedStepHandler FixedStepHandler} + * {@link org.apache.commons.math3.ode.sampling.FixedStepHandler FixedStepHandler} * interface, a forward integration may call its * eventOccurred method with t = 10 first and call its * handleStep method with t = 9 afterwards. Such out of order * calls are limited to the size of the integration step for {@link - * org.apache.commons.math.ode.sampling.StepHandler variable step handlers} and + * org.apache.commons.math3.ode.sampling.StepHandler variable step handlers} and * to the size of the fixed step for {@link - * org.apache.commons.math.ode.sampling.FixedStepHandler fixed step handlers}.

    + * org.apache.commons.math3.ode.sampling.FixedStepHandler fixed step handlers}.

    * @param t current value of the independent time variable * @param y array containing the current value of the state vector diff --git a/src/main/java/org/apache/commons/math/ode/events/EventState.java b/src/main/java/org/apache/commons/math3/ode/events/EventState.java similarity index 95% rename from src/main/java/org/apache/commons/math/ode/events/EventState.java rename to src/main/java/org/apache/commons/math3/ode/events/EventState.java index c4bfca7b4..c0572181e 100644 --- a/src/main/java/org/apache/commons/math/ode/events/EventState.java +++ b/src/main/java/org/apache/commons/math3/ode/events/EventState.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package org.apache.commons.math.ode.events; +package org.apache.commons.math3.ode.events; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.analysis.solvers.AllowedSolution; -import org.apache.commons.math.analysis.solvers.BracketedUnivariateSolver; -import org.apache.commons.math.analysis.solvers.PegasusSolver; -import org.apache.commons.math.analysis.solvers.UnivariateSolver; -import org.apache.commons.math.analysis.solvers.UnivariateSolverUtils; -import org.apache.commons.math.exception.ConvergenceException; -import org.apache.commons.math.ode.events.EventHandler; -import org.apache.commons.math.ode.sampling.StepInterpolator; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.solvers.AllowedSolution; +import org.apache.commons.math3.analysis.solvers.BracketedUnivariateSolver; +import org.apache.commons.math3.analysis.solvers.PegasusSolver; +import org.apache.commons.math3.analysis.solvers.UnivariateSolver; +import org.apache.commons.math3.analysis.solvers.UnivariateSolverUtils; +import org.apache.commons.math3.exception.ConvergenceException; +import org.apache.commons.math3.ode.events.EventHandler; +import org.apache.commons.math3.ode.sampling.StepInterpolator; +import org.apache.commons.math3.util.FastMath; /** This class handles the state for one {@link EventHandler * event handler} during integration steps. diff --git a/src/main/java/org/apache/commons/math/ode/events/package-info.java b/src/main/java/org/apache/commons/math3/ode/events/package-info.java similarity index 96% rename from src/main/java/org/apache/commons/math/ode/events/package-info.java rename to src/main/java/org/apache/commons/math3/ode/events/package-info.java index 0dcce4ffd..9d3b917c9 100644 --- a/src/main/java/org/apache/commons/math/ode/events/package-info.java +++ b/src/main/java/org/apache/commons/math3/ode/events/package-info.java @@ -23,7 +23,7 @@ * *

    * Discrete events detection is based on switching functions. The user provides - * a simple {@link org.apache.commons.math.ode.events.EventHandler#g g(t, y)} + * a simple {@link org.apache.commons.math3.ode.events.EventHandler#g g(t, y)} * function depending on the current time and state. The integrator will monitor * the value of the function throughout integration range and will trigger the * event when its sign changes. The magnitude of the value is almost irrelevant, @@ -93,4 +93,4 @@ * * */ -package org.apache.commons.math.ode.events; +package org.apache.commons.math3.ode.events; diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/AdamsBashforthIntegrator.java b/src/main/java/org/apache/commons/math3/ode/nonstiff/AdamsBashforthIntegrator.java similarity index 96% rename from src/main/java/org/apache/commons/math/ode/nonstiff/AdamsBashforthIntegrator.java rename to src/main/java/org/apache/commons/math3/ode/nonstiff/AdamsBashforthIntegrator.java index 3d1433fa8..8f118b190 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/AdamsBashforthIntegrator.java +++ b/src/main/java/org/apache/commons/math3/ode/nonstiff/AdamsBashforthIntegrator.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.commons.math.ode.nonstiff; +package org.apache.commons.math3.ode.nonstiff; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.MathIllegalStateException; -import org.apache.commons.math.linear.Array2DRowRealMatrix; -import org.apache.commons.math.ode.ExpandableStatefulODE; -import org.apache.commons.math.ode.sampling.NordsieckStepInterpolator; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.MathIllegalStateException; +import org.apache.commons.math3.linear.Array2DRowRealMatrix; +import org.apache.commons.math3.ode.ExpandableStatefulODE; +import org.apache.commons.math3.ode.sampling.NordsieckStepInterpolator; +import org.apache.commons.math3.util.FastMath; /** diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/AdamsIntegrator.java b/src/main/java/org/apache/commons/math3/ode/nonstiff/AdamsIntegrator.java similarity index 94% rename from src/main/java/org/apache/commons/math/ode/nonstiff/AdamsIntegrator.java rename to src/main/java/org/apache/commons/math3/ode/nonstiff/AdamsIntegrator.java index a382fe123..381d23419 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/AdamsIntegrator.java +++ b/src/main/java/org/apache/commons/math3/ode/nonstiff/AdamsIntegrator.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.commons.math.ode.nonstiff; +package org.apache.commons.math3.ode.nonstiff; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.MathIllegalStateException; -import org.apache.commons.math.linear.Array2DRowRealMatrix; -import org.apache.commons.math.ode.ExpandableStatefulODE; -import org.apache.commons.math.ode.MultistepIntegrator; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.MathIllegalStateException; +import org.apache.commons.math3.linear.Array2DRowRealMatrix; +import org.apache.commons.math3.ode.ExpandableStatefulODE; +import org.apache.commons.math3.ode.MultistepIntegrator; /** Base class for {@link AdamsBashforthIntegrator Adams-Bashforth} and diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/AdamsMoultonIntegrator.java b/src/main/java/org/apache/commons/math3/ode/nonstiff/AdamsMoultonIntegrator.java similarity index 97% rename from src/main/java/org/apache/commons/math/ode/nonstiff/AdamsMoultonIntegrator.java rename to src/main/java/org/apache/commons/math3/ode/nonstiff/AdamsMoultonIntegrator.java index ffe30c795..f0069aa82 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/AdamsMoultonIntegrator.java +++ b/src/main/java/org/apache/commons/math3/ode/nonstiff/AdamsMoultonIntegrator.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.apache.commons.math.ode.nonstiff; +package org.apache.commons.math3.ode.nonstiff; import java.util.Arrays; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.MathIllegalStateException; -import org.apache.commons.math.linear.Array2DRowRealMatrix; -import org.apache.commons.math.linear.RealMatrixPreservingVisitor; -import org.apache.commons.math.ode.ExpandableStatefulODE; -import org.apache.commons.math.ode.sampling.NordsieckStepInterpolator; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.MathIllegalStateException; +import org.apache.commons.math3.linear.Array2DRowRealMatrix; +import org.apache.commons.math3.linear.RealMatrixPreservingVisitor; +import org.apache.commons.math3.ode.ExpandableStatefulODE; +import org.apache.commons.math3.ode.sampling.NordsieckStepInterpolator; +import org.apache.commons.math3.util.FastMath; /** diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/AdamsNordsieckTransformer.java b/src/main/java/org/apache/commons/math3/ode/nonstiff/AdamsNordsieckTransformer.java similarity index 95% rename from src/main/java/org/apache/commons/math/ode/nonstiff/AdamsNordsieckTransformer.java rename to src/main/java/org/apache/commons/math3/ode/nonstiff/AdamsNordsieckTransformer.java index 0732f5839..6872e590c 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/AdamsNordsieckTransformer.java +++ b/src/main/java/org/apache/commons/math3/ode/nonstiff/AdamsNordsieckTransformer.java @@ -15,22 +15,22 @@ * limitations under the License. */ -package org.apache.commons.math.ode.nonstiff; +package org.apache.commons.math3.ode.nonstiff; import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import org.apache.commons.math.fraction.BigFraction; -import org.apache.commons.math.linear.Array2DRowFieldMatrix; -import org.apache.commons.math.linear.Array2DRowRealMatrix; -import org.apache.commons.math.linear.ArrayFieldVector; -import org.apache.commons.math.linear.FieldDecompositionSolver; -import org.apache.commons.math.linear.FieldLUDecomposition; -import org.apache.commons.math.linear.FieldMatrix; -import org.apache.commons.math.linear.MatrixUtils; -import org.apache.commons.math.linear.QRDecomposition; -import org.apache.commons.math.linear.RealMatrix; +import org.apache.commons.math3.fraction.BigFraction; +import org.apache.commons.math3.linear.Array2DRowFieldMatrix; +import org.apache.commons.math3.linear.Array2DRowRealMatrix; +import org.apache.commons.math3.linear.ArrayFieldVector; +import org.apache.commons.math3.linear.FieldDecompositionSolver; +import org.apache.commons.math3.linear.FieldLUDecomposition; +import org.apache.commons.math3.linear.FieldMatrix; +import org.apache.commons.math3.linear.MatrixUtils; +import org.apache.commons.math3.linear.QRDecomposition; +import org.apache.commons.math3.linear.RealMatrix; /** Transformer to Nordsieck vectors for Adams integrators. *

    This class is used by {@link AdamsBashforthIntegrator Adams-Bashforth} and diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/AdaptiveStepsizeIntegrator.java b/src/main/java/org/apache/commons/math3/ode/nonstiff/AdaptiveStepsizeIntegrator.java similarity index 95% rename from src/main/java/org/apache/commons/math/ode/nonstiff/AdaptiveStepsizeIntegrator.java rename to src/main/java/org/apache/commons/math3/ode/nonstiff/AdaptiveStepsizeIntegrator.java index 265f89157..00848f8fb 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/AdaptiveStepsizeIntegrator.java +++ b/src/main/java/org/apache/commons/math3/ode/nonstiff/AdaptiveStepsizeIntegrator.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.commons.math.ode.nonstiff; +package org.apache.commons.math3.ode.nonstiff; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.MathIllegalStateException; -import org.apache.commons.math.exception.NumberIsTooSmallException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.ode.AbstractIntegrator; -import org.apache.commons.math.ode.ExpandableStatefulODE; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.MathIllegalStateException; +import org.apache.commons.math3.exception.NumberIsTooSmallException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.ode.AbstractIntegrator; +import org.apache.commons.math3.ode.ExpandableStatefulODE; +import org.apache.commons.math3.util.FastMath; /** * This abstract class holds the common part of all adaptive @@ -44,7 +44,7 @@ import org.apache.commons.math.util.FastMath; *

    * If the Ordinary Differential Equations is an {@link ExpandableStatefulODE * extended ODE} rather than a {@link - * org.apache.commons.math.ode.FirstOrderDifferentialEquations basic ODE}, then + * org.apache.commons.math3.ode.FirstOrderDifferentialEquations basic ODE}, then * only the {@link ExpandableStatefulODE#getPrimaryState() primary part} * of the state vector is used for stepsize control, not the complete state vector. *

    diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaIntegrator.java b/src/main/java/org/apache/commons/math3/ode/nonstiff/ClassicalRungeKuttaIntegrator.java similarity index 97% rename from src/main/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaIntegrator.java rename to src/main/java/org/apache/commons/math3/ode/nonstiff/ClassicalRungeKuttaIntegrator.java index 3ebd5be48..b3f569c62 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaIntegrator.java +++ b/src/main/java/org/apache/commons/math3/ode/nonstiff/ClassicalRungeKuttaIntegrator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.ode.nonstiff; +package org.apache.commons.math3.ode.nonstiff; /** diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolator.java b/src/main/java/org/apache/commons/math3/ode/nonstiff/ClassicalRungeKuttaStepInterpolator.java similarity index 98% rename from src/main/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolator.java rename to src/main/java/org/apache/commons/math3/ode/nonstiff/ClassicalRungeKuttaStepInterpolator.java index d0ff28fa7..510cd8f00 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolator.java +++ b/src/main/java/org/apache/commons/math3/ode/nonstiff/ClassicalRungeKuttaStepInterpolator.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.ode.nonstiff; +package org.apache.commons.math3.ode.nonstiff; -import org.apache.commons.math.ode.sampling.StepInterpolator; +import org.apache.commons.math3.ode.sampling.StepInterpolator; /** * This class implements a step interpolator for the classical fourth diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/DormandPrince54Integrator.java b/src/main/java/org/apache/commons/math3/ode/nonstiff/DormandPrince54Integrator.java similarity index 98% rename from src/main/java/org/apache/commons/math/ode/nonstiff/DormandPrince54Integrator.java rename to src/main/java/org/apache/commons/math3/ode/nonstiff/DormandPrince54Integrator.java index b626ccb7f..a6bcf7e53 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/DormandPrince54Integrator.java +++ b/src/main/java/org/apache/commons/math3/ode/nonstiff/DormandPrince54Integrator.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.ode.nonstiff; +package org.apache.commons.math3.ode.nonstiff; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.util.FastMath; /** diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolator.java b/src/main/java/org/apache/commons/math3/ode/nonstiff/DormandPrince54StepInterpolator.java similarity index 97% rename from src/main/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolator.java rename to src/main/java/org/apache/commons/math3/ode/nonstiff/DormandPrince54StepInterpolator.java index 1e5f86e12..54f067936 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolator.java +++ b/src/main/java/org/apache/commons/math3/ode/nonstiff/DormandPrince54StepInterpolator.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.math.ode.nonstiff; +package org.apache.commons.math3.ode.nonstiff; -import org.apache.commons.math.ode.AbstractIntegrator; -import org.apache.commons.math.ode.EquationsMapper; -import org.apache.commons.math.ode.sampling.StepInterpolator; +import org.apache.commons.math3.ode.AbstractIntegrator; +import org.apache.commons.math3.ode.EquationsMapper; +import org.apache.commons.math3.ode.sampling.StepInterpolator; /** * This class represents an interpolator over the last step during an diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/DormandPrince853Integrator.java b/src/main/java/org/apache/commons/math3/ode/nonstiff/DormandPrince853Integrator.java similarity index 99% rename from src/main/java/org/apache/commons/math/ode/nonstiff/DormandPrince853Integrator.java rename to src/main/java/org/apache/commons/math3/ode/nonstiff/DormandPrince853Integrator.java index 666856b9a..c5bb0c3e2 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/DormandPrince853Integrator.java +++ b/src/main/java/org/apache/commons/math3/ode/nonstiff/DormandPrince853Integrator.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.ode.nonstiff; +package org.apache.commons.math3.ode.nonstiff; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.util.FastMath; /** diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolator.java b/src/main/java/org/apache/commons/math3/ode/nonstiff/DormandPrince853StepInterpolator.java similarity index 98% rename from src/main/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolator.java rename to src/main/java/org/apache/commons/math3/ode/nonstiff/DormandPrince853StepInterpolator.java index 64dd7d77b..4794d38c0 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolator.java +++ b/src/main/java/org/apache/commons/math3/ode/nonstiff/DormandPrince853StepInterpolator.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.apache.commons.math.ode.nonstiff; +package org.apache.commons.math3.ode.nonstiff; import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import org.apache.commons.math.ode.AbstractIntegrator; -import org.apache.commons.math.ode.EquationsMapper; -import org.apache.commons.math.ode.sampling.StepInterpolator; +import org.apache.commons.math3.ode.AbstractIntegrator; +import org.apache.commons.math3.ode.EquationsMapper; +import org.apache.commons.math3.ode.sampling.StepInterpolator; /** * This class represents an interpolator over the last step during an diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/EmbeddedRungeKuttaIntegrator.java b/src/main/java/org/apache/commons/math3/ode/nonstiff/EmbeddedRungeKuttaIntegrator.java similarity index 97% rename from src/main/java/org/apache/commons/math/ode/nonstiff/EmbeddedRungeKuttaIntegrator.java rename to src/main/java/org/apache/commons/math3/ode/nonstiff/EmbeddedRungeKuttaIntegrator.java index d2bbf6725..956d428ba 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/EmbeddedRungeKuttaIntegrator.java +++ b/src/main/java/org/apache/commons/math3/ode/nonstiff/EmbeddedRungeKuttaIntegrator.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.commons.math.ode.nonstiff; +package org.apache.commons.math3.ode.nonstiff; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.MathIllegalStateException; -import org.apache.commons.math.ode.ExpandableStatefulODE; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.MathIllegalStateException; +import org.apache.commons.math3.ode.ExpandableStatefulODE; +import org.apache.commons.math3.util.FastMath; /** * This class implements the common part of all embedded Runge-Kutta diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/EulerIntegrator.java b/src/main/java/org/apache/commons/math3/ode/nonstiff/EulerIntegrator.java similarity index 98% rename from src/main/java/org/apache/commons/math/ode/nonstiff/EulerIntegrator.java rename to src/main/java/org/apache/commons/math3/ode/nonstiff/EulerIntegrator.java index 2d144a1fe..a9a1463fe 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/EulerIntegrator.java +++ b/src/main/java/org/apache/commons/math3/ode/nonstiff/EulerIntegrator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.ode.nonstiff; +package org.apache.commons.math3.ode.nonstiff; /** diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/EulerStepInterpolator.java b/src/main/java/org/apache/commons/math3/ode/nonstiff/EulerStepInterpolator.java similarity index 94% rename from src/main/java/org/apache/commons/math/ode/nonstiff/EulerStepInterpolator.java rename to src/main/java/org/apache/commons/math3/ode/nonstiff/EulerStepInterpolator.java index 1d0531756..661149dda 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/EulerStepInterpolator.java +++ b/src/main/java/org/apache/commons/math3/ode/nonstiff/EulerStepInterpolator.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.ode.nonstiff; +package org.apache.commons.math3.ode.nonstiff; -import org.apache.commons.math.ode.sampling.StepInterpolator; +import org.apache.commons.math3.ode.sampling.StepInterpolator; /** * This class implements a linear interpolator for step. @@ -52,7 +52,7 @@ class EulerStepInterpolator /** Simple constructor. * This constructor builds an instance that is not usable yet, the * {@link - * org.apache.commons.math.ode.sampling.AbstractStepInterpolator#reinitialize} + * org.apache.commons.math3.ode.sampling.AbstractStepInterpolator#reinitialize} * method should be called before using the instance in order to * initialize the internal arrays. This constructor is used only * in order to delay the initialization in some cases. The {@link diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/GillIntegrator.java b/src/main/java/org/apache/commons/math3/ode/nonstiff/GillIntegrator.java similarity index 96% rename from src/main/java/org/apache/commons/math/ode/nonstiff/GillIntegrator.java rename to src/main/java/org/apache/commons/math3/ode/nonstiff/GillIntegrator.java index 03673e9b7..88eeb84b5 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/GillIntegrator.java +++ b/src/main/java/org/apache/commons/math3/ode/nonstiff/GillIntegrator.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.ode.nonstiff; +package org.apache.commons.math3.ode.nonstiff; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.util.FastMath; /** diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolator.java b/src/main/java/org/apache/commons/math3/ode/nonstiff/GillStepInterpolator.java similarity index 96% rename from src/main/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolator.java rename to src/main/java/org/apache/commons/math3/ode/nonstiff/GillStepInterpolator.java index 7a91c6519..630d4df42 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolator.java +++ b/src/main/java/org/apache/commons/math3/ode/nonstiff/GillStepInterpolator.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.ode.nonstiff; +package org.apache.commons.math3.ode.nonstiff; -import org.apache.commons.math.ode.sampling.StepInterpolator; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.ode.sampling.StepInterpolator; +import org.apache.commons.math3.util.FastMath; /** * This class implements a step interpolator for the Gill fourth @@ -68,7 +68,7 @@ class GillStepInterpolator /** Simple constructor. * This constructor builds an instance that is not usable yet, the * {@link - * org.apache.commons.math.ode.sampling.AbstractStepInterpolator#reinitialize} + * org.apache.commons.math3.ode.sampling.AbstractStepInterpolator#reinitialize} * method should be called before using the instance in order to * initialize the internal arrays. This constructor is used only * in order to delay the initialization in some cases. The {@link diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerIntegrator.java b/src/main/java/org/apache/commons/math3/ode/nonstiff/GraggBulirschStoerIntegrator.java similarity index 98% rename from src/main/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerIntegrator.java rename to src/main/java/org/apache/commons/math3/ode/nonstiff/GraggBulirschStoerIntegrator.java index 8881a2ca3..03c39da2c 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerIntegrator.java +++ b/src/main/java/org/apache/commons/math3/ode/nonstiff/GraggBulirschStoerIntegrator.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.commons.math.ode.nonstiff; +package org.apache.commons.math3.ode.nonstiff; -import org.apache.commons.math.analysis.solvers.UnivariateSolver; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.MathIllegalStateException; -import org.apache.commons.math.ode.ExpandableStatefulODE; -import org.apache.commons.math.ode.events.EventHandler; -import org.apache.commons.math.ode.sampling.AbstractStepInterpolator; -import org.apache.commons.math.ode.sampling.StepHandler; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.analysis.solvers.UnivariateSolver; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.MathIllegalStateException; +import org.apache.commons.math3.ode.ExpandableStatefulODE; +import org.apache.commons.math3.ode.events.EventHandler; +import org.apache.commons.math3.ode.sampling.AbstractStepInterpolator; +import org.apache.commons.math3.ode.sampling.StepHandler; +import org.apache.commons.math3.util.FastMath; /** * This class implements a Gragg-Bulirsch-Stoer integrator for diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolator.java b/src/main/java/org/apache/commons/math3/ode/nonstiff/GraggBulirschStoerStepInterpolator.java similarity index 97% rename from src/main/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolator.java rename to src/main/java/org/apache/commons/math3/ode/nonstiff/GraggBulirschStoerStepInterpolator.java index 6446beeec..228a00865 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolator.java +++ b/src/main/java/org/apache/commons/math3/ode/nonstiff/GraggBulirschStoerStepInterpolator.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.commons.math.ode.nonstiff; +package org.apache.commons.math3.ode.nonstiff; import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import org.apache.commons.math.ode.EquationsMapper; -import org.apache.commons.math.ode.sampling.AbstractStepInterpolator; -import org.apache.commons.math.ode.sampling.StepInterpolator; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.ode.EquationsMapper; +import org.apache.commons.math3.ode.sampling.AbstractStepInterpolator; +import org.apache.commons.math3.ode.sampling.StepInterpolator; +import org.apache.commons.math3.util.FastMath; /** * This class implements an interpolator for the Gragg-Bulirsch-Stoer diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/HighamHall54Integrator.java b/src/main/java/org/apache/commons/math3/ode/nonstiff/HighamHall54Integrator.java similarity index 98% rename from src/main/java/org/apache/commons/math/ode/nonstiff/HighamHall54Integrator.java rename to src/main/java/org/apache/commons/math3/ode/nonstiff/HighamHall54Integrator.java index 3212722fc..bde78a322 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/HighamHall54Integrator.java +++ b/src/main/java/org/apache/commons/math3/ode/nonstiff/HighamHall54Integrator.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.ode.nonstiff; +package org.apache.commons.math3.ode.nonstiff; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.util.FastMath; /** diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolator.java b/src/main/java/org/apache/commons/math3/ode/nonstiff/HighamHall54StepInterpolator.java similarity index 96% rename from src/main/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolator.java rename to src/main/java/org/apache/commons/math3/ode/nonstiff/HighamHall54StepInterpolator.java index 28c74f223..a3756ecad 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolator.java +++ b/src/main/java/org/apache/commons/math3/ode/nonstiff/HighamHall54StepInterpolator.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.ode.nonstiff; +package org.apache.commons.math3.ode.nonstiff; -import org.apache.commons.math.ode.sampling.StepInterpolator; +import org.apache.commons.math3.ode.sampling.StepInterpolator; /** * This class represents an interpolator over the last step during an @@ -38,7 +38,7 @@ class HighamHall54StepInterpolator /** Simple constructor. * This constructor builds an instance that is not usable yet, the * {@link - * org.apache.commons.math.ode.sampling.AbstractStepInterpolator#reinitialize} + * org.apache.commons.math3.ode.sampling.AbstractStepInterpolator#reinitialize} * method should be called before using the instance in order to * initialize the internal arrays. This constructor is used only * in order to delay the initialization in some cases. The {@link diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/MidpointIntegrator.java b/src/main/java/org/apache/commons/math3/ode/nonstiff/MidpointIntegrator.java similarity index 97% rename from src/main/java/org/apache/commons/math/ode/nonstiff/MidpointIntegrator.java rename to src/main/java/org/apache/commons/math3/ode/nonstiff/MidpointIntegrator.java index 11c63e397..6c3ee2f7a 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/MidpointIntegrator.java +++ b/src/main/java/org/apache/commons/math3/ode/nonstiff/MidpointIntegrator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.ode.nonstiff; +package org.apache.commons.math3.ode.nonstiff; /** diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolator.java b/src/main/java/org/apache/commons/math3/ode/nonstiff/MidpointStepInterpolator.java similarity index 95% rename from src/main/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolator.java rename to src/main/java/org/apache/commons/math3/ode/nonstiff/MidpointStepInterpolator.java index 1340c1c0a..540450e75 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolator.java +++ b/src/main/java/org/apache/commons/math3/ode/nonstiff/MidpointStepInterpolator.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.ode.nonstiff; +package org.apache.commons.math3.ode.nonstiff; -import org.apache.commons.math.ode.sampling.StepInterpolator; +import org.apache.commons.math3.ode.sampling.StepInterpolator; /** * This class implements a step interpolator for second order @@ -54,7 +54,7 @@ class MidpointStepInterpolator /** Simple constructor. * This constructor builds an instance that is not usable yet, the * {@link - * org.apache.commons.math.ode.sampling.AbstractStepInterpolator#reinitialize} + * org.apache.commons.math3.ode.sampling.AbstractStepInterpolator#reinitialize} * method should be called before using the instance in order to * initialize the internal arrays. This constructor is used only * in order to delay the initialization in some cases. The {@link diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/RungeKuttaIntegrator.java b/src/main/java/org/apache/commons/math3/ode/nonstiff/RungeKuttaIntegrator.java similarity index 94% rename from src/main/java/org/apache/commons/math/ode/nonstiff/RungeKuttaIntegrator.java rename to src/main/java/org/apache/commons/math3/ode/nonstiff/RungeKuttaIntegrator.java index 39a810f16..b9878e7cd 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/RungeKuttaIntegrator.java +++ b/src/main/java/org/apache/commons/math3/ode/nonstiff/RungeKuttaIntegrator.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.commons.math.ode.nonstiff; +package org.apache.commons.math3.ode.nonstiff; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.MathIllegalStateException; -import org.apache.commons.math.ode.AbstractIntegrator; -import org.apache.commons.math.ode.ExpandableStatefulODE; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.MathIllegalStateException; +import org.apache.commons.math3.ode.AbstractIntegrator; +import org.apache.commons.math3.ode.ExpandableStatefulODE; +import org.apache.commons.math3.util.FastMath; /** * This class implements the common part of all fixed step Runge-Kutta diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/RungeKuttaStepInterpolator.java b/src/main/java/org/apache/commons/math3/ode/nonstiff/RungeKuttaStepInterpolator.java similarity index 96% rename from src/main/java/org/apache/commons/math/ode/nonstiff/RungeKuttaStepInterpolator.java rename to src/main/java/org/apache/commons/math3/ode/nonstiff/RungeKuttaStepInterpolator.java index 55146c32c..be266e164 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/RungeKuttaStepInterpolator.java +++ b/src/main/java/org/apache/commons/math3/ode/nonstiff/RungeKuttaStepInterpolator.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.apache.commons.math.ode.nonstiff; +package org.apache.commons.math3.ode.nonstiff; import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import org.apache.commons.math.ode.AbstractIntegrator; -import org.apache.commons.math.ode.EquationsMapper; -import org.apache.commons.math.ode.sampling.AbstractStepInterpolator; +import org.apache.commons.math3.ode.AbstractIntegrator; +import org.apache.commons.math3.ode.EquationsMapper; +import org.apache.commons.math3.ode.sampling.AbstractStepInterpolator; /** This class represents an interpolator over the last step during an * ODE integration for Runge-Kutta and embedded Runge-Kutta integrators. diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesIntegrator.java b/src/main/java/org/apache/commons/math3/ode/nonstiff/ThreeEighthesIntegrator.java similarity index 97% rename from src/main/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesIntegrator.java rename to src/main/java/org/apache/commons/math3/ode/nonstiff/ThreeEighthesIntegrator.java index 6553f3760..3de3f2045 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesIntegrator.java +++ b/src/main/java/org/apache/commons/math3/ode/nonstiff/ThreeEighthesIntegrator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.ode.nonstiff; +package org.apache.commons.math3.ode.nonstiff; /** diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolator.java b/src/main/java/org/apache/commons/math3/ode/nonstiff/ThreeEighthesStepInterpolator.java similarity index 96% rename from src/main/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolator.java rename to src/main/java/org/apache/commons/math3/ode/nonstiff/ThreeEighthesStepInterpolator.java index 5cb8a3e39..70ec216d5 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolator.java +++ b/src/main/java/org/apache/commons/math3/ode/nonstiff/ThreeEighthesStepInterpolator.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.ode.nonstiff; +package org.apache.commons.math3.ode.nonstiff; -import org.apache.commons.math.ode.sampling.StepInterpolator; +import org.apache.commons.math3.ode.sampling.StepInterpolator; /** * This class implements a step interpolator for the 3/8 fourth @@ -64,7 +64,7 @@ class ThreeEighthesStepInterpolator /** Simple constructor. * This constructor builds an instance that is not usable yet, the * {@link - * org.apache.commons.math.ode.sampling.AbstractStepInterpolator#reinitialize} + * org.apache.commons.math3.ode.sampling.AbstractStepInterpolator#reinitialize} * method should be called before using the instance in order to * initialize the internal arrays. This constructor is used only * in order to delay the initialization in some cases. The {@link diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/package-info.java b/src/main/java/org/apache/commons/math3/ode/nonstiff/package-info.java similarity index 95% rename from src/main/java/org/apache/commons/math/ode/nonstiff/package-info.java rename to src/main/java/org/apache/commons/math3/ode/nonstiff/package-info.java index aa90713a8..b2387ce28 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/package-info.java +++ b/src/main/java/org/apache/commons/math3/ode/nonstiff/package-info.java @@ -22,4 +22,4 @@ * * */ -package org.apache.commons.math.ode.nonstiff; +package org.apache.commons.math3.ode.nonstiff; diff --git a/src/main/java/org/apache/commons/math/ode/package-info.java b/src/main/java/org/apache/commons/math3/ode/package-info.java similarity index 69% rename from src/main/java/org/apache/commons/math/ode/package-info.java rename to src/main/java/org/apache/commons/math3/ode/package-info.java index 49936ea58..615cc7d8d 100644 --- a/src/main/java/org/apache/commons/math/ode/package-info.java +++ b/src/main/java/org/apache/commons/math3/ode/package-info.java @@ -36,7 +36,7 @@ * computing the state vector at discrete times, they also provide a * cheap mean to get the state between the time steps. They do so through * classes extending the {@link - * org.apache.commons.math.ode.sampling.StepInterpolator StepInterpolator} + * org.apache.commons.math3.ode.sampling.StepInterpolator StepInterpolator} * abstract class, which are made available to the user at the end of * each step. *

    @@ -56,10 +56,10 @@ *

    * The user should describe his problem in his own classes * (UserProblem in the diagram below) which should implement - * the {@link org.apache.commons.math.ode.FirstOrderDifferentialEquations + * the {@link org.apache.commons.math3.ode.FirstOrderDifferentialEquations * FirstOrderDifferentialEquations} interface. Then he should pass it to * the integrator he prefers among all the classes that implement the - * {@link org.apache.commons.math.ode.FirstOrderIntegrator + * {@link org.apache.commons.math3.ode.FirstOrderIntegrator * FirstOrderIntegrator} interface. *

    * @@ -67,23 +67,23 @@ * The solution of the integration problem is provided by two means. The * first one is aimed towards simple use: the state vector at the end of * the integration process is copied in the y array of the - * {@link org.apache.commons.math.ode.FirstOrderIntegrator#integrate + * {@link org.apache.commons.math3.ode.FirstOrderIntegrator#integrate * FirstOrderIntegrator.integrate} method. The second one should be used * when more in-depth information is needed throughout the integration * process. The user can register an object implementing the {@link - * org.apache.commons.math.ode.sampling.StepHandler StepHandler} interface or a - * {@link org.apache.commons.math.ode.sampling.StepNormalizer StepNormalizer} + * org.apache.commons.math3.ode.sampling.StepHandler StepHandler} interface or a + * {@link org.apache.commons.math3.ode.sampling.StepNormalizer StepNormalizer} * object wrapping a user-specified object implementing the {@link - * org.apache.commons.math.ode.sampling.FixedStepHandler FixedStepHandler} + * org.apache.commons.math3.ode.sampling.FixedStepHandler FixedStepHandler} * interface into the integrator before calling the {@link - * org.apache.commons.math.ode.FirstOrderIntegrator#integrate + * org.apache.commons.math3.ode.FirstOrderIntegrator#integrate * FirstOrderIntegrator.integrate} method. The user object will be called * appropriately during the integration process, allowing the user to * process intermediate results. The default step handler does nothing. *

    * *

    - * {@link org.apache.commons.math.ode.ContinuousOutputModel + * {@link org.apache.commons.math3.ode.ContinuousOutputModel * ContinuousOutputModel} is a special-purpose step handler that is able * to store all steps and to provide transparent access to any * intermediate result once the integration is over. An important feature @@ -98,10 +98,10 @@ * *

    * Other default implementations of the {@link - * org.apache.commons.math.ode.sampling.StepHandler StepHandler} interface are + * org.apache.commons.math3.ode.sampling.StepHandler StepHandler} interface are * available for general needs ({@link - * org.apache.commons.math.ode.sampling.DummyStepHandler DummyStepHandler}, {@link - * org.apache.commons.math.ode.sampling.StepNormalizer StepNormalizer}) and custom + * org.apache.commons.math3.ode.sampling.DummyStepHandler DummyStepHandler}, {@link + * org.apache.commons.math3.ode.sampling.StepNormalizer StepNormalizer}) and custom * implementations can be developed for specific needs. As an example, * if an application is to be completely driven by the integration * process, then most of the application code will be run inside a step @@ -113,14 +113,14 @@ * creation time. The more efficient integrators use variable steps that * are handled internally in order to control the integration error with * respect to a specified accuracy (these integrators extend the {@link - * org.apache.commons.math.ode.nonstiff.AdaptiveStepsizeIntegrator + * org.apache.commons.math3.ode.nonstiff.AdaptiveStepsizeIntegrator * AdaptiveStepsizeIntegrator} abstract class). In this case, the step * handler which is called after each successful step shows up the * variable stepsize. The {@link - * org.apache.commons.math.ode.sampling.StepNormalizer StepNormalizer} class can + * org.apache.commons.math3.ode.sampling.StepNormalizer StepNormalizer} class can * be used to convert the variable stepsize into a fixed stepsize that * can be handled by classes implementing the {@link - * org.apache.commons.math.ode.sampling.FixedStepHandler FixedStepHandler} + * org.apache.commons.math3.ode.sampling.FixedStepHandler FixedStepHandler} * interface. Adaptive stepsize integrators can automatically compute the * initial stepsize by themselves, however the user can specify it if he * prefers to retain full control over the integration or if the @@ -131,33 +131,33 @@ * * * - * - * - * - * - * + * + * + * + * + * *
    Fixed Step Integrators
    NameOrder
    {@link org.apache.commons.math.ode.nonstiff.EulerIntegrator Euler}1
    {@link org.apache.commons.math.ode.nonstiff.MidpointIntegrator Midpoint}2
    {@link org.apache.commons.math.ode.nonstiff.ClassicalRungeKuttaIntegrator Classical Runge-Kutta}4
    {@link org.apache.commons.math.ode.nonstiff.GillIntegrator Gill}4
    {@link org.apache.commons.math.ode.nonstiff.ThreeEighthesIntegrator 3/8}4
    {@link org.apache.commons.math3.ode.nonstiff.EulerIntegrator Euler}1
    {@link org.apache.commons.math3.ode.nonstiff.MidpointIntegrator Midpoint}2
    {@link org.apache.commons.math3.ode.nonstiff.ClassicalRungeKuttaIntegrator Classical Runge-Kutta}4
    {@link org.apache.commons.math3.ode.nonstiff.GillIntegrator Gill}4
    {@link org.apache.commons.math3.ode.nonstiff.ThreeEighthesIntegrator 3/8}4
    *

    * * * * - * - * - * - * - * - * + * + * + * + * + * + * *
    Adaptive Stepsize Integrators
    NameIntegration OrderError Estimation Order
    {@link org.apache.commons.math.ode.nonstiff.HighamHall54Integrator Higham and Hall}54
    {@link org.apache.commons.math.ode.nonstiff.DormandPrince54Integrator Dormand-Prince 5(4)}54
    {@link org.apache.commons.math.ode.nonstiff.DormandPrince853Integrator Dormand-Prince 8(5,3)}85 and 3
    {@link org.apache.commons.math.ode.nonstiff.GraggBulirschStoerIntegrator Gragg-Bulirsch-Stoer}variable (up to 18 by default)variable
    {@link org.apache.commons.math.ode.nonstiff.AdamsBashforthIntegrator Adams-Bashforth}variablevariable
    {@link org.apache.commons.math.ode.nonstiff.AdamsMoultonIntegrator Adams-Moulton}variablevariable
    {@link org.apache.commons.math3.ode.nonstiff.HighamHall54Integrator Higham and Hall}54
    {@link org.apache.commons.math3.ode.nonstiff.DormandPrince54Integrator Dormand-Prince 5(4)}54
    {@link org.apache.commons.math3.ode.nonstiff.DormandPrince853Integrator Dormand-Prince 8(5,3)}85 and 3
    {@link org.apache.commons.math3.ode.nonstiff.GraggBulirschStoerIntegrator Gragg-Bulirsch-Stoer}variable (up to 18 by default)variable
    {@link org.apache.commons.math3.ode.nonstiff.AdamsBashforthIntegrator Adams-Bashforth}variablevariable
    {@link org.apache.commons.math3.ode.nonstiff.AdamsMoultonIntegrator Adams-Moulton}variablevariable
    *

    * *

    - * In the table above, the {@link org.apache.commons.math.ode.nonstiff.AdamsBashforthIntegrator - * Adams-Bashforth} and {@link org.apache.commons.math.ode.nonstiff.AdamsMoultonIntegrator + * In the table above, the {@link org.apache.commons.math3.ode.nonstiff.AdamsBashforthIntegrator + * Adams-Bashforth} and {@link org.apache.commons.math3.ode.nonstiff.AdamsMoultonIntegrator * Adams-Moulton} integrators appear as variable-step ones. This is an experimental extension * to the classical algorithms using the Nordsieck vector representation. *

    * * */ -package org.apache.commons.math.ode; +package org.apache.commons.math3.ode; diff --git a/src/main/java/org/apache/commons/math/ode/sampling/AbstractStepInterpolator.java b/src/main/java/org/apache/commons/math3/ode/sampling/AbstractStepInterpolator.java similarity index 98% rename from src/main/java/org/apache/commons/math/ode/sampling/AbstractStepInterpolator.java rename to src/main/java/org/apache/commons/math3/ode/sampling/AbstractStepInterpolator.java index 31f104e72..2dc440d96 100644 --- a/src/main/java/org/apache/commons/math/ode/sampling/AbstractStepInterpolator.java +++ b/src/main/java/org/apache/commons/math3/ode/sampling/AbstractStepInterpolator.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.commons.math.ode.sampling; +package org.apache.commons.math3.ode.sampling; import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import org.apache.commons.math.ode.EquationsMapper; +import org.apache.commons.math3.ode.EquationsMapper; /** This abstract class represents an interpolator over the last step * during an ODE integration. @@ -31,8 +31,8 @@ import org.apache.commons.math.ode.EquationsMapper; * retrieve the state vector at intermediate times between the * previous and the current grid points (dense output).

    * - * @see org.apache.commons.math.ode.FirstOrderIntegrator - * @see org.apache.commons.math.ode.SecondOrderIntegrator + * @see org.apache.commons.math3.ode.FirstOrderIntegrator + * @see org.apache.commons.math3.ode.SecondOrderIntegrator * @see StepHandler * * @version $Id$ @@ -103,7 +103,7 @@ public abstract class AbstractStepInterpolator * instance in order to initialize the internal arrays. This * constructor is used only in order to delay the initialization in * some cases. As an example, the {@link - * org.apache.commons.math.ode.nonstiff.EmbeddedRungeKuttaIntegrator} + * org.apache.commons.math3.ode.nonstiff.EmbeddedRungeKuttaIntegrator} * class uses the prototyping design pattern to create the step * interpolators by cloning an uninitialized model and latter * initializing the copy. diff --git a/src/main/java/org/apache/commons/math/ode/sampling/DummyStepHandler.java b/src/main/java/org/apache/commons/math3/ode/sampling/DummyStepHandler.java similarity index 98% rename from src/main/java/org/apache/commons/math/ode/sampling/DummyStepHandler.java rename to src/main/java/org/apache/commons/math3/ode/sampling/DummyStepHandler.java index 0369053b7..d1c761d49 100644 --- a/src/main/java/org/apache/commons/math/ode/sampling/DummyStepHandler.java +++ b/src/main/java/org/apache/commons/math3/ode/sampling/DummyStepHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.ode.sampling; +package org.apache.commons.math3.ode.sampling; /** * This class is a step handler that does nothing. diff --git a/src/main/java/org/apache/commons/math/ode/sampling/FixedStepHandler.java b/src/main/java/org/apache/commons/math3/ode/sampling/FixedStepHandler.java similarity index 98% rename from src/main/java/org/apache/commons/math/ode/sampling/FixedStepHandler.java rename to src/main/java/org/apache/commons/math3/ode/sampling/FixedStepHandler.java index 6094b0b14..e3be43d19 100644 --- a/src/main/java/org/apache/commons/math/ode/sampling/FixedStepHandler.java +++ b/src/main/java/org/apache/commons/math3/ode/sampling/FixedStepHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.ode.sampling; +package org.apache.commons.math3.ode.sampling; /** diff --git a/src/main/java/org/apache/commons/math/ode/sampling/NordsieckStepInterpolator.java b/src/main/java/org/apache/commons/math3/ode/sampling/NordsieckStepInterpolator.java similarity index 96% rename from src/main/java/org/apache/commons/math/ode/sampling/NordsieckStepInterpolator.java rename to src/main/java/org/apache/commons/math3/ode/sampling/NordsieckStepInterpolator.java index 370f6c3b7..d98148f1f 100644 --- a/src/main/java/org/apache/commons/math/ode/sampling/NordsieckStepInterpolator.java +++ b/src/main/java/org/apache/commons/math3/ode/sampling/NordsieckStepInterpolator.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.commons.math.ode.sampling; +package org.apache.commons.math3.ode.sampling; import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; import java.util.Arrays; -import org.apache.commons.math.linear.Array2DRowRealMatrix; -import org.apache.commons.math.ode.EquationsMapper; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.linear.Array2DRowRealMatrix; +import org.apache.commons.math3.ode.EquationsMapper; +import org.apache.commons.math3.util.FastMath; /** * This class implements an interpolator for integrators using Nordsieck representation. @@ -32,8 +32,8 @@ import org.apache.commons.math.util.FastMath; *

    This interpolator computes dense output around the current point. * The interpolation equation is based on Taylor series formulas. * - * @see org.apache.commons.math.ode.nonstiff.AdamsBashforthIntegrator - * @see org.apache.commons.math.ode.nonstiff.AdamsMoultonIntegrator + * @see org.apache.commons.math3.ode.nonstiff.AdamsBashforthIntegrator + * @see org.apache.commons.math3.ode.nonstiff.AdamsMoultonIntegrator * @version $Id$ * @since 2.0 */ diff --git a/src/main/java/org/apache/commons/math/ode/sampling/StepHandler.java b/src/main/java/org/apache/commons/math3/ode/sampling/StepHandler.java similarity index 92% rename from src/main/java/org/apache/commons/math/ode/sampling/StepHandler.java rename to src/main/java/org/apache/commons/math3/ode/sampling/StepHandler.java index b3ac9f590..e044c3ea1 100644 --- a/src/main/java/org/apache/commons/math/ode/sampling/StepHandler.java +++ b/src/main/java/org/apache/commons/math3/ode/sampling/StepHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.ode.sampling; +package org.apache.commons.math3.ode.sampling; /** @@ -31,8 +31,8 @@ package org.apache.commons.math.ode.sampling; * last one, store the points in an ephemeris, or forward them to * specialized processing or output methods.

    * - * @see org.apache.commons.math.ode.FirstOrderIntegrator - * @see org.apache.commons.math.ode.SecondOrderIntegrator + * @see org.apache.commons.math3.ode.FirstOrderIntegrator + * @see org.apache.commons.math3.ode.SecondOrderIntegrator * @see StepInterpolator * @version $Id$ * @since 1.2 @@ -59,7 +59,7 @@ public interface StepHandler { * object on each call, so if the instance wants to keep it across * all calls (for example to provide at the end of the integration a * continuous model valid throughout the integration range, as the - * {@link org.apache.commons.math.ode.ContinuousOutputModel + * {@link org.apache.commons.math3.ode.ContinuousOutputModel * ContinuousOutputModel} class does), it should build a local copy * using the clone method of the interpolator and store this copy. * Keeping only a reference to the interpolator and reusing it will diff --git a/src/main/java/org/apache/commons/math/ode/sampling/StepInterpolator.java b/src/main/java/org/apache/commons/math3/ode/sampling/StepInterpolator.java similarity index 93% rename from src/main/java/org/apache/commons/math/ode/sampling/StepInterpolator.java rename to src/main/java/org/apache/commons/math3/ode/sampling/StepInterpolator.java index 892cae785..58b0b1054 100644 --- a/src/main/java/org/apache/commons/math/ode/sampling/StepInterpolator.java +++ b/src/main/java/org/apache/commons/math3/ode/sampling/StepInterpolator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.ode.sampling; +package org.apache.commons.math3.ode.sampling; import java.io.Externalizable; @@ -37,8 +37,8 @@ import java.io.Externalizable; * {@link #copy()} method. *

    * - * @see org.apache.commons.math.ode.FirstOrderIntegrator - * @see org.apache.commons.math.ode.SecondOrderIntegrator + * @see org.apache.commons.math3.ode.FirstOrderIntegrator + * @see org.apache.commons.math3.ode.SecondOrderIntegrator * @see StepHandler * @version $Id$ * @since 1.2 @@ -106,8 +106,8 @@ public interface StepInterpolator extends Externalizable { * it should not be modified and it should be copied if it needs * to be preserved across several calls.

    * @param index index of the secondary set, as returned by {@link - * org.apache.commons.math.ode.ExpandableStatefulODE#addSecondaryEquations( - * org.apache.commons.math.ode.SecondaryEquations) + * org.apache.commons.math3.ode.ExpandableStatefulODE#addSecondaryEquations( + * org.apache.commons.math3.ode.SecondaryEquations) * ExpandableStatefulODE.addSecondaryEquations(SecondaryEquations)} * @return interpolated secondary state at the current interpolation date * @see #getInterpolatedState() @@ -123,8 +123,8 @@ public interface StepInterpolator extends Externalizable { * it should not be modified and it should be copied if it needs * to be preserved across several calls.

    * @param index index of the secondary set, as returned by {@link - * org.apache.commons.math.ode.ExpandableStatefulODE#addSecondaryEquations( - * org.apache.commons.math.ode.SecondaryEquations) + * org.apache.commons.math3.ode.ExpandableStatefulODE#addSecondaryEquations( + * org.apache.commons.math3.ode.SecondaryEquations) * ExpandableStatefulODE.addSecondaryEquations(SecondaryEquations)} * @return interpolated secondary derivatives at the current interpolation date * @see #getInterpolatedState() diff --git a/src/main/java/org/apache/commons/math/ode/sampling/StepNormalizer.java b/src/main/java/org/apache/commons/math3/ode/sampling/StepNormalizer.java similarity index 99% rename from src/main/java/org/apache/commons/math/ode/sampling/StepNormalizer.java rename to src/main/java/org/apache/commons/math3/ode/sampling/StepNormalizer.java index f753689e1..9441ed288 100644 --- a/src/main/java/org/apache/commons/math/ode/sampling/StepNormalizer.java +++ b/src/main/java/org/apache/commons/math3/ode/sampling/StepNormalizer.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.ode.sampling; +package org.apache.commons.math3.ode.sampling; -import org.apache.commons.math.util.FastMath; -import org.apache.commons.math.util.Precision; +import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math3.util.Precision; /** * This class wraps an object implementing {@link FixedStepHandler} diff --git a/src/main/java/org/apache/commons/math/ode/sampling/StepNormalizerBounds.java b/src/main/java/org/apache/commons/math3/ode/sampling/StepNormalizerBounds.java similarity index 98% rename from src/main/java/org/apache/commons/math/ode/sampling/StepNormalizerBounds.java rename to src/main/java/org/apache/commons/math3/ode/sampling/StepNormalizerBounds.java index b26b48206..178883faf 100644 --- a/src/main/java/org/apache/commons/math/ode/sampling/StepNormalizerBounds.java +++ b/src/main/java/org/apache/commons/math3/ode/sampling/StepNormalizerBounds.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.ode.sampling; +package org.apache.commons.math3.ode.sampling; /** {@link StepNormalizer Step normalizer} bounds settings. They influence * whether the underlying fixed step size step handler is called for the first diff --git a/src/main/java/org/apache/commons/math/ode/sampling/StepNormalizerMode.java b/src/main/java/org/apache/commons/math3/ode/sampling/StepNormalizerMode.java similarity index 98% rename from src/main/java/org/apache/commons/math/ode/sampling/StepNormalizerMode.java rename to src/main/java/org/apache/commons/math3/ode/sampling/StepNormalizerMode.java index 89493229d..550f1d0d8 100644 --- a/src/main/java/org/apache/commons/math/ode/sampling/StepNormalizerMode.java +++ b/src/main/java/org/apache/commons/math3/ode/sampling/StepNormalizerMode.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.ode.sampling; +package org.apache.commons.math3.ode.sampling; /** {@link StepNormalizer Step normalizer} modes. Determines how the step size diff --git a/src/main/java/org/apache/commons/math/ode/sampling/package-info.java b/src/main/java/org/apache/commons/math3/ode/sampling/package-info.java similarity index 80% rename from src/main/java/org/apache/commons/math/ode/sampling/package-info.java rename to src/main/java/org/apache/commons/math3/ode/sampling/package-info.java index bb88dc7de..29c65e074 100644 --- a/src/main/java/org/apache/commons/math/ode/sampling/package-info.java +++ b/src/main/java/org/apache/commons/math3/ode/sampling/package-info.java @@ -25,8 +25,8 @@ * In addition to computing the evolution of the state vector at some grid points, all * ODE integrators also build up interpolation models of this evolution inside the * last computed step. If users are interested in these interpolators, they can register a - * {@link org.apache.commons.math.ode.sampling.StepHandler StepHandler} instance using the - * {@link org.apache.commons.math.ode.FirstOrderIntegrator#addStepHandler addStepHandler} + * {@link org.apache.commons.math3.ode.sampling.StepHandler StepHandler} instance using the + * {@link org.apache.commons.math3.ode.FirstOrderIntegrator#addStepHandler addStepHandler} * method which is supported by all integrators. The integrator will call this instance * at the end of each accepted step and provide it the interpolator. The user can do * whatever he wants with this interpolator, which computes both the state and its @@ -44,17 +44,17 @@ * *

    * Since some integrators may use variable step size, the generic {@link - * org.apache.commons.math.ode.sampling.StepHandler StepHandler} interface can be called + * org.apache.commons.math3.ode.sampling.StepHandler StepHandler} interface can be called * either at regular or irregular rate. This interface allows to navigate to any location * within the last computed step, thanks to the provided {@link - * org.apache.commons.math.ode.sampling.StepInterpolator StepInterpolator} object. + * org.apache.commons.math3.ode.sampling.StepInterpolator StepInterpolator} object. * If regular output is desired (for example in order to write an ephemeris file), then - * the simpler {@link org.apache.commons.math.ode.sampling.FixedStepHandler FixedStepHandler} + * the simpler {@link org.apache.commons.math3.ode.sampling.FixedStepHandler FixedStepHandler} * interface can be used. Objects implementing this interface should be wrapped within a - * {@link org.apache.commons.math.ode.sampling.StepNormalizer StepNormalizer} instance + * {@link org.apache.commons.math3.ode.sampling.StepNormalizer StepNormalizer} instance * in order to be registered to the integrator. *

    * * */ -package org.apache.commons.math.ode.sampling; +package org.apache.commons.math3.ode.sampling; diff --git a/src/main/java/org/apache/commons/math/optimization/AbstractConvergenceChecker.java b/src/main/java/org/apache/commons/math3/optimization/AbstractConvergenceChecker.java similarity index 96% rename from src/main/java/org/apache/commons/math/optimization/AbstractConvergenceChecker.java rename to src/main/java/org/apache/commons/math3/optimization/AbstractConvergenceChecker.java index a0914d9a4..decf1fb3c 100644 --- a/src/main/java/org/apache/commons/math/optimization/AbstractConvergenceChecker.java +++ b/src/main/java/org/apache/commons/math3/optimization/AbstractConvergenceChecker.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.optimization; +package org.apache.commons.math3.optimization; -import org.apache.commons.math.util.Precision; +import org.apache.commons.math3.util.Precision; /** * Base class for all convergence checker implementations. diff --git a/src/main/java/org/apache/commons/math/optimization/BaseMultivariateMultiStartOptimizer.java b/src/main/java/org/apache/commons/math3/optimization/BaseMultivariateMultiStartOptimizer.java similarity index 94% rename from src/main/java/org/apache/commons/math/optimization/BaseMultivariateMultiStartOptimizer.java rename to src/main/java/org/apache/commons/math3/optimization/BaseMultivariateMultiStartOptimizer.java index 3d8631c27..b2867a021 100644 --- a/src/main/java/org/apache/commons/math/optimization/BaseMultivariateMultiStartOptimizer.java +++ b/src/main/java/org/apache/commons/math3/optimization/BaseMultivariateMultiStartOptimizer.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.apache.commons.math.optimization; +package org.apache.commons.math3.optimization; import java.util.Arrays; import java.util.Comparator; -import org.apache.commons.math.analysis.MultivariateFunction; -import org.apache.commons.math.exception.MathIllegalStateException; -import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.random.RandomVectorGenerator; +import org.apache.commons.math3.analysis.MultivariateFunction; +import org.apache.commons.math3.exception.MathIllegalStateException; +import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.random.RandomVectorGenerator; /** * Base class for all implementations of a multi-start optimizer. diff --git a/src/main/java/org/apache/commons/math/optimization/BaseMultivariateOptimizer.java b/src/main/java/org/apache/commons/math3/optimization/BaseMultivariateOptimizer.java similarity index 78% rename from src/main/java/org/apache/commons/math/optimization/BaseMultivariateOptimizer.java rename to src/main/java/org/apache/commons/math3/optimization/BaseMultivariateOptimizer.java index 97ec1dc21..e7651c8ad 100644 --- a/src/main/java/org/apache/commons/math/optimization/BaseMultivariateOptimizer.java +++ b/src/main/java/org/apache/commons/math3/optimization/BaseMultivariateOptimizer.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.apache.commons.math.optimization; +package org.apache.commons.math3.optimization; -import org.apache.commons.math.analysis.MultivariateFunction; +import org.apache.commons.math3.analysis.MultivariateFunction; /** * This interface is mainly intended to enforce the internal coherence of * Commons-FastMath. Users of the API are advised to base their code on * the following interfaces: *
      - *
    • {@link org.apache.commons.math.optimization.MultivariateOptimizer}
      • - *
    • {@link org.apache.commons.math.optimization.DifferentiableMultivariateOptimizer}
      • + *
    • {@link org.apache.commons.math3.optimization.MultivariateOptimizer}
      • + *
    • {@link org.apache.commons.math3.optimization.DifferentiableMultivariateOptimizer}
      • *
    * * @param Type of the objective function to be optimized. @@ -45,11 +45,11 @@ public interface BaseMultivariateOptimizer * @param maxEval Maximum number of function evaluations. * @return the point/value pair giving the optimal value for objective * function. - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if the start point dimension is wrong. - * @throws org.apache.commons.math.exception.TooManyEvaluationsException + * @throws org.apache.commons.math3.exception.TooManyEvaluationsException * if the maximal number of evaluations is exceeded. - * @throws org.apache.commons.math.exception.NullArgumentException if + * @throws org.apache.commons.math3.exception.NullArgumentException if * any argument is {@code null}. */ PointValuePair optimize(int maxEval, FUNC f, GoalType goalType, diff --git a/src/main/java/org/apache/commons/math/optimization/BaseMultivariateSimpleBoundsOptimizer.java b/src/main/java/org/apache/commons/math3/optimization/BaseMultivariateSimpleBoundsOptimizer.java similarity index 77% rename from src/main/java/org/apache/commons/math/optimization/BaseMultivariateSimpleBoundsOptimizer.java rename to src/main/java/org/apache/commons/math3/optimization/BaseMultivariateSimpleBoundsOptimizer.java index 67e8d1295..27b0d70ba 100644 --- a/src/main/java/org/apache/commons/math/optimization/BaseMultivariateSimpleBoundsOptimizer.java +++ b/src/main/java/org/apache/commons/math3/optimization/BaseMultivariateSimpleBoundsOptimizer.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.apache.commons.math.optimization; +package org.apache.commons.math3.optimization; -import org.apache.commons.math.analysis.MultivariateFunction; +import org.apache.commons.math3.analysis.MultivariateFunction; /** * This interface is mainly intended to enforce the internal coherence of * Commons-FastMath. Users of the API are advised to base their code on * the following interfaces: *
      - *
    • {@link org.apache.commons.math.optimization.MultivariateOptimizer}
      • - *
    • {@link org.apache.commons.math.optimization.DifferentiableMultivariateOptimizer}
      • + *
    • {@link org.apache.commons.math3.optimization.MultivariateOptimizer}
      • + *
    • {@link org.apache.commons.math3.optimization.DifferentiableMultivariateOptimizer}
      • *
    * * @param Type of the objective function to be optimized. @@ -47,15 +47,15 @@ public interface BaseMultivariateSimpleBoundsOptimizer - *
  • {@link org.apache.commons.math.optimization.DifferentiableMultivariateVectorOptimizer}
    • + *
  • {@link org.apache.commons.math3.optimization.DifferentiableMultivariateVectorOptimizer}
    • * * * @param Type of the objective function to be optimized. @@ -47,11 +47,11 @@ public interface BaseMultivariateVectorOptimizer - *
  • {@link org.apache.commons.math.optimization.MultivariateOptimizer}
    • - *
  • {@link org.apache.commons.math.optimization.DifferentiableMultivariateOptimizer}
    • - *
  • {@link org.apache.commons.math.optimization.DifferentiableMultivariateVectorOptimizer}
    • - *
  • {@link org.apache.commons.math.optimization.univariate.UnivariateRealOptimizer}
    • + *
  • {@link org.apache.commons.math3.optimization.MultivariateOptimizer}
    • + *
  • {@link org.apache.commons.math3.optimization.DifferentiableMultivariateOptimizer}
    • + *
  • {@link org.apache.commons.math3.optimization.DifferentiableMultivariateVectorOptimizer}
    • + *
  • {@link org.apache.commons.math3.optimization.univariate.UnivariateRealOptimizer}
    • * * * @param Type of the point/objective pair. diff --git a/src/main/java/org/apache/commons/math/optimization/ConvergenceChecker.java b/src/main/java/org/apache/commons/math3/optimization/ConvergenceChecker.java similarity index 89% rename from src/main/java/org/apache/commons/math/optimization/ConvergenceChecker.java rename to src/main/java/org/apache/commons/math3/optimization/ConvergenceChecker.java index 4d5067cd6..3297886e9 100644 --- a/src/main/java/org/apache/commons/math/optimization/ConvergenceChecker.java +++ b/src/main/java/org/apache/commons/math3/optimization/ConvergenceChecker.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.optimization; +package org.apache.commons.math3.optimization; /** * This interface specifies how to check if an optimization algorithm has @@ -36,9 +36,9 @@ package org.apache.commons.math.optimization; * * @param Type of the (point, objective value) pair. * - * @see org.apache.commons.math.optimization.SimplePointChecker - * @see org.apache.commons.math.optimization.SimpleValueChecker - * @see org.apache.commons.math.optimization.SimpleVectorValueChecker + * @see org.apache.commons.math3.optimization.SimplePointChecker + * @see org.apache.commons.math3.optimization.SimpleValueChecker + * @see org.apache.commons.math3.optimization.SimpleVectorValueChecker * * @version $Id$ * @since 3.0 diff --git a/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateMultiStartOptimizer.java b/src/main/java/org/apache/commons/math3/optimization/DifferentiableMultivariateMultiStartOptimizer.java similarity index 91% rename from src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateMultiStartOptimizer.java rename to src/main/java/org/apache/commons/math3/optimization/DifferentiableMultivariateMultiStartOptimizer.java index ceb1f6b00..e008ab876 100644 --- a/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateMultiStartOptimizer.java +++ b/src/main/java/org/apache/commons/math3/optimization/DifferentiableMultivariateMultiStartOptimizer.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.optimization; +package org.apache.commons.math3.optimization; -import org.apache.commons.math.analysis.DifferentiableMultivariateFunction; -import org.apache.commons.math.random.RandomVectorGenerator; +import org.apache.commons.math3.analysis.DifferentiableMultivariateFunction; +import org.apache.commons.math3.random.RandomVectorGenerator; /** * Special implementation of the {@link DifferentiableMultivariateOptimizer} diff --git a/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateOptimizer.java b/src/main/java/org/apache/commons/math3/optimization/DifferentiableMultivariateOptimizer.java similarity index 91% rename from src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateOptimizer.java rename to src/main/java/org/apache/commons/math3/optimization/DifferentiableMultivariateOptimizer.java index 06224aca6..b731028be 100644 --- a/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateOptimizer.java +++ b/src/main/java/org/apache/commons/math3/optimization/DifferentiableMultivariateOptimizer.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.optimization; +package org.apache.commons.math3.optimization; -import org.apache.commons.math.analysis.DifferentiableMultivariateFunction; +import org.apache.commons.math3.analysis.DifferentiableMultivariateFunction; /** * This interface represents an optimization algorithm for diff --git a/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateVectorMultiStartOptimizer.java b/src/main/java/org/apache/commons/math3/optimization/DifferentiableMultivariateVectorMultiStartOptimizer.java similarity index 91% rename from src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateVectorMultiStartOptimizer.java rename to src/main/java/org/apache/commons/math3/optimization/DifferentiableMultivariateVectorMultiStartOptimizer.java index a30d43b5c..36d4ffab1 100644 --- a/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateVectorMultiStartOptimizer.java +++ b/src/main/java/org/apache/commons/math3/optimization/DifferentiableMultivariateVectorMultiStartOptimizer.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.optimization; +package org.apache.commons.math3.optimization; -import org.apache.commons.math.analysis.DifferentiableMultivariateVectorFunction; -import org.apache.commons.math.random.RandomVectorGenerator; +import org.apache.commons.math3.analysis.DifferentiableMultivariateVectorFunction; +import org.apache.commons.math3.random.RandomVectorGenerator; /** * Special implementation of the {@link DifferentiableMultivariateVectorOptimizer} diff --git a/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateVectorOptimizer.java b/src/main/java/org/apache/commons/math3/optimization/DifferentiableMultivariateVectorOptimizer.java similarity index 89% rename from src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateVectorOptimizer.java rename to src/main/java/org/apache/commons/math3/optimization/DifferentiableMultivariateVectorOptimizer.java index bb7811988..bd32c238a 100644 --- a/src/main/java/org/apache/commons/math/optimization/DifferentiableMultivariateVectorOptimizer.java +++ b/src/main/java/org/apache/commons/math3/optimization/DifferentiableMultivariateVectorOptimizer.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.optimization; +package org.apache.commons.math3.optimization; -import org.apache.commons.math.analysis.DifferentiableMultivariateVectorFunction; +import org.apache.commons.math3.analysis.DifferentiableMultivariateVectorFunction; /** * This interface represents an optimization algorithm for diff --git a/src/main/java/org/apache/commons/math/optimization/GoalType.java b/src/main/java/org/apache/commons/math3/optimization/GoalType.java similarity index 95% rename from src/main/java/org/apache/commons/math/optimization/GoalType.java rename to src/main/java/org/apache/commons/math3/optimization/GoalType.java index f7acb0a16..1b499c779 100644 --- a/src/main/java/org/apache/commons/math/optimization/GoalType.java +++ b/src/main/java/org/apache/commons/math3/optimization/GoalType.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math.optimization; +package org.apache.commons.math3.optimization; import java.io.Serializable; diff --git a/src/main/java/org/apache/commons/math/optimization/LeastSquaresConverter.java b/src/main/java/org/apache/commons/math3/optimization/LeastSquaresConverter.java similarity index 96% rename from src/main/java/org/apache/commons/math/optimization/LeastSquaresConverter.java rename to src/main/java/org/apache/commons/math3/optimization/LeastSquaresConverter.java index b8bab414f..e807d4ea4 100644 --- a/src/main/java/org/apache/commons/math/optimization/LeastSquaresConverter.java +++ b/src/main/java/org/apache/commons/math3/optimization/LeastSquaresConverter.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.commons.math.optimization; +package org.apache.commons.math3.optimization; -import org.apache.commons.math.analysis.MultivariateFunction; -import org.apache.commons.math.analysis.MultivariateVectorFunction; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.linear.RealMatrix; +import org.apache.commons.math3.analysis.MultivariateFunction; +import org.apache.commons.math3.analysis.MultivariateVectorFunction; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.linear.RealMatrix; /** This class converts {@link MultivariateVectorFunction vectorial * objective functions} to {@link MultivariateFunction scalar objective functions} diff --git a/src/main/java/org/apache/commons/math/optimization/MultivariateMultiStartOptimizer.java b/src/main/java/org/apache/commons/math3/optimization/MultivariateMultiStartOptimizer.java similarity index 92% rename from src/main/java/org/apache/commons/math/optimization/MultivariateMultiStartOptimizer.java rename to src/main/java/org/apache/commons/math3/optimization/MultivariateMultiStartOptimizer.java index 66e2bea26..ff52f9cd4 100644 --- a/src/main/java/org/apache/commons/math/optimization/MultivariateMultiStartOptimizer.java +++ b/src/main/java/org/apache/commons/math3/optimization/MultivariateMultiStartOptimizer.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.optimization; +package org.apache.commons.math3.optimization; -import org.apache.commons.math.analysis.MultivariateFunction; -import org.apache.commons.math.random.RandomVectorGenerator; +import org.apache.commons.math3.analysis.MultivariateFunction; +import org.apache.commons.math3.random.RandomVectorGenerator; /** * Special implementation of the {@link MultivariateOptimizer} interface adding diff --git a/src/main/java/org/apache/commons/math/optimization/MultivariateOptimizer.java b/src/main/java/org/apache/commons/math3/optimization/MultivariateOptimizer.java similarity index 92% rename from src/main/java/org/apache/commons/math/optimization/MultivariateOptimizer.java rename to src/main/java/org/apache/commons/math3/optimization/MultivariateOptimizer.java index bbf16004f..5464ee05e 100644 --- a/src/main/java/org/apache/commons/math/optimization/MultivariateOptimizer.java +++ b/src/main/java/org/apache/commons/math3/optimization/MultivariateOptimizer.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.optimization; +package org.apache.commons.math3.optimization; -import org.apache.commons.math.analysis.MultivariateFunction; +import org.apache.commons.math3.analysis.MultivariateFunction; /** * This interface represents an optimization algorithm for {@link MultivariateFunction diff --git a/src/main/java/org/apache/commons/math/optimization/PointValuePair.java b/src/main/java/org/apache/commons/math3/optimization/PointValuePair.java similarity index 94% rename from src/main/java/org/apache/commons/math/optimization/PointValuePair.java rename to src/main/java/org/apache/commons/math3/optimization/PointValuePair.java index 2877aa7d4..2fe7610db 100644 --- a/src/main/java/org/apache/commons/math/optimization/PointValuePair.java +++ b/src/main/java/org/apache/commons/math3/optimization/PointValuePair.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.commons.math.optimization; +package org.apache.commons.math3.optimization; -import org.apache.commons.math.util.Pair; +import org.apache.commons.math3.util.Pair; /** * This class holds a point and the value of an objective function at * that point. * * @see PointVectorValuePair - * @see org.apache.commons.math.analysis.MultivariateFunction + * @see org.apache.commons.math3.analysis.MultivariateFunction * @version $Id$ * @since 3.0 */ diff --git a/src/main/java/org/apache/commons/math/optimization/PointVectorValuePair.java b/src/main/java/org/apache/commons/math3/optimization/PointVectorValuePair.java similarity index 95% rename from src/main/java/org/apache/commons/math/optimization/PointVectorValuePair.java rename to src/main/java/org/apache/commons/math3/optimization/PointVectorValuePair.java index 91b551caf..96424a4d2 100644 --- a/src/main/java/org/apache/commons/math/optimization/PointVectorValuePair.java +++ b/src/main/java/org/apache/commons/math3/optimization/PointVectorValuePair.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.commons.math.optimization; +package org.apache.commons.math3.optimization; -import org.apache.commons.math.util.Pair; +import org.apache.commons.math3.util.Pair; /** * This class holds a point and the vectorial value of an objective function at * that point. * * @see PointValuePair - * @see org.apache.commons.math.analysis.MultivariateVectorFunction + * @see org.apache.commons.math3.analysis.MultivariateVectorFunction * @version $Id$ * @since 3.0 */ diff --git a/src/main/java/org/apache/commons/math/optimization/SimplePointChecker.java b/src/main/java/org/apache/commons/math3/optimization/SimplePointChecker.java similarity index 96% rename from src/main/java/org/apache/commons/math/optimization/SimplePointChecker.java rename to src/main/java/org/apache/commons/math3/optimization/SimplePointChecker.java index 3705ea9e4..0befb2bf5 100644 --- a/src/main/java/org/apache/commons/math/optimization/SimplePointChecker.java +++ b/src/main/java/org/apache/commons/math3/optimization/SimplePointChecker.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math.optimization; +package org.apache.commons.math3.optimization; -import org.apache.commons.math.util.FastMath; -import org.apache.commons.math.util.Pair; +import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math3.util.Pair; /** * Simple implementation of the {@link ConvergenceChecker} interface using diff --git a/src/main/java/org/apache/commons/math/optimization/SimpleValueChecker.java b/src/main/java/org/apache/commons/math3/optimization/SimpleValueChecker.java similarity index 97% rename from src/main/java/org/apache/commons/math/optimization/SimpleValueChecker.java rename to src/main/java/org/apache/commons/math3/optimization/SimpleValueChecker.java index c68887e88..6e985d46d 100644 --- a/src/main/java/org/apache/commons/math/optimization/SimpleValueChecker.java +++ b/src/main/java/org/apache/commons/math3/optimization/SimpleValueChecker.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.optimization; +package org.apache.commons.math3.optimization; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.util.FastMath; /** * Simple implementation of the {@link ConvergenceChecker} interface using diff --git a/src/main/java/org/apache/commons/math/optimization/SimpleVectorValueChecker.java b/src/main/java/org/apache/commons/math3/optimization/SimpleVectorValueChecker.java similarity index 97% rename from src/main/java/org/apache/commons/math/optimization/SimpleVectorValueChecker.java rename to src/main/java/org/apache/commons/math3/optimization/SimpleVectorValueChecker.java index 6d33c5496..c614c78c0 100644 --- a/src/main/java/org/apache/commons/math/optimization/SimpleVectorValueChecker.java +++ b/src/main/java/org/apache/commons/math3/optimization/SimpleVectorValueChecker.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.commons.math.optimization; +package org.apache.commons.math3.optimization; -import org.apache.commons.math.util.FastMath; +import org.apache.commons.math3.util.FastMath; /** * Simple implementation of the {@link ConvergenceChecker} interface using diff --git a/src/main/java/org/apache/commons/math/optimization/direct/AbstractSimplex.java b/src/main/java/org/apache/commons/math3/optimization/direct/AbstractSimplex.java similarity index 93% rename from src/main/java/org/apache/commons/math/optimization/direct/AbstractSimplex.java rename to src/main/java/org/apache/commons/math3/optimization/direct/AbstractSimplex.java index 6d02c2ab1..96184c476 100644 --- a/src/main/java/org/apache/commons/math/optimization/direct/AbstractSimplex.java +++ b/src/main/java/org/apache/commons/math3/optimization/direct/AbstractSimplex.java @@ -15,20 +15,20 @@ * limitations under the License. */ -package org.apache.commons.math.optimization.direct; +package org.apache.commons.math3.optimization.direct; import java.util.Arrays; import java.util.Comparator; -import org.apache.commons.math.analysis.MultivariateFunction; -import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.ZeroException; -import org.apache.commons.math.exception.OutOfRangeException; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.exception.MathIllegalArgumentException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.optimization.PointValuePair; +import org.apache.commons.math3.analysis.MultivariateFunction; +import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.ZeroException; +import org.apache.commons.math3.exception.OutOfRangeException; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.optimization.PointValuePair; /** * This class implements the simplex concept. @@ -199,7 +199,7 @@ public abstract class AbstractSimplex { * @param evaluationFunction Evaluation function. * @param comparator Comparator to use to sort simplex vertices from best * to worst. - * @throws org.apache.commons.math.exception.TooManyEvaluationsException + * @throws org.apache.commons.math3.exception.TooManyEvaluationsException * if the algorithm fails to converge. */ public abstract void iterate(final MultivariateFunction evaluationFunction, @@ -237,7 +237,7 @@ public abstract class AbstractSimplex { * * @param evaluationFunction Evaluation function. * @param comparator Comparator to use to sort simplex vertices from best to worst. - * @throws org.apache.commons.math.exception.TooManyEvaluationsException + * @throws org.apache.commons.math3.exception.TooManyEvaluationsException * if the maximal number of evaluations is exceeded. */ public void evaluate(final MultivariateFunction evaluationFunction, diff --git a/src/main/java/org/apache/commons/math/optimization/direct/BOBYQAOptimizer.java b/src/main/java/org/apache/commons/math3/optimization/direct/BOBYQAOptimizer.java similarity index 99% rename from src/main/java/org/apache/commons/math/optimization/direct/BOBYQAOptimizer.java rename to src/main/java/org/apache/commons/math3/optimization/direct/BOBYQAOptimizer.java index 7964149cf..5197d2088 100644 --- a/src/main/java/org/apache/commons/math/optimization/direct/BOBYQAOptimizer.java +++ b/src/main/java/org/apache/commons/math3/optimization/direct/BOBYQAOptimizer.java @@ -15,21 +15,21 @@ * limitations under the License. */ -package org.apache.commons.math.optimization.direct; +package org.apache.commons.math3.optimization.direct; import java.util.Arrays; -import org.apache.commons.math.analysis.MultivariateFunction; -import org.apache.commons.math.exception.MathIllegalStateException; -import org.apache.commons.math.exception.NumberIsTooSmallException; -import org.apache.commons.math.exception.OutOfRangeException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.linear.Array2DRowRealMatrix; -import org.apache.commons.math.linear.ArrayRealVector; -import org.apache.commons.math.linear.RealVector; -import org.apache.commons.math.optimization.GoalType; -import org.apache.commons.math.optimization.PointValuePair; -import org.apache.commons.math.optimization.MultivariateOptimizer; +import org.apache.commons.math3.analysis.MultivariateFunction; +import org.apache.commons.math3.exception.MathIllegalStateException; +import org.apache.commons.math3.exception.NumberIsTooSmallException; +import org.apache.commons.math3.exception.OutOfRangeException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.linear.Array2DRowRealMatrix; +import org.apache.commons.math3.linear.ArrayRealVector; +import org.apache.commons.math3.linear.RealVector; +import org.apache.commons.math3.optimization.GoalType; +import org.apache.commons.math3.optimization.PointValuePair; +import org.apache.commons.math3.optimization.MultivariateOptimizer; /** * Powell's BOBYQA algorithm. This implementation is translated and diff --git a/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractMultivariateOptimizer.java b/src/main/java/org/apache/commons/math3/optimization/direct/BaseAbstractMultivariateOptimizer.java similarity index 86% rename from src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractMultivariateOptimizer.java rename to src/main/java/org/apache/commons/math3/optimization/direct/BaseAbstractMultivariateOptimizer.java index 130769a44..0696947ac 100644 --- a/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractMultivariateOptimizer.java +++ b/src/main/java/org/apache/commons/math3/optimization/direct/BaseAbstractMultivariateOptimizer.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package org.apache.commons.math.optimization.direct; +package org.apache.commons.math3.optimization.direct; -import org.apache.commons.math.util.Incrementor; -import org.apache.commons.math.exception.MaxCountExceededException; -import org.apache.commons.math.exception.TooManyEvaluationsException; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.analysis.MultivariateFunction; -import org.apache.commons.math.optimization.BaseMultivariateOptimizer; -import org.apache.commons.math.optimization.GoalType; -import org.apache.commons.math.optimization.ConvergenceChecker; -import org.apache.commons.math.optimization.PointValuePair; -import org.apache.commons.math.optimization.SimpleValueChecker; +import org.apache.commons.math3.util.Incrementor; +import org.apache.commons.math3.exception.MaxCountExceededException; +import org.apache.commons.math3.exception.TooManyEvaluationsException; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.analysis.MultivariateFunction; +import org.apache.commons.math3.optimization.BaseMultivariateOptimizer; +import org.apache.commons.math3.optimization.GoalType; +import org.apache.commons.math3.optimization.ConvergenceChecker; +import org.apache.commons.math3.optimization.PointValuePair; +import org.apache.commons.math3.optimization.SimpleValueChecker; /** * Base class for implementing optimizers for multivariate scalar functions. diff --git a/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractMultivariateSimpleBoundsOptimizer.java b/src/main/java/org/apache/commons/math3/optimization/direct/BaseAbstractMultivariateSimpleBoundsOptimizer.java similarity index 86% rename from src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractMultivariateSimpleBoundsOptimizer.java rename to src/main/java/org/apache/commons/math3/optimization/direct/BaseAbstractMultivariateSimpleBoundsOptimizer.java index 78b639334..d79be69bb 100644 --- a/src/main/java/org/apache/commons/math/optimization/direct/BaseAbstractMultivariateSimpleBoundsOptimizer.java +++ b/src/main/java/org/apache/commons/math3/optimization/direct/BaseAbstractMultivariateSimpleBoundsOptimizer.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.apache.commons.math.optimization.direct; +package org.apache.commons.math3.optimization.direct; -import org.apache.commons.math.analysis.MultivariateFunction; -import org.apache.commons.math.optimization.BaseMultivariateOptimizer; -import org.apache.commons.math.optimization.BaseMultivariateSimpleBoundsOptimizer; -import org.apache.commons.math.optimization.GoalType; -import org.apache.commons.math.optimization.PointValuePair; -import org.apache.commons.math.optimization.ConvergenceChecker; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.NumberIsTooSmallException; -import org.apache.commons.math.exception.NumberIsTooLargeException; +import org.apache.commons.math3.analysis.MultivariateFunction; +import org.apache.commons.math3.optimization.BaseMultivariateOptimizer; +import org.apache.commons.math3.optimization.BaseMultivariateSimpleBoundsOptimizer; +import org.apache.commons.math3.optimization.GoalType; +import org.apache.commons.math3.optimization.PointValuePair; +import org.apache.commons.math3.optimization.ConvergenceChecker; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.NumberIsTooSmallException; +import org.apache.commons.math3.exception.NumberIsTooLargeException; /** * Base class for implementing optimizers for multivariate scalar functions, @@ -51,7 +51,7 @@ public abstract class BaseAbstractMultivariateSimpleBoundsOptimizerAn implementation of the active Covariance Matrix Adaptation Evolution Strategy (CMA-ES) diff --git a/src/main/java/org/apache/commons/math/optimization/direct/MultiDirectionalSimplex.java b/src/main/java/org/apache/commons/math3/optimization/direct/MultiDirectionalSimplex.java similarity index 95% rename from src/main/java/org/apache/commons/math/optimization/direct/MultiDirectionalSimplex.java rename to src/main/java/org/apache/commons/math3/optimization/direct/MultiDirectionalSimplex.java index 2a819b025..83ed48f9f 100644 --- a/src/main/java/org/apache/commons/math/optimization/direct/MultiDirectionalSimplex.java +++ b/src/main/java/org/apache/commons/math3/optimization/direct/MultiDirectionalSimplex.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.commons.math.optimization.direct; +package org.apache.commons.math3.optimization.direct; import java.util.Comparator; -import org.apache.commons.math.analysis.MultivariateFunction; -import org.apache.commons.math.optimization.PointValuePair; +import org.apache.commons.math3.analysis.MultivariateFunction; +import org.apache.commons.math3.optimization.PointValuePair; /** * This class implements the multi-directional direct search method. @@ -137,9 +137,9 @@ public class MultiDirectionalSimplex extends AbstractSimplex { * {@link AbstractSimplex#AbstractSimplex(double[][])}. * @param khi Expansion coefficient. * @param gamma Contraction coefficient. - * @throws org.apache.commons.math.exception.NotStrictlyPositiveException + * @throws org.apache.commons.math3.exception.NotStrictlyPositiveException * if the reference simplex does not contain at least one point. - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if there is a dimension mismatch in the reference simplex. */ public MultiDirectionalSimplex(final double[][] referenceSimplex, @@ -188,7 +188,7 @@ public class MultiDirectionalSimplex extends AbstractSimplex { * @param comparator Comparator to use to sort simplex vertices from best * to poorest. * @return the best point in the transformed simplex. - * @throws org.apache.commons.math.exception.TooManyEvaluationsException + * @throws org.apache.commons.math3.exception.TooManyEvaluationsException * if the maximal number of evaluations is exceeded. */ private PointValuePair evaluateNewSimplex(final MultivariateFunction evaluationFunction, diff --git a/src/main/java/org/apache/commons/math/optimization/direct/MultivariateFunctionMappingAdapter.java b/src/main/java/org/apache/commons/math3/optimization/direct/MultivariateFunctionMappingAdapter.java similarity index 93% rename from src/main/java/org/apache/commons/math/optimization/direct/MultivariateFunctionMappingAdapter.java rename to src/main/java/org/apache/commons/math3/optimization/direct/MultivariateFunctionMappingAdapter.java index 45cf13a98..3ba9609a6 100644 --- a/src/main/java/org/apache/commons/math/optimization/direct/MultivariateFunctionMappingAdapter.java +++ b/src/main/java/org/apache/commons/math3/optimization/direct/MultivariateFunctionMappingAdapter.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.commons.math.optimization.direct; +package org.apache.commons.math3.optimization.direct; -import org.apache.commons.math.analysis.MultivariateFunction; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.analysis.function.Logit; -import org.apache.commons.math.analysis.function.Sigmoid; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.NumberIsTooSmallException; -import org.apache.commons.math.util.FastMath; -import org.apache.commons.math.util.MathUtils; +import org.apache.commons.math3.analysis.MultivariateFunction; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.function.Logit; +import org.apache.commons.math3.analysis.function.Sigmoid; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.NumberIsTooSmallException; +import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math3.util.MathUtils; /** *

    Adapter for mapping bounded {@link MultivariateFunction} to unbounded ones.

    @@ -53,8 +53,8 @@ import org.apache.commons.math.util.MathUtils; * user is responsible for converting his bounded point to unbounded by calling * {@link #boundedToUnbounded(double[])} before providing them to the optimizer. * For the same reason, the point returned by the {@link - * org.apache.commons.math.optimization.BaseMultivariateOptimizer#optimize(int, - * MultivariateFunction, org.apache.commons.math.optimization.GoalType, double[])} + * org.apache.commons.math3.optimization.BaseMultivariateOptimizer#optimize(int, + * MultivariateFunction, org.apache.commons.math3.optimization.GoalType, double[])} * method is unbounded. So to convert this point to bounded, users must call * {@link #unboundedToBounded(double[])} by themselves!

    *

    diff --git a/src/main/java/org/apache/commons/math/optimization/direct/MultivariateFunctionPenaltyAdapter.java b/src/main/java/org/apache/commons/math3/optimization/direct/MultivariateFunctionPenaltyAdapter.java similarity index 95% rename from src/main/java/org/apache/commons/math/optimization/direct/MultivariateFunctionPenaltyAdapter.java rename to src/main/java/org/apache/commons/math3/optimization/direct/MultivariateFunctionPenaltyAdapter.java index 10cb622e8..344764ba4 100644 --- a/src/main/java/org/apache/commons/math/optimization/direct/MultivariateFunctionPenaltyAdapter.java +++ b/src/main/java/org/apache/commons/math3/optimization/direct/MultivariateFunctionPenaltyAdapter.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.commons.math.optimization.direct; +package org.apache.commons.math3.optimization.direct; -import org.apache.commons.math.analysis.MultivariateFunction; -import org.apache.commons.math.exception.DimensionMismatchException; -import org.apache.commons.math.exception.NumberIsTooSmallException; -import org.apache.commons.math.util.FastMath; -import org.apache.commons.math.util.MathUtils; +import org.apache.commons.math3.analysis.MultivariateFunction; +import org.apache.commons.math3.exception.DimensionMismatchException; +import org.apache.commons.math3.exception.NumberIsTooSmallException; +import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math3.util.MathUtils; /** *

    Adapter extending bounded {@link MultivariateFunction} to an unbouded diff --git a/src/main/java/org/apache/commons/math/optimization/direct/NelderMeadSimplex.java b/src/main/java/org/apache/commons/math3/optimization/direct/NelderMeadSimplex.java similarity index 96% rename from src/main/java/org/apache/commons/math/optimization/direct/NelderMeadSimplex.java rename to src/main/java/org/apache/commons/math3/optimization/direct/NelderMeadSimplex.java index 9292df6b2..199548521 100644 --- a/src/main/java/org/apache/commons/math/optimization/direct/NelderMeadSimplex.java +++ b/src/main/java/org/apache/commons/math3/optimization/direct/NelderMeadSimplex.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.commons.math.optimization.direct; +package org.apache.commons.math3.optimization.direct; import java.util.Comparator; -import org.apache.commons.math.optimization.PointValuePair; -import org.apache.commons.math.analysis.MultivariateFunction; +import org.apache.commons.math3.optimization.PointValuePair; +import org.apache.commons.math3.analysis.MultivariateFunction; /** * This class implements the Nelder-Mead simplex algorithm. @@ -166,9 +166,9 @@ public class NelderMeadSimplex extends AbstractSimplex { * @param khi Expansion coefficient. * @param gamma Contraction coefficient. * @param sigma Shrinkage coefficient. - * @throws org.apache.commons.math.exception.NotStrictlyPositiveException + * @throws org.apache.commons.math3.exception.NotStrictlyPositiveException * if the reference simplex does not contain at least one point. - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if there is a dimension mismatch in the reference simplex. */ public NelderMeadSimplex(final double[][] referenceSimplex, diff --git a/src/main/java/org/apache/commons/math/optimization/direct/PowellOptimizer.java b/src/main/java/org/apache/commons/math3/optimization/direct/PowellOptimizer.java similarity index 90% rename from src/main/java/org/apache/commons/math/optimization/direct/PowellOptimizer.java rename to src/main/java/org/apache/commons/math3/optimization/direct/PowellOptimizer.java index bf678ed32..ffe1dffff 100644 --- a/src/main/java/org/apache/commons/math/optimization/direct/PowellOptimizer.java +++ b/src/main/java/org/apache/commons/math3/optimization/direct/PowellOptimizer.java @@ -15,21 +15,21 @@ * limitations under the License. */ -package org.apache.commons.math.optimization.direct; +package org.apache.commons.math3.optimization.direct; -import org.apache.commons.math.util.FastMath; -import org.apache.commons.math.util.MathArrays; -import org.apache.commons.math.analysis.UnivariateFunction; -import org.apache.commons.math.analysis.MultivariateFunction; -import org.apache.commons.math.exception.NumberIsTooSmallException; -import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.optimization.GoalType; -import org.apache.commons.math.optimization.PointValuePair; -import org.apache.commons.math.optimization.ConvergenceChecker; -import org.apache.commons.math.optimization.MultivariateOptimizer; -import org.apache.commons.math.optimization.univariate.BracketFinder; -import org.apache.commons.math.optimization.univariate.BrentOptimizer; -import org.apache.commons.math.optimization.univariate.UnivariatePointValuePair; +import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math3.util.MathArrays; +import org.apache.commons.math3.analysis.UnivariateFunction; +import org.apache.commons.math3.analysis.MultivariateFunction; +import org.apache.commons.math3.exception.NumberIsTooSmallException; +import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math3.optimization.GoalType; +import org.apache.commons.math3.optimization.PointValuePair; +import org.apache.commons.math3.optimization.ConvergenceChecker; +import org.apache.commons.math3.optimization.MultivariateOptimizer; +import org.apache.commons.math3.optimization.univariate.BracketFinder; +import org.apache.commons.math3.optimization.univariate.BrentOptimizer; +import org.apache.commons.math3.optimization.univariate.UnivariatePointValuePair; /** * Powell algorithm. @@ -259,7 +259,7 @@ public class PowellOptimizer * @param p Starting point. * @param d Search direction. * @return the optimum. - * @throws org.apache.commons.math.exception.TooManyEvaluationsException + * @throws org.apache.commons.math3.exception.TooManyEvaluationsException * if the number of evaluations is exceeded. */ public UnivariatePointValuePair search(final double[] p, final double[] d) { diff --git a/src/main/java/org/apache/commons/math/optimization/direct/SimplexOptimizer.java b/src/main/java/org/apache/commons/math3/optimization/direct/SimplexOptimizer.java similarity index 92% rename from src/main/java/org/apache/commons/math/optimization/direct/SimplexOptimizer.java rename to src/main/java/org/apache/commons/math3/optimization/direct/SimplexOptimizer.java index 14e5ff3c0..469a7ed54 100644 --- a/src/main/java/org/apache/commons/math/optimization/direct/SimplexOptimizer.java +++ b/src/main/java/org/apache/commons/math3/optimization/direct/SimplexOptimizer.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.apache.commons.math.optimization.direct; +package org.apache.commons.math3.optimization.direct; import java.util.Comparator; -import org.apache.commons.math.analysis.MultivariateFunction; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.optimization.GoalType; -import org.apache.commons.math.optimization.ConvergenceChecker; -import org.apache.commons.math.optimization.PointValuePair; -import org.apache.commons.math.optimization.SimpleValueChecker; -import org.apache.commons.math.optimization.MultivariateOptimizer; +import org.apache.commons.math3.analysis.MultivariateFunction; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.optimization.GoalType; +import org.apache.commons.math3.optimization.ConvergenceChecker; +import org.apache.commons.math3.optimization.PointValuePair; +import org.apache.commons.math3.optimization.SimpleValueChecker; +import org.apache.commons.math3.optimization.MultivariateOptimizer; /** * This class implements simplex-based direct search optimization. diff --git a/src/main/java/org/apache/commons/math/optimization/direct/package-info.java b/src/main/java/org/apache/commons/math3/optimization/direct/package-info.java similarity index 94% rename from src/main/java/org/apache/commons/math/optimization/direct/package-info.java rename to src/main/java/org/apache/commons/math3/optimization/direct/package-info.java index 0bd9e122d..a587bcfff 100644 --- a/src/main/java/org/apache/commons/math/optimization/direct/package-info.java +++ b/src/main/java/org/apache/commons/math3/optimization/direct/package-info.java @@ -21,4 +21,4 @@ *

    * */ -package org.apache.commons.math.optimization.direct; +package org.apache.commons.math3.optimization.direct; diff --git a/src/main/java/org/apache/commons/math/optimization/fitting/CurveFitter.java b/src/main/java/org/apache/commons/math3/optimization/fitting/CurveFitter.java similarity index 91% rename from src/main/java/org/apache/commons/math/optimization/fitting/CurveFitter.java rename to src/main/java/org/apache/commons/math3/optimization/fitting/CurveFitter.java index 677768c5d..160970fe6 100644 --- a/src/main/java/org/apache/commons/math/optimization/fitting/CurveFitter.java +++ b/src/main/java/org/apache/commons/math3/optimization/fitting/CurveFitter.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.commons.math.optimization.fitting; +package org.apache.commons.math3.optimization.fitting; import java.util.ArrayList; import java.util.List; -import org.apache.commons.math.analysis.DifferentiableMultivariateVectorFunction; -import org.apache.commons.math.analysis.ParametricUnivariateFunction; -import org.apache.commons.math.analysis.MultivariateMatrixFunction; -import org.apache.commons.math.optimization.DifferentiableMultivariateVectorOptimizer; -import org.apache.commons.math.optimization.PointVectorValuePair; +import org.apache.commons.math3.analysis.DifferentiableMultivariateVectorFunction; +import org.apache.commons.math3.analysis.ParametricUnivariateFunction; +import org.apache.commons.math3.analysis.MultivariateMatrixFunction; +import org.apache.commons.math3.optimization.DifferentiableMultivariateVectorOptimizer; +import org.apache.commons.math3.optimization.PointVectorValuePair; /** Fitter for parametric univariate real functions y = f(x). *

    When a univariate real function y = f(x) does depend on some @@ -117,7 +117,7 @@ public class CurveFitter { * @param f parametric function to fit. * @param initialGuess first guess of the function parameters. * @return the fitted parameters. - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if the start point dimension is wrong. */ public double[] fit(final ParametricUnivariateFunction f, final double[] initialGuess) { @@ -135,9 +135,9 @@ public class CurveFitter { * @param initialGuess first guess of the function parameters. * @param maxEval Maximum number of function evaluations. * @return the fitted parameters. - * @throws org.apache.commons.math.exception.TooManyEvaluationsException + * @throws org.apache.commons.math3.exception.TooManyEvaluationsException * if the number of allowed evaluations is exceeded. - * @throws org.apache.commons.math.exception.DimensionMismatchException + * @throws org.apache.commons.math3.exception.DimensionMismatchException * if the start point dimension is wrong. * @since 3.0 */ diff --git a/src/main/java/org/apache/commons/math/optimization/fitting/GaussianFitter.java b/src/main/java/org/apache/commons/math3/optimization/fitting/GaussianFitter.java similarity index 92% rename from src/main/java/org/apache/commons/math/optimization/fitting/GaussianFitter.java rename to src/main/java/org/apache/commons/math3/optimization/fitting/GaussianFitter.java index af4666416..8c46bcde1 100644 --- a/src/main/java/org/apache/commons/math/optimization/fitting/GaussianFitter.java +++ b/src/main/java/org/apache/commons/math3/optimization/fitting/GaussianFitter.java @@ -15,26 +15,26 @@ * limitations under the License. */ -package org.apache.commons.math.optimization.fitting; +package org.apache.commons.math3.optimization.fitting; import java.util.Arrays; import java.util.Comparator; -import org.apache.commons.math.analysis.function.Gaussian; -import org.apache.commons.math.analysis.ParametricUnivariateFunction; -import org.apache.commons.math.exception.NullArgumentException; -import org.apache.commons.math.exception.NumberIsTooSmallException; -import org.apache.commons.math.exception.OutOfRangeException; -import org.apache.commons.math.exception.ZeroException; -import org.apache.commons.math.exception.NotStrictlyPositiveException; -import org.apache.commons.math.exception.util.LocalizedFormats; -import org.apache.commons.math.optimization.DifferentiableMultivariateVectorOptimizer; -import org.apache.commons.math.optimization.fitting.CurveFitter; -import org.apache.commons.math.optimization.fitting.WeightedObservedPoint; +import org.apache.commons.math3.analysis.function.Gaussian; +import org.apache.commons.math3.analysis.ParametricUnivariateFunction; +import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math3.exception.NumberIsTooSmallException; +import org.apache.commons.math3.exception.OutOfRangeException; +import org.apache.commons.math3.exception.ZeroException; +import org.apache.commons.math3.exception.NotStrictlyPositiveException; +import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math3.optimization.DifferentiableMultivariateVectorOptimizer; +import org.apache.commons.math3.optimization.fitting.CurveFitter; +import org.apache.commons.math3.optimization.fitting.WeightedObservedPoint; /** * Fits points to a {@link - * org.apache.commons.math.analysis.function.Gaussian.Parametric Gaussian} function. + * org.apache.commons.math3.analysis.function.Gaussian.Parametric Gaussian} function. *

    * Usage example: * 

    @@ -124,7 +124,7 @@ public class GaussianFitter extends CurveFitter {
 
     /**
      * Guesses the parameters {@code norm}, {@code mean}, and {@code sigma}
-     * of a {@link org.apache.commons.math.analysis.function.Gaussian.Parametric}
+     * of a {@link org.apache.commons.math3.analysis.function.Gaussian.Parametric}
      * based on the specified observed points.
      */
     public static class ParameterGuesser {
diff --git a/src/main/java/org/apache/commons/math/optimization/fitting/HarmonicFitter.java b/src/main/java/org/apache/commons/math3/optimization/fitting/HarmonicFitter.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/optimization/fitting/HarmonicFitter.java
rename to src/main/java/org/apache/commons/math3/optimization/fitting/HarmonicFitter.java
index 928dfa676..8bdab74aa 100644
--- a/src/main/java/org/apache/commons/math/optimization/fitting/HarmonicFitter.java
+++ b/src/main/java/org/apache/commons/math3/optimization/fitting/HarmonicFitter.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.fitting;
+package org.apache.commons.math3.optimization.fitting;
 
-import org.apache.commons.math.optimization.DifferentiableMultivariateVectorOptimizer;
-import org.apache.commons.math.analysis.function.HarmonicOscillator;
-import org.apache.commons.math.exception.ZeroException;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.optimization.DifferentiableMultivariateVectorOptimizer;
+import org.apache.commons.math3.analysis.function.HarmonicOscillator;
+import org.apache.commons.math3.exception.ZeroException;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.util.FastMath;
 
 /**
  * Class that implements a curve fitting specialized for sinusoids.
diff --git a/src/main/java/org/apache/commons/math/optimization/fitting/PolynomialFitter.java b/src/main/java/org/apache/commons/math3/optimization/fitting/PolynomialFitter.java
similarity index 87%
rename from src/main/java/org/apache/commons/math/optimization/fitting/PolynomialFitter.java
rename to src/main/java/org/apache/commons/math3/optimization/fitting/PolynomialFitter.java
index 9ece71930..f5fd4451c 100644
--- a/src/main/java/org/apache/commons/math/optimization/fitting/PolynomialFitter.java
+++ b/src/main/java/org/apache/commons/math3/optimization/fitting/PolynomialFitter.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.fitting;
+package org.apache.commons.math3.optimization.fitting;
 
-import org.apache.commons.math.analysis.polynomials.PolynomialFunction;
-import org.apache.commons.math.optimization.DifferentiableMultivariateVectorOptimizer;
+import org.apache.commons.math3.analysis.polynomials.PolynomialFunction;
+import org.apache.commons.math3.optimization.DifferentiableMultivariateVectorOptimizer;
 
 /** This class implements a curve fitting specialized for polynomials.
  * 
    Polynomial fitting is a very simple case of curve fitting. The
@@ -49,7 +49,7 @@ public class PolynomialFitter extends CurveFitter {
      * Get the polynomial fitting the weighted (x, y) points.
      *
      * @return the coefficients of the polynomial that best fits the observed points.
-     * @throws org.apache.commons.math.exception.ConvergenceException
+     * @throws org.apache.commons.math3.exception.ConvergenceException
      * if the algorithm failed to converge.
      */
     public double[] fit() {
diff --git a/src/main/java/org/apache/commons/math/optimization/fitting/WeightedObservedPoint.java b/src/main/java/org/apache/commons/math3/optimization/fitting/WeightedObservedPoint.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/optimization/fitting/WeightedObservedPoint.java
rename to src/main/java/org/apache/commons/math3/optimization/fitting/WeightedObservedPoint.java
index 892b8775a..7de425b96 100644
--- a/src/main/java/org/apache/commons/math/optimization/fitting/WeightedObservedPoint.java
+++ b/src/main/java/org/apache/commons/math3/optimization/fitting/WeightedObservedPoint.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.fitting;
+package org.apache.commons.math3.optimization.fitting;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/org/apache/commons/math/optimization/fitting/package-info.java b/src/main/java/org/apache/commons/math3/optimization/fitting/package-info.java
similarity index 95%
rename from src/main/java/org/apache/commons/math/optimization/fitting/package-info.java
rename to src/main/java/org/apache/commons/math3/optimization/fitting/package-info.java
index 0ba73f05d..b25e5fd37 100644
--- a/src/main/java/org/apache/commons/math/optimization/fitting/package-info.java
+++ b/src/main/java/org/apache/commons/math3/optimization/fitting/package-info.java
@@ -27,4 +27,4 @@
  *
  *
  */
-package org.apache.commons.math.optimization.fitting;
+package org.apache.commons.math3.optimization.fitting;
diff --git a/src/main/java/org/apache/commons/math/optimization/general/AbstractLeastSquaresOptimizer.java b/src/main/java/org/apache/commons/math3/optimization/general/AbstractLeastSquaresOptimizer.java
similarity index 88%
rename from src/main/java/org/apache/commons/math/optimization/general/AbstractLeastSquaresOptimizer.java
rename to src/main/java/org/apache/commons/math3/optimization/general/AbstractLeastSquaresOptimizer.java
index 48f9de4ca..e156d65a2 100644
--- a/src/main/java/org/apache/commons/math/optimization/general/AbstractLeastSquaresOptimizer.java
+++ b/src/main/java/org/apache/commons/math3/optimization/general/AbstractLeastSquaresOptimizer.java
@@ -15,21 +15,21 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.general;
+package org.apache.commons.math3.optimization.general;
 
-import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.analysis.DifferentiableMultivariateVectorFunction;
-import org.apache.commons.math.analysis.MultivariateMatrixFunction;
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.linear.QRDecomposition;
-import org.apache.commons.math.linear.DecompositionSolver;
-import org.apache.commons.math.linear.MatrixUtils;
-import org.apache.commons.math.optimization.ConvergenceChecker;
-import org.apache.commons.math.optimization.DifferentiableMultivariateVectorOptimizer;
-import org.apache.commons.math.optimization.PointVectorValuePair;
-import org.apache.commons.math.optimization.direct.BaseAbstractMultivariateVectorOptimizer;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.analysis.DifferentiableMultivariateVectorFunction;
+import org.apache.commons.math3.analysis.MultivariateMatrixFunction;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.linear.QRDecomposition;
+import org.apache.commons.math3.linear.DecompositionSolver;
+import org.apache.commons.math3.linear.MatrixUtils;
+import org.apache.commons.math3.optimization.ConvergenceChecker;
+import org.apache.commons.math3.optimization.DifferentiableMultivariateVectorOptimizer;
+import org.apache.commons.math3.optimization.PointVectorValuePair;
+import org.apache.commons.math3.optimization.direct.BaseAbstractMultivariateVectorOptimizer;
+import org.apache.commons.math3.util.FastMath;
 
 /**
  * Base class for implementing least squares optimizers.
@@ -83,7 +83,7 @@ public abstract class AbstractLeastSquaresOptimizer
     /**
      * Simple constructor with default settings.
      * The convergence check is set to a {@link
-     * org.apache.commons.math.optimization.SimpleVectorValueChecker}.
+     * org.apache.commons.math3.optimization.SimpleVectorValueChecker}.
      */
     protected AbstractLeastSquaresOptimizer() {}
     /**
@@ -129,7 +129,7 @@ public abstract class AbstractLeastSquaresOptimizer
      * Update the residuals array and cost function value.
      * @throws DimensionMismatchException if the dimension does not match the
      * problem dimension.
-     * @throws org.apache.commons.math.exception.TooManyEvaluationsException
+     * @throws org.apache.commons.math3.exception.TooManyEvaluationsException
      * if the maximal number of evaluations is exceeded.
      */
     protected void updateResidualsAndCost() {
@@ -178,7 +178,7 @@ public abstract class AbstractLeastSquaresOptimizer
      * Get the covariance matrix of the optimized parameters.
      *
      * @return the covariance matrix.
-     * @throws org.apache.commons.math.linear.SingularMatrixException
+     * @throws org.apache.commons.math3.linear.SingularMatrixException
      * if the covariance matrix cannot be computed (singular problem).
      *
      * @see #getCovariances(double)
@@ -199,7 +199,7 @@ public abstract class AbstractLeastSquaresOptimizer
      *
      * @param threshold Singularity threshold.
      * @return the covariance matrix.
-     * @throws org.apache.commons.math.linear.SingularMatrixException
+     * @throws org.apache.commons.math3.linear.SingularMatrixException
      * if the covariance matrix cannot be computed (singular problem).
      */
     public double[][] getCovariances(double threshold) {
@@ -230,7 +230,7 @@ public abstract class AbstractLeastSquaresOptimizer
      * Guessing is covariance-based: It only gives a rough order of magnitude.
      *
      * @return errors in optimized parameters
-     * @throws org.apache.commons.math.linear.SingularMatrixException
+     * @throws org.apache.commons.math3.linear.SingularMatrixException
      * if the covariances matrix cannot be computed.
      * @throws NumberIsTooSmallException if the number of degrees of freedom is not
      * positive, i.e. the number of measurements is less or equal to the number of
diff --git a/src/main/java/org/apache/commons/math/optimization/general/AbstractScalarDifferentiableOptimizer.java b/src/main/java/org/apache/commons/math3/optimization/general/AbstractScalarDifferentiableOptimizer.java
similarity index 78%
rename from src/main/java/org/apache/commons/math/optimization/general/AbstractScalarDifferentiableOptimizer.java
rename to src/main/java/org/apache/commons/math3/optimization/general/AbstractScalarDifferentiableOptimizer.java
index 7a6783ffe..76be89ae1 100644
--- a/src/main/java/org/apache/commons/math/optimization/general/AbstractScalarDifferentiableOptimizer.java
+++ b/src/main/java/org/apache/commons/math3/optimization/general/AbstractScalarDifferentiableOptimizer.java
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.general;
+package org.apache.commons.math3.optimization.general;
 
-import org.apache.commons.math.analysis.DifferentiableMultivariateFunction;
-import org.apache.commons.math.analysis.MultivariateVectorFunction;
-import org.apache.commons.math.optimization.DifferentiableMultivariateOptimizer;
-import org.apache.commons.math.optimization.GoalType;
-import org.apache.commons.math.optimization.ConvergenceChecker;
-import org.apache.commons.math.optimization.PointValuePair;
-import org.apache.commons.math.optimization.direct.BaseAbstractMultivariateOptimizer;
+import org.apache.commons.math3.analysis.DifferentiableMultivariateFunction;
+import org.apache.commons.math3.analysis.MultivariateVectorFunction;
+import org.apache.commons.math3.optimization.DifferentiableMultivariateOptimizer;
+import org.apache.commons.math3.optimization.GoalType;
+import org.apache.commons.math3.optimization.ConvergenceChecker;
+import org.apache.commons.math3.optimization.PointValuePair;
+import org.apache.commons.math3.optimization.direct.BaseAbstractMultivariateOptimizer;
 
 /**
  * Base class for implementing optimizers for multivariate scalar
@@ -44,7 +44,7 @@ public abstract class AbstractScalarDifferentiableOptimizer
     /**
      * Simple constructor with default settings.
      * The convergence check is set to a
-     * {@link org.apache.commons.math.optimization.SimpleValueChecker
+     * {@link org.apache.commons.math3.optimization.SimpleValueChecker
      * SimpleValueChecker}.
      */
     protected AbstractScalarDifferentiableOptimizer() {}
@@ -60,7 +60,7 @@ public abstract class AbstractScalarDifferentiableOptimizer
      *
      * @param evaluationPoint Point at which the gradient must be evaluated.
      * @return the gradient at the specified point.
-     * @throws org.apache.commons.math.exception.TooManyEvaluationsException
+     * @throws org.apache.commons.math3.exception.TooManyEvaluationsException
      * if the allowed number of evaluations is exceeded.
      */
     protected double[] computeObjectiveGradient(final double[] evaluationPoint) {
diff --git a/src/main/java/org/apache/commons/math/optimization/general/ConjugateGradientFormula.java b/src/main/java/org/apache/commons/math3/optimization/general/ConjugateGradientFormula.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/optimization/general/ConjugateGradientFormula.java
rename to src/main/java/org/apache/commons/math3/optimization/general/ConjugateGradientFormula.java
index 3f454d4f9..6db6b5539 100644
--- a/src/main/java/org/apache/commons/math/optimization/general/ConjugateGradientFormula.java
+++ b/src/main/java/org/apache/commons/math3/optimization/general/ConjugateGradientFormula.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.general;
+package org.apache.commons.math3.optimization.general;
 
 /**
  * Available choices of update formulas for the β parameter
diff --git a/src/main/java/org/apache/commons/math/optimization/general/GaussNewtonOptimizer.java b/src/main/java/org/apache/commons/math3/optimization/general/GaussNewtonOptimizer.java
similarity index 87%
rename from src/main/java/org/apache/commons/math/optimization/general/GaussNewtonOptimizer.java
rename to src/main/java/org/apache/commons/math3/optimization/general/GaussNewtonOptimizer.java
index 98b5e17d2..3d620c02b 100644
--- a/src/main/java/org/apache/commons/math/optimization/general/GaussNewtonOptimizer.java
+++ b/src/main/java/org/apache/commons/math3/optimization/general/GaussNewtonOptimizer.java
@@ -15,20 +15,20 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.general;
+package org.apache.commons.math3.optimization.general;
 
-import org.apache.commons.math.exception.ConvergenceException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.linear.ArrayRealVector;
-import org.apache.commons.math.linear.BlockRealMatrix;
-import org.apache.commons.math.linear.DecompositionSolver;
-import org.apache.commons.math.linear.LUDecomposition;
-import org.apache.commons.math.linear.QRDecomposition;
-import org.apache.commons.math.linear.RealMatrix;
-import org.apache.commons.math.linear.SingularMatrixException;
-import org.apache.commons.math.optimization.ConvergenceChecker;
-import org.apache.commons.math.optimization.SimpleVectorValueChecker;
-import org.apache.commons.math.optimization.PointVectorValuePair;
+import org.apache.commons.math3.exception.ConvergenceException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.linear.ArrayRealVector;
+import org.apache.commons.math3.linear.BlockRealMatrix;
+import org.apache.commons.math3.linear.DecompositionSolver;
+import org.apache.commons.math3.linear.LUDecomposition;
+import org.apache.commons.math3.linear.QRDecomposition;
+import org.apache.commons.math3.linear.RealMatrix;
+import org.apache.commons.math3.linear.SingularMatrixException;
+import org.apache.commons.math3.optimization.ConvergenceChecker;
+import org.apache.commons.math3.optimization.SimpleVectorValueChecker;
+import org.apache.commons.math3.optimization.PointVectorValuePair;
 
 /**
  * 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/math3/optimization/general/LevenbergMarquardtOptimizer.java
similarity index 98%
rename from src/main/java/org/apache/commons/math/optimization/general/LevenbergMarquardtOptimizer.java
rename to src/main/java/org/apache/commons/math3/optimization/general/LevenbergMarquardtOptimizer.java
index ce7206eb1..804364ed6 100644
--- a/src/main/java/org/apache/commons/math/optimization/general/LevenbergMarquardtOptimizer.java
+++ b/src/main/java/org/apache/commons/math3/optimization/general/LevenbergMarquardtOptimizer.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.optimization.general;
+package org.apache.commons.math3.optimization.general;
 
 import java.util.Arrays;
 
-import org.apache.commons.math.exception.ConvergenceException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.optimization.PointVectorValuePair;
-import org.apache.commons.math.optimization.ConvergenceChecker;
-import org.apache.commons.math.util.Precision;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.exception.ConvergenceException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.optimization.PointVectorValuePair;
+import org.apache.commons.math3.optimization.ConvergenceChecker;
+import org.apache.commons.math3.util.Precision;
+import org.apache.commons.math3.util.FastMath;
 
 
 /**
diff --git a/src/main/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizer.java b/src/main/java/org/apache/commons/math3/optimization/general/NonLinearConjugateGradientOptimizer.java
similarity index 94%
rename from src/main/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizer.java
rename to src/main/java/org/apache/commons/math3/optimization/general/NonLinearConjugateGradientOptimizer.java
index 845c1ca03..a0af0bd97 100644
--- a/src/main/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizer.java
+++ b/src/main/java/org/apache/commons/math3/optimization/general/NonLinearConjugateGradientOptimizer.java
@@ -15,18 +15,18 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.general;
+package org.apache.commons.math3.optimization.general;
 
-import org.apache.commons.math.exception.MathIllegalStateException;
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.analysis.solvers.BrentSolver;
-import org.apache.commons.math.analysis.solvers.UnivariateSolver;
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.optimization.GoalType;
-import org.apache.commons.math.optimization.PointValuePair;
-import org.apache.commons.math.optimization.SimpleValueChecker;
-import org.apache.commons.math.optimization.ConvergenceChecker;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.exception.MathIllegalStateException;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.analysis.solvers.BrentSolver;
+import org.apache.commons.math3.analysis.solvers.UnivariateSolver;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.optimization.GoalType;
+import org.apache.commons.math3.optimization.PointValuePair;
+import org.apache.commons.math3.optimization.SimpleValueChecker;
+import org.apache.commons.math3.optimization.ConvergenceChecker;
+import org.apache.commons.math3.util.FastMath;
 
 /**
  * Non-linear conjugate gradient optimizer.
diff --git a/src/main/java/org/apache/commons/math/optimization/general/Preconditioner.java b/src/main/java/org/apache/commons/math3/optimization/general/Preconditioner.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/optimization/general/Preconditioner.java
rename to src/main/java/org/apache/commons/math3/optimization/general/Preconditioner.java
index 34611b2e7..8f2994f6a 100644
--- a/src/main/java/org/apache/commons/math/optimization/general/Preconditioner.java
+++ b/src/main/java/org/apache/commons/math3/optimization/general/Preconditioner.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.general;
+package org.apache.commons.math3.optimization.general;
 
 /**
  * This interface represents a preconditioner for differentiable scalar
diff --git a/src/main/java/org/apache/commons/math/optimization/general/package-info.java b/src/main/java/org/apache/commons/math3/optimization/general/package-info.java
similarity index 94%
rename from src/main/java/org/apache/commons/math/optimization/general/package-info.java
rename to src/main/java/org/apache/commons/math3/optimization/general/package-info.java
index e8c19c6ef..ba140ce9e 100644
--- a/src/main/java/org/apache/commons/math/optimization/general/package-info.java
+++ b/src/main/java/org/apache/commons/math3/optimization/general/package-info.java
@@ -19,4 +19,4 @@
  * This package provides optimization algorithms that require derivatives.
  *
  */
-package org.apache.commons.math.optimization.general;
+package org.apache.commons.math3.optimization.general;
diff --git a/src/main/java/org/apache/commons/math/optimization/linear/AbstractLinearOptimizer.java b/src/main/java/org/apache/commons/math3/optimization/linear/AbstractLinearOptimizer.java
similarity index 92%
rename from src/main/java/org/apache/commons/math/optimization/linear/AbstractLinearOptimizer.java
rename to src/main/java/org/apache/commons/math3/optimization/linear/AbstractLinearOptimizer.java
index 6c5c02a18..37254b651 100644
--- a/src/main/java/org/apache/commons/math/optimization/linear/AbstractLinearOptimizer.java
+++ b/src/main/java/org/apache/commons/math3/optimization/linear/AbstractLinearOptimizer.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.linear;
+package org.apache.commons.math3.optimization.linear;
 
 import java.util.Collection;
 
-import org.apache.commons.math.exception.MathIllegalStateException;
-import org.apache.commons.math.exception.MaxCountExceededException;
-import org.apache.commons.math.optimization.GoalType;
-import org.apache.commons.math.optimization.PointValuePair;
+import org.apache.commons.math3.exception.MathIllegalStateException;
+import org.apache.commons.math3.exception.MaxCountExceededException;
+import org.apache.commons.math3.optimization.GoalType;
+import org.apache.commons.math3.optimization.PointValuePair;
 
 /**
  * Base class for implementing linear optimizers.
diff --git a/src/main/java/org/apache/commons/math/optimization/linear/LinearConstraint.java b/src/main/java/org/apache/commons/math3/optimization/linear/LinearConstraint.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/optimization/linear/LinearConstraint.java
rename to src/main/java/org/apache/commons/math3/optimization/linear/LinearConstraint.java
index 760e6c093..acf9e1b5c 100644
--- a/src/main/java/org/apache/commons/math/optimization/linear/LinearConstraint.java
+++ b/src/main/java/org/apache/commons/math3/optimization/linear/LinearConstraint.java
@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.linear;
+package org.apache.commons.math3.optimization.linear;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 
-import org.apache.commons.math.linear.MatrixUtils;
-import org.apache.commons.math.linear.RealVector;
-import org.apache.commons.math.linear.ArrayRealVector;
+import org.apache.commons.math3.linear.MatrixUtils;
+import org.apache.commons.math3.linear.RealVector;
+import org.apache.commons.math3.linear.ArrayRealVector;
 
 
 /**
diff --git a/src/main/java/org/apache/commons/math/optimization/linear/LinearObjectiveFunction.java b/src/main/java/org/apache/commons/math3/optimization/linear/LinearObjectiveFunction.java
similarity index 95%
rename from src/main/java/org/apache/commons/math/optimization/linear/LinearObjectiveFunction.java
rename to src/main/java/org/apache/commons/math3/optimization/linear/LinearObjectiveFunction.java
index 65779c9f2..d87b46f54 100644
--- a/src/main/java/org/apache/commons/math/optimization/linear/LinearObjectiveFunction.java
+++ b/src/main/java/org/apache/commons/math3/optimization/linear/LinearObjectiveFunction.java
@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.linear;
+package org.apache.commons.math3.optimization.linear;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 
-import org.apache.commons.math.linear.MatrixUtils;
-import org.apache.commons.math.linear.RealVector;
-import org.apache.commons.math.linear.ArrayRealVector;
+import org.apache.commons.math3.linear.MatrixUtils;
+import org.apache.commons.math3.linear.RealVector;
+import org.apache.commons.math3.linear.ArrayRealVector;
 
 /**
  * An objective function for a linear optimization problem.
diff --git a/src/main/java/org/apache/commons/math/optimization/linear/LinearOptimizer.java b/src/main/java/org/apache/commons/math3/optimization/linear/LinearOptimizer.java
similarity index 94%
rename from src/main/java/org/apache/commons/math/optimization/linear/LinearOptimizer.java
rename to src/main/java/org/apache/commons/math3/optimization/linear/LinearOptimizer.java
index 9a9ab8401..adba4a07b 100644
--- a/src/main/java/org/apache/commons/math/optimization/linear/LinearOptimizer.java
+++ b/src/main/java/org/apache/commons/math3/optimization/linear/LinearOptimizer.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.linear;
+package org.apache.commons.math3.optimization.linear;
 
 import java.util.Collection;
 
-import org.apache.commons.math.exception.MathIllegalStateException;
-import org.apache.commons.math.optimization.GoalType;
-import org.apache.commons.math.optimization.PointValuePair;
+import org.apache.commons.math3.exception.MathIllegalStateException;
+import org.apache.commons.math3.optimization.GoalType;
+import org.apache.commons.math3.optimization.PointValuePair;
 
 /**
  * This interface represents an optimization algorithm for linear problems.
diff --git a/src/main/java/org/apache/commons/math/optimization/linear/NoFeasibleSolutionException.java b/src/main/java/org/apache/commons/math3/optimization/linear/NoFeasibleSolutionException.java
similarity index 87%
rename from src/main/java/org/apache/commons/math/optimization/linear/NoFeasibleSolutionException.java
rename to src/main/java/org/apache/commons/math3/optimization/linear/NoFeasibleSolutionException.java
index 2364d8850..559f9e6bf 100644
--- a/src/main/java/org/apache/commons/math/optimization/linear/NoFeasibleSolutionException.java
+++ b/src/main/java/org/apache/commons/math3/optimization/linear/NoFeasibleSolutionException.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.linear;
+package org.apache.commons.math3.optimization.linear;
 
-import org.apache.commons.math.exception.MathIllegalStateException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
+import org.apache.commons.math3.exception.MathIllegalStateException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
 
 /**
  * This class represents exceptions thrown by optimizers when no solution
diff --git a/src/main/java/org/apache/commons/math/optimization/linear/Relationship.java b/src/main/java/org/apache/commons/math3/optimization/linear/Relationship.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/optimization/linear/Relationship.java
rename to src/main/java/org/apache/commons/math3/optimization/linear/Relationship.java
index c806a685b..7ea47b752 100644
--- a/src/main/java/org/apache/commons/math/optimization/linear/Relationship.java
+++ b/src/main/java/org/apache/commons/math3/optimization/linear/Relationship.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.linear;
+package org.apache.commons.math3.optimization.linear;
 
 /**
  * Types of relationships between two cells in a Solver {@link LinearConstraint}.
diff --git a/src/main/java/org/apache/commons/math/optimization/linear/SimplexSolver.java b/src/main/java/org/apache/commons/math3/optimization/linear/SimplexSolver.java
similarity index 96%
rename from src/main/java/org/apache/commons/math/optimization/linear/SimplexSolver.java
rename to src/main/java/org/apache/commons/math3/optimization/linear/SimplexSolver.java
index 45226e2c4..f94299cf6 100644
--- a/src/main/java/org/apache/commons/math/optimization/linear/SimplexSolver.java
+++ b/src/main/java/org/apache/commons/math3/optimization/linear/SimplexSolver.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.linear;
+package org.apache.commons.math3.optimization.linear;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.math.exception.MaxCountExceededException;
-import org.apache.commons.math.optimization.PointValuePair;
-import org.apache.commons.math.util.Precision;
+import org.apache.commons.math3.exception.MaxCountExceededException;
+import org.apache.commons.math3.optimization.PointValuePair;
+import org.apache.commons.math3.util.Precision;
 
 
 /**
diff --git a/src/main/java/org/apache/commons/math/optimization/linear/SimplexTableau.java b/src/main/java/org/apache/commons/math3/optimization/linear/SimplexTableau.java
similarity index 98%
rename from src/main/java/org/apache/commons/math/optimization/linear/SimplexTableau.java
rename to src/main/java/org/apache/commons/math3/optimization/linear/SimplexTableau.java
index e2ffeb861..9a6993a55 100644
--- a/src/main/java/org/apache/commons/math/optimization/linear/SimplexTableau.java
+++ b/src/main/java/org/apache/commons/math3/optimization/linear/SimplexTableau.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.linear;
+package org.apache.commons.math3.optimization.linear;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -27,13 +27,13 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.math.linear.Array2DRowRealMatrix;
-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.optimization.GoalType;
-import org.apache.commons.math.optimization.PointValuePair;
-import org.apache.commons.math.util.Precision;
+import org.apache.commons.math3.linear.Array2DRowRealMatrix;
+import org.apache.commons.math3.linear.MatrixUtils;
+import org.apache.commons.math3.linear.RealMatrix;
+import org.apache.commons.math3.linear.RealVector;
+import org.apache.commons.math3.optimization.GoalType;
+import org.apache.commons.math3.optimization.PointValuePair;
+import org.apache.commons.math3.util.Precision;
 
 /**
  * A tableau for use in the Simplex method.
diff --git a/src/main/java/org/apache/commons/math/optimization/linear/UnboundedSolutionException.java b/src/main/java/org/apache/commons/math3/optimization/linear/UnboundedSolutionException.java
similarity index 87%
rename from src/main/java/org/apache/commons/math/optimization/linear/UnboundedSolutionException.java
rename to src/main/java/org/apache/commons/math3/optimization/linear/UnboundedSolutionException.java
index 0050d6656..8dc0e7d27 100644
--- a/src/main/java/org/apache/commons/math/optimization/linear/UnboundedSolutionException.java
+++ b/src/main/java/org/apache/commons/math3/optimization/linear/UnboundedSolutionException.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.linear;
+package org.apache.commons.math3.optimization.linear;
 
-import org.apache.commons.math.exception.MathIllegalStateException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
+import org.apache.commons.math3.exception.MathIllegalStateException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
 
 /**
  * This class represents exceptions thrown by optimizers when a solution
diff --git a/src/main/java/org/apache/commons/math/optimization/linear/package-info.java b/src/main/java/org/apache/commons/math3/optimization/linear/package-info.java
similarity index 94%
rename from src/main/java/org/apache/commons/math/optimization/linear/package-info.java
rename to src/main/java/org/apache/commons/math3/optimization/linear/package-info.java
index 5cee2644d..b61b03b1f 100644
--- a/src/main/java/org/apache/commons/math/optimization/linear/package-info.java
+++ b/src/main/java/org/apache/commons/math3/optimization/linear/package-info.java
@@ -19,4 +19,4 @@
  * This package provides optimization algorithms for linear constrained problems.
  *
  */
-package org.apache.commons.math.optimization.linear;
+package org.apache.commons.math3.optimization.linear;
diff --git a/src/main/java/org/apache/commons/math/optimization/package-info.java b/src/main/java/org/apache/commons/math3/optimization/package-info.java
similarity index 74%
rename from src/main/java/org/apache/commons/math/optimization/package-info.java
rename to src/main/java/org/apache/commons/math3/optimization/package-info.java
index 2e0e8d2cc..9905ba4c9 100644
--- a/src/main/java/org/apache/commons/math/optimization/package-info.java
+++ b/src/main/java/org/apache/commons/math3/optimization/package-info.java
@@ -32,32 +32,32 @@
  * interfaces defining the common behavior of optimizers, one for each supported type of objective
  * function:
  * 
      
- *  
    • {@link org.apache.commons.math.optimization.univariate.UnivariateRealOptimizer
- *      UnivariateRealOptimizer} for {@link org.apache.commons.math.analysis.UnivariateFunction
+ *  
    • {@link org.apache.commons.math3.optimization.univariate.UnivariateRealOptimizer
+ *      UnivariateRealOptimizer} for {@link org.apache.commons.math3.analysis.UnivariateFunction
  *      univariate real functions}
      • 
- *  
    • {@link org.apache.commons.math.optimization.MultivariateOptimizer
- *      MultivariateOptimizer} for {@link org.apache.commons.math.analysis.MultivariateFunction
+ *  
    • {@link org.apache.commons.math3.optimization.MultivariateOptimizer
+ *      MultivariateOptimizer} for {@link org.apache.commons.math3.analysis.MultivariateFunction
  *      multivariate real functions}
      • 
- *  
    • {@link org.apache.commons.math.optimization.DifferentiableMultivariateOptimizer
+ *  
    • {@link org.apache.commons.math3.optimization.DifferentiableMultivariateOptimizer
  *      DifferentiableMultivariateOptimizer} for {@link
- *      org.apache.commons.math.analysis.DifferentiableMultivariateFunction
+ *      org.apache.commons.math3.analysis.DifferentiableMultivariateFunction
  *      differentiable multivariate real functions}
      • 
- *  
    • {@link org.apache.commons.math.optimization.DifferentiableMultivariateVectorOptimizer
+ *  
    • {@link org.apache.commons.math3.optimization.DifferentiableMultivariateVectorOptimizer
  *      DifferentiableMultivariateVectorOptimizer} for {@link
- *      org.apache.commons.math.analysis.DifferentiableMultivariateVectorFunction
+ *      org.apache.commons.math3.analysis.DifferentiableMultivariateVectorFunction
  *      differentiable multivariate vectorial functions}
      • 
  * 
    
  * 
    
  *
  * 
    
  * Despite there are only four types of supported optimizers, it is possible to optimize a
- * transform a {@link org.apache.commons.math.analysis.MultivariateVectorFunction
+ * transform a {@link org.apache.commons.math3.analysis.MultivariateVectorFunction
  * non-differentiable multivariate vectorial function} by converting it to a {@link
- * org.apache.commons.math.analysis.MultivariateFunction non-differentiable multivariate
+ * org.apache.commons.math3.analysis.MultivariateFunction non-differentiable multivariate
  * real function} thanks to the {@link
- * org.apache.commons.math.optimization.LeastSquaresConverter LeastSquaresConverter} helper class.
+ * org.apache.commons.math3.optimization.LeastSquaresConverter LeastSquaresConverter} helper class.
  * The transformed function can be optimized using any implementation of the {@link
- * org.apache.commons.math.optimization.MultivariateOptimizer MultivariateOptimizer} interface.
+ * org.apache.commons.math3.optimization.MultivariateOptimizer MultivariateOptimizer} interface.
  * 
    
  *
  * 
    
@@ -69,4 +69,4 @@
  * 
    
  *
  */
-package org.apache.commons.math.optimization;
+package org.apache.commons.math3.optimization;
diff --git a/src/main/java/org/apache/commons/math/optimization/univariate/BaseAbstractUnivariateOptimizer.java b/src/main/java/org/apache/commons/math3/optimization/univariate/BaseAbstractUnivariateOptimizer.java
similarity index 90%
rename from src/main/java/org/apache/commons/math/optimization/univariate/BaseAbstractUnivariateOptimizer.java
rename to src/main/java/org/apache/commons/math3/optimization/univariate/BaseAbstractUnivariateOptimizer.java
index 3d0fa1e01..641a3633c 100644
--- a/src/main/java/org/apache/commons/math/optimization/univariate/BaseAbstractUnivariateOptimizer.java
+++ b/src/main/java/org/apache/commons/math3/optimization/univariate/BaseAbstractUnivariateOptimizer.java
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.univariate;
+package org.apache.commons.math3.optimization.univariate;
 
-import org.apache.commons.math.util.Incrementor;
-import org.apache.commons.math.exception.MaxCountExceededException;
-import org.apache.commons.math.exception.TooManyEvaluationsException;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.optimization.GoalType;
-import org.apache.commons.math.optimization.ConvergenceChecker;
+import org.apache.commons.math3.util.Incrementor;
+import org.apache.commons.math3.exception.MaxCountExceededException;
+import org.apache.commons.math3.exception.TooManyEvaluationsException;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.optimization.GoalType;
+import org.apache.commons.math3.optimization.ConvergenceChecker;
 
 /**
  * Provide a default implementation for several functions useful to generic
diff --git a/src/main/java/org/apache/commons/math/optimization/univariate/BaseUnivariateOptimizer.java b/src/main/java/org/apache/commons/math3/optimization/univariate/BaseUnivariateOptimizer.java
similarity index 82%
rename from src/main/java/org/apache/commons/math/optimization/univariate/BaseUnivariateOptimizer.java
rename to src/main/java/org/apache/commons/math3/optimization/univariate/BaseUnivariateOptimizer.java
index 610582f6b..38c86608f 100644
--- a/src/main/java/org/apache/commons/math/optimization/univariate/BaseUnivariateOptimizer.java
+++ b/src/main/java/org/apache/commons/math3/optimization/univariate/BaseUnivariateOptimizer.java
@@ -15,18 +15,18 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.univariate;
+package org.apache.commons.math3.optimization.univariate;
 
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.optimization.BaseOptimizer;
-import org.apache.commons.math.optimization.GoalType;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.optimization.BaseOptimizer;
+import org.apache.commons.math3.optimization.GoalType;
 
 /**
  * This interface is mainly intended to enforce the internal coherence of
  * Commons-Math. Users of the API are advised to base their code on
  * the following interfaces:
  * 
      
- *  
    • {@link org.apache.commons.math.optimization.univariate.UnivariateRealOptimizer}
      • 
+ *  
    • {@link org.apache.commons.math3.optimization.univariate.UnivariateRealOptimizer}
      • 
  * 
    
  *
  * @param  Type of the objective function to be optimized.
@@ -48,9 +48,9 @@ public interface BaseUnivariateOptimizer
      * @param max Upper bound for the interval.
      * @param maxEval Maximum number of function evaluations.
      * @return a (point, value) pair where the function is optimum.
-     * @throws org.apache.commons.math.exception.TooManyEvaluationsException
+     * @throws org.apache.commons.math3.exception.TooManyEvaluationsException
      * if the maximum evaluation count is exceeded.
-     * @throws org.apache.commons.math.exception.ConvergenceException
+     * @throws org.apache.commons.math3.exception.ConvergenceException
      * if the optimizer detects a convergence problem.
      * @throws IllegalArgumentException if {@code min > max} or the endpoints
      * do not satisfy the requirements specified by the optimizer.
@@ -70,13 +70,13 @@ public interface BaseUnivariateOptimizer
      * @param startValue Start value to use.
      * @param maxEval Maximum number of function evaluations.
      * @return a (point, value) pair where the function is optimum.
-     * @throws org.apache.commons.math.exception.TooManyEvaluationsException
+     * @throws org.apache.commons.math3.exception.TooManyEvaluationsException
      * if the maximum evaluation count is exceeded.
-     * @throws org.apache.commons.math.exception.ConvergenceException if the
+     * @throws org.apache.commons.math3.exception.ConvergenceException if the
      * optimizer detects a convergence problem.
      * @throws IllegalArgumentException if {@code min > max} or the endpoints
      * do not satisfy the requirements specified by the optimizer.
-     * @throws org.apache.commons.math.exception.NullArgumentException if any
+     * @throws org.apache.commons.math3.exception.NullArgumentException if any
      * argument is {@code null}.
      */
     UnivariatePointValuePair optimize(int maxEval, FUNC f, GoalType goalType,
diff --git a/src/main/java/org/apache/commons/math/optimization/univariate/BracketFinder.java b/src/main/java/org/apache/commons/math3/optimization/univariate/BracketFinder.java
similarity index 94%
rename from src/main/java/org/apache/commons/math/optimization/univariate/BracketFinder.java
rename to src/main/java/org/apache/commons/math3/optimization/univariate/BracketFinder.java
index dbe8a3b36..59c45d1b0 100644
--- a/src/main/java/org/apache/commons/math/optimization/univariate/BracketFinder.java
+++ b/src/main/java/org/apache/commons/math3/optimization/univariate/BracketFinder.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.optimization.univariate;
+package org.apache.commons.math3.optimization.univariate;
 
-import org.apache.commons.math.util.Incrementor;
-import org.apache.commons.math.exception.NotStrictlyPositiveException;
-import org.apache.commons.math.exception.TooManyEvaluationsException;
-import org.apache.commons.math.exception.MaxCountExceededException;
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.optimization.GoalType;
+import org.apache.commons.math3.util.Incrementor;
+import org.apache.commons.math3.exception.NotStrictlyPositiveException;
+import org.apache.commons.math3.exception.TooManyEvaluationsException;
+import org.apache.commons.math3.exception.MaxCountExceededException;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.optimization.GoalType;
 
 /**
  * Provide an interval that brackets a local optimum of a function.
diff --git a/src/main/java/org/apache/commons/math/optimization/univariate/BrentOptimizer.java b/src/main/java/org/apache/commons/math3/optimization/univariate/BrentOptimizer.java
similarity index 95%
rename from src/main/java/org/apache/commons/math/optimization/univariate/BrentOptimizer.java
rename to src/main/java/org/apache/commons/math3/optimization/univariate/BrentOptimizer.java
index 9bd639a1e..405eda570 100644
--- a/src/main/java/org/apache/commons/math/optimization/univariate/BrentOptimizer.java
+++ b/src/main/java/org/apache/commons/math3/optimization/univariate/BrentOptimizer.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.optimization.univariate;
+package org.apache.commons.math3.optimization.univariate;
 
-import org.apache.commons.math.util.Precision;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.exception.NotStrictlyPositiveException;
-import org.apache.commons.math.optimization.ConvergenceChecker;
-import org.apache.commons.math.optimization.GoalType;
+import org.apache.commons.math3.util.Precision;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.exception.NotStrictlyPositiveException;
+import org.apache.commons.math3.optimization.ConvergenceChecker;
+import org.apache.commons.math3.optimization.GoalType;
 
 /**
  * Implements Richard Brent's algorithm (from his book "Algorithms for
diff --git a/src/main/java/org/apache/commons/math/optimization/univariate/UnivariateMultiStartOptimizer.java b/src/main/java/org/apache/commons/math3/optimization/univariate/UnivariateMultiStartOptimizer.java
similarity index 93%
rename from src/main/java/org/apache/commons/math/optimization/univariate/UnivariateMultiStartOptimizer.java
rename to src/main/java/org/apache/commons/math3/optimization/univariate/UnivariateMultiStartOptimizer.java
index 4223a5f08..f3a86177c 100644
--- a/src/main/java/org/apache/commons/math/optimization/univariate/UnivariateMultiStartOptimizer.java
+++ b/src/main/java/org/apache/commons/math3/optimization/univariate/UnivariateMultiStartOptimizer.java
@@ -15,19 +15,19 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.univariate;
+package org.apache.commons.math3.optimization.univariate;
 
 import java.util.Arrays;
 import java.util.Comparator;
 
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.exception.MathIllegalStateException;
-import org.apache.commons.math.exception.NotStrictlyPositiveException;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.random.RandomGenerator;
-import org.apache.commons.math.optimization.GoalType;
-import org.apache.commons.math.optimization.ConvergenceChecker;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.exception.MathIllegalStateException;
+import org.apache.commons.math3.exception.NotStrictlyPositiveException;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.random.RandomGenerator;
+import org.apache.commons.math3.optimization.GoalType;
+import org.apache.commons.math3.optimization.ConvergenceChecker;
 
 /**
  * Special implementation of the {@link UnivariateRealOptimizer} interface
diff --git a/src/main/java/org/apache/commons/math/optimization/univariate/UnivariatePointValuePair.java b/src/main/java/org/apache/commons/math3/optimization/univariate/UnivariatePointValuePair.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/optimization/univariate/UnivariatePointValuePair.java
rename to src/main/java/org/apache/commons/math3/optimization/univariate/UnivariatePointValuePair.java
index f415211b7..899d2b0a0 100644
--- a/src/main/java/org/apache/commons/math/optimization/univariate/UnivariatePointValuePair.java
+++ b/src/main/java/org/apache/commons/math3/optimization/univariate/UnivariatePointValuePair.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.univariate;
+package org.apache.commons.math3.optimization.univariate;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/org/apache/commons/math/optimization/univariate/UnivariateRealOptimizer.java b/src/main/java/org/apache/commons/math3/optimization/univariate/UnivariateRealOptimizer.java
similarity index 89%
rename from src/main/java/org/apache/commons/math/optimization/univariate/UnivariateRealOptimizer.java
rename to src/main/java/org/apache/commons/math3/optimization/univariate/UnivariateRealOptimizer.java
index 2a038ebfc..21787a038 100644
--- a/src/main/java/org/apache/commons/math/optimization/univariate/UnivariateRealOptimizer.java
+++ b/src/main/java/org/apache/commons/math3/optimization/univariate/UnivariateRealOptimizer.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.optimization.univariate;
+package org.apache.commons.math3.optimization.univariate;
 
-import org.apache.commons.math.analysis.UnivariateFunction;
+import org.apache.commons.math3.analysis.UnivariateFunction;
 
 /**
  * Interface for univariate optimization algorithms.
diff --git a/src/main/java/org/apache/commons/math/optimization/univariate/package-info.java b/src/main/java/org/apache/commons/math3/optimization/univariate/package-info.java
similarity index 93%
rename from src/main/java/org/apache/commons/math/optimization/univariate/package-info.java
rename to src/main/java/org/apache/commons/math3/optimization/univariate/package-info.java
index 266ef892b..04feb33b2 100644
--- a/src/main/java/org/apache/commons/math/optimization/univariate/package-info.java
+++ b/src/main/java/org/apache/commons/math3/optimization/univariate/package-info.java
@@ -19,4 +19,4 @@
  *     Univariate real functions minimum finding algorithms.
  *
  */
-package org.apache.commons.math.optimization.univariate;
+package org.apache.commons.math3.optimization.univariate;
diff --git a/src/main/java/org/apache/commons/math/package-info.java b/src/main/java/org/apache/commons/math3/package-info.java
similarity index 96%
rename from src/main/java/org/apache/commons/math/package-info.java
rename to src/main/java/org/apache/commons/math3/package-info.java
index b9e4f7aa7..200346dfc 100644
--- a/src/main/java/org/apache/commons/math/package-info.java
+++ b/src/main/java/org/apache/commons/math3/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Common classes used throughout the commons-math library.
  */
-package org.apache.commons.math;
+package org.apache.commons.math3;
diff --git a/src/main/java/org/apache/commons/math/random/AbstractRandomGenerator.java b/src/main/java/org/apache/commons/math3/random/AbstractRandomGenerator.java
similarity index 98%
rename from src/main/java/org/apache/commons/math/random/AbstractRandomGenerator.java
rename to src/main/java/org/apache/commons/math3/random/AbstractRandomGenerator.java
index 10c8f3881..6b9ae70be 100644
--- a/src/main/java/org/apache/commons/math/random/AbstractRandomGenerator.java
+++ b/src/main/java/org/apache/commons/math3/random/AbstractRandomGenerator.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
-import org.apache.commons.math.exception.NotStrictlyPositiveException;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.exception.NotStrictlyPositiveException;
+import org.apache.commons.math3.util.FastMath;
 
 /**
  * Abstract class implementing the {@link  RandomGenerator} interface.
diff --git a/src/main/java/org/apache/commons/math/random/AbstractWell.java b/src/main/java/org/apache/commons/math3/random/AbstractWell.java
similarity index 99%
rename from src/main/java/org/apache/commons/math/random/AbstractWell.java
rename to src/main/java/org/apache/commons/math3/random/AbstractWell.java
index 7a9bd6ce0..6de9c99be 100644
--- a/src/main/java/org/apache/commons/math/random/AbstractWell.java
+++ b/src/main/java/org/apache/commons/math3/random/AbstractWell.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/org/apache/commons/math/random/BitsStreamGenerator.java b/src/main/java/org/apache/commons/math3/random/BitsStreamGenerator.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/random/BitsStreamGenerator.java
rename to src/main/java/org/apache/commons/math3/random/BitsStreamGenerator.java
index aeb0c707d..a621d7b8a 100644
--- a/src/main/java/org/apache/commons/math/random/BitsStreamGenerator.java
+++ b/src/main/java/org/apache/commons/math3/random/BitsStreamGenerator.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
-import org.apache.commons.math.exception.NotStrictlyPositiveException;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.exception.NotStrictlyPositiveException;
+import org.apache.commons.math3.util.FastMath;
 
 /** Base class for random number generators that generates bits streams.
 
diff --git a/src/main/java/org/apache/commons/math/random/CorrelatedRandomVectorGenerator.java b/src/main/java/org/apache/commons/math3/random/CorrelatedRandomVectorGenerator.java
similarity index 94%
rename from src/main/java/org/apache/commons/math/random/CorrelatedRandomVectorGenerator.java
rename to src/main/java/org/apache/commons/math3/random/CorrelatedRandomVectorGenerator.java
index b3d82d9a0..2c02cb270 100644
--- a/src/main/java/org/apache/commons/math/random/CorrelatedRandomVectorGenerator.java
+++ b/src/main/java/org/apache/commons/math3/random/CorrelatedRandomVectorGenerator.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.linear.RealMatrix;
-import org.apache.commons.math.linear.RectangularCholeskyDecomposition;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.linear.RealMatrix;
+import org.apache.commons.math3.linear.RectangularCholeskyDecomposition;
 
 /**
  * A {@link RandomVectorGenerator} that generates vectors with with
@@ -79,7 +79,7 @@ public class CorrelatedRandomVectorGenerator
      * considered to be dependent on previous ones and are discarded
      * @param generator underlying generator for uncorrelated normalized
      * components.
-     * @throws org.apache.commons.math.linear.NonPositiveDefiniteMatrixException
+     * @throws org.apache.commons.math3.linear.NonPositiveDefiniteMatrixException
      * if the covariance matrix is not strictly positive definite.
      * @throws DimensionMismatchException if the mean and covariance
      * arrays dimensions do not match.
@@ -111,7 +111,7 @@ public class CorrelatedRandomVectorGenerator
      * considered to be dependent on previous ones and are discarded.
      * @param generator Underlying generator for uncorrelated normalized
      * components.
-     * @throws org.apache.commons.math.linear.NonPositiveDefiniteMatrixException
+     * @throws org.apache.commons.math3.linear.NonPositiveDefiniteMatrixException
      * if the covariance matrix is not strictly positive definite.
      */
     public CorrelatedRandomVectorGenerator(RealMatrix covariance, double small,
diff --git a/src/main/java/org/apache/commons/math/random/EmpiricalDistribution.java b/src/main/java/org/apache/commons/math3/random/EmpiricalDistribution.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/random/EmpiricalDistribution.java
rename to src/main/java/org/apache/commons/math3/random/EmpiricalDistribution.java
index be7f86660..a88f8f462 100644
--- a/src/main/java/org/apache/commons/math/random/EmpiricalDistribution.java
+++ b/src/main/java/org/apache/commons/math3/random/EmpiricalDistribution.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -27,15 +27,15 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.MathIllegalStateException;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.ZeroException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.stat.descriptive.StatisticalSummary;
-import org.apache.commons.math.stat.descriptive.SummaryStatistics;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.util.MathUtils;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.MathIllegalStateException;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.ZeroException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.stat.descriptive.StatisticalSummary;
+import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.util.MathUtils;
 
 /**
  * Represents an     
diff --git a/src/main/java/org/apache/commons/math/random/GaussianRandomGenerator.java b/src/main/java/org/apache/commons/math3/random/GaussianRandomGenerator.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/random/GaussianRandomGenerator.java
rename to src/main/java/org/apache/commons/math3/random/GaussianRandomGenerator.java
index 152d785ae..026dcdd79 100644
--- a/src/main/java/org/apache/commons/math/random/GaussianRandomGenerator.java
+++ b/src/main/java/org/apache/commons/math3/random/GaussianRandomGenerator.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
 /**
  * This class is a gaussian normalized random generator for scalars.
diff --git a/src/main/java/org/apache/commons/math/random/ISAACRandom.java b/src/main/java/org/apache/commons/math3/random/ISAACRandom.java
similarity index 99%
rename from src/main/java/org/apache/commons/math/random/ISAACRandom.java
rename to src/main/java/org/apache/commons/math3/random/ISAACRandom.java
index 5d1db714c..21c93a187 100644
--- a/src/main/java/org/apache/commons/math/random/ISAACRandom.java
+++ b/src/main/java/org/apache/commons/math3/random/ISAACRandom.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/org/apache/commons/math/random/JDKRandomGenerator.java b/src/main/java/org/apache/commons/math3/random/JDKRandomGenerator.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/random/JDKRandomGenerator.java
rename to src/main/java/org/apache/commons/math3/random/JDKRandomGenerator.java
index 53a3a3b3f..8f8c3f3e9 100644
--- a/src/main/java/org/apache/commons/math/random/JDKRandomGenerator.java
+++ b/src/main/java/org/apache/commons/math3/random/JDKRandomGenerator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
 import java.util.Random;
 
diff --git a/src/main/java/org/apache/commons/math/random/MersenneTwister.java b/src/main/java/org/apache/commons/math3/random/MersenneTwister.java
similarity index 99%
rename from src/main/java/org/apache/commons/math/random/MersenneTwister.java
rename to src/main/java/org/apache/commons/math3/random/MersenneTwister.java
index 4df76d336..7b717fed9 100644
--- a/src/main/java/org/apache/commons/math/random/MersenneTwister.java
+++ b/src/main/java/org/apache/commons/math3/random/MersenneTwister.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
 import java.io.Serializable;
 
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.util.FastMath;
 
 
 /** This class implements a powerful pseudo-random number generator
diff --git a/src/main/java/org/apache/commons/math/random/NormalizedRandomGenerator.java b/src/main/java/org/apache/commons/math3/random/NormalizedRandomGenerator.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/random/NormalizedRandomGenerator.java
rename to src/main/java/org/apache/commons/math3/random/NormalizedRandomGenerator.java
index f063d896f..369843a4a 100644
--- a/src/main/java/org/apache/commons/math/random/NormalizedRandomGenerator.java
+++ b/src/main/java/org/apache/commons/math3/random/NormalizedRandomGenerator.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
 /**
  * This interface represent a normalized random generator for
diff --git a/src/main/java/org/apache/commons/math/random/RandomAdaptor.java b/src/main/java/org/apache/commons/math3/random/RandomAdaptor.java
similarity index 99%
rename from src/main/java/org/apache/commons/math/random/RandomAdaptor.java
rename to src/main/java/org/apache/commons/math3/random/RandomAdaptor.java
index 9e843896d..09d8d0d54 100644
--- a/src/main/java/org/apache/commons/math/random/RandomAdaptor.java
+++ b/src/main/java/org/apache/commons/math3/random/RandomAdaptor.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
 import java.util.Random;
 
diff --git a/src/main/java/org/apache/commons/math/random/RandomData.java b/src/main/java/org/apache/commons/math3/random/RandomData.java
similarity index 89%
rename from src/main/java/org/apache/commons/math/random/RandomData.java
rename to src/main/java/org/apache/commons/math3/random/RandomData.java
index 9b492027a..a0841d26d 100644
--- a/src/main/java/org/apache/commons/math/random/RandomData.java
+++ b/src/main/java/org/apache/commons/math3/random/RandomData.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 import java.util.Collection;
 
 /**
@@ -33,7 +33,7 @@ public interface RandomData {
      *
      * @param len the length of the string to be generated
      * @return a random string of hex characters of length {@code len}
-     * @throws org.apache.commons.math.exception.NotStrictlyPositiveException
+     * @throws org.apache.commons.math3.exception.NotStrictlyPositiveException
      * if {@code len <= 0}
      */
     String nextHexString(int len);
@@ -51,7 +51,7 @@ public interface RandomData {
      * @param upper upper bound for generated integer
      * @return a random integer greater than or equal to {@code lower}
      * and less than or equal to {@code upper}
-     * @throws org.apache.commons.math.exception.NumberIsTooLargeException
+     * @throws org.apache.commons.math3.exception.NumberIsTooLargeException
      * if {@code lower >= upper}
      */
     int nextInt(int lower, int upper);
@@ -69,7 +69,7 @@ public interface RandomData {
      * @param upper upper bound for generated long integer
      * @return a random long integer greater than or equal to {@code lower} and
      * less than or equal to {@code upper}
-     * @throws org.apache.commons.math.exception.NumberIsTooLargeException
+     * @throws org.apache.commons.math3.exception.NumberIsTooLargeException
      * if {@code lower >= upper}.
      */
     long nextLong(long lower, long upper);
@@ -84,7 +84,7 @@ public interface RandomData {
      *
      * @param len the length of the string to be generated
      * @return a random string of hex characters of length {@code len}
-     * @throws org.apache.commons.math.exception.NotStrictlyPositiveException
+     * @throws org.apache.commons.math3.exception.NotStrictlyPositiveException
      * if {@code len <= 0}
      */
     String nextSecureHexString(int len);
@@ -105,7 +105,7 @@ public interface RandomData {
      * @param upper upper bound for generated integer
      * @return a random integer greater than or equal to {@code lower} and less
      * than or equal to {@code upper}.
-     * @throws org.apache.commons.math.exception.NumberIsTooLargeException
+     * @throws org.apache.commons.math3.exception.NumberIsTooLargeException
      * if {@code lower >= upper}.
      */
     int nextSecureInt(int lower, int upper);
@@ -127,7 +127,7 @@ public interface RandomData {
      * @param upper upper bound for generated integer
      * @return a random long integer greater than or equal to {@code lower} and
      * less than or equal to {@code upper}.
-     * @throws org.apache.commons.math.exception.NumberIsTooLargeException
+     * @throws org.apache.commons.math3.exception.NumberIsTooLargeException
      * if {@code lower >= upper}.
      */
     long nextSecureLong(long lower, long upper);
@@ -142,7 +142,7 @@ public interface RandomData {
      *
      * @param mean the mean of the Poisson distribution
      * @return a random value following the specified Poisson distribution
-     * @throws org.apache.commons.math.exception.NotStrictlyPositiveException
+     * @throws org.apache.commons.math3.exception.NotStrictlyPositiveException
      * if {@code mean <= 0}.
      */
     long nextPoisson(double mean);
@@ -158,7 +158,7 @@ public interface RandomData {
      * @param mu the mean of the distribution
      * @param sigma the standard deviation of the distribution
      * @return a random value following the specified Gaussian distribution
-     * @throws org.apache.commons.math.exception.NotStrictlyPositiveException
+     * @throws org.apache.commons.math3.exception.NotStrictlyPositiveException
      * if {@code sigma <= 0}.
      */
     double nextGaussian(double mu, double sigma);
@@ -173,7 +173,7 @@ public interface RandomData {
      *
      * @param mean the mean of the distribution
      * @return a random value following the specified exponential distribution
-     * @throws org.apache.commons.math.exception.NotStrictlyPositiveException
+     * @throws org.apache.commons.math3.exception.NotStrictlyPositiveException
      * if {@code mean <= 0}.
      */
     double nextExponential(double mean);
@@ -192,7 +192,7 @@ public interface RandomData {
      * @param upper the exclusive upper bound of the support
      * @return a uniformly distributed random value between lower and upper
      * (exclusive)
-     * @throws org.apache.commons.math.exception.NumberIsTooLargeException
+     * @throws org.apache.commons.math3.exception.NumberIsTooLargeException
      * if {@code lower >= upper}
      */
     double nextUniform(double lower, double upper);
@@ -216,7 +216,7 @@ public interface RandomData {
      * interval, if {@code lowerInclusive} is {@code false}, or in the
      * {@code [lower, upper)} interval, if {@code lowerInclusive} is
      * {@code true}
-     * @throws org.apache.commons.math.exception.NumberIsTooLargeException
+     * @throws org.apache.commons.math3.exception.NumberIsTooLargeException
      * if {@code lower >= upper}
      */
     double nextUniform(double lower, double upper, boolean lowerInclusive);
@@ -233,9 +233,9 @@ public interface RandomData {
      * @param k the size of the permutation
      * @return a random {@code k}-permutation of {@code n}, as an array of
      * integers
-     * @throws org.apache.commons.math.exception.NumberIsTooLargeException
+     * @throws org.apache.commons.math3.exception.NumberIsTooLargeException
      * if {@code k > n}.
-     * @throws org.apache.commons.math.exception.NotStrictlyPositiveException
+     * @throws org.apache.commons.math3.exception.NotStrictlyPositiveException
      * if {@code k <= 0}.
      */
     int[] nextPermutation(int n, int k);
@@ -254,9 +254,9 @@ public interface RandomData {
      * @param c the collection to be sampled
      * @param k the size of the sample
      * @return a random sample of {@code k} elements from {@code c}
-     * @throws org.apache.commons.math.exception.NumberIsTooLargeException
+     * @throws org.apache.commons.math3.exception.NumberIsTooLargeException
      * if {@code k > c.size()}.
-     * @throws org.apache.commons.math.exception.NotStrictlyPositiveException
+     * @throws org.apache.commons.math3.exception.NotStrictlyPositiveException
      * if {@code k <= 0}.
      */
     Object[] nextSample(Collection c, int k);
diff --git a/src/main/java/org/apache/commons/math/random/RandomDataImpl.java b/src/main/java/org/apache/commons/math3/random/RandomDataImpl.java
similarity index 96%
rename from src/main/java/org/apache/commons/math/random/RandomDataImpl.java
rename to src/main/java/org/apache/commons/math3/random/RandomDataImpl.java
index cf97716e4..fa3099a1a 100644
--- a/src/main/java/org/apache/commons/math/random/RandomDataImpl.java
+++ b/src/main/java/org/apache/commons/math3/random/RandomDataImpl.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
 import java.io.Serializable;
 import java.security.MessageDigest;
@@ -24,26 +24,26 @@ import java.security.NoSuchProviderException;
 import java.security.SecureRandom;
 import java.util.Collection;
 
-import org.apache.commons.math.distribution.BetaDistribution;
-import org.apache.commons.math.distribution.BinomialDistribution;
-import org.apache.commons.math.distribution.CauchyDistribution;
-import org.apache.commons.math.distribution.ChiSquaredDistribution;
-import org.apache.commons.math.distribution.RealDistribution;
-import org.apache.commons.math.distribution.FDistribution;
-import org.apache.commons.math.distribution.HypergeometricDistribution;
-import org.apache.commons.math.distribution.IntegerDistribution;
-import org.apache.commons.math.distribution.PascalDistribution;
-import org.apache.commons.math.distribution.TDistribution;
-import org.apache.commons.math.distribution.WeibullDistribution;
-import org.apache.commons.math.distribution.ZipfDistribution;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.MathInternalError;
-import org.apache.commons.math.exception.NotStrictlyPositiveException;
-import org.apache.commons.math.exception.NumberIsTooLargeException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.util.ArithmeticUtils;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.util.ResizableDoubleArray;
+import org.apache.commons.math3.distribution.BetaDistribution;
+import org.apache.commons.math3.distribution.BinomialDistribution;
+import org.apache.commons.math3.distribution.CauchyDistribution;
+import org.apache.commons.math3.distribution.ChiSquaredDistribution;
+import org.apache.commons.math3.distribution.RealDistribution;
+import org.apache.commons.math3.distribution.FDistribution;
+import org.apache.commons.math3.distribution.HypergeometricDistribution;
+import org.apache.commons.math3.distribution.IntegerDistribution;
+import org.apache.commons.math3.distribution.PascalDistribution;
+import org.apache.commons.math3.distribution.TDistribution;
+import org.apache.commons.math3.distribution.WeibullDistribution;
+import org.apache.commons.math3.distribution.ZipfDistribution;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.MathInternalError;
+import org.apache.commons.math3.exception.NotStrictlyPositiveException;
+import org.apache.commons.math3.exception.NumberIsTooLargeException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.util.ArithmeticUtils;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.util.ResizableDoubleArray;
 
 /**
  * Implements the {@link RandomData} interface using a {@link RandomGenerator}
@@ -643,7 +643,7 @@ public class RandomDataImpl implements RandomData, Serializable {
 
     /**
      * 
    Generates a random value from the
-     * {@link org.apache.commons.math.distribution.GammaDistribution Gamma Distribution}.
    
+     * {@link org.apache.commons.math3.distribution.GammaDistribution Gamma Distribution}.
    
      *
      * 
    This implementation uses the following algorithms: 
    
      *
diff --git a/src/main/java/org/apache/commons/math/random/RandomGenerator.java b/src/main/java/org/apache/commons/math3/random/RandomGenerator.java
similarity index 99%
rename from src/main/java/org/apache/commons/math/random/RandomGenerator.java
rename to src/main/java/org/apache/commons/math3/random/RandomGenerator.java
index e1301b57e..ce16be104 100644
--- a/src/main/java/org/apache/commons/math/random/RandomGenerator.java
+++ b/src/main/java/org/apache/commons/math3/random/RandomGenerator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
 
 /**
diff --git a/src/main/java/org/apache/commons/math/random/RandomVectorGenerator.java b/src/main/java/org/apache/commons/math3/random/RandomVectorGenerator.java
similarity index 96%
rename from src/main/java/org/apache/commons/math/random/RandomVectorGenerator.java
rename to src/main/java/org/apache/commons/math3/random/RandomVectorGenerator.java
index cd2eeffde..c6f3c86c8 100644
--- a/src/main/java/org/apache/commons/math/random/RandomVectorGenerator.java
+++ b/src/main/java/org/apache/commons/math3/random/RandomVectorGenerator.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
 
 /** This interface represents a random generator for whole vectors.
diff --git a/src/main/java/org/apache/commons/math/random/StableRandomGenerator.java b/src/main/java/org/apache/commons/math3/random/StableRandomGenerator.java
similarity index 94%
rename from src/main/java/org/apache/commons/math/random/StableRandomGenerator.java
rename to src/main/java/org/apache/commons/math3/random/StableRandomGenerator.java
index a44d0602e..7effbc117 100644
--- a/src/main/java/org/apache/commons/math/random/StableRandomGenerator.java
+++ b/src/main/java/org/apache/commons/math3/random/StableRandomGenerator.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.OutOfRangeException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.OutOfRangeException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.util.FastMath;
 
 /**
  * 
    This class provides a stable normalized random generator. It samples from a stable
diff --git a/src/main/java/org/apache/commons/math/random/UncorrelatedRandomVectorGenerator.java b/src/main/java/org/apache/commons/math3/random/UncorrelatedRandomVectorGenerator.java
similarity index 96%
rename from src/main/java/org/apache/commons/math/random/UncorrelatedRandomVectorGenerator.java
rename to src/main/java/org/apache/commons/math3/random/UncorrelatedRandomVectorGenerator.java
index 329b593f2..6e32b5ba9 100644
--- a/src/main/java/org/apache/commons/math/random/UncorrelatedRandomVectorGenerator.java
+++ b/src/main/java/org/apache/commons/math3/random/UncorrelatedRandomVectorGenerator.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
 import java.util.Arrays;
 
-import org.apache.commons.math.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.DimensionMismatchException;
 
 /**
  * A {@link RandomVectorGenerator} that generates vectors with uncorrelated
diff --git a/src/main/java/org/apache/commons/math/random/UniformRandomGenerator.java b/src/main/java/org/apache/commons/math3/random/UniformRandomGenerator.java
similarity index 95%
rename from src/main/java/org/apache/commons/math/random/UniformRandomGenerator.java
rename to src/main/java/org/apache/commons/math3/random/UniformRandomGenerator.java
index 6b7726f23..bdd0ba536 100644
--- a/src/main/java/org/apache/commons/math/random/UniformRandomGenerator.java
+++ b/src/main/java/org/apache/commons/math3/random/UniformRandomGenerator.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.util.FastMath;
 
 /**
  * This class implements a normalized uniform random generator.
diff --git a/src/main/java/org/apache/commons/math/random/UnitSphereRandomVectorGenerator.java b/src/main/java/org/apache/commons/math3/random/UnitSphereRandomVectorGenerator.java
similarity index 96%
rename from src/main/java/org/apache/commons/math/random/UnitSphereRandomVectorGenerator.java
rename to src/main/java/org/apache/commons/math3/random/UnitSphereRandomVectorGenerator.java
index 945ed6341..d3a01cf2d 100644
--- a/src/main/java/org/apache/commons/math/random/UnitSphereRandomVectorGenerator.java
+++ b/src/main/java/org/apache/commons/math3/random/UnitSphereRandomVectorGenerator.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.util.FastMath;
 
 
 /**
diff --git a/src/main/java/org/apache/commons/math/random/ValueServer.java b/src/main/java/org/apache/commons/math3/random/ValueServer.java
similarity index 98%
rename from src/main/java/org/apache/commons/math/random/ValueServer.java
rename to src/main/java/org/apache/commons/math3/random/ValueServer.java
index 413f8bb34..d3ca8aff7 100644
--- a/src/main/java/org/apache/commons/math/random/ValueServer.java
+++ b/src/main/java/org/apache/commons/math3/random/ValueServer.java
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import org.apache.commons.math.exception.MathIllegalStateException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
+import org.apache.commons.math3.exception.MathIllegalStateException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
 
 /**
  * Generates values for use in simulation applications.
diff --git a/src/main/java/org/apache/commons/math/random/Well1024a.java b/src/main/java/org/apache/commons/math3/random/Well1024a.java
similarity index 98%
rename from src/main/java/org/apache/commons/math/random/Well1024a.java
rename to src/main/java/org/apache/commons/math3/random/Well1024a.java
index 47f7f7782..68f7d9209 100644
--- a/src/main/java/org/apache/commons/math/random/Well1024a.java
+++ b/src/main/java/org/apache/commons/math3/random/Well1024a.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
 
 /** This class implements the WELL1024a pseudo-random number generator
diff --git a/src/main/java/org/apache/commons/math/random/Well19937a.java b/src/main/java/org/apache/commons/math3/random/Well19937a.java
similarity index 98%
rename from src/main/java/org/apache/commons/math/random/Well19937a.java
rename to src/main/java/org/apache/commons/math3/random/Well19937a.java
index 8f2f33975..56f352d2a 100644
--- a/src/main/java/org/apache/commons/math/random/Well19937a.java
+++ b/src/main/java/org/apache/commons/math3/random/Well19937a.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
 
 /** This class implements the WELL19937a pseudo-random number generator
diff --git a/src/main/java/org/apache/commons/math/random/Well19937c.java b/src/main/java/org/apache/commons/math3/random/Well19937c.java
similarity index 98%
rename from src/main/java/org/apache/commons/math/random/Well19937c.java
rename to src/main/java/org/apache/commons/math3/random/Well19937c.java
index 68e37bba9..6e7b6860c 100644
--- a/src/main/java/org/apache/commons/math/random/Well19937c.java
+++ b/src/main/java/org/apache/commons/math3/random/Well19937c.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
 
 /** This class implements the WELL19937c pseudo-random number generator
diff --git a/src/main/java/org/apache/commons/math/random/Well44497a.java b/src/main/java/org/apache/commons/math3/random/Well44497a.java
similarity index 98%
rename from src/main/java/org/apache/commons/math/random/Well44497a.java
rename to src/main/java/org/apache/commons/math3/random/Well44497a.java
index df71307e6..2c11158fe 100644
--- a/src/main/java/org/apache/commons/math/random/Well44497a.java
+++ b/src/main/java/org/apache/commons/math3/random/Well44497a.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
 
 /** This class implements the WELL44497a pseudo-random number generator
diff --git a/src/main/java/org/apache/commons/math/random/Well44497b.java b/src/main/java/org/apache/commons/math3/random/Well44497b.java
similarity index 99%
rename from src/main/java/org/apache/commons/math/random/Well44497b.java
rename to src/main/java/org/apache/commons/math3/random/Well44497b.java
index 74e501533..8fd0e1d84 100644
--- a/src/main/java/org/apache/commons/math/random/Well44497b.java
+++ b/src/main/java/org/apache/commons/math3/random/Well44497b.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
 
 /** This class implements the WELL44497b pseudo-random number generator
diff --git a/src/main/java/org/apache/commons/math/random/Well512a.java b/src/main/java/org/apache/commons/math3/random/Well512a.java
similarity index 98%
rename from src/main/java/org/apache/commons/math/random/Well512a.java
rename to src/main/java/org/apache/commons/math3/random/Well512a.java
index 1cdf440d2..aa20c52a0 100644
--- a/src/main/java/org/apache/commons/math/random/Well512a.java
+++ b/src/main/java/org/apache/commons/math3/random/Well512a.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
 
 /** This class implements the WELL512a pseudo-random number generator
diff --git a/src/main/java/org/apache/commons/math/random/package-info.java b/src/main/java/org/apache/commons/math3/random/package-info.java
similarity index 78%
rename from src/main/java/org/apache/commons/math/random/package-info.java
rename to src/main/java/org/apache/commons/math3/random/package-info.java
index 09c76a9fe..06e57397e 100644
--- a/src/main/java/org/apache/commons/math/random/package-info.java
+++ b/src/main/java/org/apache/commons/math3/random/package-info.java
@@ -20,19 +20,19 @@
  *      
    Commons-math provides a few pseudo random number generators. The top level interface is RandomGenerator.
  *      It is implemented by three classes:
  *      
      
- *        
    • {@link org.apache.commons.math.random.JDKRandomGenerator JDKRandomGenerator}
+ *        
    • {@link org.apache.commons.math3.random.JDKRandomGenerator JDKRandomGenerator}
  *            that extends the JDK provided generator
      • 
  *        
    • AbstractRandomGenerator as a helper for users generators
      • 
  *        
    • BitStreamGenerator which is an abstract class for several generators and
  *            which in turn is extended by:
  *            
        
- *              
      • {@link org.apache.commons.math.random.MersenneTwister MersenneTwister}
        • 
- *              
      • {@link org.apache.commons.math.random.Well512a Well512a}
        • 
- *              
      • {@link org.apache.commons.math.random.Well1024a Well1024a}
        • 
- *              
      • {@link org.apache.commons.math.random.Well19937a Well19937a}
        • 
- *              
      • {@link org.apache.commons.math.random.Well19937c Well19937c}
        • 
- *              
      • {@link org.apache.commons.math.random.Well44497a Well44497a}
        • 
- *              
      • {@link org.apache.commons.math.random.Well44497b Well44497b}
        • 
+ *              
      • {@link org.apache.commons.math3.random.MersenneTwister MersenneTwister}
        • 
+ *              
      • {@link org.apache.commons.math3.random.Well512a Well512a}
        • 
+ *              
      • {@link org.apache.commons.math3.random.Well1024a Well1024a}
        • 
+ *              
      • {@link org.apache.commons.math3.random.Well19937a Well19937a}
        • 
+ *              
      • {@link org.apache.commons.math3.random.Well19937c Well19937c}
        • 
+ *              
      • {@link org.apache.commons.math3.random.Well44497a Well44497a}
        • 
+ *              
      • {@link org.apache.commons.math3.random.Well44497b Well44497b}
        • 
  *            
      
  *          
      • 
  *        
    
@@ -103,21 +103,21 @@
  *        
  *          
  *          
- *          
- *          
- *          
- *          
- *          
- *          
- *          
- *          
+ *          
+ *          
+ *          
+ *          
+ *          
+ *          
+ *          
+ *          
  *        
    Example of performances
    Namegeneration rate (relative to MersenneTwister)
    {@link org.apache.commons.math.random.MersenneTwister MersenneTwister}1
    {@link org.apache.commons.math.random.JDKRandomGenerator JDKRandomGenerator}between 0.96 and 1.16
    {@link org.apache.commons.math.random.Well512a Well512a}between 0.85 and 0.88
    {@link org.apache.commons.math.random.Well1024a Well1024a}between 0.63 and 0.73
    {@link org.apache.commons.math.random.Well19937a Well19937a}between 0.70 and 0.71
    {@link org.apache.commons.math.random.Well19937c Well19937c}between 0.57 and 0.71
    {@link org.apache.commons.math.random.Well44497a Well44497a}between 0.69 and 0.71
    {@link org.apache.commons.math.random.Well44497b Well44497b}between 0.65 and 0.71
    {@link org.apache.commons.math3.random.MersenneTwister MersenneTwister}1
    {@link org.apache.commons.math3.random.JDKRandomGenerator JDKRandomGenerator}between 0.96 and 1.16
    {@link org.apache.commons.math3.random.Well512a Well512a}between 0.85 and 0.88
    {@link org.apache.commons.math3.random.Well1024a Well1024a}between 0.63 and 0.73
    {@link org.apache.commons.math3.random.Well19937a Well19937a}between 0.70 and 0.71
    {@link org.apache.commons.math3.random.Well19937c Well19937c}between 0.57 and 0.71
    {@link org.apache.commons.math3.random.Well44497a Well44497a}between 0.69 and 0.71
    {@link org.apache.commons.math3.random.Well44497b Well44497b}between 0.65 and 0.71
    
  *      
    
  *
  *      
    
  *      So for most simulation problems, the better generators like {@link
- *      org.apache.commons.math.random.Well19937c Well19937c} and {@link
- *      org.apache.commons.math.random.Well44497b Well44497b} are probably very good choices.
+ *      org.apache.commons.math3.random.Well19937c Well19937c} and {@link
+ *      org.apache.commons.math3.random.Well44497b Well44497b} are probably very good choices.
  *      
    
  *
  *      
    
@@ -129,4 +129,4 @@
  *
  *
  */
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
diff --git a/src/main/java/org/apache/commons/math/special/Beta.java b/src/main/java/org/apache/commons/math3/special/Beta.java
similarity index 94%
rename from src/main/java/org/apache/commons/math/special/Beta.java
rename to src/main/java/org/apache/commons/math3/special/Beta.java
index bab4ced5f..8bb115de1 100644
--- a/src/main/java/org/apache/commons/math/special/Beta.java
+++ b/src/main/java/org/apache/commons/math3/special/Beta.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.special;
+package org.apache.commons.math3.special;
 
-import org.apache.commons.math.util.ContinuedFraction;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.util.ContinuedFraction;
+import org.apache.commons.math3.util.FastMath;
 
 /**
  * This is a utility class that provides computation methods related to the
@@ -43,7 +43,7 @@ public class Beta {
      * @param a Parameter {@code a}.
      * @param b Parameter {@code b}.
      * @return the regularized beta function I(x, a, b).
-     * @throws org.apache.commons.math.exception.MaxCountExceededException
+     * @throws org.apache.commons.math3.exception.MaxCountExceededException
      * if the algorithm fails to converge.
      */
     public static double regularizedBeta(double x, double a, double b) {
@@ -62,7 +62,7 @@ public class Beta {
      * series is less than epsilon the approximation ceases to calculate
      * further elements in the series.
      * @return the regularized beta function I(x, a, b)
-     * @throws org.apache.commons.math.exception.MaxCountExceededException
+     * @throws org.apache.commons.math3.exception.MaxCountExceededException
      * if the algorithm fails to converge.
      */
     public static double regularizedBeta(double x,
@@ -79,7 +79,7 @@ public class Beta {
      * @param b Parameter {@code b}.
      * @param maxIterations Maximum number of "iterations" to complete.
      * @return the regularized beta function I(x, a, b)
-     * @throws org.apache.commons.math.exception.MaxCountExceededException
+     * @throws org.apache.commons.math3.exception.MaxCountExceededException
      * if the algorithm fails to converge.
      */
     public static double regularizedBeta(double x,
@@ -109,7 +109,7 @@ public class Beta {
      * further elements in the series.
      * @param maxIterations Maximum number of "iterations" to complete.
      * @return the regularized beta function I(x, a, b)
-     * @throws org.apache.commons.math.exception.MaxCountExceededException
+     * @throws org.apache.commons.math3.exception.MaxCountExceededException
      * if the algorithm fails to converge.
      */
     public static double regularizedBeta(double x,
diff --git a/src/main/java/org/apache/commons/math/special/Erf.java b/src/main/java/org/apache/commons/math3/special/Erf.java
similarity index 94%
rename from src/main/java/org/apache/commons/math/special/Erf.java
rename to src/main/java/org/apache/commons/math3/special/Erf.java
index f936be2f8..25341af28 100644
--- a/src/main/java/org/apache/commons/math/special/Erf.java
+++ b/src/main/java/org/apache/commons/math3/special/Erf.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.special;
+package org.apache.commons.math3.special;
 
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.util.FastMath;
 
 /**
  * This is a utility class that provides computation methods related to the
@@ -59,7 +59,7 @@ public class Erf {
      *
      * @param x the value.
      * @return the error function erf(x)
-     * @throws org.apache.commons.math.exception.MaxCountExceededException
+     * @throws org.apache.commons.math3.exception.MaxCountExceededException
      * if the algorithm fails to converge.
      * @see Gamma#regularizedGammaP(double, double, double, int)
      */
@@ -89,7 +89,7 @@ public class Erf {
      *
      * @param x the value
      * @return the complementary error function erfc(x)
-     * @throws org.apache.commons.math.exception.MaxCountExceededException
+     * @throws org.apache.commons.math3.exception.MaxCountExceededException
      * if the algorithm fails to converge.
      * @see Gamma#regularizedGammaQ(double, double, double, int)
      * @since 2.2
diff --git a/src/main/java/org/apache/commons/math/special/Gamma.java b/src/main/java/org/apache/commons/math3/special/Gamma.java
similarity index 98%
rename from src/main/java/org/apache/commons/math/special/Gamma.java
rename to src/main/java/org/apache/commons/math3/special/Gamma.java
index 162de750b..dee373a40 100644
--- a/src/main/java/org/apache/commons/math/special/Gamma.java
+++ b/src/main/java/org/apache/commons/math3/special/Gamma.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.special;
+package org.apache.commons.math3.special;
 
-import org.apache.commons.math.exception.MaxCountExceededException;
-import org.apache.commons.math.util.ContinuedFraction;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.exception.MaxCountExceededException;
+import org.apache.commons.math3.util.ContinuedFraction;
+import org.apache.commons.math3.util.FastMath;
 
 /**
  * This is a utility class that provides computation methods related to the
diff --git a/src/main/java/org/apache/commons/math/special/package-info.java b/src/main/java/org/apache/commons/math3/special/package-info.java
similarity index 95%
rename from src/main/java/org/apache/commons/math/special/package-info.java
rename to src/main/java/org/apache/commons/math3/special/package-info.java
index 46fb274b5..6ebcbd51e 100644
--- a/src/main/java/org/apache/commons/math/special/package-info.java
+++ b/src/main/java/org/apache/commons/math3/special/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Implementations of special functions such as Beta and Gamma.
  */
-package org.apache.commons.math.special;
+package org.apache.commons.math3.special;
diff --git a/src/main/java/org/apache/commons/math/stat/Frequency.java b/src/main/java/org/apache/commons/math3/stat/Frequency.java
similarity index 98%
rename from src/main/java/org/apache/commons/math/stat/Frequency.java
rename to src/main/java/org/apache/commons/math3/stat/Frequency.java
index 7528777eb..46fc1a945 100644
--- a/src/main/java/org/apache/commons/math/stat/Frequency.java
+++ b/src/main/java/org/apache/commons/math3/stat/Frequency.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat;
+package org.apache.commons.math3.stat;
 
 import java.io.Serializable;
 import java.text.NumberFormat;
@@ -22,8 +22,8 @@ import java.util.Iterator;
 import java.util.Comparator;
 import java.util.TreeMap;
 
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.util.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/math3/stat/StatUtils.java
similarity index 92%
rename from src/main/java/org/apache/commons/math/stat/StatUtils.java
rename to src/main/java/org/apache/commons/math3/stat/StatUtils.java
index 10a166e58..14adc3a83 100644
--- a/src/main/java/org/apache/commons/math/stat/StatUtils.java
+++ b/src/main/java/org/apache/commons/math3/stat/StatUtils.java
@@ -14,24 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat;
+package org.apache.commons.math3.stat;
 
-import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.NoDataException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.stat.descriptive.DescriptiveStatistics;
-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;
-import org.apache.commons.math.stat.descriptive.moment.Variance;
-import org.apache.commons.math.stat.descriptive.rank.Max;
-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.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.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.NoDataException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
+import org.apache.commons.math3.stat.descriptive.UnivariateStatistic;
+import org.apache.commons.math3.stat.descriptive.moment.GeometricMean;
+import org.apache.commons.math3.stat.descriptive.moment.Mean;
+import org.apache.commons.math3.stat.descriptive.moment.Variance;
+import org.apache.commons.math3.stat.descriptive.rank.Max;
+import org.apache.commons.math3.stat.descriptive.rank.Min;
+import org.apache.commons.math3.stat.descriptive.rank.Percentile;
+import org.apache.commons.math3.stat.descriptive.summary.Product;
+import org.apache.commons.math3.stat.descriptive.summary.Sum;
+import org.apache.commons.math3.stat.descriptive.summary.SumOfLogs;
+import org.apache.commons.math3.stat.descriptive.summary.SumOfSquares;
 
 /**
  * StatUtils provides static methods for computing statistics based on data
@@ -185,7 +185,7 @@ public final class StatUtils {
      * 
    
      * Throws IllegalArgumentException if the array is null.
    
      * 
    
-     * See {@link org.apache.commons.math.stat.descriptive.summary.SumOfLogs}.
+     * See {@link org.apache.commons.math3.stat.descriptive.summary.SumOfLogs}.
      * 
    
      *
      * @param values the input array
@@ -204,7 +204,7 @@ public final class StatUtils {
      * 
    
      * Throws IllegalArgumentException if the array is null.
    
      * 
    
-     * See {@link org.apache.commons.math.stat.descriptive.summary.SumOfLogs}.
+     * See {@link org.apache.commons.math3.stat.descriptive.summary.SumOfLogs}.
      * 
    
      *
      * @param values the input array
@@ -226,7 +226,7 @@ public final class StatUtils {
      * 
    
      * Throws IllegalArgumentException if the array is null.
    
      * 
    
-     * See {@link org.apache.commons.math.stat.descriptive.moment.Mean} for
+     * See {@link org.apache.commons.math3.stat.descriptive.moment.Mean} for
      * details on the computing algorithm.
    
      *
      * @param values the input array
@@ -244,7 +244,7 @@ public final class StatUtils {
      * 
    
      * Throws IllegalArgumentException if the array is null.
    
      * 
    
-     * See {@link org.apache.commons.math.stat.descriptive.moment.Mean} for
+     * See {@link org.apache.commons.math3.stat.descriptive.moment.Mean} for
      * details on the computing algorithm.
    
      *
      * @param values the input array
@@ -265,7 +265,7 @@ public final class StatUtils {
      * 
    
      * Throws IllegalArgumentException if the array is null.
    
      * 
    
-     * See {@link org.apache.commons.math.stat.descriptive.moment.GeometricMean}
+     * See {@link org.apache.commons.math3.stat.descriptive.moment.GeometricMean}
      * for details on the computing algorithm.
    
      *
      * @param values the input array
@@ -283,7 +283,7 @@ public final class StatUtils {
      * 
    
      * Throws IllegalArgumentException if the array is null.
    
      * 
    
-     * See {@link org.apache.commons.math.stat.descriptive.moment.GeometricMean}
+     * See {@link org.apache.commons.math3.stat.descriptive.moment.GeometricMean}
      * for details on the computing algorithm.
    
      *
      * @param values the input array
@@ -307,7 +307,7 @@ public final class StatUtils {
      * the denominator).  Use {@link #populationVariance(double[])} for the non-bias-corrected
      * population variance.
    
      * 
    
-     * See {@link org.apache.commons.math.stat.descriptive.moment.Variance} for
+     * See {@link org.apache.commons.math3.stat.descriptive.moment.Variance} for
      * details on the computing algorithm.
    
      * 
    
      * Returns 0 for a single-value (i.e. length = 1) sample.
    
@@ -331,7 +331,7 @@ public final class StatUtils {
      * the denominator).  Use {@link #populationVariance(double[], int, int)} for the non-bias-corrected
      * population variance.
    
      * 
    
-     * See {@link org.apache.commons.math.stat.descriptive.moment.Variance} for
+     * See {@link org.apache.commons.math3.stat.descriptive.moment.Variance} for
      * details on the computing algorithm.
    
      * 
    
      * Returns 0 for a single-value (i.e. length = 1) sample.
    
@@ -360,7 +360,7 @@ public final class StatUtils {
      * the denominator).  Use {@link #populationVariance(double[], double, int, int)} for the non-bias-corrected
      * population variance.
    
      * 
    
-     * See {@link org.apache.commons.math.stat.descriptive.moment.Variance} for
+     * See {@link org.apache.commons.math3.stat.descriptive.moment.Variance} for
      * details on the computing algorithm.
    
      * 
    
      * The formula used assumes that the supplied mean value is the arithmetic
@@ -395,7 +395,7 @@ public final class StatUtils {
      * the denominator).  Use {@link #populationVariance(double[], double)} for the non-bias-corrected
      * population variance.
    
      * 
    
-     * See {@link org.apache.commons.math.stat.descriptive.moment.Variance} for
+     * See {@link org.apache.commons.math3.stat.descriptive.moment.Variance} for
      * details on the computing algorithm.
    
      * 
    
      * The formula used assumes that the supplied mean value is the arithmetic
@@ -421,7 +421,7 @@ public final class StatUtils {
      * population variance of the entries in the input array, or
      * Double.NaN if the array is empty.
      * 
    
-     * See {@link org.apache.commons.math.stat.descriptive.moment.Variance} for
+     * See {@link org.apache.commons.math3.stat.descriptive.moment.Variance} for
      * details on the formula and computing algorithm.
    
      * 
    
      * Returns 0 for a single-value (i.e. length = 1) sample.
    
@@ -442,7 +442,7 @@ public final class StatUtils {
      * the input array, or Double.NaN if the designated subarray
      * is empty.
      * 
    
-     * See {@link org.apache.commons.math.stat.descriptive.moment.Variance} for
+     * See {@link org.apache.commons.math3.stat.descriptive.moment.Variance} for
      * details on the computing algorithm.
    
      * 
    
      * Returns 0 for a single-value (i.e. length = 1) sample.
    
@@ -468,7 +468,7 @@ public final class StatUtils {
      * the input array, using the precomputed mean value.  Returns
      * Double.NaN if the designated subarray is empty.
      * 
    
-     * See {@link org.apache.commons.math.stat.descriptive.moment.Variance} for
+     * See {@link org.apache.commons.math3.stat.descriptive.moment.Variance} for
      * details on the computing algorithm.
    
      * 
    
      * The formula used assumes that the supplied mean value is the arithmetic
@@ -500,7 +500,7 @@ public final class StatUtils {
      * precomputed mean value.  Returns Double.NaN if the array
      * is empty.
      * 
    
-     * See {@link org.apache.commons.math.stat.descriptive.moment.Variance} for
+     * See {@link org.apache.commons.math3.stat.descriptive.moment.Variance} for
      * details on the computing algorithm.
    
      * 
    
      * The formula used assumes that the supplied mean value is the arithmetic
@@ -631,7 +631,7 @@ public final class StatUtils {
      * and less than or equal to 100)
      * 
    
      * 
    
-     * See {@link org.apache.commons.math.stat.descriptive.rank.Percentile} for
+     * See {@link org.apache.commons.math3.stat.descriptive.rank.Percentile} for
      * a description of the percentile estimation algorithm used.
    
      *
      * @param values input array of values
@@ -660,7 +660,7 @@ public final class StatUtils {
      * and less than or equal to 100)
      * 
    
      * 
    
-      * See {@link org.apache.commons.math.stat.descriptive.rank.Percentile} for
+      * See {@link org.apache.commons.math3.stat.descriptive.rank.Percentile} for
       * a description of the percentile estimation algorithm used.
    
      *
      * @param values array of input values
diff --git a/src/main/java/org/apache/commons/math/stat/clustering/Cluster.java b/src/main/java/org/apache/commons/math3/stat/clustering/Cluster.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/stat/clustering/Cluster.java
rename to src/main/java/org/apache/commons/math3/stat/clustering/Cluster.java
index 02fa652cb..793f443b8 100644
--- a/src/main/java/org/apache/commons/math/stat/clustering/Cluster.java
+++ b/src/main/java/org/apache/commons/math3/stat/clustering/Cluster.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.stat.clustering;
+package org.apache.commons.math3.stat.clustering;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/src/main/java/org/apache/commons/math/stat/clustering/Clusterable.java b/src/main/java/org/apache/commons/math3/stat/clustering/Clusterable.java
similarity index 96%
rename from src/main/java/org/apache/commons/math/stat/clustering/Clusterable.java
rename to src/main/java/org/apache/commons/math3/stat/clustering/Clusterable.java
index 5b2e2e325..f7eb8533f 100644
--- a/src/main/java/org/apache/commons/math/stat/clustering/Clusterable.java
+++ b/src/main/java/org/apache/commons/math3/stat/clustering/Clusterable.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.stat.clustering;
+package org.apache.commons.math3.stat.clustering;
 
 import java.util.Collection;
 
diff --git a/src/main/java/org/apache/commons/math/stat/clustering/EuclideanIntegerPoint.java b/src/main/java/org/apache/commons/math3/stat/clustering/EuclideanIntegerPoint.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/stat/clustering/EuclideanIntegerPoint.java
rename to src/main/java/org/apache/commons/math3/stat/clustering/EuclideanIntegerPoint.java
index c6111c07d..b8c4bc266 100644
--- a/src/main/java/org/apache/commons/math/stat/clustering/EuclideanIntegerPoint.java
+++ b/src/main/java/org/apache/commons/math3/stat/clustering/EuclideanIntegerPoint.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.stat.clustering;
+package org.apache.commons.math3.stat.clustering;
 
 import java.io.Serializable;
 import java.util.Collection;
 
-import org.apache.commons.math.util.MathArrays;
+import org.apache.commons.math3.util.MathArrays;
 
 /**
  * A simple implementation of {@link Clusterable} for points with integer coordinates.
diff --git a/src/main/java/org/apache/commons/math/stat/clustering/KMeansPlusPlusClusterer.java b/src/main/java/org/apache/commons/math3/stat/clustering/KMeansPlusPlusClusterer.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/stat/clustering/KMeansPlusPlusClusterer.java
rename to src/main/java/org/apache/commons/math3/stat/clustering/KMeansPlusPlusClusterer.java
index 3de2a0648..62f84e5ff 100644
--- a/src/main/java/org/apache/commons/math/stat/clustering/KMeansPlusPlusClusterer.java
+++ b/src/main/java/org/apache/commons/math3/stat/clustering/KMeansPlusPlusClusterer.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.stat.clustering;
+package org.apache.commons.math3.stat.clustering;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -23,12 +23,12 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Random;
 
-import org.apache.commons.math.exception.ConvergenceException;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.stat.descriptive.moment.Variance;
-import org.apache.commons.math.util.MathUtils;
+import org.apache.commons.math3.exception.ConvergenceException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.stat.descriptive.moment.Variance;
+import org.apache.commons.math3.util.MathUtils;
 
 /**
  * Clustering algorithm based on David Arthur and Sergei Vassilvitski k-means++ algorithm.
diff --git a/src/main/java/org/apache/commons/math/stat/clustering/package-info.java b/src/main/java/org/apache/commons/math3/stat/clustering/package-info.java
similarity index 94%
rename from src/main/java/org/apache/commons/math/stat/clustering/package-info.java
rename to src/main/java/org/apache/commons/math3/stat/clustering/package-info.java
index af9bef3e1..b34bfd8ea 100644
--- a/src/main/java/org/apache/commons/math/stat/clustering/package-info.java
+++ b/src/main/java/org/apache/commons/math3/stat/clustering/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Clustering algorithms
  */
-package org.apache.commons.math.stat.clustering;
+package org.apache.commons.math3.stat.clustering;
diff --git a/src/main/java/org/apache/commons/math/stat/correlation/Covariance.java b/src/main/java/org/apache/commons/math3/stat/correlation/Covariance.java
similarity index 95%
rename from src/main/java/org/apache/commons/math/stat/correlation/Covariance.java
rename to src/main/java/org/apache/commons/math3/stat/correlation/Covariance.java
index 5a616e1c2..5d59c95b7 100644
--- a/src/main/java/org/apache/commons/math/stat/correlation/Covariance.java
+++ b/src/main/java/org/apache/commons/math3/stat/correlation/Covariance.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.correlation;
+package org.apache.commons.math3.stat.correlation;
 
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.util.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.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.linear.RealMatrix;
+import org.apache.commons.math3.linear.BlockRealMatrix;
+import org.apache.commons.math3.stat.descriptive.moment.Mean;
+import org.apache.commons.math3.stat.descriptive.moment.Variance;
 
 /**
  * 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/math3/stat/correlation/PearsonsCorrelation.java
similarity index 94%
rename from src/main/java/org/apache/commons/math/stat/correlation/PearsonsCorrelation.java
rename to src/main/java/org/apache/commons/math3/stat/correlation/PearsonsCorrelation.java
index c1d7505af..0234ec435 100644
--- a/src/main/java/org/apache/commons/math/stat/correlation/PearsonsCorrelation.java
+++ b/src/main/java/org/apache/commons/math3/stat/correlation/PearsonsCorrelation.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.correlation;
+package org.apache.commons.math3.stat.correlation;
 
-import org.apache.commons.math.distribution.TDistribution;
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.DimensionMismatchException;
-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.FastMath;
+import org.apache.commons.math3.distribution.TDistribution;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.linear.RealMatrix;
+import org.apache.commons.math3.linear.BlockRealMatrix;
+import org.apache.commons.math3.stat.regression.SimpleRegression;
+import org.apache.commons.math3.util.FastMath;
 
 /**
  * Computes Pearson's product-moment correlation coefficients for pairs of arrays
@@ -157,7 +157,7 @@ public class PearsonsCorrelation {
      * significance of the corresponding correlation coefficients.
    
      *
      * @return matrix of p-values
-     * @throws org.apache.commons.math.exception.MaxCountExceededException
+     * @throws org.apache.commons.math3.exception.MaxCountExceededException
      * if an error occurs estimating probabilities
      */
     public RealMatrix getCorrelationPValues() {
diff --git a/src/main/java/org/apache/commons/math/stat/correlation/SpearmansCorrelation.java b/src/main/java/org/apache/commons/math3/stat/correlation/SpearmansCorrelation.java
similarity index 92%
rename from src/main/java/org/apache/commons/math/stat/correlation/SpearmansCorrelation.java
rename to src/main/java/org/apache/commons/math3/stat/correlation/SpearmansCorrelation.java
index b587ce2de..f4e9acc96 100644
--- a/src/main/java/org/apache/commons/math/stat/correlation/SpearmansCorrelation.java
+++ b/src/main/java/org/apache/commons/math3/stat/correlation/SpearmansCorrelation.java
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.stat.correlation;
+package org.apache.commons.math3.stat.correlation;
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.util.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.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.linear.BlockRealMatrix;
+import org.apache.commons.math3.linear.RealMatrix;
+import org.apache.commons.math3.stat.ranking.NaturalRanking;
+import org.apache.commons.math3.stat.ranking.RankingAlgorithm;
 
 /**
  * 
    Spearman's rank correlation. This implementation performs a rank
diff --git a/src/main/java/org/apache/commons/math/stat/correlation/StorelessBivariateCovariance.java b/src/main/java/org/apache/commons/math3/stat/correlation/StorelessBivariateCovariance.java
similarity index 91%
rename from src/main/java/org/apache/commons/math/stat/correlation/StorelessBivariateCovariance.java
rename to src/main/java/org/apache/commons/math3/stat/correlation/StorelessBivariateCovariance.java
index 812b21cb8..40121a8af 100644
--- a/src/main/java/org/apache/commons/math/stat/correlation/StorelessBivariateCovariance.java
+++ b/src/main/java/org/apache/commons/math3/stat/correlation/StorelessBivariateCovariance.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.correlation;
+package org.apache.commons.math3.stat.correlation;
 
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
 
 /**
  * Bivariate Covariance implementation that does not require input data to be
diff --git a/src/main/java/org/apache/commons/math/stat/correlation/StorelessCovariance.java b/src/main/java/org/apache/commons/math3/stat/correlation/StorelessCovariance.java
similarity index 91%
rename from src/main/java/org/apache/commons/math/stat/correlation/StorelessCovariance.java
rename to src/main/java/org/apache/commons/math3/stat/correlation/StorelessCovariance.java
index 6127e114c..bb5514d8a 100644
--- a/src/main/java/org/apache/commons/math/stat/correlation/StorelessCovariance.java
+++ b/src/main/java/org/apache/commons/math3/stat/correlation/StorelessCovariance.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.correlation;
+package org.apache.commons.math3.stat.correlation;
 
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.MathUnsupportedOperationException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.linear.Array2DRowRealMatrix;
-import org.apache.commons.math.linear.RealMatrix;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.MathUnsupportedOperationException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.linear.Array2DRowRealMatrix;
+import org.apache.commons.math3.linear.RealMatrix;
 
 /**
  * Covariance implementation that does not require input data to be
diff --git a/src/main/java/org/apache/commons/math/stat/correlation/package-info.java b/src/main/java/org/apache/commons/math3/stat/correlation/package-info.java
similarity index 94%
rename from src/main/java/org/apache/commons/math/stat/correlation/package-info.java
rename to src/main/java/org/apache/commons/math3/stat/correlation/package-info.java
index 649372be5..adf285e63 100644
--- a/src/main/java/org/apache/commons/math/stat/correlation/package-info.java
+++ b/src/main/java/org/apache/commons/math3/stat/correlation/package-info.java
@@ -19,4 +19,4 @@
  *        Correlations/Covariance computations.
  *
  */
-package org.apache.commons.math.stat.correlation;
+package org.apache.commons.math3.stat.correlation;
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/AbstractStorelessUnivariateStatistic.java b/src/main/java/org/apache/commons/math3/stat/descriptive/AbstractStorelessUnivariateStatistic.java
similarity index 89%
rename from src/main/java/org/apache/commons/math/stat/descriptive/AbstractStorelessUnivariateStatistic.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/AbstractStorelessUnivariateStatistic.java
index bbdb0dbce..db90fa879 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/AbstractStorelessUnivariateStatistic.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/AbstractStorelessUnivariateStatistic.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive;
+package org.apache.commons.math3.stat.descriptive;
 
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.util.MathUtils;
-import org.apache.commons.math.util.Precision;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.util.MathUtils;
+import org.apache.commons.math3.util.Precision;
 
 /**
  *
@@ -52,7 +52,7 @@ public abstract class AbstractStorelessUnivariateStatistic
      * If the array is null, an IllegalArgumentException is thrown.
    
      * @param values input array
      * @return the value of the statistic applied to the input array
-     * @see org.apache.commons.math.stat.descriptive.UnivariateStatistic#evaluate(double[])
+     * @see org.apache.commons.math3.stat.descriptive.UnivariateStatistic#evaluate(double[])
      */
     @Override
     public double evaluate(final double[] values) {
@@ -81,7 +81,7 @@ public abstract class AbstractStorelessUnivariateStatistic
      * @param begin the index of the first element to include
      * @param length the number of elements to include
      * @return the value of the statistic applied to the included array entries
-     * @see org.apache.commons.math.stat.descriptive.UnivariateStatistic#evaluate(double[], int, int)
+     * @see org.apache.commons.math3.stat.descriptive.UnivariateStatistic#evaluate(double[], int, int)
      */
     @Override
     public double evaluate(final double[] values, final int begin, final int length) {
@@ -121,7 +121,7 @@ public abstract class AbstractStorelessUnivariateStatistic
      *
      * @param values values to add
      * @throws IllegalArgumentException if values is null
-     * @see org.apache.commons.math.stat.descriptive.StorelessUnivariateStatistic#incrementAll(double[])
+     * @see org.apache.commons.math3.stat.descriptive.StorelessUnivariateStatistic#incrementAll(double[])
      */
     public void incrementAll(double[] values) {
         if (values == null) {
@@ -140,7 +140,7 @@ public abstract class AbstractStorelessUnivariateStatistic
      * @param begin   index of the first array element to add
      * @param length  number of array elements to add
      * @throws IllegalArgumentException if values is null
-     * @see org.apache.commons.math.stat.descriptive.StorelessUnivariateStatistic#incrementAll(double[], int, int)
+     * @see org.apache.commons.math3.stat.descriptive.StorelessUnivariateStatistic#incrementAll(double[], int, int)
      */
     public void incrementAll(double[] values, int begin, int length) {
         if (test(values, begin, length)) {
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/AbstractUnivariateStatistic.java b/src/main/java/org/apache/commons/math3/stat/descriptive/AbstractUnivariateStatistic.java
similarity index 96%
rename from src/main/java/org/apache/commons/math/stat/descriptive/AbstractUnivariateStatistic.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/AbstractUnivariateStatistic.java
index 757456467..7e78d5e13 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/AbstractUnivariateStatistic.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/AbstractUnivariateStatistic.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive;
+package org.apache.commons.math3.stat.descriptive;
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.NotPositiveException;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.NumberIsTooLargeException;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.NotPositiveException;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.NumberIsTooLargeException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
 
 /**
  * Abstract base class for all implementations of the
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/AggregateSummaryStatistics.java b/src/main/java/org/apache/commons/math3/stat/descriptive/AggregateSummaryStatistics.java
similarity index 99%
rename from src/main/java/org/apache/commons/math/stat/descriptive/AggregateSummaryStatistics.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/AggregateSummaryStatistics.java
index af989e0ef..ddb947db3 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/AggregateSummaryStatistics.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/AggregateSummaryStatistics.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.stat.descriptive;
+package org.apache.commons.math3.stat.descriptive;
 
 import java.io.Serializable;
 import java.util.Collection;
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/DescriptiveStatistics.java b/src/main/java/org/apache/commons/math3/stat/descriptive/DescriptiveStatistics.java
similarity index 95%
rename from src/main/java/org/apache/commons/math/stat/descriptive/DescriptiveStatistics.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/DescriptiveStatistics.java
index 3ad41d9cb..9792caeff 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/DescriptiveStatistics.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/DescriptiveStatistics.java
@@ -14,29 +14,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive;
+package org.apache.commons.math3.stat.descriptive;
 
 import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
 
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.MathIllegalStateException;
-import org.apache.commons.math.exception.util.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;
-import org.apache.commons.math.stat.descriptive.moment.Skewness;
-import org.apache.commons.math.stat.descriptive.moment.Variance;
-import org.apache.commons.math.stat.descriptive.rank.Max;
-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.MathUtils;
-import org.apache.commons.math.util.ResizableDoubleArray;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.MathIllegalStateException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.stat.descriptive.moment.GeometricMean;
+import org.apache.commons.math3.stat.descriptive.moment.Kurtosis;
+import org.apache.commons.math3.stat.descriptive.moment.Mean;
+import org.apache.commons.math3.stat.descriptive.moment.Skewness;
+import org.apache.commons.math3.stat.descriptive.moment.Variance;
+import org.apache.commons.math3.stat.descriptive.rank.Max;
+import org.apache.commons.math3.stat.descriptive.rank.Min;
+import org.apache.commons.math3.stat.descriptive.rank.Percentile;
+import org.apache.commons.math3.stat.descriptive.summary.Sum;
+import org.apache.commons.math3.stat.descriptive.summary.SumOfSquares;
+import org.apache.commons.math3.util.MathUtils;
+import org.apache.commons.math3.util.ResizableDoubleArray;
+import org.apache.commons.math3.util.FastMath;
 
 
 /**
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/MultivariateSummaryStatistics.java b/src/main/java/org/apache/commons/math3/stat/descriptive/MultivariateSummaryStatistics.java
similarity index 95%
rename from src/main/java/org/apache/commons/math/stat/descriptive/MultivariateSummaryStatistics.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/MultivariateSummaryStatistics.java
index 8df5c375f..1987f9868 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/MultivariateSummaryStatistics.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/MultivariateSummaryStatistics.java
@@ -14,27 +14,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive;
+package org.apache.commons.math3.stat.descriptive;
 
 import java.io.Serializable;
 import java.util.Arrays;
 
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.MathIllegalStateException;
-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;
-import org.apache.commons.math.stat.descriptive.moment.VectorialCovariance;
-import org.apache.commons.math.stat.descriptive.rank.Max;
-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.MathUtils;
-import org.apache.commons.math.util.MathArrays;
-import org.apache.commons.math.util.Precision;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.MathIllegalStateException;
+import org.apache.commons.math3.linear.RealMatrix;
+import org.apache.commons.math3.stat.descriptive.moment.GeometricMean;
+import org.apache.commons.math3.stat.descriptive.moment.Mean;
+import org.apache.commons.math3.stat.descriptive.moment.VectorialCovariance;
+import org.apache.commons.math3.stat.descriptive.rank.Max;
+import org.apache.commons.math3.stat.descriptive.rank.Min;
+import org.apache.commons.math3.stat.descriptive.summary.Sum;
+import org.apache.commons.math3.stat.descriptive.summary.SumOfLogs;
+import org.apache.commons.math3.stat.descriptive.summary.SumOfSquares;
+import org.apache.commons.math3.util.MathUtils;
+import org.apache.commons.math3.util.MathArrays;
+import org.apache.commons.math3.util.Precision;
+import org.apache.commons.math3.util.FastMath;
 
 /**
  * 
    Computes summary statistics for a stream of n-tuples added using the
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/StatisticalMultivariateSummary.java b/src/main/java/org/apache/commons/math3/stat/descriptive/StatisticalMultivariateSummary.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/stat/descriptive/StatisticalMultivariateSummary.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/StatisticalMultivariateSummary.java
index 1e6622622..b08a83da1 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/StatisticalMultivariateSummary.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/StatisticalMultivariateSummary.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive;
+package org.apache.commons.math3.stat.descriptive;
 
-import org.apache.commons.math.linear.RealMatrix;
+import org.apache.commons.math3.linear.RealMatrix;
 
 /**
  *  Reporting interface for basic multivariate statistics.
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/StatisticalSummary.java b/src/main/java/org/apache/commons/math3/stat/descriptive/StatisticalSummary.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/stat/descriptive/StatisticalSummary.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/StatisticalSummary.java
index 4f1537495..7eb1c76ad 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/StatisticalSummary.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/StatisticalSummary.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive;
+package org.apache.commons.math3.stat.descriptive;
 
 /**
  *  Reporting interface for basic univariate statistics.
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/StatisticalSummaryValues.java b/src/main/java/org/apache/commons/math3/stat/descriptive/StatisticalSummaryValues.java
similarity index 96%
rename from src/main/java/org/apache/commons/math/stat/descriptive/StatisticalSummaryValues.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/StatisticalSummaryValues.java
index 661ab2528..c13be9f75 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/StatisticalSummaryValues.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/StatisticalSummaryValues.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive;
+package org.apache.commons.math3.stat.descriptive;
 
 import java.io.Serializable;
 
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.util.MathUtils;
-import org.apache.commons.math.util.Precision;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.util.MathUtils;
+import org.apache.commons.math3.util.Precision;
 
 /**
  *  Value object representing the results of a univariate statistical summary.
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/StorelessUnivariateStatistic.java b/src/main/java/org/apache/commons/math3/stat/descriptive/StorelessUnivariateStatistic.java
similarity index 98%
rename from src/main/java/org/apache/commons/math/stat/descriptive/StorelessUnivariateStatistic.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/StorelessUnivariateStatistic.java
index 69100d1dd..e93b5d390 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/StorelessUnivariateStatistic.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/StorelessUnivariateStatistic.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive;
+package org.apache.commons.math3.stat.descriptive;
 
 /**
  * Extends the definition of {@link UnivariateStatistic} with
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/SummaryStatistics.java b/src/main/java/org/apache/commons/math3/stat/descriptive/SummaryStatistics.java
similarity index 96%
rename from src/main/java/org/apache/commons/math/stat/descriptive/SummaryStatistics.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/SummaryStatistics.java
index da987cd3c..3d9513a18 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/SummaryStatistics.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/SummaryStatistics.java
@@ -14,25 +14,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive;
+package org.apache.commons.math3.stat.descriptive;
 
 import java.io.Serializable;
 
-import org.apache.commons.math.exception.MathIllegalStateException;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.util.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;
-import org.apache.commons.math.stat.descriptive.moment.Variance;
-import org.apache.commons.math.stat.descriptive.rank.Max;
-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.MathUtils;
-import org.apache.commons.math.util.Precision;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.exception.MathIllegalStateException;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.stat.descriptive.moment.GeometricMean;
+import org.apache.commons.math3.stat.descriptive.moment.Mean;
+import org.apache.commons.math3.stat.descriptive.moment.SecondMoment;
+import org.apache.commons.math3.stat.descriptive.moment.Variance;
+import org.apache.commons.math3.stat.descriptive.rank.Max;
+import org.apache.commons.math3.stat.descriptive.rank.Min;
+import org.apache.commons.math3.stat.descriptive.summary.Sum;
+import org.apache.commons.math3.stat.descriptive.summary.SumOfLogs;
+import org.apache.commons.math3.stat.descriptive.summary.SumOfSquares;
+import org.apache.commons.math3.util.MathUtils;
+import org.apache.commons.math3.util.Precision;
+import org.apache.commons.math3.util.FastMath;
 
 /**
  * 
    
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/SynchronizedDescriptiveStatistics.java b/src/main/java/org/apache/commons/math3/stat/descriptive/SynchronizedDescriptiveStatistics.java
similarity index 95%
rename from src/main/java/org/apache/commons/math/stat/descriptive/SynchronizedDescriptiveStatistics.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/SynchronizedDescriptiveStatistics.java
index 0dc015e78..392ab0b5b 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/SynchronizedDescriptiveStatistics.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/SynchronizedDescriptiveStatistics.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive;
+package org.apache.commons.math3.stat.descriptive;
 
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.util.MathUtils;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.util.MathUtils;
 
 /**
  * Implementation of
- * {@link org.apache.commons.math.stat.descriptive.DescriptiveStatistics} that
+ * {@link org.apache.commons.math3.stat.descriptive.DescriptiveStatistics} that
  * is safe to use in a multithreaded environment.  Multiple threads can safely
  * operate on a single instance without causing runtime exceptions due to race
  * conditions.  In effect, this implementation makes modification and access
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/SynchronizedMultivariateSummaryStatistics.java b/src/main/java/org/apache/commons/math3/stat/descriptive/SynchronizedMultivariateSummaryStatistics.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/stat/descriptive/SynchronizedMultivariateSummaryStatistics.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/SynchronizedMultivariateSummaryStatistics.java
index b5a0ad013..1ed3eab84 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/SynchronizedMultivariateSummaryStatistics.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/SynchronizedMultivariateSummaryStatistics.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive;
+package org.apache.commons.math3.stat.descriptive;
 
-import org.apache.commons.math.linear.RealMatrix;
+import org.apache.commons.math3.linear.RealMatrix;
 
 /**
  * Implementation of
- * {@link org.apache.commons.math.stat.descriptive.MultivariateSummaryStatistics} that
+ * {@link org.apache.commons.math3.stat.descriptive.MultivariateSummaryStatistics} that
  * is safe to use in a multithreaded environment.  Multiple threads can safely
  * operate on a single instance without causing runtime exceptions due to race
  * conditions.  In effect, this implementation makes modification and access
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/SynchronizedSummaryStatistics.java b/src/main/java/org/apache/commons/math3/stat/descriptive/SynchronizedSummaryStatistics.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/stat/descriptive/SynchronizedSummaryStatistics.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/SynchronizedSummaryStatistics.java
index d131db1c6..2e3f3c8d6 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/SynchronizedSummaryStatistics.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/SynchronizedSummaryStatistics.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive;
+package org.apache.commons.math3.stat.descriptive;
 
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.util.MathUtils;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.util.MathUtils;
 
 /**
  * Implementation of
- * {@link org.apache.commons.math.stat.descriptive.SummaryStatistics} that
+ * {@link org.apache.commons.math3.stat.descriptive.SummaryStatistics} that
  * is safe to use in a multithreaded environment.  Multiple threads can safely
  * operate on a single instance without causing runtime exceptions due to race
  * conditions.  In effect, this implementation makes modification and access
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/UnivariateStatistic.java b/src/main/java/org/apache/commons/math3/stat/descriptive/UnivariateStatistic.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/stat/descriptive/UnivariateStatistic.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/UnivariateStatistic.java
index 0735059c6..19aea9eff 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/UnivariateStatistic.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/UnivariateStatistic.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive;
+package org.apache.commons.math3.stat.descriptive;
 
 
 /**
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/WeightedEvaluation.java b/src/main/java/org/apache/commons/math3/stat/descriptive/WeightedEvaluation.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/stat/descriptive/WeightedEvaluation.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/WeightedEvaluation.java
index 8b501db55..e6fdbd1e3 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/WeightedEvaluation.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/WeightedEvaluation.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive;
+package org.apache.commons.math3.stat.descriptive;
 
 /**
  * Weighted evaluation for statistics.
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/moment/FirstMoment.java b/src/main/java/org/apache/commons/math3/stat/descriptive/moment/FirstMoment.java
similarity index 94%
rename from src/main/java/org/apache/commons/math/stat/descriptive/moment/FirstMoment.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/moment/FirstMoment.java
index b7a280314..16f9c8a60 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/moment/FirstMoment.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/moment/FirstMoment.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.moment;
+package org.apache.commons.math3.stat.descriptive.moment;
 
 import java.io.Serializable;
 
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.stat.descriptive.AbstractStorelessUnivariateStatistic;
-import org.apache.commons.math.util.MathUtils;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.stat.descriptive.AbstractStorelessUnivariateStatistic;
+import org.apache.commons.math3.util.MathUtils;
 
 /**
  * Computes the first moment (arithmetic mean).  Uses the definitional formula:
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/moment/FourthMoment.java b/src/main/java/org/apache/commons/math3/stat/descriptive/moment/FourthMoment.java
similarity index 96%
rename from src/main/java/org/apache/commons/math/stat/descriptive/moment/FourthMoment.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/moment/FourthMoment.java
index 773d30fa5..596da1fd5 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/moment/FourthMoment.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/moment/FourthMoment.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.moment;
+package org.apache.commons.math3.stat.descriptive.moment;
 
 import java.io.Serializable;
 
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.util.MathUtils;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.util.MathUtils;
 
 /**
  * Computes a statistic related to the Fourth Central Moment.  Specifically,
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/moment/GeometricMean.java b/src/main/java/org/apache/commons/math3/stat/descriptive/moment/GeometricMean.java
similarity index 91%
rename from src/main/java/org/apache/commons/math/stat/descriptive/moment/GeometricMean.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/moment/GeometricMean.java
index 2aaadc969..924f640b8 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/moment/GeometricMean.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/moment/GeometricMean.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.moment;
+package org.apache.commons.math3.stat.descriptive.moment;
 
 import java.io.Serializable;
 
-import org.apache.commons.math.exception.MathIllegalStateException;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.util.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.FastMath;
-import org.apache.commons.math.util.MathUtils;
+import org.apache.commons.math3.exception.MathIllegalStateException;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.stat.descriptive.AbstractStorelessUnivariateStatistic;
+import org.apache.commons.math3.stat.descriptive.StorelessUnivariateStatistic;
+import org.apache.commons.math3.stat.descriptive.summary.SumOfLogs;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.util.MathUtils;
 
 /**
  * Returns the 
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/moment/Kurtosis.java b/src/main/java/org/apache/commons/math3/stat/descriptive/moment/Kurtosis.java
similarity index 93%
rename from src/main/java/org/apache/commons/math/stat/descriptive/moment/Kurtosis.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/moment/Kurtosis.java
index 7ce0fcbf4..6b15b2328 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/moment/Kurtosis.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/moment/Kurtosis.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.moment;
+package org.apache.commons.math3.stat.descriptive.moment;
 
 import java.io.Serializable;
 
-import org.apache.commons.math.exception.MathIllegalStateException;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.stat.descriptive.AbstractStorelessUnivariateStatistic;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.util.MathUtils;
+import org.apache.commons.math3.exception.MathIllegalStateException;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.stat.descriptive.AbstractStorelessUnivariateStatistic;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.util.MathUtils;
 
 
 /**
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/moment/Mean.java b/src/main/java/org/apache/commons/math3/stat/descriptive/moment/Mean.java
similarity index 96%
rename from src/main/java/org/apache/commons/math/stat/descriptive/moment/Mean.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/moment/Mean.java
index b1b67fd1e..a531ec056 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/moment/Mean.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/moment/Mean.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.moment;
+package org.apache.commons.math3.stat.descriptive.moment;
 
 import java.io.Serializable;
 
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.stat.descriptive.AbstractStorelessUnivariateStatistic;
-import org.apache.commons.math.stat.descriptive.WeightedEvaluation;
-import org.apache.commons.math.stat.descriptive.summary.Sum;
-import org.apache.commons.math.util.MathUtils;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.stat.descriptive.AbstractStorelessUnivariateStatistic;
+import org.apache.commons.math3.stat.descriptive.WeightedEvaluation;
+import org.apache.commons.math3.stat.descriptive.summary.Sum;
+import org.apache.commons.math3.util.MathUtils;
 
 /**
  * 
    Computes the arithmetic mean of a set of values. Uses the definitional
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/moment/SecondMoment.java b/src/main/java/org/apache/commons/math3/stat/descriptive/moment/SecondMoment.java
similarity index 95%
rename from src/main/java/org/apache/commons/math/stat/descriptive/moment/SecondMoment.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/moment/SecondMoment.java
index 53cdf3319..5fedb6279 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/moment/SecondMoment.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/moment/SecondMoment.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.moment;
+package org.apache.commons.math3.stat.descriptive.moment;
 
 import java.io.Serializable;
 
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.util.MathUtils;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.util.MathUtils;
 
 /**
  * Computes a statistic related to the Second Central Moment.  Specifically,
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/moment/SemiVariance.java b/src/main/java/org/apache/commons/math3/stat/descriptive/moment/SemiVariance.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/stat/descriptive/moment/SemiVariance.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/moment/SemiVariance.java
index 707a97675..01b2ef9da 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/moment/SemiVariance.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/moment/SemiVariance.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.stat.descriptive.moment;
+package org.apache.commons.math3.stat.descriptive.moment;
 
 import java.io.Serializable;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.stat.descriptive.AbstractUnivariateStatistic;
-import org.apache.commons.math.util.MathUtils;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.stat.descriptive.AbstractUnivariateStatistic;
+import org.apache.commons.math3.util.MathUtils;
 
 /**
  * 
    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/Skewness.java b/src/main/java/org/apache/commons/math3/stat/descriptive/moment/Skewness.java
similarity index 95%
rename from src/main/java/org/apache/commons/math/stat/descriptive/moment/Skewness.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/moment/Skewness.java
index a33cbbb2c..7f65e1553 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/moment/Skewness.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/moment/Skewness.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.moment;
+package org.apache.commons.math3.stat.descriptive.moment;
 
 import java.io.Serializable;
 
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.stat.descriptive.AbstractStorelessUnivariateStatistic;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.util.MathUtils;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.stat.descriptive.AbstractStorelessUnivariateStatistic;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.util.MathUtils;
 
 /**
  * Computes the skewness of the available values.
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/moment/StandardDeviation.java b/src/main/java/org/apache/commons/math3/stat/descriptive/moment/StandardDeviation.java
similarity index 96%
rename from src/main/java/org/apache/commons/math/stat/descriptive/moment/StandardDeviation.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/moment/StandardDeviation.java
index 10a23ed1b..2e1b630ea 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/moment/StandardDeviation.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/moment/StandardDeviation.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.moment;
+package org.apache.commons.math3.stat.descriptive.moment;
 
 import java.io.Serializable;
 
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.stat.descriptive.AbstractStorelessUnivariateStatistic;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.util.MathUtils;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.stat.descriptive.AbstractStorelessUnivariateStatistic;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.util.MathUtils;
 
 /**
  * Computes the sample standard deviation.  The standard deviation
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/moment/ThirdMoment.java b/src/main/java/org/apache/commons/math3/stat/descriptive/moment/ThirdMoment.java
similarity index 96%
rename from src/main/java/org/apache/commons/math/stat/descriptive/moment/ThirdMoment.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/moment/ThirdMoment.java
index cdff758e1..2b2f49bbc 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/moment/ThirdMoment.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/moment/ThirdMoment.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.moment;
+package org.apache.commons.math3.stat.descriptive.moment;
 
 import java.io.Serializable;
 
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.util.MathUtils;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.util.MathUtils;
 
 
 /**
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/moment/Variance.java b/src/main/java/org/apache/commons/math3/stat/descriptive/moment/Variance.java
similarity index 98%
rename from src/main/java/org/apache/commons/math/stat/descriptive/moment/Variance.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/moment/Variance.java
index 1de139f3e..1b74f57ea 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/moment/Variance.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/moment/Variance.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.moment;
+package org.apache.commons.math3.stat.descriptive.moment;
 
 import java.io.Serializable;
 
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.stat.descriptive.WeightedEvaluation;
-import org.apache.commons.math.stat.descriptive.AbstractStorelessUnivariateStatistic;
-import org.apache.commons.math.util.MathUtils;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.stat.descriptive.WeightedEvaluation;
+import org.apache.commons.math3.stat.descriptive.AbstractStorelessUnivariateStatistic;
+import org.apache.commons.math3.util.MathUtils;
 
 /**
  * Computes the variance of the available values.  By default, the unbiased
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/moment/VectorialCovariance.java b/src/main/java/org/apache/commons/math3/stat/descriptive/moment/VectorialCovariance.java
similarity index 95%
rename from src/main/java/org/apache/commons/math/stat/descriptive/moment/VectorialCovariance.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/moment/VectorialCovariance.java
index 8c026b8a8..90729a8d4 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/moment/VectorialCovariance.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/moment/VectorialCovariance.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.moment;
+package org.apache.commons.math3.stat.descriptive.moment;
 
 import java.io.Serializable;
 import java.util.Arrays;
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.linear.MatrixUtils;
-import org.apache.commons.math.linear.RealMatrix;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.linear.MatrixUtils;
+import org.apache.commons.math3.linear.RealMatrix;
 
 /**
  * Returns the covariance matrix of the available vectors.
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/moment/VectorialMean.java b/src/main/java/org/apache/commons/math3/stat/descriptive/moment/VectorialMean.java
similarity index 95%
rename from src/main/java/org/apache/commons/math/stat/descriptive/moment/VectorialMean.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/moment/VectorialMean.java
index 05b7afb66..b3dadb477 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/moment/VectorialMean.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/moment/VectorialMean.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.moment;
+package org.apache.commons.math3.stat.descriptive.moment;
 
 import java.io.Serializable;
 import java.util.Arrays;
 
-import org.apache.commons.math.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.DimensionMismatchException;
 
 /**
  * Returns the arithmetic mean of the available vectors.
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/moment/package-info.java b/src/main/java/org/apache/commons/math3/stat/descriptive/moment/package-info.java
similarity index 93%
rename from src/main/java/org/apache/commons/math/stat/descriptive/moment/package-info.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/moment/package-info.java
index bc0d011c8..e23ead74d 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/moment/package-info.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/moment/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Summary statistics based on moments.
  */
-package org.apache.commons.math.stat.descriptive.moment;
+package org.apache.commons.math3.stat.descriptive.moment;
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/package-info.java b/src/main/java/org/apache/commons/math3/stat/descriptive/package-info.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/stat/descriptive/package-info.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/package-info.java
index cd97beda6..92fa5b312 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/package-info.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/package-info.java
@@ -41,4 +41,4 @@
  *        
  *
  */
-package org.apache.commons.math.stat.descriptive;
+package org.apache.commons.math3.stat.descriptive;
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/rank/Max.java b/src/main/java/org/apache/commons/math3/stat/descriptive/rank/Max.java
similarity index 95%
rename from src/main/java/org/apache/commons/math/stat/descriptive/rank/Max.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/rank/Max.java
index c59ed540c..92181c45b 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/rank/Max.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/rank/Max.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.rank;
+package org.apache.commons.math3.stat.descriptive.rank;
 
 import java.io.Serializable;
 
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.stat.descriptive.AbstractStorelessUnivariateStatistic;
-import org.apache.commons.math.util.MathUtils;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.stat.descriptive.AbstractStorelessUnivariateStatistic;
+import org.apache.commons.math3.util.MathUtils;
 
 /**
  * Returns the maximum of the available values.
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/rank/Median.java b/src/main/java/org/apache/commons/math3/stat/descriptive/rank/Median.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/stat/descriptive/rank/Median.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/rank/Median.java
index 642999c1a..2c88ea080 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/rank/Median.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/rank/Median.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.rank;
+package org.apache.commons.math3.stat.descriptive.rank;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/rank/Min.java b/src/main/java/org/apache/commons/math3/stat/descriptive/rank/Min.java
similarity index 95%
rename from src/main/java/org/apache/commons/math/stat/descriptive/rank/Min.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/rank/Min.java
index 6f5c82d28..1c3cd72d7 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/rank/Min.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/rank/Min.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.rank;
+package org.apache.commons.math3.stat.descriptive.rank;
 
 import java.io.Serializable;
 
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.stat.descriptive.AbstractStorelessUnivariateStatistic;
-import org.apache.commons.math.util.MathUtils;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.stat.descriptive.AbstractStorelessUnivariateStatistic;
+import org.apache.commons.math3.util.MathUtils;
 
 /**
  * Returns the minimum of the available values.
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/rank/Percentile.java b/src/main/java/org/apache/commons/math3/stat/descriptive/rank/Percentile.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/stat/descriptive/rank/Percentile.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/rank/Percentile.java
index 97d272d85..7220cb4d3 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/rank/Percentile.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/rank/Percentile.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.rank;
+package org.apache.commons.math3.stat.descriptive.rank;
 
 import java.io.Serializable;
 import java.util.Arrays;
 
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.OutOfRangeException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.stat.descriptive.AbstractUnivariateStatistic;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.util.MathUtils;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.OutOfRangeException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.stat.descriptive.AbstractUnivariateStatistic;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.util.MathUtils;
 
 /**
  * Provides percentile computation.
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/rank/package-info.java b/src/main/java/org/apache/commons/math3/stat/descriptive/rank/package-info.java
similarity index 93%
rename from src/main/java/org/apache/commons/math/stat/descriptive/rank/package-info.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/rank/package-info.java
index 7f26d608f..da37b37c0 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/rank/package-info.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/rank/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Summary statistics based on ranks.
  */
-package org.apache.commons.math.stat.descriptive.rank;
+package org.apache.commons.math3.stat.descriptive.rank;
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/summary/Product.java b/src/main/java/org/apache/commons/math3/stat/descriptive/summary/Product.java
similarity index 95%
rename from src/main/java/org/apache/commons/math/stat/descriptive/summary/Product.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/summary/Product.java
index bc656d3c4..8d4a6e947 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/summary/Product.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/summary/Product.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.summary;
+package org.apache.commons.math3.stat.descriptive.summary;
 
 import java.io.Serializable;
 
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.stat.descriptive.AbstractStorelessUnivariateStatistic;
-import org.apache.commons.math.stat.descriptive.WeightedEvaluation;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.util.MathUtils;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.stat.descriptive.AbstractStorelessUnivariateStatistic;
+import org.apache.commons.math3.stat.descriptive.WeightedEvaluation;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.util.MathUtils;
 
 /**
  * Returns the product of the available values.
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/summary/Sum.java b/src/main/java/org/apache/commons/math3/stat/descriptive/summary/Sum.java
similarity index 96%
rename from src/main/java/org/apache/commons/math/stat/descriptive/summary/Sum.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/summary/Sum.java
index f865f8d82..8ec91e647 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/summary/Sum.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/summary/Sum.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.summary;
+package org.apache.commons.math3.stat.descriptive.summary;
 
 import java.io.Serializable;
 
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.stat.descriptive.AbstractStorelessUnivariateStatistic;
-import org.apache.commons.math.util.MathUtils;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.stat.descriptive.AbstractStorelessUnivariateStatistic;
+import org.apache.commons.math3.util.MathUtils;
 
 
 /**
diff --git a/src/main/java/org/apache/commons/math/stat/descriptive/summary/SumOfLogs.java b/src/main/java/org/apache/commons/math3/stat/descriptive/summary/SumOfLogs.java
similarity index 92%
rename from src/main/java/org/apache/commons/math/stat/descriptive/summary/SumOfLogs.java
rename to src/main/java/org/apache/commons/math3/stat/descriptive/summary/SumOfLogs.java
index 8166d289d..b8c3280ba 100644
--- a/src/main/java/org/apache/commons/math/stat/descriptive/summary/SumOfLogs.java
+++ b/src/main/java/org/apache/commons/math3/stat/descriptive/summary/SumOfLogs.java
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.summary;
+package org.apache.commons.math3.stat.descriptive.summary;
 
 import java.io.Serializable;
 
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.stat.descriptive.AbstractStorelessUnivariateStatistic;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.util.MathUtils;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.stat.descriptive.AbstractStorelessUnivariateStatistic;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.util.MathUtils;
 
 /**
  * Returns the sum of the natural logs for this collection of values.
  * 
    
- * Uses {@link org.apache.commons.math.util.FastMath#log(double)} to compute the logs.
+ * Uses {@link org.apache.commons.math3.util.FastMath#log(double)} to compute the logs.
  * Therefore,
  * 
    
      * This implementation uses the
-     * {@link org.apache.commons.math.distribution.FDistribution
+     * {@link org.apache.commons.math3.distribution.FDistribution
      * commons-math F Distribution implementation} to estimate the exact
      * p-value, using the formula
          *   p = 1 - cumulativeProbability(F)
    
@@ -143,7 +143,7 @@ public class OneWayAnova {
      * 
  • alpha must be strictly greater than 0 and less than or equal to 0.5.
      * 
    • 
      * This implementation uses the
-     * {@link org.apache.commons.math.distribution.FDistribution
+     * {@link org.apache.commons.math3.distribution.FDistribution
      * commons-math F Distribution implementation} to estimate the exact
      * p-value, using the formula
          *   p = 1 - cumulativeProbability(F)
    
diff --git a/src/main/java/org/apache/commons/math/stat/inference/TTest.java b/src/main/java/org/apache/commons/math3/stat/inference/TTest.java
similarity index 98%
rename from src/main/java/org/apache/commons/math/stat/inference/TTest.java
rename to src/main/java/org/apache/commons/math3/stat/inference/TTest.java
index 4d611fe39..c55ce03d3 100644
--- a/src/main/java/org/apache/commons/math/stat/inference/TTest.java
+++ b/src/main/java/org/apache/commons/math3/stat/inference/TTest.java
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.inference;
+package org.apache.commons.math3.stat.inference;
 
-import org.apache.commons.math.distribution.TDistribution;
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.MaxCountExceededException;
-import org.apache.commons.math.exception.NoDataException;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.exception.OutOfRangeException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.stat.StatUtils;
-import org.apache.commons.math.stat.descriptive.StatisticalSummary;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.distribution.TDistribution;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.MaxCountExceededException;
+import org.apache.commons.math3.exception.NoDataException;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.exception.OutOfRangeException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.stat.StatUtils;
+import org.apache.commons.math3.stat.descriptive.StatisticalSummary;
+import org.apache.commons.math3.util.FastMath;
 
 /**
  * An implementation for Student's t-tests.
@@ -49,7 +49,7 @@ import org.apache.commons.math.util.FastMath;
  * 
    
  * Input to tests can be either double[] arrays or
  * {@link StatisticalSummary} instances.
    
- * Uses commons-math {@link org.apache.commons.math.distribution.TDistribution}
+ * Uses commons-math {@link org.apache.commons.math3.distribution.TDistribution}
  * implementation to estimate exact p-values.
    
  *
  * @version $Id$
diff --git a/src/main/java/org/apache/commons/math/stat/inference/TestUtils.java b/src/main/java/org/apache/commons/math3/stat/inference/TestUtils.java
similarity index 71%
rename from src/main/java/org/apache/commons/math/stat/inference/TestUtils.java
rename to src/main/java/org/apache/commons/math3/stat/inference/TestUtils.java
index c92f1d28b..239da7e8a 100644
--- a/src/main/java/org/apache/commons/math/stat/inference/TestUtils.java
+++ b/src/main/java/org/apache/commons/math3/stat/inference/TestUtils.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.inference;
+package org.apache.commons.math3.stat.inference;
 
 import java.util.Collection;
-import org.apache.commons.math.exception.ConvergenceException;
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.MaxCountExceededException;
-import org.apache.commons.math.exception.NoDataException;
-import org.apache.commons.math.exception.NotPositiveException;
-import org.apache.commons.math.exception.NotStrictlyPositiveException;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.exception.OutOfRangeException;
-import org.apache.commons.math.exception.ZeroException;
-import org.apache.commons.math.stat.descriptive.StatisticalSummary;
+import org.apache.commons.math3.exception.ConvergenceException;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.MaxCountExceededException;
+import org.apache.commons.math3.exception.NoDataException;
+import org.apache.commons.math3.exception.NotPositiveException;
+import org.apache.commons.math3.exception.NotStrictlyPositiveException;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.exception.OutOfRangeException;
+import org.apache.commons.math3.exception.ZeroException;
+import org.apache.commons.math3.stat.descriptive.StatisticalSummary;
 
 /**
  * A collection of static methods to create inference test instances or to
@@ -57,7 +57,7 @@ public class TestUtils  {
     // CHECKSTYLE: stop JavadocMethodCheck
 
     /**
-     * @see org.apache.commons.math.stat.inference.TTest#homoscedasticT(double[], double[])
+     * @see org.apache.commons.math3.stat.inference.TTest#homoscedasticT(double[], double[])
      */
     public static double homoscedasticT(final double[] sample1, final double[] sample2)
         throws NullArgumentException, NumberIsTooSmallException {
@@ -65,7 +65,7 @@ public class TestUtils  {
     }
 
     /**
-     * @see org.apache.commons.math.stat.inference.TTest#homoscedasticT(org.apache.commons.math.stat.descriptive.StatisticalSummary, org.apache.commons.math.stat.descriptive.StatisticalSummary)
+     * @see org.apache.commons.math3.stat.inference.TTest#homoscedasticT(org.apache.commons.math3.stat.descriptive.StatisticalSummary, org.apache.commons.math3.stat.descriptive.StatisticalSummary)
      */
     public static double homoscedasticT(final StatisticalSummary sampleStats1,
                                         final StatisticalSummary sampleStats2)
@@ -74,7 +74,7 @@ public class TestUtils  {
     }
 
     /**
-     * @see org.apache.commons.math.stat.inference.TTest#homoscedasticTTest(double[], double[], double)
+     * @see org.apache.commons.math3.stat.inference.TTest#homoscedasticTTest(double[], double[], double)
      */
     public static boolean homoscedasticTTest(final double[] sample1, final double[] sample2,
                                              final double alpha)
@@ -84,7 +84,7 @@ public class TestUtils  {
     }
 
     /**
-     * @see org.apache.commons.math.stat.inference.TTest#homoscedasticTTest(double[], double[])
+     * @see org.apache.commons.math3.stat.inference.TTest#homoscedasticTTest(double[], double[])
      */
     public static double homoscedasticTTest(final double[] sample1, final double[] sample2)
         throws NullArgumentException, NumberIsTooSmallException, MaxCountExceededException {
@@ -92,7 +92,7 @@ public class TestUtils  {
     }
 
     /**
-     * @see org.apache.commons.math.stat.inference.TTest#homoscedasticTTest(org.apache.commons.math.stat.descriptive.StatisticalSummary, org.apache.commons.math.stat.descriptive.StatisticalSummary)
+     * @see org.apache.commons.math3.stat.inference.TTest#homoscedasticTTest(org.apache.commons.math3.stat.descriptive.StatisticalSummary, org.apache.commons.math3.stat.descriptive.StatisticalSummary)
      */
     public static double homoscedasticTTest(final StatisticalSummary sampleStats1,
                                             final StatisticalSummary sampleStats2)
@@ -101,7 +101,7 @@ public class TestUtils  {
     }
 
     /**
-     * @see org.apache.commons.math.stat.inference.TTest#pairedT(double[], double[])
+     * @see org.apache.commons.math3.stat.inference.TTest#pairedT(double[], double[])
      */
     public static double pairedT(final double[] sample1, final double[] sample2)
         throws NullArgumentException, NoDataException,
@@ -110,7 +110,7 @@ public class TestUtils  {
     }
 
     /**
-     * @see org.apache.commons.math.stat.inference.TTest#pairedTTest(double[], double[], double)
+     * @see org.apache.commons.math3.stat.inference.TTest#pairedTTest(double[], double[], double)
      */
     public static boolean pairedTTest(final double[] sample1, final double[] sample2,
                                       final double alpha)
@@ -120,7 +120,7 @@ public class TestUtils  {
     }
 
     /**
-     * @see org.apache.commons.math.stat.inference.TTest#pairedTTest(double[], double[])
+     * @see org.apache.commons.math3.stat.inference.TTest#pairedTTest(double[], double[])
      */
     public static double pairedTTest(final double[] sample1, final double[] sample2)
         throws NullArgumentException, NoDataException, DimensionMismatchException,
@@ -129,7 +129,7 @@ public class TestUtils  {
     }
 
     /**
-     * @see org.apache.commons.math.stat.inference.TTest#t(double, double[])
+     * @see org.apache.commons.math3.stat.inference.TTest#t(double, double[])
      */
     public static double t(final double mu, final double[] observed)
         throws NullArgumentException, NumberIsTooSmallException {
@@ -137,7 +137,7 @@ public class TestUtils  {
     }
 
     /**
-     * @see org.apache.commons.math.stat.inference.TTest#t(double, org.apache.commons.math.stat.descriptive.StatisticalSummary)
+     * @see org.apache.commons.math3.stat.inference.TTest#t(double, org.apache.commons.math3.stat.descriptive.StatisticalSummary)
      */
     public static double t(final double mu, final StatisticalSummary sampleStats)
         throws NullArgumentException, NumberIsTooSmallException {
@@ -145,7 +145,7 @@ public class TestUtils  {
     }
 
     /**
-     * @see org.apache.commons.math.stat.inference.TTest#t(double[], double[])
+     * @see org.apache.commons.math3.stat.inference.TTest#t(double[], double[])
      */
     public static double t(final double[] sample1, final double[] sample2)
         throws NullArgumentException, NumberIsTooSmallException {
@@ -153,7 +153,7 @@ public class TestUtils  {
     }
 
     /**
-     * @see org.apache.commons.math.stat.inference.TTest#t(org.apache.commons.math.stat.descriptive.StatisticalSummary, org.apache.commons.math.stat.descriptive.StatisticalSummary)
+     * @see org.apache.commons.math3.stat.inference.TTest#t(org.apache.commons.math3.stat.descriptive.StatisticalSummary, org.apache.commons.math3.stat.descriptive.StatisticalSummary)
      */
     public static double t(final StatisticalSummary sampleStats1,
                            final StatisticalSummary sampleStats2)
@@ -162,7 +162,7 @@ public class TestUtils  {
     }
 
     /**
-     * @see org.apache.commons.math.stat.inference.TTest#tTest(double, double[], double)
+     * @see org.apache.commons.math3.stat.inference.TTest#tTest(double, double[], double)
      */
     public static boolean tTest(final double mu, final double[] sample, final double alpha)
         throws NullArgumentException, NumberIsTooSmallException,
@@ -171,7 +171,7 @@ public class TestUtils  {
     }
 
     /**
-     * @see org.apache.commons.math.stat.inference.TTest#tTest(double, double[])
+     * @see org.apache.commons.math3.stat.inference.TTest#tTest(double, double[])
      */
     public static double tTest(final double mu, final double[] sample)
         throws NullArgumentException, NumberIsTooSmallException,
@@ -180,7 +180,7 @@ public class TestUtils  {
     }
 
     /**
-     * @see org.apache.commons.math.stat.inference.TTest#tTest(double, org.apache.commons.math.stat.descriptive.StatisticalSummary, double)
+     * @see org.apache.commons.math3.stat.inference.TTest#tTest(double, org.apache.commons.math3.stat.descriptive.StatisticalSummary, double)
      */
     public static boolean tTest(final double mu, final StatisticalSummary sampleStats,
                                 final double alpha)
@@ -190,7 +190,7 @@ public class TestUtils  {
     }
 
     /**
-     * @see org.apache.commons.math.stat.inference.TTest#tTest(double, org.apache.commons.math.stat.descriptive.StatisticalSummary)
+     * @see org.apache.commons.math3.stat.inference.TTest#tTest(double, org.apache.commons.math3.stat.descriptive.StatisticalSummary)
      */
     public static double tTest(final double mu, final StatisticalSummary sampleStats)
         throws NullArgumentException, NumberIsTooSmallException,
@@ -199,7 +199,7 @@ public class TestUtils  {
     }
 
     /**
-     * @see org.apache.commons.math.stat.inference.TTest#tTest(double[], double[], double)
+     * @see org.apache.commons.math3.stat.inference.TTest#tTest(double[], double[], double)
      */
     public static boolean tTest(final double[] sample1, final double[] sample2,
                                 final double alpha)
@@ -209,7 +209,7 @@ public class TestUtils  {
     }
 
     /**
-     * @see org.apache.commons.math.stat.inference.TTest#tTest(double[], double[])
+     * @see org.apache.commons.math3.stat.inference.TTest#tTest(double[], double[])
      */
     public static double tTest(final double[] sample1, final double[] sample2)
         throws NullArgumentException, NumberIsTooSmallException,
@@ -218,7 +218,7 @@ public class TestUtils  {
     }
 
     /**
-     * @see org.apache.commons.math.stat.inference.TTest#tTest(org.apache.commons.math.stat.descriptive.StatisticalSummary, org.apache.commons.math.stat.descriptive.StatisticalSummary, double)
+     * @see org.apache.commons.math3.stat.inference.TTest#tTest(org.apache.commons.math3.stat.descriptive.StatisticalSummary, org.apache.commons.math3.stat.descriptive.StatisticalSummary, double)
      */
     public static boolean tTest(final StatisticalSummary sampleStats1,
                                 final StatisticalSummary sampleStats2,
@@ -229,7 +229,7 @@ public class TestUtils  {
     }
 
     /**
-     * @see org.apache.commons.math.stat.inference.TTest#tTest(org.apache.commons.math.stat.descriptive.StatisticalSummary, org.apache.commons.math.stat.descriptive.StatisticalSummary)
+     * @see org.apache.commons.math3.stat.inference.TTest#tTest(org.apache.commons.math3.stat.descriptive.StatisticalSummary, org.apache.commons.math3.stat.descriptive.StatisticalSummary)
      */
     public static double tTest(final StatisticalSummary sampleStats1,
                                final StatisticalSummary sampleStats2)
@@ -239,7 +239,7 @@ public class TestUtils  {
     }
 
     /**
-     * @see org.apache.commons.math.stat.inference.ChiSquareTest#chiSquare(double[], long[])
+     * @see org.apache.commons.math3.stat.inference.ChiSquareTest#chiSquare(double[], long[])
      */
     public static double chiSquare(final double[] expected, final long[] observed)
         throws NotPositiveException, NotStrictlyPositiveException,
@@ -248,7 +248,7 @@ public class TestUtils  {
     }
 
     /**
-     * @see org.apache.commons.math.stat.inference.ChiSquareTest#chiSquare(long[][])
+     * @see org.apache.commons.math3.stat.inference.ChiSquareTest#chiSquare(long[][])
      */
     public static double chiSquare(final long[][] counts)
         throws NullArgumentException, NotPositiveException,
@@ -257,7 +257,7 @@ public class TestUtils  {
     }
 
     /**
-     * @see org.apache.commons.math.stat.inference.ChiSquareTest#chiSquareTest(double[], long[], double)
+     * @see org.apache.commons.math3.stat.inference.ChiSquareTest#chiSquareTest(double[], long[], double)
      */
     public static boolean chiSquareTest(final double[] expected, final long[] observed,
                                         final double alpha)
@@ -267,7 +267,7 @@ public class TestUtils  {
     }
 
     /**
-     * @see org.apache.commons.math.stat.inference.ChiSquareTest#chiSquareTest(double[], long[])
+     * @see org.apache.commons.math3.stat.inference.ChiSquareTest#chiSquareTest(double[], long[])
      */
     public static double chiSquareTest(final double[] expected, final long[] observed)
         throws NotPositiveException, NotStrictlyPositiveException,
@@ -276,7 +276,7 @@ public class TestUtils  {
     }
 
     /**
-     * @see org.apache.commons.math.stat.inference.ChiSquareTest#chiSquareTest(long[][], double)
+     * @see org.apache.commons.math3.stat.inference.ChiSquareTest#chiSquareTest(long[][], double)
      */
     public static boolean chiSquareTest(final long[][] counts, final double alpha)
         throws NullArgumentException, DimensionMismatchException,
@@ -285,7 +285,7 @@ public class TestUtils  {
     }
 
     /**
-     * @see org.apache.commons.math.stat.inference.ChiSquareTest#chiSquareTest(long[][])
+     * @see org.apache.commons.math3.stat.inference.ChiSquareTest#chiSquareTest(long[][])
      */
     public static double chiSquareTest(final long[][] counts)
         throws NullArgumentException, DimensionMismatchException,
@@ -294,7 +294,7 @@ public class TestUtils  {
     }
 
     /**
-     * @see org.apache.commons.math.stat.inference.UnknownDistributionChiSquareTest#chiSquareDataSetsComparison(long[], long[])
+     * @see org.apache.commons.math3.stat.inference.UnknownDistributionChiSquareTest#chiSquareDataSetsComparison(long[], long[])
      *
      * @since 1.2
      */
@@ -305,7 +305,7 @@ public class TestUtils  {
     }
 
     /**
-     * @see org.apache.commons.math.stat.inference.UnknownDistributionChiSquareTest#chiSquareTestDataSetsComparison(long[], long[])
+     * @see org.apache.commons.math3.stat.inference.UnknownDistributionChiSquareTest#chiSquareTestDataSetsComparison(long[], long[])
      *
      * @since 1.2
      */
@@ -317,7 +317,7 @@ public class TestUtils  {
     }
 
     /**
-     * @see org.apache.commons.math.stat.inference.UnknownDistributionChiSquareTest#chiSquareTestDataSetsComparison(long[], long[], double)
+     * @see org.apache.commons.math3.stat.inference.UnknownDistributionChiSquareTest#chiSquareTestDataSetsComparison(long[], long[], double)
      *
      * @since 1.2
      */
@@ -330,7 +330,7 @@ public class TestUtils  {
     }
 
     /**
-     * @see org.apache.commons.math.stat.inference.OneWayAnova#anovaFValue(Collection)
+     * @see org.apache.commons.math3.stat.inference.OneWayAnova#anovaFValue(Collection)
      *
      * @since 1.2
      */
@@ -340,7 +340,7 @@ public class TestUtils  {
     }
 
     /**
-     * @see org.apache.commons.math.stat.inference.OneWayAnova#anovaPValue(Collection)
+     * @see org.apache.commons.math3.stat.inference.OneWayAnova#anovaPValue(Collection)
      *
      * @since 1.2
      */
@@ -351,7 +351,7 @@ public class TestUtils  {
     }
 
     /**
-     * @see org.apache.commons.math.stat.inference.OneWayAnova#anovaTest(Collection,double)
+     * @see org.apache.commons.math3.stat.inference.OneWayAnova#anovaTest(Collection,double)
      *
      * @since 1.2
      */
diff --git a/src/main/java/org/apache/commons/math/stat/inference/WilcoxonSignedRankTest.java b/src/main/java/org/apache/commons/math3/stat/inference/WilcoxonSignedRankTest.java
similarity index 93%
rename from src/main/java/org/apache/commons/math/stat/inference/WilcoxonSignedRankTest.java
rename to src/main/java/org/apache/commons/math3/stat/inference/WilcoxonSignedRankTest.java
index 3fcd35951..a482fbb56 100644
--- a/src/main/java/org/apache/commons/math/stat/inference/WilcoxonSignedRankTest.java
+++ b/src/main/java/org/apache/commons/math3/stat/inference/WilcoxonSignedRankTest.java
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.inference;
+package org.apache.commons.math3.stat.inference;
 
-import org.apache.commons.math.distribution.NormalDistribution;
-import org.apache.commons.math.exception.ConvergenceException;
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.MaxCountExceededException;
-import org.apache.commons.math.exception.NoDataException;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.NumberIsTooLargeException;
-import org.apache.commons.math.stat.ranking.NaNStrategy;
-import org.apache.commons.math.stat.ranking.NaturalRanking;
-import org.apache.commons.math.stat.ranking.TiesStrategy;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.distribution.NormalDistribution;
+import org.apache.commons.math3.exception.ConvergenceException;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.MaxCountExceededException;
+import org.apache.commons.math3.exception.NoDataException;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.NumberIsTooLargeException;
+import org.apache.commons.math3.stat.ranking.NaNStrategy;
+import org.apache.commons.math3.stat.ranking.NaturalRanking;
+import org.apache.commons.math3.stat.ranking.TiesStrategy;
+import org.apache.commons.math3.util.FastMath;
 
 /**
  * An implementation of the Wilcoxon signed-rank test.
diff --git a/src/main/java/org/apache/commons/math/stat/inference/package-info.java b/src/main/java/org/apache/commons/math3/stat/inference/package-info.java
similarity index 94%
rename from src/main/java/org/apache/commons/math/stat/inference/package-info.java
rename to src/main/java/org/apache/commons/math3/stat/inference/package-info.java
index d0dcaf03d..093d99461 100644
--- a/src/main/java/org/apache/commons/math/stat/inference/package-info.java
+++ b/src/main/java/org/apache/commons/math3/stat/inference/package-info.java
@@ -20,4 +20,4 @@
  *      construction.
  *
  */
-package org.apache.commons.math.stat.inference;
+package org.apache.commons.math3.stat.inference;
diff --git a/src/main/java/org/apache/commons/math/stat/package-info.java b/src/main/java/org/apache/commons/math3/stat/package-info.java
similarity index 95%
rename from src/main/java/org/apache/commons/math/stat/package-info.java
rename to src/main/java/org/apache/commons/math3/stat/package-info.java
index 87caed558..0df94241a 100644
--- a/src/main/java/org/apache/commons/math/stat/package-info.java
+++ b/src/main/java/org/apache/commons/math3/stat/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Data storage, manipulation and summary routines.
  */
-package org.apache.commons.math.stat;
+package org.apache.commons.math3.stat;
diff --git a/src/main/java/org/apache/commons/math/stat/ranking/NaNStrategy.java b/src/main/java/org/apache/commons/math3/stat/ranking/NaNStrategy.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/stat/ranking/NaNStrategy.java
rename to src/main/java/org/apache/commons/math3/stat/ranking/NaNStrategy.java
index 16bddfc98..620209635 100644
--- a/src/main/java/org/apache/commons/math/stat/ranking/NaNStrategy.java
+++ b/src/main/java/org/apache/commons/math3/stat/ranking/NaNStrategy.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.stat.ranking;
+package org.apache.commons.math3.stat.ranking;
 
 /**
  * Strategies for handling NaN values in rank transformations.
diff --git a/src/main/java/org/apache/commons/math/stat/ranking/NaturalRanking.java b/src/main/java/org/apache/commons/math3/stat/ranking/NaturalRanking.java
similarity index 98%
rename from src/main/java/org/apache/commons/math/stat/ranking/NaturalRanking.java
rename to src/main/java/org/apache/commons/math3/stat/ranking/NaturalRanking.java
index ba62840e9..9018886c9 100644
--- a/src/main/java/org/apache/commons/math/stat/ranking/NaturalRanking.java
+++ b/src/main/java/org/apache/commons/math3/stat/ranking/NaturalRanking.java
@@ -15,18 +15,18 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.stat.ranking;
+package org.apache.commons.math3.stat.ranking;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.commons.math.exception.MathInternalError;
-import org.apache.commons.math.random.RandomData;
-import org.apache.commons.math.random.RandomDataImpl;
-import org.apache.commons.math.random.RandomGenerator;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.exception.MathInternalError;
+import org.apache.commons.math3.random.RandomData;
+import org.apache.commons.math3.random.RandomDataImpl;
+import org.apache.commons.math3.random.RandomGenerator;
+import org.apache.commons.math3.util.FastMath;
 
 
 /**
diff --git a/src/main/java/org/apache/commons/math/stat/ranking/RankingAlgorithm.java b/src/main/java/org/apache/commons/math3/stat/ranking/RankingAlgorithm.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/stat/ranking/RankingAlgorithm.java
rename to src/main/java/org/apache/commons/math3/stat/ranking/RankingAlgorithm.java
index cacf9857d..3ef52d194 100644
--- a/src/main/java/org/apache/commons/math/stat/ranking/RankingAlgorithm.java
+++ b/src/main/java/org/apache/commons/math3/stat/ranking/RankingAlgorithm.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.stat.ranking;
+package org.apache.commons.math3.stat.ranking;
 
 /**
  * Interface representing a rank transformation.
diff --git a/src/main/java/org/apache/commons/math/stat/ranking/TiesStrategy.java b/src/main/java/org/apache/commons/math3/stat/ranking/TiesStrategy.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/stat/ranking/TiesStrategy.java
rename to src/main/java/org/apache/commons/math3/stat/ranking/TiesStrategy.java
index 7fe74d677..5c2af2711 100644
--- a/src/main/java/org/apache/commons/math/stat/ranking/TiesStrategy.java
+++ b/src/main/java/org/apache/commons/math3/stat/ranking/TiesStrategy.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.stat.ranking;
+package org.apache.commons.math3.stat.ranking;
 
 /**
  * Strategies for handling tied values in rank transformations.
diff --git a/src/main/java/org/apache/commons/math/stat/ranking/package-info.java b/src/main/java/org/apache/commons/math3/stat/ranking/package-info.java
similarity index 94%
rename from src/main/java/org/apache/commons/math/stat/ranking/package-info.java
rename to src/main/java/org/apache/commons/math3/stat/ranking/package-info.java
index 0c0d073d0..b86575b46 100644
--- a/src/main/java/org/apache/commons/math/stat/ranking/package-info.java
+++ b/src/main/java/org/apache/commons/math3/stat/ranking/package-info.java
@@ -19,4 +19,4 @@
  *      Classes providing rank transformations.
  *
  */
-package org.apache.commons.math.stat.ranking;
+package org.apache.commons.math3.stat.ranking;
diff --git a/src/main/java/org/apache/commons/math/stat/regression/AbstractMultipleLinearRegression.java b/src/main/java/org/apache/commons/math3/stat/regression/AbstractMultipleLinearRegression.java
similarity index 93%
rename from src/main/java/org/apache/commons/math/stat/regression/AbstractMultipleLinearRegression.java
rename to src/main/java/org/apache/commons/math3/stat/regression/AbstractMultipleLinearRegression.java
index 6e4ede60a..26ac67a03 100644
--- a/src/main/java/org/apache/commons/math/stat/regression/AbstractMultipleLinearRegression.java
+++ b/src/main/java/org/apache/commons/math3/stat/regression/AbstractMultipleLinearRegression.java
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.regression;
+package org.apache.commons.math3.stat.regression;
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.NoDataException;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.linear.NonSquareMatrixException;
-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.stat.descriptive.moment.Variance;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.NoDataException;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.linear.NonSquareMatrixException;
+import org.apache.commons.math3.linear.RealMatrix;
+import org.apache.commons.math3.linear.Array2DRowRealMatrix;
+import org.apache.commons.math3.linear.RealVector;
+import org.apache.commons.math3.linear.ArrayRealVector;
+import org.apache.commons.math3.stat.descriptive.moment.Variance;
+import org.apache.commons.math3.util.FastMath;
 
 /**
  * Abstract base class for implementations of MultipleLinearRegression.
diff --git a/src/main/java/org/apache/commons/math/stat/regression/GLSMultipleLinearRegression.java b/src/main/java/org/apache/commons/math3/stat/regression/GLSMultipleLinearRegression.java
similarity index 93%
rename from src/main/java/org/apache/commons/math/stat/regression/GLSMultipleLinearRegression.java
rename to src/main/java/org/apache/commons/math3/stat/regression/GLSMultipleLinearRegression.java
index 912e8107a..a3a370cfe 100644
--- a/src/main/java/org/apache/commons/math/stat/regression/GLSMultipleLinearRegression.java
+++ b/src/main/java/org/apache/commons/math3/stat/regression/GLSMultipleLinearRegression.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.regression;
+package org.apache.commons.math3.stat.regression;
 
-import org.apache.commons.math.linear.LUDecomposition;
-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.math3.linear.LUDecomposition;
+import org.apache.commons.math3.linear.RealMatrix;
+import org.apache.commons.math3.linear.Array2DRowRealMatrix;
+import org.apache.commons.math3.linear.RealVector;
 
 /**
  * The GLS implementation of the multiple linear regression.
diff --git a/src/main/java/org/apache/commons/math/stat/regression/MillerUpdatingRegression.java b/src/main/java/org/apache/commons/math3/stat/regression/MillerUpdatingRegression.java
similarity index 99%
rename from src/main/java/org/apache/commons/math/stat/regression/MillerUpdatingRegression.java
rename to src/main/java/org/apache/commons/math3/stat/regression/MillerUpdatingRegression.java
index f9aca4675..73a0f95f8 100644
--- a/src/main/java/org/apache/commons/math/stat/regression/MillerUpdatingRegression.java
+++ b/src/main/java/org/apache/commons/math3/stat/regression/MillerUpdatingRegression.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.regression;
+package org.apache.commons.math3.stat.regression;
 
 import java.util.Arrays;
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.util.Precision;
-import org.apache.commons.math.util.MathArrays;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.util.Precision;
+import org.apache.commons.math3.util.MathArrays;
 
 /**
  * 
    This class is a concrete implementation of the {@link UpdatingMultipleLinearRegression} interface.
    
diff --git a/src/main/java/org/apache/commons/math/stat/regression/ModelSpecificationException.java b/src/main/java/org/apache/commons/math3/stat/regression/ModelSpecificationException.java
similarity index 88%
rename from src/main/java/org/apache/commons/math/stat/regression/ModelSpecificationException.java
rename to src/main/java/org/apache/commons/math3/stat/regression/ModelSpecificationException.java
index d0cb931a1..535517f43 100644
--- a/src/main/java/org/apache/commons/math/stat/regression/ModelSpecificationException.java
+++ b/src/main/java/org/apache/commons/math3/stat/regression/ModelSpecificationException.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.regression;
+package org.apache.commons.math3.stat.regression;
 
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.util.Localizable;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.util.Localizable;
 
 /**
  * Exception thrown when a regression model is not correctly specified.
diff --git a/src/main/java/org/apache/commons/math/stat/regression/MultipleLinearRegression.java b/src/main/java/org/apache/commons/math3/stat/regression/MultipleLinearRegression.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/stat/regression/MultipleLinearRegression.java
rename to src/main/java/org/apache/commons/math3/stat/regression/MultipleLinearRegression.java
index 4114bef30..f6f8070ac 100644
--- a/src/main/java/org/apache/commons/math/stat/regression/MultipleLinearRegression.java
+++ b/src/main/java/org/apache/commons/math3/stat/regression/MultipleLinearRegression.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.regression;
+package org.apache.commons.math3.stat.regression;
 
 /**
  * The multiple linear regression can be represented in matrix-notation.
diff --git a/src/main/java/org/apache/commons/math/stat/regression/OLSMultipleLinearRegression.java b/src/main/java/org/apache/commons/math3/stat/regression/OLSMultipleLinearRegression.java
similarity index 95%
rename from src/main/java/org/apache/commons/math/stat/regression/OLSMultipleLinearRegression.java
rename to src/main/java/org/apache/commons/math3/stat/regression/OLSMultipleLinearRegression.java
index 15945b673..1b39cc30b 100644
--- a/src/main/java/org/apache/commons/math/stat/regression/OLSMultipleLinearRegression.java
+++ b/src/main/java/org/apache/commons/math3/stat/regression/OLSMultipleLinearRegression.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.regression;
+package org.apache.commons.math3.stat.regression;
 
-import org.apache.commons.math.linear.Array2DRowRealMatrix;
-import org.apache.commons.math.linear.LUDecomposition;
-import org.apache.commons.math.linear.QRDecomposition;
-import org.apache.commons.math.linear.RealMatrix;
-import org.apache.commons.math.linear.RealVector;
-import org.apache.commons.math.stat.StatUtils;
-import org.apache.commons.math.stat.descriptive.moment.SecondMoment;
+import org.apache.commons.math3.linear.Array2DRowRealMatrix;
+import org.apache.commons.math3.linear.LUDecomposition;
+import org.apache.commons.math3.linear.QRDecomposition;
+import org.apache.commons.math3.linear.RealMatrix;
+import org.apache.commons.math3.linear.RealVector;
+import org.apache.commons.math3.stat.StatUtils;
+import org.apache.commons.math3.stat.descriptive.moment.SecondMoment;
 
 /**
  * 
    Implements ordinary least squares (OLS) to estimate the parameters of a
diff --git a/src/main/java/org/apache/commons/math/stat/regression/RegressionResults.java b/src/main/java/org/apache/commons/math3/stat/regression/RegressionResults.java
similarity index 99%
rename from src/main/java/org/apache/commons/math/stat/regression/RegressionResults.java
rename to src/main/java/org/apache/commons/math3/stat/regression/RegressionResults.java
index 494d226e6..1a09b203d 100644
--- a/src/main/java/org/apache/commons/math/stat/regression/RegressionResults.java
+++ b/src/main/java/org/apache/commons/math3/stat/regression/RegressionResults.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.regression;
+package org.apache.commons.math3.stat.regression;
 
 import java.io.Serializable;
 import java.util.Arrays;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.util.MathArrays;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.util.MathArrays;
 
 /**
  * Results of a Multiple Linear Regression model fit.
diff --git a/src/main/java/org/apache/commons/math/stat/regression/SimpleRegression.java b/src/main/java/org/apache/commons/math3/stat/regression/SimpleRegression.java
similarity index 98%
rename from src/main/java/org/apache/commons/math/stat/regression/SimpleRegression.java
rename to src/main/java/org/apache/commons/math3/stat/regression/SimpleRegression.java
index 963350cb5..a05af23a4 100644
--- a/src/main/java/org/apache/commons/math/stat/regression/SimpleRegression.java
+++ b/src/main/java/org/apache/commons/math3/stat/regression/SimpleRegression.java
@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.stat.regression;
+package org.apache.commons.math3.stat.regression;
 import java.io.Serializable;
 
-import org.apache.commons.math.exception.OutOfRangeException;
-import org.apache.commons.math.distribution.TDistribution;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.NoDataException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.util.Precision;
+import org.apache.commons.math3.exception.OutOfRangeException;
+import org.apache.commons.math3.distribution.TDistribution;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.NoDataException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.util.Precision;
 
 /**
  * Estimates an ordinary least squares regression model
@@ -674,7 +674,7 @@ public class SimpleRegression implements Serializable, UpdatingMultipleLinearReg
      * Double.NaN.
    
      *
      * @return significance level for slope/correlation
-     * @throws org.apache.commons.math.exception.MaxCountExceededException
+     * @throws org.apache.commons.math3.exception.MaxCountExceededException
      * if the significance level can not be computed.
      */
     public double getSignificance() {
diff --git a/src/main/java/org/apache/commons/math/stat/regression/UpdatingMultipleLinearRegression.java b/src/main/java/org/apache/commons/math3/stat/regression/UpdatingMultipleLinearRegression.java
similarity index 98%
rename from src/main/java/org/apache/commons/math/stat/regression/UpdatingMultipleLinearRegression.java
rename to src/main/java/org/apache/commons/math3/stat/regression/UpdatingMultipleLinearRegression.java
index 6449aa392..995b81a0b 100644
--- a/src/main/java/org/apache/commons/math/stat/regression/UpdatingMultipleLinearRegression.java
+++ b/src/main/java/org/apache/commons/math3/stat/regression/UpdatingMultipleLinearRegression.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.regression;
+package org.apache.commons.math3.stat.regression;
 
 /**
  * An interface for regression models allowing for dynamic updating of the data.
diff --git a/src/main/java/org/apache/commons/math/stat/regression/package-info.java b/src/main/java/org/apache/commons/math3/stat/regression/package-info.java
similarity index 94%
rename from src/main/java/org/apache/commons/math/stat/regression/package-info.java
rename to src/main/java/org/apache/commons/math3/stat/regression/package-info.java
index 54912a4ba..fbc0e1206 100644
--- a/src/main/java/org/apache/commons/math/stat/regression/package-info.java
+++ b/src/main/java/org/apache/commons/math3/stat/regression/package-info.java
@@ -19,4 +19,4 @@
  *      Statistical routines involving multivariate data.
  *
  */
-package org.apache.commons.math.stat.regression;
+package org.apache.commons.math3.stat.regression;
diff --git a/src/main/java/org/apache/commons/math/transform/DctNormalization.java b/src/main/java/org/apache/commons/math3/transform/DctNormalization.java
similarity index 98%
rename from src/main/java/org/apache/commons/math/transform/DctNormalization.java
rename to src/main/java/org/apache/commons/math3/transform/DctNormalization.java
index 90df13c2a..cc8619e0c 100644
--- a/src/main/java/org/apache/commons/math/transform/DctNormalization.java
+++ b/src/main/java/org/apache/commons/math3/transform/DctNormalization.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.transform;
+package org.apache.commons.math3.transform;
 
 /**
  * This enumeration defines the various types of normalizations that can be
diff --git a/src/main/java/org/apache/commons/math/transform/DftNormalization.java b/src/main/java/org/apache/commons/math3/transform/DftNormalization.java
similarity index 98%
rename from src/main/java/org/apache/commons/math/transform/DftNormalization.java
rename to src/main/java/org/apache/commons/math3/transform/DftNormalization.java
index 085f04ca5..ceb03cc8b 100644
--- a/src/main/java/org/apache/commons/math/transform/DftNormalization.java
+++ b/src/main/java/org/apache/commons/math3/transform/DftNormalization.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.transform;
+package org.apache.commons.math3.transform;
 
 /**
  * This enumeration defines the various types of normalizations that can be
diff --git a/src/main/java/org/apache/commons/math/transform/DstNormalization.java b/src/main/java/org/apache/commons/math3/transform/DstNormalization.java
similarity index 98%
rename from src/main/java/org/apache/commons/math/transform/DstNormalization.java
rename to src/main/java/org/apache/commons/math3/transform/DstNormalization.java
index eae0d91db..1f3e7118e 100644
--- a/src/main/java/org/apache/commons/math/transform/DstNormalization.java
+++ b/src/main/java/org/apache/commons/math3/transform/DstNormalization.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.transform;
+package org.apache.commons.math3.transform;
 
 /**
  * This enumeration defines the various types of normalizations that can be
diff --git a/src/main/java/org/apache/commons/math/transform/FastCosineTransformer.java b/src/main/java/org/apache/commons/math3/transform/FastCosineTransformer.java
similarity index 91%
rename from src/main/java/org/apache/commons/math/transform/FastCosineTransformer.java
rename to src/main/java/org/apache/commons/math3/transform/FastCosineTransformer.java
index c77ffc2b9..0748825fa 100644
--- a/src/main/java/org/apache/commons/math/transform/FastCosineTransformer.java
+++ b/src/main/java/org/apache/commons/math3/transform/FastCosineTransformer.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.transform;
+package org.apache.commons.math3.transform;
 
 import java.io.Serializable;
 
-import org.apache.commons.math.analysis.FunctionUtils;
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.complex.Complex;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.util.ArithmeticUtils;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.analysis.FunctionUtils;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.complex.Complex;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.util.ArithmeticUtils;
+import org.apache.commons.math3.util.FastMath;
 
 /**
  * 
    
@@ -115,9 +115,9 @@ public class FastCosineTransformer implements RealTransformer, Serializable {
     /**
      * {@inheritDoc}
      *
-     * @throws org.apache.commons.math.exception.NonMonotonicSequenceException
+     * @throws org.apache.commons.math3.exception.NonMonotonicSequenceException
      * if the lower bound is greater than, or equal to the upper bound
-     * @throws org.apache.commons.math.exception.NotStrictlyPositiveException
+     * @throws org.apache.commons.math3.exception.NotStrictlyPositiveException
      * if the number of sample points is negative
      * @throws MathIllegalArgumentException if the number of sample points is
      * not a power of two plus one
diff --git a/src/main/java/org/apache/commons/math/transform/FastFourierTransformer.java b/src/main/java/org/apache/commons/math3/transform/FastFourierTransformer.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/transform/FastFourierTransformer.java
rename to src/main/java/org/apache/commons/math3/transform/FastFourierTransformer.java
index d5ca8d54a..212a2d330 100644
--- a/src/main/java/org/apache/commons/math/transform/FastFourierTransformer.java
+++ b/src/main/java/org/apache/commons/math3/transform/FastFourierTransformer.java
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.transform;
+package org.apache.commons.math3.transform;
 
 import java.io.Serializable;
 import java.lang.reflect.Array;
 
-import org.apache.commons.math.analysis.FunctionUtils;
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.complex.Complex;
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.MathIllegalStateException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.util.ArithmeticUtils;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.util.MathArrays;
+import org.apache.commons.math3.analysis.FunctionUtils;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.complex.Complex;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.MathIllegalStateException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.util.ArithmeticUtils;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.util.MathArrays;
 
 /**
  * 
    
@@ -397,9 +397,9 @@ public class FastFourierTransformer implements Serializable {
      * @param n the number of sample points
      * @param type the type of transform (forward, inverse) to be performed
      * @return the complex transformed array
-     * @throws org.apache.commons.math.exception.NumberIsTooLargeException
+     * @throws org.apache.commons.math3.exception.NumberIsTooLargeException
      * if the lower bound is greater than, or equal to the upper bound
-     * @throws org.apache.commons.math.exception.NotStrictlyPositiveException
+     * @throws org.apache.commons.math3.exception.NotStrictlyPositiveException
      * if the number of sample points {@code n} is negative
      * @throws MathIllegalArgumentException if the number of sample points
      * {@code n} is not a power of two
diff --git a/src/main/java/org/apache/commons/math/transform/FastHadamardTransformer.java b/src/main/java/org/apache/commons/math3/transform/FastHadamardTransformer.java
similarity index 95%
rename from src/main/java/org/apache/commons/math/transform/FastHadamardTransformer.java
rename to src/main/java/org/apache/commons/math3/transform/FastHadamardTransformer.java
index 09009b3b3..c4b775567 100644
--- a/src/main/java/org/apache/commons/math/transform/FastHadamardTransformer.java
+++ b/src/main/java/org/apache/commons/math3/transform/FastHadamardTransformer.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.transform;
+package org.apache.commons.math3.transform;
 
 import java.io.Serializable;
 
-import org.apache.commons.math.analysis.FunctionUtils;
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.util.ArithmeticUtils;
+import org.apache.commons.math3.analysis.FunctionUtils;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.util.ArithmeticUtils;
 
 /**
  * Implements the Fast Hadamard Transform (FHT).
@@ -56,9 +56,9 @@ public class FastHadamardTransformer implements RealTransformer, Serializable {
     /**
      * {@inheritDoc}
      *
-     * @throws org.apache.commons.math.exception.NonMonotonicSequenceException
+     * @throws org.apache.commons.math3.exception.NonMonotonicSequenceException
      * if the lower bound is greater than, or equal to the upper bound
-     * @throws org.apache.commons.math.exception.NotStrictlyPositiveException
+     * @throws org.apache.commons.math3.exception.NotStrictlyPositiveException
      * if the number of sample points is negative
      * @throws MathIllegalArgumentException if the number of sample points is
      * not a power of two
diff --git a/src/main/java/org/apache/commons/math/transform/FastSineTransformer.java b/src/main/java/org/apache/commons/math3/transform/FastSineTransformer.java
similarity index 92%
rename from src/main/java/org/apache/commons/math/transform/FastSineTransformer.java
rename to src/main/java/org/apache/commons/math3/transform/FastSineTransformer.java
index b71919b9a..fe4cdecdb 100644
--- a/src/main/java/org/apache/commons/math/transform/FastSineTransformer.java
+++ b/src/main/java/org/apache/commons/math3/transform/FastSineTransformer.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.transform;
+package org.apache.commons.math3.transform;
 
 import java.io.Serializable;
 
-import org.apache.commons.math.analysis.FunctionUtils;
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.complex.Complex;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.util.ArithmeticUtils;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.analysis.FunctionUtils;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.complex.Complex;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.util.ArithmeticUtils;
+import org.apache.commons.math3.util.FastMath;
 
 /**
  * 
    
@@ -119,9 +119,9 @@ public class FastSineTransformer implements RealTransformer, Serializable {
      *
      * This implementation enforces {@code f(x) = 0.0} at {@code x = 0.0}.
      *
-     * @throws org.apache.commons.math.exception.NonMonotonicSequenceException
+     * @throws org.apache.commons.math3.exception.NonMonotonicSequenceException
      * if the lower bound is greater than, or equal to the upper bound
-     * @throws org.apache.commons.math.exception.NotStrictlyPositiveException
+     * @throws org.apache.commons.math3.exception.NotStrictlyPositiveException
      * if the number of sample points is negative
      * @throws MathIllegalArgumentException if the number of sample points is
      * not a power of two
diff --git a/src/main/java/org/apache/commons/math/transform/RealTransformer.java b/src/main/java/org/apache/commons/math3/transform/RealTransformer.java
similarity index 87%
rename from src/main/java/org/apache/commons/math/transform/RealTransformer.java
rename to src/main/java/org/apache/commons/math3/transform/RealTransformer.java
index ff18de554..69a18dfd6 100644
--- a/src/main/java/org/apache/commons/math/transform/RealTransformer.java
+++ b/src/main/java/org/apache/commons/math3/transform/RealTransformer.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.transform;
+package org.apache.commons.math3.transform;
 
-import org.apache.commons.math.analysis.UnivariateFunction;
+import org.apache.commons.math3.analysis.UnivariateFunction;
 
 /**
  * 
    Interface for one-dimensional data sets transformations producing real
@@ -25,7 +25,7 @@ import org.apache.commons.math.analysis.UnivariateFunction;
  * {@link FastCosineTransformer cosine transform} or {@link
  * FastHadamardTransformer Hadamard transform}. {@link FastFourierTransformer
  * Fourier transform} is of a different kind and does not implement this
- * interface since it produces {@link org.apache.commons.math.complex.Complex}
+ * interface since it produces {@link org.apache.commons.math3.complex.Complex}
  * results instead of real ones.
    
  *
  * @version $Id$
@@ -52,9 +52,9 @@ public interface RealTransformer  {
      * @param n the number of sample points
      * @param type the type of transform (forward, inverse) to be performed
      * @return the real transformed array
-     * @throws org.apache.commons.math.exception.NonMonotonicSequenceException
+     * @throws org.apache.commons.math3.exception.NonMonotonicSequenceException
      * if the lower bound is greater than, or equal to the upper bound
-     * @throws org.apache.commons.math.exception.NotStrictlyPositiveException
+     * @throws org.apache.commons.math3.exception.NotStrictlyPositiveException
      * if the number of sample points is negative
      */
     double[] transform(UnivariateFunction f,
diff --git a/src/main/java/org/apache/commons/math/transform/TransformType.java b/src/main/java/org/apache/commons/math3/transform/TransformType.java
similarity index 96%
rename from src/main/java/org/apache/commons/math/transform/TransformType.java
rename to src/main/java/org/apache/commons/math3/transform/TransformType.java
index a744ae670..7f5a3eade 100644
--- a/src/main/java/org/apache/commons/math/transform/TransformType.java
+++ b/src/main/java/org/apache/commons/math3/transform/TransformType.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.transform;
+package org.apache.commons.math3.transform;
 
 /**
  * This enumeration defines the type of transform which is to be computed.
diff --git a/src/main/java/org/apache/commons/math/transform/TransformUtils.java b/src/main/java/org/apache/commons/math3/transform/TransformUtils.java
similarity index 94%
rename from src/main/java/org/apache/commons/math/transform/TransformUtils.java
rename to src/main/java/org/apache/commons/math3/transform/TransformUtils.java
index 3a7600b5b..e23921f83 100644
--- a/src/main/java/org/apache/commons/math/transform/TransformUtils.java
+++ b/src/main/java/org/apache/commons/math3/transform/TransformUtils.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.transform;
+package org.apache.commons.math3.transform;
 
 import java.util.Arrays;
 
-import org.apache.commons.math.complex.Complex;
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
+import org.apache.commons.math3.complex.Complex;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
 
 /**
  * Useful functions for the implementation of various transforms.
diff --git a/src/main/java/org/apache/commons/math/transform/package-info.java b/src/main/java/org/apache/commons/math3/transform/package-info.java
similarity index 95%
rename from src/main/java/org/apache/commons/math/transform/package-info.java
rename to src/main/java/org/apache/commons/math3/transform/package-info.java
index b3ed7f565..6d6cfc62e 100644
--- a/src/main/java/org/apache/commons/math/transform/package-info.java
+++ b/src/main/java/org/apache/commons/math3/transform/package-info.java
@@ -19,4 +19,4 @@
  *     Implementations of transform methods, including Fast Fourier transforms.
  *
  */
-package org.apache.commons.math.transform;
+package org.apache.commons.math3.transform;
diff --git a/src/main/java/org/apache/commons/math/util/ArithmeticUtils.java b/src/main/java/org/apache/commons/math3/util/ArithmeticUtils.java
similarity index 98%
rename from src/main/java/org/apache/commons/math/util/ArithmeticUtils.java
rename to src/main/java/org/apache/commons/math3/util/ArithmeticUtils.java
index d011d704a..64d35a78e 100644
--- a/src/main/java/org/apache/commons/math/util/ArithmeticUtils.java
+++ b/src/main/java/org/apache/commons/math3/util/ArithmeticUtils.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.util;
+package org.apache.commons.math3.util;
 
 import java.math.BigInteger;
-import org.apache.commons.math.exception.MathArithmeticException;
-import org.apache.commons.math.exception.NotPositiveException;
-import org.apache.commons.math.exception.NumberIsTooLargeException;
-import org.apache.commons.math.exception.util.Localizable;
-import org.apache.commons.math.exception.util.LocalizedFormats;
+import org.apache.commons.math3.exception.MathArithmeticException;
+import org.apache.commons.math3.exception.NotPositiveException;
+import org.apache.commons.math3.exception.NumberIsTooLargeException;
+import org.apache.commons.math3.exception.util.Localizable;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
 
 /**
  * Some useful, arithmetics related, additions to the built-in functions in
diff --git a/src/main/java/org/apache/commons/math/util/BigReal.java b/src/main/java/org/apache/commons/math3/util/BigReal.java
similarity index 98%
rename from src/main/java/org/apache/commons/math/util/BigReal.java
rename to src/main/java/org/apache/commons/math3/util/BigReal.java
index 665976833..c4a814706 100644
--- a/src/main/java/org/apache/commons/math/util/BigReal.java
+++ b/src/main/java/org/apache/commons/math3/util/BigReal.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.math3.util;
 
 
 import java.io.Serializable;
@@ -23,8 +23,8 @@ import java.math.BigInteger;
 import java.math.MathContext;
 import java.math.RoundingMode;
 
-import org.apache.commons.math.Field;
-import org.apache.commons.math.FieldElement;
+import org.apache.commons.math3.Field;
+import org.apache.commons.math3.FieldElement;
 
 /**
  * Arbitrary precision decimal number.
diff --git a/src/main/java/org/apache/commons/math/util/BigRealField.java b/src/main/java/org/apache/commons/math3/util/BigRealField.java
similarity index 94%
rename from src/main/java/org/apache/commons/math/util/BigRealField.java
rename to src/main/java/org/apache/commons/math3/util/BigRealField.java
index dcf203f3c..dea1e3b10 100644
--- a/src/main/java/org/apache/commons/math/util/BigRealField.java
+++ b/src/main/java/org/apache/commons/math3/util/BigRealField.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.util;
+package org.apache.commons.math3.util;
 
 import java.io.Serializable;
 
-import org.apache.commons.math.Field;
-import org.apache.commons.math.FieldElement;
+import org.apache.commons.math3.Field;
+import org.apache.commons.math3.FieldElement;
 
 /**
  * Representation of real numbers with arbitrary precision field.
diff --git a/src/main/java/org/apache/commons/math/util/CompositeFormat.java b/src/main/java/org/apache/commons/math3/util/CompositeFormat.java
similarity index 99%
rename from src/main/java/org/apache/commons/math/util/CompositeFormat.java
rename to src/main/java/org/apache/commons/math3/util/CompositeFormat.java
index 6cd7bd2a8..491bc9ce9 100644
--- a/src/main/java/org/apache/commons/math/util/CompositeFormat.java
+++ b/src/main/java/org/apache/commons/math3/util/CompositeFormat.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.math3.util;
 
 import java.text.FieldPosition;
 import java.text.NumberFormat;
diff --git a/src/main/java/org/apache/commons/math/util/ContinuedFraction.java b/src/main/java/org/apache/commons/math3/util/ContinuedFraction.java
similarity index 96%
rename from src/main/java/org/apache/commons/math/util/ContinuedFraction.java
rename to src/main/java/org/apache/commons/math3/util/ContinuedFraction.java
index 1b0f673bd..35fe9160b 100644
--- a/src/main/java/org/apache/commons/math/util/ContinuedFraction.java
+++ b/src/main/java/org/apache/commons/math3/util/ContinuedFraction.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.util;
+package org.apache.commons.math3.util;
 
-import org.apache.commons.math.exception.ConvergenceException;
-import org.apache.commons.math.exception.MaxCountExceededException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
+import org.apache.commons.math3.exception.ConvergenceException;
+import org.apache.commons.math3.exception.MaxCountExceededException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
 
 /**
  * Provides a generic means to evaluate continued fractions.  Subclasses simply
diff --git a/src/main/java/org/apache/commons/math/util/DefaultTransformer.java b/src/main/java/org/apache/commons/math3/util/DefaultTransformer.java
similarity index 92%
rename from src/main/java/org/apache/commons/math/util/DefaultTransformer.java
rename to src/main/java/org/apache/commons/math3/util/DefaultTransformer.java
index 8f2a1f53a..e2fd22ab5 100644
--- a/src/main/java/org/apache/commons/math/util/DefaultTransformer.java
+++ b/src/main/java/org/apache/commons/math3/util/DefaultTransformer.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.util;
+package org.apache.commons.math3.util;
 
 import java.io.Serializable;
 
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.NullArgumentException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.NullArgumentException;
 
 /**
  * A Default NumberTransformer for java.lang.Numbers and Numeric Strings. This
diff --git a/src/main/java/org/apache/commons/math/util/DoubleArray.java b/src/main/java/org/apache/commons/math3/util/DoubleArray.java
similarity index 99%
rename from src/main/java/org/apache/commons/math/util/DoubleArray.java
rename to src/main/java/org/apache/commons/math3/util/DoubleArray.java
index 051fe4be4..4c8f0926a 100644
--- a/src/main/java/org/apache/commons/math/util/DoubleArray.java
+++ b/src/main/java/org/apache/commons/math3/util/DoubleArray.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.math3.util;
 
 
 /**
diff --git a/src/main/java/org/apache/commons/math/util/FastMath.java b/src/main/java/org/apache/commons/math3/util/FastMath.java
similarity index 99%
rename from src/main/java/org/apache/commons/math/util/FastMath.java
rename to src/main/java/org/apache/commons/math3/util/FastMath.java
index 5fb5bdc94..d626d1247 100644
--- a/src/main/java/org/apache/commons/math/util/FastMath.java
+++ b/src/main/java/org/apache/commons/math3/util/FastMath.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.math3.util;
 
 import java.io.PrintStream;
 
diff --git a/src/main/java/org/apache/commons/math/util/FastMathCalc.java b/src/main/java/org/apache/commons/math3/util/FastMathCalc.java
similarity index 99%
rename from src/main/java/org/apache/commons/math/util/FastMathCalc.java
rename to src/main/java/org/apache/commons/math3/util/FastMathCalc.java
index b36618cf4..8637badec 100644
--- a/src/main/java/org/apache/commons/math/util/FastMathCalc.java
+++ b/src/main/java/org/apache/commons/math3/util/FastMathCalc.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.util;
+package org.apache.commons.math3.util;
 
 import java.io.PrintStream;
 
-import org.apache.commons.math.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.DimensionMismatchException;
 
 /** Class used to compute the classical functions tables.
  * @version $Id$
diff --git a/src/main/java/org/apache/commons/math/util/FastMathLiteralArrays.java b/src/main/java/org/apache/commons/math3/util/FastMathLiteralArrays.java
similarity index 99%
rename from src/main/java/org/apache/commons/math/util/FastMathLiteralArrays.java
rename to src/main/java/org/apache/commons/math3/util/FastMathLiteralArrays.java
index 4e2e5cd17..00ce86b02 100644
--- a/src/main/java/org/apache/commons/math/util/FastMathLiteralArrays.java
+++ b/src/main/java/org/apache/commons/math3/util/FastMathLiteralArrays.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.util;
+package org.apache.commons.math3.util;
 
 /**
  * Utility class for loading tabulated data used by {@link FastMath}.
diff --git a/src/main/java/org/apache/commons/math/util/FastMathResources.java b/src/main/java/org/apache/commons/math3/util/FastMathResources.java
similarity index 98%
rename from src/main/java/org/apache/commons/math/util/FastMathResources.java
rename to src/main/java/org/apache/commons/math3/util/FastMathResources.java
index bcd71f0fc..84802c8dc 100644
--- a/src/main/java/org/apache/commons/math/util/FastMathResources.java
+++ b/src/main/java/org/apache/commons/math3/util/FastMathResources.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.util;
+package org.apache.commons.math3.util;
 
 import java.io.File;
 import java.io.DataOutputStream;
@@ -28,7 +28,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.DoubleBuffer;
-import org.apache.commons.math.exception.MathInternalError;
+import org.apache.commons.math3.exception.MathInternalError;
 
 /**
  * Utility class for saving and loading tabulated data used by
diff --git a/src/main/java/org/apache/commons/math/util/Incrementor.java b/src/main/java/org/apache/commons/math3/util/Incrementor.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/util/Incrementor.java
rename to src/main/java/org/apache/commons/math3/util/Incrementor.java
index 83a2a05f6..63ea7f9de 100644
--- a/src/main/java/org/apache/commons/math/util/Incrementor.java
+++ b/src/main/java/org/apache/commons/math3/util/Incrementor.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.util;
+package org.apache.commons.math3.util;
 
-import org.apache.commons.math.exception.MaxCountExceededException;
+import org.apache.commons.math3.exception.MaxCountExceededException;
 
 /**
  * Utility that increments a counter until a maximum is reached, at
diff --git a/src/main/java/org/apache/commons/math/util/IterationEvent.java b/src/main/java/org/apache/commons/math3/util/IterationEvent.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/util/IterationEvent.java
rename to src/main/java/org/apache/commons/math3/util/IterationEvent.java
index d0bc4184b..043a110b0 100644
--- a/src/main/java/org/apache/commons/math/util/IterationEvent.java
+++ b/src/main/java/org/apache/commons/math3/util/IterationEvent.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.math3.util;
 
 import java.util.EventObject;
 
diff --git a/src/main/java/org/apache/commons/math/util/IterationListener.java b/src/main/java/org/apache/commons/math3/util/IterationListener.java
similarity index 98%
rename from src/main/java/org/apache/commons/math/util/IterationListener.java
rename to src/main/java/org/apache/commons/math3/util/IterationListener.java
index 765e53fc8..2e7b7ec56 100644
--- a/src/main/java/org/apache/commons/math/util/IterationListener.java
+++ b/src/main/java/org/apache/commons/math3/util/IterationListener.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.math3.util;
 
 import java.util.EventListener;
 
diff --git a/src/main/java/org/apache/commons/math/util/IterationManager.java b/src/main/java/org/apache/commons/math3/util/IterationManager.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/util/IterationManager.java
rename to src/main/java/org/apache/commons/math3/util/IterationManager.java
index f4f23ecfb..2c7e6b0ac 100644
--- a/src/main/java/org/apache/commons/math/util/IterationManager.java
+++ b/src/main/java/org/apache/commons/math3/util/IterationManager.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.util;
+package org.apache.commons.math3.util;
 
 import java.util.Collection;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import org.apache.commons.math.exception.MaxCountExceededException;
+import org.apache.commons.math3.exception.MaxCountExceededException;
 
 /**
  * This abstract class provides a general framework for managing iterative
diff --git a/src/main/java/org/apache/commons/math/util/MathArrays.java b/src/main/java/org/apache/commons/math3/util/MathArrays.java
similarity index 98%
rename from src/main/java/org/apache/commons/math/util/MathArrays.java
rename to src/main/java/org/apache/commons/math3/util/MathArrays.java
index 983e42ff3..13ab75150 100644
--- a/src/main/java/org/apache/commons/math/util/MathArrays.java
+++ b/src/main/java/org/apache/commons/math3/util/MathArrays.java
@@ -15,20 +15,20 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.util;
+package org.apache.commons.math3.util;
 
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Collections;
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.MathInternalError;
-import org.apache.commons.math.exception.NonMonotonicSequenceException;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.exception.MathArithmeticException;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.MathInternalError;
+import org.apache.commons.math3.exception.NonMonotonicSequenceException;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.exception.MathArithmeticException;
 
 /**
  * Arrays utilities.
diff --git a/src/main/java/org/apache/commons/math/util/MathUtils.java b/src/main/java/org/apache/commons/math3/util/MathUtils.java
similarity index 96%
rename from src/main/java/org/apache/commons/math/util/MathUtils.java
rename to src/main/java/org/apache/commons/math3/util/MathUtils.java
index 104475dac..239c1adfc 100644
--- a/src/main/java/org/apache/commons/math/util/MathUtils.java
+++ b/src/main/java/org/apache/commons/math3/util/MathUtils.java
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.util;
+package org.apache.commons.math3.util;
 
 import java.util.Arrays;
 
-import org.apache.commons.math.exception.MathArithmeticException;
-import org.apache.commons.math.exception.NotFiniteNumberException;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.util.Localizable;
-import org.apache.commons.math.exception.util.LocalizedFormats;
+import org.apache.commons.math3.exception.MathArithmeticException;
+import org.apache.commons.math3.exception.NotFiniteNumberException;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.util.Localizable;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
 
 /**
  * Miscellaneous utility functions.
diff --git a/src/main/java/org/apache/commons/math/util/MultidimensionalCounter.java b/src/main/java/org/apache/commons/math3/util/MultidimensionalCounter.java
similarity index 97%
rename from src/main/java/org/apache/commons/math/util/MultidimensionalCounter.java
rename to src/main/java/org/apache/commons/math3/util/MultidimensionalCounter.java
index 35f6f788a..314a89537 100644
--- a/src/main/java/org/apache/commons/math/util/MultidimensionalCounter.java
+++ b/src/main/java/org/apache/commons/math3/util/MultidimensionalCounter.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.util;
+package org.apache.commons.math3.util;
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.OutOfRangeException;
-import org.apache.commons.math.exception.NotStrictlyPositiveException;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.OutOfRangeException;
+import org.apache.commons.math3.exception.NotStrictlyPositiveException;
 
 /**
  * Converter between unidimensional storage structure and multidimensional
diff --git a/src/main/java/org/apache/commons/math/util/NumberTransformer.java b/src/main/java/org/apache/commons/math3/util/NumberTransformer.java
similarity index 92%
rename from src/main/java/org/apache/commons/math/util/NumberTransformer.java
rename to src/main/java/org/apache/commons/math3/util/NumberTransformer.java
index f0091c58f..9652ded50 100644
--- a/src/main/java/org/apache/commons/math/util/NumberTransformer.java
+++ b/src/main/java/org/apache/commons/math3/util/NumberTransformer.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.util;
+package org.apache.commons.math3.util;
 
-import org.apache.commons.math.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
 
 /**
  * Subclasses implementing this interface can transform Objects to doubles.
diff --git a/src/main/java/org/apache/commons/math/util/OpenIntToDoubleHashMap.java b/src/main/java/org/apache/commons/math3/util/OpenIntToDoubleHashMap.java
similarity index 99%
rename from src/main/java/org/apache/commons/math/util/OpenIntToDoubleHashMap.java
rename to src/main/java/org/apache/commons/math3/util/OpenIntToDoubleHashMap.java
index 186388554..10c633478 100644
--- a/src/main/java/org/apache/commons/math/util/OpenIntToDoubleHashMap.java
+++ b/src/main/java/org/apache/commons/math3/util/OpenIntToDoubleHashMap.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.util;
+package org.apache.commons.math3.util;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
diff --git a/src/main/java/org/apache/commons/math/util/OpenIntToFieldHashMap.java b/src/main/java/org/apache/commons/math3/util/OpenIntToFieldHashMap.java
similarity index 99%
rename from src/main/java/org/apache/commons/math/util/OpenIntToFieldHashMap.java
rename to src/main/java/org/apache/commons/math3/util/OpenIntToFieldHashMap.java
index 3ae37a86c..c9acd2b48 100644
--- a/src/main/java/org/apache/commons/math/util/OpenIntToFieldHashMap.java
+++ b/src/main/java/org/apache/commons/math3/util/OpenIntToFieldHashMap.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.math3.util;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -23,8 +23,8 @@ import java.lang.reflect.Array;
 import java.util.ConcurrentModificationException;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.math.Field;
-import org.apache.commons.math.FieldElement;
+import org.apache.commons.math3.Field;
+import org.apache.commons.math3.FieldElement;
 
 /**
  * Open addressed map from int to FieldElement.
diff --git a/src/main/java/org/apache/commons/math/util/Pair.java b/src/main/java/org/apache/commons/math3/util/Pair.java
similarity index 98%
rename from src/main/java/org/apache/commons/math/util/Pair.java
rename to src/main/java/org/apache/commons/math3/util/Pair.java
index 3cbc1f346..cc5a66cff 100644
--- a/src/main/java/org/apache/commons/math/util/Pair.java
+++ b/src/main/java/org/apache/commons/math3/util/Pair.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.math3.util;
 
 /**
  * Generic pair.
diff --git a/src/main/java/org/apache/commons/math/util/Precision.java b/src/main/java/org/apache/commons/math3/util/Precision.java
similarity index 98%
rename from src/main/java/org/apache/commons/math/util/Precision.java
rename to src/main/java/org/apache/commons/math3/util/Precision.java
index 8bf33e36e..d82ff1b31 100644
--- a/src/main/java/org/apache/commons/math/util/Precision.java
+++ b/src/main/java/org/apache/commons/math3/util/Precision.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.util;
+package org.apache.commons.math3.util;
 
 import java.math.BigDecimal;
-import org.apache.commons.math.exception.MathArithmeticException;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.exception.MathArithmeticException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.util.FastMath;
 
 /**
  * Utilities for comparing numbers.
diff --git a/src/main/java/org/apache/commons/math/util/ResizableDoubleArray.java b/src/main/java/org/apache/commons/math3/util/ResizableDoubleArray.java
similarity index 99%
rename from src/main/java/org/apache/commons/math/util/ResizableDoubleArray.java
rename to src/main/java/org/apache/commons/math3/util/ResizableDoubleArray.java
index 3003ff4e8..ae9135af5 100644
--- a/src/main/java/org/apache/commons/math/util/ResizableDoubleArray.java
+++ b/src/main/java/org/apache/commons/math3/util/ResizableDoubleArray.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.util;
+package org.apache.commons.math3.util;
 
 import java.io.Serializable;
 import java.util.Arrays;
 
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.MathIllegalStateException;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.MathIllegalStateException;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
 
 /**
  * 
    
diff --git a/src/main/java/org/apache/commons/math/util/TransformerMap.java b/src/main/java/org/apache/commons/math3/util/TransformerMap.java
similarity index 96%
rename from src/main/java/org/apache/commons/math/util/TransformerMap.java
rename to src/main/java/org/apache/commons/math3/util/TransformerMap.java
index da76ed5f5..246274f6a 100644
--- a/src/main/java/org/apache/commons/math/util/TransformerMap.java
+++ b/src/main/java/org/apache/commons/math3/util/TransformerMap.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.math3.util;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.math.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
 
 /**
  * This TansformerMap automates the transformation of mixed object types.
@@ -136,7 +136,7 @@ public class TransformerMap implements NumberTransformer, Serializable {
      * @return the double value of the Object.
      * @throws MathIllegalArgumentException if the Object can not be
      * transformed into a Double.
-     * @see org.apache.commons.math.util.NumberTransformer#transform(java.lang.Object)
+     * @see org.apache.commons.math3.util.NumberTransformer#transform(java.lang.Object)
      */
     public double transform(Object o) throws MathIllegalArgumentException {
         double value = Double.NaN;
diff --git a/src/main/java/org/apache/commons/math/util/package-info.java b/src/main/java/org/apache/commons/math3/util/package-info.java
similarity index 95%
rename from src/main/java/org/apache/commons/math/util/package-info.java
rename to src/main/java/org/apache/commons/math3/util/package-info.java
index 388712819..5d753415b 100644
--- a/src/main/java/org/apache/commons/math/util/package-info.java
+++ b/src/main/java/org/apache/commons/math3/util/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Convenience routines and common data structures used throughout the commons-math library.
  */
-package org.apache.commons.math.util;
+package org.apache.commons.math3.util;
diff --git a/src/main/resources/data/org/apache/commons/math/util/FastMath__exp_frac b/src/main/resources/data/org/apache/commons/math3/util/FastMath__exp_frac
similarity index 100%
rename from src/main/resources/data/org/apache/commons/math/util/FastMath__exp_frac
rename to src/main/resources/data/org/apache/commons/math3/util/FastMath__exp_frac
diff --git a/src/main/resources/data/org/apache/commons/math/util/FastMath__exp_int b/src/main/resources/data/org/apache/commons/math3/util/FastMath__exp_int
similarity index 100%
rename from src/main/resources/data/org/apache/commons/math/util/FastMath__exp_int
rename to src/main/resources/data/org/apache/commons/math3/util/FastMath__exp_int
diff --git a/src/main/resources/data/org/apache/commons/math/util/FastMath__ln_mant b/src/main/resources/data/org/apache/commons/math3/util/FastMath__ln_mant
similarity index 100%
rename from src/main/resources/data/org/apache/commons/math/util/FastMath__ln_mant
rename to src/main/resources/data/org/apache/commons/math3/util/FastMath__ln_mant
diff --git a/src/site/resources/userguide/TrajectoryDeterminationProblem.java b/src/site/resources/userguide/TrajectoryDeterminationProblem.java
index 96e585c25..0a0ad36db 100644
--- a/src/site/resources/userguide/TrajectoryDeterminationProblem.java
+++ b/src/site/resources/userguide/TrajectoryDeterminationProblem.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-import org.apache.commons.math.optimization.general.EstimationException;
-import org.apache.commons.math.optimization.general.EstimatedParameter;
-import org.apache.commons.math.optimization.general.EstimationProblem;
-import org.apache.commons.math.optimization.general.LevenbergMarquardtEstimator;
-import org.apache.commons.math.optimization.general.SimpleEstimationProblem;
-import org.apache.commons.math.optimization.general.WeightedMeasurement;
+import org.apache.commons.math3.optimization.general.EstimationException;
+import org.apache.commons.math3.optimization.general.EstimatedParameter;
+import org.apache.commons.math3.optimization.general.EstimationProblem;
+import org.apache.commons.math3.optimization.general.LevenbergMarquardtEstimator;
+import org.apache.commons.math3.optimization.general.SimpleEstimationProblem;
+import org.apache.commons.math3.optimization.general.WeightedMeasurement;
 
 public class TrajectoryDeterminationProblem extends SimpleEstimationProblem {
 
diff --git a/src/site/xdoc/changes.xml b/src/site/xdoc/changes.xml
index e7005bbf8..9de79eb03 100644
--- a/src/site/xdoc/changes.xml
+++ b/src/site/xdoc/changes.xml
@@ -777,7 +777,7 @@ This is primarily a maintenance release, but it also includes new features and e
   2.1, there was no way to estimate models without intercept terms, and, while this was not clear from
   the documentation, design (X) matrices needed to include initial unitary columns.  In 2.2, initial
   unitary columns are not necessary and whether or not models include intercept terms is configurable.
-  See the change log and javadoc for the classes in org.apache.commons.math.stat.regression for details.
+  See the change log and javadoc for the classes in org.apache.commons.math3.stat.regression for details.
 
   The major new features are:
   a new FastMath class, both faster, more accurate and with a few additional functions than StrictMath and Math;
diff --git a/src/site/xdoc/proposal.xml b/src/site/xdoc/proposal.xml
index d5cc87077..9ddbe437e 100644
--- a/src/site/xdoc/proposal.xml
+++ b/src/site/xdoc/proposal.xml
@@ -99,7 +99,7 @@ and mathematical algorithms such as the following:
 
    
 
 
    The proposed package name for the new component is
-org.apache.commons.math.
    
+org.apache.commons.math3.
    
 
     
     
diff --git a/src/site/xdoc/userguide/analysis.xml b/src/site/xdoc/userguide/analysis.xml
index d43bf4ab3..909139ffe 100644
--- a/src/site/xdoc/userguide/analysis.xml
+++ b/src/site/xdoc/userguide/analysis.xml
@@ -513,7 +513,7 @@ System.out println("f(" + interpolationX + ") = " + interpolatedY);
       
         
    
           The 
-          org.apache.commons.math.analysis.polynomials package provides real
+          org.apache.commons.math3.analysis.polynomials package provides real
           coefficients polynomials.
         
    
         
    
diff --git a/src/site/xdoc/userguide/optimization.xml b/src/site/xdoc/userguide/optimization.xml
index dfa22b84d..59fca5adf 100644
--- a/src/site/xdoc/userguide/optimization.xml
+++ b/src/site/xdoc/userguide/optimization.xml
@@ -454,7 +454,7 @@ can be seen below:
 
 
    
 Below is the the class containing all the implementation details
-(Taken from the Apache Commons Math org.apache.commons.math.optimization.general.LevenbergMarquardtOptimizerTest):
+(Taken from the Apache Commons Math org.apache.commons.math3.optimization.general.LevenbergMarquardtOptimizerTest):
 
    
 
 
diff --git a/src/site/xdoc/userguide/overview.xml b/src/site/xdoc/userguide/overview.xml
index 6d57b2b0e..eca6a4523 100644
--- a/src/site/xdoc/userguide/overview.xml
+++ b/src/site/xdoc/userguide/overview.xml
@@ -73,20 +73,20 @@
     
    
     Commons Math is divided into fourteen subpackages, based on functionality provided.
     
      
-      
    1. org.apache.commons.math.stat - statistics, statistical tests
      2. 
-      
    2. org.apache.commons.math.analysis - rootfinding, integration, interpolation, polynomials
      3. 
-      
    3. org.apache.commons.math.random - random numbers, strings and data generation
      4. 
-      
    4. org.apache.commons.math.special - special functions (Gamma, Beta) 
      5. 
-      
    5. org.apache.commons.math.linear - matrices, solving linear systems 
      6. 
-      
    6. org.apache.commons.math.util - common math/stat functions extending java.lang.Math 
      7. 
-      
    7. org.apache.commons.math.complex - complex numbers
      8. 
-      
    8. org.apache.commons.math.distribution - probability distributions
      9. 
-      
    9. org.apache.commons.math.fraction - rational numbers
      10. 
-      
    10. org.apache.commons.math.transform - transform methods (Fast Fourier)
      11. 
-      
    11. org.apache.commons.math.geometry - geometry (Euclidean spaces and Binary Space Partitioning)
      12. 
-      
    12. org.apache.commons.math.optimization - function maximization or minimization
      13. 
-      
    13. org.apache.commons.math.ode - Ordinary Differential Equations integration
      14. 
-      
    14. org.apache.commons.math.genetics - Genetic Algorithms
      15. 
+      
    15. org.apache.commons.math3.stat - statistics, statistical tests
      16. 
+      
    16. org.apache.commons.math3.analysis - rootfinding, integration, interpolation, polynomials
      17. 
+      
    17. org.apache.commons.math3.random - random numbers, strings and data generation
      18. 
+      
    18. org.apache.commons.math3.special - special functions (Gamma, Beta) 
      19. 
+      
    19. org.apache.commons.math3.linear - matrices, solving linear systems 
      20. 
+      
    20. org.apache.commons.math3.util - common math/stat functions extending java.lang.Math 
      21. 
+      
    21. org.apache.commons.math3.complex - complex numbers
      22. 
+      
    22. org.apache.commons.math3.distribution - probability distributions
      23. 
+      
    23. org.apache.commons.math3.fraction - rational numbers
      24. 
+      
    24. org.apache.commons.math3.transform - transform methods (Fast Fourier)
      25. 
+      
    25. org.apache.commons.math3.geometry - geometry (Euclidean spaces and Binary Space Partitioning)
      26. 
+      
    26. org.apache.commons.math3.optimization - function maximization or minimization
      27. 
+      
    27. org.apache.commons.math3.ode - Ordinary Differential Equations integration
      28. 
+      
    28. org.apache.commons.math3.genetics - Genetic Algorithms
      29. 
     
    
     Package javadocs are here
     
    
diff --git a/src/site/xdoc/userguide/stat.xml b/src/site/xdoc/userguide/stat.xml
index 8f13ade3c..40330c9dc 100644
--- a/src/site/xdoc/userguide/stat.xml
+++ b/src/site/xdoc/userguide/stat.xml
@@ -618,7 +618,7 @@ regression.newSampleData(y, x, omega);
       
    
          Some statistical algorithms require that input data be replaced by ranks.
          The 
-         org.apache.commons.math.stat.ranking package provides rank transformation.
+         org.apache.commons.math3.stat.ranking package provides rank transformation.
          
          RankingAlgorithm defines the interface for ranking.  
          
@@ -659,7 +659,7 @@ new NaturalRanking(NaNStrategy.REMOVED,TiesStrategy.SEQUENTIAL).rank(exampleData
       
         
    
           The 
-          org.apache.commons.math.stat.correlation package computes covariances
+          org.apache.commons.math3.stat.correlation package computes covariances
           and correlations for pairs of arrays or columns of a matrix.
           
           Covariance computes covariances, 
@@ -806,7 +806,7 @@ new PearsonsCorrelation().correlation(ranking.rank(x), ranking.rank(y))
         
    
           The interfaces and implementations in the
           
-          org.apache.commons.math.stat.inference package provide
+          org.apache.commons.math3.stat.inference package provide
           
           Student's t,
           
diff --git a/src/site/xdoc/userguide/utilities.xml b/src/site/xdoc/userguide/utilities.xml
index 69aabc21b..a08cdc7b0 100644
--- a/src/site/xdoc/userguide/utilities.xml
+++ b/src/site/xdoc/userguide/utilities.xml
@@ -32,7 +32,7 @@
 
     
    
     The 
-    org.apache.commons.math.util package collects a group of array utilities,
+    org.apache.commons.math3.util package collects a group of array utilities,
     value transformers,  and numerical routines used by implementation classes in
     commons-math.
     
    
diff --git a/src/test/java/org/apache/commons/math/PerfTestUtils.java b/src/test/java/org/apache/commons/math3/PerfTestUtils.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/PerfTestUtils.java
rename to src/test/java/org/apache/commons/math3/PerfTestUtils.java
index a89666ee4..b235534bb 100644
--- a/src/test/java/org/apache/commons/math/PerfTestUtils.java
+++ b/src/test/java/org/apache/commons/math3/PerfTestUtils.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math;
+package org.apache.commons.math3;
 
 import java.util.Random;
 import java.util.concurrent.Callable;
-import org.apache.commons.math.stat.descriptive.SummaryStatistics;
-import org.apache.commons.math.stat.descriptive.StatisticalSummary;
-import org.apache.commons.math.exception.MathIllegalStateException;
+import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
+import org.apache.commons.math3.stat.descriptive.StatisticalSummary;
+import org.apache.commons.math3.exception.MathIllegalStateException;
 
 /**
  * Simple benchmarking utilities.
diff --git a/src/test/java/org/apache/commons/math/Retry.java b/src/test/java/org/apache/commons/math3/Retry.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/Retry.java
rename to src/test/java/org/apache/commons/math3/Retry.java
index 95b8a07a1..9e766f6f2 100644
--- a/src/test/java/org/apache/commons/math/Retry.java
+++ b/src/test/java/org/apache/commons/math3/Retry.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math;
+package org.apache.commons.math3;
 
 import java.lang.annotation.*;
 
diff --git a/src/test/java/org/apache/commons/math/RetryRunner.java b/src/test/java/org/apache/commons/math3/RetryRunner.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/RetryRunner.java
rename to src/test/java/org/apache/commons/math3/RetryRunner.java
index 3c1e031c3..b24aa5754 100644
--- a/src/test/java/org/apache/commons/math/RetryRunner.java
+++ b/src/test/java/org/apache/commons/math3/RetryRunner.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math;
+package org.apache.commons.math3;
 
 import org.junit.runners.BlockJUnit4ClassRunner;
 import org.junit.runners.model.FrameworkMethod;
diff --git a/src/test/java/org/apache/commons/math/RetryRunnerTest.java b/src/test/java/org/apache/commons/math3/RetryRunnerTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/math/RetryRunnerTest.java
rename to src/test/java/org/apache/commons/math3/RetryRunnerTest.java
index 336933667..f7fa1e08e 100644
--- a/src/test/java/org/apache/commons/math/RetryRunnerTest.java
+++ b/src/test/java/org/apache/commons/math3/RetryRunnerTest.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math;
+package org.apache.commons.math3;
 
 import java.util.Random;
 
-import org.apache.commons.math.exception.MathIllegalStateException;
+import org.apache.commons.math3.exception.MathIllegalStateException;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/org/apache/commons/math/TestUtils.java b/src/test/java/org/apache/commons/math3/TestUtils.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/TestUtils.java
rename to src/test/java/org/apache/commons/math3/TestUtils.java
index 92905accf..706674f58 100644
--- a/src/test/java/org/apache/commons/math/TestUtils.java
+++ b/src/test/java/org/apache/commons/math3/TestUtils.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math;
+package org.apache.commons.math3;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -25,14 +25,14 @@ import java.io.ObjectOutputStream;
 import java.text.DecimalFormat;
 
 
-import org.apache.commons.math.complex.Complex;
-import org.apache.commons.math.complex.ComplexFormat;
-import org.apache.commons.math.distribution.RealDistribution;
-import org.apache.commons.math.linear.FieldMatrix;
-import org.apache.commons.math.linear.RealMatrix;
-import org.apache.commons.math.stat.inference.ChiSquareTest;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.util.Precision;
+import org.apache.commons.math3.complex.Complex;
+import org.apache.commons.math3.complex.ComplexFormat;
+import org.apache.commons.math3.distribution.RealDistribution;
+import org.apache.commons.math3.linear.FieldMatrix;
+import org.apache.commons.math3.linear.RealMatrix;
+import org.apache.commons.math3.stat.inference.ChiSquareTest;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.util.Precision;
 import org.junit.Assert;
 
 /**
diff --git a/src/test/java/org/apache/commons/math/analysis/Expm1Function.java b/src/test/java/org/apache/commons/math3/analysis/Expm1Function.java
similarity index 93%
rename from src/test/java/org/apache/commons/math/analysis/Expm1Function.java
rename to src/test/java/org/apache/commons/math3/analysis/Expm1Function.java
index 6302282d4..b827edc8b 100644
--- a/src/test/java/org/apache/commons/math/analysis/Expm1Function.java
+++ b/src/test/java/org/apache/commons/math3/analysis/Expm1Function.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis;
+package org.apache.commons.math3.analysis;
 
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.util.FastMath;
 
 /**
  * Auxillary class for testing purposes.
diff --git a/src/test/java/org/apache/commons/math/analysis/FunctionUtilsTest.java b/src/test/java/org/apache/commons/math3/analysis/FunctionUtilsTest.java
similarity index 88%
rename from src/test/java/org/apache/commons/math/analysis/FunctionUtilsTest.java
rename to src/test/java/org/apache/commons/math3/analysis/FunctionUtilsTest.java
index fad187051..e25bb88ae 100644
--- a/src/test/java/org/apache/commons/math/analysis/FunctionUtilsTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/FunctionUtilsTest.java
@@ -15,27 +15,27 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.analysis;
+package org.apache.commons.math3.analysis;
 
-import org.apache.commons.math.analysis.function.Add;
-import org.apache.commons.math.analysis.function.Constant;
-import org.apache.commons.math.analysis.function.Cos;
-import org.apache.commons.math.analysis.function.Cosh;
-import org.apache.commons.math.analysis.function.Divide;
-import org.apache.commons.math.analysis.function.Identity;
-import org.apache.commons.math.analysis.function.Inverse;
-import org.apache.commons.math.analysis.function.Log;
-import org.apache.commons.math.analysis.function.Max;
-import org.apache.commons.math.analysis.function.Min;
-import org.apache.commons.math.analysis.function.Minus;
-import org.apache.commons.math.analysis.function.Multiply;
-import org.apache.commons.math.analysis.function.Pow;
-import org.apache.commons.math.analysis.function.Power;
-import org.apache.commons.math.analysis.function.Sin;
-import org.apache.commons.math.analysis.function.Sinc;
-import org.apache.commons.math.exception.NotStrictlyPositiveException;
-import org.apache.commons.math.exception.NumberIsTooLargeException;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.analysis.function.Add;
+import org.apache.commons.math3.analysis.function.Constant;
+import org.apache.commons.math3.analysis.function.Cos;
+import org.apache.commons.math3.analysis.function.Cosh;
+import org.apache.commons.math3.analysis.function.Divide;
+import org.apache.commons.math3.analysis.function.Identity;
+import org.apache.commons.math3.analysis.function.Inverse;
+import org.apache.commons.math3.analysis.function.Log;
+import org.apache.commons.math3.analysis.function.Max;
+import org.apache.commons.math3.analysis.function.Min;
+import org.apache.commons.math3.analysis.function.Minus;
+import org.apache.commons.math3.analysis.function.Multiply;
+import org.apache.commons.math3.analysis.function.Pow;
+import org.apache.commons.math3.analysis.function.Power;
+import org.apache.commons.math3.analysis.function.Sin;
+import org.apache.commons.math3.analysis.function.Sinc;
+import org.apache.commons.math3.exception.NotStrictlyPositiveException;
+import org.apache.commons.math3.exception.NumberIsTooLargeException;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/analysis/MonitoredFunction.java b/src/test/java/org/apache/commons/math3/analysis/MonitoredFunction.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/analysis/MonitoredFunction.java
rename to src/test/java/org/apache/commons/math3/analysis/MonitoredFunction.java
index 23d10920f..caa816435 100644
--- a/src/test/java/org/apache/commons/math/analysis/MonitoredFunction.java
+++ b/src/test/java/org/apache/commons/math3/analysis/MonitoredFunction.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis;
+package org.apache.commons.math3.analysis;
 
 /**
  * Wrapper class for counting functions calls.
diff --git a/src/test/java/org/apache/commons/math/analysis/QuinticFunction.java b/src/test/java/org/apache/commons/math3/analysis/QuinticFunction.java
similarity index 91%
rename from src/test/java/org/apache/commons/math/analysis/QuinticFunction.java
rename to src/test/java/org/apache/commons/math3/analysis/QuinticFunction.java
index b69b94e25..1ce217d1e 100644
--- a/src/test/java/org/apache/commons/math/analysis/QuinticFunction.java
+++ b/src/test/java/org/apache/commons/math3/analysis/QuinticFunction.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis;
+package org.apache.commons.math3.analysis;
 
 /**
  * Auxiliary class for testing solvers.
@@ -24,7 +24,7 @@ package org.apache.commons.math.analysis;
 public class QuinticFunction implements DifferentiableUnivariateFunction {
 
     /* Evaluate quintic.
-     * @see org.apache.commons.math.UnivariateFunction#value(double)
+     * @see org.apache.commons.math3.UnivariateFunction#value(double)
      */
     public double value(double x) {
         return (x-1)*(x-0.5)*x*(x+0.5)*(x+1);
diff --git a/src/test/java/org/apache/commons/math/analysis/SinFunction.java b/src/test/java/org/apache/commons/math3/analysis/SinFunction.java
similarity index 90%
rename from src/test/java/org/apache/commons/math/analysis/SinFunction.java
rename to src/test/java/org/apache/commons/math3/analysis/SinFunction.java
index 3a0b2bf77..49dbbc8a5 100644
--- a/src/test/java/org/apache/commons/math/analysis/SinFunction.java
+++ b/src/test/java/org/apache/commons/math3/analysis/SinFunction.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis;
+package org.apache.commons.math3.analysis;
 
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.util.FastMath;
 
 /**
  * Auxillary class for testing solvers.
@@ -31,7 +31,7 @@ import org.apache.commons.math.util.FastMath;
 public class SinFunction implements DifferentiableUnivariateFunction {
 
     /* Evaluate sinus fuction.
-     * @see org.apache.commons.math.UnivariateFunction#value(double)
+     * @see org.apache.commons.math3.UnivariateFunction#value(double)
      */
     public double value(double x) {
         return FastMath.sin(x);
diff --git a/src/test/java/org/apache/commons/math/analysis/SincFunction.java b/src/test/java/org/apache/commons/math3/analysis/SincFunction.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/analysis/SincFunction.java
rename to src/test/java/org/apache/commons/math3/analysis/SincFunction.java
index 31a80d2bc..d61dae624 100644
--- a/src/test/java/org/apache/commons/math/analysis/SincFunction.java
+++ b/src/test/java/org/apache/commons/math3/analysis/SincFunction.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis;
+package org.apache.commons.math3.analysis;
 
 
 /**
diff --git a/src/test/java/org/apache/commons/math/analysis/SumSincFunction.java b/src/test/java/org/apache/commons/math3/analysis/SumSincFunction.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/analysis/SumSincFunction.java
rename to src/test/java/org/apache/commons/math3/analysis/SumSincFunction.java
index 01609f61e..839e756da 100644
--- a/src/test/java/org/apache/commons/math/analysis/SumSincFunction.java
+++ b/src/test/java/org/apache/commons/math3/analysis/SumSincFunction.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis;
+package org.apache.commons.math3.analysis;
 
 /**
  * Auxiliary class for testing optimizers.
diff --git a/src/test/java/org/apache/commons/math/analysis/XMinus5Function.java b/src/test/java/org/apache/commons/math3/analysis/XMinus5Function.java
similarity index 91%
rename from src/test/java/org/apache/commons/math/analysis/XMinus5Function.java
rename to src/test/java/org/apache/commons/math3/analysis/XMinus5Function.java
index f1c895156..34a8b6796 100644
--- a/src/test/java/org/apache/commons/math/analysis/XMinus5Function.java
+++ b/src/test/java/org/apache/commons/math3/analysis/XMinus5Function.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis;
+package org.apache.commons.math3.analysis;
 
 /**
  * Auxiliary class for testing solvers.
@@ -24,7 +24,7 @@ package org.apache.commons.math.analysis;
 public class XMinus5Function implements DifferentiableUnivariateFunction {
 
     /* Evaluate x - 5 fuction.
-     * @see org.apache.commons.math.UnivariateFunction#value(double)
+     * @see org.apache.commons.math3.UnivariateFunction#value(double)
      */
     public double value(double x) {
         return x - 5;
diff --git a/src/test/java/org/apache/commons/math/analysis/function/GaussianTest.java b/src/test/java/org/apache/commons/math3/analysis/function/GaussianTest.java
similarity index 93%
rename from src/test/java/org/apache/commons/math/analysis/function/GaussianTest.java
rename to src/test/java/org/apache/commons/math3/analysis/function/GaussianTest.java
index 3257ea21d..a0c0ff16f 100644
--- a/src/test/java/org/apache/commons/math/analysis/function/GaussianTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/function/GaussianTest.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.analysis.function;
+package org.apache.commons.math3.analysis.function;
 
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.exception.NotStrictlyPositiveException;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.exception.NotStrictlyPositiveException;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.util.FastMath;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/analysis/function/HarmonicOscillatorTest.java b/src/test/java/org/apache/commons/math3/analysis/function/HarmonicOscillatorTest.java
similarity index 93%
rename from src/test/java/org/apache/commons/math/analysis/function/HarmonicOscillatorTest.java
rename to src/test/java/org/apache/commons/math3/analysis/function/HarmonicOscillatorTest.java
index b42777399..18f76750e 100644
--- a/src/test/java/org/apache/commons/math/analysis/function/HarmonicOscillatorTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/function/HarmonicOscillatorTest.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.analysis.function;
+package org.apache.commons.math3.analysis.function;
 
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.util.FastMath;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/analysis/function/LogisticTest.java b/src/test/java/org/apache/commons/math3/analysis/function/LogisticTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/math/analysis/function/LogisticTest.java
rename to src/test/java/org/apache/commons/math3/analysis/function/LogisticTest.java
index bf86cc33a..57d4d9fb3 100644
--- a/src/test/java/org/apache/commons/math/analysis/function/LogisticTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/function/LogisticTest.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.analysis.function;
+package org.apache.commons.math3.analysis.function;
 
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.exception.NotStrictlyPositiveException;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.exception.NotStrictlyPositiveException;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.util.FastMath;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/analysis/function/LogitTest.java b/src/test/java/org/apache/commons/math3/analysis/function/LogitTest.java
similarity index 93%
rename from src/test/java/org/apache/commons/math/analysis/function/LogitTest.java
rename to src/test/java/org/apache/commons/math3/analysis/function/LogitTest.java
index 528f0987a..91cf51f16 100644
--- a/src/test/java/org/apache/commons/math/analysis/function/LogitTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/function/LogitTest.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.analysis.function;
+package org.apache.commons.math3.analysis.function;
 
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.analysis.FunctionUtils;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.OutOfRangeException;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.analysis.FunctionUtils;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.OutOfRangeException;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/analysis/function/SigmoidTest.java b/src/test/java/org/apache/commons/math3/analysis/function/SigmoidTest.java
similarity index 93%
rename from src/test/java/org/apache/commons/math/analysis/function/SigmoidTest.java
rename to src/test/java/org/apache/commons/math3/analysis/function/SigmoidTest.java
index d85e02455..fb33ef680 100644
--- a/src/test/java/org/apache/commons/math/analysis/function/SigmoidTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/function/SigmoidTest.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.analysis.function;
+package org.apache.commons.math3.analysis.function;
 
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.DimensionMismatchException;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.DimensionMismatchException;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/analysis/function/SincTest.java b/src/test/java/org/apache/commons/math3/analysis/function/SincTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/math/analysis/function/SincTest.java
rename to src/test/java/org/apache/commons/math3/analysis/function/SincTest.java
index fa65965a7..352e6fbae 100644
--- a/src/test/java/org/apache/commons/math/analysis/function/SincTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/function/SincTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis.function;
+package org.apache.commons.math3.analysis.function;
 
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Test;
 import org.junit.Assert;
 
diff --git a/src/test/java/org/apache/commons/math/analysis/function/SqrtTest.java b/src/test/java/org/apache/commons/math3/analysis/function/SqrtTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/math/analysis/function/SqrtTest.java
rename to src/test/java/org/apache/commons/math3/analysis/function/SqrtTest.java
index d997b442f..e9efc0de3 100644
--- a/src/test/java/org/apache/commons/math/analysis/function/SqrtTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/function/SqrtTest.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis.function;
+package org.apache.commons.math3.analysis.function;
 
-import org.apache.commons.math.analysis.UnivariateFunction;
+import org.apache.commons.math3.analysis.UnivariateFunction;
 
 import org.junit.Test;
 import org.junit.Assert;
diff --git a/src/test/java/org/apache/commons/math/analysis/function/StepFunctionTest.java b/src/test/java/org/apache/commons/math3/analysis/function/StepFunctionTest.java
similarity index 91%
rename from src/test/java/org/apache/commons/math/analysis/function/StepFunctionTest.java
rename to src/test/java/org/apache/commons/math3/analysis/function/StepFunctionTest.java
index 5883306ef..247a0a970 100644
--- a/src/test/java/org/apache/commons/math/analysis/function/StepFunctionTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/function/StepFunctionTest.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.analysis.function;
+package org.apache.commons.math3.analysis.function;
 
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.NonMonotonicSequenceException;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.NoDataException;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.NonMonotonicSequenceException;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.NoDataException;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/analysis/integration/LegendreGaussIntegratorTest.java b/src/test/java/org/apache/commons/math3/analysis/integration/LegendreGaussIntegratorTest.java
similarity index 93%
rename from src/test/java/org/apache/commons/math/analysis/integration/LegendreGaussIntegratorTest.java
rename to src/test/java/org/apache/commons/math3/analysis/integration/LegendreGaussIntegratorTest.java
index bd3ac0546..78fc06436 100644
--- a/src/test/java/org/apache/commons/math/analysis/integration/LegendreGaussIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/integration/LegendreGaussIntegratorTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis.integration;
+package org.apache.commons.math3.analysis.integration;
 
 import java.util.Random;
 
-import org.apache.commons.math.analysis.QuinticFunction;
-import org.apache.commons.math.analysis.SinFunction;
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.analysis.polynomials.PolynomialFunction;
-import org.apache.commons.math.exception.TooManyEvaluationsException;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.analysis.QuinticFunction;
+import org.apache.commons.math3.analysis.SinFunction;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.analysis.polynomials.PolynomialFunction;
+import org.apache.commons.math3.exception.TooManyEvaluationsException;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/analysis/integration/RombergIntegratorTest.java b/src/test/java/org/apache/commons/math3/analysis/integration/RombergIntegratorTest.java
similarity index 91%
rename from src/test/java/org/apache/commons/math/analysis/integration/RombergIntegratorTest.java
rename to src/test/java/org/apache/commons/math3/analysis/integration/RombergIntegratorTest.java
index 0865dc86c..995528cf6 100644
--- a/src/test/java/org/apache/commons/math/analysis/integration/RombergIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/integration/RombergIntegratorTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis.integration;
+package org.apache.commons.math3.analysis.integration;
 
-import org.apache.commons.math.analysis.QuinticFunction;
-import org.apache.commons.math.analysis.SinFunction;
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.exception.NumberIsTooLargeException;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.analysis.QuinticFunction;
+import org.apache.commons.math3.analysis.SinFunction;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.exception.NumberIsTooLargeException;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/analysis/integration/SimpsonIntegratorTest.java b/src/test/java/org/apache/commons/math3/analysis/integration/SimpsonIntegratorTest.java
similarity index 91%
rename from src/test/java/org/apache/commons/math/analysis/integration/SimpsonIntegratorTest.java
rename to src/test/java/org/apache/commons/math3/analysis/integration/SimpsonIntegratorTest.java
index da5256866..7adea6680 100644
--- a/src/test/java/org/apache/commons/math/analysis/integration/SimpsonIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/integration/SimpsonIntegratorTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis.integration;
+package org.apache.commons.math3.analysis.integration;
 
-import org.apache.commons.math.analysis.QuinticFunction;
-import org.apache.commons.math.analysis.SinFunction;
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.exception.NumberIsTooLargeException;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.analysis.QuinticFunction;
+import org.apache.commons.math3.analysis.SinFunction;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.exception.NumberIsTooLargeException;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/analysis/integration/TrapezoidIntegratorTest.java b/src/test/java/org/apache/commons/math3/analysis/integration/TrapezoidIntegratorTest.java
similarity index 91%
rename from src/test/java/org/apache/commons/math/analysis/integration/TrapezoidIntegratorTest.java
rename to src/test/java/org/apache/commons/math3/analysis/integration/TrapezoidIntegratorTest.java
index 78d3f7c07..cc5e58991 100644
--- a/src/test/java/org/apache/commons/math/analysis/integration/TrapezoidIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/integration/TrapezoidIntegratorTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis.integration;
+package org.apache.commons.math3.analysis.integration;
 
-import org.apache.commons.math.analysis.QuinticFunction;
-import org.apache.commons.math.analysis.SinFunction;
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.exception.NumberIsTooLargeException;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.analysis.QuinticFunction;
+import org.apache.commons.math3.analysis.SinFunction;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.exception.NumberIsTooLargeException;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolatingFunctionTest.java b/src/test/java/org/apache/commons/math3/analysis/interpolation/BicubicSplineInterpolatingFunctionTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolatingFunctionTest.java
rename to src/test/java/org/apache/commons/math3/analysis/interpolation/BicubicSplineInterpolatingFunctionTest.java
index e3b524432..769446fe7 100644
--- a/src/test/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolatingFunctionTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/interpolation/BicubicSplineInterpolatingFunctionTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis.interpolation;
+package org.apache.commons.math3.analysis.interpolation;
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.analysis.BivariateFunction;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.analysis.BivariateFunction;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolatorTest.java b/src/test/java/org/apache/commons/math3/analysis/interpolation/BicubicSplineInterpolatorTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolatorTest.java
rename to src/test/java/org/apache/commons/math3/analysis/interpolation/BicubicSplineInterpolatorTest.java
index 55106ae36..1a8aaeaf8 100644
--- a/src/test/java/org/apache/commons/math/analysis/interpolation/BicubicSplineInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/interpolation/BicubicSplineInterpolatorTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis.interpolation;
+package org.apache.commons.math3.analysis.interpolation;
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.analysis.BivariateFunction;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.analysis.BivariateFunction;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/analysis/interpolation/DividedDifferenceInterpolatorTest.java b/src/test/java/org/apache/commons/math3/analysis/interpolation/DividedDifferenceInterpolatorTest.java
similarity index 93%
rename from src/test/java/org/apache/commons/math/analysis/interpolation/DividedDifferenceInterpolatorTest.java
rename to src/test/java/org/apache/commons/math3/analysis/interpolation/DividedDifferenceInterpolatorTest.java
index 15daba864..8cd1a2917 100644
--- a/src/test/java/org/apache/commons/math/analysis/interpolation/DividedDifferenceInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/interpolation/DividedDifferenceInterpolatorTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis.interpolation;
+package org.apache.commons.math3.analysis.interpolation;
 
-import org.apache.commons.math.exception.NonMonotonicSequenceException;
-import org.apache.commons.math.analysis.Expm1Function;
-import org.apache.commons.math.analysis.SinFunction;
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.exception.NonMonotonicSequenceException;
+import org.apache.commons.math3.analysis.Expm1Function;
+import org.apache.commons.math3.analysis.SinFunction;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/analysis/interpolation/LinearInterpolatorTest.java b/src/test/java/org/apache/commons/math3/analysis/interpolation/LinearInterpolatorTest.java
similarity index 91%
rename from src/test/java/org/apache/commons/math/analysis/interpolation/LinearInterpolatorTest.java
rename to src/test/java/org/apache/commons/math3/analysis/interpolation/LinearInterpolatorTest.java
index fa8348af8..3c906c73e 100644
--- a/src/test/java/org/apache/commons/math/analysis/interpolation/LinearInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/interpolation/LinearInterpolatorTest.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis.interpolation;
+package org.apache.commons.math3.analysis.interpolation;
 
-import org.apache.commons.math.exception.NonMonotonicSequenceException;
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.analysis.polynomials.PolynomialFunction;
-import org.apache.commons.math.analysis.polynomials.PolynomialSplineFunction;
+import org.apache.commons.math3.exception.NonMonotonicSequenceException;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.analysis.polynomials.PolynomialFunction;
+import org.apache.commons.math3.analysis.polynomials.PolynomialSplineFunction;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/analysis/interpolation/LoessInterpolatorTest.java b/src/test/java/org/apache/commons/math3/analysis/interpolation/LoessInterpolatorTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/math/analysis/interpolation/LoessInterpolatorTest.java
rename to src/test/java/org/apache/commons/math3/analysis/interpolation/LoessInterpolatorTest.java
index f022aa784..7cdea6eca 100644
--- a/src/test/java/org/apache/commons/math/analysis/interpolation/LoessInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/interpolation/LoessInterpolatorTest.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis.interpolation;
+package org.apache.commons.math3.analysis.interpolation;
 
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.exception.OutOfRangeException;
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.NoDataException;
-import org.apache.commons.math.exception.NonMonotonicSequenceException;
-import org.apache.commons.math.exception.NotFiniteNumberException;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.exception.OutOfRangeException;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.NoDataException;
+import org.apache.commons.math3.exception.NonMonotonicSequenceException;
+import org.apache.commons.math3.exception.NotFiniteNumberException;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/analysis/interpolation/MicrosphereInterpolatorTest.java b/src/test/java/org/apache/commons/math3/analysis/interpolation/MicrosphereInterpolatorTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/analysis/interpolation/MicrosphereInterpolatorTest.java
rename to src/test/java/org/apache/commons/math3/analysis/interpolation/MicrosphereInterpolatorTest.java
index ef7d63203..efdd5fcfc 100644
--- a/src/test/java/org/apache/commons/math/analysis/interpolation/MicrosphereInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/interpolation/MicrosphereInterpolatorTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis.interpolation;
+package org.apache.commons.math3.analysis.interpolation;
 
-import org.apache.commons.math.analysis.MultivariateFunction;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.analysis.MultivariateFunction;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/analysis/interpolation/NevilleInterpolatorTest.java b/src/test/java/org/apache/commons/math3/analysis/interpolation/NevilleInterpolatorTest.java
similarity index 93%
rename from src/test/java/org/apache/commons/math/analysis/interpolation/NevilleInterpolatorTest.java
rename to src/test/java/org/apache/commons/math3/analysis/interpolation/NevilleInterpolatorTest.java
index d29d4875c..a7c1472b6 100644
--- a/src/test/java/org/apache/commons/math/analysis/interpolation/NevilleInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/interpolation/NevilleInterpolatorTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis.interpolation;
+package org.apache.commons.math3.analysis.interpolation;
 
-import org.apache.commons.math.exception.NonMonotonicSequenceException;
-import org.apache.commons.math.analysis.Expm1Function;
-import org.apache.commons.math.analysis.SinFunction;
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.exception.NonMonotonicSequenceException;
+import org.apache.commons.math3.analysis.Expm1Function;
+import org.apache.commons.math3.analysis.SinFunction;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/analysis/interpolation/SmoothingPolynomialBicubicSplineInterpolatorTest.java b/src/test/java/org/apache/commons/math3/analysis/interpolation/SmoothingPolynomialBicubicSplineInterpolatorTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/math/analysis/interpolation/SmoothingPolynomialBicubicSplineInterpolatorTest.java
rename to src/test/java/org/apache/commons/math3/analysis/interpolation/SmoothingPolynomialBicubicSplineInterpolatorTest.java
index b1789c183..49d378133 100644
--- a/src/test/java/org/apache/commons/math/analysis/interpolation/SmoothingPolynomialBicubicSplineInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/interpolation/SmoothingPolynomialBicubicSplineInterpolatorTest.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis.interpolation;
+package org.apache.commons.math3.analysis.interpolation;
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.analysis.BivariateFunction;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.analysis.BivariateFunction;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/analysis/interpolation/SplineInterpolatorTest.java b/src/test/java/org/apache/commons/math3/analysis/interpolation/SplineInterpolatorTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/math/analysis/interpolation/SplineInterpolatorTest.java
rename to src/test/java/org/apache/commons/math3/analysis/interpolation/SplineInterpolatorTest.java
index f6dba49a7..f71949865 100644
--- a/src/test/java/org/apache/commons/math/analysis/interpolation/SplineInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/interpolation/SplineInterpolatorTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis.interpolation;
+package org.apache.commons.math3.analysis.interpolation;
 
-import org.apache.commons.math.exception.NonMonotonicSequenceException;
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.analysis.polynomials.PolynomialFunction;
-import org.apache.commons.math.analysis.polynomials.PolynomialSplineFunction;
+import org.apache.commons.math3.exception.NonMonotonicSequenceException;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.analysis.polynomials.PolynomialFunction;
+import org.apache.commons.math3.analysis.polynomials.PolynomialSplineFunction;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/analysis/interpolation/TricubicSplineInterpolatingFunctionTest.java b/src/test/java/org/apache/commons/math3/analysis/interpolation/TricubicSplineInterpolatingFunctionTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/analysis/interpolation/TricubicSplineInterpolatingFunctionTest.java
rename to src/test/java/org/apache/commons/math3/analysis/interpolation/TricubicSplineInterpolatingFunctionTest.java
index 58fded113..6e83c6a80 100644
--- a/src/test/java/org/apache/commons/math/analysis/interpolation/TricubicSplineInterpolatingFunctionTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/interpolation/TricubicSplineInterpolatingFunctionTest.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis.interpolation;
+package org.apache.commons.math3.analysis.interpolation;
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.analysis.TrivariateFunction;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.analysis.TrivariateFunction;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/analysis/interpolation/TricubicSplineInterpolatorTest.java b/src/test/java/org/apache/commons/math3/analysis/interpolation/TricubicSplineInterpolatorTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/math/analysis/interpolation/TricubicSplineInterpolatorTest.java
rename to src/test/java/org/apache/commons/math3/analysis/interpolation/TricubicSplineInterpolatorTest.java
index 8bc64cba8..3599b6442 100644
--- a/src/test/java/org/apache/commons/math/analysis/interpolation/TricubicSplineInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/interpolation/TricubicSplineInterpolatorTest.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis.interpolation;
+package org.apache.commons.math3.analysis.interpolation;
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.analysis.TrivariateFunction;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.analysis.TrivariateFunction;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/analysis/interpolation/UnivariatePeriodicInterpolatorTest.java b/src/test/java/org/apache/commons/math3/analysis/interpolation/UnivariatePeriodicInterpolatorTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/math/analysis/interpolation/UnivariatePeriodicInterpolatorTest.java
rename to src/test/java/org/apache/commons/math3/analysis/interpolation/UnivariatePeriodicInterpolatorTest.java
index 68927a768..cf3b9d6e5 100644
--- a/src/test/java/org/apache/commons/math/analysis/interpolation/UnivariatePeriodicInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/interpolation/UnivariatePeriodicInterpolatorTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis.interpolation;
+package org.apache.commons.math3.analysis.interpolation;
 
 import java.util.Random;
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.exception.NonMonotonicSequenceException;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.exception.NonMonotonicSequenceException;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionLagrangeFormTest.java b/src/test/java/org/apache/commons/math3/analysis/polynomials/PolynomialFunctionLagrangeFormTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionLagrangeFormTest.java
rename to src/test/java/org/apache/commons/math3/analysis/polynomials/PolynomialFunctionLagrangeFormTest.java
index 84885e2e3..8efa1ad5b 100644
--- a/src/test/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionLagrangeFormTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/polynomials/PolynomialFunctionLagrangeFormTest.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis.polynomials;
+package org.apache.commons.math3.analysis.polynomials;
 
-import org.apache.commons.math.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionNewtonFormTest.java b/src/test/java/org/apache/commons/math3/analysis/polynomials/PolynomialFunctionNewtonFormTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionNewtonFormTest.java
rename to src/test/java/org/apache/commons/math3/analysis/polynomials/PolynomialFunctionNewtonFormTest.java
index 39d6ec27d..12259e151 100644
--- a/src/test/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionNewtonFormTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/polynomials/PolynomialFunctionNewtonFormTest.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis.polynomials;
+package org.apache.commons.math3.analysis.polynomials;
 
-import org.apache.commons.math.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionTest.java b/src/test/java/org/apache/commons/math3/analysis/polynomials/PolynomialFunctionTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionTest.java
rename to src/test/java/org/apache/commons/math3/analysis/polynomials/PolynomialFunctionTest.java
index f02c6ac8f..b7d9d2dc3 100644
--- a/src/test/java/org/apache/commons/math/analysis/polynomials/PolynomialFunctionTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/polynomials/PolynomialFunctionTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis.polynomials;
+package org.apache.commons.math3.analysis.polynomials;
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.util.FastMath;
 
 import org.junit.Test;
 import org.junit.Assert;
diff --git a/src/test/java/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunctionTest.java b/src/test/java/org/apache/commons/math3/analysis/polynomials/PolynomialSplineFunctionTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunctionTest.java
rename to src/test/java/org/apache/commons/math3/analysis/polynomials/PolynomialSplineFunctionTest.java
index 974f5ad95..152405348 100644
--- a/src/test/java/org/apache/commons/math/analysis/polynomials/PolynomialSplineFunctionTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/polynomials/PolynomialSplineFunctionTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis.polynomials;
+package org.apache.commons.math3.analysis.polynomials;
 
 import java.util.Arrays;
 
-import org.apache.commons.math.exception.OutOfRangeException;
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.MathIllegalStateException;
+import org.apache.commons.math3.exception.OutOfRangeException;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.MathIllegalStateException;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/analysis/polynomials/PolynomialsUtilsTest.java b/src/test/java/org/apache/commons/math3/analysis/polynomials/PolynomialsUtilsTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/analysis/polynomials/PolynomialsUtilsTest.java
rename to src/test/java/org/apache/commons/math3/analysis/polynomials/PolynomialsUtilsTest.java
index 944544d1a..c89a2644d 100644
--- a/src/test/java/org/apache/commons/math/analysis/polynomials/PolynomialsUtilsTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/polynomials/PolynomialsUtilsTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis.polynomials;
+package org.apache.commons.math3.analysis.polynomials;
 
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.analysis.integration.LegendreGaussIntegrator;
-import org.apache.commons.math.util.ArithmeticUtils;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.util.Precision;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.analysis.integration.LegendreGaussIntegrator;
+import org.apache.commons.math3.util.ArithmeticUtils;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.util.Precision;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/analysis/solvers/BaseSecantSolverAbstractTest.java b/src/test/java/org/apache/commons/math3/analysis/solvers/BaseSecantSolverAbstractTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/math/analysis/solvers/BaseSecantSolverAbstractTest.java
rename to src/test/java/org/apache/commons/math3/analysis/solvers/BaseSecantSolverAbstractTest.java
index c5f4a1ca4..60eb5068f 100644
--- a/src/test/java/org/apache/commons/math/analysis/solvers/BaseSecantSolverAbstractTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/solvers/BaseSecantSolverAbstractTest.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis.solvers;
+package org.apache.commons.math3.analysis.solvers;
 
-import org.apache.commons.math.analysis.QuinticFunction;
-import org.apache.commons.math.analysis.SinFunction;
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.analysis.XMinus5Function;
-import org.apache.commons.math.exception.NumberIsTooLargeException;
-import org.apache.commons.math.exception.NoBracketingException;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.analysis.QuinticFunction;
+import org.apache.commons.math3.analysis.SinFunction;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.analysis.XMinus5Function;
+import org.apache.commons.math3.exception.NumberIsTooLargeException;
+import org.apache.commons.math3.exception.NoBracketingException;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/analysis/solvers/BisectionSolverTest.java b/src/test/java/org/apache/commons/math3/analysis/solvers/BisectionSolverTest.java
similarity index 92%
rename from src/test/java/org/apache/commons/math/analysis/solvers/BisectionSolverTest.java
rename to src/test/java/org/apache/commons/math3/analysis/solvers/BisectionSolverTest.java
index 0eaa8483b..16002e55f 100644
--- a/src/test/java/org/apache/commons/math/analysis/solvers/BisectionSolverTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/solvers/BisectionSolverTest.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis.solvers;
+package org.apache.commons.math3.analysis.solvers;
 
-import org.apache.commons.math.analysis.QuinticFunction;
-import org.apache.commons.math.analysis.SinFunction;
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.analysis.QuinticFunction;
+import org.apache.commons.math3.analysis.SinFunction;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/analysis/solvers/BracketingNthOrderBrentSolverTest.java b/src/test/java/org/apache/commons/math3/analysis/solvers/BracketingNthOrderBrentSolverTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/math/analysis/solvers/BracketingNthOrderBrentSolverTest.java
rename to src/test/java/org/apache/commons/math3/analysis/solvers/BracketingNthOrderBrentSolverTest.java
index 25eb5ed46..ffcc6f89e 100644
--- a/src/test/java/org/apache/commons/math/analysis/solvers/BracketingNthOrderBrentSolverTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/solvers/BracketingNthOrderBrentSolverTest.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.analysis.solvers;
+package org.apache.commons.math3.analysis.solvers;
 
-import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
-import org.apache.commons.math.analysis.QuinticFunction;
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.exception.TooManyEvaluationsException;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction;
+import org.apache.commons.math3.analysis.QuinticFunction;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.exception.TooManyEvaluationsException;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/analysis/solvers/BrentSolverTest.java b/src/test/java/org/apache/commons/math3/analysis/solvers/BrentSolverTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/math/analysis/solvers/BrentSolverTest.java
rename to src/test/java/org/apache/commons/math3/analysis/solvers/BrentSolverTest.java
index a4474ec9d..cdc7da518 100644
--- a/src/test/java/org/apache/commons/math/analysis/solvers/BrentSolverTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/solvers/BrentSolverTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis.solvers;
+package org.apache.commons.math3.analysis.solvers;
 
-import org.apache.commons.math.analysis.MonitoredFunction;
-import org.apache.commons.math.analysis.QuinticFunction;
-import org.apache.commons.math.analysis.SinFunction;
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.exception.NumberIsTooLargeException;
-import org.apache.commons.math.exception.NoBracketingException;
-import org.apache.commons.math.exception.TooManyEvaluationsException;
+import org.apache.commons.math3.analysis.MonitoredFunction;
+import org.apache.commons.math3.analysis.QuinticFunction;
+import org.apache.commons.math3.analysis.SinFunction;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.exception.NumberIsTooLargeException;
+import org.apache.commons.math3.exception.NoBracketingException;
+import org.apache.commons.math3.exception.TooManyEvaluationsException;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/analysis/solvers/IllinoisSolverTest.java b/src/test/java/org/apache/commons/math3/analysis/solvers/IllinoisSolverTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/analysis/solvers/IllinoisSolverTest.java
rename to src/test/java/org/apache/commons/math3/analysis/solvers/IllinoisSolverTest.java
index 4af34a9ab..7b946c04b 100644
--- a/src/test/java/org/apache/commons/math/analysis/solvers/IllinoisSolverTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/solvers/IllinoisSolverTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.analysis.solvers;
+package org.apache.commons.math3.analysis.solvers;
 
 /**
  * Test case for {@link IllinoisSolver Illinois} solver.
diff --git a/src/test/java/org/apache/commons/math/analysis/solvers/LaguerreSolverTest.java b/src/test/java/org/apache/commons/math3/analysis/solvers/LaguerreSolverTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/math/analysis/solvers/LaguerreSolverTest.java
rename to src/test/java/org/apache/commons/math3/analysis/solvers/LaguerreSolverTest.java
index 97cd143ec..83282694d 100644
--- a/src/test/java/org/apache/commons/math/analysis/solvers/LaguerreSolverTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/solvers/LaguerreSolverTest.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis.solvers;
+package org.apache.commons.math3.analysis.solvers;
 
-import org.apache.commons.math.analysis.polynomials.PolynomialFunction;
-import org.apache.commons.math.exception.NumberIsTooLargeException;
-import org.apache.commons.math.exception.NoBracketingException;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.analysis.polynomials.PolynomialFunction;
+import org.apache.commons.math3.exception.NumberIsTooLargeException;
+import org.apache.commons.math3.exception.NoBracketingException;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/analysis/solvers/MullerSolver2Test.java b/src/test/java/org/apache/commons/math3/analysis/solvers/MullerSolver2Test.java
similarity index 92%
rename from src/test/java/org/apache/commons/math/analysis/solvers/MullerSolver2Test.java
rename to src/test/java/org/apache/commons/math3/analysis/solvers/MullerSolver2Test.java
index e852b753e..5ceb1bf3c 100644
--- a/src/test/java/org/apache/commons/math/analysis/solvers/MullerSolver2Test.java
+++ b/src/test/java/org/apache/commons/math3/analysis/solvers/MullerSolver2Test.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis.solvers;
+package org.apache.commons.math3.analysis.solvers;
 
-import org.apache.commons.math.analysis.Expm1Function;
-import org.apache.commons.math.analysis.QuinticFunction;
-import org.apache.commons.math.analysis.SinFunction;
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.exception.NumberIsTooLargeException;
-import org.apache.commons.math.exception.NoBracketingException;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.analysis.Expm1Function;
+import org.apache.commons.math3.analysis.QuinticFunction;
+import org.apache.commons.math3.analysis.SinFunction;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.exception.NumberIsTooLargeException;
+import org.apache.commons.math3.exception.NoBracketingException;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/analysis/solvers/MullerSolverTest.java b/src/test/java/org/apache/commons/math3/analysis/solvers/MullerSolverTest.java
similarity index 92%
rename from src/test/java/org/apache/commons/math/analysis/solvers/MullerSolverTest.java
rename to src/test/java/org/apache/commons/math3/analysis/solvers/MullerSolverTest.java
index ed534d8b1..ef00cbfbf 100644
--- a/src/test/java/org/apache/commons/math/analysis/solvers/MullerSolverTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/solvers/MullerSolverTest.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis.solvers;
+package org.apache.commons.math3.analysis.solvers;
 
-import org.apache.commons.math.analysis.Expm1Function;
-import org.apache.commons.math.analysis.QuinticFunction;
-import org.apache.commons.math.analysis.SinFunction;
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.exception.NumberIsTooLargeException;
-import org.apache.commons.math.exception.NoBracketingException;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.analysis.Expm1Function;
+import org.apache.commons.math3.analysis.QuinticFunction;
+import org.apache.commons.math3.analysis.SinFunction;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.exception.NumberIsTooLargeException;
+import org.apache.commons.math3.exception.NoBracketingException;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/analysis/solvers/NewtonSolverTest.java b/src/test/java/org/apache/commons/math3/analysis/solvers/NewtonSolverTest.java
similarity index 91%
rename from src/test/java/org/apache/commons/math/analysis/solvers/NewtonSolverTest.java
rename to src/test/java/org/apache/commons/math3/analysis/solvers/NewtonSolverTest.java
index 07ca85645..2cad83918 100644
--- a/src/test/java/org/apache/commons/math/analysis/solvers/NewtonSolverTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/solvers/NewtonSolverTest.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis.solvers;
+package org.apache.commons.math3.analysis.solvers;
 
-import org.apache.commons.math.analysis.DifferentiableUnivariateFunction;
-import org.apache.commons.math.analysis.QuinticFunction;
-import org.apache.commons.math.analysis.SinFunction;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.analysis.DifferentiableUnivariateFunction;
+import org.apache.commons.math3.analysis.QuinticFunction;
+import org.apache.commons.math3.analysis.SinFunction;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/analysis/solvers/PegasusSolverTest.java b/src/test/java/org/apache/commons/math3/analysis/solvers/PegasusSolverTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/analysis/solvers/PegasusSolverTest.java
rename to src/test/java/org/apache/commons/math3/analysis/solvers/PegasusSolverTest.java
index 7996b975e..ff6b0e372 100644
--- a/src/test/java/org/apache/commons/math/analysis/solvers/PegasusSolverTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/solvers/PegasusSolverTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.analysis.solvers;
+package org.apache.commons.math3.analysis.solvers;
 
 /**
  * Test case for {@link PegasusSolver Pegasus} solver.
diff --git a/src/test/java/org/apache/commons/math/analysis/solvers/RegulaFalsiSolverTest.java b/src/test/java/org/apache/commons/math3/analysis/solvers/RegulaFalsiSolverTest.java
similarity index 92%
rename from src/test/java/org/apache/commons/math/analysis/solvers/RegulaFalsiSolverTest.java
rename to src/test/java/org/apache/commons/math3/analysis/solvers/RegulaFalsiSolverTest.java
index 0302c72ad..f0d086395 100644
--- a/src/test/java/org/apache/commons/math/analysis/solvers/RegulaFalsiSolverTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/solvers/RegulaFalsiSolverTest.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.analysis.solvers;
+package org.apache.commons.math3.analysis.solvers;
 
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.exception.ConvergenceException;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.exception.ConvergenceException;
 import org.junit.Test;
 import org.junit.Assert;
 
diff --git a/src/test/java/org/apache/commons/math/analysis/solvers/RiddersSolverTest.java b/src/test/java/org/apache/commons/math3/analysis/solvers/RiddersSolverTest.java
similarity index 91%
rename from src/test/java/org/apache/commons/math/analysis/solvers/RiddersSolverTest.java
rename to src/test/java/org/apache/commons/math3/analysis/solvers/RiddersSolverTest.java
index 8de77e0b0..ff21d8596 100644
--- a/src/test/java/org/apache/commons/math/analysis/solvers/RiddersSolverTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/solvers/RiddersSolverTest.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.analysis.solvers;
+package org.apache.commons.math3.analysis.solvers;
 
-import org.apache.commons.math.analysis.Expm1Function;
-import org.apache.commons.math.analysis.QuinticFunction;
-import org.apache.commons.math.analysis.SinFunction;
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.exception.NoBracketingException;
-import org.apache.commons.math.exception.NumberIsTooLargeException;
+import org.apache.commons.math3.analysis.Expm1Function;
+import org.apache.commons.math3.analysis.QuinticFunction;
+import org.apache.commons.math3.analysis.SinFunction;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.exception.NoBracketingException;
+import org.apache.commons.math3.exception.NumberIsTooLargeException;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/analysis/solvers/SecantSolverTest.java b/src/test/java/org/apache/commons/math3/analysis/solvers/SecantSolverTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/analysis/solvers/SecantSolverTest.java
rename to src/test/java/org/apache/commons/math3/analysis/solvers/SecantSolverTest.java
index a7fa33da9..76fc2e0c4 100644
--- a/src/test/java/org/apache/commons/math/analysis/solvers/SecantSolverTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/solvers/SecantSolverTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.analysis.solvers;
+package org.apache.commons.math3.analysis.solvers;
 
 /**
  * Test case for {@link SecantSolver Secant} solver.
diff --git a/src/test/java/org/apache/commons/math/analysis/solvers/UnivariateSolverUtilsTest.java b/src/test/java/org/apache/commons/math3/analysis/solvers/UnivariateSolverUtilsTest.java
similarity index 93%
rename from src/test/java/org/apache/commons/math/analysis/solvers/UnivariateSolverUtilsTest.java
rename to src/test/java/org/apache/commons/math3/analysis/solvers/UnivariateSolverUtilsTest.java
index 594d08140..47d18cf54 100644
--- a/src/test/java/org/apache/commons/math/analysis/solvers/UnivariateSolverUtilsTest.java
+++ b/src/test/java/org/apache/commons/math3/analysis/solvers/UnivariateSolverUtilsTest.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.analysis.solvers;
+package org.apache.commons.math3.analysis.solvers;
 
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.analysis.SinFunction;
-import org.apache.commons.math.analysis.QuinticFunction;
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.analysis.SinFunction;
+import org.apache.commons.math3.analysis.QuinticFunction;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/complex/ComplexFieldTest.java b/src/test/java/org/apache/commons/math3/complex/ComplexFieldTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/math/complex/ComplexFieldTest.java
rename to src/test/java/org/apache/commons/math3/complex/ComplexFieldTest.java
index 0dda3e906..f2f4e5e64 100644
--- a/src/test/java/org/apache/commons/math/complex/ComplexFieldTest.java
+++ b/src/test/java/org/apache/commons/math3/complex/ComplexFieldTest.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.complex;
+package org.apache.commons.math3.complex;
 
-import org.apache.commons.math.TestUtils;
+import org.apache.commons.math3.TestUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/complex/ComplexFormatAbstractTest.java b/src/test/java/org/apache/commons/math3/complex/ComplexFormatAbstractTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/complex/ComplexFormatAbstractTest.java
rename to src/test/java/org/apache/commons/math3/complex/ComplexFormatAbstractTest.java
index b9e3b0ebe..a7ca4f891 100644
--- a/src/test/java/org/apache/commons/math/complex/ComplexFormatAbstractTest.java
+++ b/src/test/java/org/apache/commons/math3/complex/ComplexFormatAbstractTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.complex;
+package org.apache.commons.math3.complex;
 
 import java.text.NumberFormat;
 import java.text.ParsePosition;
@@ -24,7 +24,7 @@ import java.util.Locale;
 import org.junit.Test;
 import org.junit.Assert;
 
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.util.FastMath;
 
 public abstract class ComplexFormatAbstractTest {
 
diff --git a/src/test/java/org/apache/commons/math/complex/ComplexFormatTest.java b/src/test/java/org/apache/commons/math3/complex/ComplexFormatTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/complex/ComplexFormatTest.java
rename to src/test/java/org/apache/commons/math3/complex/ComplexFormatTest.java
index 5ae92995c..d1c3630fd 100644
--- a/src/test/java/org/apache/commons/math/complex/ComplexFormatTest.java
+++ b/src/test/java/org/apache/commons/math3/complex/ComplexFormatTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.complex;
+package org.apache.commons.math3.complex;
 
 import java.util.Locale;
 
diff --git a/src/test/java/org/apache/commons/math/complex/ComplexTest.java b/src/test/java/org/apache/commons/math3/complex/ComplexTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/complex/ComplexTest.java
rename to src/test/java/org/apache/commons/math3/complex/ComplexTest.java
index c31cb90f1..25c1a92a6 100644
--- a/src/test/java/org/apache/commons/math/complex/ComplexTest.java
+++ b/src/test/java/org/apache/commons/math3/complex/ComplexTest.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.complex;
+package org.apache.commons.math3.complex;
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/complex/ComplexUtilsTest.java b/src/test/java/org/apache/commons/math3/complex/ComplexUtilsTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/complex/ComplexUtilsTest.java
rename to src/test/java/org/apache/commons/math3/complex/ComplexUtilsTest.java
index 22bf9cdf1..af20d5585 100644
--- a/src/test/java/org/apache/commons/math/complex/ComplexUtilsTest.java
+++ b/src/test/java/org/apache/commons/math3/complex/ComplexUtilsTest.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.complex;
+package org.apache.commons.math3.complex;
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Test;
 
 
diff --git a/src/test/java/org/apache/commons/math/complex/FrenchComplexFormatTest.java b/src/test/java/org/apache/commons/math3/complex/FrenchComplexFormatTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/complex/FrenchComplexFormatTest.java
rename to src/test/java/org/apache/commons/math3/complex/FrenchComplexFormatTest.java
index 9fff723b4..2fbe831c4 100644
--- a/src/test/java/org/apache/commons/math/complex/FrenchComplexFormatTest.java
+++ b/src/test/java/org/apache/commons/math3/complex/FrenchComplexFormatTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.complex;
+package org.apache.commons.math3.complex;
 
 import java.util.Locale;
 
diff --git a/src/test/java/org/apache/commons/math/complex/RootsOfUnityTest.java b/src/test/java/org/apache/commons/math3/complex/RootsOfUnityTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/math/complex/RootsOfUnityTest.java
rename to src/test/java/org/apache/commons/math3/complex/RootsOfUnityTest.java
index d82364169..641150f9b 100644
--- a/src/test/java/org/apache/commons/math/complex/RootsOfUnityTest.java
+++ b/src/test/java/org/apache/commons/math3/complex/RootsOfUnityTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.complex;
+package org.apache.commons.math3.complex;
 
-import org.apache.commons.math.exception.MathIllegalStateException;
-import org.apache.commons.math.exception.ZeroException;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.exception.MathIllegalStateException;
+import org.apache.commons.math3.exception.ZeroException;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/dfp/BracketingNthOrderBrentSolverDFPTest.java b/src/test/java/org/apache/commons/math3/dfp/BracketingNthOrderBrentSolverDFPTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/dfp/BracketingNthOrderBrentSolverDFPTest.java
rename to src/test/java/org/apache/commons/math3/dfp/BracketingNthOrderBrentSolverDFPTest.java
index b1b70bc32..3ee4bc6d8 100644
--- a/src/test/java/org/apache/commons/math/dfp/BracketingNthOrderBrentSolverDFPTest.java
+++ b/src/test/java/org/apache/commons/math3/dfp/BracketingNthOrderBrentSolverDFPTest.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.dfp;
+package org.apache.commons.math3.dfp;
 
-import org.apache.commons.math.analysis.solvers.AllowedSolution;
-import org.apache.commons.math.exception.MathInternalError;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.analysis.solvers.AllowedSolution;
+import org.apache.commons.math3.exception.MathInternalError;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/dfp/Decimal10.java b/src/test/java/org/apache/commons/math3/dfp/Decimal10.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/dfp/Decimal10.java
rename to src/test/java/org/apache/commons/math3/dfp/Decimal10.java
index f86c05985..25576e205 100644
--- a/src/test/java/org/apache/commons/math/dfp/Decimal10.java
+++ b/src/test/java/org/apache/commons/math3/dfp/Decimal10.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.dfp;
+package org.apache.commons.math3.dfp;
 
 public class Decimal10 extends DfpDec {
 
diff --git a/src/test/java/org/apache/commons/math/dfp/DfpDecTest.java b/src/test/java/org/apache/commons/math3/dfp/DfpDecTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/dfp/DfpDecTest.java
rename to src/test/java/org/apache/commons/math3/dfp/DfpDecTest.java
index 0cf6b22b9..fc65fd776 100644
--- a/src/test/java/org/apache/commons/math/dfp/DfpDecTest.java
+++ b/src/test/java/org/apache/commons/math3/dfp/DfpDecTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.dfp;
+package org.apache.commons.math3.dfp;
 
 import org.junit.After;
 import org.junit.Assert;
diff --git a/src/test/java/org/apache/commons/math/dfp/DfpMathTest.java b/src/test/java/org/apache/commons/math3/dfp/DfpMathTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/dfp/DfpMathTest.java
rename to src/test/java/org/apache/commons/math3/dfp/DfpMathTest.java
index aba6fd5b5..832a808f5 100644
--- a/src/test/java/org/apache/commons/math/dfp/DfpMathTest.java
+++ b/src/test/java/org/apache/commons/math3/dfp/DfpMathTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.dfp;
+package org.apache.commons.math3.dfp;
 
 import org.junit.After;
 import org.junit.Assert;
diff --git a/src/test/java/org/apache/commons/math/dfp/DfpTest.java b/src/test/java/org/apache/commons/math3/dfp/DfpTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/dfp/DfpTest.java
rename to src/test/java/org/apache/commons/math3/dfp/DfpTest.java
index e3e6767b2..f7549764f 100644
--- a/src/test/java/org/apache/commons/math/dfp/DfpTest.java
+++ b/src/test/java/org/apache/commons/math3/dfp/DfpTest.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.dfp;
+package org.apache.commons.math3.dfp;
 
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.util.Precision;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.util.Precision;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/src/test/java/org/apache/commons/math/distribution/AbstractRealDistributionTest.java b/src/test/java/org/apache/commons/math3/distribution/AbstractRealDistributionTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/math/distribution/AbstractRealDistributionTest.java
rename to src/test/java/org/apache/commons/math3/distribution/AbstractRealDistributionTest.java
index a1b65659f..311b27530 100644
--- a/src/test/java/org/apache/commons/math/distribution/AbstractRealDistributionTest.java
+++ b/src/test/java/org/apache/commons/math3/distribution/AbstractRealDistributionTest.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.distribution;
+package org.apache.commons.math3.distribution;
 
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.analysis.integration.RombergIntegrator;
-import org.apache.commons.math.analysis.integration.UnivariateIntegrator;
-import org.apache.commons.math.exception.OutOfRangeException;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.analysis.integration.RombergIntegrator;
+import org.apache.commons.math3.analysis.integration.UnivariateIntegrator;
+import org.apache.commons.math3.exception.OutOfRangeException;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/distribution/AbtractIntegerDistributionTest.java b/src/test/java/org/apache/commons/math3/distribution/AbtractIntegerDistributionTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/distribution/AbtractIntegerDistributionTest.java
rename to src/test/java/org/apache/commons/math3/distribution/AbtractIntegerDistributionTest.java
index 615f405ed..cf00f332e 100644
--- a/src/test/java/org/apache/commons/math/distribution/AbtractIntegerDistributionTest.java
+++ b/src/test/java/org/apache/commons/math3/distribution/AbtractIntegerDistributionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.distribution;
+package org.apache.commons.math3.distribution;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/distribution/BetaDistributionTest.java b/src/test/java/org/apache/commons/math3/distribution/BetaDistributionTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/distribution/BetaDistributionTest.java
rename to src/test/java/org/apache/commons/math3/distribution/BetaDistributionTest.java
index 2db1dbc4a..9f3cdcf9e 100644
--- a/src/test/java/org/apache/commons/math/distribution/BetaDistributionTest.java
+++ b/src/test/java/org/apache/commons/math3/distribution/BetaDistributionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.distribution;
+package org.apache.commons.math3.distribution;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/distribution/BinomialDistributionTest.java b/src/test/java/org/apache/commons/math3/distribution/BinomialDistributionTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/distribution/BinomialDistributionTest.java
rename to src/test/java/org/apache/commons/math3/distribution/BinomialDistributionTest.java
index 65cdc3f04..188efd13a 100644
--- a/src/test/java/org/apache/commons/math/distribution/BinomialDistributionTest.java
+++ b/src/test/java/org/apache/commons/math3/distribution/BinomialDistributionTest.java
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.apache.commons.math.distribution;
+package org.apache.commons.math3.distribution;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/distribution/CauchyDistributionTest.java b/src/test/java/org/apache/commons/math3/distribution/CauchyDistributionTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/distribution/CauchyDistributionTest.java
rename to src/test/java/org/apache/commons/math3/distribution/CauchyDistributionTest.java
index 672d407cb..dbde6ae90 100644
--- a/src/test/java/org/apache/commons/math/distribution/CauchyDistributionTest.java
+++ b/src/test/java/org/apache/commons/math3/distribution/CauchyDistributionTest.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.distribution;
+package org.apache.commons.math3.distribution;
 
-import org.apache.commons.math.exception.NotStrictlyPositiveException;
+import org.apache.commons.math3.exception.NotStrictlyPositiveException;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/distribution/ChiSquaredDistributionTest.java b/src/test/java/org/apache/commons/math3/distribution/ChiSquaredDistributionTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/distribution/ChiSquaredDistributionTest.java
rename to src/test/java/org/apache/commons/math3/distribution/ChiSquaredDistributionTest.java
index 0e0f8d58d..ea887ea5e 100644
--- a/src/test/java/org/apache/commons/math/distribution/ChiSquaredDistributionTest.java
+++ b/src/test/java/org/apache/commons/math3/distribution/ChiSquaredDistributionTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.distribution;
+package org.apache.commons.math3.distribution;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/distribution/ExponentialDistributionTest.java b/src/test/java/org/apache/commons/math3/distribution/ExponentialDistributionTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/distribution/ExponentialDistributionTest.java
rename to src/test/java/org/apache/commons/math3/distribution/ExponentialDistributionTest.java
index 10dec4dc3..c863242ae 100644
--- a/src/test/java/org/apache/commons/math/distribution/ExponentialDistributionTest.java
+++ b/src/test/java/org/apache/commons/math3/distribution/ExponentialDistributionTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.distribution;
+package org.apache.commons.math3.distribution;
 
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.util.Precision;
-import org.apache.commons.math.exception.NotStrictlyPositiveException;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.util.Precision;
+import org.apache.commons.math3.exception.NotStrictlyPositiveException;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/distribution/FDistributionTest.java b/src/test/java/org/apache/commons/math3/distribution/FDistributionTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/distribution/FDistributionTest.java
rename to src/test/java/org/apache/commons/math3/distribution/FDistributionTest.java
index 56cedaccd..ce7350248 100644
--- a/src/test/java/org/apache/commons/math/distribution/FDistributionTest.java
+++ b/src/test/java/org/apache/commons/math3/distribution/FDistributionTest.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.distribution;
+package org.apache.commons.math3.distribution;
 
-import org.apache.commons.math.exception.NotStrictlyPositiveException;
+import org.apache.commons.math3.exception.NotStrictlyPositiveException;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/distribution/GammaDistributionTest.java b/src/test/java/org/apache/commons/math3/distribution/GammaDistributionTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/distribution/GammaDistributionTest.java
rename to src/test/java/org/apache/commons/math3/distribution/GammaDistributionTest.java
index f9ceb970c..6b5c8fdfa 100644
--- a/src/test/java/org/apache/commons/math/distribution/GammaDistributionTest.java
+++ b/src/test/java/org/apache/commons/math3/distribution/GammaDistributionTest.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.distribution;
+package org.apache.commons.math3.distribution;
 
-import org.apache.commons.math.exception.NotStrictlyPositiveException;
+import org.apache.commons.math3.exception.NotStrictlyPositiveException;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/distribution/HypergeometricDistributionTest.java b/src/test/java/org/apache/commons/math3/distribution/HypergeometricDistributionTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/distribution/HypergeometricDistributionTest.java
rename to src/test/java/org/apache/commons/math3/distribution/HypergeometricDistributionTest.java
index 97dfa6730..b6dca362e 100644
--- a/src/test/java/org/apache/commons/math/distribution/HypergeometricDistributionTest.java
+++ b/src/test/java/org/apache/commons/math3/distribution/HypergeometricDistributionTest.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.distribution;
+package org.apache.commons.math3.distribution;
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.exception.NotPositiveException;
-import org.apache.commons.math.exception.NotStrictlyPositiveException;
-import org.apache.commons.math.exception.NumberIsTooLargeException;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.exception.NotPositiveException;
+import org.apache.commons.math3.exception.NotStrictlyPositiveException;
+import org.apache.commons.math3.exception.NumberIsTooLargeException;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/distribution/IntegerDistributionAbstractTest.java b/src/test/java/org/apache/commons/math3/distribution/IntegerDistributionAbstractTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/distribution/IntegerDistributionAbstractTest.java
rename to src/test/java/org/apache/commons/math3/distribution/IntegerDistributionAbstractTest.java
index d8216122c..fcfa3a4cc 100644
--- a/src/test/java/org/apache/commons/math/distribution/IntegerDistributionAbstractTest.java
+++ b/src/test/java/org/apache/commons/math3/distribution/IntegerDistributionAbstractTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.distribution;
+package org.apache.commons.math3.distribution;
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/src/test/java/org/apache/commons/math/distribution/KolmogorovSmirnovDistributionTest.java b/src/test/java/org/apache/commons/math3/distribution/KolmogorovSmirnovDistributionTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/distribution/KolmogorovSmirnovDistributionTest.java
rename to src/test/java/org/apache/commons/math3/distribution/KolmogorovSmirnovDistributionTest.java
index c64a2902a..5a28da8db 100644
--- a/src/test/java/org/apache/commons/math/distribution/KolmogorovSmirnovDistributionTest.java
+++ b/src/test/java/org/apache/commons/math3/distribution/KolmogorovSmirnovDistributionTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.distribution;
+package org.apache.commons.math3.distribution;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/distribution/LogNormalDistributionTest.java b/src/test/java/org/apache/commons/math3/distribution/LogNormalDistributionTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/distribution/LogNormalDistributionTest.java
rename to src/test/java/org/apache/commons/math3/distribution/LogNormalDistributionTest.java
index c9a78d0d9..328027d4d 100644
--- a/src/test/java/org/apache/commons/math/distribution/LogNormalDistributionTest.java
+++ b/src/test/java/org/apache/commons/math3/distribution/LogNormalDistributionTest.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.distribution;
+package org.apache.commons.math3.distribution;
 
-import org.apache.commons.math.exception.NotStrictlyPositiveException;
+import org.apache.commons.math3.exception.NotStrictlyPositiveException;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/distribution/NormalDistributionTest.java b/src/test/java/org/apache/commons/math3/distribution/NormalDistributionTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/distribution/NormalDistributionTest.java
rename to src/test/java/org/apache/commons/math3/distribution/NormalDistributionTest.java
index 99e3a88db..7d44987b6 100644
--- a/src/test/java/org/apache/commons/math/distribution/NormalDistributionTest.java
+++ b/src/test/java/org/apache/commons/math3/distribution/NormalDistributionTest.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.distribution;
+package org.apache.commons.math3.distribution;
 
-import org.apache.commons.math.exception.NotStrictlyPositiveException;
+import org.apache.commons.math3.exception.NotStrictlyPositiveException;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/distribution/PascalDistributionTest.java b/src/test/java/org/apache/commons/math3/distribution/PascalDistributionTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/distribution/PascalDistributionTest.java
rename to src/test/java/org/apache/commons/math3/distribution/PascalDistributionTest.java
index 691f7e9b1..a5d2d7c47 100644
--- a/src/test/java/org/apache/commons/math/distribution/PascalDistributionTest.java
+++ b/src/test/java/org/apache/commons/math3/distribution/PascalDistributionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.distribution;
+package org.apache.commons.math3.distribution;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/distribution/PoissonDistributionTest.java b/src/test/java/org/apache/commons/math3/distribution/PoissonDistributionTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/distribution/PoissonDistributionTest.java
rename to src/test/java/org/apache/commons/math3/distribution/PoissonDistributionTest.java
index c57ae7ba3..3fbdd1f62 100644
--- a/src/test/java/org/apache/commons/math/distribution/PoissonDistributionTest.java
+++ b/src/test/java/org/apache/commons/math3/distribution/PoissonDistributionTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.distribution;
+package org.apache.commons.math3.distribution;
 
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.exception.NotStrictlyPositiveException;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.exception.NotStrictlyPositiveException;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/distribution/RealDistributionAbstractTest.java b/src/test/java/org/apache/commons/math3/distribution/RealDistributionAbstractTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/distribution/RealDistributionAbstractTest.java
rename to src/test/java/org/apache/commons/math3/distribution/RealDistributionAbstractTest.java
index 160dbbfb4..033e283a9 100644
--- a/src/test/java/org/apache/commons/math/distribution/RealDistributionAbstractTest.java
+++ b/src/test/java/org/apache/commons/math3/distribution/RealDistributionAbstractTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.distribution;
+package org.apache.commons.math3.distribution;
 
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.NumberIsTooLargeException;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.NumberIsTooLargeException;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/src/test/java/org/apache/commons/math/distribution/TDistributionTest.java b/src/test/java/org/apache/commons/math3/distribution/TDistributionTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/distribution/TDistributionTest.java
rename to src/test/java/org/apache/commons/math3/distribution/TDistributionTest.java
index 82866e253..681847b08 100644
--- a/src/test/java/org/apache/commons/math/distribution/TDistributionTest.java
+++ b/src/test/java/org/apache/commons/math3/distribution/TDistributionTest.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.distribution;
+package org.apache.commons.math3.distribution;
 
-import org.apache.commons.math.exception.NotStrictlyPositiveException;
+import org.apache.commons.math3.exception.NotStrictlyPositiveException;
 import org.junit.Assert;
 import org.junit.Test;
-import org.apache.commons.math.TestUtils;
+import org.apache.commons.math3.TestUtils;
 /**
  * Test cases for TDistribution.
  * Extends ContinuousDistributionAbstractTest.  See class javadoc for
diff --git a/src/test/java/org/apache/commons/math/distribution/TriangularDistributionTest.java b/src/test/java/org/apache/commons/math3/distribution/TriangularDistributionTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/distribution/TriangularDistributionTest.java
rename to src/test/java/org/apache/commons/math3/distribution/TriangularDistributionTest.java
index 6b5028deb..40aa95a68 100644
--- a/src/test/java/org/apache/commons/math/distribution/TriangularDistributionTest.java
+++ b/src/test/java/org/apache/commons/math3/distribution/TriangularDistributionTest.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.distribution;
+package org.apache.commons.math3.distribution;
 
-import org.apache.commons.math.exception.NumberIsTooLargeException;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.exception.NumberIsTooLargeException;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/distribution/UniformIntegerDistributionTest.java b/src/test/java/org/apache/commons/math3/distribution/UniformIntegerDistributionTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/distribution/UniformIntegerDistributionTest.java
rename to src/test/java/org/apache/commons/math3/distribution/UniformIntegerDistributionTest.java
index a828df918..100832f7a 100644
--- a/src/test/java/org/apache/commons/math/distribution/UniformIntegerDistributionTest.java
+++ b/src/test/java/org/apache/commons/math3/distribution/UniformIntegerDistributionTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.distribution;
+package org.apache.commons.math3.distribution;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/distribution/UniformRealDistributionTest.java b/src/test/java/org/apache/commons/math3/distribution/UniformRealDistributionTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/distribution/UniformRealDistributionTest.java
rename to src/test/java/org/apache/commons/math3/distribution/UniformRealDistributionTest.java
index 821e05c18..72dff4899 100644
--- a/src/test/java/org/apache/commons/math/distribution/UniformRealDistributionTest.java
+++ b/src/test/java/org/apache/commons/math3/distribution/UniformRealDistributionTest.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.distribution;
+package org.apache.commons.math3.distribution;
 
-import org.apache.commons.math.exception.NumberIsTooLargeException;
+import org.apache.commons.math3.exception.NumberIsTooLargeException;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/distribution/WeibullDistributionTest.java b/src/test/java/org/apache/commons/math3/distribution/WeibullDistributionTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/math/distribution/WeibullDistributionTest.java
rename to src/test/java/org/apache/commons/math3/distribution/WeibullDistributionTest.java
index fbd780686..23a44c40c 100644
--- a/src/test/java/org/apache/commons/math/distribution/WeibullDistributionTest.java
+++ b/src/test/java/org/apache/commons/math3/distribution/WeibullDistributionTest.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.distribution;
+package org.apache.commons.math3.distribution;
 
-import org.apache.commons.math.special.Gamma;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.exception.NotStrictlyPositiveException;
+import org.apache.commons.math3.special.Gamma;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.exception.NotStrictlyPositiveException;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/distribution/ZipfDistributionTest.java b/src/test/java/org/apache/commons/math3/distribution/ZipfDistributionTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/math/distribution/ZipfDistributionTest.java
rename to src/test/java/org/apache/commons/math3/distribution/ZipfDistributionTest.java
index 07e22e1ed..43ee46f4e 100644
--- a/src/test/java/org/apache/commons/math/distribution/ZipfDistributionTest.java
+++ b/src/test/java/org/apache/commons/math3/distribution/ZipfDistributionTest.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.distribution;
+package org.apache.commons.math3.distribution;
 
-import org.apache.commons.math.exception.NotStrictlyPositiveException;
+import org.apache.commons.math3.exception.NotStrictlyPositiveException;
 
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/exception/DimensionMismatchExceptionTest.java b/src/test/java/org/apache/commons/math3/exception/DimensionMismatchExceptionTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/exception/DimensionMismatchExceptionTest.java
rename to src/test/java/org/apache/commons/math3/exception/DimensionMismatchExceptionTest.java
index a1a6ddb68..89e40fa6e 100644
--- a/src/test/java/org/apache/commons/math/exception/DimensionMismatchExceptionTest.java
+++ b/src/test/java/org/apache/commons/math3/exception/DimensionMismatchExceptionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.exception;
+package org.apache.commons.math3.exception;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/exception/MaxCountExceededExceptionTest.java b/src/test/java/org/apache/commons/math3/exception/MaxCountExceededExceptionTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/exception/MaxCountExceededExceptionTest.java
rename to src/test/java/org/apache/commons/math3/exception/MaxCountExceededExceptionTest.java
index 003b1f0c9..db724b4e2 100644
--- a/src/test/java/org/apache/commons/math/exception/MaxCountExceededExceptionTest.java
+++ b/src/test/java/org/apache/commons/math3/exception/MaxCountExceededExceptionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.exception;
+package org.apache.commons.math3.exception;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/exception/NonMonotonicSequenceExceptionTest.java b/src/test/java/org/apache/commons/math3/exception/NonMonotonicSequenceExceptionTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/math/exception/NonMonotonicSequenceExceptionTest.java
rename to src/test/java/org/apache/commons/math3/exception/NonMonotonicSequenceExceptionTest.java
index ff27a8207..da928b602 100644
--- a/src/test/java/org/apache/commons/math/exception/NonMonotonicSequenceExceptionTest.java
+++ b/src/test/java/org/apache/commons/math3/exception/NonMonotonicSequenceExceptionTest.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.exception;
+package org.apache.commons.math3.exception;
 
-import org.apache.commons.math.util.MathArrays;
+import org.apache.commons.math3.util.MathArrays;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/exception/NotPositiveExceptionTest.java b/src/test/java/org/apache/commons/math3/exception/NotPositiveExceptionTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/exception/NotPositiveExceptionTest.java
rename to src/test/java/org/apache/commons/math3/exception/NotPositiveExceptionTest.java
index 78b20e416..2a531e26a 100644
--- a/src/test/java/org/apache/commons/math/exception/NotPositiveExceptionTest.java
+++ b/src/test/java/org/apache/commons/math3/exception/NotPositiveExceptionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.exception;
+package org.apache.commons.math3.exception;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/exception/NotStrictlyPositiveExceptionTest.java b/src/test/java/org/apache/commons/math3/exception/NotStrictlyPositiveExceptionTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/exception/NotStrictlyPositiveExceptionTest.java
rename to src/test/java/org/apache/commons/math3/exception/NotStrictlyPositiveExceptionTest.java
index 82c997123..3a2c1ff63 100644
--- a/src/test/java/org/apache/commons/math/exception/NotStrictlyPositiveExceptionTest.java
+++ b/src/test/java/org/apache/commons/math3/exception/NotStrictlyPositiveExceptionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.exception;
+package org.apache.commons.math3.exception;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/exception/NumberIsTooLargeExceptionTest.java b/src/test/java/org/apache/commons/math3/exception/NumberIsTooLargeExceptionTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/exception/NumberIsTooLargeExceptionTest.java
rename to src/test/java/org/apache/commons/math3/exception/NumberIsTooLargeExceptionTest.java
index d69ca1e47..cc0ab8d04 100644
--- a/src/test/java/org/apache/commons/math/exception/NumberIsTooLargeExceptionTest.java
+++ b/src/test/java/org/apache/commons/math3/exception/NumberIsTooLargeExceptionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.exception;
+package org.apache.commons.math3.exception;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/exception/NumberIsTooSmallExceptionTest.java b/src/test/java/org/apache/commons/math3/exception/NumberIsTooSmallExceptionTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/exception/NumberIsTooSmallExceptionTest.java
rename to src/test/java/org/apache/commons/math3/exception/NumberIsTooSmallExceptionTest.java
index 8202f5d71..1caceb641 100644
--- a/src/test/java/org/apache/commons/math/exception/NumberIsTooSmallExceptionTest.java
+++ b/src/test/java/org/apache/commons/math3/exception/NumberIsTooSmallExceptionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.exception;
+package org.apache.commons.math3.exception;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/exception/OutOfRangeExceptionTest.java b/src/test/java/org/apache/commons/math3/exception/OutOfRangeExceptionTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/exception/OutOfRangeExceptionTest.java
rename to src/test/java/org/apache/commons/math3/exception/OutOfRangeExceptionTest.java
index 40216ace1..e739c1825 100644
--- a/src/test/java/org/apache/commons/math/exception/OutOfRangeExceptionTest.java
+++ b/src/test/java/org/apache/commons/math3/exception/OutOfRangeExceptionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.exception;
+package org.apache.commons.math3.exception;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/exception/TooManyEvaluationsExceptionTest.java b/src/test/java/org/apache/commons/math3/exception/TooManyEvaluationsExceptionTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/exception/TooManyEvaluationsExceptionTest.java
rename to src/test/java/org/apache/commons/math3/exception/TooManyEvaluationsExceptionTest.java
index fc1f268d5..68917ee86 100644
--- a/src/test/java/org/apache/commons/math/exception/TooManyEvaluationsExceptionTest.java
+++ b/src/test/java/org/apache/commons/math3/exception/TooManyEvaluationsExceptionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.exception;
+package org.apache.commons.math3.exception;
 
 import java.text.MessageFormat;
 
diff --git a/src/test/java/org/apache/commons/math/exception/util/ArgUtilsTest.java b/src/test/java/org/apache/commons/math3/exception/util/ArgUtilsTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/exception/util/ArgUtilsTest.java
rename to src/test/java/org/apache/commons/math3/exception/util/ArgUtilsTest.java
index e6fd73a7d..804124bd9 100644
--- a/src/test/java/org/apache/commons/math/exception/util/ArgUtilsTest.java
+++ b/src/test/java/org/apache/commons/math3/exception/util/ArgUtilsTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.exception.util;
+package org.apache.commons.math3.exception.util;
 
 import java.util.List;
 import java.util.ArrayList;
diff --git a/src/test/java/org/apache/commons/math/exception/util/ExceptionContextTest.java b/src/test/java/org/apache/commons/math3/exception/util/ExceptionContextTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/exception/util/ExceptionContextTest.java
rename to src/test/java/org/apache/commons/math3/exception/util/ExceptionContextTest.java
index 8129d269f..94156b15d 100644
--- a/src/test/java/org/apache/commons/math/exception/util/ExceptionContextTest.java
+++ b/src/test/java/org/apache/commons/math3/exception/util/ExceptionContextTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.exception.util;
+package org.apache.commons.math3.exception.util;
 
 import java.util.Locale;
 import java.util.Arrays;
diff --git a/src/test/java/org/apache/commons/math/filter/KalmanFilterTest.java b/src/test/java/org/apache/commons/math3/filter/KalmanFilterTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/math/filter/KalmanFilterTest.java
rename to src/test/java/org/apache/commons/math3/filter/KalmanFilterTest.java
index a47372438..96dd688e3 100644
--- a/src/test/java/org/apache/commons/math/filter/KalmanFilterTest.java
+++ b/src/test/java/org/apache/commons/math3/filter/KalmanFilterTest.java
@@ -12,16 +12,16 @@
  * governing permissions and limitations under the License.
  */
 
-package org.apache.commons.math.filter;
+package org.apache.commons.math3.filter;
 
-import org.apache.commons.math.linear.Array2DRowRealMatrix;
-import org.apache.commons.math.linear.ArrayRealVector;
-import org.apache.commons.math.linear.MatrixDimensionMismatchException;
-import org.apache.commons.math.linear.RealMatrix;
-import org.apache.commons.math.linear.RealVector;
-import org.apache.commons.math.random.JDKRandomGenerator;
-import org.apache.commons.math.random.RandomGenerator;
-import org.apache.commons.math.util.Precision;
+import org.apache.commons.math3.linear.Array2DRowRealMatrix;
+import org.apache.commons.math3.linear.ArrayRealVector;
+import org.apache.commons.math3.linear.MatrixDimensionMismatchException;
+import org.apache.commons.math3.linear.RealMatrix;
+import org.apache.commons.math3.linear.RealVector;
+import org.apache.commons.math3.random.JDKRandomGenerator;
+import org.apache.commons.math3.random.RandomGenerator;
+import org.apache.commons.math3.util.Precision;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/fraction/BigFractionFieldTest.java b/src/test/java/org/apache/commons/math3/fraction/BigFractionFieldTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/math/fraction/BigFractionFieldTest.java
rename to src/test/java/org/apache/commons/math3/fraction/BigFractionFieldTest.java
index 823b82719..7e7b534f1 100644
--- a/src/test/java/org/apache/commons/math/fraction/BigFractionFieldTest.java
+++ b/src/test/java/org/apache/commons/math3/fraction/BigFractionFieldTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.fraction;
+package org.apache.commons.math3.fraction;
 
 
-import org.apache.commons.math.TestUtils;
+import org.apache.commons.math3.TestUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/fraction/BigFractionFormatTest.java b/src/test/java/org/apache/commons/math3/fraction/BigFractionFormatTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/fraction/BigFractionFormatTest.java
rename to src/test/java/org/apache/commons/math3/fraction/BigFractionFormatTest.java
index 725ed57cc..5418aa0cc 100644
--- a/src/test/java/org/apache/commons/math/fraction/BigFractionFormatTest.java
+++ b/src/test/java/org/apache/commons/math3/fraction/BigFractionFormatTest.java
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.fraction;
+package org.apache.commons.math3.fraction;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.text.NumberFormat;
 import java.util.Locale;
 
-import org.apache.commons.math.exception.MathParseException;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.exception.MathParseException;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/fraction/BigFractionTest.java b/src/test/java/org/apache/commons/math3/fraction/BigFractionTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/fraction/BigFractionTest.java
rename to src/test/java/org/apache/commons/math3/fraction/BigFractionTest.java
index f2fbe0d2a..6e10f791f 100644
--- a/src/test/java/org/apache/commons/math/fraction/BigFractionTest.java
+++ b/src/test/java/org/apache/commons/math3/fraction/BigFractionTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.fraction;
+package org.apache.commons.math3.fraction;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.exception.ConvergenceException;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.ZeroException;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.exception.ConvergenceException;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.ZeroException;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/fraction/FractionFieldTest.java b/src/test/java/org/apache/commons/math3/fraction/FractionFieldTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/math/fraction/FractionFieldTest.java
rename to src/test/java/org/apache/commons/math3/fraction/FractionFieldTest.java
index 2c5ac6d44..200bf6883 100644
--- a/src/test/java/org/apache/commons/math/fraction/FractionFieldTest.java
+++ b/src/test/java/org/apache/commons/math3/fraction/FractionFieldTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.fraction;
+package org.apache.commons.math3.fraction;
 
 
-import org.apache.commons.math.TestUtils;
+import org.apache.commons.math3.TestUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/fraction/FractionFormatTest.java b/src/test/java/org/apache/commons/math3/fraction/FractionFormatTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/fraction/FractionFormatTest.java
rename to src/test/java/org/apache/commons/math3/fraction/FractionFormatTest.java
index a9700c728..cdd0c93c0 100644
--- a/src/test/java/org/apache/commons/math/fraction/FractionFormatTest.java
+++ b/src/test/java/org/apache/commons/math3/fraction/FractionFormatTest.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.fraction;
+package org.apache.commons.math3.fraction;
 
 import java.text.NumberFormat;
 import java.util.Locale;
 
-import org.apache.commons.math.exception.MathParseException;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.exception.MathParseException;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/fraction/FractionTest.java b/src/test/java/org/apache/commons/math3/fraction/FractionTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/fraction/FractionTest.java
rename to src/test/java/org/apache/commons/math3/fraction/FractionTest.java
index f6413ba7c..17811121a 100644
--- a/src/test/java/org/apache/commons/math/fraction/FractionTest.java
+++ b/src/test/java/org/apache/commons/math3/fraction/FractionTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.fraction;
+package org.apache.commons.math3.fraction;
 
-import org.apache.commons.math.exception.ConvergenceException;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.MathArithmeticException;
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.exception.ConvergenceException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.MathArithmeticException;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/genetics/BinaryChromosomeTest.java b/src/test/java/org/apache/commons/math3/genetics/BinaryChromosomeTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/genetics/BinaryChromosomeTest.java
rename to src/test/java/org/apache/commons/math3/genetics/BinaryChromosomeTest.java
index 9c8b15d40..63c04c3d4 100644
--- a/src/test/java/org/apache/commons/math/genetics/BinaryChromosomeTest.java
+++ b/src/test/java/org/apache/commons/math3/genetics/BinaryChromosomeTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.genetics;
+package org.apache.commons.math3.genetics;
 
 
 import org.junit.Assert;
diff --git a/src/test/java/org/apache/commons/math/genetics/BinaryMutationTest.java b/src/test/java/org/apache/commons/math3/genetics/BinaryMutationTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/genetics/BinaryMutationTest.java
rename to src/test/java/org/apache/commons/math3/genetics/BinaryMutationTest.java
index fc81ef777..95327fe83 100644
--- a/src/test/java/org/apache/commons/math/genetics/BinaryMutationTest.java
+++ b/src/test/java/org/apache/commons/math3/genetics/BinaryMutationTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.genetics;
+package org.apache.commons.math3.genetics;
 
 
 import org.junit.Assert;
diff --git a/src/test/java/org/apache/commons/math/genetics/ChromosomeTest.java b/src/test/java/org/apache/commons/math3/genetics/ChromosomeTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/genetics/ChromosomeTest.java
rename to src/test/java/org/apache/commons/math3/genetics/ChromosomeTest.java
index bfbc6b565..0d08812f4 100644
--- a/src/test/java/org/apache/commons/math/genetics/ChromosomeTest.java
+++ b/src/test/java/org/apache/commons/math3/genetics/ChromosomeTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.genetics;
+package org.apache.commons.math3.genetics;
 
 
 import java.util.ArrayList;
diff --git a/src/test/java/org/apache/commons/math/genetics/DummyBinaryChromosome.java b/src/test/java/org/apache/commons/math3/genetics/DummyBinaryChromosome.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/genetics/DummyBinaryChromosome.java
rename to src/test/java/org/apache/commons/math3/genetics/DummyBinaryChromosome.java
index f76cc57ce..e1a4a9196 100644
--- a/src/test/java/org/apache/commons/math/genetics/DummyBinaryChromosome.java
+++ b/src/test/java/org/apache/commons/math3/genetics/DummyBinaryChromosome.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.genetics;
+package org.apache.commons.math3.genetics;
 
 import java.util.List;
 
diff --git a/src/test/java/org/apache/commons/math/genetics/DummyRandomKey.java b/src/test/java/org/apache/commons/math3/genetics/DummyRandomKey.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/genetics/DummyRandomKey.java
rename to src/test/java/org/apache/commons/math3/genetics/DummyRandomKey.java
index 4e688aabe..4d671b495 100644
--- a/src/test/java/org/apache/commons/math/genetics/DummyRandomKey.java
+++ b/src/test/java/org/apache/commons/math3/genetics/DummyRandomKey.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.genetics;
+package org.apache.commons.math3.genetics;
 
 import java.util.List;
 
diff --git a/src/test/java/org/apache/commons/math/genetics/ElitisticListPopulationTest.java b/src/test/java/org/apache/commons/math3/genetics/ElitisticListPopulationTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/genetics/ElitisticListPopulationTest.java
rename to src/test/java/org/apache/commons/math3/genetics/ElitisticListPopulationTest.java
index 476787c4d..f2d18719b 100644
--- a/src/test/java/org/apache/commons/math/genetics/ElitisticListPopulationTest.java
+++ b/src/test/java/org/apache/commons/math3/genetics/ElitisticListPopulationTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.genetics;
+package org.apache.commons.math3.genetics;
 
 
 import org.junit.Assert;
diff --git a/src/test/java/org/apache/commons/math/genetics/FitnessCachingTest.java b/src/test/java/org/apache/commons/math3/genetics/FitnessCachingTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/genetics/FitnessCachingTest.java
rename to src/test/java/org/apache/commons/math3/genetics/FitnessCachingTest.java
index 8b1a1ad56..1b878f5f1 100644
--- a/src/test/java/org/apache/commons/math/genetics/FitnessCachingTest.java
+++ b/src/test/java/org/apache/commons/math3/genetics/FitnessCachingTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.genetics;
+package org.apache.commons.math3.genetics;
 
 
 import java.util.LinkedList;
diff --git a/src/test/java/org/apache/commons/math/genetics/FixedGenerationCountTest.java b/src/test/java/org/apache/commons/math3/genetics/FixedGenerationCountTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/genetics/FixedGenerationCountTest.java
rename to src/test/java/org/apache/commons/math3/genetics/FixedGenerationCountTest.java
index c693bfdd4..37e03fa1c 100644
--- a/src/test/java/org/apache/commons/math/genetics/FixedGenerationCountTest.java
+++ b/src/test/java/org/apache/commons/math3/genetics/FixedGenerationCountTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.genetics;
+package org.apache.commons.math3.genetics;
 
 
 import java.util.Iterator;
diff --git a/src/test/java/org/apache/commons/math/genetics/GeneticAlgorithmTestBinary.java b/src/test/java/org/apache/commons/math3/genetics/GeneticAlgorithmTestBinary.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/genetics/GeneticAlgorithmTestBinary.java
rename to src/test/java/org/apache/commons/math3/genetics/GeneticAlgorithmTestBinary.java
index 85b9ee1f7..8b9168578 100644
--- a/src/test/java/org/apache/commons/math/genetics/GeneticAlgorithmTestBinary.java
+++ b/src/test/java/org/apache/commons/math3/genetics/GeneticAlgorithmTestBinary.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.genetics;
+package org.apache.commons.math3.genetics;
 
 
 import java.util.LinkedList;
diff --git a/src/test/java/org/apache/commons/math/genetics/GeneticAlgorithmTestPermutations.java b/src/test/java/org/apache/commons/math3/genetics/GeneticAlgorithmTestPermutations.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/genetics/GeneticAlgorithmTestPermutations.java
rename to src/test/java/org/apache/commons/math3/genetics/GeneticAlgorithmTestPermutations.java
index 9351636d2..228eb6928 100644
--- a/src/test/java/org/apache/commons/math/genetics/GeneticAlgorithmTestPermutations.java
+++ b/src/test/java/org/apache/commons/math3/genetics/GeneticAlgorithmTestPermutations.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.genetics;
+package org.apache.commons.math3.genetics;
 
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/genetics/ListPopulationTest.java b/src/test/java/org/apache/commons/math3/genetics/ListPopulationTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/genetics/ListPopulationTest.java
rename to src/test/java/org/apache/commons/math3/genetics/ListPopulationTest.java
index 8876535d3..e9ad72439 100644
--- a/src/test/java/org/apache/commons/math/genetics/ListPopulationTest.java
+++ b/src/test/java/org/apache/commons/math3/genetics/ListPopulationTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.genetics;
+package org.apache.commons.math3.genetics;
 
 
 import java.util.ArrayList;
diff --git a/src/test/java/org/apache/commons/math/genetics/OnePointCrossoverTest.java b/src/test/java/org/apache/commons/math3/genetics/OnePointCrossoverTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/genetics/OnePointCrossoverTest.java
rename to src/test/java/org/apache/commons/math3/genetics/OnePointCrossoverTest.java
index 4986c2fcb..c0a34d2f6 100644
--- a/src/test/java/org/apache/commons/math/genetics/OnePointCrossoverTest.java
+++ b/src/test/java/org/apache/commons/math3/genetics/OnePointCrossoverTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.genetics;
+package org.apache.commons.math3.genetics;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/genetics/RandomKeyMutationTest.java b/src/test/java/org/apache/commons/math3/genetics/RandomKeyMutationTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/genetics/RandomKeyMutationTest.java
rename to src/test/java/org/apache/commons/math3/genetics/RandomKeyMutationTest.java
index 242bbeb71..580c848e3 100644
--- a/src/test/java/org/apache/commons/math/genetics/RandomKeyMutationTest.java
+++ b/src/test/java/org/apache/commons/math3/genetics/RandomKeyMutationTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.genetics;
+package org.apache.commons.math3.genetics;
 
 
 import org.junit.Assert;
diff --git a/src/test/java/org/apache/commons/math/genetics/RandomKeyTest.java b/src/test/java/org/apache/commons/math3/genetics/RandomKeyTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/genetics/RandomKeyTest.java
rename to src/test/java/org/apache/commons/math3/genetics/RandomKeyTest.java
index ffa7b2c10..85c05b874 100644
--- a/src/test/java/org/apache/commons/math/genetics/RandomKeyTest.java
+++ b/src/test/java/org/apache/commons/math3/genetics/RandomKeyTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.genetics;
+package org.apache.commons.math3.genetics;
 
 
 import java.util.Arrays;
diff --git a/src/test/java/org/apache/commons/math/genetics/TournamentSelectionTest.java b/src/test/java/org/apache/commons/math3/genetics/TournamentSelectionTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/genetics/TournamentSelectionTest.java
rename to src/test/java/org/apache/commons/math3/genetics/TournamentSelectionTest.java
index 9d9579311..55cad32d5 100644
--- a/src/test/java/org/apache/commons/math/genetics/TournamentSelectionTest.java
+++ b/src/test/java/org/apache/commons/math3/genetics/TournamentSelectionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.genetics;
+package org.apache.commons.math3.genetics;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/geometry/euclidean/oned/IntervalsSetTest.java b/src/test/java/org/apache/commons/math3/geometry/euclidean/oned/IntervalsSetTest.java
similarity index 91%
rename from src/test/java/org/apache/commons/math/geometry/euclidean/oned/IntervalsSetTest.java
rename to src/test/java/org/apache/commons/math3/geometry/euclidean/oned/IntervalsSetTest.java
index b7c4640a4..c769065e6 100644
--- a/src/test/java/org/apache/commons/math/geometry/euclidean/oned/IntervalsSetTest.java
+++ b/src/test/java/org/apache/commons/math3/geometry/euclidean/oned/IntervalsSetTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.geometry.euclidean.oned;
+package org.apache.commons.math3.geometry.euclidean.oned;
 
 import java.util.List;
 
-import org.apache.commons.math.geometry.euclidean.oned.Interval;
-import org.apache.commons.math.geometry.euclidean.oned.IntervalsSet;
-import org.apache.commons.math.geometry.euclidean.oned.Vector1D;
-import org.apache.commons.math.geometry.partitioning.Region;
-import org.apache.commons.math.geometry.partitioning.RegionFactory;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.geometry.euclidean.oned.Interval;
+import org.apache.commons.math3.geometry.euclidean.oned.IntervalsSet;
+import org.apache.commons.math3.geometry.euclidean.oned.Vector1D;
+import org.apache.commons.math3.geometry.partitioning.Region;
+import org.apache.commons.math3.geometry.partitioning.RegionFactory;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/geometry/euclidean/threed/FrenchVector3DFormatTest.java b/src/test/java/org/apache/commons/math3/geometry/euclidean/threed/FrenchVector3DFormatTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/math/geometry/euclidean/threed/FrenchVector3DFormatTest.java
rename to src/test/java/org/apache/commons/math3/geometry/euclidean/threed/FrenchVector3DFormatTest.java
index 538090319..9d01c5fc2 100644
--- a/src/test/java/org/apache/commons/math/geometry/euclidean/threed/FrenchVector3DFormatTest.java
+++ b/src/test/java/org/apache/commons/math3/geometry/euclidean/threed/FrenchVector3DFormatTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.geometry.euclidean.threed;
+package org.apache.commons.math3.geometry.euclidean.threed;
 
 import java.util.Locale;
 
diff --git a/src/test/java/org/apache/commons/math/geometry/euclidean/threed/LineTest.java b/src/test/java/org/apache/commons/math3/geometry/euclidean/threed/LineTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/geometry/euclidean/threed/LineTest.java
rename to src/test/java/org/apache/commons/math3/geometry/euclidean/threed/LineTest.java
index ac7d7e747..de76fe280 100644
--- a/src/test/java/org/apache/commons/math/geometry/euclidean/threed/LineTest.java
+++ b/src/test/java/org/apache/commons/math3/geometry/euclidean/threed/LineTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.geometry.euclidean.threed;
+package org.apache.commons.math3.geometry.euclidean.threed;
 
-import org.apache.commons.math.geometry.euclidean.threed.Line;
-import org.apache.commons.math.geometry.euclidean.threed.Vector3D;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.geometry.euclidean.threed.Line;
+import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/geometry/euclidean/threed/PlaneTest.java b/src/test/java/org/apache/commons/math3/geometry/euclidean/threed/PlaneTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/math/geometry/euclidean/threed/PlaneTest.java
rename to src/test/java/org/apache/commons/math3/geometry/euclidean/threed/PlaneTest.java
index df77b9736..18a4af3ff 100644
--- a/src/test/java/org/apache/commons/math/geometry/euclidean/threed/PlaneTest.java
+++ b/src/test/java/org/apache/commons/math3/geometry/euclidean/threed/PlaneTest.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.geometry.euclidean.threed;
+package org.apache.commons.math3.geometry.euclidean.threed;
 
-import org.apache.commons.math.geometry.euclidean.threed.Line;
-import org.apache.commons.math.geometry.euclidean.threed.Plane;
-import org.apache.commons.math.geometry.euclidean.threed.Rotation;
-import org.apache.commons.math.geometry.euclidean.threed.Vector3D;
+import org.apache.commons.math3.geometry.euclidean.threed.Line;
+import org.apache.commons.math3.geometry.euclidean.threed.Plane;
+import org.apache.commons.math3.geometry.euclidean.threed.Rotation;
+import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/geometry/euclidean/threed/PolyhedronsSetTest.java b/src/test/java/org/apache/commons/math3/geometry/euclidean/threed/PolyhedronsSetTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/math/geometry/euclidean/threed/PolyhedronsSetTest.java
rename to src/test/java/org/apache/commons/math3/geometry/euclidean/threed/PolyhedronsSetTest.java
index 81fa93802..6c776711f 100644
--- a/src/test/java/org/apache/commons/math/geometry/euclidean/threed/PolyhedronsSetTest.java
+++ b/src/test/java/org/apache/commons/math3/geometry/euclidean/threed/PolyhedronsSetTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.geometry.euclidean.threed;
+package org.apache.commons.math3.geometry.euclidean.threed;
 
-import org.apache.commons.math.geometry.euclidean.twod.PolygonsSet;
-import org.apache.commons.math.geometry.euclidean.twod.Vector2D;
-import org.apache.commons.math.geometry.partitioning.BSPTree;
-import org.apache.commons.math.geometry.partitioning.BSPTreeVisitor;
-import org.apache.commons.math.geometry.partitioning.BoundaryAttribute;
-import org.apache.commons.math.geometry.partitioning.Region;
-import org.apache.commons.math.geometry.partitioning.RegionFactory;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.geometry.euclidean.twod.PolygonsSet;
+import org.apache.commons.math3.geometry.euclidean.twod.Vector2D;
+import org.apache.commons.math3.geometry.partitioning.BSPTree;
+import org.apache.commons.math3.geometry.partitioning.BSPTreeVisitor;
+import org.apache.commons.math3.geometry.partitioning.BoundaryAttribute;
+import org.apache.commons.math3.geometry.partitioning.Region;
+import org.apache.commons.math3.geometry.partitioning.RegionFactory;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/geometry/euclidean/threed/RotationOrderTest.java b/src/test/java/org/apache/commons/math3/geometry/euclidean/threed/RotationOrderTest.java
similarity index 92%
rename from src/test/java/org/apache/commons/math/geometry/euclidean/threed/RotationOrderTest.java
rename to src/test/java/org/apache/commons/math3/geometry/euclidean/threed/RotationOrderTest.java
index 5e12a55c7..6dd261239 100644
--- a/src/test/java/org/apache/commons/math/geometry/euclidean/threed/RotationOrderTest.java
+++ b/src/test/java/org/apache/commons/math3/geometry/euclidean/threed/RotationOrderTest.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.geometry.euclidean.threed;
+package org.apache.commons.math3.geometry.euclidean.threed;
 
 import java.lang.reflect.Field;
 
-import org.apache.commons.math.geometry.euclidean.threed.RotationOrder;
+import org.apache.commons.math3.geometry.euclidean.threed.RotationOrder;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/geometry/euclidean/threed/RotationTest.java b/src/test/java/org/apache/commons/math3/geometry/euclidean/threed/RotationTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/geometry/euclidean/threed/RotationTest.java
rename to src/test/java/org/apache/commons/math3/geometry/euclidean/threed/RotationTest.java
index 6666f5a55..b3357668e 100644
--- a/src/test/java/org/apache/commons/math/geometry/euclidean/threed/RotationTest.java
+++ b/src/test/java/org/apache/commons/math3/geometry/euclidean/threed/RotationTest.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.geometry.euclidean.threed;
+package org.apache.commons.math3.geometry.euclidean.threed;
 
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.util.MathUtils;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.util.MathUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/geometry/euclidean/threed/SubLineTest.java b/src/test/java/org/apache/commons/math3/geometry/euclidean/threed/SubLineTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/geometry/euclidean/threed/SubLineTest.java
rename to src/test/java/org/apache/commons/math3/geometry/euclidean/threed/SubLineTest.java
index 6547ab1a5..c31405505 100644
--- a/src/test/java/org/apache/commons/math/geometry/euclidean/threed/SubLineTest.java
+++ b/src/test/java/org/apache/commons/math3/geometry/euclidean/threed/SubLineTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.geometry.euclidean.threed;
+package org.apache.commons.math3.geometry.euclidean.threed;
 
 import java.util.List;
 
-import org.apache.commons.math.geometry.euclidean.oned.Euclidean1D;
-import org.apache.commons.math.geometry.euclidean.oned.IntervalsSet;
-import org.apache.commons.math.geometry.partitioning.RegionFactory;
+import org.apache.commons.math3.geometry.euclidean.oned.Euclidean1D;
+import org.apache.commons.math3.geometry.euclidean.oned.IntervalsSet;
+import org.apache.commons.math3.geometry.partitioning.RegionFactory;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/geometry/euclidean/threed/Vector3DFormatAbstractTest.java b/src/test/java/org/apache/commons/math3/geometry/euclidean/threed/Vector3DFormatAbstractTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/geometry/euclidean/threed/Vector3DFormatAbstractTest.java
rename to src/test/java/org/apache/commons/math3/geometry/euclidean/threed/Vector3DFormatAbstractTest.java
index fa0040bee..5dfb9635c 100644
--- a/src/test/java/org/apache/commons/math/geometry/euclidean/threed/Vector3DFormatAbstractTest.java
+++ b/src/test/java/org/apache/commons/math3/geometry/euclidean/threed/Vector3DFormatAbstractTest.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.geometry.euclidean.threed;
+package org.apache.commons.math3.geometry.euclidean.threed;
 
 import java.text.NumberFormat;
 import java.text.ParsePosition;
 import java.util.Locale;
 
-import org.apache.commons.math.geometry.euclidean.threed.Vector3D;
-import org.apache.commons.math.geometry.euclidean.threed.Vector3DFormat;
+import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
+import org.apache.commons.math3.geometry.euclidean.threed.Vector3DFormat;
 import org.junit.Test;
 import org.junit.Assert;
 
diff --git a/src/test/java/org/apache/commons/math/geometry/euclidean/threed/Vector3DFormatTest.java b/src/test/java/org/apache/commons/math3/geometry/euclidean/threed/Vector3DFormatTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/math/geometry/euclidean/threed/Vector3DFormatTest.java
rename to src/test/java/org/apache/commons/math3/geometry/euclidean/threed/Vector3DFormatTest.java
index b4a672b81..1e29e3a3d 100644
--- a/src/test/java/org/apache/commons/math/geometry/euclidean/threed/Vector3DFormatTest.java
+++ b/src/test/java/org/apache/commons/math3/geometry/euclidean/threed/Vector3DFormatTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.geometry.euclidean.threed;
+package org.apache.commons.math3.geometry.euclidean.threed;
 
 import java.util.Locale;
 
diff --git a/src/test/java/org/apache/commons/math/geometry/euclidean/threed/Vector3DTest.java b/src/test/java/org/apache/commons/math3/geometry/euclidean/threed/Vector3DTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/geometry/euclidean/threed/Vector3DTest.java
rename to src/test/java/org/apache/commons/math3/geometry/euclidean/threed/Vector3DTest.java
index 26e0e3f5e..4410be56c 100644
--- a/src/test/java/org/apache/commons/math/geometry/euclidean/threed/Vector3DTest.java
+++ b/src/test/java/org/apache/commons/math3/geometry/euclidean/threed/Vector3DTest.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.geometry.euclidean.threed;
+package org.apache.commons.math3.geometry.euclidean.threed;
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.MathArithmeticException;
-import org.apache.commons.math.random.Well1024a;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.MathArithmeticException;
+import org.apache.commons.math3.random.Well1024a;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/geometry/euclidean/twod/LineTest.java b/src/test/java/org/apache/commons/math3/geometry/euclidean/twod/LineTest.java
similarity index 91%
rename from src/test/java/org/apache/commons/math/geometry/euclidean/twod/LineTest.java
rename to src/test/java/org/apache/commons/math3/geometry/euclidean/twod/LineTest.java
index c4e6e655b..5dd837638 100644
--- a/src/test/java/org/apache/commons/math/geometry/euclidean/twod/LineTest.java
+++ b/src/test/java/org/apache/commons/math3/geometry/euclidean/twod/LineTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.geometry.euclidean.twod;
+package org.apache.commons.math3.geometry.euclidean.twod;
 
-import org.apache.commons.math.geometry.euclidean.oned.Euclidean1D;
-import org.apache.commons.math.geometry.euclidean.oned.Vector1D;
-import org.apache.commons.math.geometry.euclidean.twod.Line;
-import org.apache.commons.math.geometry.euclidean.twod.Vector2D;
-import org.apache.commons.math.geometry.partitioning.Transform;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.geometry.euclidean.oned.Euclidean1D;
+import org.apache.commons.math3.geometry.euclidean.oned.Vector1D;
+import org.apache.commons.math3.geometry.euclidean.twod.Line;
+import org.apache.commons.math3.geometry.euclidean.twod.Vector2D;
+import org.apache.commons.math3.geometry.partitioning.Transform;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/geometry/euclidean/twod/PolygonsSetTest.java b/src/test/java/org/apache/commons/math3/geometry/euclidean/twod/PolygonsSetTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/geometry/euclidean/twod/PolygonsSetTest.java
rename to src/test/java/org/apache/commons/math3/geometry/euclidean/twod/PolygonsSetTest.java
index b1a922441..b5a5dfaf6 100644
--- a/src/test/java/org/apache/commons/math/geometry/euclidean/twod/PolygonsSetTest.java
+++ b/src/test/java/org/apache/commons/math3/geometry/euclidean/twod/PolygonsSetTest.java
@@ -14,22 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.geometry.euclidean.twod;
+package org.apache.commons.math3.geometry.euclidean.twod;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.math.geometry.euclidean.oned.Interval;
-import org.apache.commons.math.geometry.euclidean.oned.IntervalsSet;
-import org.apache.commons.math.geometry.euclidean.oned.Vector1D;
-import org.apache.commons.math.geometry.euclidean.twod.Line;
-import org.apache.commons.math.geometry.euclidean.twod.Vector2D;
-import org.apache.commons.math.geometry.euclidean.twod.PolygonsSet;
-import org.apache.commons.math.geometry.partitioning.BSPTree;
-import org.apache.commons.math.geometry.partitioning.Region;
-import org.apache.commons.math.geometry.partitioning.RegionFactory;
-import org.apache.commons.math.geometry.partitioning.SubHyperplane;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.geometry.euclidean.oned.Interval;
+import org.apache.commons.math3.geometry.euclidean.oned.IntervalsSet;
+import org.apache.commons.math3.geometry.euclidean.oned.Vector1D;
+import org.apache.commons.math3.geometry.euclidean.twod.Line;
+import org.apache.commons.math3.geometry.euclidean.twod.Vector2D;
+import org.apache.commons.math3.geometry.euclidean.twod.PolygonsSet;
+import org.apache.commons.math3.geometry.partitioning.BSPTree;
+import org.apache.commons.math3.geometry.partitioning.Region;
+import org.apache.commons.math3.geometry.partitioning.RegionFactory;
+import org.apache.commons.math3.geometry.partitioning.SubHyperplane;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/geometry/euclidean/twod/SubLineTest.java b/src/test/java/org/apache/commons/math3/geometry/euclidean/twod/SubLineTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/geometry/euclidean/twod/SubLineTest.java
rename to src/test/java/org/apache/commons/math3/geometry/euclidean/twod/SubLineTest.java
index 376e620a9..bc276d130 100644
--- a/src/test/java/org/apache/commons/math/geometry/euclidean/twod/SubLineTest.java
+++ b/src/test/java/org/apache/commons/math3/geometry/euclidean/twod/SubLineTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.geometry.euclidean.twod;
+package org.apache.commons.math3.geometry.euclidean.twod;
 
 import java.util.List;
 
-import org.apache.commons.math.geometry.euclidean.oned.Euclidean1D;
-import org.apache.commons.math.geometry.euclidean.oned.IntervalsSet;
-import org.apache.commons.math.geometry.partitioning.RegionFactory;
+import org.apache.commons.math3.geometry.euclidean.oned.Euclidean1D;
+import org.apache.commons.math3.geometry.euclidean.oned.IntervalsSet;
+import org.apache.commons.math3.geometry.partitioning.RegionFactory;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/geometry/partitioning/utilities/AVLTreeTest.java b/src/test/java/org/apache/commons/math3/geometry/partitioning/utilities/AVLTreeTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/geometry/partitioning/utilities/AVLTreeTest.java
rename to src/test/java/org/apache/commons/math3/geometry/partitioning/utilities/AVLTreeTest.java
index 59ab5c481..9d7f42400 100644
--- a/src/test/java/org/apache/commons/math/geometry/partitioning/utilities/AVLTreeTest.java
+++ b/src/test/java/org/apache/commons/math3/geometry/partitioning/utilities/AVLTreeTest.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.geometry.partitioning.utilities;
+package org.apache.commons.math3.geometry.partitioning.utilities;
 
-import org.apache.commons.math.geometry.partitioning.utilities.AVLTree;
+import org.apache.commons.math3.geometry.partitioning.utilities.AVLTree;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/linear/Array2DRowRealMatrixTest.java b/src/test/java/org/apache/commons/math3/linear/Array2DRowRealMatrixTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/linear/Array2DRowRealMatrixTest.java
rename to src/test/java/org/apache/commons/math3/linear/Array2DRowRealMatrixTest.java
index 752cc98d4..9ce31e17d 100644
--- a/src/test/java/org/apache/commons/math/linear/Array2DRowRealMatrixTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/Array2DRowRealMatrixTest.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
 import org.junit.Test;
 import org.junit.Assert;
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.OutOfRangeException;
-import org.apache.commons.math.exception.NoDataException;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.MathIllegalStateException;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.OutOfRangeException;
+import org.apache.commons.math3.exception.NoDataException;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.MathIllegalStateException;
 
 /**
  * Test cases for the {@link Array2DRowRealMatrix} class.
diff --git a/src/test/java/org/apache/commons/math/linear/ArrayFieldVectorTest.java b/src/test/java/org/apache/commons/math3/linear/ArrayFieldVectorTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/linear/ArrayFieldVectorTest.java
rename to src/test/java/org/apache/commons/math3/linear/ArrayFieldVectorTest.java
index 307d3950f..57d9dc8ef 100644
--- a/src/test/java/org/apache/commons/math/linear/ArrayFieldVectorTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/ArrayFieldVectorTest.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
 import java.io.Serializable;
 import java.lang.reflect.Array;
 
-import org.apache.commons.math.Field;
-import org.apache.commons.math.FieldElement;
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.OutOfRangeException;
-import org.apache.commons.math.fraction.Fraction;
-import org.apache.commons.math.fraction.FractionField;
+import org.apache.commons.math3.Field;
+import org.apache.commons.math3.FieldElement;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.OutOfRangeException;
+import org.apache.commons.math3.fraction.Fraction;
+import org.apache.commons.math3.fraction.FractionField;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/linear/ArrayRealVectorTest.java b/src/test/java/org/apache/commons/math3/linear/ArrayRealVectorTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/linear/ArrayRealVectorTest.java
rename to src/test/java/org/apache/commons/math3/linear/ArrayRealVectorTest.java
index 7d48605e8..f010cfcf7 100644
--- a/src/test/java/org/apache/commons/math/linear/ArrayRealVectorTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/ArrayRealVectorTest.java
@@ -14,43 +14,43 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
 import java.io.Serializable;
 import java.util.Iterator;
 import java.util.Random;
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.analysis.function.Abs;
-import org.apache.commons.math.analysis.function.Acos;
-import org.apache.commons.math.analysis.function.Asin;
-import org.apache.commons.math.analysis.function.Atan;
-import org.apache.commons.math.analysis.function.Cbrt;
-import org.apache.commons.math.analysis.function.Ceil;
-import org.apache.commons.math.analysis.function.Cos;
-import org.apache.commons.math.analysis.function.Cosh;
-import org.apache.commons.math.analysis.function.Exp;
-import org.apache.commons.math.analysis.function.Expm1;
-import org.apache.commons.math.analysis.function.Floor;
-import org.apache.commons.math.analysis.function.Inverse;
-import org.apache.commons.math.analysis.function.Log;
-import org.apache.commons.math.analysis.function.Log10;
-import org.apache.commons.math.analysis.function.Log1p;
-import org.apache.commons.math.analysis.function.Power;
-import org.apache.commons.math.analysis.function.Rint;
-import org.apache.commons.math.analysis.function.Signum;
-import org.apache.commons.math.analysis.function.Sin;
-import org.apache.commons.math.analysis.function.Sinh;
-import org.apache.commons.math.analysis.function.Sqrt;
-import org.apache.commons.math.analysis.function.Tan;
-import org.apache.commons.math.analysis.function.Tanh;
-import org.apache.commons.math.analysis.function.Ulp;
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.MathArithmeticException;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.OutOfRangeException;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.analysis.function.Abs;
+import org.apache.commons.math3.analysis.function.Acos;
+import org.apache.commons.math3.analysis.function.Asin;
+import org.apache.commons.math3.analysis.function.Atan;
+import org.apache.commons.math3.analysis.function.Cbrt;
+import org.apache.commons.math3.analysis.function.Ceil;
+import org.apache.commons.math3.analysis.function.Cos;
+import org.apache.commons.math3.analysis.function.Cosh;
+import org.apache.commons.math3.analysis.function.Exp;
+import org.apache.commons.math3.analysis.function.Expm1;
+import org.apache.commons.math3.analysis.function.Floor;
+import org.apache.commons.math3.analysis.function.Inverse;
+import org.apache.commons.math3.analysis.function.Log;
+import org.apache.commons.math3.analysis.function.Log10;
+import org.apache.commons.math3.analysis.function.Log1p;
+import org.apache.commons.math3.analysis.function.Power;
+import org.apache.commons.math3.analysis.function.Rint;
+import org.apache.commons.math3.analysis.function.Signum;
+import org.apache.commons.math3.analysis.function.Sin;
+import org.apache.commons.math3.analysis.function.Sinh;
+import org.apache.commons.math3.analysis.function.Sqrt;
+import org.apache.commons.math3.analysis.function.Tan;
+import org.apache.commons.math3.analysis.function.Tanh;
+import org.apache.commons.math3.analysis.function.Ulp;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.MathArithmeticException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.OutOfRangeException;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/linear/BiDiagonalTransformerTest.java b/src/test/java/org/apache/commons/math3/linear/BiDiagonalTransformerTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/linear/BiDiagonalTransformerTest.java
rename to src/test/java/org/apache/commons/math3/linear/BiDiagonalTransformerTest.java
index ce732ae55..e2463defe 100644
--- a/src/test/java/org/apache/commons/math/linear/BiDiagonalTransformerTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/BiDiagonalTransformerTest.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
-import org.apache.commons.math.linear.BiDiagonalTransformer;
-import org.apache.commons.math.linear.MatrixUtils;
-import org.apache.commons.math.linear.RealMatrix;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.linear.BiDiagonalTransformer;
+import org.apache.commons.math3.linear.MatrixUtils;
+import org.apache.commons.math3.linear.RealMatrix;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/linear/BlockFieldMatrixTest.java b/src/test/java/org/apache/commons/math3/linear/BlockFieldMatrixTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/linear/BlockFieldMatrixTest.java
rename to src/test/java/org/apache/commons/math3/linear/BlockFieldMatrixTest.java
index a0ca1f6f3..164ca9aec 100644
--- a/src/test/java/org/apache/commons/math/linear/BlockFieldMatrixTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/BlockFieldMatrixTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
 import java.util.Arrays;
 import java.util.Random;
@@ -22,15 +22,15 @@ import java.util.Random;
 import org.junit.Test;
 import org.junit.Assert;
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.fraction.Fraction;
-import org.apache.commons.math.fraction.FractionField;
-import org.apache.commons.math.exception.NoDataException;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.OutOfRangeException;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.exception.NotStrictlyPositiveException;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.fraction.Fraction;
+import org.apache.commons.math3.fraction.FractionField;
+import org.apache.commons.math3.exception.NoDataException;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.OutOfRangeException;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.exception.NotStrictlyPositiveException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
 
 /**
  * Test cases for the {@link BlockFieldMatrix} class.
diff --git a/src/test/java/org/apache/commons/math/linear/BlockRealMatrixTest.java b/src/test/java/org/apache/commons/math3/linear/BlockRealMatrixTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/linear/BlockRealMatrixTest.java
rename to src/test/java/org/apache/commons/math3/linear/BlockRealMatrixTest.java
index 6e7edaa48..29a8ec14b 100644
--- a/src/test/java/org/apache/commons/math/linear/BlockRealMatrixTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/BlockRealMatrixTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
 import java.util.Arrays;
 import java.util.Random;
@@ -22,13 +22,13 @@ import java.util.Random;
 import org.junit.Test;
 import org.junit.Assert;
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.OutOfRangeException;
-import org.apache.commons.math.exception.NoDataException;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.OutOfRangeException;
+import org.apache.commons.math3.exception.NoDataException;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
 
 /**
  * Test cases for the {@link BlockRealMatrix} class.
diff --git a/src/test/java/org/apache/commons/math/linear/CholeskyDecompositionTest.java b/src/test/java/org/apache/commons/math3/linear/CholeskyDecompositionTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/linear/CholeskyDecompositionTest.java
rename to src/test/java/org/apache/commons/math3/linear/CholeskyDecompositionTest.java
index a000eaa98..eeafa7b00 100644
--- a/src/test/java/org/apache/commons/math/linear/CholeskyDecompositionTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/CholeskyDecompositionTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
 import org.junit.Test;
 import org.junit.Assert;
diff --git a/src/test/java/org/apache/commons/math/linear/CholeskySolverTest.java b/src/test/java/org/apache/commons/math3/linear/CholeskySolverTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/linear/CholeskySolverTest.java
rename to src/test/java/org/apache/commons/math3/linear/CholeskySolverTest.java
index daa2d606f..716248f4a 100644
--- a/src/test/java/org/apache/commons/math/linear/CholeskySolverTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/CholeskySolverTest.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
-import org.apache.commons.math.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/linear/ConjugateGradientTest.java b/src/test/java/org/apache/commons/math3/linear/ConjugateGradientTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/linear/ConjugateGradientTest.java
rename to src/test/java/org/apache/commons/math3/linear/ConjugateGradientTest.java
index 411eb9025..ba6a47790 100644
--- a/src/test/java/org/apache/commons/math/linear/ConjugateGradientTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/ConjugateGradientTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
 import java.util.Arrays;
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.MathUnsupportedOperationException;
-import org.apache.commons.math.exception.MaxCountExceededException;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.util.IterationEvent;
-import org.apache.commons.math.util.IterationListener;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.MathUnsupportedOperationException;
+import org.apache.commons.math3.exception.MaxCountExceededException;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.util.IterationEvent;
+import org.apache.commons.math3.util.IterationListener;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/linear/EigenDecompositionTest.java b/src/test/java/org/apache/commons/math3/linear/EigenDecompositionTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/linear/EigenDecompositionTest.java
rename to src/test/java/org/apache/commons/math3/linear/EigenDecompositionTest.java
index 9e39963b6..bf4253292 100644
--- a/src/test/java/org/apache/commons/math/linear/EigenDecompositionTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/EigenDecompositionTest.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
 import java.util.Arrays;
 import java.util.Random;
 
 
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.util.Precision;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.util.Precision;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/src/test/java/org/apache/commons/math/linear/EigenSolverTest.java b/src/test/java/org/apache/commons/math3/linear/EigenSolverTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/linear/EigenSolverTest.java
rename to src/test/java/org/apache/commons/math3/linear/EigenSolverTest.java
index cc124c92f..f438af49d 100644
--- a/src/test/java/org/apache/commons/math/linear/EigenSolverTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/EigenSolverTest.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
 import java.util.Random;
 
-import org.apache.commons.math.util.Precision;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.util.Precision;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
 
 import org.junit.Test;
 import org.junit.Assert;
diff --git a/src/test/java/org/apache/commons/math/linear/FieldLUDecompositionTest.java b/src/test/java/org/apache/commons/math3/linear/FieldLUDecompositionTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/linear/FieldLUDecompositionTest.java
rename to src/test/java/org/apache/commons/math3/linear/FieldLUDecompositionTest.java
index 174146b9a..a1fad5f59 100644
--- a/src/test/java/org/apache/commons/math/linear/FieldLUDecompositionTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/FieldLUDecompositionTest.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
 import org.junit.Test;
 import org.junit.Assert;
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.fraction.Fraction;
-import org.apache.commons.math.fraction.FractionField;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.fraction.Fraction;
+import org.apache.commons.math3.fraction.FractionField;
 
 public class FieldLUDecompositionTest {
     private Fraction[][] testData = {
diff --git a/src/test/java/org/apache/commons/math/linear/FieldLUSolverTest.java b/src/test/java/org/apache/commons/math3/linear/FieldLUSolverTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/linear/FieldLUSolverTest.java
rename to src/test/java/org/apache/commons/math3/linear/FieldLUSolverTest.java
index dcd5f9d26..d90dff5f4 100644
--- a/src/test/java/org/apache/commons/math/linear/FieldLUSolverTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/FieldLUSolverTest.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.fraction.Fraction;
-import org.apache.commons.math.fraction.FractionField;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.fraction.Fraction;
+import org.apache.commons.math3.fraction.FractionField;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/linear/FieldMatrixImplTest.java b/src/test/java/org/apache/commons/math3/linear/FieldMatrixImplTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/linear/FieldMatrixImplTest.java
rename to src/test/java/org/apache/commons/math3/linear/FieldMatrixImplTest.java
index ea0ebfa6f..ddeb59e29 100644
--- a/src/test/java/org/apache/commons/math/linear/FieldMatrixImplTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/FieldMatrixImplTest.java
@@ -14,22 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
 import org.junit.Test;
 import org.junit.Assert;
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.fraction.Fraction;
-import org.apache.commons.math.fraction.FractionField;
-import org.apache.commons.math.exception.MathIllegalStateException;
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.NoDataException;
-import org.apache.commons.math.exception.OutOfRangeException;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.exception.NotStrictlyPositiveException;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.fraction.Fraction;
+import org.apache.commons.math3.fraction.FractionField;
+import org.apache.commons.math3.exception.MathIllegalStateException;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.NoDataException;
+import org.apache.commons.math3.exception.OutOfRangeException;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.exception.NotStrictlyPositiveException;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
 
 /**
  * Test cases for the {@link Array2DRowFieldMatrix} class.
diff --git a/src/test/java/org/apache/commons/math/linear/FrenchRealVectorFormatTest.java b/src/test/java/org/apache/commons/math3/linear/FrenchRealVectorFormatTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/linear/FrenchRealVectorFormatTest.java
rename to src/test/java/org/apache/commons/math3/linear/FrenchRealVectorFormatTest.java
index 59d988007..09aae6872 100644
--- a/src/test/java/org/apache/commons/math/linear/FrenchRealVectorFormatTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/FrenchRealVectorFormatTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
 import java.util.Locale;
 
diff --git a/src/test/java/org/apache/commons/math/linear/HilbertMatrix.java b/src/test/java/org/apache/commons/math3/linear/HilbertMatrix.java
similarity index 95%
rename from src/test/java/org/apache/commons/math/linear/HilbertMatrix.java
rename to src/test/java/org/apache/commons/math3/linear/HilbertMatrix.java
index c761176e7..7303d9903 100644
--- a/src/test/java/org/apache/commons/math/linear/HilbertMatrix.java
+++ b/src/test/java/org/apache/commons/math3/linear/HilbertMatrix.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
-import org.apache.commons.math.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.DimensionMismatchException;
 
 /** This class implements Hilbert Matrices as {@link RealLinearOperator}. */
 public class HilbertMatrix
diff --git a/src/test/java/org/apache/commons/math/linear/InverseHilbertMatrix.java b/src/test/java/org/apache/commons/math3/linear/InverseHilbertMatrix.java
similarity index 95%
rename from src/test/java/org/apache/commons/math/linear/InverseHilbertMatrix.java
rename to src/test/java/org/apache/commons/math3/linear/InverseHilbertMatrix.java
index 8dbc3f07b..52595a792 100644
--- a/src/test/java/org/apache/commons/math/linear/InverseHilbertMatrix.java
+++ b/src/test/java/org/apache/commons/math3/linear/InverseHilbertMatrix.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.util.ArithmeticUtils;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.util.ArithmeticUtils;
 
 /**
  * This class implements inverses of Hilbert Matrices as
diff --git a/src/test/java/org/apache/commons/math/linear/LUDecompositionTest.java b/src/test/java/org/apache/commons/math3/linear/LUDecompositionTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/linear/LUDecompositionTest.java
rename to src/test/java/org/apache/commons/math3/linear/LUDecompositionTest.java
index 4b9749500..f8d610a6d 100644
--- a/src/test/java/org/apache/commons/math/linear/LUDecompositionTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/LUDecompositionTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
 import org.junit.Test;
 import org.junit.Assert;
diff --git a/src/test/java/org/apache/commons/math/linear/LUSolverTest.java b/src/test/java/org/apache/commons/math3/linear/LUSolverTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/linear/LUSolverTest.java
rename to src/test/java/org/apache/commons/math3/linear/LUSolverTest.java
index 8415c83ad..bf7b8b662 100644
--- a/src/test/java/org/apache/commons/math/linear/LUSolverTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/LUSolverTest.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
-import org.apache.commons.math.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
 
 import org.junit.Test;
 import org.junit.Assert;
diff --git a/src/test/java/org/apache/commons/math/linear/MatrixDimensionMismatchExceptionTest.java b/src/test/java/org/apache/commons/math3/linear/MatrixDimensionMismatchExceptionTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/linear/MatrixDimensionMismatchExceptionTest.java
rename to src/test/java/org/apache/commons/math3/linear/MatrixDimensionMismatchExceptionTest.java
index 2b743a027..17cf55202 100644
--- a/src/test/java/org/apache/commons/math/linear/MatrixDimensionMismatchExceptionTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/MatrixDimensionMismatchExceptionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/linear/MatrixUtilsTest.java b/src/test/java/org/apache/commons/math3/linear/MatrixUtilsTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/linear/MatrixUtilsTest.java
rename to src/test/java/org/apache/commons/math3/linear/MatrixUtilsTest.java
index db938ae72..a2afdc593 100644
--- a/src/test/java/org/apache/commons/math/linear/MatrixUtilsTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/MatrixUtilsTest.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
 import java.math.BigDecimal;
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.fraction.BigFraction;
-import org.apache.commons.math.fraction.Fraction;
-import org.apache.commons.math.fraction.FractionConversionException;
-import org.apache.commons.math.fraction.FractionField;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.NotStrictlyPositiveException;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.fraction.BigFraction;
+import org.apache.commons.math3.fraction.Fraction;
+import org.apache.commons.math3.fraction.FractionConversionException;
+import org.apache.commons.math3.fraction.FractionField;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.NotStrictlyPositiveException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/linear/OpenMapRealMatrixTest.java b/src/test/java/org/apache/commons/math3/linear/OpenMapRealMatrixTest.java
similarity index 90%
rename from src/test/java/org/apache/commons/math/linear/OpenMapRealMatrixTest.java
rename to src/test/java/org/apache/commons/math3/linear/OpenMapRealMatrixTest.java
index b44be399b..9fb388ee4 100644
--- a/src/test/java/org/apache/commons/math/linear/OpenMapRealMatrixTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/OpenMapRealMatrixTest.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
-import org.apache.commons.math.exception.NumberIsTooLargeException;
+import org.apache.commons.math3.exception.NumberIsTooLargeException;
 import org.junit.Test;
 
 public final class OpenMapRealMatrixTest {
diff --git a/src/test/java/org/apache/commons/math/linear/PivotingQRDecompositionTest.java b/src/test/java/org/apache/commons/math3/linear/PivotingQRDecompositionTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/linear/PivotingQRDecompositionTest.java
rename to src/test/java/org/apache/commons/math3/linear/PivotingQRDecompositionTest.java
index 192371e77..952b8feab 100644
--- a/src/test/java/org/apache/commons/math/linear/PivotingQRDecompositionTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/PivotingQRDecompositionTest.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
 import java.util.Random;
 
 
-import org.apache.commons.math.exception.ConvergenceException;
+import org.apache.commons.math3.exception.ConvergenceException;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/linear/PivotingQRSolverTest.java b/src/test/java/org/apache/commons/math3/linear/PivotingQRSolverTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/linear/PivotingQRSolverTest.java
rename to src/test/java/org/apache/commons/math3/linear/PivotingQRSolverTest.java
index 364bf1e7e..5fd505e62 100644
--- a/src/test/java/org/apache/commons/math/linear/PivotingQRSolverTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/PivotingQRSolverTest.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
 import java.util.Random;
 
-import org.apache.commons.math.exception.ConvergenceException;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.ConvergenceException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
 
 import org.junit.Test;
 import org.junit.Assert;
diff --git a/src/test/java/org/apache/commons/math/linear/QRDecompositionTest.java b/src/test/java/org/apache/commons/math3/linear/QRDecompositionTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/linear/QRDecompositionTest.java
rename to src/test/java/org/apache/commons/math3/linear/QRDecompositionTest.java
index 8304fa642..fe8e9fc8c 100644
--- a/src/test/java/org/apache/commons/math/linear/QRDecompositionTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/QRDecompositionTest.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
 import java.util.Random;
-import org.apache.commons.math.linear.SingularMatrixException;
+import org.apache.commons.math3.linear.SingularMatrixException;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/linear/QRSolverTest.java b/src/test/java/org/apache/commons/math3/linear/QRSolverTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/linear/QRSolverTest.java
rename to src/test/java/org/apache/commons/math3/linear/QRSolverTest.java
index 066f76ae8..04021c87f 100644
--- a/src/test/java/org/apache/commons/math/linear/QRSolverTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/QRSolverTest.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
 import java.util.Random;
 
-import org.apache.commons.math.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
 
 import org.junit.Test;
 import org.junit.Assert;
diff --git a/src/test/java/org/apache/commons/math/linear/RealVectorFormatAbstractTest.java b/src/test/java/org/apache/commons/math3/linear/RealVectorFormatAbstractTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/linear/RealVectorFormatAbstractTest.java
rename to src/test/java/org/apache/commons/math3/linear/RealVectorFormatAbstractTest.java
index d356a2db8..929ccde0c 100644
--- a/src/test/java/org/apache/commons/math/linear/RealVectorFormatAbstractTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/RealVectorFormatAbstractTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
 import java.text.NumberFormat;
 import java.text.ParsePosition;
@@ -24,7 +24,7 @@ import java.util.Locale;
 import org.junit.Test;
 import org.junit.Assert;
 
-import org.apache.commons.math.exception.MathParseException;
+import org.apache.commons.math3.exception.MathParseException;
 
 public abstract class RealVectorFormatAbstractTest {
 
diff --git a/src/test/java/org/apache/commons/math/linear/RealVectorFormatTest.java b/src/test/java/org/apache/commons/math3/linear/RealVectorFormatTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/linear/RealVectorFormatTest.java
rename to src/test/java/org/apache/commons/math3/linear/RealVectorFormatTest.java
index e7368b53c..fb21a0f1b 100644
--- a/src/test/java/org/apache/commons/math/linear/RealVectorFormatTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/RealVectorFormatTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
 import java.util.Locale;
 
diff --git a/src/test/java/org/apache/commons/math/linear/RealVectorTest.java b/src/test/java/org/apache/commons/math3/linear/RealVectorTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/linear/RealVectorTest.java
rename to src/test/java/org/apache/commons/math3/linear/RealVectorTest.java
index 040ae823e..b9c677ec1 100644
--- a/src/test/java/org/apache/commons/math/linear/RealVectorTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/RealVectorTest.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
 import org.junit.Test;
 import org.junit.Assert;
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.linear.RealVector.Entry;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.linear.RealVector.Entry;
 import java.util.Iterator;
 import java.util.Random;
 
diff --git a/src/test/java/org/apache/commons/math/linear/SingularValueDecompositionTest.java b/src/test/java/org/apache/commons/math3/linear/SingularValueDecompositionTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/linear/SingularValueDecompositionTest.java
rename to src/test/java/org/apache/commons/math3/linear/SingularValueDecompositionTest.java
index 0470567d7..925291a7c 100644
--- a/src/test/java/org/apache/commons/math/linear/SingularValueDecompositionTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/SingularValueDecompositionTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
 import java.io.BufferedReader;
 import java.io.DataInputStream;
diff --git a/src/test/java/org/apache/commons/math/linear/SingularValueSolverTest.java b/src/test/java/org/apache/commons/math3/linear/SingularValueSolverTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/linear/SingularValueSolverTest.java
rename to src/test/java/org/apache/commons/math3/linear/SingularValueSolverTest.java
index 5d5c57095..c510817b4 100644
--- a/src/test/java/org/apache/commons/math/linear/SingularValueSolverTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/SingularValueSolverTest.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
-import org.apache.commons.math.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/linear/SparseFieldMatrixTest.java b/src/test/java/org/apache/commons/math3/linear/SparseFieldMatrixTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/linear/SparseFieldMatrixTest.java
rename to src/test/java/org/apache/commons/math3/linear/SparseFieldMatrixTest.java
index a92c6e240..93706ba37 100644
--- a/src/test/java/org/apache/commons/math/linear/SparseFieldMatrixTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/SparseFieldMatrixTest.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
 import org.junit.Test;
 import org.junit.Assert;
 
-import org.apache.commons.math.Field;
-import org.apache.commons.math.fraction.Fraction;
-import org.apache.commons.math.fraction.FractionConversionException;
-import org.apache.commons.math.fraction.FractionField;
-import org.apache.commons.math.exception.NoDataException;
-import org.apache.commons.math.exception.OutOfRangeException;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.Field;
+import org.apache.commons.math3.fraction.Fraction;
+import org.apache.commons.math3.fraction.FractionConversionException;
+import org.apache.commons.math3.fraction.FractionField;
+import org.apache.commons.math3.exception.NoDataException;
+import org.apache.commons.math3.exception.OutOfRangeException;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
 
 /**
  * Test cases for the {@link SparseFieldMatrix} class.
diff --git a/src/test/java/org/apache/commons/math/linear/SparseFieldVectorTest.java b/src/test/java/org/apache/commons/math3/linear/SparseFieldVectorTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/linear/SparseFieldVectorTest.java
rename to src/test/java/org/apache/commons/math3/linear/SparseFieldVectorTest.java
index fda6c3304..7f51d5559 100644
--- a/src/test/java/org/apache/commons/math/linear/SparseFieldVectorTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/SparseFieldVectorTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
 
-import org.apache.commons.math.fraction.Fraction;
-import org.apache.commons.math.fraction.FractionConversionException;
-import org.apache.commons.math.fraction.FractionField;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.fraction.Fraction;
+import org.apache.commons.math3.fraction.FractionConversionException;
+import org.apache.commons.math3.fraction.FractionField;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/linear/SparseRealMatrixTest.java b/src/test/java/org/apache/commons/math3/linear/SparseRealMatrixTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/linear/SparseRealMatrixTest.java
rename to src/test/java/org/apache/commons/math3/linear/SparseRealMatrixTest.java
index f52901144..abef69648 100644
--- a/src/test/java/org/apache/commons/math/linear/SparseRealMatrixTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/SparseRealMatrixTest.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
 import org.junit.Test;
 import org.junit.Assert;
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.OutOfRangeException;
-import org.apache.commons.math.exception.NoDataException;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.OutOfRangeException;
+import org.apache.commons.math3.exception.NoDataException;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
 
 /**
  * Test cases for the {@link OpenMapRealMatrix} class.
diff --git a/src/test/java/org/apache/commons/math/linear/SparseRealVectorTest.java b/src/test/java/org/apache/commons/math3/linear/SparseRealVectorTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/math/linear/SparseRealVectorTest.java
rename to src/test/java/org/apache/commons/math3/linear/SparseRealVectorTest.java
index 16310ee6a..f5f19d29f 100644
--- a/src/test/java/org/apache/commons/math/linear/SparseRealVectorTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/SparseRealVectorTest.java
@@ -14,43 +14,43 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
 import java.io.Serializable;
 import java.util.Iterator;
 import org.junit.Assert;
 import org.junit.Test;
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.MathArithmeticException;
-import org.apache.commons.math.exception.OutOfRangeException;
-import org.apache.commons.math.analysis.function.Abs;
-import org.apache.commons.math.analysis.function.Acos;
-import org.apache.commons.math.analysis.function.Asin;
-import org.apache.commons.math.analysis.function.Atan;
-import org.apache.commons.math.analysis.function.Cbrt;
-import org.apache.commons.math.analysis.function.Cosh;
-import org.apache.commons.math.analysis.function.Cos;
-import org.apache.commons.math.analysis.function.Exp;
-import org.apache.commons.math.analysis.function.Expm1;
-import org.apache.commons.math.analysis.function.Inverse;
-import org.apache.commons.math.analysis.function.Log10;
-import org.apache.commons.math.analysis.function.Log1p;
-import org.apache.commons.math.analysis.function.Log;
-import org.apache.commons.math.analysis.function.Sinh;
-import org.apache.commons.math.analysis.function.Sin;
-import org.apache.commons.math.analysis.function.Sqrt;
-import org.apache.commons.math.analysis.function.Tanh;
-import org.apache.commons.math.analysis.function.Tan;
-import org.apache.commons.math.analysis.function.Floor;
-import org.apache.commons.math.analysis.function.Ceil;
-import org.apache.commons.math.analysis.function.Rint;
-import org.apache.commons.math.analysis.function.Signum;
-import org.apache.commons.math.analysis.function.Ulp;
-import org.apache.commons.math.analysis.function.Power;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.MathArithmeticException;
+import org.apache.commons.math3.exception.OutOfRangeException;
+import org.apache.commons.math3.analysis.function.Abs;
+import org.apache.commons.math3.analysis.function.Acos;
+import org.apache.commons.math3.analysis.function.Asin;
+import org.apache.commons.math3.analysis.function.Atan;
+import org.apache.commons.math3.analysis.function.Cbrt;
+import org.apache.commons.math3.analysis.function.Cosh;
+import org.apache.commons.math3.analysis.function.Cos;
+import org.apache.commons.math3.analysis.function.Exp;
+import org.apache.commons.math3.analysis.function.Expm1;
+import org.apache.commons.math3.analysis.function.Inverse;
+import org.apache.commons.math3.analysis.function.Log10;
+import org.apache.commons.math3.analysis.function.Log1p;
+import org.apache.commons.math3.analysis.function.Log;
+import org.apache.commons.math3.analysis.function.Sinh;
+import org.apache.commons.math3.analysis.function.Sin;
+import org.apache.commons.math3.analysis.function.Sqrt;
+import org.apache.commons.math3.analysis.function.Tanh;
+import org.apache.commons.math3.analysis.function.Tan;
+import org.apache.commons.math3.analysis.function.Floor;
+import org.apache.commons.math3.analysis.function.Ceil;
+import org.apache.commons.math3.analysis.function.Rint;
+import org.apache.commons.math3.analysis.function.Signum;
+import org.apache.commons.math3.analysis.function.Ulp;
+import org.apache.commons.math3.analysis.function.Power;
 
 /**
  * Test cases for the {@link OpenMapRealVector} class.
diff --git a/src/test/java/org/apache/commons/math/linear/SymmLQTest.java b/src/test/java/org/apache/commons/math3/linear/SymmLQTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/linear/SymmLQTest.java
rename to src/test/java/org/apache/commons/math3/linear/SymmLQTest.java
index a51de07cd..06da405f4 100644
--- a/src/test/java/org/apache/commons/math/linear/SymmLQTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/SymmLQTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
 import java.util.Arrays;
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.util.IterationEvent;
-import org.apache.commons.math.util.IterationListener;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.util.IterationEvent;
+import org.apache.commons.math3.util.IterationListener;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/linear/TriDiagonalTransformerTest.java b/src/test/java/org/apache/commons/math3/linear/TriDiagonalTransformerTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/linear/TriDiagonalTransformerTest.java
rename to src/test/java/org/apache/commons/math3/linear/TriDiagonalTransformerTest.java
index 773087f4e..b55265bc2 100644
--- a/src/test/java/org/apache/commons/math/linear/TriDiagonalTransformerTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/TriDiagonalTransformerTest.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
 import java.util.Arrays;
 
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.util.FastMath;
 
 import org.junit.Test;
 import org.junit.Assert;
diff --git a/src/test/java/org/apache/commons/math/linear/UnmodifiableArrayRealVectorTest.java b/src/test/java/org/apache/commons/math3/linear/UnmodifiableArrayRealVectorTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/linear/UnmodifiableArrayRealVectorTest.java
rename to src/test/java/org/apache/commons/math3/linear/UnmodifiableArrayRealVectorTest.java
index bdca3409d..c6fb5aa71 100644
--- a/src/test/java/org/apache/commons/math/linear/UnmodifiableArrayRealVectorTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/UnmodifiableArrayRealVectorTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
 /**
  * This is an implementation of {@link UnmodifiableRealVectorAbstractTest} for
diff --git a/src/test/java/org/apache/commons/math/linear/UnmodifiableOpenMapRealVectorTest.java b/src/test/java/org/apache/commons/math3/linear/UnmodifiableOpenMapRealVectorTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/linear/UnmodifiableOpenMapRealVectorTest.java
rename to src/test/java/org/apache/commons/math3/linear/UnmodifiableOpenMapRealVectorTest.java
index 840d77a7d..d88c690f1 100644
--- a/src/test/java/org/apache/commons/math/linear/UnmodifiableOpenMapRealVectorTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/UnmodifiableOpenMapRealVectorTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
 /**
  * This is an implementation of {@link UnmodifiableRealVectorAbstractTest} for
diff --git a/src/test/java/org/apache/commons/math/linear/UnmodifiableRealVectorAbstractTest.java b/src/test/java/org/apache/commons/math3/linear/UnmodifiableRealVectorAbstractTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/linear/UnmodifiableRealVectorAbstractTest.java
rename to src/test/java/org/apache/commons/math3/linear/UnmodifiableRealVectorAbstractTest.java
index b5214ab4f..6dbce62f2 100644
--- a/src/test/java/org/apache/commons/math/linear/UnmodifiableRealVectorAbstractTest.java
+++ b/src/test/java/org/apache/commons/math3/linear/UnmodifiableRealVectorAbstractTest.java
@@ -14,7 +14,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.apache.commons.math.linear;
+package org.apache.commons.math3.linear;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -23,10 +23,10 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Random;
 
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.analysis.function.Sin;
-import org.apache.commons.math.exception.MathUnsupportedOperationException;
-import org.apache.commons.math.linear.RealVector.Entry;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.analysis.function.Sin;
+import org.apache.commons.math3.exception.MathUnsupportedOperationException;
+import org.apache.commons.math3.linear.RealVector.Entry;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/ode/ContinuousOutputModelTest.java b/src/test/java/org/apache/commons/math3/ode/ContinuousOutputModelTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/math/ode/ContinuousOutputModelTest.java
rename to src/test/java/org/apache/commons/math3/ode/ContinuousOutputModelTest.java
index 11b98ab57..6cd86b25d 100644
--- a/src/test/java/org/apache/commons/math/ode/ContinuousOutputModelTest.java
+++ b/src/test/java/org/apache/commons/math3/ode/ContinuousOutputModelTest.java
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math3.ode;
 
 import java.util.Random;
 
-import org.apache.commons.math.ode.nonstiff.DormandPrince54Integrator;
-import org.apache.commons.math.ode.nonstiff.DormandPrince853Integrator;
-import org.apache.commons.math.ode.sampling.DummyStepInterpolator;
-import org.apache.commons.math.ode.sampling.StepInterpolator;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.ode.nonstiff.DormandPrince54Integrator;
+import org.apache.commons.math3.ode.nonstiff.DormandPrince853Integrator;
+import org.apache.commons.math3.ode.sampling.DummyStepInterpolator;
+import org.apache.commons.math3.ode.sampling.StepInterpolator;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/src/test/java/org/apache/commons/math/ode/FirstOrderConverterTest.java b/src/test/java/org/apache/commons/math3/ode/FirstOrderConverterTest.java
similarity index 91%
rename from src/test/java/org/apache/commons/math/ode/FirstOrderConverterTest.java
rename to src/test/java/org/apache/commons/math3/ode/FirstOrderConverterTest.java
index 14d6a3318..918a0d576 100644
--- a/src/test/java/org/apache/commons/math/ode/FirstOrderConverterTest.java
+++ b/src/test/java/org/apache/commons/math3/ode/FirstOrderConverterTest.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math3.ode;
 
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.MathIllegalStateException;
-import org.apache.commons.math.ode.nonstiff.ClassicalRungeKuttaIntegrator;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.MathIllegalStateException;
+import org.apache.commons.math3.ode.nonstiff.ClassicalRungeKuttaIntegrator;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/ode/JacobianMatricesTest.java b/src/test/java/org/apache/commons/math3/ode/JacobianMatricesTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/ode/JacobianMatricesTest.java
rename to src/test/java/org/apache/commons/math3/ode/JacobianMatricesTest.java
index 3077e191f..3de831a6a 100644
--- a/src/test/java/org/apache/commons/math/ode/JacobianMatricesTest.java
+++ b/src/test/java/org/apache/commons/math3/ode/JacobianMatricesTest.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math3.ode;
 
-import org.apache.commons.math.ode.nonstiff.DormandPrince54Integrator;
-import org.apache.commons.math.stat.descriptive.SummaryStatistics;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.ode.nonstiff.DormandPrince54Integrator;
+import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/ode/TestProblem1.java b/src/test/java/org/apache/commons/math3/ode/TestProblem1.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/ode/TestProblem1.java
rename to src/test/java/org/apache/commons/math3/ode/TestProblem1.java
index fd786b621..06d19fd36 100644
--- a/src/test/java/org/apache/commons/math/ode/TestProblem1.java
+++ b/src/test/java/org/apache/commons/math3/ode/TestProblem1.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math3.ode;
 
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.util.FastMath;
 
 /**
  * This class is used in the junit tests for the ODE integrators.
diff --git a/src/test/java/org/apache/commons/math/ode/TestProblem2.java b/src/test/java/org/apache/commons/math3/ode/TestProblem2.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/ode/TestProblem2.java
rename to src/test/java/org/apache/commons/math3/ode/TestProblem2.java
index 6fab74821..64befe2a9 100644
--- a/src/test/java/org/apache/commons/math/ode/TestProblem2.java
+++ b/src/test/java/org/apache/commons/math3/ode/TestProblem2.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math3.ode;
 
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.util.FastMath;
 
 /**
  * This class is used in the junit tests for the ODE integrators.
diff --git a/src/test/java/org/apache/commons/math/ode/TestProblem3.java b/src/test/java/org/apache/commons/math3/ode/TestProblem3.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/ode/TestProblem3.java
rename to src/test/java/org/apache/commons/math3/ode/TestProblem3.java
index 988387941..c74bb66ba 100644
--- a/src/test/java/org/apache/commons/math/ode/TestProblem3.java
+++ b/src/test/java/org/apache/commons/math3/ode/TestProblem3.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math3.ode;
 
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.util.FastMath;
 
 /**
  * This class is used in the junit tests for the ODE integrators.
diff --git a/src/test/java/org/apache/commons/math/ode/TestProblem4.java b/src/test/java/org/apache/commons/math3/ode/TestProblem4.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/ode/TestProblem4.java
rename to src/test/java/org/apache/commons/math3/ode/TestProblem4.java
index 5a8f91540..e5c621950 100644
--- a/src/test/java/org/apache/commons/math/ode/TestProblem4.java
+++ b/src/test/java/org/apache/commons/math3/ode/TestProblem4.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math3.ode;
 
-import org.apache.commons.math.ode.events.EventHandler;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.ode.events.EventHandler;
+import org.apache.commons.math3.util.FastMath;
 
 /**
  * This class is used in the junit tests for the ODE integrators.
diff --git a/src/test/java/org/apache/commons/math/ode/TestProblem5.java b/src/test/java/org/apache/commons/math3/ode/TestProblem5.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/ode/TestProblem5.java
rename to src/test/java/org/apache/commons/math3/ode/TestProblem5.java
index 246991a63..4c3c44a20 100644
--- a/src/test/java/org/apache/commons/math/ode/TestProblem5.java
+++ b/src/test/java/org/apache/commons/math3/ode/TestProblem5.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math3.ode;
 
 /**
  * This class is used in the junit tests for the ODE integrators.
diff --git a/src/test/java/org/apache/commons/math/ode/TestProblem6.java b/src/test/java/org/apache/commons/math3/ode/TestProblem6.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/ode/TestProblem6.java
rename to src/test/java/org/apache/commons/math3/ode/TestProblem6.java
index 255706128..8530499e2 100644
--- a/src/test/java/org/apache/commons/math/ode/TestProblem6.java
+++ b/src/test/java/org/apache/commons/math3/ode/TestProblem6.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math3.ode;
 
 /**
  * This class is used in the junit tests for the ODE integrators.
diff --git a/src/test/java/org/apache/commons/math/ode/TestProblemAbstract.java b/src/test/java/org/apache/commons/math3/ode/TestProblemAbstract.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/ode/TestProblemAbstract.java
rename to src/test/java/org/apache/commons/math3/ode/TestProblemAbstract.java
index 75c0e6bd8..bfb4ecb70 100644
--- a/src/test/java/org/apache/commons/math/ode/TestProblemAbstract.java
+++ b/src/test/java/org/apache/commons/math3/ode/TestProblemAbstract.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math3.ode;
 
-import org.apache.commons.math.ode.FirstOrderDifferentialEquations;
-import org.apache.commons.math.ode.events.EventHandler;
+import org.apache.commons.math3.ode.FirstOrderDifferentialEquations;
+import org.apache.commons.math3.ode.events.EventHandler;
 
 /**
  * This class is used as the base class of the problems that are
diff --git a/src/test/java/org/apache/commons/math/ode/TestProblemFactory.java b/src/test/java/org/apache/commons/math3/ode/TestProblemFactory.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/ode/TestProblemFactory.java
rename to src/test/java/org/apache/commons/math3/ode/TestProblemFactory.java
index c9584c82b..706e140c8 100644
--- a/src/test/java/org/apache/commons/math/ode/TestProblemFactory.java
+++ b/src/test/java/org/apache/commons/math3/ode/TestProblemFactory.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math3.ode;
 
 /**
  * This class is used in the junit tests for the ODE integrators.
diff --git a/src/test/java/org/apache/commons/math/ode/TestProblemHandler.java b/src/test/java/org/apache/commons/math3/ode/TestProblemHandler.java
similarity index 95%
rename from src/test/java/org/apache/commons/math/ode/TestProblemHandler.java
rename to src/test/java/org/apache/commons/math3/ode/TestProblemHandler.java
index 8118d7173..e11b1e6a9 100644
--- a/src/test/java/org/apache/commons/math/ode/TestProblemHandler.java
+++ b/src/test/java/org/apache/commons/math3/ode/TestProblemHandler.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math3.ode;
 
-import org.apache.commons.math.ode.sampling.StepHandler;
-import org.apache.commons.math.ode.sampling.StepInterpolator;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.ode.sampling.StepHandler;
+import org.apache.commons.math3.ode.sampling.StepInterpolator;
+import org.apache.commons.math3.util.FastMath;
 
 /**
  * This class is used to handle steps for the test problems
diff --git a/src/test/java/org/apache/commons/math/ode/events/EventStateTest.java b/src/test/java/org/apache/commons/math3/ode/events/EventStateTest.java
similarity index 92%
rename from src/test/java/org/apache/commons/math/ode/events/EventStateTest.java
rename to src/test/java/org/apache/commons/math3/ode/events/EventStateTest.java
index 80d07f189..2343b18cd 100644
--- a/src/test/java/org/apache/commons/math/ode/events/EventStateTest.java
+++ b/src/test/java/org/apache/commons/math3/ode/events/EventStateTest.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode.events;
+package org.apache.commons.math3.ode.events;
 
 
-import org.apache.commons.math.analysis.solvers.BrentSolver;
-import org.apache.commons.math.ode.FirstOrderDifferentialEquations;
-import org.apache.commons.math.ode.nonstiff.DormandPrince853Integrator;
-import org.apache.commons.math.ode.sampling.AbstractStepInterpolator;
-import org.apache.commons.math.ode.sampling.DummyStepInterpolator;
+import org.apache.commons.math3.analysis.solvers.BrentSolver;
+import org.apache.commons.math3.ode.FirstOrderDifferentialEquations;
+import org.apache.commons.math3.ode.nonstiff.DormandPrince853Integrator;
+import org.apache.commons.math3.ode.sampling.AbstractStepInterpolator;
+import org.apache.commons.math3.ode.sampling.DummyStepInterpolator;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/ode/events/OverlappingEventsTest.java b/src/test/java/org/apache/commons/math3/ode/events/OverlappingEventsTest.java
similarity index 89%
rename from src/test/java/org/apache/commons/math/ode/events/OverlappingEventsTest.java
rename to src/test/java/org/apache/commons/math3/ode/events/OverlappingEventsTest.java
index 0d615b184..8df5e4b13 100644
--- a/src/test/java/org/apache/commons/math/ode/events/OverlappingEventsTest.java
+++ b/src/test/java/org/apache/commons/math3/ode/events/OverlappingEventsTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.ode.events;
+package org.apache.commons.math3.ode.events;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.math.analysis.solvers.BaseSecantSolver;
-import org.apache.commons.math.analysis.solvers.PegasusSolver;
-import org.apache.commons.math.ode.FirstOrderDifferentialEquations;
-import org.apache.commons.math.ode.FirstOrderIntegrator;
-import org.apache.commons.math.ode.nonstiff.DormandPrince853Integrator;
+import org.apache.commons.math3.analysis.solvers.BaseSecantSolver;
+import org.apache.commons.math3.analysis.solvers.PegasusSolver;
+import org.apache.commons.math3.ode.FirstOrderDifferentialEquations;
+import org.apache.commons.math3.ode.FirstOrderIntegrator;
+import org.apache.commons.math3.ode.nonstiff.DormandPrince853Integrator;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -44,7 +44,7 @@ public class OverlappingEventsTest implements FirstOrderDifferentialEquations {
 
     /** Test for events that occur at the exact same time, but due to numerical
      * calculations occur very close together instead. Uses event type 0. See
-     * {@link org.apache.commons.math.ode.events.EventHandler#g(double, double[])
+     * {@link org.apache.commons.math3.ode.events.EventHandler#g(double, double[])
      * EventHandler.g(double, double[])}.
      */
     @Test
@@ -54,7 +54,7 @@ public class OverlappingEventsTest implements FirstOrderDifferentialEquations {
 
     /** Test for events that occur at the exact same time, but due to numerical
      * calculations occur very close together instead. Uses event type 1. See
-     * {@link org.apache.commons.math.ode.events.EventHandler#g(double, double[])
+     * {@link org.apache.commons.math3.ode.events.EventHandler#g(double, double[])
      * EventHandler.g(double, double[])}.
      */
     @Test
@@ -65,7 +65,7 @@ public class OverlappingEventsTest implements FirstOrderDifferentialEquations {
     /** Test for events that occur at the exact same time, but due to numerical
      * calculations occur very close together instead.
      * @param eventType the type of events to use. See
-     * {@link org.apache.commons.math.ode.events.EventHandler#g(double, double[])
+     * {@link org.apache.commons.math3.ode.events.EventHandler#g(double, double[])
      * EventHandler.g(double, double[])}.
      */
     public void test(int eventType) {
diff --git a/src/test/java/org/apache/commons/math/ode/events/ReappearingEventTest.java b/src/test/java/org/apache/commons/math3/ode/events/ReappearingEventTest.java
similarity index 85%
rename from src/test/java/org/apache/commons/math/ode/events/ReappearingEventTest.java
rename to src/test/java/org/apache/commons/math3/ode/events/ReappearingEventTest.java
index 87a01ee4f..e7afc6727 100644
--- a/src/test/java/org/apache/commons/math/ode/events/ReappearingEventTest.java
+++ b/src/test/java/org/apache/commons/math3/ode/events/ReappearingEventTest.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.ode.events;
+package org.apache.commons.math3.ode.events;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.Arrays;
 
-import org.apache.commons.math.analysis.solvers.PegasusSolver;
-import org.apache.commons.math.ode.FirstOrderDifferentialEquations;
-import org.apache.commons.math.ode.FirstOrderIntegrator;
-import org.apache.commons.math.ode.events.EventHandler;
-import org.apache.commons.math.ode.nonstiff.DormandPrince853Integrator;
-import org.apache.commons.math.ode.nonstiff.GraggBulirschStoerIntegrator;
+import org.apache.commons.math3.analysis.solvers.PegasusSolver;
+import org.apache.commons.math3.ode.FirstOrderDifferentialEquations;
+import org.apache.commons.math3.ode.FirstOrderIntegrator;
+import org.apache.commons.math3.ode.events.EventHandler;
+import org.apache.commons.math3.ode.nonstiff.DormandPrince853Integrator;
+import org.apache.commons.math3.ode.nonstiff.GraggBulirschStoerIntegrator;
 import org.junit.Test;
 
 public class ReappearingEventTest {
diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/AdamsBashforthIntegratorTest.java b/src/test/java/org/apache/commons/math3/ode/nonstiff/AdamsBashforthIntegratorTest.java
similarity index 91%
rename from src/test/java/org/apache/commons/math/ode/nonstiff/AdamsBashforthIntegratorTest.java
rename to src/test/java/org/apache/commons/math3/ode/nonstiff/AdamsBashforthIntegratorTest.java
index 26ff54114..181d84ad2 100644
--- a/src/test/java/org/apache/commons/math/ode/nonstiff/AdamsBashforthIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math3/ode/nonstiff/AdamsBashforthIntegratorTest.java
@@ -15,18 +15,18 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode.nonstiff;
+package org.apache.commons.math3.ode.nonstiff;
 
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.MaxCountExceededException;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.ode.FirstOrderIntegrator;
-import org.apache.commons.math.ode.TestProblem1;
-import org.apache.commons.math.ode.TestProblem5;
-import org.apache.commons.math.ode.TestProblem6;
-import org.apache.commons.math.ode.TestProblemHandler;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.MaxCountExceededException;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.ode.FirstOrderIntegrator;
+import org.apache.commons.math3.ode.TestProblem1;
+import org.apache.commons.math3.ode.TestProblem5;
+import org.apache.commons.math3.ode.TestProblem6;
+import org.apache.commons.math3.ode.TestProblemHandler;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/AdamsMoultonIntegratorTest.java b/src/test/java/org/apache/commons/math3/ode/nonstiff/AdamsMoultonIntegratorTest.java
similarity index 91%
rename from src/test/java/org/apache/commons/math/ode/nonstiff/AdamsMoultonIntegratorTest.java
rename to src/test/java/org/apache/commons/math3/ode/nonstiff/AdamsMoultonIntegratorTest.java
index a073adda3..5c2a2ee4a 100644
--- a/src/test/java/org/apache/commons/math/ode/nonstiff/AdamsMoultonIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math3/ode/nonstiff/AdamsMoultonIntegratorTest.java
@@ -15,18 +15,18 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode.nonstiff;
+package org.apache.commons.math3.ode.nonstiff;
 
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.MaxCountExceededException;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.ode.FirstOrderIntegrator;
-import org.apache.commons.math.ode.TestProblem1;
-import org.apache.commons.math.ode.TestProblem5;
-import org.apache.commons.math.ode.TestProblem6;
-import org.apache.commons.math.ode.TestProblemHandler;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.MaxCountExceededException;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.ode.FirstOrderIntegrator;
+import org.apache.commons.math3.ode.TestProblem1;
+import org.apache.commons.math3.ode.TestProblem5;
+import org.apache.commons.math3.ode.TestProblem6;
+import org.apache.commons.math3.ode.TestProblemHandler;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaIntegratorTest.java b/src/test/java/org/apache/commons/math3/ode/nonstiff/ClassicalRungeKuttaIntegratorTest.java
similarity index 92%
rename from src/test/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaIntegratorTest.java
rename to src/test/java/org/apache/commons/math3/ode/nonstiff/ClassicalRungeKuttaIntegratorTest.java
index 9414c6a85..24d79aa3a 100644
--- a/src/test/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math3/ode/nonstiff/ClassicalRungeKuttaIntegratorTest.java
@@ -15,23 +15,23 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode.nonstiff;
+package org.apache.commons.math3.ode.nonstiff;
 
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.ode.FirstOrderDifferentialEquations;
-import org.apache.commons.math.ode.FirstOrderIntegrator;
-import org.apache.commons.math.ode.TestProblem1;
-import org.apache.commons.math.ode.TestProblem3;
-import org.apache.commons.math.ode.TestProblem5;
-import org.apache.commons.math.ode.TestProblemAbstract;
-import org.apache.commons.math.ode.TestProblemFactory;
-import org.apache.commons.math.ode.TestProblemHandler;
-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.FastMath;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.ode.FirstOrderDifferentialEquations;
+import org.apache.commons.math3.ode.FirstOrderIntegrator;
+import org.apache.commons.math3.ode.TestProblem1;
+import org.apache.commons.math3.ode.TestProblem3;
+import org.apache.commons.math3.ode.TestProblem5;
+import org.apache.commons.math3.ode.TestProblemAbstract;
+import org.apache.commons.math3.ode.TestProblemFactory;
+import org.apache.commons.math3.ode.TestProblemHandler;
+import org.apache.commons.math3.ode.events.EventHandler;
+import org.apache.commons.math3.ode.sampling.StepHandler;
+import org.apache.commons.math3.ode.sampling.StepInterpolator;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolatorTest.java b/src/test/java/org/apache/commons/math3/ode/nonstiff/ClassicalRungeKuttaStepInterpolatorTest.java
similarity index 91%
rename from src/test/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolatorTest.java
rename to src/test/java/org/apache/commons/math3/ode/nonstiff/ClassicalRungeKuttaStepInterpolatorTest.java
index 13b4eb28f..a88da0616 100644
--- a/src/test/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math3/ode/nonstiff/ClassicalRungeKuttaStepInterpolatorTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode.nonstiff;
+package org.apache.commons.math3.ode.nonstiff;
 
 
 import java.io.ByteArrayInputStream;
@@ -25,10 +25,10 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.Random;
 
-import org.apache.commons.math.ode.ContinuousOutputModel;
-import org.apache.commons.math.ode.TestProblem3;
-import org.apache.commons.math.ode.sampling.StepHandler;
-import org.apache.commons.math.ode.sampling.StepInterpolatorTestUtils;
+import org.apache.commons.math3.ode.ContinuousOutputModel;
+import org.apache.commons.math3.ode.TestProblem3;
+import org.apache.commons.math3.ode.sampling.StepHandler;
+import org.apache.commons.math3.ode.sampling.StepInterpolatorTestUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince54IntegratorTest.java b/src/test/java/org/apache/commons/math3/ode/nonstiff/DormandPrince54IntegratorTest.java
similarity index 93%
rename from src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince54IntegratorTest.java
rename to src/test/java/org/apache/commons/math3/ode/nonstiff/DormandPrince54IntegratorTest.java
index 0a8ae4ab7..5d6ba474b 100644
--- a/src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince54IntegratorTest.java
+++ b/src/test/java/org/apache/commons/math3/ode/nonstiff/DormandPrince54IntegratorTest.java
@@ -15,21 +15,21 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode.nonstiff;
+package org.apache.commons.math3.ode.nonstiff;
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.ode.FirstOrderIntegrator;
-import org.apache.commons.math.ode.TestProblem1;
-import org.apache.commons.math.ode.TestProblem3;
-import org.apache.commons.math.ode.TestProblem4;
-import org.apache.commons.math.ode.TestProblem5;
-import org.apache.commons.math.ode.TestProblemAbstract;
-import org.apache.commons.math.ode.TestProblemHandler;
-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.FastMath;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.ode.FirstOrderIntegrator;
+import org.apache.commons.math3.ode.TestProblem1;
+import org.apache.commons.math3.ode.TestProblem3;
+import org.apache.commons.math3.ode.TestProblem4;
+import org.apache.commons.math3.ode.TestProblem5;
+import org.apache.commons.math3.ode.TestProblemAbstract;
+import org.apache.commons.math3.ode.TestProblemHandler;
+import org.apache.commons.math3.ode.events.EventHandler;
+import org.apache.commons.math3.ode.sampling.StepHandler;
+import org.apache.commons.math3.ode.sampling.StepInterpolator;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolatorTest.java b/src/test/java/org/apache/commons/math3/ode/nonstiff/DormandPrince54StepInterpolatorTest.java
similarity index 93%
rename from src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolatorTest.java
rename to src/test/java/org/apache/commons/math3/ode/nonstiff/DormandPrince54StepInterpolatorTest.java
index 6ba85576f..12af70698 100644
--- a/src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math3/ode/nonstiff/DormandPrince54StepInterpolatorTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode.nonstiff;
+package org.apache.commons.math3.ode.nonstiff;
 
 
 import java.io.ByteArrayInputStream;
@@ -25,12 +25,12 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.Random;
 
-import org.apache.commons.math.ode.ContinuousOutputModel;
-import org.apache.commons.math.ode.TestProblem3;
-import org.apache.commons.math.ode.sampling.StepHandler;
-import org.apache.commons.math.ode.sampling.StepInterpolator;
-import org.apache.commons.math.ode.sampling.StepInterpolatorTestUtils;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.ode.ContinuousOutputModel;
+import org.apache.commons.math3.ode.TestProblem3;
+import org.apache.commons.math3.ode.sampling.StepHandler;
+import org.apache.commons.math3.ode.sampling.StepInterpolator;
+import org.apache.commons.math3.ode.sampling.StepInterpolatorTestUtils;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince853IntegratorTest.java b/src/test/java/org/apache/commons/math3/ode/nonstiff/DormandPrince853IntegratorTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince853IntegratorTest.java
rename to src/test/java/org/apache/commons/math3/ode/nonstiff/DormandPrince853IntegratorTest.java
index f62299863..fc2ce361d 100644
--- a/src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince853IntegratorTest.java
+++ b/src/test/java/org/apache/commons/math3/ode/nonstiff/DormandPrince853IntegratorTest.java
@@ -15,21 +15,21 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode.nonstiff;
+package org.apache.commons.math3.ode.nonstiff;
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.ode.FirstOrderDifferentialEquations;
-import org.apache.commons.math.ode.FirstOrderIntegrator;
-import org.apache.commons.math.ode.TestProblem1;
-import org.apache.commons.math.ode.TestProblem3;
-import org.apache.commons.math.ode.TestProblem4;
-import org.apache.commons.math.ode.TestProblem5;
-import org.apache.commons.math.ode.TestProblemHandler;
-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.FastMath;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.ode.FirstOrderDifferentialEquations;
+import org.apache.commons.math3.ode.FirstOrderIntegrator;
+import org.apache.commons.math3.ode.TestProblem1;
+import org.apache.commons.math3.ode.TestProblem3;
+import org.apache.commons.math3.ode.TestProblem4;
+import org.apache.commons.math3.ode.TestProblem5;
+import org.apache.commons.math3.ode.TestProblemHandler;
+import org.apache.commons.math3.ode.events.EventHandler;
+import org.apache.commons.math3.ode.sampling.StepHandler;
+import org.apache.commons.math3.ode.sampling.StepInterpolator;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolatorTest.java b/src/test/java/org/apache/commons/math3/ode/nonstiff/DormandPrince853StepInterpolatorTest.java
similarity index 93%
rename from src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolatorTest.java
rename to src/test/java/org/apache/commons/math3/ode/nonstiff/DormandPrince853StepInterpolatorTest.java
index f88e07516..01c81b8a4 100644
--- a/src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math3/ode/nonstiff/DormandPrince853StepInterpolatorTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode.nonstiff;
+package org.apache.commons.math3.ode.nonstiff;
 
 
 import java.io.ByteArrayInputStream;
@@ -25,12 +25,12 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.Random;
 
-import org.apache.commons.math.ode.ContinuousOutputModel;
-import org.apache.commons.math.ode.TestProblem3;
-import org.apache.commons.math.ode.sampling.StepHandler;
-import org.apache.commons.math.ode.sampling.StepInterpolator;
-import org.apache.commons.math.ode.sampling.StepInterpolatorTestUtils;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.ode.ContinuousOutputModel;
+import org.apache.commons.math3.ode.TestProblem3;
+import org.apache.commons.math3.ode.sampling.StepHandler;
+import org.apache.commons.math3.ode.sampling.StepInterpolator;
+import org.apache.commons.math3.ode.sampling.StepInterpolatorTestUtils;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/EulerIntegratorTest.java b/src/test/java/org/apache/commons/math3/ode/nonstiff/EulerIntegratorTest.java
similarity index 89%
rename from src/test/java/org/apache/commons/math/ode/nonstiff/EulerIntegratorTest.java
rename to src/test/java/org/apache/commons/math3/ode/nonstiff/EulerIntegratorTest.java
index affe289ee..c91fb318b 100644
--- a/src/test/java/org/apache/commons/math/ode/nonstiff/EulerIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math3/ode/nonstiff/EulerIntegratorTest.java
@@ -15,21 +15,21 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode.nonstiff;
+package org.apache.commons.math3.ode.nonstiff;
 
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.ode.FirstOrderDifferentialEquations;
-import org.apache.commons.math.ode.FirstOrderIntegrator;
-import org.apache.commons.math.ode.TestProblem1;
-import org.apache.commons.math.ode.TestProblem5;
-import org.apache.commons.math.ode.TestProblemAbstract;
-import org.apache.commons.math.ode.TestProblemFactory;
-import org.apache.commons.math.ode.TestProblemHandler;
-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.FastMath;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.ode.FirstOrderDifferentialEquations;
+import org.apache.commons.math3.ode.FirstOrderIntegrator;
+import org.apache.commons.math3.ode.TestProblem1;
+import org.apache.commons.math3.ode.TestProblem5;
+import org.apache.commons.math3.ode.TestProblemAbstract;
+import org.apache.commons.math3.ode.TestProblemFactory;
+import org.apache.commons.math3.ode.TestProblemHandler;
+import org.apache.commons.math3.ode.events.EventHandler;
+import org.apache.commons.math3.ode.sampling.StepHandler;
+import org.apache.commons.math3.ode.sampling.StepInterpolator;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/EulerStepInterpolatorTest.java b/src/test/java/org/apache/commons/math3/ode/nonstiff/EulerStepInterpolatorTest.java
similarity index 93%
rename from src/test/java/org/apache/commons/math/ode/nonstiff/EulerStepInterpolatorTest.java
rename to src/test/java/org/apache/commons/math3/ode/nonstiff/EulerStepInterpolatorTest.java
index 65cfe7485..000b99d51 100644
--- a/src/test/java/org/apache/commons/math/ode/nonstiff/EulerStepInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math3/ode/nonstiff/EulerStepInterpolatorTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode.nonstiff;
+package org.apache.commons.math3.ode.nonstiff;
 
 
 import java.io.ByteArrayInputStream;
@@ -25,13 +25,13 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.Random;
 
-import org.apache.commons.math.ode.ContinuousOutputModel;
-import org.apache.commons.math.ode.EquationsMapper;
-import org.apache.commons.math.ode.TestProblem1;
-import org.apache.commons.math.ode.TestProblem3;
-import org.apache.commons.math.ode.sampling.StepHandler;
-import org.apache.commons.math.ode.sampling.StepInterpolatorTestUtils;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.ode.ContinuousOutputModel;
+import org.apache.commons.math3.ode.EquationsMapper;
+import org.apache.commons.math3.ode.TestProblem1;
+import org.apache.commons.math3.ode.TestProblem3;
+import org.apache.commons.math3.ode.sampling.StepHandler;
+import org.apache.commons.math3.ode.sampling.StepInterpolatorTestUtils;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/GillIntegratorTest.java b/src/test/java/org/apache/commons/math3/ode/nonstiff/GillIntegratorTest.java
similarity index 90%
rename from src/test/java/org/apache/commons/math/ode/nonstiff/GillIntegratorTest.java
rename to src/test/java/org/apache/commons/math3/ode/nonstiff/GillIntegratorTest.java
index e3e06ce6c..3fd1a66f7 100644
--- a/src/test/java/org/apache/commons/math/ode/nonstiff/GillIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math3/ode/nonstiff/GillIntegratorTest.java
@@ -15,22 +15,22 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode.nonstiff;
+package org.apache.commons.math3.ode.nonstiff;
 
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.ode.FirstOrderDifferentialEquations;
-import org.apache.commons.math.ode.FirstOrderIntegrator;
-import org.apache.commons.math.ode.TestProblem1;
-import org.apache.commons.math.ode.TestProblem3;
-import org.apache.commons.math.ode.TestProblem5;
-import org.apache.commons.math.ode.TestProblemAbstract;
-import org.apache.commons.math.ode.TestProblemFactory;
-import org.apache.commons.math.ode.TestProblemHandler;
-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.FastMath;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.ode.FirstOrderDifferentialEquations;
+import org.apache.commons.math3.ode.FirstOrderIntegrator;
+import org.apache.commons.math3.ode.TestProblem1;
+import org.apache.commons.math3.ode.TestProblem3;
+import org.apache.commons.math3.ode.TestProblem5;
+import org.apache.commons.math3.ode.TestProblemAbstract;
+import org.apache.commons.math3.ode.TestProblemFactory;
+import org.apache.commons.math3.ode.TestProblemHandler;
+import org.apache.commons.math3.ode.events.EventHandler;
+import org.apache.commons.math3.ode.sampling.StepHandler;
+import org.apache.commons.math3.ode.sampling.StepInterpolator;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolatorTest.java b/src/test/java/org/apache/commons/math3/ode/nonstiff/GillStepInterpolatorTest.java
similarity index 91%
rename from src/test/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolatorTest.java
rename to src/test/java/org/apache/commons/math3/ode/nonstiff/GillStepInterpolatorTest.java
index fdf27dfd4..fb379024b 100644
--- a/src/test/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math3/ode/nonstiff/GillStepInterpolatorTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode.nonstiff;
+package org.apache.commons.math3.ode.nonstiff;
 
 
 import java.io.ByteArrayInputStream;
@@ -25,10 +25,10 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.Random;
 
-import org.apache.commons.math.ode.ContinuousOutputModel;
-import org.apache.commons.math.ode.TestProblem3;
-import org.apache.commons.math.ode.sampling.StepHandler;
-import org.apache.commons.math.ode.sampling.StepInterpolatorTestUtils;
+import org.apache.commons.math3.ode.ContinuousOutputModel;
+import org.apache.commons.math3.ode.TestProblem3;
+import org.apache.commons.math3.ode.sampling.StepHandler;
+import org.apache.commons.math3.ode.sampling.StepInterpolatorTestUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerIntegratorTest.java b/src/test/java/org/apache/commons/math3/ode/nonstiff/GraggBulirschStoerIntegratorTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerIntegratorTest.java
rename to src/test/java/org/apache/commons/math3/ode/nonstiff/GraggBulirschStoerIntegratorTest.java
index f516b2b9d..fe059d05b 100644
--- a/src/test/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math3/ode/nonstiff/GraggBulirschStoerIntegratorTest.java
@@ -15,22 +15,22 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode.nonstiff;
+package org.apache.commons.math3.ode.nonstiff;
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.ode.FirstOrderDifferentialEquations;
-import org.apache.commons.math.ode.FirstOrderIntegrator;
-import org.apache.commons.math.ode.TestProblem1;
-import org.apache.commons.math.ode.TestProblem3;
-import org.apache.commons.math.ode.TestProblem4;
-import org.apache.commons.math.ode.TestProblem5;
-import org.apache.commons.math.ode.TestProblemAbstract;
-import org.apache.commons.math.ode.TestProblemHandler;
-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.FastMath;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.ode.FirstOrderDifferentialEquations;
+import org.apache.commons.math3.ode.FirstOrderIntegrator;
+import org.apache.commons.math3.ode.TestProblem1;
+import org.apache.commons.math3.ode.TestProblem3;
+import org.apache.commons.math3.ode.TestProblem4;
+import org.apache.commons.math3.ode.TestProblem5;
+import org.apache.commons.math3.ode.TestProblemAbstract;
+import org.apache.commons.math3.ode.TestProblemHandler;
+import org.apache.commons.math3.ode.events.EventHandler;
+import org.apache.commons.math3.ode.sampling.StepHandler;
+import org.apache.commons.math3.ode.sampling.StepInterpolator;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java b/src/test/java/org/apache/commons/math3/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java
similarity index 93%
rename from src/test/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java
rename to src/test/java/org/apache/commons/math3/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java
index 2729ebcb2..1f5b46af0 100644
--- a/src/test/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math3/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode.nonstiff;
+package org.apache.commons.math3.ode.nonstiff;
 
 
 import java.io.ByteArrayInputStream;
@@ -25,12 +25,12 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.Random;
 
-import org.apache.commons.math.ode.ContinuousOutputModel;
-import org.apache.commons.math.ode.TestProblem3;
-import org.apache.commons.math.ode.sampling.StepHandler;
-import org.apache.commons.math.ode.sampling.StepInterpolator;
-import org.apache.commons.math.ode.sampling.StepInterpolatorTestUtils;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.ode.ContinuousOutputModel;
+import org.apache.commons.math3.ode.TestProblem3;
+import org.apache.commons.math3.ode.sampling.StepHandler;
+import org.apache.commons.math3.ode.sampling.StepInterpolator;
+import org.apache.commons.math3.ode.sampling.StepInterpolatorTestUtils;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/HighamHall54IntegratorTest.java b/src/test/java/org/apache/commons/math3/ode/nonstiff/HighamHall54IntegratorTest.java
similarity index 93%
rename from src/test/java/org/apache/commons/math/ode/nonstiff/HighamHall54IntegratorTest.java
rename to src/test/java/org/apache/commons/math3/ode/nonstiff/HighamHall54IntegratorTest.java
index 60853085b..d019981c7 100644
--- a/src/test/java/org/apache/commons/math/ode/nonstiff/HighamHall54IntegratorTest.java
+++ b/src/test/java/org/apache/commons/math3/ode/nonstiff/HighamHall54IntegratorTest.java
@@ -15,23 +15,23 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode.nonstiff;
+package org.apache.commons.math3.ode.nonstiff;
 
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.MathIllegalNumberException;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.exception.TooManyEvaluationsException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.ode.FirstOrderDifferentialEquations;
-import org.apache.commons.math.ode.FirstOrderIntegrator;
-import org.apache.commons.math.ode.TestProblem1;
-import org.apache.commons.math.ode.TestProblem3;
-import org.apache.commons.math.ode.TestProblem4;
-import org.apache.commons.math.ode.TestProblem5;
-import org.apache.commons.math.ode.TestProblemHandler;
-import org.apache.commons.math.ode.events.EventHandler;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.MathIllegalNumberException;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.exception.TooManyEvaluationsException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.ode.FirstOrderDifferentialEquations;
+import org.apache.commons.math3.ode.FirstOrderIntegrator;
+import org.apache.commons.math3.ode.TestProblem1;
+import org.apache.commons.math3.ode.TestProblem3;
+import org.apache.commons.math3.ode.TestProblem4;
+import org.apache.commons.math3.ode.TestProblem5;
+import org.apache.commons.math3.ode.TestProblemHandler;
+import org.apache.commons.math3.ode.events.EventHandler;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolatorTest.java b/src/test/java/org/apache/commons/math3/ode/nonstiff/HighamHall54StepInterpolatorTest.java
similarity index 93%
rename from src/test/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolatorTest.java
rename to src/test/java/org/apache/commons/math3/ode/nonstiff/HighamHall54StepInterpolatorTest.java
index a2b6607a0..95cd726b1 100644
--- a/src/test/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math3/ode/nonstiff/HighamHall54StepInterpolatorTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode.nonstiff;
+package org.apache.commons.math3.ode.nonstiff;
 
 
 import java.io.ByteArrayInputStream;
@@ -25,12 +25,12 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.Random;
 
-import org.apache.commons.math.ode.ContinuousOutputModel;
-import org.apache.commons.math.ode.TestProblem3;
-import org.apache.commons.math.ode.sampling.StepHandler;
-import org.apache.commons.math.ode.sampling.StepInterpolator;
-import org.apache.commons.math.ode.sampling.StepInterpolatorTestUtils;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.ode.ContinuousOutputModel;
+import org.apache.commons.math3.ode.TestProblem3;
+import org.apache.commons.math3.ode.sampling.StepHandler;
+import org.apache.commons.math3.ode.sampling.StepInterpolator;
+import org.apache.commons.math3.ode.sampling.StepInterpolatorTestUtils;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/MidpointIntegratorTest.java b/src/test/java/org/apache/commons/math3/ode/nonstiff/MidpointIntegratorTest.java
similarity index 89%
rename from src/test/java/org/apache/commons/math/ode/nonstiff/MidpointIntegratorTest.java
rename to src/test/java/org/apache/commons/math3/ode/nonstiff/MidpointIntegratorTest.java
index a55fcc840..5dae82772 100644
--- a/src/test/java/org/apache/commons/math/ode/nonstiff/MidpointIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math3/ode/nonstiff/MidpointIntegratorTest.java
@@ -15,21 +15,21 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode.nonstiff;
+package org.apache.commons.math3.ode.nonstiff;
 
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.ode.FirstOrderDifferentialEquations;
-import org.apache.commons.math.ode.FirstOrderIntegrator;
-import org.apache.commons.math.ode.TestProblem1;
-import org.apache.commons.math.ode.TestProblem5;
-import org.apache.commons.math.ode.TestProblemAbstract;
-import org.apache.commons.math.ode.TestProblemFactory;
-import org.apache.commons.math.ode.TestProblemHandler;
-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.FastMath;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.ode.FirstOrderDifferentialEquations;
+import org.apache.commons.math3.ode.FirstOrderIntegrator;
+import org.apache.commons.math3.ode.TestProblem1;
+import org.apache.commons.math3.ode.TestProblem5;
+import org.apache.commons.math3.ode.TestProblemAbstract;
+import org.apache.commons.math3.ode.TestProblemFactory;
+import org.apache.commons.math3.ode.TestProblemHandler;
+import org.apache.commons.math3.ode.events.EventHandler;
+import org.apache.commons.math3.ode.sampling.StepHandler;
+import org.apache.commons.math3.ode.sampling.StepInterpolator;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolatorTest.java b/src/test/java/org/apache/commons/math3/ode/nonstiff/MidpointStepInterpolatorTest.java
similarity index 90%
rename from src/test/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolatorTest.java
rename to src/test/java/org/apache/commons/math3/ode/nonstiff/MidpointStepInterpolatorTest.java
index 5efd99033..05c66b944 100644
--- a/src/test/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math3/ode/nonstiff/MidpointStepInterpolatorTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode.nonstiff;
+package org.apache.commons.math3.ode.nonstiff;
 
 
 import java.io.ByteArrayInputStream;
@@ -25,11 +25,11 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.Random;
 
-import org.apache.commons.math.ode.ContinuousOutputModel;
-import org.apache.commons.math.ode.TestProblem1;
-import org.apache.commons.math.ode.TestProblem3;
-import org.apache.commons.math.ode.sampling.StepHandler;
-import org.apache.commons.math.ode.sampling.StepInterpolatorTestUtils;
+import org.apache.commons.math3.ode.ContinuousOutputModel;
+import org.apache.commons.math3.ode.TestProblem1;
+import org.apache.commons.math3.ode.TestProblem3;
+import org.apache.commons.math3.ode.sampling.StepHandler;
+import org.apache.commons.math3.ode.sampling.StepInterpolatorTestUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/StepProblem.java b/src/test/java/org/apache/commons/math3/ode/nonstiff/StepProblem.java
similarity index 90%
rename from src/test/java/org/apache/commons/math/ode/nonstiff/StepProblem.java
rename to src/test/java/org/apache/commons/math3/ode/nonstiff/StepProblem.java
index 49c5cb84f..b4c823510 100644
--- a/src/test/java/org/apache/commons/math/ode/nonstiff/StepProblem.java
+++ b/src/test/java/org/apache/commons/math3/ode/nonstiff/StepProblem.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode.nonstiff;
+package org.apache.commons.math3.ode.nonstiff;
 
-import org.apache.commons.math.ode.FirstOrderDifferentialEquations;
-import org.apache.commons.math.ode.events.EventHandler;
+import org.apache.commons.math3.ode.FirstOrderDifferentialEquations;
+import org.apache.commons.math3.ode.events.EventHandler;
 
 
 public class StepProblem
diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesIntegratorTest.java b/src/test/java/org/apache/commons/math3/ode/nonstiff/ThreeEighthesIntegratorTest.java
similarity index 90%
rename from src/test/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesIntegratorTest.java
rename to src/test/java/org/apache/commons/math3/ode/nonstiff/ThreeEighthesIntegratorTest.java
index a46a6da2f..5b974568b 100644
--- a/src/test/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math3/ode/nonstiff/ThreeEighthesIntegratorTest.java
@@ -15,22 +15,22 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode.nonstiff;
+package org.apache.commons.math3.ode.nonstiff;
 
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.ode.FirstOrderDifferentialEquations;
-import org.apache.commons.math.ode.FirstOrderIntegrator;
-import org.apache.commons.math.ode.TestProblem1;
-import org.apache.commons.math.ode.TestProblem3;
-import org.apache.commons.math.ode.TestProblem5;
-import org.apache.commons.math.ode.TestProblemAbstract;
-import org.apache.commons.math.ode.TestProblemFactory;
-import org.apache.commons.math.ode.TestProblemHandler;
-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.FastMath;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.ode.FirstOrderDifferentialEquations;
+import org.apache.commons.math3.ode.FirstOrderIntegrator;
+import org.apache.commons.math3.ode.TestProblem1;
+import org.apache.commons.math3.ode.TestProblem3;
+import org.apache.commons.math3.ode.TestProblem5;
+import org.apache.commons.math3.ode.TestProblemAbstract;
+import org.apache.commons.math3.ode.TestProblemFactory;
+import org.apache.commons.math3.ode.TestProblemHandler;
+import org.apache.commons.math3.ode.events.EventHandler;
+import org.apache.commons.math3.ode.sampling.StepHandler;
+import org.apache.commons.math3.ode.sampling.StepInterpolator;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolatorTest.java b/src/test/java/org/apache/commons/math3/ode/nonstiff/ThreeEighthesStepInterpolatorTest.java
similarity index 91%
rename from src/test/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolatorTest.java
rename to src/test/java/org/apache/commons/math3/ode/nonstiff/ThreeEighthesStepInterpolatorTest.java
index e60e0656e..14c5fc673 100644
--- a/src/test/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math3/ode/nonstiff/ThreeEighthesStepInterpolatorTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode.nonstiff;
+package org.apache.commons.math3.ode.nonstiff;
 
 
 import java.io.ByteArrayInputStream;
@@ -25,10 +25,10 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.Random;
 
-import org.apache.commons.math.ode.ContinuousOutputModel;
-import org.apache.commons.math.ode.TestProblem3;
-import org.apache.commons.math.ode.sampling.StepHandler;
-import org.apache.commons.math.ode.sampling.StepInterpolatorTestUtils;
+import org.apache.commons.math3.ode.ContinuousOutputModel;
+import org.apache.commons.math3.ode.TestProblem3;
+import org.apache.commons.math3.ode.sampling.StepHandler;
+import org.apache.commons.math3.ode.sampling.StepInterpolatorTestUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/ode/sampling/DummyStepInterpolator.java b/src/test/java/org/apache/commons/math3/ode/sampling/DummyStepInterpolator.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/ode/sampling/DummyStepInterpolator.java
rename to src/test/java/org/apache/commons/math3/ode/sampling/DummyStepInterpolator.java
index 6fb20b86b..9d9671e79 100644
--- a/src/test/java/org/apache/commons/math/ode/sampling/DummyStepInterpolator.java
+++ b/src/test/java/org/apache/commons/math3/ode/sampling/DummyStepInterpolator.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode.sampling;
+package org.apache.commons.math3.ode.sampling;
 
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 
-import org.apache.commons.math.ode.EquationsMapper;
+import org.apache.commons.math3.ode.EquationsMapper;
 
 /** This class is a step interpolator that does nothing.
  *
@@ -52,7 +52,7 @@ public class DummyStepInterpolator
    * should be called before using the instance in order to initialize
    * the internal arrays. This constructor is used only in order to delay
    * the initialization in some cases. As an example, the {@link
-   * org.apache.commons.math.ode.nonstiff.EmbeddedRungeKuttaIntegrator} uses
+   * org.apache.commons.math3.ode.nonstiff.EmbeddedRungeKuttaIntegrator} uses
    * the prototyping design pattern to create the step interpolators by
    * cloning an uninitialized model and latter initializing the copy.
    */
diff --git a/src/test/java/org/apache/commons/math/ode/sampling/DummyStepInterpolatorTest.java b/src/test/java/org/apache/commons/math3/ode/sampling/DummyStepInterpolatorTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/math/ode/sampling/DummyStepInterpolatorTest.java
rename to src/test/java/org/apache/commons/math3/ode/sampling/DummyStepInterpolatorTest.java
index 316d5e846..50f35792b 100644
--- a/src/test/java/org/apache/commons/math/ode/sampling/DummyStepInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math3/ode/sampling/DummyStepInterpolatorTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode.sampling;
+package org.apache.commons.math3.ode.sampling;
 
 
 import java.io.ByteArrayInputStream;
@@ -24,9 +24,9 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
-import org.apache.commons.math.exception.MathIllegalStateException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.exception.MathIllegalStateException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/ode/sampling/NordsieckStepInterpolatorTest.java b/src/test/java/org/apache/commons/math3/ode/sampling/NordsieckStepInterpolatorTest.java
similarity index 91%
rename from src/test/java/org/apache/commons/math/ode/sampling/NordsieckStepInterpolatorTest.java
rename to src/test/java/org/apache/commons/math3/ode/sampling/NordsieckStepInterpolatorTest.java
index 58995f333..bfa341551 100644
--- a/src/test/java/org/apache/commons/math/ode/sampling/NordsieckStepInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math3/ode/sampling/NordsieckStepInterpolatorTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode.sampling;
+package org.apache.commons.math3.ode.sampling;
 
 
 import java.io.ByteArrayInputStream;
@@ -25,10 +25,10 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.Random;
 
-import org.apache.commons.math.ode.ContinuousOutputModel;
-import org.apache.commons.math.ode.TestProblem1;
-import org.apache.commons.math.ode.TestProblem3;
-import org.apache.commons.math.ode.nonstiff.AdamsBashforthIntegrator;
+import org.apache.commons.math3.ode.ContinuousOutputModel;
+import org.apache.commons.math3.ode.TestProblem1;
+import org.apache.commons.math3.ode.TestProblem3;
+import org.apache.commons.math3.ode.nonstiff.AdamsBashforthIntegrator;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/ode/sampling/StepInterpolatorTestUtils.java b/src/test/java/org/apache/commons/math3/ode/sampling/StepInterpolatorTestUtils.java
similarity index 94%
rename from src/test/java/org/apache/commons/math/ode/sampling/StepInterpolatorTestUtils.java
rename to src/test/java/org/apache/commons/math3/ode/sampling/StepInterpolatorTestUtils.java
index 206f790a7..90c2f1503 100644
--- a/src/test/java/org/apache/commons/math/ode/sampling/StepInterpolatorTestUtils.java
+++ b/src/test/java/org/apache/commons/math3/ode/sampling/StepInterpolatorTestUtils.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.ode.sampling;
+package org.apache.commons.math3.ode.sampling;
 
 
-import org.apache.commons.math.ode.FirstOrderIntegrator;
-import org.apache.commons.math.ode.TestProblemAbstract;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.ode.FirstOrderIntegrator;
+import org.apache.commons.math3.ode.TestProblemAbstract;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 
 public class StepInterpolatorTestUtils {
diff --git a/src/test/java/org/apache/commons/math/ode/sampling/StepNormalizerOutputOverlapTest.java b/src/test/java/org/apache/commons/math3/ode/sampling/StepNormalizerOutputOverlapTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/ode/sampling/StepNormalizerOutputOverlapTest.java
rename to src/test/java/org/apache/commons/math3/ode/sampling/StepNormalizerOutputOverlapTest.java
index 2abd52222..bba97eb1b 100644
--- a/src/test/java/org/apache/commons/math/ode/sampling/StepNormalizerOutputOverlapTest.java
+++ b/src/test/java/org/apache/commons/math3/ode/sampling/StepNormalizerOutputOverlapTest.java
@@ -1,4 +1,4 @@
-package org.apache.commons.math.ode.sampling;
+package org.apache.commons.math3.ode.sampling;
 
 /** Step normalizer output tests, for problems where the first and last points
  * are overlap fixed points.
diff --git a/src/test/java/org/apache/commons/math/ode/sampling/StepNormalizerOutputTest.java b/src/test/java/org/apache/commons/math3/ode/sampling/StepNormalizerOutputTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/ode/sampling/StepNormalizerOutputTest.java
rename to src/test/java/org/apache/commons/math3/ode/sampling/StepNormalizerOutputTest.java
index d454de2ed..4cea27179 100644
--- a/src/test/java/org/apache/commons/math/ode/sampling/StepNormalizerOutputTest.java
+++ b/src/test/java/org/apache/commons/math3/ode/sampling/StepNormalizerOutputTest.java
@@ -1,4 +1,4 @@
-package org.apache.commons.math.ode.sampling;
+package org.apache.commons.math3.ode.sampling;
 
 /** Step normalizer output tests, for problems where the first and last points
  * are not fixed points.
diff --git a/src/test/java/org/apache/commons/math/ode/sampling/StepNormalizerOutputTestBase.java b/src/test/java/org/apache/commons/math3/ode/sampling/StepNormalizerOutputTestBase.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/ode/sampling/StepNormalizerOutputTestBase.java
rename to src/test/java/org/apache/commons/math3/ode/sampling/StepNormalizerOutputTestBase.java
index a2eff35cf..61b68cbcb 100644
--- a/src/test/java/org/apache/commons/math/ode/sampling/StepNormalizerOutputTestBase.java
+++ b/src/test/java/org/apache/commons/math3/ode/sampling/StepNormalizerOutputTestBase.java
@@ -1,13 +1,13 @@
-package org.apache.commons.math.ode.sampling;
+package org.apache.commons.math3.ode.sampling;
 
 import static org.junit.Assert.assertArrayEquals;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.math.ode.FirstOrderDifferentialEquations;
-import org.apache.commons.math.ode.FirstOrderIntegrator;
-import org.apache.commons.math.ode.nonstiff.GraggBulirschStoerIntegrator;
+import org.apache.commons.math3.ode.FirstOrderDifferentialEquations;
+import org.apache.commons.math3.ode.FirstOrderIntegrator;
+import org.apache.commons.math3.ode.nonstiff.GraggBulirschStoerIntegrator;
 import org.junit.Test;
 
 /** Base class for step normalizer output tests. */
diff --git a/src/test/java/org/apache/commons/math/ode/sampling/StepNormalizerTest.java b/src/test/java/org/apache/commons/math3/ode/sampling/StepNormalizerTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/math/ode/sampling/StepNormalizerTest.java
rename to src/test/java/org/apache/commons/math3/ode/sampling/StepNormalizerTest.java
index ff6675a25..198f5600a 100644
--- a/src/test/java/org/apache/commons/math/ode/sampling/StepNormalizerTest.java
+++ b/src/test/java/org/apache/commons/math3/ode/sampling/StepNormalizerTest.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode.sampling;
+package org.apache.commons.math3.ode.sampling;
 
-import org.apache.commons.math.ode.FirstOrderIntegrator;
-import org.apache.commons.math.ode.TestProblem3;
-import org.apache.commons.math.ode.nonstiff.DormandPrince54Integrator;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.ode.FirstOrderIntegrator;
+import org.apache.commons.math3.ode.TestProblem3;
+import org.apache.commons.math3.ode.nonstiff.DormandPrince54Integrator;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/src/test/java/org/apache/commons/math/optimization/BatteryNISTTest.java b/src/test/java/org/apache/commons/math3/optimization/BatteryNISTTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/optimization/BatteryNISTTest.java
rename to src/test/java/org/apache/commons/math3/optimization/BatteryNISTTest.java
index eebf23fb0..2b4a4122b 100644
--- a/src/test/java/org/apache/commons/math/optimization/BatteryNISTTest.java
+++ b/src/test/java/org/apache/commons/math3/optimization/BatteryNISTTest.java
@@ -13,21 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.optimization;
+package org.apache.commons.math3.optimization;
 
 import java.util.Arrays;
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.analysis.DifferentiableMultivariateFunction;
-import org.apache.commons.math.analysis.MultivariateFunction;
-import org.apache.commons.math.analysis.MultivariateVectorFunction;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.optimization.direct.BOBYQAOptimizer;
-import org.apache.commons.math.optimization.direct.PowellOptimizer;
-import org.apache.commons.math.optimization.general.AbstractScalarDifferentiableOptimizer;
-import org.apache.commons.math.optimization.general.ConjugateGradientFormula;
-import org.apache.commons.math.optimization.general.NonLinearConjugateGradientOptimizer;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.analysis.DifferentiableMultivariateFunction;
+import org.apache.commons.math3.analysis.MultivariateFunction;
+import org.apache.commons.math3.analysis.MultivariateVectorFunction;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.optimization.direct.BOBYQAOptimizer;
+import org.apache.commons.math3.optimization.direct.PowellOptimizer;
+import org.apache.commons.math3.optimization.general.AbstractScalarDifferentiableOptimizer;
+import org.apache.commons.math3.optimization.general.ConjugateGradientFormula;
+import org.apache.commons.math3.optimization.general.NonLinearConjugateGradientOptimizer;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/optimization/DifferentiableMultivariateMultiStartOptimizerTest.java b/src/test/java/org/apache/commons/math3/optimization/DifferentiableMultivariateMultiStartOptimizerTest.java
similarity index 87%
rename from src/test/java/org/apache/commons/math/optimization/DifferentiableMultivariateMultiStartOptimizerTest.java
rename to src/test/java/org/apache/commons/math3/optimization/DifferentiableMultivariateMultiStartOptimizerTest.java
index cc76bb950..e63090d09 100644
--- a/src/test/java/org/apache/commons/math/optimization/DifferentiableMultivariateMultiStartOptimizerTest.java
+++ b/src/test/java/org/apache/commons/math3/optimization/DifferentiableMultivariateMultiStartOptimizerTest.java
@@ -15,21 +15,21 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization;
+package org.apache.commons.math3.optimization;
 
 
 import java.awt.geom.Point2D;
 import java.util.ArrayList;
 
-import org.apache.commons.math.analysis.DifferentiableMultivariateFunction;
-import org.apache.commons.math.analysis.MultivariateFunction;
-import org.apache.commons.math.analysis.MultivariateVectorFunction;
-import org.apache.commons.math.optimization.general.ConjugateGradientFormula;
-import org.apache.commons.math.optimization.general.NonLinearConjugateGradientOptimizer;
-import org.apache.commons.math.random.GaussianRandomGenerator;
-import org.apache.commons.math.random.JDKRandomGenerator;
-import org.apache.commons.math.random.RandomVectorGenerator;
-import org.apache.commons.math.random.UncorrelatedRandomVectorGenerator;
+import org.apache.commons.math3.analysis.DifferentiableMultivariateFunction;
+import org.apache.commons.math3.analysis.MultivariateFunction;
+import org.apache.commons.math3.analysis.MultivariateVectorFunction;
+import org.apache.commons.math3.optimization.general.ConjugateGradientFormula;
+import org.apache.commons.math3.optimization.general.NonLinearConjugateGradientOptimizer;
+import org.apache.commons.math3.random.GaussianRandomGenerator;
+import org.apache.commons.math3.random.JDKRandomGenerator;
+import org.apache.commons.math3.random.RandomVectorGenerator;
+import org.apache.commons.math3.random.UncorrelatedRandomVectorGenerator;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/optimization/DifferentiableMultivariateVectorMultiStartOptimizerTest.java b/src/test/java/org/apache/commons/math3/optimization/DifferentiableMultivariateVectorMultiStartOptimizerTest.java
similarity index 92%
rename from src/test/java/org/apache/commons/math/optimization/DifferentiableMultivariateVectorMultiStartOptimizerTest.java
rename to src/test/java/org/apache/commons/math3/optimization/DifferentiableMultivariateVectorMultiStartOptimizerTest.java
index 931b7c93b..25d9ed9a8 100644
--- a/src/test/java/org/apache/commons/math/optimization/DifferentiableMultivariateVectorMultiStartOptimizerTest.java
+++ b/src/test/java/org/apache/commons/math3/optimization/DifferentiableMultivariateVectorMultiStartOptimizerTest.java
@@ -15,19 +15,19 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization;
+package org.apache.commons.math3.optimization;
 
 
-import org.apache.commons.math.analysis.DifferentiableMultivariateVectorFunction;
-import org.apache.commons.math.analysis.MultivariateMatrixFunction;
-import org.apache.commons.math.exception.MathIllegalStateException;
-import org.apache.commons.math.linear.BlockRealMatrix;
-import org.apache.commons.math.linear.RealMatrix;
-import org.apache.commons.math.optimization.general.GaussNewtonOptimizer;
-import org.apache.commons.math.random.GaussianRandomGenerator;
-import org.apache.commons.math.random.JDKRandomGenerator;
-import org.apache.commons.math.random.RandomVectorGenerator;
-import org.apache.commons.math.random.UncorrelatedRandomVectorGenerator;
+import org.apache.commons.math3.analysis.DifferentiableMultivariateVectorFunction;
+import org.apache.commons.math3.analysis.MultivariateMatrixFunction;
+import org.apache.commons.math3.exception.MathIllegalStateException;
+import org.apache.commons.math3.linear.BlockRealMatrix;
+import org.apache.commons.math3.linear.RealMatrix;
+import org.apache.commons.math3.optimization.general.GaussNewtonOptimizer;
+import org.apache.commons.math3.random.GaussianRandomGenerator;
+import org.apache.commons.math3.random.JDKRandomGenerator;
+import org.apache.commons.math3.random.RandomVectorGenerator;
+import org.apache.commons.math3.random.UncorrelatedRandomVectorGenerator;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/optimization/MultivariateMultiStartOptimizerTest.java b/src/test/java/org/apache/commons/math3/optimization/MultivariateMultiStartOptimizerTest.java
similarity index 82%
rename from src/test/java/org/apache/commons/math/optimization/MultivariateMultiStartOptimizerTest.java
rename to src/test/java/org/apache/commons/math3/optimization/MultivariateMultiStartOptimizerTest.java
index 09433c852..f9444fd32 100644
--- a/src/test/java/org/apache/commons/math/optimization/MultivariateMultiStartOptimizerTest.java
+++ b/src/test/java/org/apache/commons/math3/optimization/MultivariateMultiStartOptimizerTest.java
@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization;
+package org.apache.commons.math3.optimization;
 
 
-import org.apache.commons.math.analysis.MultivariateFunction;
-import org.apache.commons.math.optimization.direct.NelderMeadSimplex;
-import org.apache.commons.math.optimization.direct.SimplexOptimizer;
-import org.apache.commons.math.random.GaussianRandomGenerator;
-import org.apache.commons.math.random.JDKRandomGenerator;
-import org.apache.commons.math.random.RandomVectorGenerator;
-import org.apache.commons.math.random.UncorrelatedRandomVectorGenerator;
+import org.apache.commons.math3.analysis.MultivariateFunction;
+import org.apache.commons.math3.optimization.direct.NelderMeadSimplex;
+import org.apache.commons.math3.optimization.direct.SimplexOptimizer;
+import org.apache.commons.math3.random.GaussianRandomGenerator;
+import org.apache.commons.math3.random.JDKRandomGenerator;
+import org.apache.commons.math3.random.RandomVectorGenerator;
+import org.apache.commons.math3.random.UncorrelatedRandomVectorGenerator;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/optimization/direct/BOBYQAOptimizerTest.java b/src/test/java/org/apache/commons/math3/optimization/direct/BOBYQAOptimizerTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/optimization/direct/BOBYQAOptimizerTest.java
rename to src/test/java/org/apache/commons/math3/optimization/direct/BOBYQAOptimizerTest.java
index 06c48ec40..375e5d2ac 100644
--- a/src/test/java/org/apache/commons/math/optimization/direct/BOBYQAOptimizerTest.java
+++ b/src/test/java/org/apache/commons/math3/optimization/direct/BOBYQAOptimizerTest.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.optimization.direct;
+package org.apache.commons.math3.optimization.direct;
 
 import java.util.Arrays;
 import java.util.Random;
 
-import org.apache.commons.math.analysis.MultivariateFunction;
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.TooManyEvaluationsException;
-import org.apache.commons.math.exception.NumberIsTooLargeException;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.optimization.GoalType;
-import org.apache.commons.math.optimization.PointValuePair;
+import org.apache.commons.math3.analysis.MultivariateFunction;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.TooManyEvaluationsException;
+import org.apache.commons.math3.exception.NumberIsTooLargeException;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.optimization.GoalType;
+import org.apache.commons.math3.optimization.PointValuePair;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/optimization/direct/CMAESOptimizerTest.java b/src/test/java/org/apache/commons/math3/optimization/direct/CMAESOptimizerTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/optimization/direct/CMAESOptimizerTest.java
rename to src/test/java/org/apache/commons/math3/optimization/direct/CMAESOptimizerTest.java
index 3b3403052..7db6b114c 100644
--- a/src/test/java/org/apache/commons/math/optimization/direct/CMAESOptimizerTest.java
+++ b/src/test/java/org/apache/commons/math3/optimization/direct/CMAESOptimizerTest.java
@@ -14,22 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.optimization.direct;
+package org.apache.commons.math3.optimization.direct;
 
 import java.util.Arrays;
 import java.util.Random;
 
-import org.apache.commons.math.Retry;
-import org.apache.commons.math.RetryRunner;
-import org.apache.commons.math.analysis.MultivariateFunction;
-import org.apache.commons.math.exception.MultiDimensionMismatchException;
-import org.apache.commons.math.exception.NoDataException;
-import org.apache.commons.math.exception.NotPositiveException;
-import org.apache.commons.math.exception.OutOfRangeException;
-import org.apache.commons.math.optimization.GoalType;
-import org.apache.commons.math.optimization.MultivariateOptimizer;
-import org.apache.commons.math.optimization.PointValuePair;
-import org.apache.commons.math.random.MersenneTwister;
+import org.apache.commons.math3.Retry;
+import org.apache.commons.math3.RetryRunner;
+import org.apache.commons.math3.analysis.MultivariateFunction;
+import org.apache.commons.math3.exception.MultiDimensionMismatchException;
+import org.apache.commons.math3.exception.NoDataException;
+import org.apache.commons.math3.exception.NotPositiveException;
+import org.apache.commons.math3.exception.OutOfRangeException;
+import org.apache.commons.math3.optimization.GoalType;
+import org.apache.commons.math3.optimization.MultivariateOptimizer;
+import org.apache.commons.math3.optimization.PointValuePair;
+import org.apache.commons.math3.random.MersenneTwister;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/org/apache/commons/math/optimization/direct/MultivariateFunctionMappingAdapterTest.java b/src/test/java/org/apache/commons/math3/optimization/direct/MultivariateFunctionMappingAdapterTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/optimization/direct/MultivariateFunctionMappingAdapterTest.java
rename to src/test/java/org/apache/commons/math3/optimization/direct/MultivariateFunctionMappingAdapterTest.java
index 02a627a8f..62f638c62 100644
--- a/src/test/java/org/apache/commons/math/optimization/direct/MultivariateFunctionMappingAdapterTest.java
+++ b/src/test/java/org/apache/commons/math3/optimization/direct/MultivariateFunctionMappingAdapterTest.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.direct;
+package org.apache.commons.math3.optimization.direct;
 
 
-import org.apache.commons.math.analysis.MultivariateFunction;
-import org.apache.commons.math.optimization.GoalType;
-import org.apache.commons.math.optimization.PointValuePair;
+import org.apache.commons.math3.analysis.MultivariateFunction;
+import org.apache.commons.math3.optimization.GoalType;
+import org.apache.commons.math3.optimization.PointValuePair;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/optimization/direct/MultivariateFunctionPenaltyAdapterTest.java b/src/test/java/org/apache/commons/math3/optimization/direct/MultivariateFunctionPenaltyAdapterTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/optimization/direct/MultivariateFunctionPenaltyAdapterTest.java
rename to src/test/java/org/apache/commons/math3/optimization/direct/MultivariateFunctionPenaltyAdapterTest.java
index becd87b08..67962699d 100644
--- a/src/test/java/org/apache/commons/math/optimization/direct/MultivariateFunctionPenaltyAdapterTest.java
+++ b/src/test/java/org/apache/commons/math3/optimization/direct/MultivariateFunctionPenaltyAdapterTest.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.direct;
+package org.apache.commons.math3.optimization.direct;
 
 
-import org.apache.commons.math.analysis.MultivariateFunction;
-import org.apache.commons.math.optimization.GoalType;
-import org.apache.commons.math.optimization.PointValuePair;
-import org.apache.commons.math.optimization.SimplePointChecker;
+import org.apache.commons.math3.analysis.MultivariateFunction;
+import org.apache.commons.math3.optimization.GoalType;
+import org.apache.commons.math3.optimization.PointValuePair;
+import org.apache.commons.math3.optimization.SimplePointChecker;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/optimization/direct/PowellOptimizerTest.java b/src/test/java/org/apache/commons/math3/optimization/direct/PowellOptimizerTest.java
similarity index 92%
rename from src/test/java/org/apache/commons/math/optimization/direct/PowellOptimizerTest.java
rename to src/test/java/org/apache/commons/math3/optimization/direct/PowellOptimizerTest.java
index 4e21ed723..e40a72cfc 100644
--- a/src/test/java/org/apache/commons/math/optimization/direct/PowellOptimizerTest.java
+++ b/src/test/java/org/apache/commons/math3/optimization/direct/PowellOptimizerTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.optimization.direct;
+package org.apache.commons.math3.optimization.direct;
 
-import org.apache.commons.math.analysis.MultivariateFunction;
-import org.apache.commons.math.analysis.SumSincFunction;
-import org.apache.commons.math.optimization.GoalType;
-import org.apache.commons.math.optimization.MultivariateOptimizer;
-import org.apache.commons.math.optimization.PointValuePair;
+import org.apache.commons.math3.analysis.MultivariateFunction;
+import org.apache.commons.math3.analysis.SumSincFunction;
+import org.apache.commons.math3.optimization.GoalType;
+import org.apache.commons.math3.optimization.MultivariateOptimizer;
+import org.apache.commons.math3.optimization.PointValuePair;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/optimization/direct/SimplexOptimizerMultiDirectionalTest.java b/src/test/java/org/apache/commons/math3/optimization/direct/SimplexOptimizerMultiDirectionalTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/optimization/direct/SimplexOptimizerMultiDirectionalTest.java
rename to src/test/java/org/apache/commons/math3/optimization/direct/SimplexOptimizerMultiDirectionalTest.java
index 43c325f51..5c222066f 100644
--- a/src/test/java/org/apache/commons/math/optimization/direct/SimplexOptimizerMultiDirectionalTest.java
+++ b/src/test/java/org/apache/commons/math3/optimization/direct/SimplexOptimizerMultiDirectionalTest.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.direct;
+package org.apache.commons.math3.optimization.direct;
 
-import org.apache.commons.math.analysis.MultivariateFunction;
-import org.apache.commons.math.optimization.GoalType;
-import org.apache.commons.math.optimization.PointValuePair;
-import org.apache.commons.math.optimization.SimpleValueChecker;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.analysis.MultivariateFunction;
+import org.apache.commons.math3.optimization.GoalType;
+import org.apache.commons.math3.optimization.PointValuePair;
+import org.apache.commons.math3.optimization.SimpleValueChecker;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/optimization/direct/SimplexOptimizerNelderMeadTest.java b/src/test/java/org/apache/commons/math3/optimization/direct/SimplexOptimizerNelderMeadTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/math/optimization/direct/SimplexOptimizerNelderMeadTest.java
rename to src/test/java/org/apache/commons/math3/optimization/direct/SimplexOptimizerNelderMeadTest.java
index e78cfe2a4..b47ff6eb4 100644
--- a/src/test/java/org/apache/commons/math/optimization/direct/SimplexOptimizerNelderMeadTest.java
+++ b/src/test/java/org/apache/commons/math3/optimization/direct/SimplexOptimizerNelderMeadTest.java
@@ -15,18 +15,18 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.direct;
+package org.apache.commons.math3.optimization.direct;
 
 
-import org.apache.commons.math.exception.TooManyEvaluationsException;
-import org.apache.commons.math.analysis.MultivariateFunction;
-import org.apache.commons.math.analysis.MultivariateVectorFunction;
-import org.apache.commons.math.linear.Array2DRowRealMatrix;
-import org.apache.commons.math.linear.RealMatrix;
-import org.apache.commons.math.optimization.GoalType;
-import org.apache.commons.math.optimization.LeastSquaresConverter;
-import org.apache.commons.math.optimization.PointValuePair;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.exception.TooManyEvaluationsException;
+import org.apache.commons.math3.analysis.MultivariateFunction;
+import org.apache.commons.math3.analysis.MultivariateVectorFunction;
+import org.apache.commons.math3.linear.Array2DRowRealMatrix;
+import org.apache.commons.math3.linear.RealMatrix;
+import org.apache.commons.math3.optimization.GoalType;
+import org.apache.commons.math3.optimization.LeastSquaresConverter;
+import org.apache.commons.math3.optimization.PointValuePair;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/optimization/fitting/CurveFitterTest.java b/src/test/java/org/apache/commons/math3/optimization/fitting/CurveFitterTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/math/optimization/fitting/CurveFitterTest.java
rename to src/test/java/org/apache/commons/math3/optimization/fitting/CurveFitterTest.java
index e79b49462..77b29714c 100644
--- a/src/test/java/org/apache/commons/math/optimization/fitting/CurveFitterTest.java
+++ b/src/test/java/org/apache/commons/math3/optimization/fitting/CurveFitterTest.java
@@ -15,11 +15,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.commons.math.optimization.fitting;
+package org.apache.commons.math3.optimization.fitting;
 
-import org.apache.commons.math.optimization.general.LevenbergMarquardtOptimizer;
-import org.apache.commons.math.analysis.ParametricUnivariateFunction;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.optimization.general.LevenbergMarquardtOptimizer;
+import org.apache.commons.math3.analysis.ParametricUnivariateFunction;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/optimization/fitting/GaussianFitterTest.java b/src/test/java/org/apache/commons/math3/optimization/fitting/GaussianFitterTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/optimization/fitting/GaussianFitterTest.java
rename to src/test/java/org/apache/commons/math3/optimization/fitting/GaussianFitterTest.java
index ba7ab8062..69a6bd785 100644
--- a/src/test/java/org/apache/commons/math/optimization/fitting/GaussianFitterTest.java
+++ b/src/test/java/org/apache/commons/math3/optimization/fitting/GaussianFitterTest.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.fitting;
+package org.apache.commons.math3.optimization.fitting;
 
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.optimization.general.LevenbergMarquardtOptimizer;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.optimization.general.LevenbergMarquardtOptimizer;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/optimization/fitting/HarmonicFitterTest.java b/src/test/java/org/apache/commons/math3/optimization/fitting/HarmonicFitterTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/math/optimization/fitting/HarmonicFitterTest.java
rename to src/test/java/org/apache/commons/math3/optimization/fitting/HarmonicFitterTest.java
index c08de3a6f..910ba1ba6 100644
--- a/src/test/java/org/apache/commons/math/optimization/fitting/HarmonicFitterTest.java
+++ b/src/test/java/org/apache/commons/math3/optimization/fitting/HarmonicFitterTest.java
@@ -15,15 +15,15 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.commons.math.optimization.fitting;
+package org.apache.commons.math3.optimization.fitting;
 
 import java.util.Random;
 
-import org.apache.commons.math.analysis.function.HarmonicOscillator;
-import org.apache.commons.math.optimization.general.LevenbergMarquardtOptimizer;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.util.MathUtils;
+import org.apache.commons.math3.analysis.function.HarmonicOscillator;
+import org.apache.commons.math3.optimization.general.LevenbergMarquardtOptimizer;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.util.MathUtils;
 
 import org.junit.Test;
 import org.junit.Assert;
diff --git a/src/test/java/org/apache/commons/math/optimization/fitting/PolynomialFitterTest.java b/src/test/java/org/apache/commons/math3/optimization/fitting/PolynomialFitterTest.java
similarity index 90%
rename from src/test/java/org/apache/commons/math/optimization/fitting/PolynomialFitterTest.java
rename to src/test/java/org/apache/commons/math3/optimization/fitting/PolynomialFitterTest.java
index 96fa79524..97566672d 100644
--- a/src/test/java/org/apache/commons/math/optimization/fitting/PolynomialFitterTest.java
+++ b/src/test/java/org/apache/commons/math3/optimization/fitting/PolynomialFitterTest.java
@@ -15,16 +15,16 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.commons.math.optimization.fitting;
+package org.apache.commons.math3.optimization.fitting;
 
 import java.util.Random;
 
-import org.apache.commons.math.analysis.polynomials.PolynomialFunction;
-import org.apache.commons.math.exception.ConvergenceException;
-import org.apache.commons.math.optimization.DifferentiableMultivariateVectorOptimizer;
-import org.apache.commons.math.optimization.general.GaussNewtonOptimizer;
-import org.apache.commons.math.optimization.general.LevenbergMarquardtOptimizer;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.analysis.polynomials.PolynomialFunction;
+import org.apache.commons.math3.exception.ConvergenceException;
+import org.apache.commons.math3.optimization.DifferentiableMultivariateVectorOptimizer;
+import org.apache.commons.math3.optimization.general.GaussNewtonOptimizer;
+import org.apache.commons.math3.optimization.general.LevenbergMarquardtOptimizer;
+import org.apache.commons.math3.util.FastMath;
 
 import org.junit.Test;
 import org.junit.Assert;
diff --git a/src/test/java/org/apache/commons/math/optimization/general/CircleScalar.java b/src/test/java/org/apache/commons/math3/optimization/general/CircleScalar.java
similarity index 91%
rename from src/test/java/org/apache/commons/math/optimization/general/CircleScalar.java
rename to src/test/java/org/apache/commons/math3/optimization/general/CircleScalar.java
index 1cfc3be09..6aaf6adf5 100644
--- a/src/test/java/org/apache/commons/math/optimization/general/CircleScalar.java
+++ b/src/test/java/org/apache/commons/math3/optimization/general/CircleScalar.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.general;
+package org.apache.commons.math3.optimization.general;
 
 import java.awt.geom.Point2D;
 import java.util.ArrayList;
-import org.apache.commons.math.analysis.DifferentiableMultivariateFunction;
-import org.apache.commons.math.analysis.MultivariateFunction;
-import org.apache.commons.math.analysis.MultivariateVectorFunction;
+import org.apache.commons.math3.analysis.DifferentiableMultivariateFunction;
+import org.apache.commons.math3.analysis.MultivariateFunction;
+import org.apache.commons.math3.analysis.MultivariateVectorFunction;
 
 /**
  * Class used in the tests.
diff --git a/src/test/java/org/apache/commons/math/optimization/general/CircleVectorial.java b/src/test/java/org/apache/commons/math3/optimization/general/CircleVectorial.java
similarity index 93%
rename from src/test/java/org/apache/commons/math/optimization/general/CircleVectorial.java
rename to src/test/java/org/apache/commons/math3/optimization/general/CircleVectorial.java
index 28ef23b4b..4605b996b 100644
--- a/src/test/java/org/apache/commons/math/optimization/general/CircleVectorial.java
+++ b/src/test/java/org/apache/commons/math3/optimization/general/CircleVectorial.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.general;
+package org.apache.commons.math3.optimization.general;
 
 import java.awt.geom.Point2D;
 import java.util.ArrayList;
-import org.apache.commons.math.analysis.DifferentiableMultivariateVectorFunction;
-import org.apache.commons.math.analysis.MultivariateMatrixFunction;
+import org.apache.commons.math3.analysis.DifferentiableMultivariateVectorFunction;
+import org.apache.commons.math3.analysis.MultivariateMatrixFunction;
 
 /**
  * Class used in the tests.
diff --git a/src/test/java/org/apache/commons/math/optimization/general/GaussNewtonOptimizerTest.java b/src/test/java/org/apache/commons/math3/optimization/general/GaussNewtonOptimizerTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/optimization/general/GaussNewtonOptimizerTest.java
rename to src/test/java/org/apache/commons/math3/optimization/general/GaussNewtonOptimizerTest.java
index 073d0cc33..b261e27a0 100644
--- a/src/test/java/org/apache/commons/math/optimization/general/GaussNewtonOptimizerTest.java
+++ b/src/test/java/org/apache/commons/math3/optimization/general/GaussNewtonOptimizerTest.java
@@ -15,23 +15,23 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.general;
+package org.apache.commons.math3.optimization.general;
 
 import java.awt.geom.Point2D;
 import java.io.Serializable;
 import java.util.Arrays;
 
 
-import org.apache.commons.math.exception.ConvergenceException;
-import org.apache.commons.math.exception.TooManyEvaluationsException;
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.analysis.DifferentiableMultivariateVectorFunction;
-import org.apache.commons.math.analysis.MultivariateMatrixFunction;
-import org.apache.commons.math.linear.BlockRealMatrix;
-import org.apache.commons.math.linear.RealMatrix;
-import org.apache.commons.math.optimization.SimpleVectorValueChecker;
-import org.apache.commons.math.optimization.PointVectorValuePair;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.exception.ConvergenceException;
+import org.apache.commons.math3.exception.TooManyEvaluationsException;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.analysis.DifferentiableMultivariateVectorFunction;
+import org.apache.commons.math3.analysis.MultivariateMatrixFunction;
+import org.apache.commons.math3.linear.BlockRealMatrix;
+import org.apache.commons.math3.linear.RealMatrix;
+import org.apache.commons.math3.optimization.SimpleVectorValueChecker;
+import org.apache.commons.math3.optimization.PointVectorValuePair;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/optimization/general/LevenbergMarquardtOptimizerTest.java b/src/test/java/org/apache/commons/math3/optimization/general/LevenbergMarquardtOptimizerTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/optimization/general/LevenbergMarquardtOptimizerTest.java
rename to src/test/java/org/apache/commons/math3/optimization/general/LevenbergMarquardtOptimizerTest.java
index e7e15153b..ebc491ddc 100644
--- a/src/test/java/org/apache/commons/math/optimization/general/LevenbergMarquardtOptimizerTest.java
+++ b/src/test/java/org/apache/commons/math3/optimization/general/LevenbergMarquardtOptimizerTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.general;
+package org.apache.commons.math3.optimization.general;
 
 import java.awt.geom.Point2D;
 import java.io.Serializable;
@@ -24,19 +24,19 @@ import java.util.Arrays;
 import java.util.List;
 
 
-import org.apache.commons.math.exception.ConvergenceException;
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.TooManyEvaluationsException;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.analysis.DifferentiableMultivariateVectorFunction;
-import org.apache.commons.math.analysis.MultivariateMatrixFunction;
-import org.apache.commons.math.linear.BlockRealMatrix;
-import org.apache.commons.math.linear.RealMatrix;
-import org.apache.commons.math.linear.SingularMatrixException;
-import org.apache.commons.math.optimization.SimpleVectorValueChecker;
-import org.apache.commons.math.optimization.PointVectorValuePair;
-import org.apache.commons.math.util.Precision;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.exception.ConvergenceException;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.TooManyEvaluationsException;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.analysis.DifferentiableMultivariateVectorFunction;
+import org.apache.commons.math3.analysis.MultivariateMatrixFunction;
+import org.apache.commons.math3.linear.BlockRealMatrix;
+import org.apache.commons.math3.linear.RealMatrix;
+import org.apache.commons.math3.linear.SingularMatrixException;
+import org.apache.commons.math3.optimization.SimpleVectorValueChecker;
+import org.apache.commons.math3.optimization.PointVectorValuePair;
+import org.apache.commons.math3.util.Precision;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/optimization/general/MinpackTest.java b/src/test/java/org/apache/commons/math3/optimization/general/MinpackTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/optimization/general/MinpackTest.java
rename to src/test/java/org/apache/commons/math3/optimization/general/MinpackTest.java
index 973f913c9..6d88e504a 100644
--- a/src/test/java/org/apache/commons/math/optimization/general/MinpackTest.java
+++ b/src/test/java/org/apache/commons/math3/optimization/general/MinpackTest.java
@@ -15,17 +15,17 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.general;
+package org.apache.commons.math3.optimization.general;
 
 import java.io.Serializable;
 import java.util.Arrays;
 
 
-import org.apache.commons.math.exception.TooManyEvaluationsException;
-import org.apache.commons.math.analysis.DifferentiableMultivariateVectorFunction;
-import org.apache.commons.math.analysis.MultivariateMatrixFunction;
-import org.apache.commons.math.optimization.PointVectorValuePair;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.exception.TooManyEvaluationsException;
+import org.apache.commons.math3.analysis.DifferentiableMultivariateVectorFunction;
+import org.apache.commons.math3.analysis.MultivariateMatrixFunction;
+import org.apache.commons.math3.optimization.PointVectorValuePair;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizerTest.java b/src/test/java/org/apache/commons/math3/optimization/general/NonLinearConjugateGradientOptimizerTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizerTest.java
rename to src/test/java/org/apache/commons/math3/optimization/general/NonLinearConjugateGradientOptimizerTest.java
index 8dd435613..275719a11 100644
--- a/src/test/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizerTest.java
+++ b/src/test/java/org/apache/commons/math3/optimization/general/NonLinearConjugateGradientOptimizerTest.java
@@ -15,19 +15,19 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.general;
+package org.apache.commons.math3.optimization.general;
 
 import java.awt.geom.Point2D;
 import java.io.Serializable;
-import org.apache.commons.math.analysis.DifferentiableMultivariateFunction;
-import org.apache.commons.math.analysis.MultivariateFunction;
-import org.apache.commons.math.analysis.MultivariateVectorFunction;
-import org.apache.commons.math.analysis.solvers.BrentSolver;
-import org.apache.commons.math.linear.BlockRealMatrix;
-import org.apache.commons.math.linear.RealMatrix;
-import org.apache.commons.math.optimization.GoalType;
-import org.apache.commons.math.optimization.PointValuePair;
-import org.apache.commons.math.optimization.SimpleValueChecker;
+import org.apache.commons.math3.analysis.DifferentiableMultivariateFunction;
+import org.apache.commons.math3.analysis.MultivariateFunction;
+import org.apache.commons.math3.analysis.MultivariateVectorFunction;
+import org.apache.commons.math3.analysis.solvers.BrentSolver;
+import org.apache.commons.math3.linear.BlockRealMatrix;
+import org.apache.commons.math3.linear.RealMatrix;
+import org.apache.commons.math3.optimization.GoalType;
+import org.apache.commons.math3.optimization.PointValuePair;
+import org.apache.commons.math3.optimization.SimpleValueChecker;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/optimization/linear/SimplexSolverTest.java b/src/test/java/org/apache/commons/math3/optimization/linear/SimplexSolverTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/optimization/linear/SimplexSolverTest.java
rename to src/test/java/org/apache/commons/math3/optimization/linear/SimplexSolverTest.java
index 3e951c6ba..4b1a4b5c9 100644
--- a/src/test/java/org/apache/commons/math/optimization/linear/SimplexSolverTest.java
+++ b/src/test/java/org/apache/commons/math3/optimization/linear/SimplexSolverTest.java
@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.linear;
+package org.apache.commons.math3.optimization.linear;
 
 import org.junit.Assert;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.apache.commons.math.optimization.GoalType;
-import org.apache.commons.math.optimization.PointValuePair;
-import org.apache.commons.math.util.Precision;
+import org.apache.commons.math3.optimization.GoalType;
+import org.apache.commons.math3.optimization.PointValuePair;
+import org.apache.commons.math3.util.Precision;
 import org.junit.Test;
 
 public class SimplexSolverTest {
diff --git a/src/test/java/org/apache/commons/math/optimization/linear/SimplexTableauTest.java b/src/test/java/org/apache/commons/math3/optimization/linear/SimplexTableauTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/optimization/linear/SimplexTableauTest.java
rename to src/test/java/org/apache/commons/math3/optimization/linear/SimplexTableauTest.java
index d41c2385d..efbef43b9 100644
--- a/src/test/java/org/apache/commons/math/optimization/linear/SimplexTableauTest.java
+++ b/src/test/java/org/apache/commons/math3/optimization/linear/SimplexTableauTest.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.linear;
+package org.apache.commons.math3.optimization.linear;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.optimization.GoalType;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.optimization.GoalType;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/optimization/univariate/BracketFinderTest.java b/src/test/java/org/apache/commons/math3/optimization/univariate/BracketFinderTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/math/optimization/univariate/BracketFinderTest.java
rename to src/test/java/org/apache/commons/math3/optimization/univariate/BracketFinderTest.java
index ad38e533a..465efbbe3 100644
--- a/src/test/java/org/apache/commons/math/optimization/univariate/BracketFinderTest.java
+++ b/src/test/java/org/apache/commons/math3/optimization/univariate/BracketFinderTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.optimization.univariate;
+package org.apache.commons.math3.optimization.univariate;
 
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.optimization.GoalType;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.optimization.GoalType;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/optimization/univariate/BrentOptimizerTest.java b/src/test/java/org/apache/commons/math3/optimization/univariate/BrentOptimizerTest.java
similarity index 91%
rename from src/test/java/org/apache/commons/math/optimization/univariate/BrentOptimizerTest.java
rename to src/test/java/org/apache/commons/math3/optimization/univariate/BrentOptimizerTest.java
index 45eb5fab8..b8e56c7f7 100644
--- a/src/test/java/org/apache/commons/math/optimization/univariate/BrentOptimizerTest.java
+++ b/src/test/java/org/apache/commons/math3/optimization/univariate/BrentOptimizerTest.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.optimization.univariate;
+package org.apache.commons.math3.optimization.univariate;
 
 
-import org.apache.commons.math.exception.TooManyEvaluationsException;
-import org.apache.commons.math.analysis.QuinticFunction;
-import org.apache.commons.math.analysis.SinFunction;
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.optimization.GoalType;
-import org.apache.commons.math.stat.descriptive.DescriptiveStatistics;
+import org.apache.commons.math3.exception.TooManyEvaluationsException;
+import org.apache.commons.math3.analysis.QuinticFunction;
+import org.apache.commons.math3.analysis.SinFunction;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.optimization.GoalType;
+import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/optimization/univariate/UnivariateMultiStartOptimizerTest.java b/src/test/java/org/apache/commons/math3/optimization/univariate/UnivariateMultiStartOptimizerTest.java
similarity index 90%
rename from src/test/java/org/apache/commons/math/optimization/univariate/UnivariateMultiStartOptimizerTest.java
rename to src/test/java/org/apache/commons/math3/optimization/univariate/UnivariateMultiStartOptimizerTest.java
index 79abd1d9c..33b9f0153 100644
--- a/src/test/java/org/apache/commons/math/optimization/univariate/UnivariateMultiStartOptimizerTest.java
+++ b/src/test/java/org/apache/commons/math3/optimization/univariate/UnivariateMultiStartOptimizerTest.java
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.optimization.univariate;
+package org.apache.commons.math3.optimization.univariate;
 
-import org.apache.commons.math.analysis.QuinticFunction;
-import org.apache.commons.math.analysis.SinFunction;
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.optimization.univariate.BrentOptimizer;
-import org.apache.commons.math.optimization.GoalType;
-import org.apache.commons.math.random.JDKRandomGenerator;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.analysis.QuinticFunction;
+import org.apache.commons.math3.analysis.SinFunction;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.optimization.univariate.BrentOptimizer;
+import org.apache.commons.math3.optimization.GoalType;
+import org.apache.commons.math3.random.JDKRandomGenerator;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Test;
 import org.junit.Assert;
 
diff --git a/src/test/java/org/apache/commons/math/random/AbstractRandomGeneratorTest.java b/src/test/java/org/apache/commons/math3/random/AbstractRandomGeneratorTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/random/AbstractRandomGeneratorTest.java
rename to src/test/java/org/apache/commons/math3/random/AbstractRandomGeneratorTest.java
index 96236e98c..366d79fe8 100644
--- a/src/test/java/org/apache/commons/math/random/AbstractRandomGeneratorTest.java
+++ b/src/test/java/org/apache/commons/math3/random/AbstractRandomGeneratorTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
 /**
  * Test cases for the AbstractRandomGenerator class.
diff --git a/src/test/java/org/apache/commons/math/random/BitsStreamGeneratorTest.java b/src/test/java/org/apache/commons/math3/random/BitsStreamGeneratorTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/random/BitsStreamGeneratorTest.java
rename to src/test/java/org/apache/commons/math3/random/BitsStreamGeneratorTest.java
index 4b8a1f5f4..4d2d115a5 100644
--- a/src/test/java/org/apache/commons/math/random/BitsStreamGeneratorTest.java
+++ b/src/test/java/org/apache/commons/math3/random/BitsStreamGeneratorTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
 import java.util.Random;
 
diff --git a/src/test/java/org/apache/commons/math/random/CorrelatedRandomVectorGeneratorTest.java b/src/test/java/org/apache/commons/math3/random/CorrelatedRandomVectorGeneratorTest.java
similarity index 93%
rename from src/test/java/org/apache/commons/math/random/CorrelatedRandomVectorGeneratorTest.java
rename to src/test/java/org/apache/commons/math3/random/CorrelatedRandomVectorGeneratorTest.java
index fcfecddb0..167382a8f 100644
--- a/src/test/java/org/apache/commons/math/random/CorrelatedRandomVectorGeneratorTest.java
+++ b/src/test/java/org/apache/commons/math3/random/CorrelatedRandomVectorGeneratorTest.java
@@ -15,13 +15,13 @@
 //specific language governing permissions and limitations
 //under the License.
 
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
-import org.apache.commons.math.linear.MatrixUtils;
-import org.apache.commons.math.linear.RealMatrix;
-import org.apache.commons.math.stat.descriptive.moment.VectorialCovariance;
-import org.apache.commons.math.stat.descriptive.moment.VectorialMean;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.linear.MatrixUtils;
+import org.apache.commons.math3.linear.RealMatrix;
+import org.apache.commons.math3.stat.descriptive.moment.VectorialCovariance;
+import org.apache.commons.math3.stat.descriptive.moment.VectorialMean;
+import org.apache.commons.math3.util.FastMath;
 
 import org.junit.Test;
 import org.junit.Assert;
diff --git a/src/test/java/org/apache/commons/math/random/EmpiricalDistributionTest.java b/src/test/java/org/apache/commons/math3/random/EmpiricalDistributionTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/random/EmpiricalDistributionTest.java
rename to src/test/java/org/apache/commons/math3/random/EmpiricalDistributionTest.java
index 7604a9f83..610e8d1a6 100644
--- a/src/test/java/org/apache/commons/math/random/EmpiricalDistributionTest.java
+++ b/src/test/java/org/apache/commons/math3/random/EmpiricalDistributionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -23,9 +23,9 @@ import java.io.InputStreamReader;
 import java.net.URL;
 import java.util.ArrayList;
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.stat.descriptive.SummaryStatistics;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/random/GaussianRandomGeneratorTest.java b/src/test/java/org/apache/commons/math3/random/GaussianRandomGeneratorTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/math/random/GaussianRandomGeneratorTest.java
rename to src/test/java/org/apache/commons/math3/random/GaussianRandomGeneratorTest.java
index 01be9889f..ecb325e9d 100644
--- a/src/test/java/org/apache/commons/math/random/GaussianRandomGeneratorTest.java
+++ b/src/test/java/org/apache/commons/math3/random/GaussianRandomGeneratorTest.java
@@ -15,9 +15,9 @@
 //specific language governing permissions and limitations
 //under the License.
 
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
-import org.apache.commons.math.stat.StatUtils;
+import org.apache.commons.math3.stat.StatUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/random/ISAACTest.java b/src/test/java/org/apache/commons/math3/random/ISAACTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/random/ISAACTest.java
rename to src/test/java/org/apache/commons/math3/random/ISAACTest.java
index d6346cc7f..f2edbbd1e 100644
--- a/src/test/java/org/apache/commons/math/random/ISAACTest.java
+++ b/src/test/java/org/apache/commons/math3/random/ISAACTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/random/MersenneTwisterTest.java b/src/test/java/org/apache/commons/math3/random/MersenneTwisterTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/random/MersenneTwisterTest.java
rename to src/test/java/org/apache/commons/math3/random/MersenneTwisterTest.java
index cf75cc0ae..9769cdfeb 100644
--- a/src/test/java/org/apache/commons/math/random/MersenneTwisterTest.java
+++ b/src/test/java/org/apache/commons/math3/random/MersenneTwisterTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/random/RandomAdaptorTest.java b/src/test/java/org/apache/commons/math3/random/RandomAdaptorTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/random/RandomAdaptorTest.java
rename to src/test/java/org/apache/commons/math3/random/RandomAdaptorTest.java
index b525279d4..aa83838b1 100644
--- a/src/test/java/org/apache/commons/math/random/RandomAdaptorTest.java
+++ b/src/test/java/org/apache/commons/math3/random/RandomAdaptorTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
 import java.util.Random;
 
diff --git a/src/test/java/org/apache/commons/math/random/RandomDataTest.java b/src/test/java/org/apache/commons/math3/random/RandomDataTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/random/RandomDataTest.java
rename to src/test/java/org/apache/commons/math3/random/RandomDataTest.java
index 54169a503..8d9d4bf57 100644
--- a/src/test/java/org/apache/commons/math/random/RandomDataTest.java
+++ b/src/test/java/org/apache/commons/math3/random/RandomDataTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;
@@ -22,31 +22,31 @@ import java.util.HashSet;
 import java.util.List;
 
 
-import org.apache.commons.math.Retry;
-import org.apache.commons.math.RetryRunner;
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.distribution.BetaDistribution;
-import org.apache.commons.math.distribution.BinomialDistribution;
-import org.apache.commons.math.distribution.BinomialDistributionTest;
-import org.apache.commons.math.distribution.CauchyDistribution;
-import org.apache.commons.math.distribution.ChiSquaredDistribution;
-import org.apache.commons.math.distribution.ExponentialDistribution;
-import org.apache.commons.math.distribution.FDistribution;
-import org.apache.commons.math.distribution.GammaDistribution;
-import org.apache.commons.math.distribution.HypergeometricDistribution;
-import org.apache.commons.math.distribution.HypergeometricDistributionTest;
-import org.apache.commons.math.distribution.PascalDistribution;
-import org.apache.commons.math.distribution.PascalDistributionTest;
-import org.apache.commons.math.distribution.PoissonDistribution;
-import org.apache.commons.math.distribution.TDistribution;
-import org.apache.commons.math.distribution.WeibullDistribution;
-import org.apache.commons.math.distribution.ZipfDistribution;
-import org.apache.commons.math.distribution.ZipfDistributionTest;
-import org.apache.commons.math.stat.Frequency;
-import org.apache.commons.math.stat.descriptive.SummaryStatistics;
-import org.apache.commons.math.stat.inference.ChiSquareTest;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.Retry;
+import org.apache.commons.math3.RetryRunner;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.distribution.BetaDistribution;
+import org.apache.commons.math3.distribution.BinomialDistribution;
+import org.apache.commons.math3.distribution.BinomialDistributionTest;
+import org.apache.commons.math3.distribution.CauchyDistribution;
+import org.apache.commons.math3.distribution.ChiSquaredDistribution;
+import org.apache.commons.math3.distribution.ExponentialDistribution;
+import org.apache.commons.math3.distribution.FDistribution;
+import org.apache.commons.math3.distribution.GammaDistribution;
+import org.apache.commons.math3.distribution.HypergeometricDistribution;
+import org.apache.commons.math3.distribution.HypergeometricDistributionTest;
+import org.apache.commons.math3.distribution.PascalDistribution;
+import org.apache.commons.math3.distribution.PascalDistributionTest;
+import org.apache.commons.math3.distribution.PoissonDistribution;
+import org.apache.commons.math3.distribution.TDistribution;
+import org.apache.commons.math3.distribution.WeibullDistribution;
+import org.apache.commons.math3.distribution.ZipfDistribution;
+import org.apache.commons.math3.distribution.ZipfDistributionTest;
+import org.apache.commons.math3.stat.Frequency;
+import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
+import org.apache.commons.math3.stat.inference.ChiSquareTest;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/org/apache/commons/math/random/RandomGeneratorAbstractTest.java b/src/test/java/org/apache/commons/math3/random/RandomGeneratorAbstractTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/random/RandomGeneratorAbstractTest.java
rename to src/test/java/org/apache/commons/math3/random/RandomGeneratorAbstractTest.java
index 61707fdcb..81a40f594 100644
--- a/src/test/java/org/apache/commons/math/random/RandomGeneratorAbstractTest.java
+++ b/src/test/java/org/apache/commons/math3/random/RandomGeneratorAbstractTest.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
 import java.util.Arrays;
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.stat.Frequency;
-import org.apache.commons.math.stat.descriptive.SummaryStatistics;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.stat.Frequency;
+import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
 
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/src/test/java/org/apache/commons/math/random/StableRandomGeneratorTest.java b/src/test/java/org/apache/commons/math3/random/StableRandomGeneratorTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/math/random/StableRandomGeneratorTest.java
rename to src/test/java/org/apache/commons/math3/random/StableRandomGeneratorTest.java
index a0509cfdf..bd5eb0e5d 100644
--- a/src/test/java/org/apache/commons/math/random/StableRandomGeneratorTest.java
+++ b/src/test/java/org/apache/commons/math3/random/StableRandomGeneratorTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
-import org.apache.commons.math.exception.OutOfRangeException;
-import org.apache.commons.math.stat.StatUtils;
-import org.apache.commons.math.stat.descriptive.DescriptiveStatistics;
+import org.apache.commons.math3.exception.OutOfRangeException;
+import org.apache.commons.math3.stat.StatUtils;
+import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/random/TestRandomGenerator.java b/src/test/java/org/apache/commons/math3/random/TestRandomGenerator.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/random/TestRandomGenerator.java
rename to src/test/java/org/apache/commons/math3/random/TestRandomGenerator.java
index 362ac55e0..8d0136f6f 100644
--- a/src/test/java/org/apache/commons/math/random/TestRandomGenerator.java
+++ b/src/test/java/org/apache/commons/math3/random/TestRandomGenerator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 import java.util.Random;
 
 /**
diff --git a/src/test/java/org/apache/commons/math/random/UncorrelatedRandomVectorGeneratorTest.java b/src/test/java/org/apache/commons/math3/random/UncorrelatedRandomVectorGeneratorTest.java
similarity index 91%
rename from src/test/java/org/apache/commons/math/random/UncorrelatedRandomVectorGeneratorTest.java
rename to src/test/java/org/apache/commons/math3/random/UncorrelatedRandomVectorGeneratorTest.java
index 7d8f29472..419527384 100644
--- a/src/test/java/org/apache/commons/math/random/UncorrelatedRandomVectorGeneratorTest.java
+++ b/src/test/java/org/apache/commons/math3/random/UncorrelatedRandomVectorGeneratorTest.java
@@ -15,11 +15,11 @@
 //specific language governing permissions and limitations
 //under the License.
 
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
-import org.apache.commons.math.linear.RealMatrix;
-import org.apache.commons.math.stat.descriptive.moment.VectorialCovariance;
-import org.apache.commons.math.stat.descriptive.moment.VectorialMean;
+import org.apache.commons.math3.linear.RealMatrix;
+import org.apache.commons.math3.stat.descriptive.moment.VectorialCovariance;
+import org.apache.commons.math3.stat.descriptive.moment.VectorialMean;
 
 import org.junit.Test;
 import org.junit.Assert;
diff --git a/src/test/java/org/apache/commons/math/random/UniformRandomGeneratorTest.java b/src/test/java/org/apache/commons/math3/random/UniformRandomGeneratorTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/math/random/UniformRandomGeneratorTest.java
rename to src/test/java/org/apache/commons/math3/random/UniformRandomGeneratorTest.java
index 336c8ed6b..554a3eb78 100644
--- a/src/test/java/org/apache/commons/math/random/UniformRandomGeneratorTest.java
+++ b/src/test/java/org/apache/commons/math3/random/UniformRandomGeneratorTest.java
@@ -15,9 +15,9 @@
 //specific language governing permissions and limitations
 //under the License.
 
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
-import org.apache.commons.math.stat.StatUtils;
+import org.apache.commons.math3.stat.StatUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/random/ValueServerTest.java b/src/test/java/org/apache/commons/math3/random/ValueServerTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/random/ValueServerTest.java
rename to src/test/java/org/apache/commons/math3/random/ValueServerTest.java
index 973a402d9..934208805 100644
--- a/src/test/java/org/apache/commons/math/random/ValueServerTest.java
+++ b/src/test/java/org/apache/commons/math3/random/ValueServerTest.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
 import java.net.URL;
 import java.util.Arrays;
 
-import org.apache.commons.math.RetryRunner;
-import org.apache.commons.math.exception.MathIllegalStateException;
-import org.apache.commons.math.exception.ZeroException;
-import org.apache.commons.math.stat.descriptive.SummaryStatistics;
+import org.apache.commons.math3.RetryRunner;
+import org.apache.commons.math3.exception.MathIllegalStateException;
+import org.apache.commons.math3.exception.ZeroException;
+import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/random/Well1024aTest.java b/src/test/java/org/apache/commons/math3/random/Well1024aTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/random/Well1024aTest.java
rename to src/test/java/org/apache/commons/math3/random/Well1024aTest.java
index 3adc4fc73..239194c75 100644
--- a/src/test/java/org/apache/commons/math/random/Well1024aTest.java
+++ b/src/test/java/org/apache/commons/math3/random/Well1024aTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
 import org.junit.Assert;
 
diff --git a/src/test/java/org/apache/commons/math/random/Well19937aTest.java b/src/test/java/org/apache/commons/math3/random/Well19937aTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/random/Well19937aTest.java
rename to src/test/java/org/apache/commons/math3/random/Well19937aTest.java
index 4920b96c1..ff9fe958f 100644
--- a/src/test/java/org/apache/commons/math/random/Well19937aTest.java
+++ b/src/test/java/org/apache/commons/math3/random/Well19937aTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/random/Well19937cTest.java b/src/test/java/org/apache/commons/math3/random/Well19937cTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/random/Well19937cTest.java
rename to src/test/java/org/apache/commons/math3/random/Well19937cTest.java
index b2fe777f6..a9f7a8e01 100644
--- a/src/test/java/org/apache/commons/math/random/Well19937cTest.java
+++ b/src/test/java/org/apache/commons/math3/random/Well19937cTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/random/Well44497aTest.java b/src/test/java/org/apache/commons/math3/random/Well44497aTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/random/Well44497aTest.java
rename to src/test/java/org/apache/commons/math3/random/Well44497aTest.java
index 87659cde4..ac46eb7a5 100644
--- a/src/test/java/org/apache/commons/math/random/Well44497aTest.java
+++ b/src/test/java/org/apache/commons/math3/random/Well44497aTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/random/Well44497bTest.java b/src/test/java/org/apache/commons/math3/random/Well44497bTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/random/Well44497bTest.java
rename to src/test/java/org/apache/commons/math3/random/Well44497bTest.java
index 150ecdd9b..23be9718d 100644
--- a/src/test/java/org/apache/commons/math/random/Well44497bTest.java
+++ b/src/test/java/org/apache/commons/math3/random/Well44497bTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/random/Well512aTest.java b/src/test/java/org/apache/commons/math3/random/Well512aTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/random/Well512aTest.java
rename to src/test/java/org/apache/commons/math3/random/Well512aTest.java
index e66e13a7f..3bfed1d36 100644
--- a/src/test/java/org/apache/commons/math/random/Well512aTest.java
+++ b/src/test/java/org/apache/commons/math3/random/Well512aTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.random;
+package org.apache.commons.math3.random;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/special/BetaTest.java b/src/test/java/org/apache/commons/math3/special/BetaTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/special/BetaTest.java
rename to src/test/java/org/apache/commons/math3/special/BetaTest.java
index b08dff69c..066c69005 100644
--- a/src/test/java/org/apache/commons/math/special/BetaTest.java
+++ b/src/test/java/org/apache/commons/math3/special/BetaTest.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.special;
+package org.apache.commons.math3.special;
 
-import org.apache.commons.math.TestUtils;
+import org.apache.commons.math3.TestUtils;
 
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/special/ErfTest.java b/src/test/java/org/apache/commons/math3/special/ErfTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/special/ErfTest.java
rename to src/test/java/org/apache/commons/math3/special/ErfTest.java
index f0abcafd0..045a75cb3 100644
--- a/src/test/java/org/apache/commons/math/special/ErfTest.java
+++ b/src/test/java/org/apache/commons/math3/special/ErfTest.java
@@ -15,10 +15,10 @@
  *  limitations under the License.
  */
 
-package org.apache.commons.math.special;
+package org.apache.commons.math3.special;
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.util.FastMath;
 
 import org.junit.Test;
 import org.junit.Assert;
diff --git a/src/test/java/org/apache/commons/math/special/GammaTest.java b/src/test/java/org/apache/commons/math3/special/GammaTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/special/GammaTest.java
rename to src/test/java/org/apache/commons/math3/special/GammaTest.java
index 03aa0f812..2ed775838 100644
--- a/src/test/java/org/apache/commons/math/special/GammaTest.java
+++ b/src/test/java/org/apache/commons/math3/special/GammaTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.special;
+package org.apache.commons.math3.special;
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.util.FastMath;
 
 import org.junit.Test;
 import org.junit.Assert;
diff --git a/src/test/java/org/apache/commons/math/stat/CertifiedDataTest.java b/src/test/java/org/apache/commons/math3/stat/CertifiedDataTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/stat/CertifiedDataTest.java
rename to src/test/java/org/apache/commons/math3/stat/CertifiedDataTest.java
index 6991c9030..8a9867f37 100644
--- a/src/test/java/org/apache/commons/math/stat/CertifiedDataTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/CertifiedDataTest.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat;
+package org.apache.commons.math3.stat;
 
 import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 
 
-import org.apache.commons.math.stat.descriptive.DescriptiveStatistics;
-import org.apache.commons.math.stat.descriptive.SummaryStatistics;
+import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
+import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/stat/FrequencyTest.java b/src/test/java/org/apache/commons/math3/stat/FrequencyTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/stat/FrequencyTest.java
rename to src/test/java/org/apache/commons/math3/stat/FrequencyTest.java
index 1ef98e13c..fc79462c5 100644
--- a/src/test/java/org/apache/commons/math/stat/FrequencyTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/FrequencyTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat;
+package org.apache.commons.math3.stat;
 
 import java.io.BufferedReader;
 import java.io.StringReader;
 import java.util.Iterator;
 
 
-import org.apache.commons.math.TestUtils;
+import org.apache.commons.math3.TestUtils;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/stat/StatUtilsTest.java b/src/test/java/org/apache/commons/math3/stat/StatUtilsTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/stat/StatUtilsTest.java
rename to src/test/java/org/apache/commons/math3/stat/StatUtilsTest.java
index 07495ae65..7b64ecb81 100644
--- a/src/test/java/org/apache/commons/math/stat/StatUtilsTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/StatUtilsTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat;
+package org.apache.commons.math3.stat;
 
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.stat.descriptive.DescriptiveStatistics;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.util.Precision;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.util.Precision;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/stat/clustering/EuclideanIntegerPointTest.java b/src/test/java/org/apache/commons/math3/stat/clustering/EuclideanIntegerPointTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/math/stat/clustering/EuclideanIntegerPointTest.java
rename to src/test/java/org/apache/commons/math3/stat/clustering/EuclideanIntegerPointTest.java
index 44a874335..15d3ab663 100644
--- a/src/test/java/org/apache/commons/math/stat/clustering/EuclideanIntegerPointTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/clustering/EuclideanIntegerPointTest.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.stat.clustering;
+package org.apache.commons.math3.stat.clustering;
 
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/stat/clustering/KMeansPlusPlusClustererTest.java b/src/test/java/org/apache/commons/math3/stat/clustering/KMeansPlusPlusClustererTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/stat/clustering/KMeansPlusPlusClustererTest.java
rename to src/test/java/org/apache/commons/math3/stat/clustering/KMeansPlusPlusClustererTest.java
index 96d6a34ac..d42f154f3 100644
--- a/src/test/java/org/apache/commons/math/stat/clustering/KMeansPlusPlusClustererTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/clustering/KMeansPlusPlusClustererTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.stat.clustering;
+package org.apache.commons.math3.stat.clustering;
 
 
 import java.util.ArrayList;
@@ -24,7 +24,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Random;
 
-import org.apache.commons.math.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/stat/correlation/CovarianceTest.java b/src/test/java/org/apache/commons/math3/stat/correlation/CovarianceTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/stat/correlation/CovarianceTest.java
rename to src/test/java/org/apache/commons/math3/stat/correlation/CovarianceTest.java
index 74d761d0a..7f0e3c298 100644
--- a/src/test/java/org/apache/commons/math/stat/correlation/CovarianceTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/correlation/CovarianceTest.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.correlation;
+package org.apache.commons.math3.stat.correlation;
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.linear.RealMatrix;
-import org.apache.commons.math.linear.Array2DRowRealMatrix;
-import org.apache.commons.math.stat.descriptive.moment.Variance;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.linear.RealMatrix;
+import org.apache.commons.math3.linear.Array2DRowRealMatrix;
+import org.apache.commons.math3.stat.descriptive.moment.Variance;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/stat/correlation/PearsonsCorrelationTest.java b/src/test/java/org/apache/commons/math3/stat/correlation/PearsonsCorrelationTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/stat/correlation/PearsonsCorrelationTest.java
rename to src/test/java/org/apache/commons/math3/stat/correlation/PearsonsCorrelationTest.java
index 30f4b4f33..a5a5c4787 100644
--- a/src/test/java/org/apache/commons/math/stat/correlation/PearsonsCorrelationTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/correlation/PearsonsCorrelationTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.correlation;
+package org.apache.commons.math3.stat.correlation;
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.distribution.TDistribution;
-import org.apache.commons.math.linear.RealMatrix;
-import org.apache.commons.math.linear.BlockRealMatrix;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.distribution.TDistribution;
+import org.apache.commons.math3.linear.RealMatrix;
+import org.apache.commons.math3.linear.BlockRealMatrix;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/stat/correlation/SpearmansRankCorrelationTest.java b/src/test/java/org/apache/commons/math3/stat/correlation/SpearmansRankCorrelationTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/stat/correlation/SpearmansRankCorrelationTest.java
rename to src/test/java/org/apache/commons/math3/stat/correlation/SpearmansRankCorrelationTest.java
index d6421e1e4..e2ac829fc 100644
--- a/src/test/java/org/apache/commons/math/stat/correlation/SpearmansRankCorrelationTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/correlation/SpearmansRankCorrelationTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.correlation;
+package org.apache.commons.math3.stat.correlation;
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.linear.BlockRealMatrix;
-import org.apache.commons.math.linear.RealMatrix;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.linear.BlockRealMatrix;
+import org.apache.commons.math3.linear.RealMatrix;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/stat/correlation/StorelessCovarianceTest.java b/src/test/java/org/apache/commons/math3/stat/correlation/StorelessCovarianceTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/stat/correlation/StorelessCovarianceTest.java
rename to src/test/java/org/apache/commons/math3/stat/correlation/StorelessCovarianceTest.java
index 96b933cec..8d9a2de68 100644
--- a/src/test/java/org/apache/commons/math/stat/correlation/StorelessCovarianceTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/correlation/StorelessCovarianceTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.correlation;
+package org.apache.commons.math3.stat.correlation;
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.linear.Array2DRowRealMatrix;
-import org.apache.commons.math.linear.RealMatrix;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.linear.Array2DRowRealMatrix;
+import org.apache.commons.math3.linear.RealMatrix;
 import org.junit.Test;
 
 
diff --git a/src/test/java/org/apache/commons/math/stat/data/CertifiedDataAbstractTest.java b/src/test/java/org/apache/commons/math3/stat/data/CertifiedDataAbstractTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/math/stat/data/CertifiedDataAbstractTest.java
rename to src/test/java/org/apache/commons/math3/stat/data/CertifiedDataAbstractTest.java
index c949831aa..1c77d997a 100644
--- a/src/test/java/org/apache/commons/math/stat/data/CertifiedDataAbstractTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/data/CertifiedDataAbstractTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.stat.data;
+package org.apache.commons.math3.stat.data;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -27,9 +27,9 @@ import java.util.HashMap;
 import java.util.Map;
 
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.stat.descriptive.DescriptiveStatistics;
-import org.apache.commons.math.stat.descriptive.SummaryStatistics;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
+import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/src/test/java/org/apache/commons/math/stat/data/LewTest.java b/src/test/java/org/apache/commons/math3/stat/data/LewTest.java
similarity index 90%
rename from src/test/java/org/apache/commons/math/stat/data/LewTest.java
rename to src/test/java/org/apache/commons/math3/stat/data/LewTest.java
index ba3463a72..beeac36bc 100644
--- a/src/test/java/org/apache/commons/math/stat/data/LewTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/data/LewTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.stat.data;
+package org.apache.commons.math3.stat.data;
 
 /**
  * @version $Id$
@@ -24,6 +24,6 @@ public class LewTest extends CertifiedDataAbstractTest {
 
     @Override
     protected String getResourceName() {
-        return "org/apache/commons/math/stat/data/Lew.txt";
+        return "org/apache/commons/math3/stat/data/Lew.txt";
     }
 }
diff --git a/src/test/java/org/apache/commons/math/stat/data/LotteryTest.java b/src/test/java/org/apache/commons/math3/stat/data/LotteryTest.java
similarity index 89%
rename from src/test/java/org/apache/commons/math/stat/data/LotteryTest.java
rename to src/test/java/org/apache/commons/math3/stat/data/LotteryTest.java
index 80a464002..b23600fbe 100644
--- a/src/test/java/org/apache/commons/math/stat/data/LotteryTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/data/LotteryTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.stat.data;
+package org.apache.commons.math3.stat.data;
 
 /**
  * @version $Id$
@@ -24,6 +24,6 @@ public class LotteryTest extends CertifiedDataAbstractTest {
 
     @Override
     protected String getResourceName() {
-        return "org/apache/commons/math/stat/data/Lottery.txt";
+        return "org/apache/commons/math3/stat/data/Lottery.txt";
     }
 }
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/AbstractUnivariateStatisticTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/AbstractUnivariateStatisticTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/math/stat/descriptive/AbstractUnivariateStatisticTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/AbstractUnivariateStatisticTest.java
index dc7268f24..bf3e0e9f6 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/AbstractUnivariateStatisticTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/AbstractUnivariateStatisticTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive;
+package org.apache.commons.math3.stat.descriptive;
 
 
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.stat.descriptive.moment.Mean;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.stat.descriptive.moment.Mean;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/AggregateSummaryStatisticsTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/AggregateSummaryStatisticsTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/stat/descriptive/AggregateSummaryStatisticsTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/AggregateSummaryStatisticsTest.java
index 22b6c8c0b..fce706e78 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/AggregateSummaryStatisticsTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/AggregateSummaryStatisticsTest.java
@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.stat.descriptive;
+package org.apache.commons.math3.stat.descriptive;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.random.RandomData;
-import org.apache.commons.math.random.RandomDataImpl;
-import org.apache.commons.math.util.Precision;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.random.RandomData;
+import org.apache.commons.math3.random.RandomDataImpl;
+import org.apache.commons.math3.util.Precision;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/DescriptiveStatisticsTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/DescriptiveStatisticsTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/math/stat/descriptive/DescriptiveStatisticsTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/DescriptiveStatisticsTest.java
index e0cdbee23..702d7b333 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/DescriptiveStatisticsTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/DescriptiveStatisticsTest.java
@@ -11,21 +11,21 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive;
+package org.apache.commons.math3.stat.descriptive;
 
 import java.util.Locale;
 
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.stat.descriptive.rank.Percentile;
-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.Variance;
-import org.apache.commons.math.stat.descriptive.rank.Max;
-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.SumOfSquares;
-import org.apache.commons.math.util.Precision;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.stat.descriptive.rank.Percentile;
+import org.apache.commons.math3.stat.descriptive.moment.GeometricMean;
+import org.apache.commons.math3.stat.descriptive.moment.Mean;
+import org.apache.commons.math3.stat.descriptive.moment.Variance;
+import org.apache.commons.math3.stat.descriptive.rank.Max;
+import org.apache.commons.math3.stat.descriptive.rank.Min;
+import org.apache.commons.math3.stat.descriptive.summary.Sum;
+import org.apache.commons.math3.stat.descriptive.summary.SumOfSquares;
+import org.apache.commons.math3.util.Precision;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/ListUnivariateImpl.java b/src/test/java/org/apache/commons/math3/stat/descriptive/ListUnivariateImpl.java
similarity index 93%
rename from src/test/java/org/apache/commons/math/stat/descriptive/ListUnivariateImpl.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/ListUnivariateImpl.java
index c996217c7..7820f4d48 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/ListUnivariateImpl.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/ListUnivariateImpl.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive;
+package org.apache.commons.math3.stat.descriptive;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.stat.descriptive.UnivariateStatistic;
-import org.apache.commons.math.stat.descriptive.DescriptiveStatistics;
-import org.apache.commons.math.util.DefaultTransformer;
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.util.NumberTransformer;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.stat.descriptive.UnivariateStatistic;
+import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
+import org.apache.commons.math3.util.DefaultTransformer;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.util.NumberTransformer;
 
 /**
  * @version $Id$
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/ListUnivariateImplTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/ListUnivariateImplTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/stat/descriptive/ListUnivariateImplTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/ListUnivariateImplTest.java
index f899d1cb1..b6878f6a0 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/ListUnivariateImplTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/ListUnivariateImplTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive;
+package org.apache.commons.math3.stat.descriptive;
 
 import java.util.ArrayList;
 import java.util.List;
 
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/MixedListUnivariateImplTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/MixedListUnivariateImplTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/stat/descriptive/MixedListUnivariateImplTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/MixedListUnivariateImplTest.java
index ae27c3a30..0d5ec71eb 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/MixedListUnivariateImplTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/MixedListUnivariateImplTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive;
+package org.apache.commons.math3.stat.descriptive;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
 
-import org.apache.commons.math.util.FastMath;
-import org.apache.commons.math.util.NumberTransformer;
-import org.apache.commons.math.util.TransformerMap;
+import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math3.util.NumberTransformer;
+import org.apache.commons.math3.util.TransformerMap;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/MultivariateSummaryStatisticsTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/MultivariateSummaryStatisticsTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/stat/descriptive/MultivariateSummaryStatisticsTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/MultivariateSummaryStatisticsTest.java
index 99648da18..172d536d8 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/MultivariateSummaryStatisticsTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/MultivariateSummaryStatisticsTest.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive;
+package org.apache.commons.math3.stat.descriptive;
 
 
 import java.util.Locale;
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.stat.descriptive.moment.Mean;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.stat.descriptive.moment.Mean;
+import org.apache.commons.math3.util.FastMath;
 
 import org.junit.Test;
 import org.junit.Assert;
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/StatisticalSummaryValuesTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/StatisticalSummaryValuesTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/stat/descriptive/StatisticalSummaryValuesTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/StatisticalSummaryValuesTest.java
index ca4562903..162c9dba4 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/StatisticalSummaryValuesTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/StatisticalSummaryValuesTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive;
+package org.apache.commons.math3.stat.descriptive;
 
 
 import java.util.Locale;
 
 
-import org.apache.commons.math.TestUtils;
+import org.apache.commons.math3.TestUtils;
 import org.junit.Assert;
 import org.junit.Test;
 /**
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/StorelessUnivariateStatisticAbstractTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/StorelessUnivariateStatisticAbstractTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/stat/descriptive/StorelessUnivariateStatisticAbstractTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/StorelessUnivariateStatisticAbstractTest.java
index 2b71738e7..d67aa54d4 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/StorelessUnivariateStatisticAbstractTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/StorelessUnivariateStatisticAbstractTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive;
+package org.apache.commons.math3.stat.descriptive;
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.stat.descriptive.moment.SecondMoment;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.stat.descriptive.moment.SecondMoment;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/SummaryStatisticsTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/SummaryStatisticsTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/stat/descriptive/SummaryStatisticsTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/SummaryStatisticsTest.java
index 53cf5656d..8b2239810 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/SummaryStatisticsTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/SummaryStatisticsTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive;
+package org.apache.commons.math3.stat.descriptive;
 
 
-import org.apache.commons.math.TestUtils;
+import org.apache.commons.math3.TestUtils;
 
-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.Variance;
-import org.apache.commons.math.stat.descriptive.summary.Sum;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.stat.descriptive.moment.GeometricMean;
+import org.apache.commons.math3.stat.descriptive.moment.Mean;
+import org.apache.commons.math3.stat.descriptive.moment.Variance;
+import org.apache.commons.math3.stat.descriptive.summary.Sum;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 /**
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/SynchronizedDescriptiveStatisticsTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/SynchronizedDescriptiveStatisticsTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/math/stat/descriptive/SynchronizedDescriptiveStatisticsTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/SynchronizedDescriptiveStatisticsTest.java
index bd5ee575d..12da15a5c 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/SynchronizedDescriptiveStatisticsTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/SynchronizedDescriptiveStatisticsTest.java
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive;
+package org.apache.commons.math3.stat.descriptive;
 
 
 /**
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/SynchronizedMultivariateSummaryStatisticsTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/SynchronizedMultivariateSummaryStatisticsTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/stat/descriptive/SynchronizedMultivariateSummaryStatisticsTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/SynchronizedMultivariateSummaryStatisticsTest.java
index 3f5ee134f..49abefd3e 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/SynchronizedMultivariateSummaryStatisticsTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/SynchronizedMultivariateSummaryStatisticsTest.java
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive;
+package org.apache.commons.math3.stat.descriptive;
 
 
 /**
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/SynchronizedSummaryStatisticsTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/SynchronizedSummaryStatisticsTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/math/stat/descriptive/SynchronizedSummaryStatisticsTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/SynchronizedSummaryStatisticsTest.java
index f5459fc43..36aa75dbf 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/SynchronizedSummaryStatisticsTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/SynchronizedSummaryStatisticsTest.java
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive;
+package org.apache.commons.math3.stat.descriptive;
 
 /**
  * Test cases for the {@link SynchronizedSummaryStatisticsTest} class.
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/UnivariateStatisticAbstractTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/UnivariateStatisticAbstractTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/stat/descriptive/UnivariateStatisticAbstractTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/UnivariateStatisticAbstractTest.java
index 3e142a188..9b739d447 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/UnivariateStatisticAbstractTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/UnivariateStatisticAbstractTest.java
@@ -14,16 +14,16 @@ s * Unless required by applicable law or agreed to in writing, software
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive;
+package org.apache.commons.math3.stat.descriptive;
 
 import java.util.ArrayList;
 import java.util.List;
 
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.random.RandomData;
-import org.apache.commons.math.random.RandomDataImpl;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.random.RandomData;
+import org.apache.commons.math3.random.RandomDataImpl;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/moment/FirstMomentTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/moment/FirstMomentTest.java
similarity index 74%
rename from src/test/java/org/apache/commons/math/stat/descriptive/moment/FirstMomentTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/moment/FirstMomentTest.java
index 11b74ba7d..f66eee07f 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/moment/FirstMomentTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/moment/FirstMomentTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.moment;
+package org.apache.commons.math3.stat.descriptive.moment;
 
-import org.apache.commons.math.stat.descriptive.StorelessUnivariateStatisticAbstractTest;
-import org.apache.commons.math.stat.descriptive.UnivariateStatistic;
+import org.apache.commons.math3.stat.descriptive.StorelessUnivariateStatisticAbstractTest;
+import org.apache.commons.math3.stat.descriptive.UnivariateStatistic;
 
 /**
  * Test cases for the {@link FirstMoment} class.
@@ -29,7 +29,7 @@ public class FirstMomentTest extends StorelessUnivariateStatisticAbstractTest{
     protected FirstMoment stat;
 
     /**
-     * @see org.apache.commons.math.stat.descriptive.UnivariateStatisticAbstractTest#getUnivariateStatistic()
+     * @see org.apache.commons.math3.stat.descriptive.UnivariateStatisticAbstractTest#getUnivariateStatistic()
      */
     @Override
     public UnivariateStatistic getUnivariateStatistic() {
@@ -37,7 +37,7 @@ public class FirstMomentTest extends StorelessUnivariateStatisticAbstractTest{
     }
 
     /**
-     * @see org.apache.commons.math.stat.descriptive.UnivariateStatisticAbstractTest#expectedValue()
+     * @see org.apache.commons.math3.stat.descriptive.UnivariateStatisticAbstractTest#expectedValue()
      */
     @Override
     public double expectedValue() {
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/moment/FourthMomentTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/moment/FourthMomentTest.java
similarity index 74%
rename from src/test/java/org/apache/commons/math/stat/descriptive/moment/FourthMomentTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/moment/FourthMomentTest.java
index 6f957d30b..efb1acc6e 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/moment/FourthMomentTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/moment/FourthMomentTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.moment;
+package org.apache.commons.math3.stat.descriptive.moment;
 
-import org.apache.commons.math.stat.descriptive.StorelessUnivariateStatisticAbstractTest;
-import org.apache.commons.math.stat.descriptive.UnivariateStatistic;
+import org.apache.commons.math3.stat.descriptive.StorelessUnivariateStatisticAbstractTest;
+import org.apache.commons.math3.stat.descriptive.UnivariateStatistic;
 
 /**
  * Test cases for the {@link FourthMoment} class.
@@ -29,7 +29,7 @@ public class FourthMomentTest extends StorelessUnivariateStatisticAbstractTest{
     protected FourthMoment stat;
 
     /**
-     * @see org.apache.commons.math.stat.descriptive.UnivariateStatisticAbstractTest#getUnivariateStatistic()
+     * @see org.apache.commons.math3.stat.descriptive.UnivariateStatisticAbstractTest#getUnivariateStatistic()
      */
     @Override
     public UnivariateStatistic getUnivariateStatistic() {
@@ -37,7 +37,7 @@ public class FourthMomentTest extends StorelessUnivariateStatisticAbstractTest{
     }
 
     /**
-     * @see org.apache.commons.math.stat.descriptive.UnivariateStatisticAbstractTest#expectedValue()
+     * @see org.apache.commons.math3.stat.descriptive.UnivariateStatisticAbstractTest#expectedValue()
      */
     @Override
     public double expectedValue() {
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/moment/GeometricMeanTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/moment/GeometricMeanTest.java
similarity index 91%
rename from src/test/java/org/apache/commons/math/stat/descriptive/moment/GeometricMeanTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/moment/GeometricMeanTest.java
index 80f914ff2..4cecbdfed 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/moment/GeometricMeanTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/moment/GeometricMeanTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.moment;
+package org.apache.commons.math3.stat.descriptive.moment;
 
-import org.apache.commons.math.stat.descriptive.StorelessUnivariateStatisticAbstractTest;
-import org.apache.commons.math.stat.descriptive.UnivariateStatistic;
+import org.apache.commons.math3.stat.descriptive.StorelessUnivariateStatisticAbstractTest;
+import org.apache.commons.math3.stat.descriptive.UnivariateStatistic;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/moment/InteractionTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/moment/InteractionTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/stat/descriptive/moment/InteractionTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/moment/InteractionTest.java
index 262604689..81fb932c5 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/moment/InteractionTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/moment/InteractionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.moment;
+package org.apache.commons.math3.stat.descriptive.moment;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/moment/KurtosisTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/moment/KurtosisTest.java
similarity index 89%
rename from src/test/java/org/apache/commons/math/stat/descriptive/moment/KurtosisTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/moment/KurtosisTest.java
index 7f9058c8d..e5ca1a98e 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/moment/KurtosisTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/moment/KurtosisTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.moment;
+package org.apache.commons.math3.stat.descriptive.moment;
 
-import org.apache.commons.math.stat.descriptive.StorelessUnivariateStatisticAbstractTest;
-import org.apache.commons.math.stat.descriptive.UnivariateStatistic;
+import org.apache.commons.math3.stat.descriptive.StorelessUnivariateStatisticAbstractTest;
+import org.apache.commons.math3.stat.descriptive.UnivariateStatistic;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/moment/MeanTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/moment/MeanTest.java
similarity index 90%
rename from src/test/java/org/apache/commons/math/stat/descriptive/moment/MeanTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/moment/MeanTest.java
index 60b77dede..a4571ae0e 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/moment/MeanTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/moment/MeanTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.moment;
+package org.apache.commons.math3.stat.descriptive.moment;
 
-import org.apache.commons.math.stat.descriptive.StorelessUnivariateStatisticAbstractTest;
-import org.apache.commons.math.stat.descriptive.UnivariateStatistic;
+import org.apache.commons.math3.stat.descriptive.StorelessUnivariateStatisticAbstractTest;
+import org.apache.commons.math3.stat.descriptive.UnivariateStatistic;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/moment/SecondMomentTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/moment/SecondMomentTest.java
similarity index 74%
rename from src/test/java/org/apache/commons/math/stat/descriptive/moment/SecondMomentTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/moment/SecondMomentTest.java
index 93decb9f1..eedc5ac93 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/moment/SecondMomentTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/moment/SecondMomentTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.moment;
+package org.apache.commons.math3.stat.descriptive.moment;
 
-import org.apache.commons.math.stat.descriptive.StorelessUnivariateStatisticAbstractTest;
-import org.apache.commons.math.stat.descriptive.UnivariateStatistic;
+import org.apache.commons.math3.stat.descriptive.StorelessUnivariateStatisticAbstractTest;
+import org.apache.commons.math3.stat.descriptive.UnivariateStatistic;
 
 /**
  * Test cases for the {@link SecondMoment} class.
@@ -29,7 +29,7 @@ public class SecondMomentTest extends StorelessUnivariateStatisticAbstractTest {
     protected SecondMoment stat;
 
     /**
-     * @see org.apache.commons.math.stat.descriptive.UnivariateStatisticAbstractTest#getUnivariateStatistic()
+     * @see org.apache.commons.math3.stat.descriptive.UnivariateStatisticAbstractTest#getUnivariateStatistic()
      */
     @Override
     public UnivariateStatistic getUnivariateStatistic() {
@@ -37,7 +37,7 @@ public class SecondMomentTest extends StorelessUnivariateStatisticAbstractTest {
     }
 
     /**
-     * @see org.apache.commons.math.stat.descriptive.UnivariateStatisticAbstractTest#expectedValue()
+     * @see org.apache.commons.math3.stat.descriptive.UnivariateStatisticAbstractTest#expectedValue()
      */
     @Override
     public double expectedValue() {
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/moment/SemiVarianceTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/moment/SemiVarianceTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/stat/descriptive/moment/SemiVarianceTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/moment/SemiVarianceTest.java
index adcef8fa3..96f88f3dc 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/moment/SemiVarianceTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/moment/SemiVarianceTest.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.stat.descriptive.moment;
+package org.apache.commons.math3.stat.descriptive.moment;
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.stat.StatUtils;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.stat.StatUtils;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/moment/SkewnessTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/moment/SkewnessTest.java
similarity index 89%
rename from src/test/java/org/apache/commons/math/stat/descriptive/moment/SkewnessTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/moment/SkewnessTest.java
index bbb185ea5..e82536660 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/moment/SkewnessTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/moment/SkewnessTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.moment;
+package org.apache.commons.math3.stat.descriptive.moment;
 
-import org.apache.commons.math.stat.descriptive.StorelessUnivariateStatisticAbstractTest;
-import org.apache.commons.math.stat.descriptive.UnivariateStatistic;
+import org.apache.commons.math3.stat.descriptive.StorelessUnivariateStatisticAbstractTest;
+import org.apache.commons.math3.stat.descriptive.UnivariateStatistic;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/moment/StandardDeviationTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/moment/StandardDeviationTest.java
similarity index 91%
rename from src/test/java/org/apache/commons/math/stat/descriptive/moment/StandardDeviationTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/moment/StandardDeviationTest.java
index d10e07701..c01e1a0ff 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/moment/StandardDeviationTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/moment/StandardDeviationTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.moment;
+package org.apache.commons.math3.stat.descriptive.moment;
 
-import org.apache.commons.math.stat.descriptive.StorelessUnivariateStatisticAbstractTest;
-import org.apache.commons.math.stat.descriptive.UnivariateStatistic;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.stat.descriptive.StorelessUnivariateStatisticAbstractTest;
+import org.apache.commons.math3.stat.descriptive.UnivariateStatistic;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/moment/ThirdMomentTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/moment/ThirdMomentTest.java
similarity index 74%
rename from src/test/java/org/apache/commons/math/stat/descriptive/moment/ThirdMomentTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/moment/ThirdMomentTest.java
index e158d19dc..048be99f3 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/moment/ThirdMomentTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/moment/ThirdMomentTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.moment;
+package org.apache.commons.math3.stat.descriptive.moment;
 
-import org.apache.commons.math.stat.descriptive.StorelessUnivariateStatisticAbstractTest;
-import org.apache.commons.math.stat.descriptive.UnivariateStatistic;
+import org.apache.commons.math3.stat.descriptive.StorelessUnivariateStatisticAbstractTest;
+import org.apache.commons.math3.stat.descriptive.UnivariateStatistic;
 
 /**
  * Test cases for the {@link ThirdMoment} class.
@@ -29,7 +29,7 @@ public class ThirdMomentTest extends StorelessUnivariateStatisticAbstractTest{
     protected ThirdMoment stat;
 
     /**
-     * @see org.apache.commons.math.stat.descriptive.UnivariateStatisticAbstractTest#getUnivariateStatistic()
+     * @see org.apache.commons.math3.stat.descriptive.UnivariateStatisticAbstractTest#getUnivariateStatistic()
      */
     @Override
     public UnivariateStatistic getUnivariateStatistic() {
@@ -37,7 +37,7 @@ public class ThirdMomentTest extends StorelessUnivariateStatisticAbstractTest{
     }
 
     /**
-     * @see org.apache.commons.math.stat.descriptive.UnivariateStatisticAbstractTest#expectedValue()
+     * @see org.apache.commons.math3.stat.descriptive.UnivariateStatisticAbstractTest#expectedValue()
      */
     @Override
     public double expectedValue() {
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/moment/VarianceTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/moment/VarianceTest.java
similarity index 93%
rename from src/test/java/org/apache/commons/math/stat/descriptive/moment/VarianceTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/moment/VarianceTest.java
index 65b85818e..85178a919 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/moment/VarianceTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/moment/VarianceTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.moment;
+package org.apache.commons.math3.stat.descriptive.moment;
 
-import org.apache.commons.math.stat.descriptive.StorelessUnivariateStatisticAbstractTest;
-import org.apache.commons.math.stat.descriptive.UnivariateStatistic;
-import org.apache.commons.math.util.MathArrays;
+import org.apache.commons.math3.stat.descriptive.StorelessUnivariateStatisticAbstractTest;
+import org.apache.commons.math3.stat.descriptive.UnivariateStatistic;
+import org.apache.commons.math3.util.MathArrays;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/moment/VectorialCovarianceTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/moment/VectorialCovarianceTest.java
similarity index 92%
rename from src/test/java/org/apache/commons/math/stat/descriptive/moment/VectorialCovarianceTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/moment/VectorialCovarianceTest.java
index 50e243a12..68f7e6f21 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/moment/VectorialCovarianceTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/moment/VectorialCovarianceTest.java
@@ -15,11 +15,11 @@
 //specific language governing permissions and limitations
 //under the License.
 
-package org.apache.commons.math.stat.descriptive.moment;
+package org.apache.commons.math3.stat.descriptive.moment;
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.linear.RealMatrix;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.linear.RealMatrix;
 
 import org.junit.Test;
 import org.junit.Assert;
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/moment/VectorialMeanTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/moment/VectorialMeanTest.java
similarity index 93%
rename from src/test/java/org/apache/commons/math/stat/descriptive/moment/VectorialMeanTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/moment/VectorialMeanTest.java
index f5b588b1e..8a3f479de 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/moment/VectorialMeanTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/moment/VectorialMeanTest.java
@@ -15,10 +15,10 @@
 //specific language governing permissions and limitations
 //under the License.
 
-package org.apache.commons.math.stat.descriptive.moment;
+package org.apache.commons.math3.stat.descriptive.moment;
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.TestUtils;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.TestUtils;
 
 import org.junit.Test;
 import org.junit.Assert;
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/rank/MaxTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/rank/MaxTest.java
similarity index 91%
rename from src/test/java/org/apache/commons/math/stat/descriptive/rank/MaxTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/rank/MaxTest.java
index b3523fc3d..c0143680c 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/rank/MaxTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/rank/MaxTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.rank;
+package org.apache.commons.math3.stat.descriptive.rank;
 
-import org.apache.commons.math.stat.descriptive.StorelessUnivariateStatisticAbstractTest;
-import org.apache.commons.math.stat.descriptive.UnivariateStatistic;
+import org.apache.commons.math3.stat.descriptive.StorelessUnivariateStatisticAbstractTest;
+import org.apache.commons.math3.stat.descriptive.UnivariateStatistic;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/rank/MedianTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/rank/MedianTest.java
similarity index 85%
rename from src/test/java/org/apache/commons/math/stat/descriptive/rank/MedianTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/rank/MedianTest.java
index b521f93c0..a2972cf66 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/rank/MedianTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/rank/MedianTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.rank;
+package org.apache.commons.math3.stat.descriptive.rank;
 
-import org.apache.commons.math.stat.descriptive.UnivariateStatistic;
-import org.apache.commons.math.stat.descriptive.UnivariateStatisticAbstractTest;
+import org.apache.commons.math3.stat.descriptive.UnivariateStatistic;
+import org.apache.commons.math3.stat.descriptive.UnivariateStatisticAbstractTest;
 
 /**
  * Test cases for the {@link UnivariateStatistic} class.
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/rank/MinTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/rank/MinTest.java
similarity index 91%
rename from src/test/java/org/apache/commons/math/stat/descriptive/rank/MinTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/rank/MinTest.java
index c96ffacdf..9999287f0 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/rank/MinTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/rank/MinTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.rank;
+package org.apache.commons.math3.stat.descriptive.rank;
 
-import org.apache.commons.math.stat.descriptive.StorelessUnivariateStatisticAbstractTest;
-import org.apache.commons.math.stat.descriptive.UnivariateStatistic;
+import org.apache.commons.math3.stat.descriptive.StorelessUnivariateStatisticAbstractTest;
+import org.apache.commons.math3.stat.descriptive.UnivariateStatistic;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/rank/PercentileTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/rank/PercentileTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/math/stat/descriptive/rank/PercentileTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/rank/PercentileTest.java
index 584c5dcd5..bbe124ff6 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/rank/PercentileTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/rank/PercentileTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.rank;
+package org.apache.commons.math3.stat.descriptive.rank;
 
-import org.apache.commons.math.stat.descriptive.UnivariateStatistic;
-import org.apache.commons.math.stat.descriptive.UnivariateStatisticAbstractTest;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.stat.descriptive.UnivariateStatistic;
+import org.apache.commons.math3.stat.descriptive.UnivariateStatisticAbstractTest;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/summary/ProductTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/summary/ProductTest.java
similarity index 90%
rename from src/test/java/org/apache/commons/math/stat/descriptive/summary/ProductTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/summary/ProductTest.java
index c6dda5f02..f77a76e34 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/summary/ProductTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/summary/ProductTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.summary;
+package org.apache.commons.math3.stat.descriptive.summary;
 
-import org.apache.commons.math.stat.descriptive.StorelessUnivariateStatistic;
-import org.apache.commons.math.stat.descriptive.StorelessUnivariateStatisticAbstractTest;
-import org.apache.commons.math.stat.descriptive.UnivariateStatistic;
+import org.apache.commons.math3.stat.descriptive.StorelessUnivariateStatistic;
+import org.apache.commons.math3.stat.descriptive.StorelessUnivariateStatisticAbstractTest;
+import org.apache.commons.math3.stat.descriptive.UnivariateStatistic;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/summary/SumLogTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/summary/SumLogTest.java
similarity index 89%
rename from src/test/java/org/apache/commons/math/stat/descriptive/summary/SumLogTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/summary/SumLogTest.java
index 13d8a6938..ad960daa6 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/summary/SumLogTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/summary/SumLogTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.summary;
+package org.apache.commons.math3.stat.descriptive.summary;
 
-import org.apache.commons.math.stat.descriptive.StorelessUnivariateStatistic;
-import org.apache.commons.math.stat.descriptive.StorelessUnivariateStatisticAbstractTest;
-import org.apache.commons.math.stat.descriptive.UnivariateStatistic;
+import org.apache.commons.math3.stat.descriptive.StorelessUnivariateStatistic;
+import org.apache.commons.math3.stat.descriptive.StorelessUnivariateStatisticAbstractTest;
+import org.apache.commons.math3.stat.descriptive.UnivariateStatistic;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/summary/SumSqTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/summary/SumSqTest.java
similarity index 87%
rename from src/test/java/org/apache/commons/math/stat/descriptive/summary/SumSqTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/summary/SumSqTest.java
index 8bb33c0d3..db04fab59 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/summary/SumSqTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/summary/SumSqTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.summary;
+package org.apache.commons.math3.stat.descriptive.summary;
 
-import org.apache.commons.math.stat.descriptive.StorelessUnivariateStatistic;
-import org.apache.commons.math.stat.descriptive.StorelessUnivariateStatisticAbstractTest;
-import org.apache.commons.math.stat.descriptive.UnivariateStatistic;
+import org.apache.commons.math3.stat.descriptive.StorelessUnivariateStatistic;
+import org.apache.commons.math3.stat.descriptive.StorelessUnivariateStatisticAbstractTest;
+import org.apache.commons.math3.stat.descriptive.UnivariateStatistic;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/stat/descriptive/summary/SumTest.java b/src/test/java/org/apache/commons/math3/stat/descriptive/summary/SumTest.java
similarity index 89%
rename from src/test/java/org/apache/commons/math/stat/descriptive/summary/SumTest.java
rename to src/test/java/org/apache/commons/math3/stat/descriptive/summary/SumTest.java
index 4e024001a..53c794e0e 100644
--- a/src/test/java/org/apache/commons/math/stat/descriptive/summary/SumTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/descriptive/summary/SumTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.descriptive.summary;
+package org.apache.commons.math3.stat.descriptive.summary;
 
-import org.apache.commons.math.stat.descriptive.StorelessUnivariateStatistic;
-import org.apache.commons.math.stat.descriptive.StorelessUnivariateStatisticAbstractTest;
-import org.apache.commons.math.stat.descriptive.UnivariateStatistic;
+import org.apache.commons.math3.stat.descriptive.StorelessUnivariateStatistic;
+import org.apache.commons.math3.stat.descriptive.StorelessUnivariateStatisticAbstractTest;
+import org.apache.commons.math3.stat.descriptive.UnivariateStatistic;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/stat/inference/ChiSquareTestTest.java b/src/test/java/org/apache/commons/math3/stat/inference/ChiSquareTestTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/math/stat/inference/ChiSquareTestTest.java
rename to src/test/java/org/apache/commons/math3/stat/inference/ChiSquareTestTest.java
index 222c37643..ce8a30141 100644
--- a/src/test/java/org/apache/commons/math/stat/inference/ChiSquareTestTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/inference/ChiSquareTestTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.inference;
+package org.apache.commons.math3.stat.inference;
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.NotPositiveException;
-import org.apache.commons.math.exception.NotStrictlyPositiveException;
-import org.apache.commons.math.exception.OutOfRangeException;
-import org.apache.commons.math.exception.ZeroException;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.NotPositiveException;
+import org.apache.commons.math3.exception.NotStrictlyPositiveException;
+import org.apache.commons.math3.exception.OutOfRangeException;
+import org.apache.commons.math3.exception.ZeroException;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -171,8 +171,8 @@ public class ChiSquareTestTest {
         long[] obs = new long[] {
             2372383, 584222, 257170, 17750155, 7903832, 489265, 209628, 393899
         };
-        org.apache.commons.math.stat.inference.ChiSquareTest csti =
-            new org.apache.commons.math.stat.inference.ChiSquareTest();
+        org.apache.commons.math3.stat.inference.ChiSquareTest csti =
+            new org.apache.commons.math3.stat.inference.ChiSquareTest();
         double cst = csti.chiSquareTest(exp, obs);
         Assert.assertEquals("chi-square p-value", 0.0, cst, 1E-3);
         Assert.assertEquals( "chi-square test statistic",
diff --git a/src/test/java/org/apache/commons/math/stat/inference/MannWhitneyUTestTest.java b/src/test/java/org/apache/commons/math3/stat/inference/MannWhitneyUTestTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/math/stat/inference/MannWhitneyUTestTest.java
rename to src/test/java/org/apache/commons/math3/stat/inference/MannWhitneyUTestTest.java
index 83a8d7f08..803292205 100644
--- a/src/test/java/org/apache/commons/math/stat/inference/MannWhitneyUTestTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/inference/MannWhitneyUTestTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.inference;
+package org.apache.commons.math3.stat.inference;
 
-import org.apache.commons.math.exception.NoDataException;
-import org.apache.commons.math.exception.NullArgumentException;
+import org.apache.commons.math3.exception.NoDataException;
+import org.apache.commons.math3.exception.NullArgumentException;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/stat/inference/OneWayAnovaTest.java b/src/test/java/org/apache/commons/math3/stat/inference/OneWayAnovaTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/stat/inference/OneWayAnovaTest.java
rename to src/test/java/org/apache/commons/math3/stat/inference/OneWayAnovaTest.java
index 99bccc813..eb75fbd3e 100644
--- a/src/test/java/org/apache/commons/math/stat/inference/OneWayAnovaTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/inference/OneWayAnovaTest.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.inference;
+package org.apache.commons.math3.stat.inference;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.math.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/stat/inference/TTestTest.java b/src/test/java/org/apache/commons/math3/stat/inference/TTestTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/stat/inference/TTestTest.java
rename to src/test/java/org/apache/commons/math3/stat/inference/TTestTest.java
index 441784410..c1eb09618 100644
--- a/src/test/java/org/apache/commons/math/stat/inference/TTestTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/inference/TTestTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.inference;
+package org.apache.commons.math3.stat.inference;
 
 
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.exception.OutOfRangeException;
-import org.apache.commons.math.stat.descriptive.SummaryStatistics;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.exception.OutOfRangeException;
+import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/stat/inference/TestUtilsTest.java b/src/test/java/org/apache/commons/math3/stat/inference/TestUtilsTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/stat/inference/TestUtilsTest.java
rename to src/test/java/org/apache/commons/math3/stat/inference/TestUtilsTest.java
index 2b4c9892b..ccca193d4 100644
--- a/src/test/java/org/apache/commons/math/stat/inference/TestUtilsTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/inference/TestUtilsTest.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.inference;
+package org.apache.commons.math3.stat.inference;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.NotPositiveException;
-import org.apache.commons.math.exception.NotStrictlyPositiveException;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.NumberIsTooSmallException;
-import org.apache.commons.math.exception.OutOfRangeException;
-import org.apache.commons.math.stat.descriptive.SummaryStatistics;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.NotPositiveException;
+import org.apache.commons.math3.exception.NotStrictlyPositiveException;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.NumberIsTooSmallException;
+import org.apache.commons.math3.exception.OutOfRangeException;
+import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -173,8 +173,8 @@ public class TestUtilsTest {
         long[] obs = new long[] {
                 2372383, 584222, 257170, 17750155, 7903832, 489265, 209628, 393899
         };
-        org.apache.commons.math.stat.inference.ChiSquareTest csti =
-            new org.apache.commons.math.stat.inference.ChiSquareTest();
+        org.apache.commons.math3.stat.inference.ChiSquareTest csti =
+            new org.apache.commons.math3.stat.inference.ChiSquareTest();
         double cst = csti.chiSquareTest(exp, obs);
         Assert.assertEquals("chi-square p-value", 0.0, cst, 1E-3);
         Assert.assertEquals( "chi-square test statistic",
diff --git a/src/test/java/org/apache/commons/math/stat/inference/WilcoxonSignedRankTestTest.java b/src/test/java/org/apache/commons/math3/stat/inference/WilcoxonSignedRankTestTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/math/stat/inference/WilcoxonSignedRankTestTest.java
rename to src/test/java/org/apache/commons/math3/stat/inference/WilcoxonSignedRankTestTest.java
index fbc6e308b..a1c5d4462 100644
--- a/src/test/java/org/apache/commons/math/stat/inference/WilcoxonSignedRankTestTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/inference/WilcoxonSignedRankTestTest.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.inference;
+package org.apache.commons.math3.stat.inference;
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.NoDataException;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.NumberIsTooLargeException;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.NoDataException;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.NumberIsTooLargeException;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/stat/ranking/NaturalRankingTest.java b/src/test/java/org/apache/commons/math3/stat/ranking/NaturalRankingTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/stat/ranking/NaturalRankingTest.java
rename to src/test/java/org/apache/commons/math3/stat/ranking/NaturalRankingTest.java
index 6e533034f..a2905d632 100644
--- a/src/test/java/org/apache/commons/math/stat/ranking/NaturalRankingTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/ranking/NaturalRankingTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.ranking;
+package org.apache.commons.math3.stat.ranking;
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.random.JDKRandomGenerator;
-import org.apache.commons.math.random.RandomGenerator;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.random.JDKRandomGenerator;
+import org.apache.commons.math3.random.RandomGenerator;
 import org.junit.Test;
 
 
diff --git a/src/test/java/org/apache/commons/math/stat/regression/GLSMultipleLinearRegressionTest.java b/src/test/java/org/apache/commons/math3/stat/regression/GLSMultipleLinearRegressionTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/math/stat/regression/GLSMultipleLinearRegressionTest.java
rename to src/test/java/org/apache/commons/math3/stat/regression/GLSMultipleLinearRegressionTest.java
index 5ea1b3ef1..63303cf90 100644
--- a/src/test/java/org/apache/commons/math/stat/regression/GLSMultipleLinearRegressionTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/regression/GLSMultipleLinearRegressionTest.java
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.regression;
+package org.apache.commons.math3.stat.regression;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.apache.commons.math.TestUtils;
-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.random.CorrelatedRandomVectorGenerator;
-import org.apache.commons.math.random.JDKRandomGenerator;
-import org.apache.commons.math.random.GaussianRandomGenerator;
-import org.apache.commons.math.random.RandomGenerator;
-import org.apache.commons.math.stat.correlation.Covariance;
-import org.apache.commons.math.stat.descriptive.DescriptiveStatistics;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.linear.MatrixUtils;
+import org.apache.commons.math3.linear.RealMatrix;
+import org.apache.commons.math3.linear.RealVector;
+import org.apache.commons.math3.random.CorrelatedRandomVectorGenerator;
+import org.apache.commons.math3.random.JDKRandomGenerator;
+import org.apache.commons.math3.random.GaussianRandomGenerator;
+import org.apache.commons.math3.random.RandomGenerator;
+import org.apache.commons.math3.stat.correlation.Covariance;
+import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
 
 public class GLSMultipleLinearRegressionTest extends MultipleLinearRegressionAbstractTest {
 
diff --git a/src/test/java/org/apache/commons/math/stat/regression/MillerUpdatingRegressionTest.java b/src/test/java/org/apache/commons/math3/stat/regression/MillerUpdatingRegressionTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/stat/regression/MillerUpdatingRegressionTest.java
rename to src/test/java/org/apache/commons/math3/stat/regression/MillerUpdatingRegressionTest.java
index 4196880db..8789e5cfe 100644
--- a/src/test/java/org/apache/commons/math/stat/regression/MillerUpdatingRegressionTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/regression/MillerUpdatingRegressionTest.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.regression;
+package org.apache.commons.math3.stat.regression;
 
-import org.apache.commons.math.linear.RealMatrix;
-import org.apache.commons.math.stat.correlation.PearsonsCorrelation;
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.linear.RealMatrix;
+import org.apache.commons.math3.stat.correlation.PearsonsCorrelation;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/stat/regression/MultipleLinearRegressionAbstractTest.java b/src/test/java/org/apache/commons/math3/stat/regression/MultipleLinearRegressionAbstractTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/stat/regression/MultipleLinearRegressionAbstractTest.java
rename to src/test/java/org/apache/commons/math3/stat/regression/MultipleLinearRegressionAbstractTest.java
index fc89b6f0d..38f5f8779 100644
--- a/src/test/java/org/apache/commons/math/stat/regression/MultipleLinearRegressionAbstractTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/regression/MultipleLinearRegressionAbstractTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.regression;
+package org.apache.commons.math3.stat.regression;
 
-import org.apache.commons.math.linear.RealMatrix;
-import org.apache.commons.math.linear.RealVector;
+import org.apache.commons.math3.linear.RealMatrix;
+import org.apache.commons.math3.linear.RealVector;
 
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/src/test/java/org/apache/commons/math/stat/regression/OLSMultipleLinearRegressionTest.java b/src/test/java/org/apache/commons/math3/stat/regression/OLSMultipleLinearRegressionTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/stat/regression/OLSMultipleLinearRegressionTest.java
rename to src/test/java/org/apache/commons/math3/stat/regression/OLSMultipleLinearRegressionTest.java
index 1fec8726a..ebfc55a4c 100644
--- a/src/test/java/org/apache/commons/math/stat/regression/OLSMultipleLinearRegressionTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/regression/OLSMultipleLinearRegressionTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.regression;
+package org.apache.commons.math3.stat.regression;
 
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.linear.DefaultRealMatrixChangingVisitor;
-import org.apache.commons.math.linear.MatrixUtils;
-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.stat.StatUtils;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.linear.DefaultRealMatrixChangingVisitor;
+import org.apache.commons.math3.linear.MatrixUtils;
+import org.apache.commons.math3.linear.RealMatrix;
+import org.apache.commons.math3.linear.Array2DRowRealMatrix;
+import org.apache.commons.math3.linear.RealVector;
+import org.apache.commons.math3.stat.StatUtils;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/stat/regression/SimpleRegressionTest.java b/src/test/java/org/apache/commons/math3/stat/regression/SimpleRegressionTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/stat/regression/SimpleRegressionTest.java
rename to src/test/java/org/apache/commons/math3/stat/regression/SimpleRegressionTest.java
index 0837a7780..07e809bc3 100644
--- a/src/test/java/org/apache/commons/math/stat/regression/SimpleRegressionTest.java
+++ b/src/test/java/org/apache/commons/math3/stat/regression/SimpleRegressionTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.stat.regression;
+package org.apache.commons.math3.stat.regression;
 
 import java.util.Random;
 
-import org.apache.commons.math.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/transform/FastCosineTransformerTest.java b/src/test/java/org/apache/commons/math3/transform/FastCosineTransformerTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/transform/FastCosineTransformerTest.java
rename to src/test/java/org/apache/commons/math3/transform/FastCosineTransformerTest.java
index e71c7a994..7ad9e8b09 100644
--- a/src/test/java/org/apache/commons/math/transform/FastCosineTransformerTest.java
+++ b/src/test/java/org/apache/commons/math3/transform/FastCosineTransformerTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.transform;
+package org.apache.commons.math3.transform;
 
 import java.util.Arrays;
 import java.util.Collection;
 
-import org.apache.commons.math.analysis.SinFunction;
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.analysis.function.Sinc;
-import org.apache.commons.math.exception.MathIllegalStateException;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.analysis.SinFunction;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.analysis.function.Sinc;
+import org.apache.commons.math3.exception.MathIllegalStateException;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/org/apache/commons/math/transform/FastFourierTransformerTest.java b/src/test/java/org/apache/commons/math3/transform/FastFourierTransformerTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/transform/FastFourierTransformerTest.java
rename to src/test/java/org/apache/commons/math3/transform/FastFourierTransformerTest.java
index 8f0470515..21c5f3c82 100644
--- a/src/test/java/org/apache/commons/math/transform/FastFourierTransformerTest.java
+++ b/src/test/java/org/apache/commons/math3/transform/FastFourierTransformerTest.java
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.transform;
+package org.apache.commons.math3.transform;
 
 import java.util.Random;
 
-import org.apache.commons.math.analysis.SinFunction;
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.analysis.function.Sin;
-import org.apache.commons.math.analysis.function.Sinc;
-import org.apache.commons.math.complex.Complex;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.NotStrictlyPositiveException;
-import org.apache.commons.math.exception.NumberIsTooLargeException;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.analysis.SinFunction;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.analysis.function.Sin;
+import org.apache.commons.math3.analysis.function.Sinc;
+import org.apache.commons.math3.complex.Complex;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.NotStrictlyPositiveException;
+import org.apache.commons.math3.exception.NumberIsTooLargeException;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/transform/FastHadamardTransformerTest.java b/src/test/java/org/apache/commons/math3/transform/FastHadamardTransformerTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/math/transform/FastHadamardTransformerTest.java
rename to src/test/java/org/apache/commons/math3/transform/FastHadamardTransformerTest.java
index 23782ec85..3d432871c 100644
--- a/src/test/java/org/apache/commons/math/transform/FastHadamardTransformerTest.java
+++ b/src/test/java/org/apache/commons/math3/transform/FastHadamardTransformerTest.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.transform;
+package org.apache.commons.math3.transform;
 
-import org.apache.commons.math.util.Precision;
+import org.apache.commons.math3.util.Precision;
 import org.junit.Assert;
 import org.junit.Test;
 
 
 /**
  * JUnit Test for HadamardTransformerTest
- * @see org.apache.commons.math.transform.FastHadamardTransformer
+ * @see org.apache.commons.math3.transform.FastHadamardTransformer
  */
 public final class FastHadamardTransformerTest {
 
diff --git a/src/test/java/org/apache/commons/math/transform/FastSineTransformerTest.java b/src/test/java/org/apache/commons/math3/transform/FastSineTransformerTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/math/transform/FastSineTransformerTest.java
rename to src/test/java/org/apache/commons/math3/transform/FastSineTransformerTest.java
index 511c551c9..e684adf1d 100644
--- a/src/test/java/org/apache/commons/math/transform/FastSineTransformerTest.java
+++ b/src/test/java/org/apache/commons/math3/transform/FastSineTransformerTest.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.transform;
+package org.apache.commons.math3.transform;
 
 import java.util.Arrays;
 import java.util.Collection;
 
-import org.apache.commons.math.analysis.SinFunction;
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.analysis.function.Sinc;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.MathIllegalStateException;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.analysis.SinFunction;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.analysis.function.Sinc;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.MathIllegalStateException;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/org/apache/commons/math/transform/RealTransformerAbstractTest.java b/src/test/java/org/apache/commons/math3/transform/RealTransformerAbstractTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/transform/RealTransformerAbstractTest.java
rename to src/test/java/org/apache/commons/math3/transform/RealTransformerAbstractTest.java
index cd88b576e..8bfef50b7 100644
--- a/src/test/java/org/apache/commons/math/transform/RealTransformerAbstractTest.java
+++ b/src/test/java/org/apache/commons/math3/transform/RealTransformerAbstractTest.java
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.transform;
+package org.apache.commons.math3.transform;
 
 import java.util.Random;
 
-import org.apache.commons.math.analysis.UnivariateFunction;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.NotStrictlyPositiveException;
-import org.apache.commons.math.exception.NumberIsTooLargeException;
-import org.apache.commons.math.util.FastMath;
+import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.NotStrictlyPositiveException;
+import org.apache.commons.math3.exception.NumberIsTooLargeException;
+import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/util/ArithmeticUtilsTest.java b/src/test/java/org/apache/commons/math3/util/ArithmeticUtilsTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/util/ArithmeticUtilsTest.java
rename to src/test/java/org/apache/commons/math3/util/ArithmeticUtilsTest.java
index d055500c5..e609e3fd6 100644
--- a/src/test/java/org/apache/commons/math/util/ArithmeticUtilsTest.java
+++ b/src/test/java/org/apache/commons/math3/util/ArithmeticUtilsTest.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.math3.util;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -23,9 +23,9 @@ import java.util.List;
 import java.util.Map;
 import java.math.BigInteger;
 
-import org.apache.commons.math.exception.MathArithmeticException;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.random.RandomDataImpl;
+import org.apache.commons.math3.exception.MathArithmeticException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.random.RandomDataImpl;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/util/BigRealFieldTest.java b/src/test/java/org/apache/commons/math3/util/BigRealFieldTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/math/util/BigRealFieldTest.java
rename to src/test/java/org/apache/commons/math3/util/BigRealFieldTest.java
index 5fe60591c..0f9af0e9e 100644
--- a/src/test/java/org/apache/commons/math/util/BigRealFieldTest.java
+++ b/src/test/java/org/apache/commons/math3/util/BigRealFieldTest.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.util;
+package org.apache.commons.math3.util;
 
 
-import org.apache.commons.math.TestUtils;
+import org.apache.commons.math3.TestUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/util/BigRealTest.java b/src/test/java/org/apache/commons/math3/util/BigRealTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/util/BigRealTest.java
rename to src/test/java/org/apache/commons/math3/util/BigRealTest.java
index 12082e184..63009d191 100644
--- a/src/test/java/org/apache/commons/math/util/BigRealTest.java
+++ b/src/test/java/org/apache/commons/math3/util/BigRealTest.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.util;
+package org.apache.commons.math3.util;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.math.MathContext;
 
-import org.apache.commons.math.TestUtils;
+import org.apache.commons.math3.TestUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/util/ContinuedFractionTest.java b/src/test/java/org/apache/commons/math3/util/ContinuedFractionTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/util/ContinuedFractionTest.java
rename to src/test/java/org/apache/commons/math3/util/ContinuedFractionTest.java
index 877c77cc5..ebf5b8bda 100644
--- a/src/test/java/org/apache/commons/math/util/ContinuedFractionTest.java
+++ b/src/test/java/org/apache/commons/math3/util/ContinuedFractionTest.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.math3.util;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/util/DefaultTransformerTest.java b/src/test/java/org/apache/commons/math3/util/DefaultTransformerTest.java
similarity index 92%
rename from src/test/java/org/apache/commons/math/util/DefaultTransformerTest.java
rename to src/test/java/org/apache/commons/math3/util/DefaultTransformerTest.java
index f7fed1ca3..eeb1d075f 100644
--- a/src/test/java/org/apache/commons/math/util/DefaultTransformerTest.java
+++ b/src/test/java/org/apache/commons/math3/util/DefaultTransformerTest.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.util;
+package org.apache.commons.math3.util;
 
 import java.math.BigDecimal;
 
 
-import org.apache.commons.math.TestUtils;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.exception.NullArgumentException;
+import org.apache.commons.math3.TestUtils;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.exception.NullArgumentException;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/util/DoubleArrayAbstractTest.java b/src/test/java/org/apache/commons/math3/util/DoubleArrayAbstractTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/util/DoubleArrayAbstractTest.java
rename to src/test/java/org/apache/commons/math3/util/DoubleArrayAbstractTest.java
index 899c9436c..c5e7bce80 100644
--- a/src/test/java/org/apache/commons/math/util/DoubleArrayAbstractTest.java
+++ b/src/test/java/org/apache/commons/math3/util/DoubleArrayAbstractTest.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.util;
+package org.apache.commons.math3.util;
 
-import org.apache.commons.math.stat.StatUtils;
+import org.apache.commons.math3.stat.StatUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/util/FastMathLoadCheck.java b/src/test/java/org/apache/commons/math3/util/FastMathLoadCheck.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/util/FastMathLoadCheck.java
rename to src/test/java/org/apache/commons/math3/util/FastMathLoadCheck.java
index df8924742..1db284a0f 100644
--- a/src/test/java/org/apache/commons/math/util/FastMathLoadCheck.java
+++ b/src/test/java/org/apache/commons/math3/util/FastMathLoadCheck.java
@@ -1,4 +1,4 @@
-package org.apache.commons.math.util;
+package org.apache.commons.math3.util;
 
 import java.lang.reflect.Field;
 
@@ -12,7 +12,7 @@ import java.lang.reflect.Field;
  * 
  * For example, this shell command:
  * 
    - *  $ for max in false true ; do for how in compute resources array; do java -cp target/classes:target/test-classes org.apache.commons.math.util.FastMathLoadCheck $max $how 4 ; done ; done
+ *  $ for max in false true ; do for how in compute resources array; do java -cp target/classes:target/test-classes org.apache.commons.math3.util.FastMathLoadCheck $max $how 4 ; done ; done
  * 
    
  * will produce an output similar to the following:
  * 
    diff --git a/src/test/java/org/apache/commons/math/util/FastMathResourcesSave.java b/src/test/java/org/apache/commons/math3/util/FastMathResourcesSave.java
similarity index 92%
rename from src/test/java/org/apache/commons/math/util/FastMathResourcesSave.java
rename to src/test/java/org/apache/commons/math3/util/FastMathResourcesSave.java
index 6e07c40b4..b0064d1f5 100644
--- a/src/test/java/org/apache/commons/math/util/FastMathResourcesSave.java
+++ b/src/test/java/org/apache/commons/math3/util/FastMathResourcesSave.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.math3.util;
 
 /**
  * Not a test class.
@@ -22,7 +22,7 @@ package org.apache.commons.math.util;
  * You should run it from inside the "resources" directory, i.e. use as:
  * 
      *  $ cd src/main/resources/
- *  $ java -cp ../../../target/classes:../../../target/test-classes org.apache.commons.math.util.FastMathResourcesSave
+ *  $ java -cp ../../../target/classes:../../../target/test-classes org.apache.commons.math3.util.FastMathResourcesSave
  * 
    
  */
 public class FastMathResourcesSave {
diff --git a/src/test/java/org/apache/commons/math/util/FastMathStrictComparisonTest.java b/src/test/java/org/apache/commons/math3/util/FastMathStrictComparisonTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/util/FastMathStrictComparisonTest.java
rename to src/test/java/org/apache/commons/math3/util/FastMathStrictComparisonTest.java
index 7a7f89759..de65e922e 100644
--- a/src/test/java/org/apache/commons/math/util/FastMathStrictComparisonTest.java
+++ b/src/test/java/org/apache/commons/math3/util/FastMathStrictComparisonTest.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.math3.util;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
diff --git a/src/test/java/org/apache/commons/math/util/FastMathTest.java b/src/test/java/org/apache/commons/math3/util/FastMathTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/util/FastMathTest.java
rename to src/test/java/org/apache/commons/math3/util/FastMathTest.java
index b16f0835c..6b883597d 100644
--- a/src/test/java/org/apache/commons/math/util/FastMathTest.java
+++ b/src/test/java/org/apache/commons/math3/util/FastMathTest.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.util;
+package org.apache.commons.math3.util;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Type;
 
-import org.apache.commons.math.dfp.Dfp;
-import org.apache.commons.math.dfp.DfpField;
-import org.apache.commons.math.dfp.DfpMath;
-import org.apache.commons.math.random.MersenneTwister;
-import org.apache.commons.math.random.RandomGenerator;
-import org.apache.commons.math.TestUtils;
+import org.apache.commons.math3.dfp.Dfp;
+import org.apache.commons.math3.dfp.DfpField;
+import org.apache.commons.math3.dfp.DfpMath;
+import org.apache.commons.math3.random.MersenneTwister;
+import org.apache.commons.math3.random.RandomGenerator;
+import org.apache.commons.math3.TestUtils;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Ignore;
diff --git a/src/test/java/org/apache/commons/math/util/FastMathTestPerformance.java b/src/test/java/org/apache/commons/math3/util/FastMathTestPerformance.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/util/FastMathTestPerformance.java
rename to src/test/java/org/apache/commons/math3/util/FastMathTestPerformance.java
index 340ac1c06..32fb9082b 100644
--- a/src/test/java/org/apache/commons/math/util/FastMathTestPerformance.java
+++ b/src/test/java/org/apache/commons/math3/util/FastMathTestPerformance.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.util;
+package org.apache.commons.math3.util;
 
-import org.apache.commons.math.PerfTestUtils;
+import org.apache.commons.math3.PerfTestUtils;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/util/IncrementorTest.java b/src/test/java/org/apache/commons/math3/util/IncrementorTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/math/util/IncrementorTest.java
rename to src/test/java/org/apache/commons/math3/util/IncrementorTest.java
index dc40ee71a..0c7d4fbed 100644
--- a/src/test/java/org/apache/commons/math/util/IncrementorTest.java
+++ b/src/test/java/org/apache/commons/math3/util/IncrementorTest.java
@@ -11,10 +11,10 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.apache.commons.math.util;
+package org.apache.commons.math3.util;
 
-import org.apache.commons.math.exception.MaxCountExceededException;
-import org.apache.commons.math.exception.TooManyEvaluationsException;
+import org.apache.commons.math3.exception.MaxCountExceededException;
+import org.apache.commons.math3.exception.TooManyEvaluationsException;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/util/MathArraysTest.java b/src/test/java/org/apache/commons/math3/util/MathArraysTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/math/util/MathArraysTest.java
rename to src/test/java/org/apache/commons/math3/util/MathArraysTest.java
index 817a4c545..5bdb7b456 100644
--- a/src/test/java/org/apache/commons/math/util/MathArraysTest.java
+++ b/src/test/java/org/apache/commons/math3/util/MathArraysTest.java
@@ -11,16 +11,16 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.apache.commons.math.util;
+package org.apache.commons.math3.util;
 
 import java.util.Arrays;
-import org.apache.commons.math.exception.NonMonotonicSequenceException;
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.MathArithmeticException;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.random.Well1024a;
-import org.apache.commons.math.TestUtils;
+import org.apache.commons.math3.exception.NonMonotonicSequenceException;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.MathArithmeticException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.random.Well1024a;
+import org.apache.commons.math3.TestUtils;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/util/MathUtilsTest.java b/src/test/java/org/apache/commons/math3/util/MathUtilsTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/util/MathUtilsTest.java
rename to src/test/java/org/apache/commons/math3/util/MathUtilsTest.java
index 405d43280..0e9e08a2c 100644
--- a/src/test/java/org/apache/commons/math/util/MathUtilsTest.java
+++ b/src/test/java/org/apache/commons/math3/util/MathUtilsTest.java
@@ -11,13 +11,13 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.apache.commons.math.util;
+package org.apache.commons.math3.util;
 
-import org.apache.commons.math.exception.MathArithmeticException;
-import org.apache.commons.math.exception.NotFiniteNumberException;
-import org.apache.commons.math.exception.NullArgumentException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
-import org.apache.commons.math.random.RandomDataImpl;
+import org.apache.commons.math3.exception.MathArithmeticException;
+import org.apache.commons.math3.exception.NotFiniteNumberException;
+import org.apache.commons.math3.exception.NullArgumentException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math3.random.RandomDataImpl;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/util/MultidimensionalCounterTest.java b/src/test/java/org/apache/commons/math3/util/MultidimensionalCounterTest.java
similarity index 95%
rename from src/test/java/org/apache/commons/math/util/MultidimensionalCounterTest.java
rename to src/test/java/org/apache/commons/math3/util/MultidimensionalCounterTest.java
index a3110b99a..5fe76dd4d 100644
--- a/src/test/java/org/apache/commons/math/util/MultidimensionalCounterTest.java
+++ b/src/test/java/org/apache/commons/math3/util/MultidimensionalCounterTest.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.util;
+package org.apache.commons.math3.util;
 
-import org.apache.commons.math.exception.DimensionMismatchException;
-import org.apache.commons.math.exception.OutOfRangeException;
-import org.apache.commons.math.exception.NotStrictlyPositiveException;
+import org.apache.commons.math3.exception.DimensionMismatchException;
+import org.apache.commons.math3.exception.OutOfRangeException;
+import org.apache.commons.math3.exception.NotStrictlyPositiveException;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/apache/commons/math/util/OpenIntToDoubleHashMapTest.java b/src/test/java/org/apache/commons/math3/util/OpenIntToDoubleHashMapTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/util/OpenIntToDoubleHashMapTest.java
rename to src/test/java/org/apache/commons/math3/util/OpenIntToDoubleHashMapTest.java
index 66eecd8d9..6cbf9f464 100644
--- a/src/test/java/org/apache/commons/math/util/OpenIntToDoubleHashMapTest.java
+++ b/src/test/java/org/apache/commons/math3/util/OpenIntToDoubleHashMapTest.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.math3.util;
 
 import java.util.ConcurrentModificationException;
 import java.util.HashMap;
diff --git a/src/test/java/org/apache/commons/math/util/OpenIntToFieldTest.java b/src/test/java/org/apache/commons/math3/util/OpenIntToFieldTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/util/OpenIntToFieldTest.java
rename to src/test/java/org/apache/commons/math3/util/OpenIntToFieldTest.java
index 293dd74e7..2366d9257 100644
--- a/src/test/java/org/apache/commons/math/util/OpenIntToFieldTest.java
+++ b/src/test/java/org/apache/commons/math3/util/OpenIntToFieldTest.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.math3.util;
 
 import java.util.ConcurrentModificationException;
 import java.util.HashMap;
@@ -25,10 +25,10 @@ import java.util.Random;
 import java.util.Set;
 import java.util.Map.Entry;
 
-import org.apache.commons.math.Field;
-import org.apache.commons.math.fraction.Fraction;
-import org.apache.commons.math.fraction.FractionConversionException;
-import org.apache.commons.math.fraction.FractionField;
+import org.apache.commons.math3.Field;
+import org.apache.commons.math3.fraction.Fraction;
+import org.apache.commons.math3.fraction.FractionConversionException;
+import org.apache.commons.math3.fraction.FractionField;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/util/PairTest.java b/src/test/java/org/apache/commons/math3/util/PairTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/util/PairTest.java
rename to src/test/java/org/apache/commons/math3/util/PairTest.java
index 50e409b3d..136359cb9 100644
--- a/src/test/java/org/apache/commons/math/util/PairTest.java
+++ b/src/test/java/org/apache/commons/math3/util/PairTest.java
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.apache.commons.math.util;
+package org.apache.commons.math3.util;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/util/PrecisionTest.java b/src/test/java/org/apache/commons/math3/util/PrecisionTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/util/PrecisionTest.java
rename to src/test/java/org/apache/commons/math3/util/PrecisionTest.java
index 18531213b..e1bc43277 100644
--- a/src/test/java/org/apache/commons/math/util/PrecisionTest.java
+++ b/src/test/java/org/apache/commons/math3/util/PrecisionTest.java
@@ -11,12 +11,12 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.apache.commons.math.util;
+package org.apache.commons.math3.util;
 
 import java.math.BigDecimal;
-import org.apache.commons.math.exception.MathArithmeticException;
-import org.apache.commons.math.exception.MathIllegalArgumentException;
-import org.apache.commons.math.TestUtils;
+import org.apache.commons.math3.exception.MathArithmeticException;
+import org.apache.commons.math3.exception.MathIllegalArgumentException;
+import org.apache.commons.math3.TestUtils;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/apache/commons/math/util/ResizableDoubleArrayTest.java b/src/test/java/org/apache/commons/math3/util/ResizableDoubleArrayTest.java
similarity index 99%
rename from src/test/java/org/apache/commons/math/util/ResizableDoubleArrayTest.java
rename to src/test/java/org/apache/commons/math3/util/ResizableDoubleArrayTest.java
index 995fe933f..151fbeaa2 100644
--- a/src/test/java/org/apache/commons/math/util/ResizableDoubleArrayTest.java
+++ b/src/test/java/org/apache/commons/math3/util/ResizableDoubleArrayTest.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math.util;
-import org.apache.commons.math.random.RandomDataImpl;
-import org.apache.commons.math.random.RandomData;
+package org.apache.commons.math3.util;
+import org.apache.commons.math3.random.RandomDataImpl;
+import org.apache.commons.math3.random.RandomData;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/src/test/java/org/apache/commons/math/util/TestBean.java b/src/test/java/org/apache/commons/math3/util/TestBean.java
similarity index 89%
rename from src/test/java/org/apache/commons/math/util/TestBean.java
rename to src/test/java/org/apache/commons/math3/util/TestBean.java
index 53f095182..879a93081 100644
--- a/src/test/java/org/apache/commons/math/util/TestBean.java
+++ b/src/test/java/org/apache/commons/math3/util/TestBean.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.util;
+package org.apache.commons.math3.util;
 
-import org.apache.commons.math.exception.MathUnsupportedOperationException;
-import org.apache.commons.math.exception.util.LocalizedFormats;
+import org.apache.commons.math3.exception.MathUnsupportedOperationException;
+import org.apache.commons.math3.exception.util.LocalizedFormats;
 
 /**
  * @version $Id$
diff --git a/src/test/java/org/apache/commons/math/util/TransformerMapTest.java b/src/test/java/org/apache/commons/math3/util/TransformerMapTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/math/util/TransformerMapTest.java
rename to src/test/java/org/apache/commons/math3/util/TransformerMapTest.java
index abe9cf66d..534289c72 100644
--- a/src/test/java/org/apache/commons/math/util/TransformerMapTest.java
+++ b/src/test/java/org/apache/commons/math3/util/TransformerMapTest.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.util;
+package org.apache.commons.math3.util;
 
-import org.apache.commons.math.TestUtils;
+import org.apache.commons.math3.TestUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/resources/org/apache/commons/math/linear/matrix1.csv b/src/test/resources/org/apache/commons/math3/linear/matrix1.csv
similarity index 100%
rename from src/test/resources/org/apache/commons/math/linear/matrix1.csv
rename to src/test/resources/org/apache/commons/math3/linear/matrix1.csv
diff --git a/src/test/resources/org/apache/commons/math/linear/matrix2.csv b/src/test/resources/org/apache/commons/math3/linear/matrix2.csv
similarity index 100%
rename from src/test/resources/org/apache/commons/math/linear/matrix2.csv
rename to src/test/resources/org/apache/commons/math3/linear/matrix2.csv
diff --git a/src/test/resources/org/apache/commons/math/random/emptyFile.txt b/src/test/resources/org/apache/commons/math3/random/emptyFile.txt
similarity index 100%
rename from src/test/resources/org/apache/commons/math/random/emptyFile.txt
rename to src/test/resources/org/apache/commons/math3/random/emptyFile.txt
diff --git a/src/test/resources/org/apache/commons/math/random/testData.txt b/src/test/resources/org/apache/commons/math3/random/testData.txt
similarity index 100%
rename from src/test/resources/org/apache/commons/math/random/testData.txt
rename to src/test/resources/org/apache/commons/math3/random/testData.txt
diff --git a/src/test/resources/org/apache/commons/math/stat/data/Lew.txt b/src/test/resources/org/apache/commons/math3/stat/data/Lew.txt
similarity index 100%
rename from src/test/resources/org/apache/commons/math/stat/data/Lew.txt
rename to src/test/resources/org/apache/commons/math3/stat/data/Lew.txt
diff --git a/src/test/resources/org/apache/commons/math/stat/data/Lottery.txt b/src/test/resources/org/apache/commons/math3/stat/data/Lottery.txt
similarity index 100%
rename from src/test/resources/org/apache/commons/math/stat/data/Lottery.txt
rename to src/test/resources/org/apache/commons/math3/stat/data/Lottery.txt
diff --git a/src/test/resources/org/apache/commons/math/stat/data/Mavro.txt b/src/test/resources/org/apache/commons/math3/stat/data/Mavro.txt
similarity index 100%
rename from src/test/resources/org/apache/commons/math/stat/data/Mavro.txt
rename to src/test/resources/org/apache/commons/math3/stat/data/Mavro.txt
diff --git a/src/test/resources/org/apache/commons/math/stat/data/Michelso.txt b/src/test/resources/org/apache/commons/math3/stat/data/Michelso.txt
similarity index 100%
rename from src/test/resources/org/apache/commons/math/stat/data/Michelso.txt
rename to src/test/resources/org/apache/commons/math3/stat/data/Michelso.txt
diff --git a/src/test/resources/org/apache/commons/math/stat/data/NumAcc1.txt b/src/test/resources/org/apache/commons/math3/stat/data/NumAcc1.txt
similarity index 100%
rename from src/test/resources/org/apache/commons/math/stat/data/NumAcc1.txt
rename to src/test/resources/org/apache/commons/math3/stat/data/NumAcc1.txt
diff --git a/src/test/resources/org/apache/commons/math/stat/data/NumAcc2.txt b/src/test/resources/org/apache/commons/math3/stat/data/NumAcc2.txt
similarity index 100%
rename from src/test/resources/org/apache/commons/math/stat/data/NumAcc2.txt
rename to src/test/resources/org/apache/commons/math3/stat/data/NumAcc2.txt
diff --git a/src/test/resources/org/apache/commons/math/stat/data/NumAcc3.txt b/src/test/resources/org/apache/commons/math3/stat/data/NumAcc3.txt
similarity index 100%
rename from src/test/resources/org/apache/commons/math/stat/data/NumAcc3.txt
rename to src/test/resources/org/apache/commons/math3/stat/data/NumAcc3.txt
diff --git a/src/test/resources/org/apache/commons/math/stat/data/NumAcc4.txt b/src/test/resources/org/apache/commons/math3/stat/data/NumAcc4.txt
similarity index 100%
rename from src/test/resources/org/apache/commons/math/stat/data/NumAcc4.txt
rename to src/test/resources/org/apache/commons/math3/stat/data/NumAcc4.txt
diff --git a/src/test/resources/org/apache/commons/math/stat/data/PiDigits.txt b/src/test/resources/org/apache/commons/math3/stat/data/PiDigits.txt
similarity index 100%
rename from src/test/resources/org/apache/commons/math/stat/data/PiDigits.txt
rename to src/test/resources/org/apache/commons/math3/stat/data/PiDigits.txt