commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From l..@apache.org
Subject svn commit: r670469 [7/8] - in /commons/proper/math/branches/MATH_2_0/src: experimental/org/apache/commons/math/analysis/ experimental/org/apache/commons/math/analysis/derivative/ experimental/org/apache/commons/math/function/ experimental/org/apache/c...
Date Mon, 23 Jun 2008 08:01:55 GMT
Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/estimation/LevenbergMarquardtEstimatorTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/estimation/MinpackTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/estimation/WeightedMeasurementTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/fraction/FractionFormatTest.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jun 23 01:01:38 2008
@@ -1 +1 @@
-Date Author Id Revision HeadURL
+Author Date Id Revision

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/fraction/FractionTest.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jun 23 01:01:38 2008
@@ -1 +1 @@
-Date Author Id Revision HeadURL
+Author Date Id Revision

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/geometry/RotationOrderTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/geometry/RotationTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/geometry/Vector3DTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/linear/BigMatrixImplTest.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jun 23 01:01:38 2008
@@ -1 +1 @@
-Date Author Id Revision HeadURL
+Author Date Id Revision

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/linear/InvalidMatrixExceptionTest.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jun 23 01:01:38 2008
@@ -1 +1 @@
-Date Author Id Revision HeadURL
+Author Date Id Revision

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/linear/MatrixIndexExceptionTest.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jun 23 01:01:38 2008
@@ -1 +1 @@
-Date Author Id Revision HeadURL
+Author Date Id Revision

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/linear/MatrixUtilsTest.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jun 23 01:01:38 2008
@@ -1 +1 @@
-Date Author Id Revision HeadURL
+Author Date Id Revision

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/linear/QRDecompositionImplTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/linear/RealMatrixImplTest.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Jun 23 01:01:38 2008
@@ -1 +1 @@
-Date Author Id Revision HeadURL
+Author Date Id Revision

Modified: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/ContinuousOutputModelTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/ContinuousOutputModelTest.java?rev=670469&r1=670468&r2=670469&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/ContinuousOutputModelTest.java (original)
+++ commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/ContinuousOutputModelTest.java Mon Jun 23 01:01:38 2008
@@ -22,9 +22,13 @@
 
 import org.apache.commons.math.ode.ContinuousOutputModel;
 import org.apache.commons.math.ode.DerivativeException;
-import org.apache.commons.math.ode.DormandPrince54Integrator;
 import org.apache.commons.math.ode.FirstOrderIntegrator;
 import org.apache.commons.math.ode.IntegratorException;
