commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t.@apache.org
Subject [71/82] [math] Update for next development iteration: commons-math4
Date Mon, 16 Feb 2015 22:40:41 GMT
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853StepInterpolator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853StepInterpolator.java b/src/main/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853StepInterpolator.java
index 3ff3a85..38fe2ec 100644
--- a/src/main/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853StepInterpolator.java
+++ b/src/main/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853StepInterpolator.java
@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.ode.nonstiff;
+package org.apache.commons.math4.ode.nonstiff;
 
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 
-import org.apache.commons.math3.exception.MaxCountExceededException;
-import org.apache.commons.math3.ode.AbstractIntegrator;
-import org.apache.commons.math3.ode.EquationsMapper;
-import org.apache.commons.math3.ode.sampling.StepInterpolator;
+import org.apache.commons.math4.exception.MaxCountExceededException;
+import org.apache.commons.math4.ode.AbstractIntegrator;
+import org.apache.commons.math4.ode.EquationsMapper;
+import org.apache.commons.math4.ode.sampling.StepInterpolator;
 
 /**
  * This class represents an interpolator over the last step during an

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/ode/nonstiff/EmbeddedRungeKuttaIntegrator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/nonstiff/EmbeddedRungeKuttaIntegrator.java b/src/main/java/org/apache/commons/math4/ode/nonstiff/EmbeddedRungeKuttaIntegrator.java
index 098d2e5..a82f168 100644
--- a/src/main/java/org/apache/commons/math4/ode/nonstiff/EmbeddedRungeKuttaIntegrator.java
+++ b/src/main/java/org/apache/commons/math4/ode/nonstiff/EmbeddedRungeKuttaIntegrator.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.ode.nonstiff;
-
-import org.apache.commons.math3.exception.DimensionMismatchException;
-import org.apache.commons.math3.exception.MaxCountExceededException;
-import org.apache.commons.math3.exception.NoBracketingException;
-import org.apache.commons.math3.exception.NumberIsTooSmallException;
-import org.apache.commons.math3.ode.ExpandableStatefulODE;
-import org.apache.commons.math3.util.FastMath;
+package org.apache.commons.math4.ode.nonstiff;
+
+import org.apache.commons.math4.exception.DimensionMismatchException;
+import org.apache.commons.math4.exception.MaxCountExceededException;
+import org.apache.commons.math4.exception.NoBracketingException;
+import org.apache.commons.math4.exception.NumberIsTooSmallException;
+import org.apache.commons.math4.ode.ExpandableStatefulODE;
+import org.apache.commons.math4.util.FastMath;
 
 /**
  * This class implements the common part of all embedded Runge-Kutta

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/ode/nonstiff/EulerIntegrator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/nonstiff/EulerIntegrator.java b/src/main/java/org/apache/commons/math4/ode/nonstiff/EulerIntegrator.java
index 22c15c5..1c05ad4 100644
--- a/src/main/java/org/apache/commons/math4/ode/nonstiff/EulerIntegrator.java
+++ b/src/main/java/org/apache/commons/math4/ode/nonstiff/EulerIntegrator.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.ode.nonstiff;
+package org.apache.commons.math4.ode.nonstiff;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/ode/nonstiff/EulerStepInterpolator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/nonstiff/EulerStepInterpolator.java b/src/main/java/org/apache/commons/math4/ode/nonstiff/EulerStepInterpolator.java
index 3c45780..af78449 100644
--- a/src/main/java/org/apache/commons/math4/ode/nonstiff/EulerStepInterpolator.java
+++ b/src/main/java/org/apache/commons/math4/ode/nonstiff/EulerStepInterpolator.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.ode.nonstiff;
+package org.apache.commons.math4.ode.nonstiff;
 
-import org.apache.commons.math3.ode.sampling.StepInterpolator;
+import org.apache.commons.math4.ode.sampling.StepInterpolator;
 
 /**
  * This class implements a linear interpolator for step.
@@ -51,7 +51,7 @@ class EulerStepInterpolator
   /** Simple constructor.
    * This constructor builds an instance that is not usable yet, the
    * {@link
-   * org.apache.commons.math3.ode.sampling.AbstractStepInterpolator#reinitialize}
+   * org.apache.commons.math4.ode.sampling.AbstractStepInterpolator#reinitialize}
    * method should be called before using the instance in order to
    * initialize the internal arrays. This constructor is used only
    * in order to delay the initialization in some cases. The {@link

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/ode/nonstiff/GillIntegrator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/nonstiff/GillIntegrator.java b/src/main/java/org/apache/commons/math4/ode/nonstiff/GillIntegrator.java
index 5273e02..1ebc48f 100644
--- a/src/main/java/org/apache/commons/math4/ode/nonstiff/GillIntegrator.java
+++ b/src/main/java/org/apache/commons/math4/ode/nonstiff/GillIntegrator.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.ode.nonstiff;
+package org.apache.commons.math4.ode.nonstiff;
 
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.util.FastMath;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/ode/nonstiff/GillStepInterpolator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/nonstiff/GillStepInterpolator.java b/src/main/java/org/apache/commons/math4/ode/nonstiff/GillStepInterpolator.java
index 49081f5..7131388 100644
--- a/src/main/java/org/apache/commons/math4/ode/nonstiff/GillStepInterpolator.java
+++ b/src/main/java/org/apache/commons/math4/ode/nonstiff/GillStepInterpolator.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.ode.nonstiff;
+package org.apache.commons.math4.ode.nonstiff;
 
-import org.apache.commons.math3.ode.sampling.StepInterpolator;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.ode.sampling.StepInterpolator;
+import org.apache.commons.math4.util.FastMath;
 
 /**
  * This class implements a step interpolator for the Gill fourth
@@ -67,7 +67,7 @@ class GillStepInterpolator
   /** Simple constructor.
    * This constructor builds an instance that is not usable yet, the
    * {@link
-   * org.apache.commons.math3.ode.sampling.AbstractStepInterpolator#reinitialize}
+   * org.apache.commons.math4.ode.sampling.AbstractStepInterpolator#reinitialize}
    * method should be called before using the instance in order to
    * initialize the internal arrays. This constructor is used only
    * in order to delay the initialization in some cases. The {@link

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/ode/nonstiff/GraggBulirschStoerIntegrator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/nonstiff/GraggBulirschStoerIntegrator.java b/src/main/java/org/apache/commons/math4/ode/nonstiff/GraggBulirschStoerIntegrator.java
index 50a463e..47defd2 100644
--- a/src/main/java/org/apache/commons/math4/ode/nonstiff/GraggBulirschStoerIntegrator.java
+++ b/src/main/java/org/apache/commons/math4/ode/nonstiff/GraggBulirschStoerIntegrator.java
@@ -15,18 +15,18 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.ode.nonstiff;
-
-import org.apache.commons.math3.analysis.solvers.UnivariateSolver;
-import org.apache.commons.math3.exception.DimensionMismatchException;
-import org.apache.commons.math3.exception.MaxCountExceededException;
-import org.apache.commons.math3.exception.NoBracketingException;
-import org.apache.commons.math3.exception.NumberIsTooSmallException;
-import org.apache.commons.math3.ode.ExpandableStatefulODE;
-import org.apache.commons.math3.ode.events.EventHandler;
-import org.apache.commons.math3.ode.sampling.AbstractStepInterpolator;
-import org.apache.commons.math3.ode.sampling.StepHandler;
-import org.apache.commons.math3.util.FastMath;
+package org.apache.commons.math4.ode.nonstiff;
+
+import org.apache.commons.math4.analysis.solvers.UnivariateSolver;
+import org.apache.commons.math4.exception.DimensionMismatchException;
+import org.apache.commons.math4.exception.MaxCountExceededException;
+import org.apache.commons.math4.exception.NoBracketingException;
+import org.apache.commons.math4.exception.NumberIsTooSmallException;
+import org.apache.commons.math4.ode.ExpandableStatefulODE;
+import org.apache.commons.math4.ode.events.EventHandler;
+import org.apache.commons.math4.ode.sampling.AbstractStepInterpolator;
+import org.apache.commons.math4.ode.sampling.StepHandler;
+import org.apache.commons.math4.util.FastMath;
 
 /**
  * This class implements a Gragg-Bulirsch-Stoer integrator for

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/ode/nonstiff/GraggBulirschStoerStepInterpolator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/nonstiff/GraggBulirschStoerStepInterpolator.java b/src/main/java/org/apache/commons/math4/ode/nonstiff/GraggBulirschStoerStepInterpolator.java
index c1d61b3..95c41c8 100644
--- a/src/main/java/org/apache/commons/math4/ode/nonstiff/GraggBulirschStoerStepInterpolator.java
+++ b/src/main/java/org/apache/commons/math4/ode/nonstiff/GraggBulirschStoerStepInterpolator.java
@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.ode.nonstiff;
+package org.apache.commons.math4.ode.nonstiff;
 
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 
-import org.apache.commons.math3.ode.EquationsMapper;
-import org.apache.commons.math3.ode.sampling.AbstractStepInterpolator;
-import org.apache.commons.math3.ode.sampling.StepInterpolator;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.ode.EquationsMapper;
+import org.apache.commons.math4.ode.sampling.AbstractStepInterpolator;
+import org.apache.commons.math4.ode.sampling.StepInterpolator;
+import org.apache.commons.math4.util.FastMath;
 
 /**
  * This class implements an interpolator for the Gragg-Bulirsch-Stoer

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/ode/nonstiff/HighamHall54Integrator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/nonstiff/HighamHall54Integrator.java b/src/main/java/org/apache/commons/math4/ode/nonstiff/HighamHall54Integrator.java
index c48c4f9..f5354f3 100644
--- a/src/main/java/org/apache/commons/math4/ode/nonstiff/HighamHall54Integrator.java
+++ b/src/main/java/org/apache/commons/math4/ode/nonstiff/HighamHall54Integrator.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.ode.nonstiff;
+package org.apache.commons.math4.ode.nonstiff;
 
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.util.FastMath;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/ode/nonstiff/HighamHall54StepInterpolator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/nonstiff/HighamHall54StepInterpolator.java b/src/main/java/org/apache/commons/math4/ode/nonstiff/HighamHall54StepInterpolator.java
index cecbafb..19acf08 100644
--- a/src/main/java/org/apache/commons/math4/ode/nonstiff/HighamHall54StepInterpolator.java
+++ b/src/main/java/org/apache/commons/math4/ode/nonstiff/HighamHall54StepInterpolator.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.ode.nonstiff;
+package org.apache.commons.math4.ode.nonstiff;
 
-import org.apache.commons.math3.ode.sampling.StepInterpolator;
+import org.apache.commons.math4.ode.sampling.StepInterpolator;
 
 /**
  * This class represents an interpolator over the last step during an
@@ -37,7 +37,7 @@ class HighamHall54StepInterpolator
   /** Simple constructor.
    * This constructor builds an instance that is not usable yet, the
    * {@link
-   * org.apache.commons.math3.ode.sampling.AbstractStepInterpolator#reinitialize}
+   * org.apache.commons.math4.ode.sampling.AbstractStepInterpolator#reinitialize}
    * method should be called before using the instance in order to
    * initialize the internal arrays. This constructor is used only
    * in order to delay the initialization in some cases. The {@link

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/ode/nonstiff/LutherIntegrator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/nonstiff/LutherIntegrator.java b/src/main/java/org/apache/commons/math4/ode/nonstiff/LutherIntegrator.java
index d3d0d6a..631d6b2 100644
--- a/src/main/java/org/apache/commons/math4/ode/nonstiff/LutherIntegrator.java
+++ b/src/main/java/org/apache/commons/math4/ode/nonstiff/LutherIntegrator.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.ode.nonstiff;
+package org.apache.commons.math4.ode.nonstiff;
 
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.util.FastMath;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/ode/nonstiff/LutherStepInterpolator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/nonstiff/LutherStepInterpolator.java b/src/main/java/org/apache/commons/math4/ode/nonstiff/LutherStepInterpolator.java
index 6f54b70..d3fd546 100644
--- a/src/main/java/org/apache/commons/math4/ode/nonstiff/LutherStepInterpolator.java
+++ b/src/main/java/org/apache/commons/math4/ode/nonstiff/LutherStepInterpolator.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.ode.nonstiff;
+package org.apache.commons.math4.ode.nonstiff;
 
-import org.apache.commons.math3.ode.sampling.StepInterpolator;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.ode.sampling.StepInterpolator;
+import org.apache.commons.math4.util.FastMath;
 
 /**
  * This class represents an interpolator over the last step during an
@@ -43,7 +43,7 @@ class LutherStepInterpolator extends RungeKuttaStepInterpolator {
     /** Simple constructor.
      * This constructor builds an instance that is not usable yet, the
      * {@link
-     * org.apache.commons.math3.ode.sampling.AbstractStepInterpolator#reinitialize}
+     * org.apache.commons.math4.ode.sampling.AbstractStepInterpolator#reinitialize}
      * method should be called before using the instance in order to
      * initialize the internal arrays. This constructor is used only
      * in order to delay the initialization in some cases. The {@link

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/ode/nonstiff/MidpointIntegrator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/nonstiff/MidpointIntegrator.java b/src/main/java/org/apache/commons/math4/ode/nonstiff/MidpointIntegrator.java
index fa834a1..ff41520 100644
--- a/src/main/java/org/apache/commons/math4/ode/nonstiff/MidpointIntegrator.java
+++ b/src/main/java/org/apache/commons/math4/ode/nonstiff/MidpointIntegrator.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.ode.nonstiff;
+package org.apache.commons.math4.ode.nonstiff;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/ode/nonstiff/MidpointStepInterpolator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/nonstiff/MidpointStepInterpolator.java b/src/main/java/org/apache/commons/math4/ode/nonstiff/MidpointStepInterpolator.java
index 7346f7a..d872d6e 100644
--- a/src/main/java/org/apache/commons/math4/ode/nonstiff/MidpointStepInterpolator.java
+++ b/src/main/java/org/apache/commons/math4/ode/nonstiff/MidpointStepInterpolator.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.ode.nonstiff;
+package org.apache.commons.math4.ode.nonstiff;
 
-import org.apache.commons.math3.ode.sampling.StepInterpolator;
+import org.apache.commons.math4.ode.sampling.StepInterpolator;
 
 /**
  * This class implements a step interpolator for second order
@@ -53,7 +53,7 @@ class MidpointStepInterpolator
   /** Simple constructor.
    * This constructor builds an instance that is not usable yet, the
    * {@link
-   * org.apache.commons.math3.ode.sampling.AbstractStepInterpolator#reinitialize}
+   * org.apache.commons.math4.ode.sampling.AbstractStepInterpolator#reinitialize}
    * method should be called before using the instance in order to
    * initialize the internal arrays. This constructor is used only
    * in order to delay the initialization in some cases. The {@link

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/ode/nonstiff/RungeKuttaIntegrator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/nonstiff/RungeKuttaIntegrator.java b/src/main/java/org/apache/commons/math4/ode/nonstiff/RungeKuttaIntegrator.java
index 5f7d5d8..4b8b6c3 100644
--- a/src/main/java/org/apache/commons/math4/ode/nonstiff/RungeKuttaIntegrator.java
+++ b/src/main/java/org/apache/commons/math4/ode/nonstiff/RungeKuttaIntegrator.java
@@ -15,17 +15,17 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.ode.nonstiff;
+package org.apache.commons.math4.ode.nonstiff;
 
 
-import org.apache.commons.math3.exception.DimensionMismatchException;
-import org.apache.commons.math3.exception.MaxCountExceededException;
-import org.apache.commons.math3.exception.NoBracketingException;
-import org.apache.commons.math3.exception.NumberIsTooSmallException;
-import org.apache.commons.math3.ode.AbstractIntegrator;
-import org.apache.commons.math3.ode.ExpandableStatefulODE;
-import org.apache.commons.math3.ode.FirstOrderDifferentialEquations;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.exception.DimensionMismatchException;
+import org.apache.commons.math4.exception.MaxCountExceededException;
+import org.apache.commons.math4.exception.NoBracketingException;
+import org.apache.commons.math4.exception.NumberIsTooSmallException;
+import org.apache.commons.math4.ode.AbstractIntegrator;
+import org.apache.commons.math4.ode.ExpandableStatefulODE;
+import org.apache.commons.math4.ode.FirstOrderDifferentialEquations;
+import org.apache.commons.math4.util.FastMath;
 
 /**
  * This class implements the common part of all fixed step Runge-Kutta

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/ode/nonstiff/RungeKuttaStepInterpolator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/nonstiff/RungeKuttaStepInterpolator.java b/src/main/java/org/apache/commons/math4/ode/nonstiff/RungeKuttaStepInterpolator.java
index c15c590..5d09d94 100644
--- a/src/main/java/org/apache/commons/math4/ode/nonstiff/RungeKuttaStepInterpolator.java
+++ b/src/main/java/org/apache/commons/math4/ode/nonstiff/RungeKuttaStepInterpolator.java
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.ode.nonstiff;
+package org.apache.commons.math4.ode.nonstiff;
 
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 
-import org.apache.commons.math3.ode.AbstractIntegrator;
-import org.apache.commons.math3.ode.EquationsMapper;
-import org.apache.commons.math3.ode.sampling.AbstractStepInterpolator;
+import org.apache.commons.math4.ode.AbstractIntegrator;
+import org.apache.commons.math4.ode.EquationsMapper;
+import org.apache.commons.math4.ode.sampling.AbstractStepInterpolator;
 
 /** This class represents an interpolator over the last step during an
  * ODE integration for Runge-Kutta and embedded Runge-Kutta integrators.

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/ode/nonstiff/ThreeEighthesIntegrator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/nonstiff/ThreeEighthesIntegrator.java b/src/main/java/org/apache/commons/math4/ode/nonstiff/ThreeEighthesIntegrator.java
index c5f8216..cb14511 100644
--- a/src/main/java/org/apache/commons/math4/ode/nonstiff/ThreeEighthesIntegrator.java
+++ b/src/main/java/org/apache/commons/math4/ode/nonstiff/ThreeEighthesIntegrator.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.ode.nonstiff;
+package org.apache.commons.math4.ode.nonstiff;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/ode/nonstiff/ThreeEighthesStepInterpolator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/nonstiff/ThreeEighthesStepInterpolator.java b/src/main/java/org/apache/commons/math4/ode/nonstiff/ThreeEighthesStepInterpolator.java
index 0f263d1..33fee20 100644
--- a/src/main/java/org/apache/commons/math4/ode/nonstiff/ThreeEighthesStepInterpolator.java
+++ b/src/main/java/org/apache/commons/math4/ode/nonstiff/ThreeEighthesStepInterpolator.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.ode.nonstiff;
+package org.apache.commons.math4.ode.nonstiff;
 
-import org.apache.commons.math3.ode.sampling.StepInterpolator;
+import org.apache.commons.math4.ode.sampling.StepInterpolator;
 
 /**
  * This class implements a step interpolator for the 3/8 fourth
@@ -63,7 +63,7 @@ class ThreeEighthesStepInterpolator
   /** Simple constructor.
    * This constructor builds an instance that is not usable yet, the
    * {@link
-   * org.apache.commons.math3.ode.sampling.AbstractStepInterpolator#reinitialize}
+   * org.apache.commons.math4.ode.sampling.AbstractStepInterpolator#reinitialize}
    * method should be called before using the instance in order to
    * initialize the internal arrays. This constructor is used only
    * in order to delay the initialization in some cases. The {@link

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/ode/nonstiff/package-info.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/nonstiff/package-info.java b/src/main/java/org/apache/commons/math4/ode/nonstiff/package-info.java
index b2387ce..41e452c 100644
--- a/src/main/java/org/apache/commons/math4/ode/nonstiff/package-info.java
+++ b/src/main/java/org/apache/commons/math4/ode/nonstiff/package-info.java
@@ -22,4 +22,4 @@
  *
  *
  */
