Author: luc
Date: Sun Jun 7 19:04:37 2009
New Revision: 782431
URL: http://svn.apache.org/viewvc?rev=782431&view=rev
Log:
added a lazy evaluation for step interpolators
moved the possible exceptions from setInterpolatedTime (which now does almost
nothing) to getInterpolatedState and getInterpolatedDerivatives (which now do
the evaluations)
renamed an internal function to make sure people overriding it don't forget to
set the derivatives
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/ContinuousOutputModel.java
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/AbstractStepInterpolator.java
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/DummyStepInterpolator.java
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/NordsieckStepInterpolator.java
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/StepInterpolator.java
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/ContinuousOutputModel.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/ContinuousOutputModel.java?rev=782431&r1=782430&r2=782431&view=diff
==============================================================================
---
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/ContinuousOutputModel.java
(original)
+++
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/ContinuousOutputModel.java
Sun Jun 7 19:04:37 2009
@@ -233,7 +233,6 @@
*/
public void setInterpolatedTime(final double time) {
- try {
// initialize the search with the complete steps table
int iMin = 0;
final StepInterpolator sMin = steps.get(iMin);
@@ -318,17 +317,15 @@
steps.get(index).setInterpolatedTime(time);
- } catch (DerivativeException de) {
- throw new MathRuntimeException(de, "unexpected exception caught");
- }
-
}
/**
* Get the state vector of the interpolated point.
* @return state vector at time {...@link #getInterpolatedTime}
+ * @throws DerivativeException if this call induces an automatic
+ * step finalization that throws one
*/
- public double[] getInterpolatedState() {
+ public double[] getInterpolatedState() throws DerivativeException {
return steps.get(index).getInterpolatedState();
}
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/AbstractStepInterpolator.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/AbstractStepInterpolator.java?rev=782431&r1=782430&r2=782431&view=diff
==============================================================================
---
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/AbstractStepInterpolator.java
(original)
+++
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/AbstractStepInterpolator.java
Sun Jun 7 19:04:37 2009
@@ -74,6 +74,10 @@
/** integration direction. */
private boolean forward;
+ /** indicator for dirty state. */
+ private boolean dirtyState;
+
+
/** Simple constructor.
* This constructor builds an instance that is not usable yet, the
* {...@link #reinitialize} method should be called before using the
@@ -94,6 +98,7 @@
interpolatedDerivatives = null;
finalized = false;
this.forward = true;
+ this.dirtyState = true;
}
/** Simple constructor.
@@ -114,6 +119,7 @@
finalized = false;
this.forward = forward;
+ this.dirtyState = true;
}
@@ -151,8 +157,9 @@
interpolatedDerivatives = null;
}
- finalized = interpolator.finalized;
- forward = interpolator.forward;
+ finalized = interpolator.finalized;
+ forward = interpolator.forward;
+ dirtyState = interpolator.dirtyState;
}
@@ -174,6 +181,7 @@
finalized = false;
this.forward = forward;
+ this.dirtyState = true;
}
@@ -210,14 +218,12 @@
*/
public void storeTime(final double t) {
- currentTime = t;
- h = currentTime - previousTime;
- interpolatedTime = t;
- System.arraycopy(currentState, 0, interpolatedState, 0,
- currentState.length);
+ currentTime = t;
+ h = currentTime - previousTime;
+ setInterpolatedTime(t);
// the step is not finalized anymore
- finalized = false;
+ finalized = false;
}
@@ -237,12 +243,9 @@
}
/** {...@inheritdoc} */
- public void setInterpolatedTime(final double time)
- throws DerivativeException {
+ public void setInterpolatedTime(final double time) {
interpolatedTime = time;
- final double oneMinusThetaH = currentTime - interpolatedTime;
- final double theta = (h == 0) ? 0 : (h - oneMinusThetaH) / h;
- computeInterpolatedState(theta, oneMinusThetaH);
+ dirtyState = true;
}
/** {...@inheritdoc} */
@@ -250,7 +253,7 @@
return forward;
}
- /** Compute the state at the interpolated time.
+ /** Compute the state and derivatives at the interpolated time.
* This is the main processing method that should be implemented by
* the derived classes to perform the interpolation.
* @param theta normalized interpolation abscissa within the step
@@ -260,18 +263,38 @@
* @throws DerivativeException this exception is propagated to the caller if
the
* underlying user function triggers one
*/
- protected abstract void computeInterpolatedState(double theta,
- double oneMinusThetaH)
+ protected abstract void computeInterpolatedStateAndDerivatives(double theta,
+ double
oneMinusThetaH)
throws DerivativeException;
/** {...@inheritdoc} */
- public double[] getInterpolatedState() {
- return interpolatedState;
+ public double[] getInterpolatedState() throws DerivativeException {
+
+ // lazy evaluation of the state
+ if (dirtyState) {
+ final double oneMinusThetaH = currentTime - interpolatedTime;
+ final double theta = (h == 0) ? 0 : (h - oneMinusThetaH) / h;
+ computeInterpolatedStateAndDerivatives(theta, oneMinusThetaH);
+ dirtyState = false;
+ }
+
+ return interpolatedState;
+
}
/** {...@inheritdoc} */
- public double[] getInterpolatedDerivatives() {
- return interpolatedDerivatives;
+ public double[] getInterpolatedDerivatives() throws DerivativeException {
+
+ // lazy evaluation of the state
+ if (dirtyState) {
+ final double oneMinusThetaH = currentTime - interpolatedTime;
+ final double theta = (h == 0) ? 0 : (h - oneMinusThetaH) / h;
+ computeInterpolatedStateAndDerivatives(theta, oneMinusThetaH);
+ dirtyState = false;
+ }
+
+ return interpolatedDerivatives;
+
}
/**
@@ -398,6 +421,7 @@
currentTime = in.readDouble();
h = in.readDouble();
forward = in.readBoolean();
+ dirtyState = true;
if (dimension < 0) {
currentState = null;
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/DummyStepInterpolator.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/DummyStepInterpolator.java?rev=782431&r1=782430&r2=782431&view=diff
==============================================================================
---
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/DummyStepInterpolator.java
(original)
+++
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/DummyStepInterpolator.java
Sun Jun 7 19:04:37 2009
@@ -17,11 +17,10 @@
package org.apache.commons.math.ode.sampling;
+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.nonstiff.EmbeddedRungeKuttaIntegrator;
@@ -93,7 +92,7 @@
* underlying user function triggers one
*/
@Override
- protected void computeInterpolatedState(final double theta, final double
oneMinusThetaH)
+ protected void computeInterpolatedStateAndDerivatives(final double theta,
final double oneMinusThetaH)
throws DerivativeException {
System.arraycopy(currentState, 0, interpolatedState, 0,
currentState.length);
}
@@ -120,12 +119,8 @@
// read the base class
final double t = readBaseExternal(in);
- 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/sampling/NordsieckStepInterpolator.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/NordsieckStepInterpolator.java?rev=782431&r1=782430&r2=782431&view=diff
==============================================================================
---
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/NordsieckStepInterpolator.java
(original)
+++
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/NordsieckStepInterpolator.java
Sun Jun 7 19:04:37 2009
@@ -22,12 +22,9 @@
import java.io.ObjectOutput;
import java.util.Arrays;
-import org.apache.commons.math.MathRuntimeException;
import org.apache.commons.math.linear.RealMatrix;
import org.apache.commons.math.linear.RealMatrixImpl;
import org.apache.commons.math.linear.RealMatrixPreservingVisitor;
-import org.apache.commons.math.ode.DerivativeException;
-import org.apache.commons.math.ode.nonstiff.AdamsIntegrator;
/**
* This class implements an interpolator for integrators using Nordsieck
representation.
@@ -35,7 +32,8 @@
* <p>This interpolator computes dense output around the current point.
* The interpolation equation is based on Taylor series formulas.
*
- * @see AdamsIntegrator
+ * @see org.apache.commons.math.ode.nonstiff.AdamsBashforthIntegrator
+ * @see org.apache.commons.math.ode.nonstiff.AdamsMoultonIntegrator
* @version $Revision$ $Date$
* @since 2.0
*/
@@ -48,6 +46,14 @@
/** Step size used in the first scaled derivative and Nordsieck vector. */
private double scalingH;
+ /** Reference time for all arrays.
+ * <p>Sometimes, the reference time is the same as previousTime,
+ * sometimes it is the same as currentTime, so we use a separate
+ * field to avoid any confusion.
+ * </p>
+ */
+ private double referenceTime;
+
/** First scaled derivative. */
private double[] scaled;
@@ -101,34 +107,29 @@
/** Reinitialize the instance
* <p>Beware that all arrays <em>must</em> be references to integrator
* arrays, in order to ensure proper update without copy.</p>
+ * @param referenceTime time at which all arrays are defined
* @param scalingH step size used in the scaled and nordsieck arrays
* @param scaled reference to the integrator array holding the first
* scaled derivative
* @param nordsieck reference to the integrator matrix holding the
* nordsieck vector
*/
- public void reinitialize(final double scalingH, final double[] scaled,
- final RealMatrix nordsieck) {
- this.scalingH = scalingH;
- this.scaled = scaled;
- this.nordsieck = nordsieck;
- }
+ public void reinitialize(final double referenceTime, final double scalingH,
+ final double[] scaled, final RealMatrix
nordsieck) {
+ this.referenceTime = referenceTime;
+ this.scalingH = scalingH;
+ this.scaled = scaled;
+ this.nordsieck = nordsieck;
+
+ // make sure the state and derivatives will depend on the new arrays
+ setInterpolatedTime(getInterpolatedTime());
- /** Store the current step time.
- * @param t current time
- */
- @Override
- public void storeTime(final double t) {
- currentTime = t;
- h = currentTime - previousTime;
- interpolatedTime = t;
- computeInterpolatedState(1.0, 0.0);
}
/** {...@inheritdoc} */
@Override
- protected void computeInterpolatedState(final double theta, final double
oneMinusThetaH) {
- final double x = theta * h;
+ protected void computeInterpolatedStateAndDerivatives(final double theta,
final double oneMinusThetaH) {
+ final double x = interpolatedTime - referenceTime;
nordsieck.walkInOptimizedOrder(new StateEstimator(x, x / scalingH));
}
@@ -254,13 +255,9 @@
nordsieck = null;
}
- try {
- if (hasScaled && hasNordsieck) {
- // we can now set the interpolated time and state
- setInterpolatedTime(t);
- }
- } catch (DerivativeException e) {
- throw MathRuntimeException.createIOException(e);
+ if (hasScaled && hasNordsieck) {
+ // we can now set the interpolated time and state
+ setInterpolatedTime(t);
}
}
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/StepInterpolator.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/StepInterpolator.java?rev=782431&r1=782430&r2=782431&view=diff
==============================================================================
---
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/StepInterpolator.java
(original)
+++
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/StepInterpolator.java
Sun Jun 7 19:04:37 2009
@@ -82,11 +82,8 @@
* specific state must be preserved, a copy of the instance must be
* created using {...@link #copy()}.</p>
* @param time time of the interpolated point
- * @throws DerivativeException if this call induces an automatic
- * step finalization that throws one
*/
- public void setInterpolatedTime(double time)
- throws DerivativeException;
+ public void setInterpolatedTime(double time);
/**
* Get the state vector of the interpolated point.
@@ -95,8 +92,11 @@
* to be preserved across several calls.</p>
* @return state vector at time {...@link #getInterpolatedTime}
* @see #getInterpolatedDerivatives()
+ * @throws DerivativeException if this call induces an automatic
+ * step finalization that throws one
*/
- public double[] getInterpolatedState();
+ public double[] getInterpolatedState()
+ throws DerivativeException;
/**
* Get the derivatives of the state vector of the interpolated point.
@@ -105,9 +105,12 @@
* to be preserved across several calls.</p>
* @return derivatives of the state vector at time {...@link
#getInterpolatedTime}
* @see #getInterpolatedState()
+ * @throws DerivativeException if this call induces an automatic
+ * step finalization that throws one
* @since 2.0
*/
- public double[] getInterpolatedDerivatives();
+ public double[] getInterpolatedDerivatives()
+ throws DerivativeException;
/** Check if the natural integration direction is forward.
* <p>This method provides the integration direction as specified by
