Author: luc
Date: Wed Sep 28 06:18:40 2011
New Revision: 1176745
URL: http://svn.apache.org/viewvc?rev=1176745&view=rev
Log:
updated serialization metadata as we now serialize secondary equations too
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolator.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolator.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolator.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/EulerStepInterpolator.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolator.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolator.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolator.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolator.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolator.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolatorTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolatorTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolatorTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolatorTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolatorTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolatorTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolatorTest.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/sampling/DummyStepInterpolatorTest.java
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolator.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolator.java?rev=1176745&r1=1176744&r2=1176745&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolator.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolator.java
Wed Sep 28 06:18:40 2011
@@ -47,8 +47,8 @@ import org.apache.commons.math.ode.sampl
class ClassicalRungeKuttaStepInterpolator
extends RungeKuttaStepInterpolator {
- /** Serializable version identifier */
- private static final long serialVersionUID = -6576285612589783992L;
+ /** Serializable version identifier. */
+ private static final long serialVersionUID = 20110928L;
/** Simple constructor.
* This constructor builds an instance that is not usable yet, the
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolator.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolator.java?rev=1176745&r1=1176744&r2=1176745&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolator.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolator.java
Wed Sep 28 06:18:40 2011
@@ -71,8 +71,8 @@ class DormandPrince54StepInterpolator
/** Shampine (1986) Dense output, element 6. */
private static final double D6 = 69997945.0 / 29380423.0;
- /** Serializable version identifier */
- private static final long serialVersionUID = 4104157279605906956L;
+ /** Serializable version identifier. */
+ private static final long serialVersionUID = 20110928L;
/** First vector for interpolation. */
private double[] v1;
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolator.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolator.java?rev=1176745&r1=1176744&r2=1176745&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolator.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolator.java
Wed Sep 28 06:18:40 2011
@@ -38,8 +38,8 @@ import org.apache.commons.math.ode.sampl
class DormandPrince853StepInterpolator
extends RungeKuttaStepInterpolator {
- /** Serializable version identifier */
- private static final long serialVersionUID = 7152276390558450974L;
+ /** Serializable version identifier. */
+ private static final long serialVersionUID = 20110928L;
/** Propagation weights, element 1. */
private static final double B_01 = 104257.0 / 1920240.0;
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/EulerStepInterpolator.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/EulerStepInterpolator.java?rev=1176745&r1=1176744&r2=1176745&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/EulerStepInterpolator.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/EulerStepInterpolator.java
Wed Sep 28 06:18:40 2011
@@ -41,8 +41,8 @@ import org.apache.commons.math.ode.sampl
class EulerStepInterpolator
extends RungeKuttaStepInterpolator {
- /** Serializable version identifier */
- private static final long serialVersionUID = -7179861704951334960L;
+ /** Serializable version identifier. */
+ private static final long serialVersionUID = 20110928L;
/** Simple constructor.
* This constructor builds an instance that is not usable yet, the
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolator.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolator.java?rev=1176745&r1=1176744&r2=1176745&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolator.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolator.java
Wed Sep 28 06:18:40 2011
@@ -53,8 +53,8 @@ class GillStepInterpolator
/** Second Gill coefficient. */
private static final double TWO_PLUS_SQRT_2 = 2 + FastMath.sqrt(2.0);
- /** Serializable version identifier */
- private static final long serialVersionUID = -107804074496313322L;
+ /** Serializable version identifier. */
+ private static final long serialVersionUID = 20110928L;
/** Simple constructor.
* This constructor builds an instance that is not usable yet, the
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolator.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolator.java?rev=1176745&r1=1176744&r2=1176745&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolator.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolator.java
Wed Sep 28 06:18:40 2011
@@ -79,7 +79,7 @@ class GraggBulirschStoerStepInterpolator
extends AbstractStepInterpolator {
/** Serializable version identifier. */
- private static final long serialVersionUID = 7320613236731409847L;
+ private static final long serialVersionUID = 20110928L;
/** Slope at the beginning of the step. */
private double[] y0Dot;
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolator.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolator.java?rev=1176745&r1=1176744&r2=1176745&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolator.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolator.java
Wed Sep 28 06:18:40 2011
@@ -33,7 +33,7 @@ class HighamHall54StepInterpolator
extends RungeKuttaStepInterpolator {
/** Serializable version identifier */
- private static final long serialVersionUID = -3583240427587318654L;
+ private static final long serialVersionUID = 20110928L;
/** Simple constructor.
* This constructor builds an instance that is not usable yet, the
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolator.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolator.java?rev=1176745&r1=1176744&r2=1176745&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolator.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolator.java
Wed Sep 28 06:18:40 2011
@@ -43,8 +43,8 @@ import org.apache.commons.math.ode.sampl
class MidpointStepInterpolator
extends RungeKuttaStepInterpolator {
- /** Serializable version identifier */
- private static final long serialVersionUID = -865524111506042509L;
+ /** Serializable version identifier */
+ private static final long serialVersionUID = 20110928L;
/** Simple constructor.
* This constructor builds an instance that is not usable yet, the
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolator.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolator.java?rev=1176745&r1=1176744&r2=1176745&view=diff
==============================================================================
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolator.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolator.java
Wed Sep 28 06:18:40 2011
@@ -48,8 +48,8 @@ import org.apache.commons.math.ode.sampl
class ThreeEighthesStepInterpolator
extends RungeKuttaStepInterpolator {
- /** Serializable version identifier */
- private static final long serialVersionUID = -3345024435978721931L;
+ /** Serializable version identifier */
+ private static final long serialVersionUID = 20110928L;
/** Simple constructor.
* This constructor builds an instance that is not usable yet, the
Modified:
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolatorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolatorTest.java?rev=1176745&r1=1176744&r2=1176745&view=diff
==============================================================================
---
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolatorTest.java
(original)
+++
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolatorTest.java
Wed Sep 28 06:18:40 2011
@@ -61,8 +61,8 @@ public class ClassicalRungeKuttaStepInte
oos.writeObject(handler);
}
- Assert.assertTrue(bos.size () > 753000);
- Assert.assertTrue(bos.size () < 754000);
+ Assert.assertTrue(bos.size () > 750000);
+ Assert.assertTrue(bos.size () < 800000);
ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
ObjectInputStream ois = new ObjectInputStream(bis);
Modified:
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolatorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolatorTest.java?rev=1176745&r1=1176744&r2=1176745&view=diff
==============================================================================
---
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolatorTest.java
(original)
+++
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolatorTest.java
Wed Sep 28 06:18:40 2011
@@ -73,8 +73,8 @@ public class DormandPrince54StepInterpol
oos.writeObject(handler);
}
- Assert.assertTrue(bos.size () > 126000);
- Assert.assertTrue(bos.size () < 127000);
+ Assert.assertTrue(bos.size () > 125000);
+ Assert.assertTrue(bos.size () < 130000);
ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
ObjectInputStream ois = new ObjectInputStream(bis);
Modified:
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolatorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolatorTest.java?rev=1176745&r1=1176744&r2=1176745&view=diff
==============================================================================
---
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolatorTest.java
(original)
+++
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolatorTest.java
Wed Sep 28 06:18:40 2011
@@ -73,8 +73,8 @@ public class DormandPrince853StepInterpo
oos.writeObject(handler);
}
- Assert.assertTrue(bos.size () > 88000);
- Assert.assertTrue(bos.size () < 89000);
+ Assert.assertTrue(bos.size () > 85000);
+ Assert.assertTrue(bos.size () < 95000);
ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
ObjectInputStream ois = new ObjectInputStream(bis);
Modified:
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolatorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolatorTest.java?rev=1176745&r1=1176744&r2=1176745&view=diff
==============================================================================
---
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolatorTest.java
(original)
+++
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolatorTest.java
Wed Sep 28 06:18:40 2011
@@ -61,8 +61,8 @@ public class GillStepInterpolatorTest {
oos.writeObject(handler);
}
- Assert.assertTrue(bos.size () > 753000);
- Assert.assertTrue(bos.size () < 754000);
+ Assert.assertTrue(bos.size () > 750000);
+ Assert.assertTrue(bos.size () < 800000);
ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
ObjectInputStream ois = new ObjectInputStream(bis);
Modified:
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java?rev=1176745&r1=1176744&r2=1176745&view=diff
==============================================================================
---
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java
(original)
+++
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java
Wed Sep 28 06:18:40 2011
@@ -75,8 +75,8 @@ public class GraggBulirschStoerStepInter
oos.writeObject(handler);
}
- Assert.assertTrue(bos.size () > 34000);
- Assert.assertTrue(bos.size () < 35000);
+ Assert.assertTrue(bos.size () > 35000);
+ Assert.assertTrue(bos.size () < 36000);
ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
ObjectInputStream ois = new ObjectInputStream(bis);
Modified:
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolatorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolatorTest.java?rev=1176745&r1=1176744&r2=1176745&view=diff
==============================================================================
---
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolatorTest.java
(original)
+++
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolatorTest.java
Wed Sep 28 06:18:40 2011
@@ -73,8 +73,8 @@ public class HighamHall54StepInterpolato
oos.writeObject(handler);
}
- Assert.assertTrue(bos.size () > 167000);
- Assert.assertTrue(bos.size () < 168000);
+ Assert.assertTrue(bos.size () > 170000);
+ Assert.assertTrue(bos.size () < 175000);
ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
ObjectInputStream ois = new ObjectInputStream(bis);
Modified:
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolatorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolatorTest.java?rev=1176745&r1=1176744&r2=1176745&view=diff
==============================================================================
---
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolatorTest.java
(original)
+++
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolatorTest.java
Wed Sep 28 06:18:40 2011
@@ -62,8 +62,8 @@ public class MidpointStepInterpolatorTes
oos.writeObject(handler);
}
- Assert.assertTrue(bos.size () > 114000);
- Assert.assertTrue(bos.size () < 115000);
+ Assert.assertTrue(bos.size () > 120000);
+ Assert.assertTrue(bos.size () < 125000);
ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
ObjectInputStream ois = new ObjectInputStream(bis);
Modified:
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolatorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolatorTest.java?rev=1176745&r1=1176744&r2=1176745&view=diff
==============================================================================
---
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolatorTest.java
(original)
+++
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolatorTest.java
Wed Sep 28 06:18:40 2011
@@ -61,8 +61,8 @@ public class ThreeEighthesStepInterpolat
oos.writeObject(handler);
}
- Assert.assertTrue(bos.size () > 753000);
- Assert.assertTrue(bos.size () < 754000);
+ Assert.assertTrue(bos.size () > 750000);
+ Assert.assertTrue(bos.size () < 800000);
ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
ObjectInputStream ois = new ObjectInputStream(bis);
Modified:
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/sampling/DummyStepInterpolatorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/sampling/DummyStepInterpolatorTest.java?rev=1176745&r1=1176744&r2=1176745&view=diff
==============================================================================
---
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/sampling/DummyStepInterpolatorTest.java
(original)
+++
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/sampling/DummyStepInterpolatorTest.java
Wed Sep 28 06:18:40 2011
@@ -85,8 +85,8 @@ public class DummyStepInterpolatorTest {
ObjectOutputStream oos = new ObjectOutputStream(bos);
oos.writeObject(interpolator);
- Assert.assertTrue(bos.size () > 200);
- Assert.assertTrue(bos.size () < 300);
+ Assert.assertTrue(bos.size () > 300);
+ Assert.assertTrue(bos.size () < 500);
ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
ObjectInputStream ois = new ObjectInputStream(bis);