-package org.apache.commons.math3.ode.nonstiff;
+package org.apache.commons.math4.ode.nonstiff;

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/ode/package-info.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/package-info.java b/src/main/java/org/apache/commons/math4/ode/package-info.java
index c40e764..106a757 100644
--- a/src/main/java/org/apache/commons/math4/ode/package-info.java
+++ b/src/main/java/org/apache/commons/math4/ode/package-info.java
@@ -36,7 +36,7 @@
  * computing the state vector at discrete times, they also provide a
  * cheap mean to get the state between the time steps. They do so through
  * classes extending the {@link
- * org.apache.commons.math3.ode.sampling.StepInterpolator StepInterpolator}
+ * org.apache.commons.math4.ode.sampling.StepInterpolator StepInterpolator}
  * abstract class, which are made available to the user at the end of
  * each step.
  * </p>
@@ -56,10 +56,10 @@
  * <p>
  * The user should describe his problem in his own classes
  * (<code>UserProblem</code> in the diagram below) which should implement
- * the {@link org.apache.commons.math3.ode.FirstOrderDifferentialEquations
+ * the {@link org.apache.commons.math4.ode.FirstOrderDifferentialEquations
  * FirstOrderDifferentialEquations} interface. Then he should pass it to
  * the integrator he prefers among all the classes that implement the
- * {@link org.apache.commons.math3.ode.FirstOrderIntegrator
+ * {@link org.apache.commons.math4.ode.FirstOrderIntegrator
  * FirstOrderIntegrator} interface.
  * </p>
  *
@@ -67,23 +67,23 @@
  * The solution of the integration problem is provided by two means. The
  * first one is aimed towards simple use: the state vector at the end of
  * the integration process is copied in the <code>y</code> array of the
- * {@link org.apache.commons.math3.ode.FirstOrderIntegrator#integrate
+ * {@link org.apache.commons.math4.ode.FirstOrderIntegrator#integrate
  * FirstOrderIntegrator.integrate} method. The second one should be used
  * when more in-depth information is needed throughout the integration
  * process. The user can register an object implementing the {@link
- * org.apache.commons.math3.ode.sampling.StepHandler StepHandler} interface or a
- * {@link org.apache.commons.math3.ode.sampling.StepNormalizer StepNormalizer}
+ * org.apache.commons.math4.ode.sampling.StepHandler StepHandler} interface or a
+ * {@link org.apache.commons.math4.ode.sampling.StepNormalizer StepNormalizer}
  * object wrapping a user-specified object implementing the {@link
- * org.apache.commons.math3.ode.sampling.FixedStepHandler FixedStepHandler}
+ * org.apache.commons.math4.ode.sampling.FixedStepHandler FixedStepHandler}
  * interface into the integrator before calling the {@link
- * org.apache.commons.math3.ode.FirstOrderIntegrator#integrate
+ * org.apache.commons.math4.ode.FirstOrderIntegrator#integrate
  * FirstOrderIntegrator.integrate} method. The user object will be called
  * appropriately during the integration process, allowing the user to
  * process intermediate results. The default step handler does nothing.
  * </p>
  *
  * <p>
- * {@link org.apache.commons.math3.ode.ContinuousOutputModel
+ * {@link org.apache.commons.math4.ode.ContinuousOutputModel
  * ContinuousOutputModel} is a special-purpose step handler that is able
  * to store all steps and to provide transparent access to any
  * intermediate result once the integration is over. An important feature
@@ -98,10 +98,10 @@
  *
  * <p>
  * Other default implementations of the {@link
- * org.apache.commons.math3.ode.sampling.StepHandler StepHandler} interface are
+ * org.apache.commons.math4.ode.sampling.StepHandler StepHandler} interface are
  * available for general needs ({@link
- * org.apache.commons.math3.ode.sampling.DummyStepHandler DummyStepHandler}, {@link
- * org.apache.commons.math3.ode.sampling.StepNormalizer StepNormalizer}) and custom
+ * org.apache.commons.math4.ode.sampling.DummyStepHandler DummyStepHandler}, {@link
+ * org.apache.commons.math4.ode.sampling.StepNormalizer StepNormalizer}) and custom
  * implementations can be developed for specific needs. As an example,
  * if an application is to be completely driven by the integration
  * process, then most of the application code will be run inside a step
