updated step interpolators implementations to latest interface changes

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@782432 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Luc Maisonobe 2009-06-07 19:08:26 +00:00
parent 7de1b628c6
commit 5124ebc4c2
10 changed files with 15 additions and 26 deletions

View File

@ -81,7 +81,7 @@ class ClassicalRungeKuttaStepInterpolator
/** {@inheritDoc} */
@Override
protected void computeInterpolatedState(final double theta,
protected void computeInterpolatedStateAndDerivatives(final double theta,
final double oneMinusThetaH)
throws DerivativeException {

View File

@ -109,7 +109,7 @@ class DormandPrince54StepInterpolator
/** {@inheritDoc} */
@Override
protected void computeInterpolatedState(final double theta,
protected void computeInterpolatedStateAndDerivatives(final double theta,
final double oneMinusThetaH)
throws DerivativeException {

View File

@ -131,7 +131,7 @@ class DormandPrince853StepInterpolator
/** {@inheritDoc} */
@Override
protected void computeInterpolatedState(final double theta,
protected void computeInterpolatedStateAndDerivatives(final double theta,
final double oneMinusThetaH)
throws DerivativeException {

View File

@ -76,7 +76,7 @@ class EulerStepInterpolator
/** {@inheritDoc} */
@Override
protected void computeInterpolatedState(final double theta,
protected void computeInterpolatedStateAndDerivatives(final double theta,
final double oneMinusThetaH)
throws DerivativeException {

View File

@ -78,7 +78,7 @@ class GillStepInterpolator
/** {@inheritDoc} */
@Override
protected void computeInterpolatedState(final double theta,
protected void computeInterpolatedStateAndDerivatives(final double theta,
final double oneMinusThetaH)
throws DerivativeException {

View File

@ -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 @@ class GraggBulirschStoerStepInterpolator
/** {@inheritDoc} */
@Override
protected void computeInterpolatedState(final double theta,
protected void computeInterpolatedStateAndDerivatives(final double theta,
final double oneMinusThetaH)
throws DerivativeException {
@ -393,12 +392,8 @@ class GraggBulirschStoerStepInterpolator
}
}
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);
}

View File

@ -65,7 +65,7 @@ class HighamHall54StepInterpolator
/** {@inheritDoc} */
@Override
protected void computeInterpolatedState(final double theta,
protected void computeInterpolatedStateAndDerivatives(final double theta,
final double oneMinusThetaH)
throws DerivativeException {

View File

@ -75,7 +75,7 @@ class MidpointStepInterpolator
/** {@inheritDoc} */
@Override
protected void computeInterpolatedState(final double theta,
protected void computeInterpolatedStateAndDerivatives(final double theta,
final double oneMinusThetaH)
throws DerivativeException {

View File

@ -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 @@ abstract class RungeKuttaStepInterpolator
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;
}

View File

@ -80,7 +80,7 @@ class ThreeEighthesStepInterpolator
/** {@inheritDoc} */
@Override
protected void computeInterpolatedState(final double theta,
protected void computeInterpolatedStateAndDerivatives(final double theta,
final double oneMinusThetaH)
throws DerivativeException {