commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From l..@apache.org
Subject svn commit: r782432 - /commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/
Date Sun, 07 Jun 2009 19:08:27 GMT
Author: luc
Date: Sun Jun  7 19:08:26 2009
New Revision: 782432

URL: http://svn.apache.org/viewvc?rev=782432&view=rev
Log:
updated step interpolators implementations to latest interface changes

Modified:
    commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolator.java
    commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolator.java
    commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolator.java
    commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/EulerStepInterpolator.java
    commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolator.java
    commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolator.java
    commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolator.java
    commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolator.java
    commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/RungeKuttaStepInterpolator.java
    commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolator.java

Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolator.java?rev=782432&r1=782431&r2=782432&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolator.java
(original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolator.java
Sun Jun  7 19:08:26 2009
@@ -81,7 +81,7 @@
 
     /** {@inheritDoc} */
     @Override
-    protected void computeInterpolatedState(final double theta,
+    protected void computeInterpolatedStateAndDerivatives(final double theta,
                                             final double oneMinusThetaH)
         throws DerivativeException {
 

Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolator.java?rev=782432&r1=782431&r2=782432&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolator.java
(original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolator.java
Sun Jun  7 19:08:26 2009
@@ -109,7 +109,7 @@
 
   /** {@inheritDoc} */
   @Override
-  protected void computeInterpolatedState(final double theta,
+  protected void computeInterpolatedStateAndDerivatives(final double theta,
                                           final double oneMinusThetaH)
     throws DerivativeException {
 

Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolator.java?rev=782432&r1=782431&r2=782432&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolator.java
(original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolator.java
Sun Jun  7 19:08:26 2009
@@ -131,7 +131,7 @@
 
   /** {@inheritDoc} */
   @Override
-  protected void computeInterpolatedState(final double theta,
+  protected void computeInterpolatedStateAndDerivatives(final double theta,
                                           final double oneMinusThetaH)
     throws DerivativeException {
 

Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/EulerStepInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/EulerStepInterpolator.java?rev=782432&r1=782431&r2=782432&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/EulerStepInterpolator.java
(original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/EulerStepInterpolator.java
Sun Jun  7 19:08:26 2009
@@ -76,7 +76,7 @@
 
   /** {@inheritDoc} */
   @Override
-  protected void computeInterpolatedState(final double theta,
+  protected void computeInterpolatedStateAndDerivatives(final double theta,
                                           final double oneMinusThetaH)
     throws DerivativeException {
 

Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolator.java?rev=782432&r1=782431&r2=782432&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolator.java
(original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolator.java
Sun Jun  7 19:08:26 2009
@@ -78,7 +78,7 @@
 
   /** {@inheritDoc} */
   @Override
-  protected void computeInterpolatedState(final double theta,
+  protected void computeInterpolatedStateAndDerivatives(final double theta,
                                           final double oneMinusThetaH)
     throws DerivativeException {
 

Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolator.java?rev=782432&r1=782431&r2=782432&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolator.java
(original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolator.java
Sun Jun  7 19:08:26 2009
@@ -17,11 +17,10 @@
 
 package org.apache.commons.math.ode.nonstiff;
 
+import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.io.IOException;
 
-import org.apache.commons.math.MathRuntimeException;
 import org.apache.commons.math.ode.DerivativeException;
 import org.apache.commons.math.ode.sampling.AbstractStepInterpolator;
 import org.apache.commons.math.ode.sampling.StepInterpolator;
@@ -307,7 +306,7 @@
 
   /** {@inheritDoc} */
   @Override
-  protected void computeInterpolatedState(final double theta,
+  protected void computeInterpolatedStateAndDerivatives(final double theta,
                                           final double oneMinusThetaH)
     throws DerivativeException {
 
@@ -393,12 +392,8 @@
       }
     }
 
-    try {
-      // we can now set the interpolated time and state
-      setInterpolatedTime(t);
-    } catch (DerivativeException e) {
-      throw MathRuntimeException.createIOException(e);
-    }
+    // we can now set the interpolated time and state
+    setInterpolatedTime(t);
 
   }
 

Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolator.java?rev=782432&r1=782431&r2=782432&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolator.java
(original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolator.java
Sun Jun  7 19:08:26 2009
@@ -65,7 +65,7 @@
 
   /** {@inheritDoc} */
   @Override
-  protected void computeInterpolatedState(final double theta,
+  protected void computeInterpolatedStateAndDerivatives(final double theta,
                                           final double oneMinusThetaH)
     throws DerivativeException {
 

Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolator.java?rev=782432&r1=782431&r2=782432&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolator.java
(original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolator.java
Sun Jun  7 19:08:26 2009
@@ -75,7 +75,7 @@
 
   /** {@inheritDoc} */
   @Override
-  protected void computeInterpolatedState(final double theta,
+  protected void computeInterpolatedStateAndDerivatives(final double theta,
                                           final double oneMinusThetaH)
     throws DerivativeException {
 

Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/RungeKuttaStepInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/RungeKuttaStepInterpolator.java?rev=782432&r1=782431&r2=782432&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/RungeKuttaStepInterpolator.java
(original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/RungeKuttaStepInterpolator.java
Sun Jun  7 19:08:26 2009
@@ -17,12 +17,10 @@
 
 package org.apache.commons.math.ode.nonstiff;
 
+import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.io.IOException;
 
-import org.apache.commons.math.MathRuntimeException;
-import org.apache.commons.math.ode.DerivativeException;
 import org.apache.commons.math.ode.FirstOrderDifferentialEquations;
 import org.apache.commons.math.ode.sampling.AbstractStepInterpolator;
 
@@ -168,12 +166,8 @@
     equations = null;
 
     if (currentState != null) {
-        try {
-            // we can now set the interpolated time and state
-            setInterpolatedTime(t);
-        } catch (DerivativeException e) {
-            throw MathRuntimeException.createIOException(e);
-        }
+        // we can now set the interpolated time and state
+        setInterpolatedTime(t);
     } else {
         interpolatedTime = t;
     }

Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolator.java?rev=782432&r1=782431&r2=782432&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolator.java
(original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolator.java
Sun Jun  7 19:08:26 2009
@@ -80,7 +80,7 @@
 
   /** {@inheritDoc} */
   @Override
-  protected void computeInterpolatedState(final double theta,
+  protected void computeInterpolatedStateAndDerivatives(final double theta,
                                           final double oneMinusThetaH)
       throws DerivativeException {
 



Mime
View raw message