@@ -113,14 +113,14 @@
  * creation time. The more efficient integrators use variable steps that
  * are handled internally in order to control the integration error with
  * respect to a specified accuracy (these integrators extend the {@link
- * org.apache.commons.math3.ode.nonstiff.AdaptiveStepsizeIntegrator
+ * org.apache.commons.math4.ode.nonstiff.AdaptiveStepsizeIntegrator
  * AdaptiveStepsizeIntegrator} abstract class). In this case, the step
  * handler which is called after each successful step shows up the
  * variable stepsize. The {@link
- * org.apache.commons.math3.ode.sampling.StepNormalizer StepNormalizer} class can
+ * org.apache.commons.math4.ode.sampling.StepNormalizer StepNormalizer} class can
  * be used to convert the variable stepsize into a fixed stepsize that
  * can be handled by classes implementing the {@link
- * org.apache.commons.math3.ode.sampling.FixedStepHandler FixedStepHandler}
+ * org.apache.commons.math4.ode.sampling.FixedStepHandler FixedStepHandler}
  * interface. Adaptive stepsize integrators can automatically compute the
  * initial stepsize by themselves, however the user can specify it if he
  * prefers to retain full control over the integration or if the
@@ -131,34 +131,34 @@
  * <table border="1" align="center">
  * <tr BGCOLOR="#CCCCFF"><td colspan=2><font size="+2">Fixed Step Integrators</font></td></tr>
  * <tr BGCOLOR="#EEEEFF"><font size="+1"><td>Name</td><td>Order</td></font></tr>