+import org.apache.commons.math.ode.nonstiff.DormandPrince54Integrator;
+import org.apache.commons.math.ode.nonstiff.DormandPrince853Integrator;
+import org.apache.commons.math.ode.nonstiff.TestProblem3;
+import org.apache.commons.math.ode.sampling.DummyStepInterpolator;
+import org.apache.commons.math.ode.sampling.StepInterpolator;
 
 public class ContinuousOutputModelTest
   extends TestCase {

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/ContinuousOutputModelTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/FirstOrderConverterTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/FirstOrderConverterTest.java?rev=670469&r1=670468&r2=670469&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/FirstOrderConverterTest.java (original)
+++ commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/FirstOrderConverterTest.java Mon Jun 23 01:01:38 2008
@@ -17,11 +17,11 @@
 
 package org.apache.commons.math.ode;
 
-import org.apache.commons.math.ode.ClassicalRungeKuttaIntegrator;
 import org.apache.commons.math.ode.DerivativeException;
 import org.apache.commons.math.ode.FirstOrderConverter;
 import org.apache.commons.math.ode.IntegratorException;
 import org.apache.commons.math.ode.SecondOrderDifferentialEquations;
+import org.apache.commons.math.ode.nonstiff.ClassicalRungeKuttaIntegrator;
 
 import junit.framework.*;
 

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/FirstOrderConverterTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaIntegratorTest.java (from r669847, commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/ClassicalRungeKuttaIntegratorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaIntegratorTest.java?p2=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaIntegratorTest.java&p1=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/ClassicalRungeKuttaIntegratorTest.java&r1=669847&r2=670469&rev=670469&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/ClassicalRungeKuttaIntegratorTest.java (original)
+++ commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaIntegratorTest.java Mon Jun 23 01:01:38 2008
@@ -15,17 +15,17 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math.ode.nonstiff;
 
 import junit.framework.*;
 
-import org.apache.commons.math.ode.ClassicalRungeKuttaIntegrator;
 import org.apache.commons.math.ode.DerivativeException;
 import org.apache.commons.math.ode.FirstOrderIntegrator;
 import org.apache.commons.math.ode.IntegratorException;
-import org.apache.commons.math.ode.StepHandler;
-import org.apache.commons.math.ode.StepInterpolator;
-import org.apache.commons.math.ode.SwitchingFunction;
+import org.apache.commons.math.ode.events.EventHandler;
+import org.apache.commons.math.ode.nonstiff.ClassicalRungeKuttaIntegrator;
+import org.apache.commons.math.ode.sampling.StepHandler;
+import org.apache.commons.math.ode.sampling.StepInterpolator;
 
 public class ClassicalRungeKuttaIntegratorTest
   extends TestCase {
@@ -83,12 +83,12 @@
         FirstOrderIntegrator integ = new ClassicalRungeKuttaIntegrator(step);
         TestProblemHandler handler = new TestProblemHandler(pb, integ);
         integ.setStepHandler(handler);
-        SwitchingFunction[] functions = pb.getSwitchingFunctions();
+        EventHandler[] functions = pb.getEventsHandlers();
         for (int l = 0; l < functions.length; ++l) {
-          integ.addSwitchingFunction(functions[l],
+          integ.addEventHandler(functions[l],
                                      Double.POSITIVE_INFINITY, 1.0e-6 * step, 1000);
         }
-        assertEquals(functions.length, integ.getSwitchingFunctions().size());
+        assertEquals(functions.length, integ.getEventsHandlers().size());
         integ.integrate(pb, pb.getInitialTime(), pb.getInitialState(),
                         pb.getFinalTime(), new double[pb.getDimension()]);
 
@@ -98,8 +98,8 @@
         }
         previousError = error;
         assertEquals(0, handler.getMaximalTimeError(), 1.0e-12);
-        integ.clearSwitchingFunctions();
-        assertEquals(0, integ.getSwitchingFunctions().size());
+        integ.clearEventsHandlers();
+        assertEquals(0, integ.getEventsHandlers().size());
       }
 
     }
@@ -156,6 +156,7 @@
   }
 
   private static class KeplerHandler implements StepHandler {
+    private static final long serialVersionUID = 7510061424396717277L;
     public KeplerHandler(TestProblem3 pb) {
       this.pb = pb;
       reset();

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaIntegratorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaIntegratorTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolatorTest.java (from r669847, commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/ClassicalRungeKuttaStepInterpolatorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolatorTest.java?p2=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolatorTest.java&p1=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/ClassicalRungeKuttaStepInterpolatorTest.java&r1=669847&r2=670469&rev=670469&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/ClassicalRungeKuttaStepInterpolatorTest.java (original)
+++ commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolatorTest.java Mon Jun 23 01:01:38 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math.ode.nonstiff;
 
 import junit.framework.*;
 import java.util.Random;
@@ -25,10 +25,10 @@
 import java.io.ObjectInputStream;
 import java.io.IOException;
 
-import org.apache.commons.math.ode.ClassicalRungeKuttaIntegrator;
 import org.apache.commons.math.ode.ContinuousOutputModel;
 import org.apache.commons.math.ode.DerivativeException;
 import org.apache.commons.math.ode.IntegratorException;
+import org.apache.commons.math.ode.nonstiff.ClassicalRungeKuttaIntegrator;
 
 public class ClassicalRungeKuttaStepInterpolatorTest
   extends TestCase {

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolatorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolatorTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince54IntegratorTest.java (from r669847, commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/DormandPrince54IntegratorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince54IntegratorTest.java?p2=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince54IntegratorTest.java&p1=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/DormandPrince54IntegratorTest.java&r1=669847&r2=670469&rev=670469&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/DormandPrince54IntegratorTest.java (original)
+++ commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince54IntegratorTest.java Mon Jun 23 01:01:38 2008
@@ -15,16 +15,17 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math.ode.nonstiff;
 
 import org.apache.commons.math.ode.AdaptiveStepsizeIntegrator;
 import org.apache.commons.math.ode.DerivativeException;
-import org.apache.commons.math.ode.DormandPrince54Integrator;
 import org.apache.commons.math.ode.FirstOrderIntegrator;
 import org.apache.commons.math.ode.IntegratorException;
-import org.apache.commons.math.ode.StepHandler;
-import org.apache.commons.math.ode.StepInterpolator;
-import org.apache.commons.math.ode.SwitchingFunction;
+import org.apache.commons.math.ode.events.EventHandler;
+import org.apache.commons.math.ode.nonstiff.DormandPrince54Integrator;
+import org.apache.commons.math.ode.nonstiff.EmbeddedRungeKuttaIntegrator;
+import org.apache.commons.math.ode.sampling.StepHandler;
+import org.apache.commons.math.ode.sampling.StepInterpolator;
 
 import junit.framework.*;
 
@@ -103,6 +104,8 @@
 
   private static class DP54SmallLastHandler implements StepHandler {
 
+    private static final long serialVersionUID = -8168590945325629799L;
+
     public DP54SmallLastHandler(double minStep) {
       lastSeen = false;
       this.minStep = minStep;
@@ -172,7 +175,7 @@
 
   }
 
-  public void testSwitchingFunctions()
+  public void testEvents()
     throws DerivativeException, IntegratorException {
 
     TestProblem4 pb = new TestProblem4();
@@ -186,12 +189,12 @@
                                                                scalRelativeTolerance);
     TestProblemHandler handler = new TestProblemHandler(pb, integ);
     integ.setStepHandler(handler);
-    SwitchingFunction[] functions = pb.getSwitchingFunctions();
+    EventHandler[] functions = pb.getEventsHandlers();
     for (int l = 0; l < functions.length; ++l) {
-      integ.addSwitchingFunction(functions[l],
+      integ.addEventHandler(functions[l],
                                  Double.POSITIVE_INFINITY, 1.0e-8 * maxStep, 1000);
     }
-    assertEquals(functions.length, integ.getSwitchingFunctions().size());
+    assertEquals(functions.length, integ.getEventsHandlers().size());
     integ.integrate(pb,
                     pb.getInitialTime(), pb.getInitialState(),
                     pb.getFinalTime(), new double[pb.getDimension()]);
@@ -199,8 +202,8 @@
     assertTrue(handler.getMaximalValueError() < 5.0e-6);
     assertEquals(0, handler.getMaximalTimeError(), 1.0e-12);
     assertEquals(12.0, handler.getLastTime(), 1.0e-8 * maxStep);
-    integ.clearSwitchingFunctions();
-    assertEquals(0, integ.getSwitchingFunctions().size());
+    integ.clearEventsHandlers();
+    assertEquals(0, integ.getEventsHandlers().size());
 
   }
 
@@ -244,6 +247,8 @@
   }
 
   private static class KeplerHandler implements StepHandler {
+    private static final long serialVersionUID = -1645853847806655456L;
+
     public KeplerHandler(TestProblem3 pb) {
       this.pb = pb;
       reset();
@@ -287,6 +292,7 @@
   }
 
   private static class VariableHandler implements StepHandler {
+    private static final long serialVersionUID = -5196650833828379228L;
     public VariableHandler() {
       firstTime = true;
       minStep = 0;

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince54IntegratorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince54IntegratorTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolatorTest.java (from r669847, commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/DormandPrince54StepInterpolatorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolatorTest.java?p2=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolatorTest.java&p1=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/DormandPrince54StepInterpolatorTest.java&r1=669847&r2=670469&rev=670469&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/DormandPrince54StepInterpolatorTest.java (original)
+++ commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolatorTest.java Mon Jun 23 01:01:38 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math.ode.nonstiff;
 
 import junit.framework.*;
 import java.util.Random;
@@ -27,8 +27,10 @@
 
 import org.apache.commons.math.ode.ContinuousOutputModel;
 import org.apache.commons.math.ode.DerivativeException;
-import org.apache.commons.math.ode.DormandPrince54Integrator;
 import org.apache.commons.math.ode.IntegratorException;
+import org.apache.commons.math.ode.nonstiff.DormandPrince54Integrator;
+import org.apache.commons.math.ode.sampling.StepHandler;
+import org.apache.commons.math.ode.sampling.StepInterpolator;
 
 public class DormandPrince54StepInterpolatorTest
   extends TestCase {
@@ -96,7 +98,8 @@
                                                                       scalAbsoluteTolerance,
                                                                       scalRelativeTolerance);
       integ.setStepHandler(new StepHandler() {
-          public void handleStep(StepInterpolator interpolator, boolean isLast)
+        private static final long serialVersionUID = -6768136169276197L;
+        public void handleStep(StepInterpolator interpolator, boolean isLast)
           throws DerivativeException {
               StepInterpolator cloned = interpolator.copy();
               double tA = cloned.getPreviousTime();

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolatorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolatorTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince853IntegratorTest.java (from r669847, commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/DormandPrince853IntegratorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince853IntegratorTest.java?p2=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince853IntegratorTest.java&p1=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/DormandPrince853IntegratorTest.java&r1=669847&r2=670469&rev=670469&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/DormandPrince853IntegratorTest.java (original)
+++ commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince853IntegratorTest.java Mon Jun 23 01:01:38 2008
@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math.ode.nonstiff;
 
 import org.apache.commons.math.ode.DerivativeException;
-import org.apache.commons.math.ode.DormandPrince853Integrator;
-import org.apache.commons.math.ode.DummyStepHandler;
 import org.apache.commons.math.ode.FirstOrderIntegrator;
 import org.apache.commons.math.ode.IntegratorException;
-import org.apache.commons.math.ode.StepHandler;
-import org.apache.commons.math.ode.StepInterpolator;
-import org.apache.commons.math.ode.SwitchingFunction;
+import org.apache.commons.math.ode.events.EventHandler;
+import org.apache.commons.math.ode.nonstiff.DormandPrince853Integrator;
+import org.apache.commons.math.ode.sampling.DummyStepHandler;
+import org.apache.commons.math.ode.sampling.StepHandler;
+import org.apache.commons.math.ode.sampling.StepInterpolator;
 
 import junit.framework.*;
 
@@ -125,7 +125,7 @@
 
   }
 
-  public void testSwitchingFunctions()
+  public void testEvents()
     throws DerivativeException, IntegratorException {
 
     TestProblem4 pb = new TestProblem4();
@@ -139,12 +139,12 @@
                                                                 scalRelativeTolerance);
     TestProblemHandler handler = new TestProblemHandler(pb, integ);
     integ.setStepHandler(handler);
-    SwitchingFunction[] functions = pb.getSwitchingFunctions();
+    EventHandler[] functions = pb.getEventsHandlers();
     for (int l = 0; l < functions.length; ++l) {
-      integ.addSwitchingFunction(functions[l],
+      integ.addEventHandler(functions[l],
                                  Double.POSITIVE_INFINITY, 1.0e-8 * maxStep, 1000);
     }
-    assertEquals(functions.length, integ.getSwitchingFunctions().size());
+    assertEquals(functions.length, integ.getEventsHandlers().size());
     integ.integrate(pb,
                     pb.getInitialTime(), pb.getInitialState(),
                     pb.getFinalTime(), new double[pb.getDimension()]);
@@ -152,8 +152,8 @@
     assertTrue(handler.getMaximalValueError() < 5.0e-8);
     assertEquals(0, handler.getMaximalTimeError(), 1.0e-12);
     assertEquals(12.0, handler.getLastTime(), 1.0e-8 * maxStep);
-    integ.clearSwitchingFunctions();
-    assertEquals(0, integ.getSwitchingFunctions().size());
+    integ.clearEventsHandlers();
+    assertEquals(0, integ.getEventsHandlers().size());
 
   }
 
@@ -230,13 +230,14 @@
     final StepProblem stepProblem = new StepProblem(0.0, 1.0, 2.0);
     FirstOrderIntegrator integ =
       new DormandPrince853Integrator(0.1, 10, 1.0e-12, 0.0);
-    integ.addSwitchingFunction(stepProblem, 1.0, 1.0e-12, 1000);
+    integ.addEventHandler(stepProblem, 1.0, 1.0e-12, 1000);
     double[] y = { Double.NaN };
     integ.integrate(stepProblem, 0.0, new double[] { 0.0 }, 10.0, y);
     assertEquals(8.0, y[0], 1.0e-12);
   }
 
   private static class KeplerHandler implements StepHandler {
+    private static final long serialVersionUID = -1752092987112788459L;
     public KeplerHandler(TestProblem3 pb) {
       this.pb = pb;
       reset();
@@ -280,6 +281,7 @@
   }
 
   private static class VariableHandler implements StepHandler {
+    private static final long serialVersionUID = 5542665697103383623L;
     public VariableHandler() {
       reset();
     }
@@ -320,6 +322,7 @@
   }
 
   private static class InterpolatingStepHandler implements StepHandler {
+    private static final long serialVersionUID = -5272695044664350727L;
     public boolean requiresDenseOutput() {
       return true;
     }

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince853IntegratorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince853IntegratorTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolatorTest.java (from r669847, commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/DormandPrince853StepInterpolatorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolatorTest.java?p2=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolatorTest.java&p1=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/DormandPrince853StepInterpolatorTest.java&r1=669847&r2=670469&rev=670469&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/DormandPrince853StepInterpolatorTest.java (original)
+++ commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolatorTest.java Mon Jun 23 01:01:38 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math.ode.nonstiff;
 
 import junit.framework.*;
 import java.util.Random;
@@ -27,8 +27,10 @@
 
 import org.apache.commons.math.ode.ContinuousOutputModel;
 import org.apache.commons.math.ode.DerivativeException;
-import org.apache.commons.math.ode.DormandPrince853Integrator;
 import org.apache.commons.math.ode.IntegratorException;
+import org.apache.commons.math.ode.nonstiff.DormandPrince853Integrator;
+import org.apache.commons.math.ode.sampling.StepHandler;
+import org.apache.commons.math.ode.sampling.StepInterpolator;
 
 public class DormandPrince853StepInterpolatorTest
   extends TestCase {
@@ -96,6 +98,7 @@
                                                                       scalAbsoluteTolerance,
                                                                       scalRelativeTolerance);
     integ.setStepHandler(new StepHandler() {
+        private static final long serialVersionUID = 2209212559670665268L;
         public void handleStep(StepInterpolator interpolator, boolean isLast)
         throws DerivativeException {
             StepInterpolator cloned = interpolator.copy();

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolatorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolatorTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/EulerIntegratorTest.java (from r669847, commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/EulerIntegratorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/EulerIntegratorTest.java?p2=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/EulerIntegratorTest.java&p1=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/EulerIntegratorTest.java&r1=669847&r2=670469&rev=670469&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/EulerIntegratorTest.java (original)
+++ commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/EulerIntegratorTest.java Mon Jun 23 01:01:38 2008
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math.ode.nonstiff;
 
 import junit.framework.*;
 
 import org.apache.commons.math.ode.DerivativeException;
-import org.apache.commons.math.ode.EulerIntegrator;
 import org.apache.commons.math.ode.FirstOrderIntegrator;
 import org.apache.commons.math.ode.IntegratorException;
-import org.apache.commons.math.ode.SwitchingFunction;
+import org.apache.commons.math.ode.events.EventHandler;
+import org.apache.commons.math.ode.nonstiff.EulerIntegrator;
 
 public class EulerIntegratorTest
   extends TestCase {
@@ -61,9 +61,9 @@
         FirstOrderIntegrator integ = new EulerIntegrator(step);
         TestProblemHandler handler = new TestProblemHandler(pb, integ);
         integ.setStepHandler(handler);
-        SwitchingFunction[] functions = pb.getSwitchingFunctions();
+        EventHandler[] functions = pb.getEventsHandlers();
         for (int l = 0; l < functions.length; ++l) {
-          integ.addSwitchingFunction(functions[l],
+          integ.addEventHandler(functions[l],
                                      Double.POSITIVE_INFINITY, 1.0e-6 * step, 1000);
         }
         integ.integrate(pb,

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/EulerIntegratorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/EulerIntegratorTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/EulerStepInterpolatorTest.java (from r669847, commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/EulerStepInterpolatorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/EulerStepInterpolatorTest.java?p2=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/EulerStepInterpolatorTest.java&p1=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/EulerStepInterpolatorTest.java&r1=669847&r2=670469&rev=670469&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/EulerStepInterpolatorTest.java (original)
+++ commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/EulerStepInterpolatorTest.java Mon Jun 23 01:01:38 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math.ode.nonstiff;
 
 import junit.framework.*;
 import java.util.Random;
@@ -27,10 +27,10 @@
 
 import org.apache.commons.math.ode.ContinuousOutputModel;
 import org.apache.commons.math.ode.DerivativeException;
-import org.apache.commons.math.ode.EulerIntegrator;
-import org.apache.commons.math.ode.EulerStepInterpolator;
 import org.apache.commons.math.ode.FirstOrderDifferentialEquations;
 import org.apache.commons.math.ode.IntegratorException;
+import org.apache.commons.math.ode.nonstiff.EulerIntegrator;
+import org.apache.commons.math.ode.nonstiff.EulerStepInterpolator;
 
 public class EulerStepInterpolatorTest
   extends TestCase {

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/EulerStepInterpolatorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/EulerStepInterpolatorTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/GillIntegratorTest.java (from r669847, commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/GillIntegratorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/GillIntegratorTest.java?p2=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/GillIntegratorTest.java&p1=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/GillIntegratorTest.java&r1=669847&r2=670469&rev=670469&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/GillIntegratorTest.java (original)
+++ commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/GillIntegratorTest.java Mon Jun 23 01:01:38 2008
@@ -15,17 +15,17 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math.ode.nonstiff;
 
 import junit.framework.*;
 
 import org.apache.commons.math.ode.DerivativeException;
 import org.apache.commons.math.ode.FirstOrderIntegrator;
-import org.apache.commons.math.ode.GillIntegrator;
 import org.apache.commons.math.ode.IntegratorException;
-import org.apache.commons.math.ode.StepHandler;
-import org.apache.commons.math.ode.StepInterpolator;
-import org.apache.commons.math.ode.SwitchingFunction;
+import org.apache.commons.math.ode.events.EventHandler;
+import org.apache.commons.math.ode.nonstiff.GillIntegrator;
+import org.apache.commons.math.ode.sampling.StepHandler;
+import org.apache.commons.math.ode.sampling.StepInterpolator;
 
 public class GillIntegratorTest
   extends TestCase {
@@ -63,9 +63,9 @@
         FirstOrderIntegrator integ = new GillIntegrator(step);
         TestProblemHandler handler = new TestProblemHandler(pb, integ);
         integ.setStepHandler(handler);
-        SwitchingFunction[] functions = pb.getSwitchingFunctions();
+        EventHandler[] functions = pb.getEventsHandlers();
         for (int l = 0; l < functions.length; ++l) {
-          integ.addSwitchingFunction(functions[l],
+          integ.addEventHandler(functions[l],
                                      Double.POSITIVE_INFINITY, 1.0e-6 * step, 1000);
         }
         integ.integrate(pb, pb.getInitialTime(), pb.getInitialState(),
@@ -138,13 +138,14 @@
   throws DerivativeException, IntegratorException {
     final StepProblem stepProblem = new StepProblem(0.0, 1.0, 2.0);
     FirstOrderIntegrator integ = new GillIntegrator(0.3);
-    integ.addSwitchingFunction(stepProblem, 1.0, 1.0e-12, 1000);
+    integ.addEventHandler(stepProblem, 1.0, 1.0e-12, 1000);
     double[] y = { Double.NaN };
     integ.integrate(stepProblem, 0.0, new double[] { 0.0 }, 10.0, y);
     assertEquals(8.0, y[0], 1.0e-12);
   }
 
   private static class KeplerStepHandler implements StepHandler {
+    private static final long serialVersionUID = 1250933165809631538L;
     public KeplerStepHandler(TestProblem3 pb) {
       this.pb = pb;
       reset();

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/GillIntegratorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/GillIntegratorTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/GillStepInterpolatorTest.java (from r669847, commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/GillStepInterpolatorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/GillStepInterpolatorTest.java?p2=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/GillStepInterpolatorTest.java&p1=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/GillStepInterpolatorTest.java&r1=669847&r2=670469&rev=670469&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/GillStepInterpolatorTest.java (original)
+++ commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/GillStepInterpolatorTest.java Mon Jun 23 01:01:38 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math.ode.nonstiff;
 
 import junit.framework.*;
 import java.util.Random;
@@ -27,8 +27,8 @@
 
 import org.apache.commons.math.ode.ContinuousOutputModel;
 import org.apache.commons.math.ode.DerivativeException;
-import org.apache.commons.math.ode.GillIntegrator;
 import org.apache.commons.math.ode.IntegratorException;
+import org.apache.commons.math.ode.nonstiff.GillIntegrator;
 
 public class GillStepInterpolatorTest
   extends TestCase {

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/GillStepInterpolatorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/GillStepInterpolatorTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerIntegratorTest.java (from r669847, commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/GraggBulirschStoerIntegratorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerIntegratorTest.java?p2=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerIntegratorTest.java&p1=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/GraggBulirschStoerIntegratorTest.java&r1=669847&r2=670469&rev=670469&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/GraggBulirschStoerIntegratorTest.java (original)
+++ commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerIntegratorTest.java Mon Jun 23 01:01:38 2008
@@ -15,15 +15,16 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math.ode.nonstiff;
 
+import org.apache.commons.math.ode.AdaptiveStepsizeIntegrator;
 import org.apache.commons.math.ode.DerivativeException;
 import org.apache.commons.math.ode.FirstOrderIntegrator;
-import org.apache.commons.math.ode.GraggBulirschStoerIntegrator;
 import org.apache.commons.math.ode.IntegratorException;
-import org.apache.commons.math.ode.StepHandler;
-import org.apache.commons.math.ode.StepInterpolator;
-import org.apache.commons.math.ode.SwitchingFunction;
+import org.apache.commons.math.ode.events.EventHandler;
+import org.apache.commons.math.ode.nonstiff.GraggBulirschStoerIntegrator;
+import org.apache.commons.math.ode.sampling.StepHandler;
+import org.apache.commons.math.ode.sampling.StepInterpolator;
 
 import junit.framework.*;
 
@@ -165,7 +166,7 @@
       return handler.getMaximalValueError();
   }
 
-  public void testSwitchingFunctions()
+  public void testEvents()
     throws DerivativeException, IntegratorException {
 
     TestProblem4 pb = new TestProblem4();
@@ -179,12 +180,12 @@
                                                                   scalRelativeTolerance);
     TestProblemHandler handler = new TestProblemHandler(pb, integ);
     integ.setStepHandler(handler);
-    SwitchingFunction[] functions = pb.getSwitchingFunctions();
+    EventHandler[] functions = pb.getEventsHandlers();
     for (int l = 0; l < functions.length; ++l) {
-      integ.addSwitchingFunction(functions[l],
+      integ.addEventHandler(functions[l],
                                  Double.POSITIVE_INFINITY, 1.0e-8 * maxStep, 1000);
     }
-    assertEquals(functions.length, integ.getSwitchingFunctions().size());
+    assertEquals(functions.length, integ.getEventsHandlers().size());
     integ.integrate(pb,
                     pb.getInitialTime(), pb.getInitialState(),
                     pb.getFinalTime(), new double[pb.getDimension()]);
@@ -192,8 +193,8 @@
     assertTrue(handler.getMaximalValueError() < 5.0e-8);
     assertEquals(0, handler.getMaximalTimeError(), 1.0e-12);
     assertEquals(12.0, handler.getLastTime(), 1.0e-8 * maxStep);
-    integ.clearSwitchingFunctions();
-    assertEquals(0, integ.getSwitchingFunctions().size());
+    integ.clearEventsHandlers();
+    assertEquals(0, integ.getEventsHandlers().size());
 
   }
 
@@ -241,13 +242,14 @@
     final StepProblem stepProblem = new StepProblem(0.0, 1.0, 2.0);
     FirstOrderIntegrator integ =
       new GraggBulirschStoerIntegrator(0.1, 10, 1.0e-12, 0.0);
-    integ.addSwitchingFunction(stepProblem, 1.0, 1.0e-12, 1000);
+    integ.addEventHandler(stepProblem, 1.0, 1.0e-12, 1000);
     double[] y = { Double.NaN };
     integ.integrate(stepProblem, 0.0, new double[] { 0.0 }, 10.0, y);
     assertEquals(8.0, y[0], 1.0e-12);
   }
 
   private static class KeplerStepHandler implements StepHandler {
+    private static final long serialVersionUID = -8231434585284002546L;
     public KeplerStepHandler(TestProblem3 pb) {
       this.pb = pb;
       reset();
@@ -291,6 +293,7 @@
   }
 
   public static class VariableStepHandler implements StepHandler {
+    private static final long serialVersionUID = -5955452449048688985L;
     public VariableStepHandler() {
       reset();
     }

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerIntegratorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerIntegratorTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java (from r669847, commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/GraggBulirschStoerStepInterpolatorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java?p2=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java&p1=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/GraggBulirschStoerStepInterpolatorTest.java&r1=669847&r2=670469&rev=670469&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/GraggBulirschStoerStepInterpolatorTest.java (original)
+++ commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java Mon Jun 23 01:01:38 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math.ode.nonstiff;
 
 import junit.framework.*;
 import java.util.Random;
@@ -27,8 +27,10 @@
 
 import org.apache.commons.math.ode.ContinuousOutputModel;
 import org.apache.commons.math.ode.DerivativeException;
-import org.apache.commons.math.ode.GraggBulirschStoerIntegrator;
 import org.apache.commons.math.ode.IntegratorException;
+import org.apache.commons.math.ode.nonstiff.GraggBulirschStoerIntegrator;
+import org.apache.commons.math.ode.sampling.StepHandler;
+import org.apache.commons.math.ode.sampling.StepInterpolator;
 
 public class GraggBulirschStoerStepInterpolatorTest
   extends TestCase {
@@ -97,6 +99,7 @@
                                                                           scalAbsoluteTolerance,
                                                                           scalRelativeTolerance);
     integ.setStepHandler(new StepHandler() {
+        private static final long serialVersionUID = -5947183291381232297L;
         public void handleStep(StepInterpolator interpolator, boolean isLast)
         throws DerivativeException {
             StepInterpolator cloned = interpolator.copy();

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/HighamHall54IntegratorTest.java (from r669847, commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/HighamHall54IntegratorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/HighamHall54IntegratorTest.java?p2=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/HighamHall54IntegratorTest.java&p1=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/HighamHall54IntegratorTest.java&r1=669847&r2=670469&rev=670469&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/HighamHall54IntegratorTest.java (original)
+++ commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/HighamHall54IntegratorTest.java Mon Jun 23 01:01:38 2008
@@ -15,13 +15,22 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math.ode.nonstiff;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
 import org.apache.commons.math.ConvergenceException;
+import org.apache.commons.math.ode.DerivativeException;
+import org.apache.commons.math.ode.FirstOrderDifferentialEquations;
+import org.apache.commons.math.ode.FirstOrderIntegrator;
+import org.apache.commons.math.ode.IntegratorException;
+import org.apache.commons.math.ode.events.EventException;
+import org.apache.commons.math.ode.events.EventHandler;
+import org.apache.commons.math.ode.nonstiff.HighamHall54Integrator;
+import org.apache.commons.math.ode.sampling.StepHandler;
+import org.apache.commons.math.ode.sampling.StepInterpolator;
 
 public class HighamHall54IntegratorTest
   extends TestCase {
@@ -129,7 +138,7 @@
 
   }
 
-  public void testSwitchingFunctions()
+  public void testEvents()
     throws DerivativeException, IntegratorException {
 
     TestProblem4 pb = new TestProblem4();
@@ -143,12 +152,12 @@
                                                             scalRelativeTolerance);
     TestProblemHandler handler = new TestProblemHandler(pb, integ);
     integ.setStepHandler(handler);
-    SwitchingFunction[] functions = pb.getSwitchingFunctions();
+    EventHandler[] functions = pb.getEventsHandlers();
     for (int l = 0; l < functions.length; ++l) {
-      integ.addSwitchingFunction(functions[l],
+      integ.addEventHandler(functions[l],
                                  Double.POSITIVE_INFINITY, 1.0e-8 * maxStep, 1000);
     }
-    assertEquals(functions.length, integ.getSwitchingFunctions().size());
+    assertEquals(functions.length, integ.getEventsHandlers().size());
     integ.integrate(pb,
                     pb.getInitialTime(), pb.getInitialState(),
                     pb.getFinalTime(), new double[pb.getDimension()]);
@@ -156,12 +165,12 @@
     assertTrue(handler.getMaximalValueError() < 1.0e-7);
     assertEquals(0, handler.getMaximalTimeError(), 1.0e-12);
     assertEquals(12.0, handler.getLastTime(), 1.0e-8 * maxStep);
-    integ.clearSwitchingFunctions();
-    assertEquals(0, integ.getSwitchingFunctions().size());
+    integ.clearEventsHandlers();
+    assertEquals(0, integ.getEventsHandlers().size());
 
   }
 
-  public void testSwitchingFunctionsError()
+  public void testEventsErrors()
     throws DerivativeException, IntegratorException {
 
       final TestProblem1 pb = new TestProblem1();
@@ -176,15 +185,15 @@
       TestProblemHandler handler = new TestProblemHandler(pb, integ);
       integ.setStepHandler(handler);
 
-      integ.addSwitchingFunction(new SwitchingFunction() {
+      integ.addEventHandler(new EventHandler() {
         public int eventOccurred(double t, double[] y) {
-          return SwitchingFunction.CONTINUE;
+          return EventHandler.CONTINUE;
         }
-        public double g(double t, double[] y) throws SwitchException {
+        public double g(double t, double[] y) throws EventException {
           double middle = (pb.getInitialTime() + pb.getFinalTime()) / 2;
           double offset = t - middle;
           if (offset > 0) {
-            throw new SwitchException("Evaluation failed for argument = {0}",
+            throw new EventException("Evaluation failed for argument = {0}",
                                       new Object[] { Double.valueOf(t) });
           }
           return offset;
@@ -207,7 +216,7 @@
 
   }
 
-  public void testSwitchingFunctionsNoConvergence()
+  public void testEventsNoConvergence()
   throws DerivativeException, IntegratorException {
 
     final TestProblem1 pb = new TestProblem1();
@@ -222,9 +231,9 @@
     TestProblemHandler handler = new TestProblemHandler(pb, integ);
     integ.setStepHandler(handler);
 
-    integ.addSwitchingFunction(new SwitchingFunction() {
+    integ.addEventHandler(new EventHandler() {
       public int eventOccurred(double t, double[] y) {
-        return SwitchingFunction.CONTINUE;
+        return EventHandler.CONTINUE;
       }
       public double g(double t, double[] y) {
         double middle = (pb.getInitialTime() + pb.getFinalTime()) / 2;
@@ -331,6 +340,7 @@
   }
 
   private static class KeplerHandler implements StepHandler {
+    private static final long serialVersionUID = 3200246026175251943L;
     public KeplerHandler(TestProblem3 pb) {
       this.pb = pb;
       nbSteps = 0;

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/HighamHall54IntegratorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/HighamHall54IntegratorTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolatorTest.java (from r669847, commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/HighamHall54StepInterpolatorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolatorTest.java?p2=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolatorTest.java&p1=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/HighamHall54StepInterpolatorTest.java&r1=669847&r2=670469&rev=670469&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/HighamHall54StepInterpolatorTest.java (original)
+++ commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolatorTest.java Mon Jun 23 01:01:38 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math.ode.nonstiff;
 
 import junit.framework.*;
 import java.util.Random;
@@ -27,8 +27,10 @@
 
 import org.apache.commons.math.ode.ContinuousOutputModel;
 import org.apache.commons.math.ode.DerivativeException;
-import org.apache.commons.math.ode.HighamHall54Integrator;
 import org.apache.commons.math.ode.IntegratorException;
+import org.apache.commons.math.ode.nonstiff.HighamHall54Integrator;
+import org.apache.commons.math.ode.sampling.StepHandler;
+import org.apache.commons.math.ode.sampling.StepInterpolator;
 
 public class HighamHall54StepInterpolatorTest
   extends TestCase {
@@ -96,6 +98,7 @@
                                                               scalAbsoluteTolerance,
                                                               scalRelativeTolerance);
     integ.setStepHandler(new StepHandler() {
+        private static final long serialVersionUID = 9111679755950880352L;
         public void handleStep(StepInterpolator interpolator, boolean isLast)
         throws DerivativeException {
             StepInterpolator cloned = interpolator.copy();

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolatorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolatorTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/MidpointIntegratorTest.java (from r669847, commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/MidpointIntegratorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/MidpointIntegratorTest.java?p2=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/MidpointIntegratorTest.java&p1=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/MidpointIntegratorTest.java&r1=669847&r2=670469&rev=670469&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/MidpointIntegratorTest.java (original)
+++ commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/MidpointIntegratorTest.java Mon Jun 23 01:01:38 2008
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math.ode.nonstiff;
 
 import junit.framework.*;
 
 import org.apache.commons.math.ode.DerivativeException;
 import org.apache.commons.math.ode.FirstOrderIntegrator;
 import org.apache.commons.math.ode.IntegratorException;
-import org.apache.commons.math.ode.MidpointIntegrator;
-import org.apache.commons.math.ode.SwitchingFunction;
+import org.apache.commons.math.ode.events.EventHandler;
+import org.apache.commons.math.ode.nonstiff.MidpointIntegrator;
 
 public class MidpointIntegratorTest
   extends TestCase {
@@ -60,9 +60,9 @@
         FirstOrderIntegrator integ = new MidpointIntegrator(step);
         TestProblemHandler handler = new TestProblemHandler(pb, integ);
         integ.setStepHandler(handler);
-        SwitchingFunction[] functions = pb.getSwitchingFunctions();
+        EventHandler[] functions = pb.getEventsHandlers();
         for (int l = 0; l < functions.length; ++l) {
-          integ.addSwitchingFunction(functions[l],
+          integ.addEventHandler(functions[l],
                                      Double.POSITIVE_INFINITY, 1.0e-6 * step, 1000);
         }
         integ.integrate(pb,

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/MidpointIntegratorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/MidpointIntegratorTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolatorTest.java (from r669847, commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/MidpointStepInterpolatorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolatorTest.java?p2=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolatorTest.java&p1=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/MidpointStepInterpolatorTest.java&r1=669847&r2=670469&rev=670469&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/MidpointStepInterpolatorTest.java (original)
+++ commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolatorTest.java Mon Jun 23 01:01:38 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math.ode.nonstiff;
 
 import junit.framework.*;
 import java.util.Random;
@@ -28,7 +28,7 @@
 import org.apache.commons.math.ode.ContinuousOutputModel;
 import org.apache.commons.math.ode.DerivativeException;
 import org.apache.commons.math.ode.IntegratorException;
-import org.apache.commons.math.ode.MidpointIntegrator;
+import org.apache.commons.math.ode.nonstiff.MidpointIntegrator;
 
 public class MidpointStepInterpolatorTest
   extends TestCase {

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolatorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolatorTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/StepProblem.java (from r669847, commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/StepProblem.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/StepProblem.java?p2=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/StepProblem.java&p1=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/StepProblem.java&r1=669847&r2=670469&rev=670469&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/StepProblem.java (original)
+++ commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/StepProblem.java Mon Jun 23 01:01:38 2008
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math.ode.nonstiff;
 
 import org.apache.commons.math.ode.FirstOrderDifferentialEquations;
-import org.apache.commons.math.ode.SwitchingFunction;
+import org.apache.commons.math.ode.events.EventHandler;
 
 
 public class StepProblem
-  implements FirstOrderDifferentialEquations, SwitchingFunction {
+  implements FirstOrderDifferentialEquations, EventHandler {
 
   public StepProblem(double rateBefore, double rateAfter,
                      double switchTime) {

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/StepProblem.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/StepProblem.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblem1.java (from r669847, commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/TestProblem1.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblem1.java?p2=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblem1.java&p1=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/TestProblem1.java&r1=669847&r2=670469&rev=670469&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/TestProblem1.java (original)
+++ commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblem1.java Mon Jun 23 01:01:38 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math.ode.nonstiff;
 
 /**
  * This class is used in the junit tests for the ODE integrators.
@@ -31,7 +31,7 @@
  * </p>
 
  */
-class TestProblem1
+public class TestProblem1
   extends TestProblemAbstract {
 
   /** Serializable version identifier. */

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblem1.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblem1.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblem2.java (from r669847, commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/TestProblem2.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblem2.java?p2=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblem2.java&p1=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/TestProblem2.java&r1=669847&r2=670469&rev=670469&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/TestProblem2.java (original)
+++ commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblem2.java Mon Jun 23 01:01:38 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math.ode.nonstiff;
 
 /**
  * This class is used in the junit tests for the ODE integrators.
@@ -32,7 +32,7 @@
  * </p>
 
  */
-class TestProblem2
+public class TestProblem2
   extends TestProblemAbstract {
 
   /** Serializable version identifier. */

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblem2.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblem2.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblem3.java (from r669847, commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/TestProblem3.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblem3.java?p2=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblem3.java&p1=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/TestProblem3.java&r1=669847&r2=670469&rev=670469&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/TestProblem3.java (original)
+++ commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblem3.java Mon Jun 23 01:01:38 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math.ode.nonstiff;
 
 /**
  * This class is used in the junit tests for the ODE integrators.
@@ -34,7 +34,7 @@
  * </p>
 
  */
-class TestProblem3
+public class TestProblem3
   extends TestProblemAbstract {
 
   /** Serializable version identifier. */

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblem3.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblem3.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblem4.java (from r669847, commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/TestProblem4.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblem4.java?p2=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblem4.java&p1=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/TestProblem4.java&r1=669847&r2=670469&rev=670469&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/TestProblem4.java (original)
+++ commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblem4.java Mon Jun 23 01:01:38 2008
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math.ode.nonstiff;
 
-import org.apache.commons.math.ode.SwitchingFunction;
+import org.apache.commons.math.ode.events.EventHandler;
 
 /**
  * This class is used in the junit tests for the ODE integrators.
@@ -34,7 +34,7 @@
  * </p>
 
  */
-class TestProblem4
+public class TestProblem4
   extends TestProblemAbstract {
 
   /** Serializable version identifier. */
@@ -76,8 +76,8 @@
     return new TestProblem4(this);
   }
 
-  public SwitchingFunction[] getSwitchingFunctions() {
-    return new SwitchingFunction[] { new Bounce(), new Stop() };
+  public EventHandler[] getEventsHandlers() {
+    return new EventHandler[] { new Bounce(), new Stop() };
   }
 
   public void doComputeDerivatives(double t, double[] y, double[] yDot) {
@@ -93,7 +93,7 @@
     return y;
   }
 
-  private static class Bounce implements SwitchingFunction {
+  private static class Bounce implements EventHandler {
 
     private static final long serialVersionUID = 1356097180027801200L;
     private int sign;
@@ -109,7 +109,7 @@
     public int eventOccurred(double t, double[] y) {
       // this sign change is needed because the state will be reset soon
       sign = -sign;
-      return SwitchingFunction.RESET_STATE;
+      return EventHandler.RESET_STATE;
     }
   
     public void resetState(double t, double[] y) {
@@ -118,7 +118,7 @@
 
   }
 
-  private static class Stop implements SwitchingFunction {
+  private static class Stop implements EventHandler {
 
     private static final long serialVersionUID = 6975050568227951931L;
 
@@ -130,7 +130,7 @@
     }
 
     public int eventOccurred(double t, double[] y) {
-      return SwitchingFunction.STOP;
+      return EventHandler.STOP;
     }
   
     public void resetState(double t, double[] y) {

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblem4.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblem4.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblem5.java (from r669847, commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/TestProblem5.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblem5.java?p2=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblem5.java&p1=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/TestProblem5.java&r1=669847&r2=670469&rev=670469&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/TestProblem5.java (original)
+++ commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblem5.java Mon Jun 23 01:01:38 2008
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math.ode.nonstiff;
 
 /**
  * This class is used in the junit tests for the ODE integrators.
  * <p>This is the same as problem 1 except integration is done
  * backward in time</p>
  */
-class TestProblem5
+public class TestProblem5
   extends TestProblem1 {
 
   /** Serializable version identifier. */

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblem5.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblem5.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblemAbstract.java (from r669847, commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/TestProblemAbstract.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblemAbstract.java?p2=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblemAbstract.java&p1=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/TestProblemAbstract.java&r1=669847&r2=670469&rev=670469&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/TestProblemAbstract.java (original)
+++ commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblemAbstract.java Mon Jun 23 01:01:38 2008
@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math.ode.nonstiff;
 
 import org.apache.commons.math.ode.FirstOrderDifferentialEquations;
-import org.apache.commons.math.ode.SwitchingFunction;
+import org.apache.commons.math.ode.events.EventHandler;
 
 /**
  * This class is used as the base class of the problems that are
  * integrated during the junit tests for the ODE integrators.
  */
-abstract class TestProblemAbstract
+public abstract class TestProblemAbstract
   implements FirstOrderDifferentialEquations, Cloneable {
 
   /** Dimension of the problem. */
@@ -149,11 +149,10 @@
   }
 
   /**
-   * Get the switching functions.
-   * @return switching functions
-   */
-  public SwitchingFunction[] getSwitchingFunctions() {
-    return new SwitchingFunction[0];
+   * Get the events handlers.
+   * @return events handlers   */
+  public EventHandler[] getEventsHandlers() {
+    return new EventHandler[0];
   }
 
   /**

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblemAbstract.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblemAbstract.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblemFactory.java (from r669847, commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/TestProblemFactory.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblemFactory.java?p2=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblemFactory.java&p1=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/TestProblemFactory.java&r1=669847&r2=670469&rev=670469&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/TestProblemFactory.java (original)
+++ commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblemFactory.java Mon Jun 23 01:01:38 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math.ode.nonstiff;
 
 /**
  * This class is used in the junit tests for the ODE integrators.

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblemFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblemFactory.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblemHandler.java (from r669847, commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/TestProblemHandler.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblemHandler.java?p2=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblemHandler.java&p1=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/TestProblemHandler.java&r1=669847&r2=670469&rev=670469&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/TestProblemHandler.java (original)
+++ commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblemHandler.java Mon Jun 23 01:01:38 2008
@@ -15,11 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math.ode.nonstiff;
 
 import org.apache.commons.math.ode.DerivativeException;
-import org.apache.commons.math.ode.StepHandler;
-import org.apache.commons.math.ode.StepInterpolator;
+import org.apache.commons.math.ode.FirstOrderIntegrator;
+import org.apache.commons.math.ode.sampling.StepHandler;
+import org.apache.commons.math.ode.sampling.StepInterpolator;
 
 /**
  * This class is used to handle steps for the test problems
@@ -28,7 +29,10 @@
 class TestProblemHandler
   implements StepHandler {
 
-  /** Associated problem. */
+  /** Serializable version identifier. */
+    private static final long serialVersionUID = 3589490480549900461L;
+
+/** Associated problem. */
   private TestProblemAbstract problem;
 
   /** Maximal errors encountered during the integration. */

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblemHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/TestProblemHandler.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/ThreeEighthesIntegratorTest.java (from r669847, commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/ThreeEighthesIntegratorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/ThreeEighthesIntegratorTest.java?p2=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/ThreeEighthesIntegratorTest.java&p1=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/ThreeEighthesIntegratorTest.java&r1=669847&r2=670469&rev=670469&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/ThreeEighthesIntegratorTest.java (original)
+++ commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/ThreeEighthesIntegratorTest.java Mon Jun 23 01:01:38 2008
@@ -15,17 +15,17 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math.ode.nonstiff;
 
 import junit.framework.*;
 
 import org.apache.commons.math.ode.DerivativeException;
 import org.apache.commons.math.ode.FirstOrderIntegrator;
 import org.apache.commons.math.ode.IntegratorException;
-import org.apache.commons.math.ode.StepHandler;
-import org.apache.commons.math.ode.StepInterpolator;
-import org.apache.commons.math.ode.SwitchingFunction;
-import org.apache.commons.math.ode.ThreeEighthesIntegrator;
+import org.apache.commons.math.ode.events.EventHandler;
+import org.apache.commons.math.ode.nonstiff.ThreeEighthesIntegrator;
+import org.apache.commons.math.ode.sampling.StepHandler;
+import org.apache.commons.math.ode.sampling.StepInterpolator;
 
 public class ThreeEighthesIntegratorTest
   extends TestCase {
@@ -63,9 +63,9 @@
         FirstOrderIntegrator integ = new ThreeEighthesIntegrator(step);
         TestProblemHandler handler = new TestProblemHandler(pb, integ);
         integ.setStepHandler(handler);
-        SwitchingFunction[] functions = pb.getSwitchingFunctions();
+        EventHandler[] functions = pb.getEventsHandlers();
         for (int l = 0; l < functions.length; ++l) {
-          integ.addSwitchingFunction(functions[l],
+          integ.addEventHandler(functions[l],
                                      Double.POSITIVE_INFINITY, 1.0e-6 * step, 1000);
         }
         integ.integrate(pb, pb.getInitialTime(), pb.getInitialState(),
@@ -136,6 +136,8 @@
 
   private static class KeplerHandler implements StepHandler {
 
+    private static final long serialVersionUID = 4400497468419540899L;
+
     public KeplerHandler(TestProblem3 pb) {
       this.pb = pb;
       maxError = 0;

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/ThreeEighthesIntegratorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/ThreeEighthesIntegratorTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolatorTest.java (from r669847, commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/ThreeEighthesStepInterpolatorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolatorTest.java?p2=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolatorTest.java&p1=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/ThreeEighthesStepInterpolatorTest.java&r1=669847&r2=670469&rev=670469&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/ThreeEighthesStepInterpolatorTest.java (original)
+++ commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolatorTest.java Mon Jun 23 01:01:38 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math.ode.nonstiff;
 
 import junit.framework.*;
 import java.util.Random;
@@ -28,7 +28,7 @@
 import org.apache.commons.math.ode.ContinuousOutputModel;
 import org.apache.commons.math.ode.DerivativeException;
 import org.apache.commons.math.ode.IntegratorException;
-import org.apache.commons.math.ode.ThreeEighthesIntegrator;
+import org.apache.commons.math.ode.nonstiff.ThreeEighthesIntegrator;
 
 public class ThreeEighthesStepInterpolatorTest
   extends TestCase {

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolatorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolatorTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/sampling/DummyStepInterpolatorTest.java (from r669847, commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/DummyStepInterpolatorTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/sampling/DummyStepInterpolatorTest.java?p2=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/sampling/DummyStepInterpolatorTest.java&p1=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/DummyStepInterpolatorTest.java&r1=669847&r2=670469&rev=670469&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/DummyStepInterpolatorTest.java (original)
+++ commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/sampling/DummyStepInterpolatorTest.java Mon Jun 23 01:01:38 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math.ode.sampling;
 
 import junit.framework.*;
 import java.io.ByteArrayOutputStream;
@@ -24,6 +24,11 @@
 import java.io.ObjectInputStream;
 import java.io.IOException;
 
+import org.apache.commons.math.ode.DerivativeException;
+import org.apache.commons.math.ode.IntegratorException;
+import org.apache.commons.math.ode.sampling.AbstractStepInterpolator;
+import org.apache.commons.math.ode.sampling.DummyStepInterpolator;
+
 public class DummyStepInterpolatorTest
   extends TestCase {
 
@@ -151,8 +156,8 @@
     ObjectOutputStream    oos = new ObjectOutputStream(bos);
     oos.writeObject(interpolator);
 
-    assertTrue(bos.size () > 250);
-    assertTrue(bos.size () < 300);
+    assertTrue(bos.size () > 300);
+    assertTrue(bos.size () < 350);
 
     ByteArrayInputStream  bis = new ByteArrayInputStream(bos.toByteArray());
     ObjectInputStream     ois = new ObjectInputStream(bis);

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/sampling/DummyStepInterpolatorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/sampling/DummyStepInterpolatorTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/sampling/StepNormalizerTest.java (from r669847, commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/StepNormalizerTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/sampling/StepNormalizerTest.java?p2=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/sampling/StepNormalizerTest.java&p1=commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/StepNormalizerTest.java&r1=669847&r2=670469&rev=670469&view=diff
==============================================================================
--- commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/StepNormalizerTest.java (original)
+++ commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/sampling/StepNormalizerTest.java Mon Jun 23 01:01:38 2008
@@ -15,14 +15,15 @@
  * limitations under the License.
  */
 
-package org.apache.commons.math.ode;
+package org.apache.commons.math.ode.sampling;
 
 import org.apache.commons.math.ode.DerivativeException;
-import org.apache.commons.math.ode.DormandPrince54Integrator;
 import org.apache.commons.math.ode.FirstOrderIntegrator;
-import org.apache.commons.math.ode.FixedStepHandler;
 import org.apache.commons.math.ode.IntegratorException;
-import org.apache.commons.math.ode.StepNormalizer;
+import org.apache.commons.math.ode.nonstiff.DormandPrince54Integrator;
+import org.apache.commons.math.ode.nonstiff.TestProblem3;
+import org.apache.commons.math.ode.sampling.FixedStepHandler;
+import org.apache.commons.math.ode.sampling.StepNormalizer;
 
 import junit.framework.*;
 

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/sampling/StepNormalizerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/ode/sampling/StepNormalizerTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: commons/proper/math/branches/MATH_2_0/src/test/org/apache/commons/math/optimization/MultiDirectionalTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision



Mime
View raw message