http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/fitting/PolynomialFitter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/fitting/PolynomialFitter.java b/src/main/java/org/apache/commons/math4/fitting/PolynomialFitter.java index ec242c1..38ebe91 100644 --- a/src/main/java/org/apache/commons/math4/fitting/PolynomialFitter.java +++ b/src/main/java/org/apache/commons/math4/fitting/PolynomialFitter.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fitting; +package org.apache.commons.math4.fitting; -import org.apache.commons.math3.analysis.polynomials.PolynomialFunction; -import org.apache.commons.math3.optim.nonlinear.vector.MultivariateVectorOptimizer; +import org.apache.commons.math4.analysis.polynomials.PolynomialFunction; +import org.apache.commons.math4.optim.nonlinear.vector.MultivariateVectorOptimizer; /** * Polynomial fitting is a very simple case of {@link CurveFitter curve fitting}. @@ -47,9 +47,9 @@ public class PolynomialFitter extends CurveFitter<PolynomialFunction.Parametric> * increasing order of the polynomial's degree. * @param maxEval Maximum number of evaluations of the polynomial. * @return the coefficients of the polynomial that best fits the observed points. - * @throws org.apache.commons.math3.exception.TooManyEvaluationsException if + * @throws org.apache.commons.math4.exception.TooManyEvaluationsException if * the number of evaluations exceeds {@code maxEval}. - * @throws org.apache.commons.math3.exception.ConvergenceException + * @throws org.apache.commons.math4.exception.ConvergenceException * if the algorithm failed to converge. */ public double[] fit(int maxEval, double[] guess) { @@ -63,7 +63,7 @@ public class PolynomialFitter extends CurveFitter<PolynomialFunction.Parametric> * @param guess First guess for the coefficients. They must be sorted in * increasing order of the polynomial's degree. * @return the coefficients of the polynomial that best fits the observed points. - * @throws org.apache.commons.math3.exception.ConvergenceException + * @throws org.apache.commons.math4.exception.ConvergenceException * if the algorithm failed to converge. */ public double[] fit(double[] guess) {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/fitting/SimpleCurveFitter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/fitting/SimpleCurveFitter.java b/src/main/java/org/apache/commons/math4/fitting/SimpleCurveFitter.java index 3f6b7d6..54f6cbf 100644 --- a/src/main/java/org/apache/commons/math4/fitting/SimpleCurveFitter.java +++ b/src/main/java/org/apache/commons/math4/fitting/SimpleCurveFitter.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fitting; +package org.apache.commons.math4.fitting; import java.util.Collection; -import org.apache.commons.math3.analysis.ParametricUnivariateFunction; -import org.apache.commons.math3.fitting.leastsquares.LeastSquaresBuilder; -import org.apache.commons.math3.fitting.leastsquares.LeastSquaresProblem; -import org.apache.commons.math3.linear.DiagonalMatrix; +import org.apache.commons.math4.analysis.ParametricUnivariateFunction; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresBuilder; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresProblem; +import org.apache.commons.math4.linear.DiagonalMatrix; /** * Fits points to a user-defined {@link ParametricUnivariateFunction function}. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/fitting/WeightedObservedPoint.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/fitting/WeightedObservedPoint.java b/src/main/java/org/apache/commons/math4/fitting/WeightedObservedPoint.java index 00292c9..a036098 100644 --- a/src/main/java/org/apache/commons/math4/fitting/WeightedObservedPoint.java +++ b/src/main/java/org/apache/commons/math4/fitting/WeightedObservedPoint.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fitting; +package org.apache.commons.math4.fitting; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/fitting/WeightedObservedPoints.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/fitting/WeightedObservedPoints.java b/src/main/java/org/apache/commons/math4/fitting/WeightedObservedPoints.java index 9eba337..520af88 100644 --- a/src/main/java/org/apache/commons/math4/fitting/WeightedObservedPoints.java +++ b/src/main/java/org/apache/commons/math4/fitting/WeightedObservedPoints.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fitting; +package org.apache.commons.math4.fitting; import java.util.List; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/fitting/leastsquares/AbstractEvaluation.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/fitting/leastsquares/AbstractEvaluation.java b/src/main/java/org/apache/commons/math4/fitting/leastsquares/AbstractEvaluation.java index b164380..2326b38 100644 --- a/src/main/java/org/apache/commons/math4/fitting/leastsquares/AbstractEvaluation.java +++ b/src/main/java/org/apache/commons/math4/fitting/leastsquares/AbstractEvaluation.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fitting.leastsquares; +package org.apache.commons.math4.fitting.leastsquares; -import org.apache.commons.math3.fitting.leastsquares.LeastSquaresProblem.Evaluation; -import org.apache.commons.math3.linear.ArrayRealVector; -import org.apache.commons.math3.linear.DecompositionSolver; -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.util.FastMath; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresProblem.Evaluation; +import org.apache.commons.math4.linear.ArrayRealVector; +import org.apache.commons.math4.linear.DecompositionSolver; +import org.apache.commons.math4.linear.QRDecomposition; +import org.apache.commons.math4.linear.RealMatrix; +import org.apache.commons.math4.linear.RealVector; +import org.apache.commons.math4.util.FastMath; /** * An implementation of {@link Evaluation} that is designed for extension. All of the http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/fitting/leastsquares/DenseWeightedEvaluation.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/fitting/leastsquares/DenseWeightedEvaluation.java b/src/main/java/org/apache/commons/math4/fitting/leastsquares/DenseWeightedEvaluation.java index 89f5f1f..a2f1335 100644 --- a/src/main/java/org/apache/commons/math4/fitting/leastsquares/DenseWeightedEvaluation.java +++ b/src/main/java/org/apache/commons/math4/fitting/leastsquares/DenseWeightedEvaluation.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fitting.leastsquares; +package org.apache.commons.math4.fitting.leastsquares; -import org.apache.commons.math3.fitting.leastsquares.LeastSquaresProblem.Evaluation; -import org.apache.commons.math3.linear.RealMatrix; -import org.apache.commons.math3.linear.RealVector; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresProblem.Evaluation; +import org.apache.commons.math4.linear.RealMatrix; +import org.apache.commons.math4.linear.RealVector; /** * Applies a dense weight matrix to an evaluation. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/fitting/leastsquares/EvaluationRmsChecker.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/fitting/leastsquares/EvaluationRmsChecker.java b/src/main/java/org/apache/commons/math4/fitting/leastsquares/EvaluationRmsChecker.java index ceb5988..2430ec8 100644 --- a/src/main/java/org/apache/commons/math4/fitting/leastsquares/EvaluationRmsChecker.java +++ b/src/main/java/org/apache/commons/math4/fitting/leastsquares/EvaluationRmsChecker.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fitting.leastsquares; +package org.apache.commons.math4.fitting.leastsquares; -import org.apache.commons.math3.fitting.leastsquares.LeastSquaresProblem.Evaluation; -import org.apache.commons.math3.optim.ConvergenceChecker; -import org.apache.commons.math3.util.Precision; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresProblem.Evaluation; +import org.apache.commons.math4.optim.ConvergenceChecker; +import org.apache.commons.math4.util.Precision; /** * Check if an optimization has converged based on the change in computed RMS. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/fitting/leastsquares/GaussNewtonOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/fitting/leastsquares/GaussNewtonOptimizer.java b/src/main/java/org/apache/commons/math4/fitting/leastsquares/GaussNewtonOptimizer.java index bc4503c..39c5803 100644 --- a/src/main/java/org/apache/commons/math4/fitting/leastsquares/GaussNewtonOptimizer.java +++ b/src/main/java/org/apache/commons/math4/fitting/leastsquares/GaussNewtonOptimizer.java @@ -14,25 +14,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fitting.leastsquares; +package org.apache.commons.math4.fitting.leastsquares; -import org.apache.commons.math3.exception.ConvergenceException; -import org.apache.commons.math3.exception.NullArgumentException; -import org.apache.commons.math3.exception.util.LocalizedFormats; -import org.apache.commons.math3.fitting.leastsquares.LeastSquaresProblem.Evaluation; -import org.apache.commons.math3.linear.ArrayRealVector; -import org.apache.commons.math3.linear.CholeskyDecomposition; -import org.apache.commons.math3.linear.LUDecomposition; -import org.apache.commons.math3.linear.MatrixUtils; -import org.apache.commons.math3.linear.NonPositiveDefiniteMatrixException; -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.linear.SingularMatrixException; -import org.apache.commons.math3.linear.SingularValueDecomposition; -import org.apache.commons.math3.optim.ConvergenceChecker; -import org.apache.commons.math3.util.Incrementor; -import org.apache.commons.math3.util.Pair; +import org.apache.commons.math4.exception.ConvergenceException; +import org.apache.commons.math4.exception.NullArgumentException; +import org.apache.commons.math4.exception.util.LocalizedFormats; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresProblem.Evaluation; +import org.apache.commons.math4.linear.ArrayRealVector; +import org.apache.commons.math4.linear.CholeskyDecomposition; +import org.apache.commons.math4.linear.LUDecomposition; +import org.apache.commons.math4.linear.MatrixUtils; +import org.apache.commons.math4.linear.NonPositiveDefiniteMatrixException; +import org.apache.commons.math4.linear.QRDecomposition; +import org.apache.commons.math4.linear.RealMatrix; +import org.apache.commons.math4.linear.RealVector; +import org.apache.commons.math4.linear.SingularMatrixException; +import org.apache.commons.math4.linear.SingularValueDecomposition; +import org.apache.commons.math4.optim.ConvergenceChecker; +import org.apache.commons.math4.util.Incrementor; +import org.apache.commons.math4.util.Pair; /** * Gauss-Newton least-squares solver. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/fitting/leastsquares/LeastSquaresAdapter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/fitting/leastsquares/LeastSquaresAdapter.java b/src/main/java/org/apache/commons/math4/fitting/leastsquares/LeastSquaresAdapter.java index 1c09874..4744305 100644 --- a/src/main/java/org/apache/commons/math4/fitting/leastsquares/LeastSquaresAdapter.java +++ b/src/main/java/org/apache/commons/math4/fitting/leastsquares/LeastSquaresAdapter.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fitting.leastsquares; +package org.apache.commons.math4.fitting.leastsquares; -import org.apache.commons.math3.linear.RealVector; -import org.apache.commons.math3.optim.ConvergenceChecker; -import org.apache.commons.math3.util.Incrementor; +import org.apache.commons.math4.linear.RealVector; +import org.apache.commons.math4.optim.ConvergenceChecker; +import org.apache.commons.math4.util.Incrementor; /** * An adapter that delegates to another implementation of {@link LeastSquaresProblem}. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/fitting/leastsquares/LeastSquaresBuilder.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/fitting/leastsquares/LeastSquaresBuilder.java b/src/main/java/org/apache/commons/math4/fitting/leastsquares/LeastSquaresBuilder.java index 7b14b37..5f6beae 100644 --- a/src/main/java/org/apache/commons/math4/fitting/leastsquares/LeastSquaresBuilder.java +++ b/src/main/java/org/apache/commons/math4/fitting/leastsquares/LeastSquaresBuilder.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fitting.leastsquares; - -import org.apache.commons.math3.analysis.MultivariateMatrixFunction; -import org.apache.commons.math3.analysis.MultivariateVectorFunction; -import org.apache.commons.math3.fitting.leastsquares.LeastSquaresProblem.Evaluation; -import org.apache.commons.math3.linear.ArrayRealVector; -import org.apache.commons.math3.linear.RealMatrix; -import org.apache.commons.math3.linear.RealVector; -import org.apache.commons.math3.optim.ConvergenceChecker; -import org.apache.commons.math3.optim.PointVectorValuePair; +package org.apache.commons.math4.fitting.leastsquares; + +import org.apache.commons.math4.analysis.MultivariateMatrixFunction; +import org.apache.commons.math4.analysis.MultivariateVectorFunction; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresProblem.Evaluation; +import org.apache.commons.math4.linear.ArrayRealVector; +import org.apache.commons.math4.linear.RealMatrix; +import org.apache.commons.math4.linear.RealVector; +import org.apache.commons.math4.optim.ConvergenceChecker; +import org.apache.commons.math4.optim.PointVectorValuePair; /** * A mutable builder for {@link LeastSquaresProblem}s. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/fitting/leastsquares/LeastSquaresFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/fitting/leastsquares/LeastSquaresFactory.java b/src/main/java/org/apache/commons/math4/fitting/leastsquares/LeastSquaresFactory.java index d483c26..8f96d87 100644 --- a/src/main/java/org/apache/commons/math4/fitting/leastsquares/LeastSquaresFactory.java +++ b/src/main/java/org/apache/commons/math4/fitting/leastsquares/LeastSquaresFactory.java @@ -14,25 +14,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fitting.leastsquares; - -import org.apache.commons.math3.exception.MathIllegalStateException; -import org.apache.commons.math3.exception.util.LocalizedFormats; -import org.apache.commons.math3.analysis.MultivariateMatrixFunction; -import org.apache.commons.math3.analysis.MultivariateVectorFunction; -import org.apache.commons.math3.fitting.leastsquares.LeastSquaresProblem.Evaluation; -import org.apache.commons.math3.linear.Array2DRowRealMatrix; -import org.apache.commons.math3.linear.ArrayRealVector; -import org.apache.commons.math3.linear.DiagonalMatrix; -import org.apache.commons.math3.linear.EigenDecomposition; -import org.apache.commons.math3.linear.RealMatrix; -import org.apache.commons.math3.linear.RealVector; -import org.apache.commons.math3.optim.AbstractOptimizationProblem; -import org.apache.commons.math3.optim.ConvergenceChecker; -import org.apache.commons.math3.optim.PointVectorValuePair; -import org.apache.commons.math3.util.FastMath; -import org.apache.commons.math3.util.Incrementor; -import org.apache.commons.math3.util.Pair; +package org.apache.commons.math4.fitting.leastsquares; + +import org.apache.commons.math4.analysis.MultivariateMatrixFunction; +import org.apache.commons.math4.analysis.MultivariateVectorFunction; +import org.apache.commons.math4.exception.MathIllegalStateException; +import org.apache.commons.math4.exception.util.LocalizedFormats; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresProblem.Evaluation; +import org.apache.commons.math4.linear.Array2DRowRealMatrix; +import org.apache.commons.math4.linear.ArrayRealVector; +import org.apache.commons.math4.linear.DiagonalMatrix; +import org.apache.commons.math4.linear.EigenDecomposition; +import org.apache.commons.math4.linear.RealMatrix; +import org.apache.commons.math4.linear.RealVector; +import org.apache.commons.math4.optim.AbstractOptimizationProblem; +import org.apache.commons.math4.optim.ConvergenceChecker; +import org.apache.commons.math4.optim.PointVectorValuePair; +import org.apache.commons.math4.util.FastMath; +import org.apache.commons.math4.util.Incrementor; +import org.apache.commons.math4.util.Pair; /** * A Factory for creating {@link LeastSquaresProblem}s. @@ -45,7 +45,7 @@ public class LeastSquaresFactory { private LeastSquaresFactory() {} /** - * Create a {@link org.apache.commons.math3.fitting.leastsquares.LeastSquaresProblem} + * Create a {@link org.apache.commons.math4.fitting.leastsquares.LeastSquaresProblem} * from the given elements. There will be no weights applied (unit weights). * * @param model the model function. Produces the computed values. @@ -87,7 +87,7 @@ public class LeastSquaresFactory { } /** - * Create a {@link org.apache.commons.math3.fitting.leastsquares.LeastSquaresProblem} + * Create a {@link org.apache.commons.math4.fitting.leastsquares.LeastSquaresProblem} * from the given elements. There will be no weights applied (unit weights). * * @param model the model function. Produces the computed values. @@ -116,7 +116,7 @@ public class LeastSquaresFactory { } /** - * Create a {@link org.apache.commons.math3.fitting.leastsquares.LeastSquaresProblem} + * Create a {@link org.apache.commons.math4.fitting.leastsquares.LeastSquaresProblem} * from the given elements. * * @param model the model function. Produces the computed values. @@ -145,7 +145,7 @@ public class LeastSquaresFactory { } /** - * Create a {@link org.apache.commons.math3.fitting.leastsquares.LeastSquaresProblem} + * Create a {@link org.apache.commons.math4.fitting.leastsquares.LeastSquaresProblem} * from the given elements. * <p> * This factory method is provided for continuity with previous interfaces. Newer http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/fitting/leastsquares/LeastSquaresOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/fitting/leastsquares/LeastSquaresOptimizer.java b/src/main/java/org/apache/commons/math4/fitting/leastsquares/LeastSquaresOptimizer.java index 50d5b8a..79f09ab 100644 --- a/src/main/java/org/apache/commons/math4/fitting/leastsquares/LeastSquaresOptimizer.java +++ b/src/main/java/org/apache/commons/math4/fitting/leastsquares/LeastSquaresOptimizer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fitting.leastsquares; +package org.apache.commons.math4.fitting.leastsquares; /** * An algorithm that can be applied to a non-linear least squares problem. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/fitting/leastsquares/LeastSquaresProblem.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/fitting/leastsquares/LeastSquaresProblem.java b/src/main/java/org/apache/commons/math4/fitting/leastsquares/LeastSquaresProblem.java index 097ff81..dfc5b5e 100644 --- a/src/main/java/org/apache/commons/math4/fitting/leastsquares/LeastSquaresProblem.java +++ b/src/main/java/org/apache/commons/math4/fitting/leastsquares/LeastSquaresProblem.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fitting.leastsquares; +package org.apache.commons.math4.fitting.leastsquares; -import org.apache.commons.math3.linear.RealMatrix; -import org.apache.commons.math3.linear.RealVector; -import org.apache.commons.math3.optim.OptimizationProblem; +import org.apache.commons.math4.linear.RealMatrix; +import org.apache.commons.math4.linear.RealVector; +import org.apache.commons.math4.optim.OptimizationProblem; /** * The data necessary to define a non-linear least squares problem. @@ -67,7 +67,7 @@ public interface LeastSquaresProblem extends OptimizationProblem<LeastSquaresPro * * @param point the parameter values. * @return the model's value and derivative at the given point. - * @throws org.apache.commons.math3.exception.TooManyEvaluationsException + * @throws org.apache.commons.math4.exception.TooManyEvaluationsException * if the maximal number of evaluations (of the model vector function) is * exceeded. */ @@ -89,7 +89,7 @@ public interface LeastSquaresProblem extends OptimizationProblem<LeastSquaresPro * * @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). */ RealMatrix getCovariances(double threshold); @@ -104,7 +104,7 @@ public interface LeastSquaresProblem extends OptimizationProblem<LeastSquaresPro * @param covarianceSingularityThreshold Singularity threshold (see {@link * #getCovariances(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. */ RealVector getSigma(double covarianceSingularityThreshold); @@ -121,7 +121,7 @@ public interface LeastSquaresProblem extends OptimizationProblem<LeastSquaresPro * Get the weighted Jacobian matrix. * * @return the weighted Jacobian: W<sup>1/2</sup> J. - * @throws org.apache.commons.math3.exception.DimensionMismatchException + * @throws org.apache.commons.math4.exception.DimensionMismatchException * if the Jacobian dimension does not match problem dimension. */ RealMatrix getJacobian(); @@ -141,7 +141,7 @@ public interface LeastSquaresProblem extends OptimizationProblem<LeastSquaresPro * then multiplied by the square root of the weight matrix. * * @return the weighted residuals: W<sup>1/2</sup> K. - * @throws org.apache.commons.math3.exception.DimensionMismatchException + * @throws org.apache.commons.math4.exception.DimensionMismatchException * if the residuals have the wrong length. */ RealVector getResiduals(); http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/fitting/leastsquares/LevenbergMarquardtOptimizer.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/fitting/leastsquares/LevenbergMarquardtOptimizer.java b/src/main/java/org/apache/commons/math4/fitting/leastsquares/LevenbergMarquardtOptimizer.java index 358d240..3e5ea1a 100644 --- a/src/main/java/org/apache/commons/math4/fitting/leastsquares/LevenbergMarquardtOptimizer.java +++ b/src/main/java/org/apache/commons/math4/fitting/leastsquares/LevenbergMarquardtOptimizer.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fitting.leastsquares; +package org.apache.commons.math4.fitting.leastsquares; import java.util.Arrays; -import org.apache.commons.math3.fitting.leastsquares.LeastSquaresProblem.Evaluation; -import org.apache.commons.math3.linear.ArrayRealVector; -import org.apache.commons.math3.linear.RealMatrix; -import org.apache.commons.math3.exception.ConvergenceException; -import org.apache.commons.math3.exception.util.LocalizedFormats; -import org.apache.commons.math3.optim.ConvergenceChecker; -import org.apache.commons.math3.util.Incrementor; -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.fitting.leastsquares.LeastSquaresProblem.Evaluation; +import org.apache.commons.math4.linear.ArrayRealVector; +import org.apache.commons.math4.linear.RealMatrix; +import org.apache.commons.math4.optim.ConvergenceChecker; +import org.apache.commons.math4.util.FastMath; +import org.apache.commons.math4.util.Incrementor; +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/fitting/leastsquares/MultivariateJacobianFunction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/fitting/leastsquares/MultivariateJacobianFunction.java b/src/main/java/org/apache/commons/math4/fitting/leastsquares/MultivariateJacobianFunction.java index e673855..9f127ce 100644 --- a/src/main/java/org/apache/commons/math4/fitting/leastsquares/MultivariateJacobianFunction.java +++ b/src/main/java/org/apache/commons/math4/fitting/leastsquares/MultivariateJacobianFunction.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fitting.leastsquares; +package org.apache.commons.math4.fitting.leastsquares; -import org.apache.commons.math3.linear.RealMatrix; -import org.apache.commons.math3.linear.RealVector; -import org.apache.commons.math3.util.Pair; +import org.apache.commons.math4.linear.RealMatrix; +import org.apache.commons.math4.linear.RealVector; +import org.apache.commons.math4.util.Pair; /** * A interface for functions that compute a vector of values and can compute their http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/fitting/leastsquares/OptimumImpl.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/fitting/leastsquares/OptimumImpl.java b/src/main/java/org/apache/commons/math4/fitting/leastsquares/OptimumImpl.java index 698f86c..e01b750 100644 --- a/src/main/java/org/apache/commons/math4/fitting/leastsquares/OptimumImpl.java +++ b/src/main/java/org/apache/commons/math4/fitting/leastsquares/OptimumImpl.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fitting.leastsquares; +package org.apache.commons.math4.fitting.leastsquares; -import org.apache.commons.math3.fitting.leastsquares.LeastSquaresOptimizer.Optimum; -import org.apache.commons.math3.fitting.leastsquares.LeastSquaresProblem.Evaluation; -import org.apache.commons.math3.linear.RealMatrix; -import org.apache.commons.math3.linear.RealVector; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresOptimizer.Optimum; +import org.apache.commons.math4.fitting.leastsquares.LeastSquaresProblem.Evaluation; +import org.apache.commons.math4.linear.RealMatrix; +import org.apache.commons.math4.linear.RealVector; /** * A pedantic implementation of {@link Optimum}. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/fitting/leastsquares/ParameterValidator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/fitting/leastsquares/ParameterValidator.java b/src/main/java/org/apache/commons/math4/fitting/leastsquares/ParameterValidator.java index d5b8529..915f322 100644 --- a/src/main/java/org/apache/commons/math4/fitting/leastsquares/ParameterValidator.java +++ b/src/main/java/org/apache/commons/math4/fitting/leastsquares/ParameterValidator.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fitting.leastsquares; +package org.apache.commons.math4.fitting.leastsquares; -import org.apache.commons.math3.linear.RealVector; +import org.apache.commons.math4.linear.RealVector; /** * Interface for validating a set of model parameters. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/fitting/leastsquares/ValueAndJacobianFunction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/fitting/leastsquares/ValueAndJacobianFunction.java b/src/main/java/org/apache/commons/math4/fitting/leastsquares/ValueAndJacobianFunction.java index 180e328..dd88fee 100644 --- a/src/main/java/org/apache/commons/math4/fitting/leastsquares/ValueAndJacobianFunction.java +++ b/src/main/java/org/apache/commons/math4/fitting/leastsquares/ValueAndJacobianFunction.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fitting.leastsquares; +package org.apache.commons.math4.fitting.leastsquares; -import org.apache.commons.math3.linear.RealMatrix; -import org.apache.commons.math3.linear.RealVector; +import org.apache.commons.math4.linear.RealMatrix; +import org.apache.commons.math4.linear.RealVector; /** * A interface for functions that compute a vector of values and can compute their http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/fitting/leastsquares/package-info.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/fitting/leastsquares/package-info.java b/src/main/java/org/apache/commons/math4/fitting/leastsquares/package-info.java index 98623b5..b565376 100644 --- a/src/main/java/org/apache/commons/math4/fitting/leastsquares/package-info.java +++ b/src/main/java/org/apache/commons/math4/fitting/leastsquares/package-info.java @@ -18,22 +18,22 @@ /** * This package provides algorithms that minimize the residuals * between observations and model values. - * The {@link org.apache.commons.math3.fitting.leastsquares.LeastSquaresOptimizer + * The {@link org.apache.commons.math4.fitting.leastsquares.LeastSquaresOptimizer * least-squares optimizers} minimize the distance (called * <em>cost</em> or <em>χ<sup>2</sup></em>) between model and * observations. * * <br/> * Algorithms in this category need access to a <em>problem</em> - * (represented by a {@link org.apache.commons.math3.fitting.leastsquares.LeastSquaresProblem + * (represented by a {@link org.apache.commons.math4.fitting.leastsquares.LeastSquaresProblem * LeastSquaresProblem}). * Such a model predicts a set of values which the algorithm tries to match * with a set of given set of observed values. * <br/> * The problem can be created progressively using a {@link - * org.apache.commons.math3.fitting.leastsquares.LeastSquaresBuilder builder} or it can - * be created at once using a {@link org.apache.commons.math3.fitting.leastsquares.LeastSquaresFactory + * org.apache.commons.math4.fitting.leastsquares.LeastSquaresBuilder builder} or it can + * be created at once using a {@link org.apache.commons.math4.fitting.leastsquares.LeastSquaresFactory * factory}. * @since 3.3 */ -package org.apache.commons.math3.fitting.leastsquares; +package org.apache.commons.math4.fitting.leastsquares; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/fitting/package-info.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/fitting/package-info.java b/src/main/java/org/apache/commons/math4/fitting/package-info.java index 460e3f7..1cc86f1 100644 --- a/src/main/java/org/apache/commons/math4/fitting/package-info.java +++ b/src/main/java/org/apache/commons/math4/fitting/package-info.java @@ -23,4 +23,4 @@ * were the objective function is the squared sum of the residuals * \( f(x_i) - y_i \) for observed points \( (x_i, y_i) \). */ -package org.apache.commons.math3.fitting; +package org.apache.commons.math4.fitting; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/fraction/AbstractFormat.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/fraction/AbstractFormat.java b/src/main/java/org/apache/commons/math4/fraction/AbstractFormat.java index fcb9d41..1359c0e 100644 --- a/src/main/java/org/apache/commons/math4/fraction/AbstractFormat.java +++ b/src/main/java/org/apache/commons/math4/fraction/AbstractFormat.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math3.fraction; +package org.apache.commons.math4.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.math3.exception.NullArgumentException; -import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math4.exception.NullArgumentException; +import org.apache.commons.math4.exception.util.LocalizedFormats; /** * Common part shared by both {@link FractionFormat} and {@link BigFractionFormat}. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/fraction/BigFraction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/fraction/BigFraction.java b/src/main/java/org/apache/commons/math4/fraction/BigFraction.java index e16c593..5c2f24b 100644 --- a/src/main/java/org/apache/commons/math4/fraction/BigFraction.java +++ b/src/main/java/org/apache/commons/math4/fraction/BigFraction.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fraction; +package org.apache.commons.math4.fraction; import java.io.Serializable; import java.math.BigDecimal; import java.math.BigInteger; -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.NullArgumentException; -import org.apache.commons.math3.exception.ZeroException; -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.MathUtils; +import org.apache.commons.math4.FieldElement; +import org.apache.commons.math4.exception.MathArithmeticException; +import org.apache.commons.math4.exception.MathIllegalArgumentException; +import org.apache.commons.math4.exception.NullArgumentException; +import org.apache.commons.math4.exception.ZeroException; +import org.apache.commons.math4.exception.util.LocalizedFormats; +import org.apache.commons.math4.util.ArithmeticUtils; +import org.apache.commons.math4.util.FastMath; +import org.apache.commons.math4.util.MathUtils; /** * Representation of a rational number without any overflow. This class is http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/fraction/BigFractionField.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/fraction/BigFractionField.java b/src/main/java/org/apache/commons/math4/fraction/BigFractionField.java index 81170f8..4cf4d8f 100644 --- a/src/main/java/org/apache/commons/math4/fraction/BigFractionField.java +++ b/src/main/java/org/apache/commons/math4/fraction/BigFractionField.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.commons.math3.fraction; +package org.apache.commons.math4.fraction; import java.io.Serializable; -import org.apache.commons.math3.Field; -import org.apache.commons.math3.FieldElement; +import org.apache.commons.math4.Field; +import org.apache.commons.math4.FieldElement; /** * Representation of the fractional numbers without any overflow field. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/fraction/BigFractionFormat.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/fraction/BigFractionFormat.java b/src/main/java/org/apache/commons/math4/fraction/BigFractionFormat.java index 196dcd5..a940a9d 100644 --- a/src/main/java/org/apache/commons/math4/fraction/BigFractionFormat.java +++ b/src/main/java/org/apache/commons/math4/fraction/BigFractionFormat.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.math3.fraction; +package org.apache.commons.math4.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.math3.exception.MathIllegalArgumentException; -import org.apache.commons.math3.exception.MathParseException; -import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math4.exception.MathIllegalArgumentException; +import org.apache.commons.math4.exception.MathParseException; +import org.apache.commons.math4.exception.util.LocalizedFormats; /** * Formats a BigFraction number in proper format or improper format. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/fraction/Fraction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/fraction/Fraction.java b/src/main/java/org/apache/commons/math4/fraction/Fraction.java index 1752043..7c193f3 100644 --- a/src/main/java/org/apache/commons/math4/fraction/Fraction.java +++ b/src/main/java/org/apache/commons/math4/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.math3.fraction; +package org.apache.commons.math4.fraction; import java.io.Serializable; import java.math.BigInteger; -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; +import org.apache.commons.math4.FieldElement; +import org.apache.commons.math4.exception.MathArithmeticException; +import org.apache.commons.math4.exception.NullArgumentException; +import org.apache.commons.math4.exception.util.LocalizedFormats; +import org.apache.commons.math4.util.ArithmeticUtils; +import org.apache.commons.math4.util.FastMath; /** * Representation of a rational number. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/fraction/FractionConversionException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/fraction/FractionConversionException.java b/src/main/java/org/apache/commons/math4/fraction/FractionConversionException.java index a16a97a..f74a7cf 100644 --- a/src/main/java/org/apache/commons/math4/fraction/FractionConversionException.java +++ b/src/main/java/org/apache/commons/math4/fraction/FractionConversionException.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.math3.fraction; +package org.apache.commons.math4.fraction; -import org.apache.commons.math3.exception.ConvergenceException; -import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math4.exception.ConvergenceException; +import org.apache.commons.math4.exception.util.LocalizedFormats; /** * Error thrown when a double value cannot be converted to a fraction http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/fraction/FractionField.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/fraction/FractionField.java b/src/main/java/org/apache/commons/math4/fraction/FractionField.java index 2928509..8a49265 100644 --- a/src/main/java/org/apache/commons/math4/fraction/FractionField.java +++ b/src/main/java/org/apache/commons/math4/fraction/FractionField.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.commons.math3.fraction; +package org.apache.commons.math4.fraction; import java.io.Serializable; -import org.apache.commons.math3.Field; -import org.apache.commons.math3.FieldElement; +import org.apache.commons.math4.Field; +import org.apache.commons.math4.FieldElement; /** * Representation of the fractional numbers field. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/fraction/FractionFormat.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/fraction/FractionFormat.java b/src/main/java/org/apache/commons/math4/fraction/FractionFormat.java index 06c5a10..9c8b1fe 100644 --- a/src/main/java/org/apache/commons/math4/fraction/FractionFormat.java +++ b/src/main/java/org/apache/commons/math4/fraction/FractionFormat.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.commons.math3.fraction; +package org.apache.commons.math4.fraction; import java.text.FieldPosition; import java.text.NumberFormat; import java.text.ParsePosition; import java.util.Locale; -import org.apache.commons.math3.exception.MathIllegalArgumentException; -import org.apache.commons.math3.exception.MathParseException; -import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math4.exception.MathIllegalArgumentException; +import org.apache.commons.math4.exception.MathParseException; +import org.apache.commons.math4.exception.util.LocalizedFormats; /** * Formats a Fraction number in proper format or improper format. The number http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/fraction/ProperBigFractionFormat.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/fraction/ProperBigFractionFormat.java b/src/main/java/org/apache/commons/math4/fraction/ProperBigFractionFormat.java index 4f84acd..ae601c8 100644 --- a/src/main/java/org/apache/commons/math4/fraction/ProperBigFractionFormat.java +++ b/src/main/java/org/apache/commons/math4/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.math3.fraction; +package org.apache.commons.math4.fraction; import java.math.BigInteger; import java.text.FieldPosition; import java.text.NumberFormat; import java.text.ParsePosition; -import org.apache.commons.math3.exception.util.LocalizedFormats; -import org.apache.commons.math3.exception.NullArgumentException; +import org.apache.commons.math4.exception.NullArgumentException; +import org.apache.commons.math4.exception.util.LocalizedFormats; /** * Formats a BigFraction number in proper format. The number format for each of http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/fraction/ProperFractionFormat.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/fraction/ProperFractionFormat.java b/src/main/java/org/apache/commons/math4/fraction/ProperFractionFormat.java index 9dc6778..1843f8a 100644 --- a/src/main/java/org/apache/commons/math4/fraction/ProperFractionFormat.java +++ b/src/main/java/org/apache/commons/math4/fraction/ProperFractionFormat.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.fraction; +package org.apache.commons.math4.fraction; import java.text.FieldPosition; import java.text.NumberFormat; import java.text.ParsePosition; -import org.apache.commons.math3.exception.util.LocalizedFormats; -import org.apache.commons.math3.exception.NullArgumentException; -import org.apache.commons.math3.util.FastMath; -import org.apache.commons.math3.util.MathUtils; +import org.apache.commons.math4.exception.NullArgumentException; +import org.apache.commons.math4.exception.util.LocalizedFormats; +import org.apache.commons.math4.util.FastMath; +import org.apache.commons.math4.util.MathUtils; /** * Formats a Fraction number in proper format. The number format for each of http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/fraction/package-info.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/fraction/package-info.java b/src/main/java/org/apache/commons/math4/fraction/package-info.java index f5425c6..2547102 100644 --- a/src/main/java/org/apache/commons/math4/fraction/package-info.java +++ b/src/main/java/org/apache/commons/math4/fraction/package-info.java @@ -19,4 +19,4 @@ * Fraction number type and fraction number formatting. * */ -package org.apache.commons.math3.fraction; +package org.apache.commons.math4.fraction; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/genetics/AbstractListChromosome.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/genetics/AbstractListChromosome.java b/src/main/java/org/apache/commons/math4/genetics/AbstractListChromosome.java index 60450ba..e470d34 100644 --- a/src/main/java/org/apache/commons/math4/genetics/AbstractListChromosome.java +++ b/src/main/java/org/apache/commons/math4/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.math3.genetics; +package org.apache.commons.math4.genetics; import java.util.ArrayList; import java.util.Arrays; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/genetics/BinaryChromosome.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/genetics/BinaryChromosome.java b/src/main/java/org/apache/commons/math4/genetics/BinaryChromosome.java index 47d317c..e1efea9 100644 --- a/src/main/java/org/apache/commons/math4/genetics/BinaryChromosome.java +++ b/src/main/java/org/apache/commons/math4/genetics/BinaryChromosome.java @@ -14,11 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.genetics; +package org.apache.commons.math4.genetics; import java.util.ArrayList; import java.util.List; -import org.apache.commons.math3.exception.util.LocalizedFormats; + +import org.apache.commons.math4.exception.util.LocalizedFormats; /** http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/genetics/BinaryMutation.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/genetics/BinaryMutation.java b/src/main/java/org/apache/commons/math4/genetics/BinaryMutation.java index 0802fc6..e2ba8c2 100644 --- a/src/main/java/org/apache/commons/math4/genetics/BinaryMutation.java +++ b/src/main/java/org/apache/commons/math4/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.math3.genetics; +package org.apache.commons.math4.genetics; import java.util.ArrayList; import java.util.List; -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; /** * Mutation for {@link BinaryChromosome}s. Randomly changes one gene. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/genetics/Chromosome.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/genetics/Chromosome.java b/src/main/java/org/apache/commons/math4/genetics/Chromosome.java index 22e4750..09b3392 100644 --- a/src/main/java/org/apache/commons/math4/genetics/Chromosome.java +++ b/src/main/java/org/apache/commons/math4/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.math3.genetics; +package org.apache.commons.math4.genetics; /** * Individual in a population. Chromosomes are compared based on their fitness. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/genetics/ChromosomePair.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/genetics/ChromosomePair.java b/src/main/java/org/apache/commons/math4/genetics/ChromosomePair.java index ef8769d..dc76451 100644 --- a/src/main/java/org/apache/commons/math4/genetics/ChromosomePair.java +++ b/src/main/java/org/apache/commons/math4/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.math3.genetics; +package org.apache.commons.math4.genetics; /** * A pair of {@link Chromosome} objects. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/genetics/CrossoverPolicy.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/genetics/CrossoverPolicy.java b/src/main/java/org/apache/commons/math4/genetics/CrossoverPolicy.java index 9af56f1..e6a2b23 100644 --- a/src/main/java/org/apache/commons/math4/genetics/CrossoverPolicy.java +++ b/src/main/java/org/apache/commons/math4/genetics/CrossoverPolicy.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.genetics; +package org.apache.commons.math4.genetics; -import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math4.exception.MathIllegalArgumentException; /** * Policy used to create a pair of new chromosomes by performing a crossover http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/genetics/CycleCrossover.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/genetics/CycleCrossover.java b/src/main/java/org/apache/commons/math4/genetics/CycleCrossover.java index 364b16b..021f61a 100644 --- a/src/main/java/org/apache/commons/math4/genetics/CycleCrossover.java +++ b/src/main/java/org/apache/commons/math4/genetics/CycleCrossover.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.genetics; +package org.apache.commons.math4.genetics; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -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.math4.exception.DimensionMismatchException; +import org.apache.commons.math4.exception.MathIllegalArgumentException; +import org.apache.commons.math4.exception.util.LocalizedFormats; /** * Cycle Crossover [CX] builds offspring from <b>ordered</b> chromosomes by identifying cycles http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/genetics/ElitisticListPopulation.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/genetics/ElitisticListPopulation.java b/src/main/java/org/apache/commons/math4/genetics/ElitisticListPopulation.java index a426bc2..b7834ff 100644 --- a/src/main/java/org/apache/commons/math4/genetics/ElitisticListPopulation.java +++ b/src/main/java/org/apache/commons/math4/genetics/ElitisticListPopulation.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.genetics; +package org.apache.commons.math4.genetics; import java.util.Collections; import java.util.List; -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.OutOfRangeException; -import org.apache.commons.math3.exception.util.LocalizedFormats; -import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math4.exception.NotPositiveException; +import org.apache.commons.math4.exception.NullArgumentException; +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.FastMath; /** * Population of chromosomes which uses elitism (certain percentage of the best http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/genetics/Fitness.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/genetics/Fitness.java b/src/main/java/org/apache/commons/math4/genetics/Fitness.java index 40d6192..15ce9c5 100644 --- a/src/main/java/org/apache/commons/math4/genetics/Fitness.java +++ b/src/main/java/org/apache/commons/math4/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.math3.genetics; +package org.apache.commons.math4.genetics; /** * Fitness of a chromosome. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/genetics/FixedElapsedTime.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/genetics/FixedElapsedTime.java b/src/main/java/org/apache/commons/math4/genetics/FixedElapsedTime.java index 3879a8c..9eafc0b 100644 --- a/src/main/java/org/apache/commons/math4/genetics/FixedElapsedTime.java +++ b/src/main/java/org/apache/commons/math4/genetics/FixedElapsedTime.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.genetics; +package org.apache.commons.math4.genetics; import java.util.concurrent.TimeUnit; -import org.apache.commons.math3.exception.NumberIsTooSmallException; +import org.apache.commons.math4.exception.NumberIsTooSmallException; /** * Stops after a fixed amount of time has elapsed. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/genetics/FixedGenerationCount.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/genetics/FixedGenerationCount.java b/src/main/java/org/apache/commons/math4/genetics/FixedGenerationCount.java index 64362fc..70ae10d 100644 --- a/src/main/java/org/apache/commons/math4/genetics/FixedGenerationCount.java +++ b/src/main/java/org/apache/commons/math4/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.math3.genetics; +package org.apache.commons.math4.genetics; -import org.apache.commons.math3.exception.NumberIsTooSmallException; +import org.apache.commons.math4.exception.NumberIsTooSmallException; /** * Stops after a fixed number of generations. Each time {@link #isSatisfied(Population)} is invoked, a generation http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/genetics/GeneticAlgorithm.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/genetics/GeneticAlgorithm.java b/src/main/java/org/apache/commons/math4/genetics/GeneticAlgorithm.java index 2f3d684..bf77606 100644 --- a/src/main/java/org/apache/commons/math4/genetics/GeneticAlgorithm.java +++ b/src/main/java/org/apache/commons/math4/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.math3.genetics; +package org.apache.commons.math4.genetics; -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; +import org.apache.commons.math4.exception.OutOfRangeException; +import org.apache.commons.math4.exception.util.LocalizedFormats; +import org.apache.commons.math4.random.JDKRandomGenerator; +import org.apache.commons.math4.random.RandomGenerator; /** * Implementation of a genetic algorithm. All factors that govern the operation http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/genetics/InvalidRepresentationException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/genetics/InvalidRepresentationException.java b/src/main/java/org/apache/commons/math4/genetics/InvalidRepresentationException.java index 7ca3a9a..7cac69b 100644 --- a/src/main/java/org/apache/commons/math4/genetics/InvalidRepresentationException.java +++ b/src/main/java/org/apache/commons/math4/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.math3.genetics; +package org.apache.commons.math4.genetics; -import org.apache.commons.math3.exception.MathIllegalArgumentException; -import org.apache.commons.math3.exception.util.Localizable; +import org.apache.commons.math4.exception.MathIllegalArgumentException; +import org.apache.commons.math4.exception.util.Localizable; /** * Exception indicating that the representation of a chromosome is not valid. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/genetics/ListPopulation.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/genetics/ListPopulation.java b/src/main/java/org/apache/commons/math4/genetics/ListPopulation.java index ce45234..b0358c9 100644 --- a/src/main/java/org/apache/commons/math4/genetics/ListPopulation.java +++ b/src/main/java/org/apache/commons/math4/genetics/ListPopulation.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.genetics; +package org.apache.commons.math4.genetics; import java.util.ArrayList; import java.util.Collection; @@ -22,11 +22,11 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import org.apache.commons.math3.exception.util.LocalizedFormats; -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.NumberIsTooSmallException; +import org.apache.commons.math4.exception.NotPositiveException; +import org.apache.commons.math4.exception.NullArgumentException; +import org.apache.commons.math4.exception.NumberIsTooLargeException; +import org.apache.commons.math4.exception.NumberIsTooSmallException; +import org.apache.commons.math4.exception.util.LocalizedFormats; /** * Population of chromosomes represented by a {@link List}. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/genetics/MutationPolicy.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/genetics/MutationPolicy.java b/src/main/java/org/apache/commons/math4/genetics/MutationPolicy.java index b981881..999d14b 100644 --- a/src/main/java/org/apache/commons/math4/genetics/MutationPolicy.java +++ b/src/main/java/org/apache/commons/math4/genetics/MutationPolicy.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.genetics; +package org.apache.commons.math4.genetics; -import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math4.exception.MathIllegalArgumentException; /** * Algorithm used to mutate a chromosome. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/genetics/NPointCrossover.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/genetics/NPointCrossover.java b/src/main/java/org/apache/commons/math4/genetics/NPointCrossover.java index a1a7d99..0b16c95 100644 --- a/src/main/java/org/apache/commons/math4/genetics/NPointCrossover.java +++ b/src/main/java/org/apache/commons/math4/genetics/NPointCrossover.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.genetics; +package org.apache.commons.math4.genetics; import java.util.ArrayList; import java.util.List; -import org.apache.commons.math3.exception.DimensionMismatchException; -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.exception.util.LocalizedFormats; -import org.apache.commons.math3.random.RandomGenerator; +import org.apache.commons.math4.exception.DimensionMismatchException; +import org.apache.commons.math4.exception.MathIllegalArgumentException; +import org.apache.commons.math4.exception.NotStrictlyPositiveException; +import org.apache.commons.math4.exception.NumberIsTooLargeException; +import org.apache.commons.math4.exception.util.LocalizedFormats; +import org.apache.commons.math4.random.RandomGenerator; /** * N-point crossover policy. For each iteration a random crossover point is http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/genetics/OnePointCrossover.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/genetics/OnePointCrossover.java b/src/main/java/org/apache/commons/math4/genetics/OnePointCrossover.java index b1ea47b..03559d2 100644 --- a/src/main/java/org/apache/commons/math4/genetics/OnePointCrossover.java +++ b/src/main/java/org/apache/commons/math4/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.math3.genetics; +package org.apache.commons.math4.genetics; import java.util.ArrayList; import java.util.List; -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.math4.exception.DimensionMismatchException; +import org.apache.commons.math4.exception.MathIllegalArgumentException; +import org.apache.commons.math4.exception.util.LocalizedFormats; /** http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/genetics/OrderedCrossover.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/genetics/OrderedCrossover.java b/src/main/java/org/apache/commons/math4/genetics/OrderedCrossover.java index e796f53..f9dbb2f 100644 --- a/src/main/java/org/apache/commons/math4/genetics/OrderedCrossover.java +++ b/src/main/java/org/apache/commons/math4/genetics/OrderedCrossover.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.genetics; +package org.apache.commons.math4.genetics; import java.util.ArrayList; import java.util.Collections; @@ -22,11 +22,11 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -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.random.RandomGenerator; -import org.apache.commons.math3.util.FastMath; +import org.apache.commons.math4.exception.DimensionMismatchException; +import org.apache.commons.math4.exception.MathIllegalArgumentException; +import org.apache.commons.math4.exception.util.LocalizedFormats; +import org.apache.commons.math4.random.RandomGenerator; +import org.apache.commons.math4.util.FastMath; /** * Order 1 Crossover [OX1] builds offspring from <b>ordered</b> chromosomes by copying a http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/genetics/PermutationChromosome.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/genetics/PermutationChromosome.java b/src/main/java/org/apache/commons/math4/genetics/PermutationChromosome.java index d02cf2c..3bc6748 100644 --- a/src/main/java/org/apache/commons/math4/genetics/PermutationChromosome.java +++ b/src/main/java/org/apache/commons/math4/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.math3.genetics; +package org.apache.commons.math4.genetics; import java.util.List; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/genetics/Population.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/genetics/Population.java b/src/main/java/org/apache/commons/math4/genetics/Population.java index 8cc6d8b..0c3e365 100644 --- a/src/main/java/org/apache/commons/math4/genetics/Population.java +++ b/src/main/java/org/apache/commons/math4/genetics/Population.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.genetics; +package org.apache.commons.math4.genetics; -import org.apache.commons.math3.exception.NumberIsTooLargeException; +import org.apache.commons.math4.exception.NumberIsTooLargeException; /** http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/genetics/RandomKey.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/genetics/RandomKey.java b/src/main/java/org/apache/commons/math4/genetics/RandomKey.java index 52db4a7..0eb679a 100644 --- a/src/main/java/org/apache/commons/math4/genetics/RandomKey.java +++ b/src/main/java/org/apache/commons/math4/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.math3.genetics; +package org.apache.commons.math4.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.math3.exception.DimensionMismatchException; -import org.apache.commons.math3.exception.MathIllegalArgumentException; -import org.apache.commons.math3.exception.util.LocalizedFormats; +import org.apache.commons.math4.exception.DimensionMismatchException; +import org.apache.commons.math4.exception.MathIllegalArgumentException; +import org.apache.commons.math4.exception.util.LocalizedFormats; /** * Random Key chromosome is used for permutation representation. It is a vector http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/genetics/RandomKeyMutation.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/genetics/RandomKeyMutation.java b/src/main/java/org/apache/commons/math4/genetics/RandomKeyMutation.java index 9fb16fb..54edfbb 100644 --- a/src/main/java/org/apache/commons/math4/genetics/RandomKeyMutation.java +++ b/src/main/java/org/apache/commons/math4/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.math3.genetics; +package org.apache.commons.math4.genetics; import java.util.ArrayList; import java.util.List; -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; /** * Mutation operator for {@link RandomKey}s. Changes a randomly chosen element http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/genetics/SelectionPolicy.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/genetics/SelectionPolicy.java b/src/main/java/org/apache/commons/math4/genetics/SelectionPolicy.java index 5240f75..156653b 100644 --- a/src/main/java/org/apache/commons/math4/genetics/SelectionPolicy.java +++ b/src/main/java/org/apache/commons/math4/genetics/SelectionPolicy.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.genetics; +package org.apache.commons.math4.genetics; -import org.apache.commons.math3.exception.MathIllegalArgumentException; +import org.apache.commons.math4.exception.MathIllegalArgumentException; /** * Algorithm used to select a chromosome pair from a population. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/genetics/StoppingCondition.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/genetics/StoppingCondition.java b/src/main/java/org/apache/commons/math4/genetics/StoppingCondition.java index 0e21628..094b697 100644 --- a/src/main/java/org/apache/commons/math4/genetics/StoppingCondition.java +++ b/src/main/java/org/apache/commons/math4/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.math3.genetics; +package org.apache.commons.math4.genetics; /** * Algorithm used to determine when to stop evolution. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/genetics/TournamentSelection.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/genetics/TournamentSelection.java b/src/main/java/org/apache/commons/math4/genetics/TournamentSelection.java index 95051ee..871c17d 100644 --- a/src/main/java/org/apache/commons/math4/genetics/TournamentSelection.java +++ b/src/main/java/org/apache/commons/math4/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.math3.genetics; +package org.apache.commons.math4.genetics; import java.util.ArrayList; import java.util.List; -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; /** * Tournament selection scheme. Each of the two selected chromosomes is selected http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/genetics/UniformCrossover.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/genetics/UniformCrossover.java b/src/main/java/org/apache/commons/math4/genetics/UniformCrossover.java index 2a63bbb..1427d24 100644 --- a/src/main/java/org/apache/commons/math4/genetics/UniformCrossover.java +++ b/src/main/java/org/apache/commons/math4/genetics/UniformCrossover.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.genetics; +package org.apache.commons.math4.genetics; import java.util.ArrayList; import java.util.List; -import org.apache.commons.math3.exception.DimensionMismatchException; -import org.apache.commons.math3.exception.MathIllegalArgumentException; -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.math4.exception.DimensionMismatchException; +import org.apache.commons.math4.exception.MathIllegalArgumentException; +import org.apache.commons.math4.exception.OutOfRangeException; +import org.apache.commons.math4.exception.util.LocalizedFormats; +import org.apache.commons.math4.random.RandomGenerator; /** * Perform Uniform Crossover [UX] on the specified chromosomes. A fixed mixing http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/genetics/package-info.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/genetics/package-info.java b/src/main/java/org/apache/commons/math4/genetics/package-info.java index 5c145e8..02eb5c9 100644 --- a/src/main/java/org/apache/commons/math4/genetics/package-info.java +++ b/src/main/java/org/apache/commons/math4/genetics/package-info.java @@ -17,4 +17,4 @@ /** * This package provides Genetic Algorithms components and implementations. */ -package org.apache.commons.math3.genetics; +package org.apache.commons.math4.genetics; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/geometry/Point.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/geometry/Point.java b/src/main/java/org/apache/commons/math4/geometry/Point.java index 1504d2e..d45421a 100644 --- a/src/main/java/org/apache/commons/math4/geometry/Point.java +++ b/src/main/java/org/apache/commons/math4/geometry/Point.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.geometry; +package org.apache.commons.math4.geometry; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/geometry/Space.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/geometry/Space.java b/src/main/java/org/apache/commons/math4/geometry/Space.java index 7f72439..8413c7c 100644 --- a/src/main/java/org/apache/commons/math4/geometry/Space.java +++ b/src/main/java/org/apache/commons/math4/geometry/Space.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.geometry; +package org.apache.commons.math4.geometry; import java.io.Serializable; -import org.apache.commons.math3.exception.MathUnsupportedOperationException; +import org.apache.commons.math4.exception.MathUnsupportedOperationException; /** This interface represents a generic space, with affine and vectorial counterparts. * @see Vector http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/geometry/Vector.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/geometry/Vector.java b/src/main/java/org/apache/commons/math4/geometry/Vector.java index f22f7a1..9e740b3 100644 --- a/src/main/java/org/apache/commons/math4/geometry/Vector.java +++ b/src/main/java/org/apache/commons/math4/geometry/Vector.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.geometry; +package org.apache.commons.math4.geometry; import java.text.NumberFormat; -import org.apache.commons.math3.exception.MathArithmeticException; +import org.apache.commons.math4.exception.MathArithmeticException; /** This interface represents a generic vector in a vectorial space or a point in an affine space. * @param <S> Type of the space. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/geometry/VectorFormat.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/geometry/VectorFormat.java b/src/main/java/org/apache/commons/math4/geometry/VectorFormat.java index b58d765..7278a2f 100644 --- a/src/main/java/org/apache/commons/math4/geometry/VectorFormat.java +++ b/src/main/java/org/apache/commons/math4/geometry/VectorFormat.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.apache.commons.math3.geometry; +package org.apache.commons.math4.geometry; import java.text.FieldPosition; import java.text.NumberFormat; import java.text.ParsePosition; import java.util.Locale; -import org.apache.commons.math3.util.CompositeFormat; -import org.apache.commons.math3.exception.MathParseException; +import org.apache.commons.math4.exception.MathParseException; +import org.apache.commons.math4.util.CompositeFormat; /** * Formats a vector in components list format "{x; y; ...}". http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/geometry/enclosing/Encloser.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/geometry/enclosing/Encloser.java b/src/main/java/org/apache/commons/math4/geometry/enclosing/Encloser.java index 9b2588a..5997779 100644 --- a/src/main/java/org/apache/commons/math4/geometry/enclosing/Encloser.java +++ b/src/main/java/org/apache/commons/math4/geometry/enclosing/Encloser.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.geometry.enclosing; +package org.apache.commons.math4.geometry.enclosing; -import org.apache.commons.math3.geometry.Point; -import org.apache.commons.math3.geometry.Space; +import org.apache.commons.math4.geometry.Point; +import org.apache.commons.math4.geometry.Space; /** Interface for algorithms computing enclosing balls. * @param <S> Space type. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/geometry/enclosing/EnclosingBall.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/geometry/enclosing/EnclosingBall.java b/src/main/java/org/apache/commons/math4/geometry/enclosing/EnclosingBall.java index eedbd46..64caf28 100644 --- a/src/main/java/org/apache/commons/math4/geometry/enclosing/EnclosingBall.java +++ b/src/main/java/org/apache/commons/math4/geometry/enclosing/EnclosingBall.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.geometry.enclosing; +package org.apache.commons.math4.geometry.enclosing; import java.io.Serializable; -import org.apache.commons.math3.geometry.Point; -import org.apache.commons.math3.geometry.Space; +import org.apache.commons.math4.geometry.Point; +import org.apache.commons.math4.geometry.Space; /** This class represents a ball enclosing some points. * @param <S> Space type. http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/geometry/enclosing/SupportBallGenerator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/geometry/enclosing/SupportBallGenerator.java b/src/main/java/org/apache/commons/math4/geometry/enclosing/SupportBallGenerator.java index 3a0f875..9886d97 100644 --- a/src/main/java/org/apache/commons/math4/geometry/enclosing/SupportBallGenerator.java +++ b/src/main/java/org/apache/commons/math4/geometry/enclosing/SupportBallGenerator.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.geometry.enclosing; +package org.apache.commons.math4.geometry.enclosing; import java.util.List; -import org.apache.commons.math3.geometry.Point; -import org.apache.commons.math3.geometry.Space; +import org.apache.commons.math4.geometry.Point; +import org.apache.commons.math4.geometry.Space; /** Interface for generating balls based on support points. * <p> http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/geometry/enclosing/WelzlEncloser.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/geometry/enclosing/WelzlEncloser.java b/src/main/java/org/apache/commons/math4/geometry/enclosing/WelzlEncloser.java index 987e7d9..0891d99 100644 --- a/src/main/java/org/apache/commons/math4/geometry/enclosing/WelzlEncloser.java +++ b/src/main/java/org/apache/commons/math4/geometry/enclosing/WelzlEncloser.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.math3.geometry.enclosing; +package org.apache.commons.math4.geometry.enclosing; import java.util.ArrayList; import java.util.List; -import org.apache.commons.math3.exception.MathInternalError; -import org.apache.commons.math3.geometry.Point; -import org.apache.commons.math3.geometry.Space; +import org.apache.commons.math4.exception.MathInternalError; +import org.apache.commons.math4.geometry.Point; +import org.apache.commons.math4.geometry.Space; /** Class implementing Emo Welzl algorithm to find the smallest enclosing ball in linear time. * <p> http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/geometry/enclosing/package-info.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/math4/geometry/enclosing/package-info.java b/src/main/java/org/apache/commons/math4/geometry/enclosing/package-info.java index 20462a1..7456a41 100644 --- a/src/main/java/org/apache/commons/math4/geometry/enclosing/package-info.java +++ b/src/main/java/org/apache/commons/math4/geometry/enclosing/package-info.java @@ -21,4 +21,4 @@ * </p> * */ -package org.apache.commons.math3.geometry.enclosing; +package org.apache.commons.math4.geometry.enclosing;