- * <tr><td>{@link org.apache.commons.math3.ode.nonstiff.EulerIntegrator Euler}</td><td>1</td></tr>
- * <tr><td>{@link org.apache.commons.math3.ode.nonstiff.MidpointIntegrator Midpoint}</td><td>2</td></tr>
- * <tr><td>{@link org.apache.commons.math3.ode.nonstiff.ClassicalRungeKuttaIntegrator Classical Runge-Kutta}</td><td>4</td></tr>
- * <tr><td>{@link org.apache.commons.math3.ode.nonstiff.GillIntegrator Gill}</td><td>4</td></tr>
- * <tr><td>{@link org.apache.commons.math3.ode.nonstiff.ThreeEighthesIntegrator 3/8}</td><td>4</td></tr>
- * <tr><td>{@link org.apache.commons.math3.ode.nonstiff.LutherIntegrator Luther}</td><td>6</td></tr>
+ * <tr><td>{@link org.apache.commons.math4.ode.nonstiff.EulerIntegrator Euler}</td><td>1</td></tr>
+ * <tr><td>{@link org.apache.commons.math4.ode.nonstiff.MidpointIntegrator Midpoint}</td><td>2</td></tr>
+ * <tr><td>{@link org.apache.commons.math4.ode.nonstiff.ClassicalRungeKuttaIntegrator Classical Runge-Kutta}</td><td>4</td></tr>
+ * <tr><td>{@link org.apache.commons.math4.ode.nonstiff.GillIntegrator Gill}</td><td>4</td></tr>
+ * <tr><td>{@link org.apache.commons.math4.ode.nonstiff.ThreeEighthesIntegrator 3/8}</td><td>4</td></tr>
+ * <tr><td>{@link org.apache.commons.math4.ode.nonstiff.LutherIntegrator Luther}</td><td>6</td></tr>
  * </table>
  * </p>
  *
  * <table border="1" align="center">
  * <tr BGCOLOR="#CCCCFF"><td colspan=3><font size="+2">Adaptive Stepsize Integrators</font></td></tr>
  * <tr BGCOLOR="#EEEEFF"><font size="+1"><td>Name</td><td>Integration Order</td><td>Error Estimation Order</td></font></tr>
- * <tr><td>{@link org.apache.commons.math3.ode.nonstiff.HighamHall54Integrator Higham and Hall}</td><td>5</td><td>4</td></tr>
- * <tr><td>{@link org.apache.commons.math3.ode.nonstiff.DormandPrince54Integrator Dormand-Prince 5(4)}</td><td>5</td><td>4</td></tr>
- * <tr><td>{@link org.apache.commons.math3.ode.nonstiff.DormandPrince853Integrator Dormand-Prince 8(5,3)}</td><td>8</td><td>5 and 3</td></tr>
- * <tr><td>{@link org.apache.commons.math3.ode.nonstiff.GraggBulirschStoerIntegrator Gragg-Bulirsch-Stoer}</td><td>variable (up to 18 by default)</td><td>variable</td></tr>
- * <tr><td>{@link org.apache.commons.math3.ode.nonstiff.AdamsBashforthIntegrator Adams-Bashforth}</td><td>variable</td><td>variable</td></tr>
- * <tr><td>{@link org.apache.commons.math3.ode.nonstiff.AdamsMoultonIntegrator Adams-Moulton}</td><td>variable</td><td>variable</td></tr>
+ * <tr><td>{@link org.apache.commons.math4.ode.nonstiff.HighamHall54Integrator Higham and Hall}</td><td>5</td><td>4</td></tr>
+ * <tr><td>{@link org.apache.commons.math4.ode.nonstiff.DormandPrince54Integrator Dormand-Prince 5(4)}</td><td>5</td><td>4</td></tr>
+ * <tr><td>{@link org.apache.commons.math4.ode.nonstiff.DormandPrince853Integrator Dormand-Prince 8(5,3)}</td><td>8</td><td>5 and 3</td></tr>
+ * <tr><td>{@link org.apache.commons.math4.ode.nonstiff.GraggBulirschStoerIntegrator Gragg-Bulirsch-Stoer}</td><td>variable (up to 18 by default)</td><td>variable</td></tr>
+ * <tr><td>{@link org.apache.commons.math4.ode.nonstiff.AdamsBashforthIntegrator Adams-Bashforth}</td><td>variable</td><td>variable</td></tr>
+ * <tr><td>{@link org.apache.commons.math4.ode.nonstiff.AdamsMoultonIntegrator Adams-Moulton}</td><td>variable</td><td>variable</td></tr>
  * </table>
  * </p>
  *
  * <p>
