diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolator.java b/src/main/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolator.java index 1453b9065..42796c755 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolator.java +++ b/src/main/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolator.java @@ -47,8 +47,8 @@ import org.apache.commons.math.ode.sampling.StepInterpolator; 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 diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolator.java b/src/main/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolator.java index 52cdcdf48..af32c4c01 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolator.java +++ b/src/main/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolator.java @@ -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; diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolator.java b/src/main/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolator.java index ebf3049b1..45ebb82f6 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolator.java +++ b/src/main/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolator.java @@ -38,8 +38,8 @@ import org.apache.commons.math.ode.sampling.StepInterpolator; 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; diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/EulerStepInterpolator.java b/src/main/java/org/apache/commons/math/ode/nonstiff/EulerStepInterpolator.java index 7046fdcb6..99a604f3b 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/EulerStepInterpolator.java +++ b/src/main/java/org/apache/commons/math/ode/nonstiff/EulerStepInterpolator.java @@ -41,8 +41,8 @@ import org.apache.commons.math.ode.sampling.StepInterpolator; 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 diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolator.java b/src/main/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolator.java index 118dda113..e956b200e 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolator.java +++ b/src/main/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolator.java @@ -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 diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolator.java b/src/main/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolator.java index ef346b847..6446beeec 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolator.java +++ b/src/main/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolator.java @@ -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; diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolator.java b/src/main/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolator.java index f44d63219..ba112d449 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolator.java +++ b/src/main/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolator.java @@ -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 diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolator.java b/src/main/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolator.java index 5d0dd2b53..1c7648365 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolator.java +++ b/src/main/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolator.java @@ -43,8 +43,8 @@ import org.apache.commons.math.ode.sampling.StepInterpolator; 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 diff --git a/src/main/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolator.java b/src/main/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolator.java index ccf17e12c..731ec444c 100644 --- a/src/main/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolator.java +++ b/src/main/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolator.java @@ -48,8 +48,8 @@ import org.apache.commons.math.ode.sampling.StepInterpolator; 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 diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolatorTest.java b/src/test/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolatorTest.java index 29d02df63..57bbf7a9f 100644 --- a/src/test/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolatorTest.java +++ b/src/test/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaStepInterpolatorTest.java @@ -61,8 +61,8 @@ public class ClassicalRungeKuttaStepInterpolatorTest { 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); diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolatorTest.java b/src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolatorTest.java index a61239ea3..51cba08e7 100644 --- a/src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolatorTest.java +++ b/src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolatorTest.java @@ -73,8 +73,8 @@ public class DormandPrince54StepInterpolatorTest { 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); diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolatorTest.java b/src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolatorTest.java index 83390a63b..0a8ea97c8 100644 --- a/src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolatorTest.java +++ b/src/test/java/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolatorTest.java @@ -73,8 +73,8 @@ public class DormandPrince853StepInterpolatorTest { 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); diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolatorTest.java b/src/test/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolatorTest.java index 84ee5ac28..7cbb992f1 100644 --- a/src/test/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolatorTest.java +++ b/src/test/java/org/apache/commons/math/ode/nonstiff/GillStepInterpolatorTest.java @@ -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); diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java b/src/test/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java index 0dfa08699..89e5ad089 100644 --- a/src/test/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java +++ b/src/test/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java @@ -75,8 +75,8 @@ public class GraggBulirschStoerStepInterpolatorTest { 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); diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolatorTest.java b/src/test/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolatorTest.java index a67fe7dea..691ce4a68 100644 --- a/src/test/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolatorTest.java +++ b/src/test/java/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolatorTest.java @@ -73,8 +73,8 @@ public class HighamHall54StepInterpolatorTest { 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); diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolatorTest.java b/src/test/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolatorTest.java index d68afcf23..3b71c961c 100644 --- a/src/test/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolatorTest.java +++ b/src/test/java/org/apache/commons/math/ode/nonstiff/MidpointStepInterpolatorTest.java @@ -62,8 +62,8 @@ public class MidpointStepInterpolatorTest { 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); diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolatorTest.java b/src/test/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolatorTest.java index 4808049d6..6ffad4fdd 100644 --- a/src/test/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolatorTest.java +++ b/src/test/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesStepInterpolatorTest.java @@ -61,8 +61,8 @@ public class ThreeEighthesStepInterpolatorTest { 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); diff --git a/src/test/java/org/apache/commons/math/ode/sampling/DummyStepInterpolatorTest.java b/src/test/java/org/apache/commons/math/ode/sampling/DummyStepInterpolatorTest.java index 5d37e1082..7f58fa29d 100644 --- a/src/test/java/org/apache/commons/math/ode/sampling/DummyStepInterpolatorTest.java +++ b/src/test/java/org/apache/commons/math/ode/sampling/DummyStepInterpolatorTest.java @@ -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);