You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by tn...@apache.org on 2015/02/16 23:40:38 UTC
[68/82] [math] Update for next development iteration: commons-math4
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/general/AbstractLeastSquaresOptimizer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optimization/general/AbstractLeastSquaresOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/general/AbstractLeastSquaresOptimizer.java
index 96f7fb2..3bc9a05 100644
--- a/src/main/java/org/apache/commons/math4/optimization/general/AbstractLeastSquaresOptimizer.java
+++ b/src/main/java/org/apache/commons/math4/optimization/general/AbstractLeastSquaresOptimizer.java
@@ -15,31 +15,31 @@
* limitations under the License.
*/
-package org.apache.commons.math3.optimization.general;
-
-import org.apache.commons.math3.analysis.DifferentiableMultivariateVectorFunction;
-import org.apache.commons.math3.analysis.FunctionUtils;
-import org.apache.commons.math3.analysis.differentiation.DerivativeStructure;
-import org.apache.commons.math3.analysis.differentiation.MultivariateDifferentiableVectorFunction;
-import org.apache.commons.math3.exception.DimensionMismatchException;
-import org.apache.commons.math3.exception.NumberIsTooSmallException;
-import org.apache.commons.math3.exception.util.LocalizedFormats;
-import org.apache.commons.math3.linear.ArrayRealVector;
-import org.apache.commons.math3.linear.RealMatrix;
-import org.apache.commons.math3.linear.DiagonalMatrix;
-import org.apache.commons.math3.linear.DecompositionSolver;
-import org.apache.commons.math3.linear.MatrixUtils;
-import org.apache.commons.math3.linear.QRDecomposition;
-import org.apache.commons.math3.linear.EigenDecomposition;
-import org.apache.commons.math3.optimization.OptimizationData;
-import org.apache.commons.math3.optimization.InitialGuess;
-import org.apache.commons.math3.optimization.Target;
-import org.apache.commons.math3.optimization.Weight;
-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;
+package org.apache.commons.math4.optimization.general;
+
+import org.apache.commons.math4.analysis.DifferentiableMultivariateVectorFunction;
+import org.apache.commons.math4.analysis.FunctionUtils;
+import org.apache.commons.math4.analysis.differentiation.DerivativeStructure;
+import org.apache.commons.math4.analysis.differentiation.MultivariateDifferentiableVectorFunction;
+import org.apache.commons.math4.exception.DimensionMismatchException;
+import org.apache.commons.math4.exception.NumberIsTooSmallException;
+import org.apache.commons.math4.exception.util.LocalizedFormats;
+import org.apache.commons.math4.linear.ArrayRealVector;
+import org.apache.commons.math4.linear.DecompositionSolver;
+import org.apache.commons.math4.linear.DiagonalMatrix;
+import org.apache.commons.math4.linear.EigenDecomposition;
+import org.apache.commons.math4.linear.MatrixUtils;
+import org.apache.commons.math4.linear.QRDecomposition;
+import org.apache.commons.math4.linear.RealMatrix;
+import org.apache.commons.math4.optimization.ConvergenceChecker;
+import org.apache.commons.math4.optimization.DifferentiableMultivariateVectorOptimizer;
+import org.apache.commons.math4.optimization.InitialGuess;
+import org.apache.commons.math4.optimization.OptimizationData;
+import org.apache.commons.math4.optimization.PointVectorValuePair;
+import org.apache.commons.math4.optimization.Target;
+import org.apache.commons.math4.optimization.Weight;
+import org.apache.commons.math4.optimization.direct.BaseAbstractMultivariateVectorOptimizer;
+import org.apache.commons.math4.util.FastMath;
/**
* Base class for implementing least squares optimizers.
@@ -48,13 +48,13 @@ import org.apache.commons.math3.util.FastMath;
* <br/>
* This class constructs the Jacobian matrix of the function argument in method
* {@link BaseAbstractMultivariateVectorOptimizer#optimize(int,
- * org.apache.commons.math3.analysis.MultivariateVectorFunction,OptimizationData[])
+ * org.apache.commons.math4.analysis.MultivariateVectorFunction,OptimizationData[])
* optimize} and assumes that the rows of that matrix iterate on the model
* functions while the columns iterate on the parameters; thus, the numbers
* of rows is equal to the dimension of the
- * {@link org.apache.commons.math3.optimization.Target Target} while
+ * {@link org.apache.commons.math4.optimization.Target Target} while
* the number of columns is equal to the dimension of the
- * {@link org.apache.commons.math3.optimization.InitialGuess InitialGuess}.
+ * {@link org.apache.commons.math4.optimization.InitialGuess InitialGuess}.
*
* @deprecated As of 3.1 (to be removed in 4.0).
* @since 1.2
@@ -121,8 +121,8 @@ public abstract class AbstractLeastSquaresOptimizer
/**
* Simple constructor with default settings.
* The convergence check is set to a {@link
- * org.apache.commons.math3.optimization.SimpleVectorValueChecker}.
- * @deprecated See {@link org.apache.commons.math3.optimization.SimpleValueChecker#SimpleValueChecker()}
+ * org.apache.commons.math4.optimization.SimpleVectorValueChecker}.
+ * @deprecated See {@link org.apache.commons.math4.optimization.SimpleValueChecker#SimpleValueChecker()}
*/
@Deprecated
protected AbstractLeastSquaresOptimizer() {}
@@ -194,7 +194,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.math3.exception.TooManyEvaluationsException
+ * @throws org.apache.commons.math4.exception.TooManyEvaluationsException
* if the maximal number of evaluations is exceeded.
* @deprecated As of 3.1. Please use {@link #computeResiduals(double[])},
* {@link #computeObjectiveValue(double[])}, {@link #computeCost(double[])}
@@ -274,7 +274,7 @@ public abstract class AbstractLeastSquaresOptimizer
* Get the covariance matrix of the optimized parameters.
*
* @return the covariance matrix.
- * @throws org.apache.commons.math3.linear.SingularMatrixException
+ * @throws org.apache.commons.math4.linear.SingularMatrixException
* if the covariance matrix cannot be computed (singular problem).
* @see #getCovariances(double)
* @deprecated As of 3.1. Please use {@link #computeCovariances(double[],double)}
@@ -297,7 +297,7 @@ public abstract class AbstractLeastSquaresOptimizer
*
* @param threshold Singularity threshold.
* @return the covariance matrix.
- * @throws org.apache.commons.math3.linear.SingularMatrixException
+ * @throws org.apache.commons.math4.linear.SingularMatrixException
* if the covariance matrix cannot be computed (singular problem).
* @deprecated As of 3.1. Please use {@link #computeCovariances(double[],double)}
* instead.
@@ -320,7 +320,7 @@ public abstract class AbstractLeastSquaresOptimizer
* @param params Model parameters.
* @param threshold Singularity threshold.
* @return the covariance matrix.
- * @throws org.apache.commons.math3.linear.SingularMatrixException
+ * @throws org.apache.commons.math4.linear.SingularMatrixException
* if the covariance matrix cannot be computed (singular problem).
* @since 3.1
*/
@@ -358,7 +358,7 @@ public abstract class AbstractLeastSquaresOptimizer
* </p>
*
* @return an estimate of the standard deviation of the optimized parameters
- * @throws org.apache.commons.math3.linear.SingularMatrixException
+ * @throws org.apache.commons.math4.linear.SingularMatrixException
* if the covariance 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
@@ -393,7 +393,7 @@ public abstract class AbstractLeastSquaresOptimizer
* @param covarianceSingularityThreshold Singularity threshold (see
* {@link #computeCovariances(double[],double) computeCovariances}).
* @return an estimate of the standard deviation of the optimized parameters
- * @throws org.apache.commons.math3.linear.SingularMatrixException
+ * @throws org.apache.commons.math4.linear.SingularMatrixException
* if the covariance matrix cannot be computed.
* @since 3.1
*/
@@ -411,7 +411,7 @@ public abstract class AbstractLeastSquaresOptimizer
/** {@inheritDoc}
* @deprecated As of 3.1. Please use
* {@link BaseAbstractMultivariateVectorOptimizer#optimize(int,
- * org.apache.commons.math3.analysis.MultivariateVectorFunction,OptimizationData[])
+ * org.apache.commons.math4.analysis.MultivariateVectorFunction,OptimizationData[])
* optimize(int,MultivariateDifferentiableVectorFunction,OptimizationData...)}
* instead.
*/
@@ -441,15 +441,15 @@ public abstract class AbstractLeastSquaresOptimizer
* @return the point/value pair giving the optimal value for objective
* function.
* @param maxEval Maximum number of function evaluations.
- * @throws org.apache.commons.math3.exception.DimensionMismatchException
+ * @throws org.apache.commons.math4.exception.DimensionMismatchException
* if the start point dimension is wrong.
- * @throws org.apache.commons.math3.exception.TooManyEvaluationsException
+ * @throws org.apache.commons.math4.exception.TooManyEvaluationsException
* if the maximal number of evaluations is exceeded.
- * @throws org.apache.commons.math3.exception.NullArgumentException if
+ * @throws org.apache.commons.math4.exception.NullArgumentException if
* any argument is {@code null}.
* @deprecated As of 3.1. Please use
* {@link BaseAbstractMultivariateVectorOptimizer#optimize(int,
- * org.apache.commons.math3.analysis.MultivariateVectorFunction,OptimizationData[])
+ * org.apache.commons.math4.analysis.MultivariateVectorFunction,OptimizationData[])
* optimize(int,MultivariateDifferentiableVectorFunction,OptimizationData...)}
* instead.
*/
@@ -480,12 +480,12 @@ public abstract class AbstractLeastSquaresOptimizer
* </ul>
* @return the point/value pair giving the optimal value of the objective
* function.
- * @throws org.apache.commons.math3.exception.TooManyEvaluationsException if
+ * @throws org.apache.commons.math4.exception.TooManyEvaluationsException if
* the maximal number of evaluations is exceeded.
* @throws DimensionMismatchException if the target, and weight arguments
* have inconsistent dimensions.
* @see BaseAbstractMultivariateVectorOptimizer#optimizeInternal(int,
- * org.apache.commons.math3.analysis.MultivariateVectorFunction,OptimizationData[])
+ * org.apache.commons.math4.analysis.MultivariateVectorFunction,OptimizationData[])
* @since 3.1
* @deprecated As of 3.1. Override is necessary only until this class's generic
* argument is changed to {@code MultivariateDifferentiableVectorFunction}.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/general/AbstractScalarDifferentiableOptimizer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optimization/general/AbstractScalarDifferentiableOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/general/AbstractScalarDifferentiableOptimizer.java
index 3947c2c..1bb8cc0 100644
--- a/src/main/java/org/apache/commons/math4/optimization/general/AbstractScalarDifferentiableOptimizer.java
+++ b/src/main/java/org/apache/commons/math4/optimization/general/AbstractScalarDifferentiableOptimizer.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.apache.commons.math3.optimization.general;
+package org.apache.commons.math4.optimization.general;
-import org.apache.commons.math3.analysis.DifferentiableMultivariateFunction;
-import org.apache.commons.math3.analysis.MultivariateVectorFunction;
-import org.apache.commons.math3.analysis.FunctionUtils;
-import org.apache.commons.math3.analysis.differentiation.MultivariateDifferentiableFunction;
-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;
+import org.apache.commons.math4.analysis.DifferentiableMultivariateFunction;
+import org.apache.commons.math4.analysis.FunctionUtils;
+import org.apache.commons.math4.analysis.MultivariateVectorFunction;
+import org.apache.commons.math4.analysis.differentiation.MultivariateDifferentiableFunction;
+import org.apache.commons.math4.optimization.ConvergenceChecker;
+import org.apache.commons.math4.optimization.DifferentiableMultivariateOptimizer;
+import org.apache.commons.math4.optimization.GoalType;
+import org.apache.commons.math4.optimization.PointValuePair;
+import org.apache.commons.math4.optimization.direct.BaseAbstractMultivariateOptimizer;
/**
* Base class for implementing optimizers for multivariate scalar
@@ -47,9 +47,9 @@ public abstract class AbstractScalarDifferentiableOptimizer
/**
* Simple constructor with default settings.
* The convergence check is set to a
- * {@link org.apache.commons.math3.optimization.SimpleValueChecker
+ * {@link org.apache.commons.math4.optimization.SimpleValueChecker
* SimpleValueChecker}.
- * @deprecated See {@link org.apache.commons.math3.optimization.SimpleValueChecker#SimpleValueChecker()}
+ * @deprecated See {@link org.apache.commons.math4.optimization.SimpleValueChecker#SimpleValueChecker()}
*/
@Deprecated
protected AbstractScalarDifferentiableOptimizer() {}
@@ -66,7 +66,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.math3.exception.TooManyEvaluationsException
+ * @throws org.apache.commons.math4.exception.TooManyEvaluationsException
* if the allowed number of evaluations is exceeded.
*/
protected double[] computeObjectiveGradient(final double[] evaluationPoint) {
@@ -95,11 +95,11 @@ public abstract class AbstractScalarDifferentiableOptimizer
* @param maxEval Maximum number of function evaluations.
* @return the point/value pair giving the optimal value for objective
* function.
- * @throws org.apache.commons.math3.exception.DimensionMismatchException
+ * @throws org.apache.commons.math4.exception.DimensionMismatchException
* if the start point dimension is wrong.
- * @throws org.apache.commons.math3.exception.TooManyEvaluationsException
+ * @throws org.apache.commons.math4.exception.TooManyEvaluationsException
* if the maximal number of evaluations is exceeded.
- * @throws org.apache.commons.math3.exception.NullArgumentException if
+ * @throws org.apache.commons.math4.exception.NullArgumentException if
* any argument is {@code null}.
*/
public PointValuePair optimize(final int maxEval,
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/general/ConjugateGradientFormula.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optimization/general/ConjugateGradientFormula.java b/src/main/java/org/apache/commons/math4/optimization/general/ConjugateGradientFormula.java
index 5fee40a..fae7419 100644
--- a/src/main/java/org/apache/commons/math4/optimization/general/ConjugateGradientFormula.java
+++ b/src/main/java/org/apache/commons/math4/optimization/general/ConjugateGradientFormula.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.math3.optimization.general;
+package org.apache.commons.math4.optimization.general;
/**
* Available choices of update formulas for the β parameter
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/general/GaussNewtonOptimizer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optimization/general/GaussNewtonOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/general/GaussNewtonOptimizer.java
index 464a0f0..9a44084 100644
--- a/src/main/java/org/apache/commons/math4/optimization/general/GaussNewtonOptimizer.java
+++ b/src/main/java/org/apache/commons/math4/optimization/general/GaussNewtonOptimizer.java
@@ -15,22 +15,22 @@
* limitations under the License.
*/
-package org.apache.commons.math3.optimization.general;
-
-import org.apache.commons.math3.exception.ConvergenceException;
-import org.apache.commons.math3.exception.NullArgumentException;
-import org.apache.commons.math3.exception.MathInternalError;
-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;
+package org.apache.commons.math4.optimization.general;
+
+import org.apache.commons.math4.exception.ConvergenceException;
+import org.apache.commons.math4.exception.MathInternalError;
+import org.apache.commons.math4.exception.NullArgumentException;
+import org.apache.commons.math4.exception.util.LocalizedFormats;
+import org.apache.commons.math4.linear.ArrayRealVector;
+import org.apache.commons.math4.linear.BlockRealMatrix;
+import org.apache.commons.math4.linear.DecompositionSolver;
+import org.apache.commons.math4.linear.LUDecomposition;
+import org.apache.commons.math4.linear.QRDecomposition;
+import org.apache.commons.math4.linear.RealMatrix;
+import org.apache.commons.math4.linear.SingularMatrixException;
+import org.apache.commons.math4.optimization.ConvergenceChecker;
+import org.apache.commons.math4.optimization.PointVectorValuePair;
+import org.apache.commons.math4.optimization.SimpleVectorValueChecker;
/**
* Gauss-Newton least-squares solver.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/general/LevenbergMarquardtOptimizer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optimization/general/LevenbergMarquardtOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/general/LevenbergMarquardtOptimizer.java
index a29cafc..407f721 100644
--- a/src/main/java/org/apache/commons/math4/optimization/general/LevenbergMarquardtOptimizer.java
+++ b/src/main/java/org/apache/commons/math4/optimization/general/LevenbergMarquardtOptimizer.java
@@ -14,17 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.math3.optimization.general;
+package org.apache.commons.math4.optimization.general;
import java.util.Arrays;
-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.linear.RealMatrix;
-import org.apache.commons.math3.util.Precision;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.exception.ConvergenceException;
+import org.apache.commons.math4.exception.util.LocalizedFormats;
+import org.apache.commons.math4.linear.RealMatrix;
+import org.apache.commons.math4.optimization.ConvergenceChecker;
+import org.apache.commons.math4.optimization.PointVectorValuePair;
+import org.apache.commons.math4.util.FastMath;
+import org.apache.commons.math4.util.Precision;
/**
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/general/NonLinearConjugateGradientOptimizer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optimization/general/NonLinearConjugateGradientOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/general/NonLinearConjugateGradientOptimizer.java
index c076d11..499fd07 100644
--- a/src/main/java/org/apache/commons/math4/optimization/general/NonLinearConjugateGradientOptimizer.java
+++ b/src/main/java/org/apache/commons/math4/optimization/general/NonLinearConjugateGradientOptimizer.java
@@ -15,18 +15,18 @@
* limitations under the License.
*/
-package org.apache.commons.math3.optimization.general;
+package org.apache.commons.math4.optimization.general;
-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;
+import org.apache.commons.math4.analysis.UnivariateFunction;
+import org.apache.commons.math4.analysis.solvers.BrentSolver;
+import org.apache.commons.math4.analysis.solvers.UnivariateSolver;
+import org.apache.commons.math4.exception.MathIllegalStateException;
+import org.apache.commons.math4.exception.util.LocalizedFormats;
+import org.apache.commons.math4.optimization.ConvergenceChecker;
+import org.apache.commons.math4.optimization.GoalType;
+import org.apache.commons.math4.optimization.PointValuePair;
+import org.apache.commons.math4.optimization.SimpleValueChecker;
+import org.apache.commons.math4.util.FastMath;
/**
* Non-linear conjugate gradient optimizer.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/general/Preconditioner.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optimization/general/Preconditioner.java b/src/main/java/org/apache/commons/math4/optimization/general/Preconditioner.java
index 7142e76..882b789 100644
--- a/src/main/java/org/apache/commons/math4/optimization/general/Preconditioner.java
+++ b/src/main/java/org/apache/commons/math4/optimization/general/Preconditioner.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.math3.optimization.general;
+package org.apache.commons.math4.optimization.general;
/**
* This interface represents a preconditioner for differentiable scalar
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/general/package-info.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optimization/general/package-info.java b/src/main/java/org/apache/commons/math4/optimization/general/package-info.java
index ba140ce..ac50fd4 100644
--- a/src/main/java/org/apache/commons/math4/optimization/general/package-info.java
+++ b/src/main/java/org/apache/commons/math4/optimization/general/package-info.java
@@ -19,4 +19,4 @@
* This package provides optimization algorithms that require derivatives.
*
*/
-package org.apache.commons.math3.optimization.general;
+package org.apache.commons.math4.optimization.general;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/linear/AbstractLinearOptimizer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optimization/linear/AbstractLinearOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/linear/AbstractLinearOptimizer.java
index 921d877..7a58f0d 100644
--- a/src/main/java/org/apache/commons/math4/optimization/linear/AbstractLinearOptimizer.java
+++ b/src/main/java/org/apache/commons/math4/optimization/linear/AbstractLinearOptimizer.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.commons.math3.optimization.linear;
+package org.apache.commons.math4.optimization.linear;
import java.util.Collection;
import java.util.Collections;
-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;
+import org.apache.commons.math4.exception.MathIllegalStateException;
+import org.apache.commons.math4.exception.MaxCountExceededException;
+import org.apache.commons.math4.optimization.GoalType;
+import org.apache.commons.math4.optimization.PointValuePair;
/**
* Base class for implementing linear optimizers.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/linear/LinearConstraint.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optimization/linear/LinearConstraint.java b/src/main/java/org/apache/commons/math4/optimization/linear/LinearConstraint.java
index 4e1966c..85c3b2f 100644
--- a/src/main/java/org/apache/commons/math4/optimization/linear/LinearConstraint.java
+++ b/src/main/java/org/apache/commons/math4/optimization/linear/LinearConstraint.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.commons.math3.optimization.linear;
+package org.apache.commons.math4.optimization.linear;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
-import org.apache.commons.math3.linear.MatrixUtils;
-import org.apache.commons.math3.linear.RealVector;
-import org.apache.commons.math3.linear.ArrayRealVector;
+import org.apache.commons.math4.linear.ArrayRealVector;
+import org.apache.commons.math4.linear.MatrixUtils;
+import org.apache.commons.math4.linear.RealVector;
/**
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/linear/LinearObjectiveFunction.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optimization/linear/LinearObjectiveFunction.java b/src/main/java/org/apache/commons/math4/optimization/linear/LinearObjectiveFunction.java
index 5755f5e..be5ed6bd 100644
--- a/src/main/java/org/apache/commons/math4/optimization/linear/LinearObjectiveFunction.java
+++ b/src/main/java/org/apache/commons/math4/optimization/linear/LinearObjectiveFunction.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.commons.math3.optimization.linear;
+package org.apache.commons.math4.optimization.linear;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
-import org.apache.commons.math3.linear.MatrixUtils;
-import org.apache.commons.math3.linear.RealVector;
-import org.apache.commons.math3.linear.ArrayRealVector;
+import org.apache.commons.math4.linear.ArrayRealVector;
+import org.apache.commons.math4.linear.MatrixUtils;
+import org.apache.commons.math4.linear.RealVector;
/**
* An objective function for a linear optimization problem.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/linear/LinearOptimizer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optimization/linear/LinearOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/linear/LinearOptimizer.java
index 610d0cb..07e5930 100644
--- a/src/main/java/org/apache/commons/math4/optimization/linear/LinearOptimizer.java
+++ b/src/main/java/org/apache/commons/math4/optimization/linear/LinearOptimizer.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.commons.math3.optimization.linear;
+package org.apache.commons.math4.optimization.linear;
import java.util.Collection;
-import org.apache.commons.math3.exception.MathIllegalStateException;
-import org.apache.commons.math3.optimization.GoalType;
-import org.apache.commons.math3.optimization.PointValuePair;
+import org.apache.commons.math4.exception.MathIllegalStateException;
+import org.apache.commons.math4.optimization.GoalType;
+import org.apache.commons.math4.optimization.PointValuePair;
/**
* This interface represents an optimization algorithm for linear problems.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/linear/NoFeasibleSolutionException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optimization/linear/NoFeasibleSolutionException.java b/src/main/java/org/apache/commons/math4/optimization/linear/NoFeasibleSolutionException.java
index c585c3a..ca3b438 100644
--- a/src/main/java/org/apache/commons/math4/optimization/linear/NoFeasibleSolutionException.java
+++ b/src/main/java/org/apache/commons/math4/optimization/linear/NoFeasibleSolutionException.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.commons.math3.optimization.linear;
+package org.apache.commons.math4.optimization.linear;
-import org.apache.commons.math3.exception.MathIllegalStateException;
-import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math4.exception.MathIllegalStateException;
+import org.apache.commons.math4.exception.util.LocalizedFormats;
/**
* This class represents exceptions thrown by optimizers when no solution fulfills the constraints.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/linear/Relationship.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optimization/linear/Relationship.java b/src/main/java/org/apache/commons/math4/optimization/linear/Relationship.java
index 0da755f..7675694 100644
--- a/src/main/java/org/apache/commons/math4/optimization/linear/Relationship.java
+++ b/src/main/java/org/apache/commons/math4/optimization/linear/Relationship.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.math3.optimization.linear;
+package org.apache.commons.math4.optimization.linear;
/**
* Types of relationships between two cells in a Solver {@link LinearConstraint}.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/linear/SimplexSolver.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optimization/linear/SimplexSolver.java b/src/main/java/org/apache/commons/math4/optimization/linear/SimplexSolver.java
index 1e5dbda..23db158 100644
--- a/src/main/java/org/apache/commons/math4/optimization/linear/SimplexSolver.java
+++ b/src/main/java/org/apache/commons/math4/optimization/linear/SimplexSolver.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.commons.math3.optimization.linear;
+package org.apache.commons.math4.optimization.linear;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.math3.exception.MaxCountExceededException;
-import org.apache.commons.math3.optimization.PointValuePair;
-import org.apache.commons.math3.util.Precision;
+import org.apache.commons.math4.exception.MaxCountExceededException;
+import org.apache.commons.math4.optimization.PointValuePair;
+import org.apache.commons.math4.util.Precision;
/**
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/linear/SimplexTableau.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optimization/linear/SimplexTableau.java b/src/main/java/org/apache/commons/math4/optimization/linear/SimplexTableau.java
index ebc703a..16f07ef 100644
--- a/src/main/java/org/apache/commons/math4/optimization/linear/SimplexTableau.java
+++ b/src/main/java/org/apache/commons/math4/optimization/linear/SimplexTableau.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.math3.optimization.linear;
+package org.apache.commons.math4.optimization.linear;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -28,14 +28,14 @@ import java.util.List;
import java.util.Set;
import java.util.TreeSet;
-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.FastMath;
-import org.apache.commons.math3.util.Precision;
+import org.apache.commons.math4.linear.Array2DRowRealMatrix;
+import org.apache.commons.math4.linear.MatrixUtils;
+import org.apache.commons.math4.linear.RealMatrix;
+import org.apache.commons.math4.linear.RealVector;
+import org.apache.commons.math4.optimization.GoalType;
+import org.apache.commons.math4.optimization.PointValuePair;
+import org.apache.commons.math4.util.FastMath;
+import org.apache.commons.math4.util.Precision;
/**
* A tableau for use in the Simplex method.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/linear/UnboundedSolutionException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optimization/linear/UnboundedSolutionException.java b/src/main/java/org/apache/commons/math4/optimization/linear/UnboundedSolutionException.java
index a8fe77b..1332440 100644
--- a/src/main/java/org/apache/commons/math4/optimization/linear/UnboundedSolutionException.java
+++ b/src/main/java/org/apache/commons/math4/optimization/linear/UnboundedSolutionException.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.commons.math3.optimization.linear;
+package org.apache.commons.math4.optimization.linear;
-import org.apache.commons.math3.exception.MathIllegalStateException;
-import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math4.exception.MathIllegalStateException;
+import org.apache.commons.math4.exception.util.LocalizedFormats;
/**
* This class represents exceptions thrown by optimizers when a solution escapes to infinity.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/linear/package-info.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optimization/linear/package-info.java b/src/main/java/org/apache/commons/math4/optimization/linear/package-info.java
index b61b03b..3e7c424 100644
--- a/src/main/java/org/apache/commons/math4/optimization/linear/package-info.java
+++ b/src/main/java/org/apache/commons/math4/optimization/linear/package-info.java
@@ -19,4 +19,4 @@
* This package provides optimization algorithms for linear constrained problems.
*
*/
-package org.apache.commons.math3.optimization.linear;
+package org.apache.commons.math4.optimization.linear;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/package-info.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optimization/package-info.java b/src/main/java/org/apache/commons/math4/optimization/package-info.java
index 84349b2..f92cb0f 100644
--- a/src/main/java/org/apache/commons/math4/optimization/package-info.java
+++ b/src/main/java/org/apache/commons/math4/optimization/package-info.java
@@ -18,8 +18,8 @@
* <h2>All classes and sub-packages of this package are deprecated.</h2>
* <h3>Please use their replacements, to be found under
* <ul>
- * <li>{@link org.apache.commons.math3.optim}</li>
- * <li>{@link org.apache.commons.math3.fitting}</li>
+ * <li>{@link org.apache.commons.math4.optim}</li>
+ * <li>{@link org.apache.commons.math4.fitting}</li>
* </ul>
* </h3>
*
@@ -39,32 +39,32 @@
* interfaces defining the common behavior of optimizers, one for each supported type of objective
* function:
* <ul>
- * <li>{@link org.apache.commons.math3.optimization.univariate.UnivariateOptimizer
- * UnivariateOptimizer} for {@link org.apache.commons.math3.analysis.UnivariateFunction
+ * <li>{@link org.apache.commons.math4.optimization.univariate.UnivariateOptimizer
+ * UnivariateOptimizer} for {@link org.apache.commons.math4.analysis.UnivariateFunction
* univariate real functions}</li>
- * <li>{@link org.apache.commons.math3.optimization.MultivariateOptimizer
- * MultivariateOptimizer} for {@link org.apache.commons.math3.analysis.MultivariateFunction
+ * <li>{@link org.apache.commons.math4.optimization.MultivariateOptimizer
+ * MultivariateOptimizer} for {@link org.apache.commons.math4.analysis.MultivariateFunction
* multivariate real functions}</li>
- * <li>{@link org.apache.commons.math3.optimization.MultivariateDifferentiableOptimizer
+ * <li>{@link org.apache.commons.math4.optimization.MultivariateDifferentiableOptimizer
* MultivariateDifferentiableOptimizer} for {@link
- * org.apache.commons.math3.analysis.differentiation.MultivariateDifferentiableFunction
+ * org.apache.commons.math4.analysis.differentiation.MultivariateDifferentiableFunction
* multivariate differentiable real functions}</li>
- * <li>{@link org.apache.commons.math3.optimization.MultivariateDifferentiableVectorOptimizer
+ * <li>{@link org.apache.commons.math4.optimization.MultivariateDifferentiableVectorOptimizer
* MultivariateDifferentiableVectorOptimizer} for {@link
- * org.apache.commons.math3.analysis.differentiation.MultivariateDifferentiableVectorFunction
+ * org.apache.commons.math4.analysis.differentiation.MultivariateDifferentiableVectorFunction
* multivariate differentiable vectorial functions}</li>
* </ul>
* </p>
*
* <p>
* Despite there are only four types of supported optimizers, it is possible to optimize a
- * transform a {@link org.apache.commons.math3.analysis.MultivariateVectorFunction
+ * transform a {@link org.apache.commons.math4.analysis.MultivariateVectorFunction
* non-differentiable multivariate vectorial function} by converting it to a {@link
- * org.apache.commons.math3.analysis.MultivariateFunction non-differentiable multivariate
+ * org.apache.commons.math4.analysis.MultivariateFunction non-differentiable multivariate
* real function} thanks to the {@link
- * org.apache.commons.math3.optimization.LeastSquaresConverter LeastSquaresConverter} helper class.
+ * org.apache.commons.math4.optimization.LeastSquaresConverter LeastSquaresConverter} helper class.
* The transformed function can be optimized using any implementation of the {@link
- * org.apache.commons.math3.optimization.MultivariateOptimizer MultivariateOptimizer} interface.
+ * org.apache.commons.math4.optimization.MultivariateOptimizer MultivariateOptimizer} interface.
* </p>
*
* <p>
@@ -76,4 +76,4 @@
* </p>
*
*/
-package org.apache.commons.math3.optimization;
+package org.apache.commons.math4.optimization;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/univariate/BaseAbstractUnivariateOptimizer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optimization/univariate/BaseAbstractUnivariateOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/univariate/BaseAbstractUnivariateOptimizer.java
index fcacd01..6b6a9b1 100644
--- a/src/main/java/org/apache/commons/math4/optimization/univariate/BaseAbstractUnivariateOptimizer.java
+++ b/src/main/java/org/apache/commons/math4/optimization/univariate/BaseAbstractUnivariateOptimizer.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.commons.math3.optimization.univariate;
+package org.apache.commons.math4.optimization.univariate;
-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;
+import org.apache.commons.math4.analysis.UnivariateFunction;
+import org.apache.commons.math4.exception.MaxCountExceededException;
+import org.apache.commons.math4.exception.NullArgumentException;
+import org.apache.commons.math4.exception.TooManyEvaluationsException;
+import org.apache.commons.math4.optimization.ConvergenceChecker;
+import org.apache.commons.math4.optimization.GoalType;
+import org.apache.commons.math4.util.Incrementor;
/**
* Provide a default implementation for several functions useful to generic
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/univariate/BaseUnivariateOptimizer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optimization/univariate/BaseUnivariateOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/univariate/BaseUnivariateOptimizer.java
index fcae6f1..67e16ca 100644
--- a/src/main/java/org/apache/commons/math4/optimization/univariate/BaseUnivariateOptimizer.java
+++ b/src/main/java/org/apache/commons/math4/optimization/univariate/BaseUnivariateOptimizer.java
@@ -15,18 +15,18 @@
* limitations under the License.
*/
-package org.apache.commons.math3.optimization.univariate;
+package org.apache.commons.math4.optimization.univariate;
-import org.apache.commons.math3.analysis.UnivariateFunction;
-import org.apache.commons.math3.optimization.BaseOptimizer;
-import org.apache.commons.math3.optimization.GoalType;
+import org.apache.commons.math4.analysis.UnivariateFunction;
+import org.apache.commons.math4.optimization.BaseOptimizer;
+import org.apache.commons.math4.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:
* <ul>
- * <li>{@link org.apache.commons.math3.optimization.univariate.UnivariateOptimizer}</li>
+ * <li>{@link org.apache.commons.math4.optimization.univariate.UnivariateOptimizer}</li>
* </ul>
*
* @param <FUNC> Type of the objective function to be optimized.
@@ -49,9 +49,9 @@ public interface BaseUnivariateOptimizer<FUNC extends UnivariateFunction>
* @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.math3.exception.TooManyEvaluationsException
+ * @throws org.apache.commons.math4.exception.TooManyEvaluationsException
* if the maximum evaluation count is exceeded.
- * @throws org.apache.commons.math3.exception.ConvergenceException
+ * @throws org.apache.commons.math4.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.
@@ -71,13 +71,13 @@ public interface BaseUnivariateOptimizer<FUNC extends UnivariateFunction>
* @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.math3.exception.TooManyEvaluationsException
+ * @throws org.apache.commons.math4.exception.TooManyEvaluationsException
* if the maximum evaluation count is exceeded.
- * @throws org.apache.commons.math3.exception.ConvergenceException if the
+ * @throws org.apache.commons.math4.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.math3.exception.NullArgumentException if any
+ * @throws org.apache.commons.math4.exception.NullArgumentException if any
* argument is {@code null}.
*/
UnivariatePointValuePair optimize(int maxEval, FUNC f, GoalType goalType,
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/univariate/BracketFinder.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optimization/univariate/BracketFinder.java b/src/main/java/org/apache/commons/math4/optimization/univariate/BracketFinder.java
index cd3057f..2727a2f 100644
--- a/src/main/java/org/apache/commons/math4/optimization/univariate/BracketFinder.java
+++ b/src/main/java/org/apache/commons/math4/optimization/univariate/BracketFinder.java
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.math3.optimization.univariate;
+package org.apache.commons.math4.optimization.univariate;
-import org.apache.commons.math3.util.FastMath;
-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;
+import org.apache.commons.math4.analysis.UnivariateFunction;
+import org.apache.commons.math4.exception.MaxCountExceededException;
+import org.apache.commons.math4.exception.NotStrictlyPositiveException;
+import org.apache.commons.math4.exception.TooManyEvaluationsException;
+import org.apache.commons.math4.optimization.GoalType;
+import org.apache.commons.math4.util.FastMath;
+import org.apache.commons.math4.util.Incrementor;
/**
* Provide an interval that brackets a local optimum of a function.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/univariate/BrentOptimizer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optimization/univariate/BrentOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/univariate/BrentOptimizer.java
index 763ec99..a7d39df 100644
--- a/src/main/java/org/apache/commons/math4/optimization/univariate/BrentOptimizer.java
+++ b/src/main/java/org/apache/commons/math4/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.math3.optimization.univariate;
+package org.apache.commons.math4.optimization.univariate;
-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;
+import org.apache.commons.math4.exception.NotStrictlyPositiveException;
+import org.apache.commons.math4.exception.NumberIsTooSmallException;
+import org.apache.commons.math4.optimization.ConvergenceChecker;
+import org.apache.commons.math4.optimization.GoalType;
+import org.apache.commons.math4.util.FastMath;
+import org.apache.commons.math4.util.Precision;
/**
* For a function defined on some interval {@code (lo, hi)}, this class
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/univariate/SimpleUnivariateValueChecker.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optimization/univariate/SimpleUnivariateValueChecker.java b/src/main/java/org/apache/commons/math4/optimization/univariate/SimpleUnivariateValueChecker.java
index 82c50b6..29928e1 100644
--- a/src/main/java/org/apache/commons/math4/optimization/univariate/SimpleUnivariateValueChecker.java
+++ b/src/main/java/org/apache/commons/math4/optimization/univariate/SimpleUnivariateValueChecker.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.commons.math3.optimization.univariate;
+package org.apache.commons.math4.optimization.univariate;
-import org.apache.commons.math3.util.FastMath;
-import org.apache.commons.math3.exception.NotStrictlyPositiveException;
-import org.apache.commons.math3.optimization.AbstractConvergenceChecker;
+import org.apache.commons.math4.exception.NotStrictlyPositiveException;
+import org.apache.commons.math4.optimization.AbstractConvergenceChecker;
+import org.apache.commons.math4.util.FastMath;
/**
* Simple implementation of the
- * {@link org.apache.commons.math3.optimization.ConvergenceChecker} interface
+ * {@link org.apache.commons.math4.optimization.ConvergenceChecker} interface
* that uses only objective function values.
*
* Convergence is considered to have been reached if either the relative
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/univariate/UnivariateMultiStartOptimizer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optimization/univariate/UnivariateMultiStartOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/univariate/UnivariateMultiStartOptimizer.java
index 6606d33..cbf73c5 100644
--- a/src/main/java/org/apache/commons/math4/optimization/univariate/UnivariateMultiStartOptimizer.java
+++ b/src/main/java/org/apache/commons/math4/optimization/univariate/UnivariateMultiStartOptimizer.java
@@ -15,19 +15,19 @@
* limitations under the License.
*/
-package org.apache.commons.math3.optimization.univariate;
+package org.apache.commons.math4.optimization.univariate;
import java.util.Arrays;
import java.util.Comparator;
-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;
+import org.apache.commons.math4.analysis.UnivariateFunction;
+import org.apache.commons.math4.exception.MathIllegalStateException;
+import org.apache.commons.math4.exception.NotStrictlyPositiveException;
+import org.apache.commons.math4.exception.NullArgumentException;
+import org.apache.commons.math4.exception.util.LocalizedFormats;
+import org.apache.commons.math4.optimization.ConvergenceChecker;
+import org.apache.commons.math4.optimization.GoalType;
+import org.apache.commons.math4.random.RandomGenerator;
/**
* Special implementation of the {@link UnivariateOptimizer} interface
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/univariate/UnivariateOptimizer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optimization/univariate/UnivariateOptimizer.java b/src/main/java/org/apache/commons/math4/optimization/univariate/UnivariateOptimizer.java
index e3ebbb3..b621c8b 100644
--- a/src/main/java/org/apache/commons/math4/optimization/univariate/UnivariateOptimizer.java
+++ b/src/main/java/org/apache/commons/math4/optimization/univariate/UnivariateOptimizer.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.math3.optimization.univariate;
+package org.apache.commons.math4.optimization.univariate;
-import org.apache.commons.math3.analysis.UnivariateFunction;
+import org.apache.commons.math4.analysis.UnivariateFunction;
/**
* Interface for univariate optimization algorithms.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/univariate/UnivariatePointValuePair.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optimization/univariate/UnivariatePointValuePair.java b/src/main/java/org/apache/commons/math4/optimization/univariate/UnivariatePointValuePair.java
index eee931c..6f5c450 100644
--- a/src/main/java/org/apache/commons/math4/optimization/univariate/UnivariatePointValuePair.java
+++ b/src/main/java/org/apache/commons/math4/optimization/univariate/UnivariatePointValuePair.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.math3.optimization.univariate;
+package org.apache.commons.math4.optimization.univariate;
import java.io.Serializable;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optimization/univariate/package-info.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optimization/univariate/package-info.java b/src/main/java/org/apache/commons/math4/optimization/univariate/package-info.java
index 04feb33..97258e3 100644
--- a/src/main/java/org/apache/commons/math4/optimization/univariate/package-info.java
+++ b/src/main/java/org/apache/commons/math4/optimization/univariate/package-info.java
@@ -19,4 +19,4 @@
* Univariate real functions minimum finding algorithms.
*
*/
-package org.apache.commons.math3.optimization.univariate;
+package org.apache.commons.math4.optimization.univariate;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/package-info.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/package-info.java b/src/main/java/org/apache/commons/math4/package-info.java
index 200346d..86871c6 100644
--- a/src/main/java/org/apache/commons/math4/package-info.java
+++ b/src/main/java/org/apache/commons/math4/package-info.java
@@ -17,4 +17,4 @@
/**
* Common classes used throughout the commons-math library.
*/
-package org.apache.commons.math3;
+package org.apache.commons.math4;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/primes/PollardRho.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/primes/PollardRho.java b/src/main/java/org/apache/commons/math4/primes/PollardRho.java
index bf7fbf8..fc2ec88 100644
--- a/src/main/java/org/apache/commons/math4/primes/PollardRho.java
+++ b/src/main/java/org/apache/commons/math4/primes/PollardRho.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.math3.primes;
+package org.apache.commons.math4.primes;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.util.FastMath;
/**
* Implementation of the Pollard's rho factorization algorithm.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/primes/Primes.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/primes/Primes.java b/src/main/java/org/apache/commons/math4/primes/Primes.java
index 12cd317..7dbb883 100644
--- a/src/main/java/org/apache/commons/math4/primes/Primes.java
+++ b/src/main/java/org/apache/commons/math4/primes/Primes.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.math3.primes;
+package org.apache.commons.math4.primes;
-import org.apache.commons.math3.exception.MathIllegalArgumentException;
-import org.apache.commons.math3.exception.util.LocalizedFormats;
+import org.apache.commons.math4.exception.MathIllegalArgumentException;
+import org.apache.commons.math4.exception.util.LocalizedFormats;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/primes/SmallPrimes.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/primes/SmallPrimes.java b/src/main/java/org/apache/commons/math4/primes/SmallPrimes.java
index c889f10..0738cd2 100644
--- a/src/main/java/org/apache/commons/math4/primes/SmallPrimes.java
+++ b/src/main/java/org/apache/commons/math4/primes/SmallPrimes.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.math3.primes;
+package org.apache.commons.math4.primes;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.util.FastMath;
/**
* Utility methods to work on primes within the <code>int</code> range.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/primes/package-info.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/primes/package-info.java b/src/main/java/org/apache/commons/math4/primes/package-info.java
index 0873f66..076ec31 100644
--- a/src/main/java/org/apache/commons/math4/primes/package-info.java
+++ b/src/main/java/org/apache/commons/math4/primes/package-info.java
@@ -17,4 +17,4 @@
/**
* Methods related to prime numbers like primality test, factor decomposition.
*/
-package org.apache.commons.math3.primes;
+package org.apache.commons.math4.primes;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/random/AbstractRandomGenerator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/random/AbstractRandomGenerator.java b/src/main/java/org/apache/commons/math4/random/AbstractRandomGenerator.java
index ea7a5cc..0e1251c 100644
--- a/src/main/java/org/apache/commons/math4/random/AbstractRandomGenerator.java
+++ b/src/main/java/org/apache/commons/math4/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.math3.random;
+package org.apache.commons.math4.random;
-import org.apache.commons.math3.exception.NotStrictlyPositiveException;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.exception.NotStrictlyPositiveException;
+import org.apache.commons.math4.util.FastMath;
/**
* Abstract class implementing the {@link RandomGenerator} interface.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/random/AbstractWell.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/random/AbstractWell.java b/src/main/java/org/apache/commons/math4/random/AbstractWell.java
index 615854e..19820a1 100644
--- a/src/main/java/org/apache/commons/math4/random/AbstractWell.java
+++ b/src/main/java/org/apache/commons/math4/random/AbstractWell.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.math3.random;
+package org.apache.commons.math4.random;
import java.io.Serializable;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.util.FastMath;
/** This abstract class implements the WELL class of pseudo-random number generator
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/random/BitsStreamGenerator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/random/BitsStreamGenerator.java b/src/main/java/org/apache/commons/math4/random/BitsStreamGenerator.java
index dcb000f..d8ddd2e 100644
--- a/src/main/java/org/apache/commons/math4/random/BitsStreamGenerator.java
+++ b/src/main/java/org/apache/commons/math4/random/BitsStreamGenerator.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.math3.random;
+package org.apache.commons.math4.random;
import java.io.Serializable;
-import org.apache.commons.math3.exception.NotStrictlyPositiveException;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.exception.NotStrictlyPositiveException;
+import org.apache.commons.math4.util.FastMath;
/** Base class for random number generators that generates bits streams.
*
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/random/CorrelatedRandomVectorGenerator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/random/CorrelatedRandomVectorGenerator.java b/src/main/java/org/apache/commons/math4/random/CorrelatedRandomVectorGenerator.java
index f0325b7..f95b018 100644
--- a/src/main/java/org/apache/commons/math4/random/CorrelatedRandomVectorGenerator.java
+++ b/src/main/java/org/apache/commons/math4/random/CorrelatedRandomVectorGenerator.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.commons.math3.random;
+package org.apache.commons.math4.random;
-import org.apache.commons.math3.exception.DimensionMismatchException;
-import org.apache.commons.math3.linear.RealMatrix;
-import org.apache.commons.math3.linear.RectangularCholeskyDecomposition;
+import org.apache.commons.math4.exception.DimensionMismatchException;
+import org.apache.commons.math4.linear.RealMatrix;
+import org.apache.commons.math4.linear.RectangularCholeskyDecomposition;
/**
* A {@link RandomVectorGenerator} that generates vectors with with
@@ -78,7 +78,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.math3.linear.NonPositiveDefiniteMatrixException
+ * @throws org.apache.commons.math4.linear.NonPositiveDefiniteMatrixException
* if the covariance matrix is not strictly positive definite.
* @throws DimensionMismatchException if the mean and covariance
* arrays dimensions do not match.
@@ -110,7 +110,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.math3.linear.NonPositiveDefiniteMatrixException
+ * @throws org.apache.commons.math4.linear.NonPositiveDefiniteMatrixException
* if the covariance matrix is not strictly positive definite.
*/
public CorrelatedRandomVectorGenerator(RealMatrix covariance, double small,
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/random/EmpiricalDistribution.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/random/EmpiricalDistribution.java b/src/main/java/org/apache/commons/math4/random/EmpiricalDistribution.java
index 3dd2d7f..7997181 100644
--- a/src/main/java/org/apache/commons/math4/random/EmpiricalDistribution.java
+++ b/src/main/java/org/apache/commons/math4/random/EmpiricalDistribution.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.math3.random;
+package org.apache.commons.math4.random;
import java.io.BufferedReader;
import java.io.File;
@@ -28,20 +28,20 @@ import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.math3.distribution.AbstractRealDistribution;
-import org.apache.commons.math3.distribution.ConstantRealDistribution;
-import org.apache.commons.math3.distribution.NormalDistribution;
-import org.apache.commons.math3.distribution.RealDistribution;
-import org.apache.commons.math3.exception.MathIllegalStateException;
-import org.apache.commons.math3.exception.MathInternalError;
-import org.apache.commons.math3.exception.NullArgumentException;
-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.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;
+import org.apache.commons.math4.distribution.AbstractRealDistribution;
+import org.apache.commons.math4.distribution.ConstantRealDistribution;
+import org.apache.commons.math4.distribution.NormalDistribution;
+import org.apache.commons.math4.distribution.RealDistribution;
+import org.apache.commons.math4.exception.MathIllegalStateException;
+import org.apache.commons.math4.exception.MathInternalError;
+import org.apache.commons.math4.exception.NullArgumentException;
+import org.apache.commons.math4.exception.OutOfRangeException;
+import org.apache.commons.math4.exception.ZeroException;
+import org.apache.commons.math4.exception.util.LocalizedFormats;
+import org.apache.commons.math4.stat.descriptive.StatisticalSummary;
+import org.apache.commons.math4.stat.descriptive.SummaryStatistics;
+import org.apache.commons.math4.util.FastMath;
+import org.apache.commons.math4.util.MathUtils;
/**
* <p>Represents an <a href="http://http://en.wikipedia.org/wiki/Empirical_distribution_function">
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/random/GaussianRandomGenerator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/random/GaussianRandomGenerator.java b/src/main/java/org/apache/commons/math4/random/GaussianRandomGenerator.java
index 1067ffc..55369b2 100644
--- a/src/main/java/org/apache/commons/math4/random/GaussianRandomGenerator.java
+++ b/src/main/java/org/apache/commons/math4/random/GaussianRandomGenerator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.math3.random;
+package org.apache.commons.math4.random;
/**
* This class is a gaussian normalized random generator for scalars.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/random/HaltonSequenceGenerator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/random/HaltonSequenceGenerator.java b/src/main/java/org/apache/commons/math4/random/HaltonSequenceGenerator.java
index af58e1d..25059ab 100644
--- a/src/main/java/org/apache/commons/math4/random/HaltonSequenceGenerator.java
+++ b/src/main/java/org/apache/commons/math4/random/HaltonSequenceGenerator.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.math3.random;
+package org.apache.commons.math4.random;
-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.OutOfRangeException;
-import org.apache.commons.math3.util.MathUtils;
+import org.apache.commons.math4.exception.DimensionMismatchException;
+import org.apache.commons.math4.exception.NotPositiveException;
+import org.apache.commons.math4.exception.NullArgumentException;
+import org.apache.commons.math4.exception.OutOfRangeException;
+import org.apache.commons.math4.util.MathUtils;
/**
* Implementation of a Halton sequence.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/random/ISAACRandom.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/random/ISAACRandom.java b/src/main/java/org/apache/commons/math4/random/ISAACRandom.java
index 87035cf..24ef390 100644
--- a/src/main/java/org/apache/commons/math4/random/ISAACRandom.java
+++ b/src/main/java/org/apache/commons/math4/random/ISAACRandom.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.commons.math3.random;
+package org.apache.commons.math4.random;
import java.io.Serializable;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.util.FastMath;
/**
* <a href="http://burtleburtle.net/bob/rand/isaacafa.html">
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/random/JDKRandomGenerator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/random/JDKRandomGenerator.java b/src/main/java/org/apache/commons/math4/random/JDKRandomGenerator.java
index 73c2f75..3594332 100644
--- a/src/main/java/org/apache/commons/math4/random/JDKRandomGenerator.java
+++ b/src/main/java/org/apache/commons/math4/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.math3.random;
+package org.apache.commons.math4.random;
import java.util.Random;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/random/MersenneTwister.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/random/MersenneTwister.java b/src/main/java/org/apache/commons/math4/random/MersenneTwister.java
index 288df3e..ab684c0 100644
--- a/src/main/java/org/apache/commons/math4/random/MersenneTwister.java
+++ b/src/main/java/org/apache/commons/math4/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.math3.random;
+package org.apache.commons.math4.random;
import java.io.Serializable;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.util.FastMath;
/** This class implements a powerful pseudo-random number generator
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/random/NormalizedRandomGenerator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/random/NormalizedRandomGenerator.java b/src/main/java/org/apache/commons/math4/random/NormalizedRandomGenerator.java
index bd3552b..0574cc7 100644
--- a/src/main/java/org/apache/commons/math4/random/NormalizedRandomGenerator.java
+++ b/src/main/java/org/apache/commons/math4/random/NormalizedRandomGenerator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.math3.random;
+package org.apache.commons.math4.random;
/**
* This interface represent a normalized random generator for
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/random/RandomAdaptor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/random/RandomAdaptor.java b/src/main/java/org/apache/commons/math4/random/RandomAdaptor.java
index 80ca940..066aa99 100644
--- a/src/main/java/org/apache/commons/math4/random/RandomAdaptor.java
+++ b/src/main/java/org/apache/commons/math4/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.math3.random;
+package org.apache.commons.math4.random;
import java.util.Random;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/random/RandomData.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/random/RandomData.java b/src/main/java/org/apache/commons/math4/random/RandomData.java
index fad4cb8..9f862f1 100644
--- a/src/main/java/org/apache/commons/math4/random/RandomData.java
+++ b/src/main/java/org/apache/commons/math4/random/RandomData.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.commons.math3.random;
+package org.apache.commons.math4.random;
import java.util.Collection;
-import org.apache.commons.math3.exception.NotANumberException;
-import org.apache.commons.math3.exception.NotFiniteNumberException;
-import org.apache.commons.math3.exception.NotStrictlyPositiveException;
-import org.apache.commons.math3.exception.NumberIsTooLargeException;
+import org.apache.commons.math4.exception.NotANumberException;
+import org.apache.commons.math4.exception.NotFiniteNumberException;
+import org.apache.commons.math4.exception.NotStrictlyPositiveException;
+import org.apache.commons.math4.exception.NumberIsTooLargeException;
/**
* Random data generation utilities.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/random/RandomDataGenerator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/random/RandomDataGenerator.java b/src/main/java/org/apache/commons/math4/random/RandomDataGenerator.java
index b0948d8..34765aa 100644
--- a/src/main/java/org/apache/commons/math4/random/RandomDataGenerator.java
+++ b/src/main/java/org/apache/commons/math4/random/RandomDataGenerator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.math3.random;
+package org.apache.commons.math4.random;
import java.io.Serializable;
import java.security.MessageDigest;
@@ -24,29 +24,29 @@ import java.security.NoSuchProviderException;
import java.security.SecureRandom;
import java.util.Collection;
-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.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.PascalDistribution;
-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.UniformIntegerDistribution;
-import org.apache.commons.math3.exception.MathInternalError;
-import org.apache.commons.math3.exception.NotANumberException;
-import org.apache.commons.math3.exception.NotFiniteNumberException;
-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.OutOfRangeException;
-import org.apache.commons.math3.exception.util.LocalizedFormats;
-import org.apache.commons.math3.util.MathArrays;
+import org.apache.commons.math4.distribution.BetaDistribution;
+import org.apache.commons.math4.distribution.BinomialDistribution;
+import org.apache.commons.math4.distribution.CauchyDistribution;
+import org.apache.commons.math4.distribution.ChiSquaredDistribution;
+import org.apache.commons.math4.distribution.ExponentialDistribution;
+import org.apache.commons.math4.distribution.FDistribution;
+import org.apache.commons.math4.distribution.GammaDistribution;
+import org.apache.commons.math4.distribution.HypergeometricDistribution;
+import org.apache.commons.math4.distribution.PascalDistribution;
+import org.apache.commons.math4.distribution.PoissonDistribution;
+import org.apache.commons.math4.distribution.TDistribution;
+import org.apache.commons.math4.distribution.UniformIntegerDistribution;
+import org.apache.commons.math4.distribution.WeibullDistribution;
+import org.apache.commons.math4.distribution.ZipfDistribution;
+import org.apache.commons.math4.exception.MathInternalError;
+import org.apache.commons.math4.exception.NotANumberException;
+import org.apache.commons.math4.exception.NotFiniteNumberException;
+import org.apache.commons.math4.exception.NotPositiveException;
+import org.apache.commons.math4.exception.NotStrictlyPositiveException;
+import org.apache.commons.math4.exception.NumberIsTooLargeException;
+import org.apache.commons.math4.exception.OutOfRangeException;
+import org.apache.commons.math4.exception.util.LocalizedFormats;
+import org.apache.commons.math4.util.MathArrays;
/**
* Implements the {@link RandomData} interface using a {@link RandomGenerator}
@@ -398,7 +398,7 @@ public class RandomDataGenerator implements RandomData, Serializable {
/**
* <p>Generates a random value from the
- * {@link org.apache.commons.math3.distribution.GammaDistribution Gamma Distribution}.</p>
+ * {@link org.apache.commons.math4.distribution.GammaDistribution Gamma Distribution}.</p>
*
* <p>This implementation uses the following algorithms: </p>
*
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/random/RandomDataImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/random/RandomDataImpl.java b/src/main/java/org/apache/commons/math4/random/RandomDataImpl.java
index 5b79393..df2c699 100644
--- a/src/main/java/org/apache/commons/math4/random/RandomDataImpl.java
+++ b/src/main/java/org/apache/commons/math4/random/RandomDataImpl.java
@@ -15,22 +15,22 @@
* limitations under the License.
*/
-package org.apache.commons.math3.random;
+package org.apache.commons.math4.random;
import java.io.Serializable;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
import java.util.Collection;
-import org.apache.commons.math3.distribution.IntegerDistribution;
-import org.apache.commons.math3.distribution.RealDistribution;
-import org.apache.commons.math3.exception.NotANumberException;
-import org.apache.commons.math3.exception.NotFiniteNumberException;
-import org.apache.commons.math3.exception.NotPositiveException;
-import org.apache.commons.math3.exception.NotStrictlyPositiveException;
-import org.apache.commons.math3.exception.MathIllegalArgumentException;
-import org.apache.commons.math3.exception.NumberIsTooLargeException;
-import org.apache.commons.math3.exception.OutOfRangeException;
+import org.apache.commons.math4.distribution.IntegerDistribution;
+import org.apache.commons.math4.distribution.RealDistribution;
+import org.apache.commons.math4.exception.MathIllegalArgumentException;
+import org.apache.commons.math4.exception.NotANumberException;
+import org.apache.commons.math4.exception.NotFiniteNumberException;
+import org.apache.commons.math4.exception.NotPositiveException;
+import org.apache.commons.math4.exception.NotStrictlyPositiveException;
+import org.apache.commons.math4.exception.NumberIsTooLargeException;
+import org.apache.commons.math4.exception.OutOfRangeException;
/**
* Generates random deviates and other random data using a {@link RandomGenerator}
@@ -265,7 +265,7 @@ public class RandomDataImpl implements RandomData, Serializable {
}
/**
- * Generates a random value from the {@link org.apache.commons.math3.distribution.BetaDistribution Beta Distribution}.
+ * Generates a random value from the {@link org.apache.commons.math4.distribution.BetaDistribution Beta Distribution}.
* This implementation uses {@link #nextInversionDeviate(RealDistribution) inversion}
* to generate random values.
*
@@ -279,7 +279,7 @@ public class RandomDataImpl implements RandomData, Serializable {
}
/**
- * Generates a random value from the {@link org.apache.commons.math3.distribution.BinomialDistribution Binomial Distribution}.
+ * Generates a random value from the {@link org.apache.commons.math4.distribution.BinomialDistribution Binomial Distribution}.
* This implementation uses {@link #nextInversionDeviate(RealDistribution) inversion}
* to generate random values.
*
@@ -293,7 +293,7 @@ public class RandomDataImpl implements RandomData, Serializable {
}
/**
- * Generates a random value from the {@link org.apache.commons.math3.distribution.CauchyDistribution Cauchy Distribution}.
+ * Generates a random value from the {@link org.apache.commons.math4.distribution.CauchyDistribution Cauchy Distribution}.
* This implementation uses {@link #nextInversionDeviate(RealDistribution) inversion}
* to generate random values.
*
@@ -307,7 +307,7 @@ public class RandomDataImpl implements RandomData, Serializable {
}
/**
- * Generates a random value from the {@link org.apache.commons.math3.distribution.ChiSquaredDistribution ChiSquare Distribution}.
+ * Generates a random value from the {@link org.apache.commons.math4.distribution.ChiSquaredDistribution ChiSquare Distribution}.
* This implementation uses {@link #nextInversionDeviate(RealDistribution) inversion}
* to generate random values.
*
@@ -320,7 +320,7 @@ public class RandomDataImpl implements RandomData, Serializable {
}
/**
- * Generates a random value from the {@link org.apache.commons.math3.distribution.FDistribution F Distribution}.
+ * Generates a random value from the {@link org.apache.commons.math4.distribution.FDistribution F Distribution}.
* This implementation uses {@link #nextInversionDeviate(RealDistribution) inversion}
* to generate random values.
*
@@ -337,7 +337,7 @@ public class RandomDataImpl implements RandomData, Serializable {
/**
* <p>Generates a random value from the
- * {@link org.apache.commons.math3.distribution.GammaDistribution Gamma Distribution}.</p>
+ * {@link org.apache.commons.math4.distribution.GammaDistribution Gamma Distribution}.</p>
*
* <p>This implementation uses the following algorithms: </p>
*
@@ -363,7 +363,7 @@ public class RandomDataImpl implements RandomData, Serializable {
}
/**
- * Generates a random value from the {@link org.apache.commons.math3.distribution.HypergeometricDistribution Hypergeometric Distribution}.
+ * Generates a random value from the {@link org.apache.commons.math4.distribution.HypergeometricDistribution Hypergeometric Distribution}.
* This implementation uses {@link #nextInversionDeviate(IntegerDistribution) inversion}
* to generate random values.
*
@@ -383,7 +383,7 @@ public class RandomDataImpl implements RandomData, Serializable {
}
/**
- * Generates a random value from the {@link org.apache.commons.math3.distribution.PascalDistribution Pascal Distribution}.
+ * Generates a random value from the {@link org.apache.commons.math4.distribution.PascalDistribution Pascal Distribution}.
* This implementation uses {@link #nextInversionDeviate(IntegerDistribution) inversion}
* to generate random values.
*
@@ -401,7 +401,7 @@ public class RandomDataImpl implements RandomData, Serializable {
}
/**
- * Generates a random value from the {@link org.apache.commons.math3.distribution.TDistribution T Distribution}.
+ * Generates a random value from the {@link org.apache.commons.math4.distribution.TDistribution T Distribution}.
* This implementation uses {@link #nextInversionDeviate(RealDistribution) inversion}
* to generate random values.
*
@@ -415,7 +415,7 @@ public class RandomDataImpl implements RandomData, Serializable {
}
/**
- * Generates a random value from the {@link org.apache.commons.math3.distribution.WeibullDistribution Weibull Distribution}.
+ * Generates a random value from the {@link org.apache.commons.math4.distribution.WeibullDistribution Weibull Distribution}.
* This implementation uses {@link #nextInversionDeviate(RealDistribution) inversion}
* to generate random values.
*
@@ -431,7 +431,7 @@ public class RandomDataImpl implements RandomData, Serializable {
}
/**
- * Generates a random value from the {@link org.apache.commons.math3.distribution.ZipfDistribution Zipf Distribution}.
+ * Generates a random value from the {@link org.apache.commons.math4.distribution.ZipfDistribution Zipf Distribution}.
* This implementation uses {@link #nextInversionDeviate(IntegerDistribution) inversion}
* to generate random values.
*
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/random/RandomGenerator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/random/RandomGenerator.java b/src/main/java/org/apache/commons/math4/random/RandomGenerator.java
index 56cf4bf..8e0b5b1 100644
--- a/src/main/java/org/apache/commons/math4/random/RandomGenerator.java
+++ b/src/main/java/org/apache/commons/math4/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.math3.random;
+package org.apache.commons.math4.random;
/**