- * In the table above, the {@link org.apache.commons.math3.ode.nonstiff.AdamsBashforthIntegrator
- * Adams-Bashforth} and {@link org.apache.commons.math3.ode.nonstiff.AdamsMoultonIntegrator
+ * In the table above, the {@link org.apache.commons.math4.ode.nonstiff.AdamsBashforthIntegrator
+ * Adams-Bashforth} and {@link org.apache.commons.math4.ode.nonstiff.AdamsMoultonIntegrator
  * Adams-Moulton} integrators appear as variable-step ones. This is an experimental extension
  * to the classical algorithms using the Nordsieck vector representation.
  * </p>
  *
  *
  */
-package org.apache.commons.math3.ode;
+package org.apache.commons.math4.ode;

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/ode/sampling/AbstractStepInterpolator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/sampling/AbstractStepInterpolator.java b/src/main/java/org/apache/commons/math4/ode/sampling/AbstractStepInterpolator.java
index 1fbc04a..fdd0030 100644
--- a/src/main/java/org/apache/commons/math4/ode/sampling/AbstractStepInterpolator.java
+++ b/src/main/java/org/apache/commons/math4/ode/sampling/AbstractStepInterpolator.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.ode.sampling;
+package org.apache.commons.math4.ode.sampling;
 
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 
-import org.apache.commons.math3.exception.MaxCountExceededException;
-import org.apache.commons.math3.ode.EquationsMapper;
+import org.apache.commons.math4.exception.MaxCountExceededException;
+import org.apache.commons.math4.ode.EquationsMapper;
 
 /** This abstract class represents an interpolator over the last step
  * during an ODE integration.
@@ -32,8 +32,8 @@ import org.apache.commons.math3.ode.EquationsMapper;
  * retrieve the state vector at intermediate times between the
  * previous and the current grid points (dense output).</p>
  *
- * @see org.apache.commons.math3.ode.FirstOrderIntegrator
- * @see org.apache.commons.math3.ode.SecondOrderIntegrator
+ * @see org.apache.commons.math4.ode.FirstOrderIntegrator
+ * @see org.apache.commons.math4.ode.SecondOrderIntegrator
  * @see StepHandler
  *
  * @since 1.2
@@ -103,7 +103,7 @@ public abstract class AbstractStepInterpolator
    * instance in order to initialize the internal arrays. This
    * constructor is used only in order to delay the initialization in
    * some cases. As an example, the {@link
-   * org.apache.commons.math3.ode.nonstiff.EmbeddedRungeKuttaIntegrator}
+   * org.apache.commons.math4.ode.nonstiff.EmbeddedRungeKuttaIntegrator}
    * class uses the prototyping design pattern to create the step
    * interpolators by cloning an uninitialized model and latter
    * initializing the copy.

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/ode/sampling/DummyStepHandler.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/sampling/DummyStepHandler.java b/src/main/java/org/apache/commons/math4/ode/sampling/DummyStepHandler.java
index c1d4fe3..7134619 100644
--- a/src/main/java/org/apache/commons/math4/ode/sampling/DummyStepHandler.java
+++ b/src/main/java/org/apache/commons/math4/ode/sampling/DummyStepHandler.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.ode.sampling;
+package org.apache.commons.math4.ode.sampling;
 
 /**
  * This class is a step handler that does nothing.

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/ode/sampling/FixedStepHandler.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/sampling/FixedStepHandler.java b/src/main/java/org/apache/commons/math4/ode/sampling/FixedStepHandler.java
index bbe6ac5..20f29bf 100644
--- a/src/main/java/org/apache/commons/math4/ode/sampling/FixedStepHandler.java
+++ b/src/main/java/org/apache/commons/math4/ode/sampling/FixedStepHandler.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.ode.sampling;
+package org.apache.commons.math4.ode.sampling;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/ode/sampling/NordsieckStepInterpolator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/sampling/NordsieckStepInterpolator.java b/src/main/java/org/apache/commons/math4/ode/sampling/NordsieckStepInterpolator.java
index 39b05ab..1937844 100644
--- a/src/main/java/org/apache/commons/math4/ode/sampling/NordsieckStepInterpolator.java
+++ b/src/main/java/org/apache/commons/math4/ode/sampling/NordsieckStepInterpolator.java
@@ -15,17 +15,17 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.ode.sampling;
+package org.apache.commons.math4.ode.sampling;
 
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 import java.util.Arrays;
 
-import org.apache.commons.math3.exception.MaxCountExceededException;
-import org.apache.commons.math3.linear.Array2DRowRealMatrix;
-import org.apache.commons.math3.ode.EquationsMapper;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.exception.MaxCountExceededException;
+import org.apache.commons.math4.linear.Array2DRowRealMatrix;
+import org.apache.commons.math4.ode.EquationsMapper;
+import org.apache.commons.math4.util.FastMath;
 
 /**
  * This class implements an interpolator for integrators using Nordsieck representation.
@@ -33,8 +33,8 @@ import org.apache.commons.math3.util.FastMath;
  * <p>This interpolator computes dense output around the current point.
  * The interpolation equation is based on Taylor series formulas.
  *
- * @see org.apache.commons.math3.ode.nonstiff.AdamsBashforthIntegrator
- * @see org.apache.commons.math3.ode.nonstiff.AdamsMoultonIntegrator
+ * @see org.apache.commons.math4.ode.nonstiff.AdamsBashforthIntegrator
+ * @see org.apache.commons.math4.ode.nonstiff.AdamsMoultonIntegrator
  * @since 2.0
  */
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/ode/sampling/StepHandler.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/sampling/StepHandler.java b/src/main/java/org/apache/commons/math4/ode/sampling/StepHandler.java
index f4c63df..09b7b2b 100644
--- a/src/main/java/org/apache/commons/math4/ode/sampling/StepHandler.java
+++ b/src/main/java/org/apache/commons/math4/ode/sampling/StepHandler.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.ode.sampling;
+package org.apache.commons.math4.ode.sampling;
 
-import org.apache.commons.math3.exception.MaxCountExceededException;
+import org.apache.commons.math4.exception.MaxCountExceededException;
 
 
 /**
@@ -33,8 +33,8 @@ import org.apache.commons.math3.exception.MaxCountExceededException;
  * last one, store the points in an ephemeris, or forward them to
  * specialized processing or output methods.</p>
  *
- * @see org.apache.commons.math3.ode.FirstOrderIntegrator
- * @see org.apache.commons.math3.ode.SecondOrderIntegrator
+ * @see org.apache.commons.math4.ode.FirstOrderIntegrator
+ * @see org.apache.commons.math4.ode.SecondOrderIntegrator
  * @see StepInterpolator
  * @since 1.2
  */
@@ -60,7 +60,7 @@ public interface StepHandler {
      * object on each call, so if the instance wants to keep it across
      * all calls (for example to provide at the end of the integration a
      * continuous model valid throughout the integration range, as the
-     * {@link org.apache.commons.math3.ode.ContinuousOutputModel
+     * {@link org.apache.commons.math4.ode.ContinuousOutputModel
      * ContinuousOutputModel} class does), it should build a local copy
      * using the clone method of the interpolator and store this copy.
      * Keeping only a reference to the interpolator and reusing it will

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/ode/sampling/StepInterpolator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/sampling/StepInterpolator.java b/src/main/java/org/apache/commons/math4/ode/sampling/StepInterpolator.java
index 5d27bf2..c253942 100644
--- a/src/main/java/org/apache/commons/math4/ode/sampling/StepInterpolator.java
+++ b/src/main/java/org/apache/commons/math4/ode/sampling/StepInterpolator.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.ode.sampling;
+package org.apache.commons.math4.ode.sampling;
 
 import java.io.Externalizable;
 
-import org.apache.commons.math3.exception.MaxCountExceededException;
+import org.apache.commons.math4.exception.MaxCountExceededException;
 
 /** This interface represents an interpolator over the last step
  * during an ODE integration.
@@ -39,8 +39,8 @@ import org.apache.commons.math3.exception.MaxCountExceededException;
  * {@link #copy()} method.
  * </p>
  *
- * @see org.apache.commons.math3.ode.FirstOrderIntegrator
- * @see org.apache.commons.math3.ode.SecondOrderIntegrator
+ * @see org.apache.commons.math4.ode.FirstOrderIntegrator
+ * @see org.apache.commons.math4.ode.SecondOrderIntegrator
  * @see StepHandler
  * @since 1.2
  */
@@ -125,8 +125,8 @@ public interface StepInterpolator extends Externalizable {
    * to be preserved across several calls to the associated
    * {@link #setInterpolatedTime(double)} method.</p>
    * @param index index of the secondary set, as returned by {@link
-   * org.apache.commons.math3.ode.ExpandableStatefulODE#addSecondaryEquations(
-   * org.apache.commons.math3.ode.SecondaryEquations)
+   * org.apache.commons.math4.ode.ExpandableStatefulODE#addSecondaryEquations(
+   * org.apache.commons.math4.ode.SecondaryEquations)
    * ExpandableStatefulODE.addSecondaryEquations(SecondaryEquations)}
    * @return interpolated secondary state at the current interpolation date
    * @see #getInterpolatedState()
@@ -143,8 +143,8 @@ public interface StepInterpolator extends Externalizable {
    * it should not be modified and it should be copied if it needs
    * to be preserved across several calls.</p>
    * @param index index of the secondary set, as returned by {@link
-   * org.apache.commons.math3.ode.ExpandableStatefulODE#addSecondaryEquations(
-   * org.apache.commons.math3.ode.SecondaryEquations)
+   * org.apache.commons.math4.ode.ExpandableStatefulODE#addSecondaryEquations(
+   * org.apache.commons.math4.ode.SecondaryEquations)
    * ExpandableStatefulODE.addSecondaryEquations(SecondaryEquations)}
    * @return interpolated secondary derivatives at the current interpolation date
    * @see #getInterpolatedState()

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/ode/sampling/StepNormalizer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/sampling/StepNormalizer.java b/src/main/java/org/apache/commons/math4/ode/sampling/StepNormalizer.java
index 307c0d9..1766248 100644
--- a/src/main/java/org/apache/commons/math4/ode/sampling/StepNormalizer.java
+++ b/src/main/java/org/apache/commons/math4/ode/sampling/StepNormalizer.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.ode.sampling;
+package org.apache.commons.math4.ode.sampling;
 
-import org.apache.commons.math3.exception.MaxCountExceededException;
-import org.apache.commons.math3.util.FastMath;
-import org.apache.commons.math3.util.Precision;
+import org.apache.commons.math4.exception.MaxCountExceededException;
+import org.apache.commons.math4.util.FastMath;
+import org.apache.commons.math4.util.Precision;
 
 /**
  * This class wraps an object implementing {@link FixedStepHandler}

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/ode/sampling/StepNormalizerBounds.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/sampling/StepNormalizerBounds.java b/src/main/java/org/apache/commons/math4/ode/sampling/StepNormalizerBounds.java
index ff1ee2c..0a9ccfd 100644
--- a/src/main/java/org/apache/commons/math4/ode/sampling/StepNormalizerBounds.java
+++ b/src/main/java/org/apache/commons/math4/ode/sampling/StepNormalizerBounds.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.ode.sampling;
+package org.apache.commons.math4.ode.sampling;
 
 /** {@link StepNormalizer Step normalizer} bounds settings. They influence
  * whether the underlying fixed step size step handler is called for the first

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/ode/sampling/StepNormalizerMode.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/sampling/StepNormalizerMode.java b/src/main/java/org/apache/commons/math4/ode/sampling/StepNormalizerMode.java
index 0a2ddc9..c3d19b6 100644
--- a/src/main/java/org/apache/commons/math4/ode/sampling/StepNormalizerMode.java
+++ b/src/main/java/org/apache/commons/math4/ode/sampling/StepNormalizerMode.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.ode.sampling;
+package org.apache.commons.math4.ode.sampling;
 
 
 /** {@link StepNormalizer Step normalizer} modes. Determines how the step size

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/ode/sampling/package-info.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/ode/sampling/package-info.java b/src/main/java/org/apache/commons/math4/ode/sampling/package-info.java
index 29c65e0..6a05287 100644
--- a/src/main/java/org/apache/commons/math4/ode/sampling/package-info.java
+++ b/src/main/java/org/apache/commons/math4/ode/sampling/package-info.java
@@ -25,8 +25,8 @@
  * In addition to computing the evolution of the state vector at some grid points, all
  * ODE integrators also build up interpolation models of this evolution <em>inside</em> the
  * last computed step. If users are interested in these interpolators, they can register a
- * {@link org.apache.commons.math3.ode.sampling.StepHandler StepHandler} instance using the
- * {@link org.apache.commons.math3.ode.FirstOrderIntegrator#addStepHandler addStepHandler}
+ * {@link org.apache.commons.math4.ode.sampling.StepHandler StepHandler} instance using the
+ * {@link org.apache.commons.math4.ode.FirstOrderIntegrator#addStepHandler addStepHandler}
  * method which is supported by all integrators. The integrator will call this instance
  * at the end of each accepted step and provide it the interpolator. The user can do
  * whatever he wants with this interpolator, which computes both the state and its
@@ -44,17 +44,17 @@
  *
  * <p>
  * Since some integrators may use variable step size, the generic {@link
- * org.apache.commons.math3.ode.sampling.StepHandler StepHandler} interface can be called
+ * org.apache.commons.math4.ode.sampling.StepHandler StepHandler} interface can be called
  * either at regular or irregular rate. This interface allows to navigate to any location
  * within the last computed step, thanks to the provided {@link
- * org.apache.commons.math3.ode.sampling.StepInterpolator StepInterpolator} object.
+ * org.apache.commons.math4.ode.sampling.StepInterpolator StepInterpolator} object.
  * If regular output is desired (for example in order to write an ephemeris file), then
- * the simpler {@link org.apache.commons.math3.ode.sampling.FixedStepHandler FixedStepHandler}
+ * the simpler {@link org.apache.commons.math4.ode.sampling.FixedStepHandler FixedStepHandler}
  * interface can be used. Objects implementing this interface should be wrapped within a
- * {@link org.apache.commons.math3.ode.sampling.StepNormalizer StepNormalizer} instance
+ * {@link org.apache.commons.math4.ode.sampling.StepNormalizer StepNormalizer} instance
  * in order to be registered to the integrator.
  * </p>
  *
  *
  */
-package org.apache.commons.math3.ode.sampling;
+package org.apache.commons.math4.ode.sampling;

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/AbstractConvergenceChecker.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/AbstractConvergenceChecker.java b/src/main/java/org/apache/commons/math4/optim/AbstractConvergenceChecker.java
index 4885959..6e0b9ab 100644
--- a/src/main/java/org/apache/commons/math4/optim/AbstractConvergenceChecker.java
+++ b/src/main/java/org/apache/commons/math4/optim/AbstractConvergenceChecker.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.optim;
+package org.apache.commons.math4.optim;
 
 /**
  * Base class for all convergence checker implementations.

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/AbstractOptimizationProblem.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/AbstractOptimizationProblem.java b/src/main/java/org/apache/commons/math4/optim/AbstractOptimizationProblem.java
index d40c427..3432404 100644
--- a/src/main/java/org/apache/commons/math4/optim/AbstractOptimizationProblem.java
+++ b/src/main/java/org/apache/commons/math4/optim/AbstractOptimizationProblem.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.optim;
+package org.apache.commons.math4.optim;
 
-import org.apache.commons.math3.exception.TooManyEvaluationsException;
-import org.apache.commons.math3.exception.TooManyIterationsException;
-import org.apache.commons.math3.util.Incrementor;
+import org.apache.commons.math4.exception.TooManyEvaluationsException;
+import org.apache.commons.math4.exception.TooManyIterationsException;
+import org.apache.commons.math4.util.Incrementor;
 
 /**
  * Base class for implementing optimization problems. It contains the boiler-plate code

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/BaseMultiStartMultivariateOptimizer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/BaseMultiStartMultivariateOptimizer.java b/src/main/java/org/apache/commons/math4/optim/BaseMultiStartMultivariateOptimizer.java
index f98e4c3..4ceab3e 100644
--- a/src/main/java/org/apache/commons/math4/optim/BaseMultiStartMultivariateOptimizer.java
+++ b/src/main/java/org/apache/commons/math4/optim/BaseMultiStartMultivariateOptimizer.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.optim;
+package org.apache.commons.math4.optim;
 
-import org.apache.commons.math3.exception.MathIllegalStateException;
-import org.apache.commons.math3.exception.NotStrictlyPositiveException;
-import org.apache.commons.math3.exception.TooManyEvaluationsException;
-import org.apache.commons.math3.random.RandomVectorGenerator;
+import org.apache.commons.math4.exception.MathIllegalStateException;
+import org.apache.commons.math4.exception.NotStrictlyPositiveException;
+import org.apache.commons.math4.exception.TooManyEvaluationsException;
+import org.apache.commons.math4.random.RandomVectorGenerator;
 
 /**
  * Base class multi-start optimizer for a multivariate function.

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/BaseMultivariateOptimizer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/BaseMultivariateOptimizer.java b/src/main/java/org/apache/commons/math4/optim/BaseMultivariateOptimizer.java
index ec52e0a..32908b7 100644
--- a/src/main/java/org/apache/commons/math4/optim/BaseMultivariateOptimizer.java
+++ b/src/main/java/org/apache/commons/math4/optim/BaseMultivariateOptimizer.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.optim;
+package org.apache.commons.math4.optim;
 
-import org.apache.commons.math3.exception.DimensionMismatchException;
-import org.apache.commons.math3.exception.NumberIsTooSmallException;
-import org.apache.commons.math3.exception.NumberIsTooLargeException;
+import org.apache.commons.math4.exception.DimensionMismatchException;
+import org.apache.commons.math4.exception.NumberIsTooLargeException;
+import org.apache.commons.math4.exception.NumberIsTooSmallException;
 
 /**
  * Base class for implementing optimizers for multivariate functions.

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/BaseOptimizer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/BaseOptimizer.java b/src/main/java/org/apache/commons/math4/optim/BaseOptimizer.java
index e317298..00c0a3c 100644
--- a/src/main/java/org/apache/commons/math4/optim/BaseOptimizer.java
+++ b/src/main/java/org/apache/commons/math4/optim/BaseOptimizer.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.optim;
+package org.apache.commons.math4.optim;
 
-import org.apache.commons.math3.util.Incrementor;
-import org.apache.commons.math3.exception.TooManyEvaluationsException;
-import org.apache.commons.math3.exception.TooManyIterationsException;
+import org.apache.commons.math4.exception.TooManyEvaluationsException;
+import org.apache.commons.math4.exception.TooManyIterationsException;
+import org.apache.commons.math4.util.Incrementor;
 
 /**
  * Base class for implementing optimizers.

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/ConvergenceChecker.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/ConvergenceChecker.java b/src/main/java/org/apache/commons/math4/optim/ConvergenceChecker.java
index 67331e2..b61e419 100644
--- a/src/main/java/org/apache/commons/math4/optim/ConvergenceChecker.java
+++ b/src/main/java/org/apache/commons/math4/optim/ConvergenceChecker.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.optim;
+package org.apache.commons.math4.optim;
 
 /**
  * This interface specifies how to check if an optimization algorithm has
@@ -36,9 +36,9 @@ package org.apache.commons.math3.optim;
  *
  * @param <PAIR> Type of the (point, objective value) pair.
  *
- * @see org.apache.commons.math3.optim.SimplePointChecker
- * @see org.apache.commons.math3.optim.SimpleValueChecker
- * @see org.apache.commons.math3.optim.SimpleVectorValueChecker
+ * @see org.apache.commons.math4.optim.SimplePointChecker
+ * @see org.apache.commons.math4.optim.SimpleValueChecker
+ * @see org.apache.commons.math4.optim.SimpleVectorValueChecker
  *
  * @since 3.0
  */

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/InitialGuess.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/InitialGuess.java b/src/main/java/org/apache/commons/math4/optim/InitialGuess.java
index e76cc0d..d1d8fe0 100644
--- a/src/main/java/org/apache/commons/math4/optim/InitialGuess.java
+++ b/src/main/java/org/apache/commons/math4/optim/InitialGuess.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.optim;
+package org.apache.commons.math4.optim;
 
 /**
  * Starting point (first guess) of the optimization procedure.

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/MaxEval.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/MaxEval.java b/src/main/java/org/apache/commons/math4/optim/MaxEval.java
index 5d730fb..2ef4e97 100644
--- a/src/main/java/org/apache/commons/math4/optim/MaxEval.java
+++ b/src/main/java/org/apache/commons/math4/optim/MaxEval.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.optim;
+package org.apache.commons.math4.optim;
 
-import org.apache.commons.math3.exception.NotStrictlyPositiveException;
+import org.apache.commons.math4.exception.NotStrictlyPositiveException;
 
 /**
  * Maximum number of evaluations of the function to be optimized.

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/MaxIter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/MaxIter.java b/src/main/java/org/apache/commons/math4/optim/MaxIter.java
index 40c2292..315359a 100644
--- a/src/main/java/org/apache/commons/math4/optim/MaxIter.java
+++ b/src/main/java/org/apache/commons/math4/optim/MaxIter.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.optim;
+package org.apache.commons.math4.optim;
 
-import org.apache.commons.math3.exception.NotStrictlyPositiveException;
+import org.apache.commons.math4.exception.NotStrictlyPositiveException;
 
 /**
  * Maximum number of iterations performed by an (iterative) algorithm.

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/OptimizationData.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/OptimizationData.java b/src/main/java/org/apache/commons/math4/optim/OptimizationData.java
index d97687b..fbba855 100644
--- a/src/main/java/org/apache/commons/math4/optim/OptimizationData.java
+++ b/src/main/java/org/apache/commons/math4/optim/OptimizationData.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.optim;
+package org.apache.commons.math4.optim;
 
 /**
  * Marker interface.

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/OptimizationProblem.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/OptimizationProblem.java b/src/main/java/org/apache/commons/math4/optim/OptimizationProblem.java
index 24b13f5..35623b4 100644
--- a/src/main/java/org/apache/commons/math4/optim/OptimizationProblem.java
+++ b/src/main/java/org/apache/commons/math4/optim/OptimizationProblem.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.optim;
+package org.apache.commons.math4.optim;
 
-import org.apache.commons.math3.util.Incrementor;
+import org.apache.commons.math4.util.Incrementor;
 
 /**
  * Common settings for all optimization problems. Includes divergence and convergence

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/PointValuePair.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/PointValuePair.java b/src/main/java/org/apache/commons/math4/optim/PointValuePair.java
index 0f27a52..b3e01a0 100644
--- a/src/main/java/org/apache/commons/math4/optim/PointValuePair.java
+++ b/src/main/java/org/apache/commons/math4/optim/PointValuePair.java
@@ -14,17 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.optim;
+package org.apache.commons.math4.optim;
 
 import java.io.Serializable;
-import org.apache.commons.math3.util.Pair;
+
+import org.apache.commons.math4.util.Pair;
 
 /**
  * This class holds a point and the value of an objective function at
  * that point.
  *
  * @see PointVectorValuePair
- * @see org.apache.commons.math3.analysis.MultivariateFunction
+ * @see org.apache.commons.math4.analysis.MultivariateFunction
  * @since 3.0
  */
 public class PointValuePair extends Pair<double[], Double> implements Serializable {

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/PointVectorValuePair.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/PointVectorValuePair.java b/src/main/java/org/apache/commons/math4/optim/PointVectorValuePair.java
index 0dd70f4..62741d7 100644
--- a/src/main/java/org/apache/commons/math4/optim/PointVectorValuePair.java
+++ b/src/main/java/org/apache/commons/math4/optim/PointVectorValuePair.java
@@ -14,17 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.optim;
+package org.apache.commons.math4.optim;
 
 import java.io.Serializable;
-import org.apache.commons.math3.util.Pair;
+
+import org.apache.commons.math4.util.Pair;
 
 /**
  * This class holds a point and the vectorial value of an objective function at
  * that point.
  *
  * @see PointValuePair
- * @see org.apache.commons.math3.analysis.MultivariateVectorFunction
+ * @see org.apache.commons.math4.analysis.MultivariateVectorFunction
  * @since 3.0
  */
 public class PointVectorValuePair extends Pair<double[], double[]> implements Serializable {

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/SimpleBounds.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/SimpleBounds.java b/src/main/java/org/apache/commons/math4/optim/SimpleBounds.java
index 4099c1c..c166341 100644
--- a/src/main/java/org/apache/commons/math4/optim/SimpleBounds.java
+++ b/src/main/java/org/apache/commons/math4/optim/SimpleBounds.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.optim;
+package org.apache.commons.math4.optim;
 
 import java.util.Arrays;
 

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/SimplePointChecker.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/SimplePointChecker.java b/src/main/java/org/apache/commons/math4/optim/SimplePointChecker.java
index 0998bc4..e1463c9 100644
--- a/src/main/java/org/apache/commons/math4/optim/SimplePointChecker.java
+++ b/src/main/java/org/apache/commons/math4/optim/SimplePointChecker.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.optim;
+package org.apache.commons.math4.optim;
 
-import org.apache.commons.math3.util.FastMath;
-import org.apache.commons.math3.util.Pair;
-import org.apache.commons.math3.exception.NotStrictlyPositiveException;
+import org.apache.commons.math4.exception.NotStrictlyPositiveException;
+import org.apache.commons.math4.util.FastMath;
+import org.apache.commons.math4.util.Pair;
 
 /**
  * Simple implementation of the {@link ConvergenceChecker} interface using

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/SimpleValueChecker.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/SimpleValueChecker.java b/src/main/java/org/apache/commons/math4/optim/SimpleValueChecker.java
index 2b5fc14..a62c8ca 100644
--- a/src/main/java/org/apache/commons/math4/optim/SimpleValueChecker.java
+++ b/src/main/java/org/apache/commons/math4/optim/SimpleValueChecker.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.optim;
+package org.apache.commons.math4.optim;
 
-import org.apache.commons.math3.util.FastMath;
-import org.apache.commons.math3.exception.NotStrictlyPositiveException;
+import org.apache.commons.math4.exception.NotStrictlyPositiveException;
+import org.apache.commons.math4.util.FastMath;
 
 /**
  * Simple implementation of the {@link ConvergenceChecker} interface using

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/SimpleVectorValueChecker.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/SimpleVectorValueChecker.java b/src/main/java/org/apache/commons/math4/optim/SimpleVectorValueChecker.java
index 8d9beba..460fb38 100644
--- a/src/main/java/org/apache/commons/math4/optim/SimpleVectorValueChecker.java
+++ b/src/main/java/org/apache/commons/math4/optim/SimpleVectorValueChecker.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.optim;
+package org.apache.commons.math4.optim;
 
-import org.apache.commons.math3.util.FastMath;
-import org.apache.commons.math3.exception.NotStrictlyPositiveException;
+import org.apache.commons.math4.exception.NotStrictlyPositiveException;
+import org.apache.commons.math4.util.FastMath;
 
 /**
  * Simple implementation of the {@link ConvergenceChecker} interface using

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/linear/LinearConstraint.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/linear/LinearConstraint.java b/src/main/java/org/apache/commons/math4/optim/linear/LinearConstraint.java
index ae5a28a..63c0b83 100644
--- a/src/main/java/org/apache/commons/math4/optim/linear/LinearConstraint.java
+++ b/src/main/java/org/apache/commons/math4/optim/linear/LinearConstraint.java
@@ -14,15 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.optim.linear;
+package org.apache.commons.math4.optim.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;
 
 /**
  * A linear constraint for a linear optimization problem.

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/linear/LinearConstraintSet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/linear/LinearConstraintSet.java b/src/main/java/org/apache/commons/math4/optim/linear/LinearConstraintSet.java
index d54bd61..7a31698 100644
--- a/src/main/java/org/apache/commons/math4/optim/linear/LinearConstraintSet.java
+++ b/src/main/java/org/apache/commons/math4/optim/linear/LinearConstraintSet.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.optim.linear;
+package org.apache.commons.math4.optim.linear;
 
 import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.Collection;
 import java.util.Collections;
 
-import org.apache.commons.math3.optim.OptimizationData;
+import org.apache.commons.math4.optim.OptimizationData;
 
 /**
  * Class that represents a set of {@link LinearConstraint linear constraints}.

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/linear/LinearObjectiveFunction.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/linear/LinearObjectiveFunction.java b/src/main/java/org/apache/commons/math4/optim/linear/LinearObjectiveFunction.java
index dc4f429..7b63872 100644
--- a/src/main/java/org/apache/commons/math4/optim/linear/LinearObjectiveFunction.java
+++ b/src/main/java/org/apache/commons/math4/optim/linear/LinearObjectiveFunction.java
@@ -14,17 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.optim.linear;
+package org.apache.commons.math4.optim.linear;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
-import org.apache.commons.math3.analysis.MultivariateFunction;
-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.math3.optim.OptimizationData;
+
+import org.apache.commons.math4.analysis.MultivariateFunction;
+import org.apache.commons.math4.linear.ArrayRealVector;
+import org.apache.commons.math4.linear.MatrixUtils;
+import org.apache.commons.math4.linear.RealVector;
+import org.apache.commons.math4.optim.OptimizationData;
 
 /**
  * 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/optim/linear/LinearOptimizer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/linear/LinearOptimizer.java b/src/main/java/org/apache/commons/math4/optim/linear/LinearOptimizer.java
index 7e80687..f923cca 100644
--- a/src/main/java/org/apache/commons/math4/optim/linear/LinearOptimizer.java
+++ b/src/main/java/org/apache/commons/math4/optim/linear/LinearOptimizer.java
@@ -14,14 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.optim.linear;
+package org.apache.commons.math4.optim.linear;
 
 import java.util.Collection;
 import java.util.Collections;
-import org.apache.commons.math3.exception.TooManyIterationsException;
-import org.apache.commons.math3.optim.OptimizationData;
-import org.apache.commons.math3.optim.PointValuePair;
-import org.apache.commons.math3.optim.nonlinear.scalar.MultivariateOptimizer;
+
+import org.apache.commons.math4.exception.TooManyIterationsException;
+import org.apache.commons.math4.optim.OptimizationData;
+import org.apache.commons.math4.optim.PointValuePair;
+import org.apache.commons.math4.optim.nonlinear.scalar.MultivariateOptimizer;
 
 /**
  * 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/optim/linear/NoFeasibleSolutionException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/linear/NoFeasibleSolutionException.java b/src/main/java/org/apache/commons/math4/optim/linear/NoFeasibleSolutionException.java
index cbe8321..c10729a 100644
--- a/src/main/java/org/apache/commons/math4/optim/linear/NoFeasibleSolutionException.java
+++ b/src/main/java/org/apache/commons/math4/optim/linear/NoFeasibleSolutionException.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.optim.linear;
+package org.apache.commons.math4.optim.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/optim/linear/NonNegativeConstraint.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/linear/NonNegativeConstraint.java b/src/main/java/org/apache/commons/math4/optim/linear/NonNegativeConstraint.java
index dafcb63..6bd4631 100644
--- a/src/main/java/org/apache/commons/math4/optim/linear/NonNegativeConstraint.java
+++ b/src/main/java/org/apache/commons/math4/optim/linear/NonNegativeConstraint.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.optim.linear;
+package org.apache.commons.math4.optim.linear;
 
-import org.apache.commons.math3.optim.OptimizationData;
+import org.apache.commons.math4.optim.OptimizationData;
 
 /**
  * A constraint for a linear optimization problem indicating whether all

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/linear/PivotSelectionRule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/linear/PivotSelectionRule.java b/src/main/java/org/apache/commons/math4/optim/linear/PivotSelectionRule.java
index a2a2765..07c55ca 100644
--- a/src/main/java/org/apache/commons/math4/optim/linear/PivotSelectionRule.java
+++ b/src/main/java/org/apache/commons/math4/optim/linear/PivotSelectionRule.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.optim.linear;
+package org.apache.commons.math4.optim.linear;
 
-import org.apache.commons.math3.optim.OptimizationData;
+import org.apache.commons.math4.optim.OptimizationData;
 
 /**
  * Pivot selection rule to the use for a Simplex solver.

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/linear/Relationship.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/linear/Relationship.java b/src/main/java/org/apache/commons/math4/optim/linear/Relationship.java
index 58612c7..f46a649 100644
--- a/src/main/java/org/apache/commons/math4/optim/linear/Relationship.java
+++ b/src/main/java/org/apache/commons/math4/optim/linear/Relationship.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.optim.linear;
+package org.apache.commons.math4.optim.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/optim/linear/SimplexSolver.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/linear/SimplexSolver.java b/src/main/java/org/apache/commons/math4/optim/linear/SimplexSolver.java
index e95b657..d4b4259 100644
--- a/src/main/java/org/apache/commons/math4/optim/linear/SimplexSolver.java
+++ b/src/main/java/org/apache/commons/math4/optim/linear/SimplexSolver.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.optim.linear;
+package org.apache.commons.math4.optim.linear;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.math3.exception.TooManyIterationsException;
-import org.apache.commons.math3.optim.OptimizationData;
-import org.apache.commons.math3.optim.PointValuePair;
-import org.apache.commons.math3.util.FastMath;
-import org.apache.commons.math3.util.Precision;
+import org.apache.commons.math4.exception.TooManyIterationsException;
+import org.apache.commons.math4.optim.OptimizationData;
+import org.apache.commons.math4.optim.PointValuePair;
+import org.apache.commons.math4.util.FastMath;
+import org.apache.commons.math4.util.Precision;
 
 /**
  * Solves a linear problem using the "Two-Phase Simplex" method.
@@ -33,12 +33,12 @@ import org.apache.commons.math3.util.Precision;
  * <ul>
  *   <li>objective function: {@link LinearObjectiveFunction} - mandatory</li>
  *   <li>linear constraints {@link LinearConstraintSet} - mandatory</li>
- *   <li>type of optimization: {@link org.apache.commons.math3.optim.nonlinear.scalar.GoalType GoalType}
- *    - optional, default: {@link org.apache.commons.math3.optim.nonlinear.scalar.GoalType#MINIMIZE MINIMIZE}</li>
+ *   <li>type of optimization: {@link org.apache.commons.math4.optim.nonlinear.scalar.GoalType GoalType}
+ *    - optional, default: {@link org.apache.commons.math4.optim.nonlinear.scalar.GoalType#MINIMIZE MINIMIZE}</li>
  *   <li>whether to allow negative values as solution: {@link NonNegativeConstraint} - optional, default: true</li>
  *   <li>pivot selection rule: {@link PivotSelectionRule} - optional, default {@link PivotSelectionRule#DANTZIG}</li>
  *   <li>callback for the best solution: {@link SolutionCallback} - optional</li>
- *   <li>maximum number of iterations: {@link org.apache.commons.math3.optim.MaxIter} - optional, default: {@link Integer#MAX_VALUE}</li>
+ *   <li>maximum number of iterations: {@link org.apache.commons.math4.optim.MaxIter} - optional, default: {@link Integer#MAX_VALUE}</li>
  * </ul>
  * <p>
  * <b>Note:</b> Depending on the problem definition, the default convergence criteria

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/linear/SimplexTableau.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/linear/SimplexTableau.java b/src/main/java/org/apache/commons/math4/optim/linear/SimplexTableau.java
index 57ffcd9..e869a74 100644
--- a/src/main/java/org/apache/commons/math4/optim/linear/SimplexTableau.java
+++ b/src/main/java/org/apache/commons/math4/optim/linear/SimplexTableau.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.optim.linear;
+package org.apache.commons.math4.optim.linear;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -28,12 +28,12 @@ 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.RealVector;
-import org.apache.commons.math3.optim.nonlinear.scalar.GoalType;
-import org.apache.commons.math3.optim.PointValuePair;
-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.RealVector;
+import org.apache.commons.math4.optim.PointValuePair;
+import org.apache.commons.math4.optim.nonlinear.scalar.GoalType;
+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/optim/linear/SolutionCallback.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/linear/SolutionCallback.java b/src/main/java/org/apache/commons/math4/optim/linear/SolutionCallback.java
index 3536da0..b84af27 100644
--- a/src/main/java/org/apache/commons/math4/optim/linear/SolutionCallback.java
+++ b/src/main/java/org/apache/commons/math4/optim/linear/SolutionCallback.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.optim.linear;
+package org.apache.commons.math4.optim.linear;
 
-import org.apache.commons.math3.optim.OptimizationData;
-import org.apache.commons.math3.optim.PointValuePair;
+import org.apache.commons.math4.optim.OptimizationData;
+import org.apache.commons.math4.optim.PointValuePair;
 
 /**
  * A constraint for a linear optimization problem indicating whether all

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/linear/UnboundedSolutionException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/linear/UnboundedSolutionException.java b/src/main/java/org/apache/commons/math4/optim/linear/UnboundedSolutionException.java
index 546cdd2..b68e0fe 100644
--- a/src/main/java/org/apache/commons/math4/optim/linear/UnboundedSolutionException.java
+++ b/src/main/java/org/apache/commons/math4/optim/linear/UnboundedSolutionException.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.optim.linear;
+package org.apache.commons.math4.optim.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/optim/linear/package-info.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/linear/package-info.java b/src/main/java/org/apache/commons/math4/optim/linear/package-info.java
index b900589..d0eea18 100644
--- a/src/main/java/org/apache/commons/math4/optim/linear/package-info.java
+++ b/src/main/java/org/apache/commons/math4/optim/linear/package-info.java
@@ -18,4 +18,4 @@
 /**
  * Optimization algorithms for linear constrained problems.
  */
-package org.apache.commons.math3.optim.linear;
+package org.apache.commons.math4.optim.linear;

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/GoalType.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/GoalType.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/GoalType.java
index c0457b4..3adea01 100644
--- a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/GoalType.java
+++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/GoalType.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.optim.nonlinear.scalar;
+package org.apache.commons.math4.optim.nonlinear.scalar;
 
-import org.apache.commons.math3.optim.OptimizationData;
+import org.apache.commons.math4.optim.OptimizationData;
 
 /**
  * Goal type for an optimization problem (minimization or maximization of

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/GradientMultivariateOptimizer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/GradientMultivariateOptimizer.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/GradientMultivariateOptimizer.java
index 38a8bf7..d6a9fcf 100644
--- a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/GradientMultivariateOptimizer.java
+++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/GradientMultivariateOptimizer.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.math3.optim.nonlinear.scalar;
+package org.apache.commons.math4.optim.nonlinear.scalar;
 
-import org.apache.commons.math3.analysis.MultivariateVectorFunction;
-import org.apache.commons.math3.optim.ConvergenceChecker;
-import org.apache.commons.math3.optim.OptimizationData;
-import org.apache.commons.math3.optim.PointValuePair;
-import org.apache.commons.math3.exception.TooManyEvaluationsException;
+import org.apache.commons.math4.analysis.MultivariateVectorFunction;
+import org.apache.commons.math4.exception.TooManyEvaluationsException;
+import org.apache.commons.math4.optim.ConvergenceChecker;
+import org.apache.commons.math4.optim.OptimizationData;
+import org.apache.commons.math4.optim.PointValuePair;
 
 /**
  * Base class for implementing optimizers for multivariate scalar

http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/LeastSquaresConverter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/LeastSquaresConverter.java b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/LeastSquaresConverter.java
index 4be1f12..fc59f2c 100644
--- a/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/LeastSquaresConverter.java
+++ b/src/main/java/org/apache/commons/math4/optim/nonlinear/scalar/LeastSquaresConverter.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math3.optim.nonlinear.scalar;
+package org.apache.commons.math4.optim.nonlinear.scalar;
 
-import org.apache.commons.math3.analysis.MultivariateFunction;
-import org.apache.commons.math3.analysis.MultivariateVectorFunction;
-import org.apache.commons.math3.exception.DimensionMismatchException;
-import org.apache.commons.math3.linear.RealMatrix;
+import org.apache.commons.math4.analysis.MultivariateFunction;
+import org.apache.commons.math4.analysis.MultivariateVectorFunction;
+import org.apache.commons.math4.exception.DimensionMismatchException;
+import org.apache.commons.math4.linear.RealMatrix;
 
 /**
  * This class converts


Mime
View raw message