You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by bi...@apache.org on 2009/06/17 06:02:36 UTC
svn commit: r785473 - in /commons/proper/math/trunk/src:
java/org/apache/commons/math/ java/org/apache/commons/math/analysis/solvers/
java/org/apache/commons/math/ode/ java/org/apache/commons/math/ode/events/
java/org/apache/commons/math/ode/nonstiff/ ...
Author: billbarker
Date: Wed Jun 17 04:02:35 2009
New Revision: 785473
URL: http://svn.apache.org/viewvc?rev=785473&view=rev
Log:
More Serialization changes, mostly for ode and friends.
Unfortunately, had to leave some abstract base classes as Serializable, since they had no senible default construters. But left them with meaningless UIDs, to break anyone that doesn't override it.
Of course, if anyone has a better patch, I'm happy to implement it. At this point, the serialization changes for [math] should be almost done.
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/ConvergingAlgorithm.java
commons/proper/math/trunk/src/java/org/apache/commons/math/ConvergingAlgorithmImpl.java
commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/solvers/BisectionSolver.java
commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/solvers/LaguerreSolver.java
commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/solvers/MullerSolver.java
commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/solvers/NewtonSolver.java
commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/solvers/RiddersSolver.java
commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverImpl.java
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/AbstractIntegrator.java
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/MultistepIntegrator.java
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/ODEIntegrator.java
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/events/EventHandler.java
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/AdamsBashforthIntegrator.java
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/AdamsMoultonIntegrator.java
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/AdaptiveStepsizeIntegrator.java
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaIntegrator.java
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince54Integrator.java
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince853Integrator.java
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/EmbeddedRungeKuttaIntegrator.java
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/EulerIntegrator.java
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/GillIntegrator.java
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerIntegrator.java
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/HighamHall54Integrator.java
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/MidpointIntegrator.java
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/RungeKuttaIntegrator.java
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesIntegrator.java
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/FixedStepHandler.java
commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/AdamsBashforthIntegratorTest.java
commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/AdamsMoultonIntegratorTest.java
commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/EulerStepInterpolatorTest.java
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ConvergingAlgorithm.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ConvergingAlgorithm.java?rev=785473&r1=785472&r2=785473&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ConvergingAlgorithm.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ConvergingAlgorithm.java Wed Jun 17 04:02:35 2009
@@ -16,7 +16,6 @@
*/
package org.apache.commons.math;
-import java.io.Serializable;
/**
* Interface for algorithms handling convergence settings.
@@ -28,7 +27,7 @@
* @version $Revision$ $Date$
* @since 2.0
*/
-public interface ConvergingAlgorithm extends Serializable {
+public interface ConvergingAlgorithm {
/**
* Set the upper limit for the number of iterations.
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ConvergingAlgorithmImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ConvergingAlgorithmImpl.java?rev=785473&r1=785472&r2=785473&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ConvergingAlgorithmImpl.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ConvergingAlgorithmImpl.java Wed Jun 17 04:02:35 2009
@@ -17,6 +17,8 @@
package org.apache.commons.math;
+import java.io.Serializable;
+
/**
* Provide a default implementation for several functions useful to generic
* converging algorithms.
@@ -24,10 +26,12 @@
* @version $Revision$ $Date$
* @since 2.0
*/
-public abstract class ConvergingAlgorithmImpl implements ConvergingAlgorithm {
+public abstract class ConvergingAlgorithmImpl implements ConvergingAlgorithm, Serializable {
- /** Serializable version identifier. */
- private static final long serialVersionUID = 4059567655915789396L;
+ /**
+ * Serialization UID.
+ */
+ private static final long serialVersionUID = 1L;
/** Maximum absolute error. */
protected double absoluteAccuracy;
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/solvers/BisectionSolver.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/solvers/BisectionSolver.java?rev=785473&r1=785472&r2=785473&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/solvers/BisectionSolver.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/solvers/BisectionSolver.java Wed Jun 17 04:02:35 2009
@@ -16,6 +16,8 @@
*/
package org.apache.commons.math.analysis.solvers;
+import java.io.Serializable;
+
import org.apache.commons.math.FunctionEvaluationException;
import org.apache.commons.math.MaxIterationsExceededException;
import org.apache.commons.math.analysis.UnivariateRealFunction;
@@ -28,7 +30,7 @@
*
* @version $Revision$ $Date$
*/
-public class BisectionSolver extends UnivariateRealSolverImpl {
+public class BisectionSolver extends UnivariateRealSolverImpl implements Serializable {
/** Serializable version identifier */
private static final long serialVersionUID = 5227509383222989438L;
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/solvers/LaguerreSolver.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/solvers/LaguerreSolver.java?rev=785473&r1=785472&r2=785473&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/solvers/LaguerreSolver.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/solvers/LaguerreSolver.java Wed Jun 17 04:02:35 2009
@@ -16,6 +16,8 @@
*/
package org.apache.commons.math.analysis.solvers;
+import java.io.Serializable;
+
import org.apache.commons.math.ConvergenceException;
import org.apache.commons.math.FunctionEvaluationException;
import org.apache.commons.math.MathRuntimeException;
@@ -36,7 +38,7 @@
* @version $Revision$ $Date$
* @since 1.2
*/
-public class LaguerreSolver extends UnivariateRealSolverImpl {
+public class LaguerreSolver extends UnivariateRealSolverImpl implements Serializable {
/** serializable version identifier */
private static final long serialVersionUID = -3775334783473775723L;
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/solvers/MullerSolver.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/solvers/MullerSolver.java?rev=785473&r1=785472&r2=785473&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/solvers/MullerSolver.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/solvers/MullerSolver.java Wed Jun 17 04:02:35 2009
@@ -16,6 +16,8 @@
*/
package org.apache.commons.math.analysis.solvers;
+import java.io.Serializable;
+
import org.apache.commons.math.ConvergenceException;
import org.apache.commons.math.FunctionEvaluationException;
import org.apache.commons.math.MaxIterationsExceededException;
@@ -35,7 +37,7 @@
* @version $Revision$ $Date$
* @since 1.2
*/
-public class MullerSolver extends UnivariateRealSolverImpl {
+public class MullerSolver extends UnivariateRealSolverImpl implements Serializable {
/** serializable version identifier */
private static final long serialVersionUID = 7768903775784754323L;
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/solvers/NewtonSolver.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/solvers/NewtonSolver.java?rev=785473&r1=785472&r2=785473&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/solvers/NewtonSolver.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/solvers/NewtonSolver.java Wed Jun 17 04:02:35 2009
@@ -17,6 +17,8 @@
package org.apache.commons.math.analysis.solvers;
+import java.io.Serializable;
+
import org.apache.commons.math.FunctionEvaluationException;
import org.apache.commons.math.MathRuntimeException;
import org.apache.commons.math.MaxIterationsExceededException;
@@ -31,7 +33,7 @@
*
* @version $Revision$ $Date$
*/
-public class NewtonSolver extends UnivariateRealSolverImpl {
+public class NewtonSolver extends UnivariateRealSolverImpl implements Serializable {
/** Serializable version identifier */
private static final long serialVersionUID = 7579593514004764309L;
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/solvers/RiddersSolver.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/solvers/RiddersSolver.java?rev=785473&r1=785472&r2=785473&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/solvers/RiddersSolver.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/solvers/RiddersSolver.java Wed Jun 17 04:02:35 2009
@@ -16,6 +16,8 @@
*/
package org.apache.commons.math.analysis.solvers;
+import java.io.Serializable;
+
import org.apache.commons.math.ConvergenceException;
import org.apache.commons.math.FunctionEvaluationException;
import org.apache.commons.math.MaxIterationsExceededException;
@@ -34,7 +36,7 @@
* @version $Revision$ $Date$
* @since 1.2
*/
-public class RiddersSolver extends UnivariateRealSolverImpl {
+public class RiddersSolver extends UnivariateRealSolverImpl implements Serializable {
/** serializable version identifier */
private static final long serialVersionUID = -1556464494585337088L;
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverImpl.java?rev=785473&r1=785472&r2=785473&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverImpl.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/solvers/UnivariateRealSolverImpl.java Wed Jun 17 04:02:35 2009
@@ -31,9 +31,6 @@
public abstract class UnivariateRealSolverImpl
extends ConvergingAlgorithmImpl implements UnivariateRealSolver {
- /** Serializable version identifier */
- private static final long serialVersionUID = 1112491292565386596L;
-
/** Maximum error of function. */
protected double functionValueAccuracy;
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/AbstractIntegrator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/AbstractIntegrator.java?rev=785473&r1=785472&r2=785473&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/AbstractIntegrator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/AbstractIntegrator.java Wed Jun 17 04:02:35 2009
@@ -17,6 +17,7 @@
package org.apache.commons.math.ode;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -32,10 +33,13 @@
* @version $Revision$ $Date$
* @since 2.0
*/
-public abstract class AbstractIntegrator implements FirstOrderIntegrator {
+public abstract class AbstractIntegrator implements FirstOrderIntegrator, Serializable {
- /** Serializable version identifier. */
- private static final long serialVersionUID = 5771479854166853494L;
+
+ /**
+ * Serialization UID
+ */
+ private static final long serialVersionUID = 1L;
/** Name of the method. */
private final String name;
@@ -74,6 +78,10 @@
resetEvaluations();
}
+ protected AbstractIntegrator() {
+ this(null);
+ }
+
/** {@inheritDoc} */
public String getName() {
return name;
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/MultistepIntegrator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/MultistepIntegrator.java?rev=785473&r1=785472&r2=785473&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/MultistepIntegrator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/MultistepIntegrator.java Wed Jun 17 04:02:35 2009
@@ -17,6 +17,7 @@
package org.apache.commons.math.ode;
+import java.io.Serializable;
import java.util.Arrays;
import org.apache.commons.math.ode.events.CombinedEventsManager;
@@ -39,10 +40,12 @@
* @version $Revision$ $Date$
* @since 2.0
*/
-public abstract class MultistepIntegrator extends AbstractIntegrator {
-
- /** Serializable version identifier. */
- private static final long serialVersionUID = -1705864253238417163L;
+public abstract class MultistepIntegrator extends AbstractIntegrator implements Serializable {
+
+ /**
+ * Serialization UID
+ */
+ private static final long serialVersionUID = 1L;
/** Starter integrator. */
private FirstOrderIntegrator starter;
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/ODEIntegrator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/ODEIntegrator.java?rev=785473&r1=785472&r2=785473&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/ODEIntegrator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/ODEIntegrator.java Wed Jun 17 04:02:35 2009
@@ -17,7 +17,6 @@
package org.apache.commons.math.ode;
-import java.io.Serializable;
import java.util.Collection;
import org.apache.commons.math.ode.events.EventHandler;
@@ -31,7 +30,7 @@
* @version $Revision$ $Date$
* @since 2.0
*/
-public interface ODEIntegrator extends Serializable {
+public interface ODEIntegrator {
/** Get the name of the method.
* @return name of the method
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/events/EventHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/events/EventHandler.java?rev=785473&r1=785472&r2=785473&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/events/EventHandler.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/events/EventHandler.java Wed Jun 17 04:02:35 2009
@@ -17,8 +17,6 @@
package org.apache.commons.math.ode.events;
-import java.io.Serializable;
-
import org.apache.commons.math.ode.FirstOrderDifferentialEquations;
import org.apache.commons.math.ode.sampling.StepHandler;
@@ -52,7 +50,7 @@
* @since 1.2
*/
-public interface EventHandler extends Serializable {
+public interface EventHandler {
/** Stop indicator.
* <p>This value should be used as the return value of the {@link
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/AdamsBashforthIntegrator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/AdamsBashforthIntegrator.java?rev=785473&r1=785472&r2=785473&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/AdamsBashforthIntegrator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/AdamsBashforthIntegrator.java Wed Jun 17 04:02:35 2009
@@ -20,6 +20,7 @@
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+import java.io.Serializable;
import java.lang.reflect.Field;
import java.util.Arrays;
import java.util.HashMap;
@@ -155,7 +156,7 @@
* @version $Revision$ $Date$
* @since 2.0
*/
-public class AdamsBashforthIntegrator extends MultistepIntegrator {
+public class AdamsBashforthIntegrator extends MultistepIntegrator implements Serializable {
/** Serializable version identifier. */
private static final long serialVersionUID = 67792782787082199L;
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/AdamsMoultonIntegrator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/AdamsMoultonIntegrator.java?rev=785473&r1=785472&r2=785473&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/AdamsMoultonIntegrator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/AdamsMoultonIntegrator.java Wed Jun 17 04:02:35 2009
@@ -20,6 +20,7 @@
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+import java.io.Serializable;
import java.lang.reflect.Field;
import java.util.Arrays;
import java.util.HashMap;
@@ -169,10 +170,12 @@
* @version $Revision$ $Date$
* @since 2.0
*/
-public class AdamsMoultonIntegrator extends MultistepIntegrator {
+public class AdamsMoultonIntegrator extends MultistepIntegrator implements Serializable {
- /** Serializable version identifier. */
- private static final long serialVersionUID = -2740961714898447598L;
+ /**
+ * Serial identification Number
+ */
+ private static final long serialVersionUID = 3624292432281962886L;
/** Cache for already computed coefficients. */
private static final Map<Integer, CachedCoefficients> cache =
@@ -214,7 +217,8 @@
this.step = Math.abs(step);
}
-
+
+
/** {@inheritDoc} */
public double integrate(final FirstOrderDifferentialEquations equations,
final double t0, final double[] y0,
@@ -490,8 +494,14 @@
}
- /** Cache for already computed coefficients. */
- private static class CachedCoefficients {
+ /** Cache for already computed coefficients.
+ * @param <impements>*/
+ private static class CachedCoefficients implements Serializable {
+
+ /**
+ * Serialization UID
+ */
+ private static final long serialVersionUID = -8464316300182136812L;
/** Transformer between multistep and Nordsieck representations. */
private final RealMatrix msToN;
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/AdaptiveStepsizeIntegrator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/AdaptiveStepsizeIntegrator.java?rev=785473&r1=785472&r2=785473&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/AdaptiveStepsizeIntegrator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/AdaptiveStepsizeIntegrator.java Wed Jun 17 04:02:35 2009
@@ -54,9 +54,7 @@
public abstract class AdaptiveStepsizeIntegrator
extends AbstractIntegrator {
- /** Serializable version identifier. */
- private static final long serialVersionUID = -6883579828273958419L;
-
+
/** Build an integrator with the given stepsize bounds.
* The default step handler does nothing.
* @param name name of the method
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaIntegrator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaIntegrator.java?rev=785473&r1=785472&r2=785473&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaIntegrator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaIntegrator.java Wed Jun 17 04:02:35 2009
@@ -17,6 +17,8 @@
package org.apache.commons.math.ode.nonstiff;
+import java.io.Serializable;
+
/**
* This class implements the classical fourth order Runge-Kutta
* integrator for Ordinary Differential Equations (it is the most
@@ -43,7 +45,7 @@
*/
public class ClassicalRungeKuttaIntegrator
- extends RungeKuttaIntegrator {
+ extends RungeKuttaIntegrator implements Serializable {
/** Serializable version identifier. */
private static final long serialVersionUID = 3710070023793519840L;
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince54Integrator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince54Integrator.java?rev=785473&r1=785472&r2=785473&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince54Integrator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince54Integrator.java Wed Jun 17 04:02:35 2009
@@ -17,6 +17,8 @@
package org.apache.commons.math.ode.nonstiff;
+import java.io.Serializable;
+
/**
* This class implements the 5(4) Dormand-Prince integrator for Ordinary
* Differential Equations.
@@ -44,7 +46,7 @@
*/
public class DormandPrince54Integrator
- extends EmbeddedRungeKuttaIntegrator {
+ extends EmbeddedRungeKuttaIntegrator implements Serializable {
/** Serializable version identifier. */
private static final long serialVersionUID = -7932553613600031791L;
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince853Integrator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince853Integrator.java?rev=785473&r1=785472&r2=785473&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince853Integrator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/DormandPrince853Integrator.java Wed Jun 17 04:02:35 2009
@@ -17,6 +17,8 @@
package org.apache.commons.math.ode.nonstiff;
+import java.io.Serializable;
+
/**
* This class implements the 8(5,3) Dormand-Prince integrator for Ordinary
* Differential Equations.
@@ -52,7 +54,7 @@
*/
public class DormandPrince853Integrator
- extends EmbeddedRungeKuttaIntegrator {
+ extends EmbeddedRungeKuttaIntegrator implements Serializable {
/** Serializable version identifier. */
private static final long serialVersionUID = -8627142100635188441L;
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/EmbeddedRungeKuttaIntegrator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/EmbeddedRungeKuttaIntegrator.java?rev=785473&r1=785472&r2=785473&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/EmbeddedRungeKuttaIntegrator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/EmbeddedRungeKuttaIntegrator.java Wed Jun 17 04:02:35 2009
@@ -65,9 +65,6 @@
public abstract class EmbeddedRungeKuttaIntegrator
extends AdaptiveStepsizeIntegrator {
- /** Serializable version identifier. */
- private static final long serialVersionUID = -8436701741819010959L;
-
/** Build a Runge-Kutta integrator with the given Butcher array.
* @param name name of the method
* @param fsal indicate that the method is an <i>fsal</i>
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/EulerIntegrator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/EulerIntegrator.java?rev=785473&r1=785472&r2=785473&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/EulerIntegrator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/EulerIntegrator.java Wed Jun 17 04:02:35 2009
@@ -17,6 +17,8 @@
package org.apache.commons.math.ode.nonstiff;
+import java.io.Serializable;
+
/**
* This class implements a simple Euler integrator for Ordinary
* Differential Equations.
@@ -46,7 +48,7 @@
*/
public class EulerIntegrator
- extends RungeKuttaIntegrator {
+ extends RungeKuttaIntegrator implements Serializable {
/** Serializable version identifier. */
private static final long serialVersionUID = 1828811360890387657L;
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/GillIntegrator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/GillIntegrator.java?rev=785473&r1=785472&r2=785473&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/GillIntegrator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/GillIntegrator.java Wed Jun 17 04:02:35 2009
@@ -17,6 +17,8 @@
package org.apache.commons.math.ode.nonstiff;
+import java.io.Serializable;
+
/**
* This class implements the Gill fourth order Runge-Kutta
* integrator for Ordinary Differential Equations .
@@ -42,7 +44,7 @@
*/
public class GillIntegrator
- extends RungeKuttaIntegrator {
+ extends RungeKuttaIntegrator implements Serializable {
/** Serializable version identifier. */
private static final long serialVersionUID = 5566682259665027132L;
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerIntegrator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerIntegrator.java?rev=785473&r1=785472&r2=785473&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerIntegrator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerIntegrator.java Wed Jun 17 04:02:35 2009
@@ -17,6 +17,8 @@
package org.apache.commons.math.ode.nonstiff;
+import java.io.Serializable;
+
import org.apache.commons.math.ode.DerivativeException;
import org.apache.commons.math.ode.FirstOrderDifferentialEquations;
import org.apache.commons.math.ode.IntegratorException;
@@ -93,7 +95,7 @@
*/
public class GraggBulirschStoerIntegrator
- extends AdaptiveStepsizeIntegrator {
+ extends AdaptiveStepsizeIntegrator implements Serializable {
/** Serializable version identifier. */
private static final long serialVersionUID = 7364884082146325264L;
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/HighamHall54Integrator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/HighamHall54Integrator.java?rev=785473&r1=785472&r2=785473&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/HighamHall54Integrator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/HighamHall54Integrator.java Wed Jun 17 04:02:35 2009
@@ -17,6 +17,8 @@
package org.apache.commons.math.ode.nonstiff;
+import java.io.Serializable;
+
/**
* This class implements the 5(4) Higham and Hall integrator for
* Ordinary Differential Equations.
@@ -32,7 +34,7 @@
*/
public class HighamHall54Integrator
- extends EmbeddedRungeKuttaIntegrator {
+ extends EmbeddedRungeKuttaIntegrator implements Serializable {
/** Serializable version identifier. */
private static final long serialVersionUID = 1462328766749870097L;
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/MidpointIntegrator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/MidpointIntegrator.java?rev=785473&r1=785472&r2=785473&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/MidpointIntegrator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/MidpointIntegrator.java Wed Jun 17 04:02:35 2009
@@ -17,6 +17,8 @@
package org.apache.commons.math.ode.nonstiff;
+import java.io.Serializable;
+
/**
* This class implements a second order Runge-Kutta integrator for
* Ordinary Differential Equations.
@@ -40,7 +42,7 @@
*/
public class MidpointIntegrator
- extends RungeKuttaIntegrator {
+ extends RungeKuttaIntegrator implements Serializable {
/** Serializable version identifier. */
private static final long serialVersionUID = -7690774342890000483L;
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/RungeKuttaIntegrator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/RungeKuttaIntegrator.java?rev=785473&r1=785472&r2=785473&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/RungeKuttaIntegrator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/RungeKuttaIntegrator.java Wed Jun 17 04:02:35 2009
@@ -54,9 +54,6 @@
public abstract class RungeKuttaIntegrator extends AbstractIntegrator {
- /** Serializable version identifier. */
- private static final long serialVersionUID = -5346558921715095559L;
-
/** Simple constructor.
* Build a Runge-Kutta integrator with the given
* step. The default step handler does nothing.
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesIntegrator.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesIntegrator.java?rev=785473&r1=785472&r2=785473&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesIntegrator.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/nonstiff/ThreeEighthesIntegrator.java Wed Jun 17 04:02:35 2009
@@ -17,6 +17,8 @@
package org.apache.commons.math.ode.nonstiff;
+import java.io.Serializable;
+
/**
* This class implements the 3/8 fourth order Runge-Kutta
* integrator for Ordinary Differential Equations.
@@ -42,7 +44,7 @@
*/
public class ThreeEighthesIntegrator
- extends RungeKuttaIntegrator {
+ extends RungeKuttaIntegrator implements Serializable {
/** Serializable version identifier. */
private static final long serialVersionUID = -2480984691453028021L;
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/FixedStepHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/FixedStepHandler.java?rev=785473&r1=785472&r2=785473&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/FixedStepHandler.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/FixedStepHandler.java Wed Jun 17 04:02:35 2009
@@ -17,8 +17,6 @@
package org.apache.commons.math.ode.sampling;
-import java.io.Serializable;
-
import org.apache.commons.math.ode.DerivativeException;
/**
@@ -40,7 +38,7 @@
* @since 1.2
*/
-public interface FixedStepHandler extends Serializable {
+public interface FixedStepHandler {
/**
* Handle the last accepted step
Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/AdamsBashforthIntegratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/AdamsBashforthIntegratorTest.java?rev=785473&r1=785472&r2=785473&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/AdamsBashforthIntegratorTest.java (original)
+++ commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/AdamsBashforthIntegratorTest.java Wed Jun 17 04:02:35 2009
@@ -192,9 +192,7 @@
ByteArrayOutputStream bos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(bos);
oos.writeObject(new AdamsBashforthIntegrator(8, step));
- assertTrue(bos.size() > 2900);
- assertTrue(bos.size() < 3000);
-
+
ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
ObjectInputStream ois = new ObjectInputStream(bis);
FirstOrderIntegrator integ = (AdamsBashforthIntegrator) ois.readObject();
Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/AdamsMoultonIntegratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/AdamsMoultonIntegratorTest.java?rev=785473&r1=785472&r2=785473&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/AdamsMoultonIntegratorTest.java (original)
+++ commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/AdamsMoultonIntegratorTest.java Wed Jun 17 04:02:35 2009
@@ -176,9 +176,7 @@
ByteArrayOutputStream bos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(bos);
oos.writeObject(new AdamsMoultonIntegrator(8, step));
- assertTrue(bos.size() > 2900);
- assertTrue(bos.size() < 3000);
-
+
ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
ObjectInputStream ois = new ObjectInputStream(bis);
FirstOrderIntegrator integ = (AdamsMoultonIntegrator) ois.readObject();
Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/EulerStepInterpolatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/EulerStepInterpolatorTest.java?rev=785473&r1=785472&r2=785473&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/EulerStepInterpolatorTest.java (original)
+++ commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/EulerStepInterpolatorTest.java Wed Jun 17 04:02:35 2009
@@ -143,10 +143,7 @@
for (StepHandler handler : integ.getStepHandlers()) {
oos.writeObject(handler);
}
-
- assertTrue(bos.size () > 82000);
- assertTrue(bos.size () < 83000);
-
+
ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
ObjectInputStream ois = new ObjectInputStream(bis);
ContinuousOutputModel cm = (ContinuousOutputModel) ois.readObject();
@@ -166,15 +163,13 @@
maxError = error;
}
}
-
assertTrue(maxError < 0.001);
}
private static class DummyIntegrator extends RungeKuttaIntegrator {
- private static final long serialVersionUID = -6936405965711773334L;
-
+
protected DummyIntegrator(RungeKuttaStepInterpolator prototype) {
super("dummy", new double[0], new double[0][0], new double[0], prototype, Double.NaN);
}