You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by tn...@apache.org on 2015/02/16 23:40:27 UTC
[57/82] [math] Update for next development iteration: commons-math4
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ml/distance/ChebyshevDistanceTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ml/distance/ChebyshevDistanceTest.java b/src/test/java/org/apache/commons/math4/ml/distance/ChebyshevDistanceTest.java
index 41a3887..2132a92 100644
--- a/src/test/java/org/apache/commons/math4/ml/distance/ChebyshevDistanceTest.java
+++ b/src/test/java/org/apache/commons/math4/ml/distance/ChebyshevDistanceTest.java
@@ -14,8 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.math3.ml.distance;
+package org.apache.commons.math4.ml.distance;
+import org.apache.commons.math4.ml.distance.ChebyshevDistance;
+import org.apache.commons.math4.ml.distance.DistanceMeasure;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ml/distance/EarthMoversDistanceTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ml/distance/EarthMoversDistanceTest.java b/src/test/java/org/apache/commons/math4/ml/distance/EarthMoversDistanceTest.java
index 43d3b6f..8755e72 100644
--- a/src/test/java/org/apache/commons/math4/ml/distance/EarthMoversDistanceTest.java
+++ b/src/test/java/org/apache/commons/math4/ml/distance/EarthMoversDistanceTest.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.math3.ml.distance;
+package org.apache.commons.math4.ml.distance;
import org.junit.Assert;
-
-import org.apache.commons.math3.ml.distance.DistanceMeasure;
+import org.apache.commons.math4.ml.distance.DistanceMeasure;
+import org.apache.commons.math4.ml.distance.EarthMoversDistance;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ml/distance/EuclideanDistanceTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ml/distance/EuclideanDistanceTest.java b/src/test/java/org/apache/commons/math4/ml/distance/EuclideanDistanceTest.java
index 13ec4c5..b55d367 100644
--- a/src/test/java/org/apache/commons/math4/ml/distance/EuclideanDistanceTest.java
+++ b/src/test/java/org/apache/commons/math4/ml/distance/EuclideanDistanceTest.java
@@ -14,11 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.math3.ml.distance;
+package org.apache.commons.math4.ml.distance;
import org.junit.Assert;
import org.junit.Test;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.ml.distance.DistanceMeasure;
+import org.apache.commons.math4.ml.distance.EuclideanDistance;
+import org.apache.commons.math4.util.FastMath;
/**
* Tests for {@link EuclideanDistance} class.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ml/distance/ManhattanDistanceTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ml/distance/ManhattanDistanceTest.java b/src/test/java/org/apache/commons/math4/ml/distance/ManhattanDistanceTest.java
index 2a74c77..cf610f3 100644
--- a/src/test/java/org/apache/commons/math4/ml/distance/ManhattanDistanceTest.java
+++ b/src/test/java/org/apache/commons/math4/ml/distance/ManhattanDistanceTest.java
@@ -14,8 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.math3.ml.distance;
+package org.apache.commons.math4.ml.distance;
+import org.apache.commons.math4.ml.distance.DistanceMeasure;
+import org.apache.commons.math4.ml.distance.ManhattanDistance;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ml/neuralnet/MapUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ml/neuralnet/MapUtilsTest.java b/src/test/java/org/apache/commons/math4/ml/neuralnet/MapUtilsTest.java
index 72bf09c..d395ba7 100644
--- a/src/test/java/org/apache/commons/math4/ml/neuralnet/MapUtilsTest.java
+++ b/src/test/java/org/apache/commons/math4/ml/neuralnet/MapUtilsTest.java
@@ -15,13 +15,19 @@
* limitations under the License.
*/
-package org.apache.commons.math3.ml.neuralnet;
+package org.apache.commons.math4.ml.neuralnet;
import java.util.Set;
import java.util.HashSet;
-import org.apache.commons.math3.ml.distance.DistanceMeasure;
-import org.apache.commons.math3.ml.distance.EuclideanDistance;
-import org.apache.commons.math3.ml.neuralnet.oned.NeuronString;
+
+import org.apache.commons.math4.ml.distance.DistanceMeasure;
+import org.apache.commons.math4.ml.distance.EuclideanDistance;
+import org.apache.commons.math4.ml.neuralnet.FeatureInitializer;
+import org.apache.commons.math4.ml.neuralnet.FeatureInitializerFactory;
+import org.apache.commons.math4.ml.neuralnet.MapUtils;
+import org.apache.commons.math4.ml.neuralnet.Network;
+import org.apache.commons.math4.ml.neuralnet.Neuron;
+import org.apache.commons.math4.ml.neuralnet.oned.NeuronString;
import org.junit.Test;
import org.junit.Assert;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ml/neuralnet/NetworkTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ml/neuralnet/NetworkTest.java b/src/test/java/org/apache/commons/math4/ml/neuralnet/NetworkTest.java
index 7f2bec9..4f81eb6 100644
--- a/src/test/java/org/apache/commons/math4/ml/neuralnet/NetworkTest.java
+++ b/src/test/java/org/apache/commons/math4/ml/neuralnet/NetworkTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.math3.ml.neuralnet;
+package org.apache.commons.math4.ml.neuralnet;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -25,7 +25,12 @@ import java.io.ObjectOutputStream;
import java.util.Collection;
import java.util.NoSuchElementException;
-import org.apache.commons.math3.ml.neuralnet.twod.NeuronSquareMesh2D;
+import org.apache.commons.math4.ml.neuralnet.FeatureInitializer;
+import org.apache.commons.math4.ml.neuralnet.FeatureInitializerFactory;
+import org.apache.commons.math4.ml.neuralnet.Network;
+import org.apache.commons.math4.ml.neuralnet.Neuron;
+import org.apache.commons.math4.ml.neuralnet.SquareNeighbourhood;
+import org.apache.commons.math4.ml.neuralnet.twod.NeuronSquareMesh2D;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ml/neuralnet/NeuronTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ml/neuralnet/NeuronTest.java b/src/test/java/org/apache/commons/math4/ml/neuralnet/NeuronTest.java
index b03f07d..92ec4bf 100644
--- a/src/test/java/org/apache/commons/math4/ml/neuralnet/NeuronTest.java
+++ b/src/test/java/org/apache/commons/math4/ml/neuralnet/NeuronTest.java
@@ -15,13 +15,15 @@
* limitations under the License.
*/
-package org.apache.commons.math3.ml.neuralnet;
+package org.apache.commons.math4.ml.neuralnet;
import java.io.ByteArrayOutputStream;
import java.io.ByteArrayInputStream;
import java.io.ObjectOutputStream;
import java.io.ObjectInputStream;
import java.io.IOException;
+
+import org.apache.commons.math4.ml.neuralnet.Neuron;
import org.junit.Test;
import org.junit.Assert;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ml/neuralnet/OffsetFeatureInitializer.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ml/neuralnet/OffsetFeatureInitializer.java b/src/test/java/org/apache/commons/math4/ml/neuralnet/OffsetFeatureInitializer.java
index 9c800cc..cc19143 100644
--- a/src/test/java/org/apache/commons/math4/ml/neuralnet/OffsetFeatureInitializer.java
+++ b/src/test/java/org/apache/commons/math4/ml/neuralnet/OffsetFeatureInitializer.java
@@ -15,7 +15,9 @@
* limitations under the License.
*/
-package org.apache.commons.math3.ml.neuralnet;
+package org.apache.commons.math4.ml.neuralnet;
+
+import org.apache.commons.math4.ml.neuralnet.FeatureInitializer;
/**
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ml/neuralnet/oned/NeuronStringTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ml/neuralnet/oned/NeuronStringTest.java b/src/test/java/org/apache/commons/math4/ml/neuralnet/oned/NeuronStringTest.java
index 782cbda..e7654fd 100644
--- a/src/test/java/org/apache/commons/math4/ml/neuralnet/oned/NeuronStringTest.java
+++ b/src/test/java/org/apache/commons/math4/ml/neuralnet/oned/NeuronStringTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.math3.ml.neuralnet.oned;
+package org.apache.commons.math4.ml.neuralnet.oned;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -25,10 +25,11 @@ import java.io.ObjectOutputStream;
import java.util.ArrayList;
import java.util.Collection;
-import org.apache.commons.math3.ml.neuralnet.FeatureInitializer;
-import org.apache.commons.math3.ml.neuralnet.FeatureInitializerFactory;
-import org.apache.commons.math3.ml.neuralnet.Network;
-import org.apache.commons.math3.ml.neuralnet.Neuron;
+import org.apache.commons.math4.ml.neuralnet.FeatureInitializer;
+import org.apache.commons.math4.ml.neuralnet.FeatureInitializerFactory;
+import org.apache.commons.math4.ml.neuralnet.Network;
+import org.apache.commons.math4.ml.neuralnet.Neuron;
+import org.apache.commons.math4.ml.neuralnet.oned.NeuronString;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/KohonenTrainingTaskTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/KohonenTrainingTaskTest.java b/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/KohonenTrainingTaskTest.java
index d3f5628..f729f48 100644
--- a/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/KohonenTrainingTaskTest.java
+++ b/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/KohonenTrainingTaskTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.math3.ml.neuralnet.sofm;
+package org.apache.commons.math4.ml.neuralnet.sofm;
import java.io.PrintWriter;
import java.util.ArrayList;
@@ -28,9 +28,10 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
-import org.apache.commons.math3.Retry;
-import org.apache.commons.math3.RetryRunner;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.Retry;
+import org.apache.commons.math4.RetryRunner;
+import org.apache.commons.math4.ml.neuralnet.sofm.KohonenTrainingTask;
+import org.apache.commons.math4.util.FastMath;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/KohonenUpdateActionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/KohonenUpdateActionTest.java b/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/KohonenUpdateActionTest.java
index 334a5a8..9051dd6 100644
--- a/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/KohonenUpdateActionTest.java
+++ b/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/KohonenUpdateActionTest.java
@@ -15,18 +15,23 @@
* limitations under the License.
*/
-package org.apache.commons.math3.ml.neuralnet.sofm;
+package org.apache.commons.math4.ml.neuralnet.sofm;
-import org.apache.commons.math3.ml.neuralnet.Neuron;
-import org.apache.commons.math3.ml.neuralnet.Network;
-import org.apache.commons.math3.ml.neuralnet.MapUtils;
-import org.apache.commons.math3.ml.neuralnet.UpdateAction;
-import org.apache.commons.math3.ml.neuralnet.OffsetFeatureInitializer;
-import org.apache.commons.math3.ml.neuralnet.FeatureInitializer;
-import org.apache.commons.math3.ml.neuralnet.FeatureInitializerFactory;
-import org.apache.commons.math3.ml.distance.DistanceMeasure;
-import org.apache.commons.math3.ml.distance.EuclideanDistance;
-import org.apache.commons.math3.ml.neuralnet.oned.NeuronString;
+import org.apache.commons.math4.ml.distance.DistanceMeasure;
+import org.apache.commons.math4.ml.distance.EuclideanDistance;
+import org.apache.commons.math4.ml.neuralnet.FeatureInitializer;
+import org.apache.commons.math4.ml.neuralnet.FeatureInitializerFactory;
+import org.apache.commons.math4.ml.neuralnet.MapUtils;
+import org.apache.commons.math4.ml.neuralnet.Network;
+import org.apache.commons.math4.ml.neuralnet.Neuron;
+import org.apache.commons.math4.ml.neuralnet.OffsetFeatureInitializer;
+import org.apache.commons.math4.ml.neuralnet.UpdateAction;
+import org.apache.commons.math4.ml.neuralnet.oned.NeuronString;
+import org.apache.commons.math4.ml.neuralnet.sofm.KohonenUpdateAction;
+import org.apache.commons.math4.ml.neuralnet.sofm.LearningFactorFunction;
+import org.apache.commons.math4.ml.neuralnet.sofm.LearningFactorFunctionFactory;
+import org.apache.commons.math4.ml.neuralnet.sofm.NeighbourhoodSizeFunction;
+import org.apache.commons.math4.ml.neuralnet.sofm.NeighbourhoodSizeFunctionFactory;
import org.junit.Test;
import org.junit.Assert;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/LearningFactorFunctionFactoryTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/LearningFactorFunctionFactoryTest.java b/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/LearningFactorFunctionFactoryTest.java
index 93df5ad..59eb78d 100644
--- a/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/LearningFactorFunctionFactoryTest.java
+++ b/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/LearningFactorFunctionFactoryTest.java
@@ -15,11 +15,13 @@
* limitations under the License.
*/
-package org.apache.commons.math3.ml.neuralnet.sofm;
+package org.apache.commons.math4.ml.neuralnet.sofm;
-import org.apache.commons.math3.exception.NotStrictlyPositiveException;
-import org.apache.commons.math3.exception.OutOfRangeException;
-import org.apache.commons.math3.exception.NumberIsTooLargeException;
+import org.apache.commons.math4.exception.NotStrictlyPositiveException;
+import org.apache.commons.math4.exception.NumberIsTooLargeException;
+import org.apache.commons.math4.exception.OutOfRangeException;
+import org.apache.commons.math4.ml.neuralnet.sofm.LearningFactorFunction;
+import org.apache.commons.math4.ml.neuralnet.sofm.LearningFactorFunctionFactory;
import org.junit.Test;
import org.junit.Assert;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/NeighbourhoodSizeFunctionFactoryTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/NeighbourhoodSizeFunctionFactoryTest.java b/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/NeighbourhoodSizeFunctionFactoryTest.java
index 4570fc8..72ffed0 100644
--- a/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/NeighbourhoodSizeFunctionFactoryTest.java
+++ b/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/NeighbourhoodSizeFunctionFactoryTest.java
@@ -15,10 +15,12 @@
* limitations under the License.
*/
-package org.apache.commons.math3.ml.neuralnet.sofm;
+package org.apache.commons.math4.ml.neuralnet.sofm;
-import org.apache.commons.math3.exception.NotStrictlyPositiveException;
-import org.apache.commons.math3.exception.NumberIsTooLargeException;
+import org.apache.commons.math4.exception.NotStrictlyPositiveException;
+import org.apache.commons.math4.exception.NumberIsTooLargeException;
+import org.apache.commons.math4.ml.neuralnet.sofm.NeighbourhoodSizeFunction;
+import org.apache.commons.math4.ml.neuralnet.sofm.NeighbourhoodSizeFunctionFactory;
import org.junit.Test;
import org.junit.Assert;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/TravellingSalesmanSolver.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/TravellingSalesmanSolver.java b/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/TravellingSalesmanSolver.java
index 369ea33..6fe215d 100644
--- a/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/TravellingSalesmanSolver.java
+++ b/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/TravellingSalesmanSolver.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.math3.ml.neuralnet.sofm;
+package org.apache.commons.math4.ml.neuralnet.sofm;
import java.util.List;
import java.util.ArrayList;
@@ -23,23 +23,30 @@ import java.util.Set;
import java.util.HashSet;
import java.util.Collection;
import java.util.Iterator;
-import org.apache.commons.math3.ml.neuralnet.Neuron;
-import org.apache.commons.math3.ml.neuralnet.Network;
-import org.apache.commons.math3.ml.neuralnet.FeatureInitializer;
-import org.apache.commons.math3.ml.neuralnet.FeatureInitializerFactory;
-import org.apache.commons.math3.ml.distance.DistanceMeasure;
-import org.apache.commons.math3.ml.distance.EuclideanDistance;
-import org.apache.commons.math3.ml.neuralnet.oned.NeuronString;
-import org.apache.commons.math3.random.RandomGenerator;
-import org.apache.commons.math3.random.Well44497b;
-import org.apache.commons.math3.exception.MathUnsupportedOperationException;
-import org.apache.commons.math3.util.FastMath;
-import org.apache.commons.math3.analysis.UnivariateFunction;
-import org.apache.commons.math3.analysis.FunctionUtils;
-import org.apache.commons.math3.analysis.function.HarmonicOscillator;
-import org.apache.commons.math3.analysis.function.Constant;
-import org.apache.commons.math3.distribution.RealDistribution;
-import org.apache.commons.math3.distribution.UniformRealDistribution;
+
+import org.apache.commons.math4.analysis.FunctionUtils;
+import org.apache.commons.math4.analysis.UnivariateFunction;
+import org.apache.commons.math4.analysis.function.Constant;
+import org.apache.commons.math4.analysis.function.HarmonicOscillator;
+import org.apache.commons.math4.distribution.RealDistribution;
+import org.apache.commons.math4.distribution.UniformRealDistribution;
+import org.apache.commons.math4.exception.MathUnsupportedOperationException;
+import org.apache.commons.math4.ml.distance.DistanceMeasure;
+import org.apache.commons.math4.ml.distance.EuclideanDistance;
+import org.apache.commons.math4.ml.neuralnet.FeatureInitializer;
+import org.apache.commons.math4.ml.neuralnet.FeatureInitializerFactory;
+import org.apache.commons.math4.ml.neuralnet.Network;
+import org.apache.commons.math4.ml.neuralnet.Neuron;
+import org.apache.commons.math4.ml.neuralnet.oned.NeuronString;
+import org.apache.commons.math4.ml.neuralnet.sofm.KohonenTrainingTask;
+import org.apache.commons.math4.ml.neuralnet.sofm.KohonenUpdateAction;
+import org.apache.commons.math4.ml.neuralnet.sofm.LearningFactorFunction;
+import org.apache.commons.math4.ml.neuralnet.sofm.LearningFactorFunctionFactory;
+import org.apache.commons.math4.ml.neuralnet.sofm.NeighbourhoodSizeFunction;
+import org.apache.commons.math4.ml.neuralnet.sofm.NeighbourhoodSizeFunctionFactory;
+import org.apache.commons.math4.random.RandomGenerator;
+import org.apache.commons.math4.random.Well44497b;
+import org.apache.commons.math4.util.FastMath;
/**
* Solves the "Travelling Salesman's Problem" (i.e. trying to find the
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/util/ExponentialDecayFunctionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/util/ExponentialDecayFunctionTest.java b/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/util/ExponentialDecayFunctionTest.java
index ddbdcfc..4c4831e 100644
--- a/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/util/ExponentialDecayFunctionTest.java
+++ b/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/util/ExponentialDecayFunctionTest.java
@@ -15,10 +15,11 @@
* limitations under the License.
*/
-package org.apache.commons.math3.ml.neuralnet.sofm.util;
+package org.apache.commons.math4.ml.neuralnet.sofm.util;
-import org.apache.commons.math3.exception.NotStrictlyPositiveException;
-import org.apache.commons.math3.exception.NumberIsTooLargeException;
+import org.apache.commons.math4.exception.NotStrictlyPositiveException;
+import org.apache.commons.math4.exception.NumberIsTooLargeException;
+import org.apache.commons.math4.ml.neuralnet.sofm.util.ExponentialDecayFunction;
import org.junit.Test;
import org.junit.Assert;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/util/QuasiSigmoidDecayFunctionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/util/QuasiSigmoidDecayFunctionTest.java b/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/util/QuasiSigmoidDecayFunctionTest.java
index 49c9cda..e2d8193 100644
--- a/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/util/QuasiSigmoidDecayFunctionTest.java
+++ b/src/test/java/org/apache/commons/math4/ml/neuralnet/sofm/util/QuasiSigmoidDecayFunctionTest.java
@@ -15,10 +15,11 @@
* limitations under the License.
*/
-package org.apache.commons.math3.ml.neuralnet.sofm.util;
+package org.apache.commons.math4.ml.neuralnet.sofm.util;
-import org.apache.commons.math3.exception.NotStrictlyPositiveException;
-import org.apache.commons.math3.exception.NumberIsTooLargeException;
+import org.apache.commons.math4.exception.NotStrictlyPositiveException;
+import org.apache.commons.math4.exception.NumberIsTooLargeException;
+import org.apache.commons.math4.ml.neuralnet.sofm.util.QuasiSigmoidDecayFunction;
import org.junit.Test;
import org.junit.Assert;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ml/neuralnet/twod/NeuronSquareMesh2DTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ml/neuralnet/twod/NeuronSquareMesh2DTest.java b/src/test/java/org/apache/commons/math4/ml/neuralnet/twod/NeuronSquareMesh2DTest.java
index 9d5f21c..f5395b4 100644
--- a/src/test/java/org/apache/commons/math4/ml/neuralnet/twod/NeuronSquareMesh2DTest.java
+++ b/src/test/java/org/apache/commons/math4/ml/neuralnet/twod/NeuronSquareMesh2DTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.math3.ml.neuralnet.twod;
+package org.apache.commons.math4.ml.neuralnet.twod;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -25,12 +25,13 @@ import java.io.ObjectOutputStream;
import java.util.Collection;
import java.util.HashSet;
-import org.apache.commons.math3.exception.NumberIsTooSmallException;
-import org.apache.commons.math3.ml.neuralnet.FeatureInitializer;
-import org.apache.commons.math3.ml.neuralnet.FeatureInitializerFactory;
-import org.apache.commons.math3.ml.neuralnet.Network;
-import org.apache.commons.math3.ml.neuralnet.Neuron;
-import org.apache.commons.math3.ml.neuralnet.SquareNeighbourhood;
+import org.apache.commons.math4.exception.NumberIsTooSmallException;
+import org.apache.commons.math4.ml.neuralnet.FeatureInitializer;
+import org.apache.commons.math4.ml.neuralnet.FeatureInitializerFactory;
+import org.apache.commons.math4.ml.neuralnet.Network;
+import org.apache.commons.math4.ml.neuralnet.Neuron;
+import org.apache.commons.math4.ml.neuralnet.SquareNeighbourhood;
+import org.apache.commons.math4.ml.neuralnet.twod.NeuronSquareMesh2D;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ode/ContinuousOutputModelTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/ContinuousOutputModelTest.java b/src/test/java/org/apache/commons/math4/ode/ContinuousOutputModelTest.java
index 3a098ba..b08ef1f 100644
--- a/src/test/java/org/apache/commons/math4/ode/ContinuousOutputModelTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/ContinuousOutputModelTest.java
@@ -15,20 +15,23 @@
* limitations under the License.
*/
-package org.apache.commons.math3.ode;
+package org.apache.commons.math4.ode;
import java.util.Random;
-import org.apache.commons.math3.exception.DimensionMismatchException;
-import org.apache.commons.math3.exception.MathIllegalArgumentException;
-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.nonstiff.DormandPrince54Integrator;
-import org.apache.commons.math3.ode.nonstiff.DormandPrince853Integrator;
-import org.apache.commons.math3.ode.sampling.DummyStepInterpolator;
-import org.apache.commons.math3.ode.sampling.StepInterpolator;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.exception.DimensionMismatchException;
+import org.apache.commons.math4.exception.MathIllegalArgumentException;
+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.ContinuousOutputModel;
+import org.apache.commons.math4.ode.FirstOrderDifferentialEquations;
+import org.apache.commons.math4.ode.FirstOrderIntegrator;
+import org.apache.commons.math4.ode.nonstiff.DormandPrince54Integrator;
+import org.apache.commons.math4.ode.nonstiff.DormandPrince853Integrator;
+import org.apache.commons.math4.ode.sampling.DummyStepInterpolator;
+import org.apache.commons.math4.ode.sampling.StepInterpolator;
+import org.apache.commons.math4.util.FastMath;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ode/FirstOrderConverterTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/FirstOrderConverterTest.java b/src/test/java/org/apache/commons/math4/ode/FirstOrderConverterTest.java
index 445888f..0ea620e 100644
--- a/src/test/java/org/apache/commons/math4/ode/FirstOrderConverterTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/FirstOrderConverterTest.java
@@ -15,14 +15,16 @@
* limitations under the License.
*/
-package org.apache.commons.math3.ode;
-
-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.nonstiff.ClassicalRungeKuttaIntegrator;
-import org.apache.commons.math3.util.FastMath;
+package org.apache.commons.math4.ode;
+
+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.FirstOrderConverter;
+import org.apache.commons.math4.ode.SecondOrderDifferentialEquations;
+import org.apache.commons.math4.ode.nonstiff.ClassicalRungeKuttaIntegrator;
+import org.apache.commons.math4.util.FastMath;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ode/JacobianMatricesTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/JacobianMatricesTest.java b/src/test/java/org/apache/commons/math4/ode/JacobianMatricesTest.java
index 2c45656..b50fe7a 100644
--- a/src/test/java/org/apache/commons/math4/ode/JacobianMatricesTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/JacobianMatricesTest.java
@@ -15,16 +15,26 @@
* limitations under the License.
*/
-package org.apache.commons.math3.ode;
-
-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.JacobianMatrices.MismatchedEquations;
-import org.apache.commons.math3.ode.nonstiff.DormandPrince54Integrator;
-import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
-import org.apache.commons.math3.util.FastMath;
+package org.apache.commons.math4.ode;
+
+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.AbstractParameterizable;
+import org.apache.commons.math4.ode.ExpandableStatefulODE;
+import org.apache.commons.math4.ode.FirstOrderDifferentialEquations;
+import org.apache.commons.math4.ode.FirstOrderIntegrator;
+import org.apache.commons.math4.ode.JacobianMatrices;
+import org.apache.commons.math4.ode.MainStateJacobianProvider;
+import org.apache.commons.math4.ode.ParameterJacobianProvider;
+import org.apache.commons.math4.ode.ParameterizedODE;
+import org.apache.commons.math4.ode.UnknownParameterException;
+import org.apache.commons.math4.ode.JacobianMatrices.MismatchedEquations;
+import org.apache.commons.math4.ode.nonstiff.DormandPrince54Integrator;
+import org.apache.commons.math4.stat.descriptive.SummaryStatistics;
+import org.apache.commons.math4.util.FastMath;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ode/TestProblem1.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/TestProblem1.java b/src/test/java/org/apache/commons/math4/ode/TestProblem1.java
index 06d19fd..ad21ba4 100644
--- a/src/test/java/org/apache/commons/math4/ode/TestProblem1.java
+++ b/src/test/java/org/apache/commons/math4/ode/TestProblem1.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.commons.math3.ode;
+package org.apache.commons.math4.ode;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.util.FastMath;
/**
* This class is used in the junit tests for the ODE integrators.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ode/TestProblem2.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/TestProblem2.java b/src/test/java/org/apache/commons/math4/ode/TestProblem2.java
index 64befe2..19dda5a 100644
--- a/src/test/java/org/apache/commons/math4/ode/TestProblem2.java
+++ b/src/test/java/org/apache/commons/math4/ode/TestProblem2.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.commons.math3.ode;
+package org.apache.commons.math4.ode;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.util.FastMath;
/**
* This class is used in the junit tests for the ODE integrators.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ode/TestProblem3.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/TestProblem3.java b/src/test/java/org/apache/commons/math4/ode/TestProblem3.java
index c74bb66..0986cfd 100644
--- a/src/test/java/org/apache/commons/math4/ode/TestProblem3.java
+++ b/src/test/java/org/apache/commons/math4/ode/TestProblem3.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.commons.math3.ode;
+package org.apache.commons.math4.ode;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.util.FastMath;
/**
* This class is used in the junit tests for the ODE integrators.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ode/TestProblem4.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/TestProblem4.java b/src/test/java/org/apache/commons/math4/ode/TestProblem4.java
index e5c6219..cfb8873 100644
--- a/src/test/java/org/apache/commons/math4/ode/TestProblem4.java
+++ b/src/test/java/org/apache/commons/math4/ode/TestProblem4.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.commons.math3.ode;
+package org.apache.commons.math4.ode;
-import org.apache.commons.math3.ode.events.EventHandler;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.ode.events.EventHandler;
+import org.apache.commons.math4.util.FastMath;
/**
* This class is used in the junit tests for the ODE integrators.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ode/TestProblem5.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/TestProblem5.java b/src/test/java/org/apache/commons/math4/ode/TestProblem5.java
index 4c3c44a..615bfca 100644
--- a/src/test/java/org/apache/commons/math4/ode/TestProblem5.java
+++ b/src/test/java/org/apache/commons/math4/ode/TestProblem5.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.math3.ode;
+package org.apache.commons.math4.ode;
/**
* This class is used in the junit tests for the ODE integrators.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ode/TestProblem6.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/TestProblem6.java b/src/test/java/org/apache/commons/math4/ode/TestProblem6.java
index 8530499..1e5d525 100644
--- a/src/test/java/org/apache/commons/math4/ode/TestProblem6.java
+++ b/src/test/java/org/apache/commons/math4/ode/TestProblem6.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.math3.ode;
+package org.apache.commons.math4.ode;
/**
* This class is used in the junit tests for the ODE integrators.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ode/TestProblemAbstract.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/TestProblemAbstract.java b/src/test/java/org/apache/commons/math4/ode/TestProblemAbstract.java
index bfb4ecb..a99613e 100644
--- a/src/test/java/org/apache/commons/math4/ode/TestProblemAbstract.java
+++ b/src/test/java/org/apache/commons/math4/ode/TestProblemAbstract.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.commons.math3.ode;
+package org.apache.commons.math4.ode;
-import org.apache.commons.math3.ode.FirstOrderDifferentialEquations;
-import org.apache.commons.math3.ode.events.EventHandler;
+import org.apache.commons.math4.ode.FirstOrderDifferentialEquations;
+import org.apache.commons.math4.ode.events.EventHandler;
/**
* This class is used as the base class of the problems that are
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ode/TestProblemFactory.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/TestProblemFactory.java b/src/test/java/org/apache/commons/math4/ode/TestProblemFactory.java
index 706e140..8d504e3 100644
--- a/src/test/java/org/apache/commons/math4/ode/TestProblemFactory.java
+++ b/src/test/java/org/apache/commons/math4/ode/TestProblemFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.math3.ode;
+package org.apache.commons.math4.ode;
/**
* This class is used in the junit tests for the ODE integrators.
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ode/TestProblemHandler.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/TestProblemHandler.java b/src/test/java/org/apache/commons/math4/ode/TestProblemHandler.java
index 40ff404..9aadd2c 100644
--- a/src/test/java/org/apache/commons/math4/ode/TestProblemHandler.java
+++ b/src/test/java/org/apache/commons/math4/ode/TestProblemHandler.java
@@ -15,12 +15,13 @@
* limitations under the License.
*/
-package org.apache.commons.math3.ode;
+package org.apache.commons.math4.ode;
-import org.apache.commons.math3.exception.MaxCountExceededException;
-import org.apache.commons.math3.ode.sampling.StepHandler;
-import org.apache.commons.math3.ode.sampling.StepInterpolator;
-import org.apache.commons.math3.util.FastMath;
+import org.apache.commons.math4.exception.MaxCountExceededException;
+import org.apache.commons.math4.ode.ODEIntegrator;
+import org.apache.commons.math4.ode.sampling.StepHandler;
+import org.apache.commons.math4.ode.sampling.StepInterpolator;
+import org.apache.commons.math4.util.FastMath;
/**
* This class is used to handle steps for the test problems
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ode/events/EventFilterTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/events/EventFilterTest.java b/src/test/java/org/apache/commons/math4/ode/events/EventFilterTest.java
index 155c46a..c8ea085 100644
--- a/src/test/java/org/apache/commons/math4/ode/events/EventFilterTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/events/EventFilterTest.java
@@ -14,19 +14,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.math3.ode.events;
-
-import org.apache.commons.math3.analysis.solvers.BracketingNthOrderBrentSolver;
-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.FirstOrderDifferentialEquations;
-import org.apache.commons.math3.ode.FirstOrderIntegrator;
-import org.apache.commons.math3.ode.nonstiff.DormandPrince853Integrator;
-import org.apache.commons.math3.random.RandomGenerator;
-import org.apache.commons.math3.random.Well19937a;
-import org.apache.commons.math3.util.FastMath;
+package org.apache.commons.math4.ode.events;
+
+import org.apache.commons.math4.analysis.solvers.BracketingNthOrderBrentSolver;
+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.FirstOrderDifferentialEquations;
+import org.apache.commons.math4.ode.FirstOrderIntegrator;
+import org.apache.commons.math4.ode.events.EventFilter;
+import org.apache.commons.math4.ode.events.EventHandler;
+import org.apache.commons.math4.ode.events.FilterType;
+import org.apache.commons.math4.ode.nonstiff.DormandPrince853Integrator;
+import org.apache.commons.math4.random.RandomGenerator;
+import org.apache.commons.math4.random.Well19937a;
+import org.apache.commons.math4.util.FastMath;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ode/events/EventStateTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/events/EventStateTest.java b/src/test/java/org/apache/commons/math4/ode/events/EventStateTest.java
index 6468fdc..b2041dc 100644
--- a/src/test/java/org/apache/commons/math4/ode/events/EventStateTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/events/EventStateTest.java
@@ -15,20 +15,22 @@
* limitations under the License.
*/
-package org.apache.commons.math3.ode.events;
-
-
-import org.apache.commons.math3.analysis.solvers.BrentSolver;
-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.FirstOrderDifferentialEquations;
-import org.apache.commons.math3.ode.SecondaryEquations;
-import org.apache.commons.math3.ode.nonstiff.DormandPrince853Integrator;
-import org.apache.commons.math3.ode.sampling.AbstractStepInterpolator;
-import org.apache.commons.math3.ode.sampling.DummyStepInterpolator;
+package org.apache.commons.math4.ode.events;
+
+
+import org.apache.commons.math4.analysis.solvers.BrentSolver;
+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.FirstOrderDifferentialEquations;
+import org.apache.commons.math4.ode.SecondaryEquations;
+import org.apache.commons.math4.ode.events.EventHandler;
+import org.apache.commons.math4.ode.events.EventState;
+import org.apache.commons.math4.ode.nonstiff.DormandPrince853Integrator;
+import org.apache.commons.math4.ode.sampling.AbstractStepInterpolator;
+import org.apache.commons.math4.ode.sampling.DummyStepInterpolator;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ode/events/OverlappingEventsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/events/OverlappingEventsTest.java b/src/test/java/org/apache/commons/math4/ode/events/OverlappingEventsTest.java
index 081788d..e489e4e 100644
--- a/src/test/java/org/apache/commons/math4/ode/events/OverlappingEventsTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/events/OverlappingEventsTest.java
@@ -14,20 +14,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.math3.ode.events;
+package org.apache.commons.math4.ode.events;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.math3.analysis.solvers.BaseSecantSolver;
-import org.apache.commons.math3.analysis.solvers.PegasusSolver;
-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.FirstOrderDifferentialEquations;
-import org.apache.commons.math3.ode.FirstOrderIntegrator;
-import org.apache.commons.math3.ode.nonstiff.DormandPrince853Integrator;
+import org.apache.commons.math4.analysis.solvers.BaseSecantSolver;
+import org.apache.commons.math4.analysis.solvers.PegasusSolver;
+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.FirstOrderDifferentialEquations;
+import org.apache.commons.math4.ode.FirstOrderIntegrator;
+import org.apache.commons.math4.ode.events.EventHandler;
+import org.apache.commons.math4.ode.nonstiff.DormandPrince853Integrator;
import org.junit.Assert;
import org.junit.Test;
@@ -48,7 +49,7 @@ public class OverlappingEventsTest implements FirstOrderDifferentialEquations {
/** Test for events that occur at the exact same time, but due to numerical
* calculations occur very close together instead. Uses event type 0. See
- * {@link org.apache.commons.math3.ode.events.EventHandler#g(double, double[])
+ * {@link org.apache.commons.math4.ode.events.EventHandler#g(double, double[])
* EventHandler.g(double, double[])}.
*/
@Test
@@ -60,7 +61,7 @@ public class OverlappingEventsTest implements FirstOrderDifferentialEquations {
/** Test for events that occur at the exact same time, but due to numerical
* calculations occur very close together instead. Uses event type 1. See
- * {@link org.apache.commons.math3.ode.events.EventHandler#g(double, double[])
+ * {@link org.apache.commons.math4.ode.events.EventHandler#g(double, double[])
* EventHandler.g(double, double[])}.
*/
@Test
@@ -73,7 +74,7 @@ public class OverlappingEventsTest implements FirstOrderDifferentialEquations {
/** Test for events that occur at the exact same time, but due to numerical
* calculations occur very close together instead.
* @param eventType the type of events to use. See
- * {@link org.apache.commons.math3.ode.events.EventHandler#g(double, double[])
+ * {@link org.apache.commons.math4.ode.events.EventHandler#g(double, double[])
* EventHandler.g(double, double[])}.
*/
public void test(int eventType)
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ode/events/ReappearingEventTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/events/ReappearingEventTest.java b/src/test/java/org/apache/commons/math4/ode/events/ReappearingEventTest.java
index eae9247..b53e760 100644
--- a/src/test/java/org/apache/commons/math4/ode/events/ReappearingEventTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/events/ReappearingEventTest.java
@@ -14,22 +14,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.math3.ode.events;
+package org.apache.commons.math4.ode.events;
import org.junit.Assert;
import java.util.Arrays;
-import org.apache.commons.math3.analysis.solvers.PegasusSolver;
-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.FirstOrderDifferentialEquations;
-import org.apache.commons.math3.ode.FirstOrderIntegrator;
-import org.apache.commons.math3.ode.events.EventHandler;
-import org.apache.commons.math3.ode.nonstiff.DormandPrince853Integrator;
-import org.apache.commons.math3.ode.nonstiff.GraggBulirschStoerIntegrator;
+import org.apache.commons.math4.analysis.solvers.PegasusSolver;
+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.FirstOrderDifferentialEquations;
+import org.apache.commons.math4.ode.FirstOrderIntegrator;
+import org.apache.commons.math4.ode.events.EventHandler;
+import org.apache.commons.math4.ode.nonstiff.DormandPrince853Integrator;
+import org.apache.commons.math4.ode.nonstiff.GraggBulirschStoerIntegrator;
import org.junit.Test;
public class ReappearingEventTest {
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsBashforthIntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsBashforthIntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsBashforthIntegratorTest.java
index f5a96a6..64ca4cc 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsBashforthIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsBashforthIntegratorTest.java
@@ -15,19 +15,20 @@
* 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.FirstOrderIntegrator;
-import org.apache.commons.math3.ode.TestProblem1;
-import org.apache.commons.math3.ode.TestProblem5;
-import org.apache.commons.math3.ode.TestProblem6;
-import org.apache.commons.math3.ode.TestProblemHandler;
-import org.apache.commons.math3.util.FastMath;
+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.FirstOrderIntegrator;
+import org.apache.commons.math4.ode.TestProblem1;
+import org.apache.commons.math4.ode.TestProblem5;
+import org.apache.commons.math4.ode.TestProblem6;
+import org.apache.commons.math4.ode.TestProblemHandler;
+import org.apache.commons.math4.ode.nonstiff.AdamsBashforthIntegrator;
+import org.apache.commons.math4.util.FastMath;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonIntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonIntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonIntegratorTest.java
index 712eba4..8c24d7b 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/AdamsMoultonIntegratorTest.java
@@ -15,19 +15,20 @@
* 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.FirstOrderIntegrator;
-import org.apache.commons.math3.ode.TestProblem1;
-import org.apache.commons.math3.ode.TestProblem5;
-import org.apache.commons.math3.ode.TestProblem6;
-import org.apache.commons.math3.ode.TestProblemHandler;
-import org.apache.commons.math3.util.FastMath;
+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.FirstOrderIntegrator;
+import org.apache.commons.math4.ode.TestProblem1;
+import org.apache.commons.math4.ode.TestProblem5;
+import org.apache.commons.math4.ode.TestProblem6;
+import org.apache.commons.math4.ode.TestProblemHandler;
+import org.apache.commons.math4.ode.nonstiff.AdamsMoultonIntegrator;
+import org.apache.commons.math4.util.FastMath;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ode/nonstiff/ClassicalRungeKuttaIntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/ClassicalRungeKuttaIntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/ClassicalRungeKuttaIntegratorTest.java
index c527680..6a3b51b 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/ClassicalRungeKuttaIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/ClassicalRungeKuttaIntegratorTest.java
@@ -15,25 +15,27 @@
* 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.FirstOrderDifferentialEquations;
-import org.apache.commons.math3.ode.FirstOrderIntegrator;
-import org.apache.commons.math3.ode.TestProblem1;
-import org.apache.commons.math3.ode.TestProblem3;
-import org.apache.commons.math3.ode.TestProblem5;
-import org.apache.commons.math3.ode.TestProblemAbstract;
-import org.apache.commons.math3.ode.TestProblemFactory;
-import org.apache.commons.math3.ode.TestProblemHandler;
-import org.apache.commons.math3.ode.events.EventHandler;
-import org.apache.commons.math3.ode.sampling.StepHandler;
-import org.apache.commons.math3.ode.sampling.StepInterpolator;
-import org.apache.commons.math3.util.FastMath;
+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.FirstOrderDifferentialEquations;
+import org.apache.commons.math4.ode.FirstOrderIntegrator;
+import org.apache.commons.math4.ode.TestProblem1;
+import org.apache.commons.math4.ode.TestProblem3;
+import org.apache.commons.math4.ode.TestProblem5;
+import org.apache.commons.math4.ode.TestProblemAbstract;
+import org.apache.commons.math4.ode.TestProblemFactory;
+import org.apache.commons.math4.ode.TestProblemHandler;
+import org.apache.commons.math4.ode.events.EventHandler;
+import org.apache.commons.math4.ode.nonstiff.ClassicalRungeKuttaIntegrator;
+import org.apache.commons.math4.ode.nonstiff.RungeKuttaIntegrator;
+import org.apache.commons.math4.ode.sampling.StepHandler;
+import org.apache.commons.math4.ode.sampling.StepInterpolator;
+import org.apache.commons.math4.util.FastMath;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ode/nonstiff/ClassicalRungeKuttaStepInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/ClassicalRungeKuttaStepInterpolatorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/ClassicalRungeKuttaStepInterpolatorTest.java
index 6f618cd..0413da8 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/ClassicalRungeKuttaStepInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/ClassicalRungeKuttaStepInterpolatorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.math3.ode.nonstiff;
+package org.apache.commons.math4.ode.nonstiff;
import java.io.ByteArrayInputStream;
@@ -25,14 +25,15 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.Random;
-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.ContinuousOutputModel;
-import org.apache.commons.math3.ode.TestProblem3;
-import org.apache.commons.math3.ode.sampling.StepHandler;
-import org.apache.commons.math3.ode.sampling.StepInterpolatorTestUtils;
+import org.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.ContinuousOutputModel;
+import org.apache.commons.math4.ode.TestProblem3;
+import org.apache.commons.math4.ode.nonstiff.ClassicalRungeKuttaIntegrator;
+import org.apache.commons.math4.ode.sampling.StepHandler;
+import org.apache.commons.math4.ode.sampling.StepInterpolatorTestUtils;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54IntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54IntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54IntegratorTest.java
index 31be298..b4909c9 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54IntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54IntegratorTest.java
@@ -15,23 +15,26 @@
* 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.FirstOrderIntegrator;
-import org.apache.commons.math3.ode.TestProblem1;
-import org.apache.commons.math3.ode.TestProblem3;
-import org.apache.commons.math3.ode.TestProblem4;
-import org.apache.commons.math3.ode.TestProblem5;
-import org.apache.commons.math3.ode.TestProblemAbstract;
-import org.apache.commons.math3.ode.TestProblemHandler;
-import org.apache.commons.math3.ode.events.EventHandler;
-import org.apache.commons.math3.ode.sampling.StepHandler;
-import org.apache.commons.math3.ode.sampling.StepInterpolator;
-import org.apache.commons.math3.util.FastMath;
+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.FirstOrderIntegrator;
+import org.apache.commons.math4.ode.TestProblem1;
+import org.apache.commons.math4.ode.TestProblem3;
+import org.apache.commons.math4.ode.TestProblem4;
+import org.apache.commons.math4.ode.TestProblem5;
+import org.apache.commons.math4.ode.TestProblemAbstract;
+import org.apache.commons.math4.ode.TestProblemHandler;
+import org.apache.commons.math4.ode.events.EventHandler;
+import org.apache.commons.math4.ode.nonstiff.AdaptiveStepsizeIntegrator;
+import org.apache.commons.math4.ode.nonstiff.DormandPrince54Integrator;
+import org.apache.commons.math4.ode.nonstiff.EmbeddedRungeKuttaIntegrator;
+import org.apache.commons.math4.ode.sampling.StepHandler;
+import org.apache.commons.math4.ode.sampling.StepInterpolator;
+import org.apache.commons.math4.util.FastMath;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54StepInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54StepInterpolatorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54StepInterpolatorTest.java
index 2b3b8e7..60c0905 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54StepInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince54StepInterpolatorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.math3.ode.nonstiff;
+package org.apache.commons.math4.ode.nonstiff;
import java.io.ByteArrayInputStream;
@@ -25,16 +25,17 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.Random;
-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.ContinuousOutputModel;
-import org.apache.commons.math3.ode.TestProblem3;
-import org.apache.commons.math3.ode.sampling.StepHandler;
-import org.apache.commons.math3.ode.sampling.StepInterpolator;
-import org.apache.commons.math3.ode.sampling.StepInterpolatorTestUtils;
-import org.apache.commons.math3.util.FastMath;
+import org.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.ContinuousOutputModel;
+import org.apache.commons.math4.ode.TestProblem3;
+import org.apache.commons.math4.ode.nonstiff.DormandPrince54Integrator;
+import org.apache.commons.math4.ode.sampling.StepHandler;
+import org.apache.commons.math4.ode.sampling.StepInterpolator;
+import org.apache.commons.math4.ode.sampling.StepInterpolatorTestUtils;
+import org.apache.commons.math4.util.FastMath;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853IntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853IntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853IntegratorTest.java
index fcba93c..33c721c 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853IntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853IntegratorTest.java
@@ -15,23 +15,25 @@
* 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.FirstOrderDifferentialEquations;
-import org.apache.commons.math3.ode.FirstOrderIntegrator;
-import org.apache.commons.math3.ode.TestProblem1;
-import org.apache.commons.math3.ode.TestProblem3;
-import org.apache.commons.math3.ode.TestProblem4;
-import org.apache.commons.math3.ode.TestProblem5;
-import org.apache.commons.math3.ode.TestProblemHandler;
-import org.apache.commons.math3.ode.events.EventHandler;
-import org.apache.commons.math3.ode.sampling.StepHandler;
-import org.apache.commons.math3.ode.sampling.StepInterpolator;
-import org.apache.commons.math3.util.FastMath;
+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.FirstOrderDifferentialEquations;
+import org.apache.commons.math4.ode.FirstOrderIntegrator;
+import org.apache.commons.math4.ode.TestProblem1;
+import org.apache.commons.math4.ode.TestProblem3;
+import org.apache.commons.math4.ode.TestProblem4;
+import org.apache.commons.math4.ode.TestProblem5;
+import org.apache.commons.math4.ode.TestProblemHandler;
+import org.apache.commons.math4.ode.events.EventHandler;
+import org.apache.commons.math4.ode.nonstiff.AdaptiveStepsizeIntegrator;
+import org.apache.commons.math4.ode.nonstiff.DormandPrince853Integrator;
+import org.apache.commons.math4.ode.sampling.StepHandler;
+import org.apache.commons.math4.ode.sampling.StepInterpolator;
+import org.apache.commons.math4.util.FastMath;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853StepInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853StepInterpolatorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853StepInterpolatorTest.java
index e6b8fd5..a1e1788 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853StepInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/DormandPrince853StepInterpolatorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.math3.ode.nonstiff;
+package org.apache.commons.math4.ode.nonstiff;
import java.io.ByteArrayInputStream;
@@ -25,16 +25,17 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.Random;
-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.ContinuousOutputModel;
-import org.apache.commons.math3.ode.TestProblem3;
-import org.apache.commons.math3.ode.sampling.StepHandler;
-import org.apache.commons.math3.ode.sampling.StepInterpolator;
-import org.apache.commons.math3.ode.sampling.StepInterpolatorTestUtils;
-import org.apache.commons.math3.util.FastMath;
+import org.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.ContinuousOutputModel;
+import org.apache.commons.math4.ode.TestProblem3;
+import org.apache.commons.math4.ode.nonstiff.DormandPrince853Integrator;
+import org.apache.commons.math4.ode.sampling.StepHandler;
+import org.apache.commons.math4.ode.sampling.StepInterpolator;
+import org.apache.commons.math4.ode.sampling.StepInterpolatorTestUtils;
+import org.apache.commons.math4.util.FastMath;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ode/nonstiff/EulerIntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/EulerIntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/EulerIntegratorTest.java
index eaef55b..f5952e0 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/EulerIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/EulerIntegratorTest.java
@@ -15,24 +15,25 @@
* 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.FirstOrderDifferentialEquations;
-import org.apache.commons.math3.ode.FirstOrderIntegrator;
-import org.apache.commons.math3.ode.TestProblem1;
-import org.apache.commons.math3.ode.TestProblem5;
-import org.apache.commons.math3.ode.TestProblemAbstract;
-import org.apache.commons.math3.ode.TestProblemFactory;
-import org.apache.commons.math3.ode.TestProblemHandler;
-import org.apache.commons.math3.ode.events.EventHandler;
-import org.apache.commons.math3.ode.sampling.StepHandler;
-import org.apache.commons.math3.ode.sampling.StepInterpolator;
-import org.apache.commons.math3.util.FastMath;
+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.FirstOrderDifferentialEquations;
+import org.apache.commons.math4.ode.FirstOrderIntegrator;
+import org.apache.commons.math4.ode.TestProblem1;
+import org.apache.commons.math4.ode.TestProblem5;
+import org.apache.commons.math4.ode.TestProblemAbstract;
+import org.apache.commons.math4.ode.TestProblemFactory;
+import org.apache.commons.math4.ode.TestProblemHandler;
+import org.apache.commons.math4.ode.events.EventHandler;
+import org.apache.commons.math4.ode.nonstiff.EulerIntegrator;
+import org.apache.commons.math4.ode.sampling.StepHandler;
+import org.apache.commons.math4.ode.sampling.StepInterpolator;
+import org.apache.commons.math4.util.FastMath;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ode/nonstiff/EulerStepInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/EulerStepInterpolatorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/EulerStepInterpolatorTest.java
index de99547..15094da 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/EulerStepInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/EulerStepInterpolatorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.math3.ode.nonstiff;
+package org.apache.commons.math4.ode.nonstiff;
import java.io.ByteArrayInputStream;
@@ -25,17 +25,21 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.Random;
-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.ContinuousOutputModel;
-import org.apache.commons.math3.ode.EquationsMapper;
-import org.apache.commons.math3.ode.TestProblem1;
-import org.apache.commons.math3.ode.TestProblem3;
-import org.apache.commons.math3.ode.sampling.StepHandler;
-import org.apache.commons.math3.ode.sampling.StepInterpolatorTestUtils;
-import org.apache.commons.math3.util.FastMath;
+import org.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.ContinuousOutputModel;
+import org.apache.commons.math4.ode.EquationsMapper;
+import org.apache.commons.math4.ode.TestProblem1;
+import org.apache.commons.math4.ode.TestProblem3;
+import org.apache.commons.math4.ode.nonstiff.EulerIntegrator;
+import org.apache.commons.math4.ode.nonstiff.EulerStepInterpolator;
+import org.apache.commons.math4.ode.nonstiff.RungeKuttaIntegrator;
+import org.apache.commons.math4.ode.nonstiff.RungeKuttaStepInterpolator;
+import org.apache.commons.math4.ode.sampling.StepHandler;
+import org.apache.commons.math4.ode.sampling.StepInterpolatorTestUtils;
+import org.apache.commons.math4.util.FastMath;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ode/nonstiff/GillIntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/GillIntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/GillIntegratorTest.java
index e165e20..1265aef 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/GillIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/GillIntegratorTest.java
@@ -15,25 +15,26 @@
* 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.FirstOrderDifferentialEquations;
-import org.apache.commons.math3.ode.FirstOrderIntegrator;
-import org.apache.commons.math3.ode.TestProblem1;
-import org.apache.commons.math3.ode.TestProblem3;
-import org.apache.commons.math3.ode.TestProblem5;
-import org.apache.commons.math3.ode.TestProblemAbstract;
-import org.apache.commons.math3.ode.TestProblemFactory;
-import org.apache.commons.math3.ode.TestProblemHandler;
-import org.apache.commons.math3.ode.events.EventHandler;
-import org.apache.commons.math3.ode.sampling.StepHandler;
-import org.apache.commons.math3.ode.sampling.StepInterpolator;
-import org.apache.commons.math3.util.FastMath;
+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.FirstOrderDifferentialEquations;
+import org.apache.commons.math4.ode.FirstOrderIntegrator;
+import org.apache.commons.math4.ode.TestProblem1;
+import org.apache.commons.math4.ode.TestProblem3;
+import org.apache.commons.math4.ode.TestProblem5;
+import org.apache.commons.math4.ode.TestProblemAbstract;
+import org.apache.commons.math4.ode.TestProblemFactory;
+import org.apache.commons.math4.ode.TestProblemHandler;
+import org.apache.commons.math4.ode.events.EventHandler;
+import org.apache.commons.math4.ode.nonstiff.GillIntegrator;
+import org.apache.commons.math4.ode.sampling.StepHandler;
+import org.apache.commons.math4.ode.sampling.StepInterpolator;
+import org.apache.commons.math4.util.FastMath;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ode/nonstiff/GillStepInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/GillStepInterpolatorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/GillStepInterpolatorTest.java
index d441ac0..4fc1dff 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/GillStepInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/GillStepInterpolatorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.math3.ode.nonstiff;
+package org.apache.commons.math4.ode.nonstiff;
import java.io.ByteArrayInputStream;
@@ -25,14 +25,15 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.Random;
-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.ContinuousOutputModel;
-import org.apache.commons.math3.ode.TestProblem3;
-import org.apache.commons.math3.ode.sampling.StepHandler;
-import org.apache.commons.math3.ode.sampling.StepInterpolatorTestUtils;
+import org.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.ContinuousOutputModel;
+import org.apache.commons.math4.ode.TestProblem3;
+import org.apache.commons.math4.ode.nonstiff.GillIntegrator;
+import org.apache.commons.math4.ode.sampling.StepHandler;
+import org.apache.commons.math4.ode.sampling.StepInterpolatorTestUtils;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ode/nonstiff/GraggBulirschStoerIntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/GraggBulirschStoerIntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/GraggBulirschStoerIntegratorTest.java
index 6d24676..ad39b78 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/GraggBulirschStoerIntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/GraggBulirschStoerIntegratorTest.java
@@ -15,24 +15,26 @@
* 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.FirstOrderDifferentialEquations;
-import org.apache.commons.math3.ode.FirstOrderIntegrator;
-import org.apache.commons.math3.ode.TestProblem1;
-import org.apache.commons.math3.ode.TestProblem3;
-import org.apache.commons.math3.ode.TestProblem4;
-import org.apache.commons.math3.ode.TestProblem5;
-import org.apache.commons.math3.ode.TestProblemAbstract;
-import org.apache.commons.math3.ode.TestProblemHandler;
-import org.apache.commons.math3.ode.events.EventHandler;
-import org.apache.commons.math3.ode.sampling.StepHandler;
-import org.apache.commons.math3.ode.sampling.StepInterpolator;
-import org.apache.commons.math3.util.FastMath;
+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.FirstOrderDifferentialEquations;
+import org.apache.commons.math4.ode.FirstOrderIntegrator;
+import org.apache.commons.math4.ode.TestProblem1;
+import org.apache.commons.math4.ode.TestProblem3;
+import org.apache.commons.math4.ode.TestProblem4;
+import org.apache.commons.math4.ode.TestProblem5;
+import org.apache.commons.math4.ode.TestProblemAbstract;
+import org.apache.commons.math4.ode.TestProblemHandler;
+import org.apache.commons.math4.ode.events.EventHandler;
+import org.apache.commons.math4.ode.nonstiff.AdaptiveStepsizeIntegrator;
+import org.apache.commons.math4.ode.nonstiff.GraggBulirschStoerIntegrator;
+import org.apache.commons.math4.ode.sampling.StepHandler;
+import org.apache.commons.math4.ode.sampling.StepInterpolator;
+import org.apache.commons.math4.util.FastMath;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java
index e71e5c0..6893873 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.math3.ode.nonstiff;
+package org.apache.commons.math4.ode.nonstiff;
import java.io.ByteArrayInputStream;
@@ -25,16 +25,17 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.Random;
-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.ContinuousOutputModel;
-import org.apache.commons.math3.ode.TestProblem3;
-import org.apache.commons.math3.ode.sampling.StepHandler;
-import org.apache.commons.math3.ode.sampling.StepInterpolator;
-import org.apache.commons.math3.ode.sampling.StepInterpolatorTestUtils;
-import org.apache.commons.math3.util.FastMath;
+import org.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.ContinuousOutputModel;
+import org.apache.commons.math4.ode.TestProblem3;
+import org.apache.commons.math4.ode.nonstiff.GraggBulirschStoerIntegrator;
+import org.apache.commons.math4.ode.sampling.StepHandler;
+import org.apache.commons.math4.ode.sampling.StepInterpolator;
+import org.apache.commons.math4.ode.sampling.StepInterpolatorTestUtils;
+import org.apache.commons.math4.util.FastMath;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/commons-math/blob/e4e1ac23/src/test/java/org/apache/commons/math4/ode/nonstiff/HighamHall54IntegratorTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/math4/ode/nonstiff/HighamHall54IntegratorTest.java b/src/test/java/org/apache/commons/math4/ode/nonstiff/HighamHall54IntegratorTest.java
index 65a96f2..3a4e138 100644
--- a/src/test/java/org/apache/commons/math4/ode/nonstiff/HighamHall54IntegratorTest.java
+++ b/src/test/java/org/apache/commons/math4/ode/nonstiff/HighamHall54IntegratorTest.java
@@ -15,23 +15,24 @@
* 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.exception.TooManyEvaluationsException;
-import org.apache.commons.math3.ode.FirstOrderDifferentialEquations;
-import org.apache.commons.math3.ode.FirstOrderIntegrator;
-import org.apache.commons.math3.ode.TestProblem1;
-import org.apache.commons.math3.ode.TestProblem3;
-import org.apache.commons.math3.ode.TestProblem4;
-import org.apache.commons.math3.ode.TestProblem5;
-import org.apache.commons.math3.ode.TestProblemHandler;
-import org.apache.commons.math3.ode.events.EventHandler;
-import org.apache.commons.math3.util.FastMath;
+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.exception.TooManyEvaluationsException;
+import org.apache.commons.math4.ode.FirstOrderDifferentialEquations;
+import org.apache.commons.math4.ode.FirstOrderIntegrator;
+import org.apache.commons.math4.ode.TestProblem1;
+import org.apache.commons.math4.ode.TestProblem3;
+import org.apache.commons.math4.ode.TestProblem4;
+import org.apache.commons.math4.ode.TestProblem5;
+import org.apache.commons.math4.ode.TestProblemHandler;
+import org.apache.commons.math4.ode.events.EventHandler;
+import org.apache.commons.math4.ode.nonstiff.HighamHall54Integrator;
+import org.apache.commons.math4.util.FastMath;
import org.junit.Assert;
import org.junit.Test;