You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by lu...@apache.org on 2009/06/20 20:53:09 UTC
svn commit: r786881 - in /commons/proper/math/trunk/src:
java/org/apache/commons/math/ode/ java/org/apache/commons/math/ode/events/
java/org/apache/commons/math/ode/nonstiff/
java/org/apache/commons/math/ode/sampling/
test/org/apache/commons/math/ode/n...
Author: luc
Date: Sat Jun 20 18:53:08 2009
New Revision: 786881
URL: http://svn.apache.org/viewvc?rev=786881&view=rev
Log:
removed lots of serialization in ODE
the only classes/interfaces for which serialization is really important in this package are the step interpolators. The reason for that is that the ContinuousOutputModel is explicitly serializable and contains step interpolators. This allows users to perform integration of any complex model and to save the result of the integration for all integration range by serializing a ContinuousOutputModel instance. This feature is a major one.
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/AbstractIntegrator.java
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/FirstOrderConverter.java
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/FirstOrderDifferentialEquations.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/events/CombinedEventsManager.java
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/events/EventState.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/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/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/ThreeEighthesIntegrator.java
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/DummyStepHandler.java
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/StepHandler.java
commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/StepNormalizer.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/ClassicalRungeKuttaIntegratorTest.java
commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince54IntegratorTest.java
commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolatorTest.java
commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince853IntegratorTest.java
commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolatorTest.java
commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/EulerIntegratorTest.java
commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/GillIntegratorTest.java
commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerIntegratorTest.java
commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java
commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/HighamHall54IntegratorTest.java
commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolatorTest.java
commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/MidpointIntegratorTest.java
commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/TestProblemHandler.java
commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/ThreeEighthesIntegratorTest.java
commons/proper/math/trunk/src/test/org/apache/commons/math/ode/sampling/StepInterpolatorTestUtils.java
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=786881&r1=786880&r2=786881&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 Sat Jun 20 18:53:08 2009
@@ -17,7 +17,6 @@
package org.apache.commons.math.ode;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -33,14 +32,9 @@
* @version $Revision$ $Date$
* @since 2.0
*/
-public abstract class AbstractIntegrator implements FirstOrderIntegrator, Serializable {
+public abstract class AbstractIntegrator implements FirstOrderIntegrator {
- /**
- * Serialization UID
- */
- private static final long serialVersionUID = 1L;
-
/** Name of the method. */
private final String name;
@@ -254,9 +248,6 @@
/** Specialized event handler to stop integration. */
private static class EndTimeChecker implements EventHandler {
- /** Serializable version identifier. */
- private static final long serialVersionUID = -7029115498939113263L;
-
/** Desired end time. */
private final double endTime;
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/FirstOrderConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/FirstOrderConverter.java?rev=786881&r1=786880&r2=786881&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/FirstOrderConverter.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/FirstOrderConverter.java Sat Jun 20 18:53:08 2009
@@ -53,11 +53,7 @@
* @since 1.2
*/
-public class FirstOrderConverter
- implements FirstOrderDifferentialEquations {
-
- /** Serializable version identifier. */
- private static final long serialVersionUID = -8233657110042144146L;
+public class FirstOrderConverter implements FirstOrderDifferentialEquations {
/** Simple constructor.
* Build a converter around a second order equations set.
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/FirstOrderDifferentialEquations.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/FirstOrderDifferentialEquations.java?rev=786881&r1=786880&r2=786881&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/FirstOrderDifferentialEquations.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/FirstOrderDifferentialEquations.java Sat Jun 20 18:53:08 2009
@@ -17,7 +17,6 @@
package org.apache.commons.math.ode;
-import java.io.Serializable;
/** This interface represents a first order differential equations set.
*
@@ -46,7 +45,7 @@
* @since 1.2
*/
-public interface FirstOrderDifferentialEquations extends Serializable {
+public interface FirstOrderDifferentialEquations {
/** Get the dimension of the problem.
* @return dimension of the problem
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=786881&r1=786880&r2=786881&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 Sat Jun 20 18:53:08 2009
@@ -41,9 +41,6 @@
*/
public abstract class MultistepIntegrator extends AdaptiveStepsizeIntegrator {
- /** Serializable version identifier. */
- private static final long serialVersionUID = 1L;
-
/** Transformer. */
protected final transient NordsieckTransformer transformer;
@@ -311,9 +308,6 @@
/** Specialized step handler storing the first step. */
private class NordsieckInitializer implements StepHandler {
- /** Serializable version identifier. */
- private static final long serialVersionUID = 4452937833660410413L;
-
/** Problem dimension. */
private final int n;
@@ -386,9 +380,6 @@
/** Wrapper for differential equations, ensuring start evaluations are counted. */
private class CountingDifferentialEquations implements FirstOrderDifferentialEquations {
- /** Serializable uid. */
- private static final long serialVersionUID = -6329212616396607764L;
-
/** Dimension of the problem. */
private final int dimension;
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/events/CombinedEventsManager.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/events/CombinedEventsManager.java?rev=786881&r1=786880&r2=786881&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/events/CombinedEventsManager.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/events/CombinedEventsManager.java Sat Jun 20 18:53:08 2009
@@ -17,7 +17,6 @@
package org.apache.commons.math.ode.events;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -36,10 +35,7 @@
* @since 1.2
*/
-public class CombinedEventsManager implements Serializable {
-
- /** Serializable version identifier. */
- private static final long serialVersionUID = -4151965151236441261L;
+public class CombinedEventsManager {
/** Events states. */
private final List<EventState> states;
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/events/EventState.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/events/EventState.java?rev=786881&r1=786880&r2=786881&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/events/EventState.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/events/EventState.java Sat Jun 20 18:53:08 2009
@@ -17,8 +17,6 @@
package org.apache.commons.math.ode.events;
-import java.io.Serializable;
-
import org.apache.commons.math.ConvergenceException;
import org.apache.commons.math.FunctionEvaluationException;
import org.apache.commons.math.analysis.UnivariateRealFunction;
@@ -40,10 +38,7 @@
* @version $Revision$ $Date$
* @since 1.2
*/
-public class EventState implements Serializable {
-
- /** Serializable version identifier. */
- private static final long serialVersionUID = -216176055159247559L;
+public class EventState {
/** Event handler. */
private final EventHandler handler;
@@ -196,7 +191,6 @@
increasing = (gb >= ga);
final UnivariateRealFunction f = new UnivariateRealFunction() {
- private static final long serialVersionUID = 620905575148456915L;
public double value(final double t) throws FunctionEvaluationException {
try {
interpolator.setInterpolatedTime(t);
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=786881&r1=786880&r2=786881&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 Sat Jun 20 18:53:08 2009
@@ -17,8 +17,6 @@
package org.apache.commons.math.ode.nonstiff;
-import java.io.Serializable;
-
import org.apache.commons.math.linear.RealMatrix;
import org.apache.commons.math.ode.DerivativeException;
import org.apache.commons.math.ode.FirstOrderDifferentialEquations;
@@ -140,10 +138,7 @@
* @version $Revision$ $Date$
* @since 2.0
*/
-public class AdamsBashforthIntegrator extends MultistepIntegrator implements Serializable {
-
- /** Serializable version identifier. */
- private static final long serialVersionUID = 67792782787082199L;
+public class AdamsBashforthIntegrator extends MultistepIntegrator {
/**
* Build an Adams-Bashforth with the given order and step size.
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=786881&r1=786880&r2=786881&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 Sat Jun 20 18:53:08 2009
@@ -17,7 +17,6 @@
package org.apache.commons.math.ode.nonstiff;
-import java.io.Serializable;
import java.util.Arrays;
import org.apache.commons.math.linear.MatrixVisitorException;
@@ -156,12 +155,7 @@
* @version $Revision$ $Date$
* @since 2.0
*/
-public class AdamsMoultonIntegrator extends MultistepIntegrator implements Serializable {
-
- /**
- * Serial identification Number
- */
- private static final long serialVersionUID = 3624292432281962886L;
+public class AdamsMoultonIntegrator extends MultistepIntegrator {
/**
* Build an Adams-Moulton integrator with the given order and step size.
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=786881&r1=786880&r2=786881&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 Sat Jun 20 18:53:08 2009
@@ -17,7 +17,6 @@
package org.apache.commons.math.ode.nonstiff;
-import java.io.Serializable;
/**
* This class implements the classical fourth order Runge-Kutta
@@ -44,11 +43,7 @@
* @since 1.2
*/
-public class ClassicalRungeKuttaIntegrator
- extends RungeKuttaIntegrator implements Serializable {
-
- /** Serializable version identifier. */
- private static final long serialVersionUID = 3710070023793519840L;
+public class ClassicalRungeKuttaIntegrator extends RungeKuttaIntegrator {
/** Time steps Butcher array. */
private static final double[] c = {
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=786881&r1=786880&r2=786881&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 Sat Jun 20 18:53:08 2009
@@ -17,7 +17,6 @@
package org.apache.commons.math.ode.nonstiff;
-import java.io.Serializable;
/**
* This class implements the 5(4) Dormand-Prince integrator for Ordinary
@@ -45,11 +44,7 @@
* @since 1.2
*/
-public class DormandPrince54Integrator
- extends EmbeddedRungeKuttaIntegrator implements Serializable {
-
- /** Serializable version identifier. */
- private static final long serialVersionUID = -7932553613600031791L;
+public class DormandPrince54Integrator extends EmbeddedRungeKuttaIntegrator {
/** Integrator method name. */
private static final String METHOD_NAME = "Dormand-Prince 5(4)";
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=786881&r1=786880&r2=786881&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 Sat Jun 20 18:53:08 2009
@@ -17,7 +17,6 @@
package org.apache.commons.math.ode.nonstiff;
-import java.io.Serializable;
/**
* This class implements the 8(5,3) Dormand-Prince integrator for Ordinary
@@ -53,11 +52,7 @@
* @since 1.2
*/
-public class DormandPrince853Integrator
- extends EmbeddedRungeKuttaIntegrator implements Serializable {
-
- /** Serializable version identifier. */
- private static final long serialVersionUID = -8627142100635188441L;
+public class DormandPrince853Integrator extends EmbeddedRungeKuttaIntegrator {
/** Integrator method name. */
private static final String METHOD_NAME = "Dormand-Prince 8 (5, 3)";
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=786881&r1=786880&r2=786881&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 Sat Jun 20 18:53:08 2009
@@ -17,7 +17,6 @@
package org.apache.commons.math.ode.nonstiff;
-import java.io.Serializable;
/**
* This class implements a simple Euler integrator for Ordinary
@@ -47,11 +46,7 @@
* @since 1.2
*/
-public class EulerIntegrator
- extends RungeKuttaIntegrator implements Serializable {
-
- /** Serializable version identifier. */
- private static final long serialVersionUID = 1828811360890387657L;
+public class EulerIntegrator extends RungeKuttaIntegrator {
/** Time steps Butcher array. */
private static final double[] c = {
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=786881&r1=786880&r2=786881&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 Sat Jun 20 18:53:08 2009
@@ -17,7 +17,6 @@
package org.apache.commons.math.ode.nonstiff;
-import java.io.Serializable;
/**
* This class implements the Gill fourth order Runge-Kutta
@@ -43,11 +42,7 @@
* @since 1.2
*/
-public class GillIntegrator
- extends RungeKuttaIntegrator implements Serializable {
-
- /** Serializable version identifier. */
- private static final long serialVersionUID = 5566682259665027132L;
+public class GillIntegrator extends RungeKuttaIntegrator {
/** Time steps Butcher array. */
private static final double[] c = {
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=786881&r1=786880&r2=786881&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 Sat Jun 20 18:53:08 2009
@@ -17,8 +17,6 @@
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;
@@ -94,11 +92,7 @@
* @since 1.2
*/
-public class GraggBulirschStoerIntegrator
- extends AdaptiveStepsizeIntegrator implements Serializable {
-
- /** Serializable version identifier. */
- private static final long serialVersionUID = 7364884082146325264L;
+public class GraggBulirschStoerIntegrator extends AdaptiveStepsizeIntegrator {
/** Integrator method name. */
private static final String METHOD_NAME = "Gragg-Bulirsch-Stoer";
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=786881&r1=786880&r2=786881&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 Sat Jun 20 18:53:08 2009
@@ -17,7 +17,6 @@
package org.apache.commons.math.ode.nonstiff;
-import java.io.Serializable;
/**
* This class implements the 5(4) Higham and Hall integrator for
@@ -33,11 +32,7 @@
* @since 1.2
*/
-public class HighamHall54Integrator
- extends EmbeddedRungeKuttaIntegrator implements Serializable {
-
- /** Serializable version identifier. */
- private static final long serialVersionUID = 1462328766749870097L;
+public class HighamHall54Integrator extends EmbeddedRungeKuttaIntegrator {
/** Integrator method name. */
private static final String METHOD_NAME = "Higham-Hall 5(4)";
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=786881&r1=786880&r2=786881&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 Sat Jun 20 18:53:08 2009
@@ -17,7 +17,6 @@
package org.apache.commons.math.ode.nonstiff;
-import java.io.Serializable;
/**
* This class implements a second order Runge-Kutta integrator for
@@ -41,11 +40,7 @@
* @since 1.2
*/
-public class MidpointIntegrator
- extends RungeKuttaIntegrator implements Serializable {
-
- /** Serializable version identifier. */
- private static final long serialVersionUID = -7690774342890000483L;
+public class MidpointIntegrator extends RungeKuttaIntegrator {
/** Time steps Butcher array. */
private static final double[] c = {
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=786881&r1=786880&r2=786881&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 Sat Jun 20 18:53:08 2009
@@ -17,7 +17,6 @@
package org.apache.commons.math.ode.nonstiff;
-import java.io.Serializable;
/**
* This class implements the 3/8 fourth order Runge-Kutta
@@ -43,11 +42,7 @@
* @since 1.2
*/
-public class ThreeEighthesIntegrator
- extends RungeKuttaIntegrator implements Serializable {
-
- /** Serializable version identifier. */
- private static final long serialVersionUID = -2480984691453028021L;
+public class ThreeEighthesIntegrator extends RungeKuttaIntegrator {
/** Time steps Butcher array. */
private static final double[] c = {
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/DummyStepHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/DummyStepHandler.java?rev=786881&r1=786880&r2=786881&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/DummyStepHandler.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/DummyStepHandler.java Sat Jun 20 18:53:08 2009
@@ -17,7 +17,6 @@
package org.apache.commons.math.ode.sampling;
-import java.io.Serializable;
/**
* This class is a step handler that does nothing.
@@ -36,8 +35,7 @@
* @since 1.2
*/
-public class DummyStepHandler
- implements StepHandler, Serializable {
+public class DummyStepHandler implements StepHandler {
/** Private constructor.
* The constructor is private to prevent users from creating
@@ -86,7 +84,4 @@
/** The only instance. */
private static final DummyStepHandler instance = new DummyStepHandler();
- /** Serializable version identifier */
- private static final long serialVersionUID = 2731635121223090252L;
-
}
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/StepHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/StepHandler.java?rev=786881&r1=786880&r2=786881&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/StepHandler.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/StepHandler.java Sat Jun 20 18:53:08 2009
@@ -17,8 +17,6 @@
package org.apache.commons.math.ode.sampling;
-import java.io.Serializable;
-
import org.apache.commons.math.ode.ContinuousOutputModel;
import org.apache.commons.math.ode.DerivativeException;
import org.apache.commons.math.ode.FirstOrderIntegrator;
@@ -44,7 +42,7 @@
* @since 1.2
*/
-public interface StepHandler extends Serializable {
+public interface StepHandler {
/** Determines whether this handler needs dense output.
* <p>This method allows the integrator to avoid performing extra
Modified: commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/StepNormalizer.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/StepNormalizer.java?rev=786881&r1=786880&r2=786881&view=diff
==============================================================================
--- commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/StepNormalizer.java (original)
+++ commons/proper/math/trunk/src/java/org/apache/commons/math/ode/sampling/StepNormalizer.java Sat Jun 20 18:53:08 2009
@@ -49,9 +49,6 @@
public class StepNormalizer implements StepHandler {
- /** Serializable version identifier. */
- private static final long serialVersionUID = -789699939659144654L;
-
/** Fixed time step. */
private double h;
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=786881&r1=786880&r2=786881&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 Sat Jun 20 18:53:08 2009
@@ -20,12 +20,6 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.commons.math.ode.DerivativeException;
import org.apache.commons.math.ode.FirstOrderIntegrator;
import org.apache.commons.math.ode.IntegratorException;
@@ -155,30 +149,4 @@
}
- @Test
- public void serialization()
- throws IntegratorException, DerivativeException,
- IOException, ClassNotFoundException {
-
- TestProblem6 pb = new TestProblem6();
- double range = Math.abs(pb.getFinalTime() - pb.getInitialTime());
-
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- ObjectOutputStream oos = new ObjectOutputStream(bos);
- oos.writeObject(new AdamsBashforthIntegrator(5, 0, range, 1.0e-12, 1.0e-12));
- assertTrue(bos.size() > 2800);
- assertTrue(bos.size() < 3000);
-
- ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
- ObjectInputStream ois = new ObjectInputStream(bis);
- FirstOrderIntegrator integ = (AdamsBashforthIntegrator) ois.readObject();
- assertEquals("Adams-Bashforth", integ.getName());
- TestProblemHandler handler = new TestProblemHandler(pb, integ);
- integ.addStepHandler(handler);
- integ.integrate(pb, pb.getInitialTime(), pb.getInitialState(),
- pb.getFinalTime(), new double[pb.getDimension()]);
- assertTrue(handler.getMaximalValueError() < 2.0e-11);
-
- }
-
}
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=786881&r1=786880&r2=786881&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 Sat Jun 20 18:53:08 2009
@@ -20,12 +20,6 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import org.apache.commons.math.ode.DerivativeException;
import org.apache.commons.math.ode.FirstOrderIntegrator;
import org.apache.commons.math.ode.IntegratorException;
@@ -155,30 +149,4 @@
}
- @Test
- public void serialization()
- throws IntegratorException, DerivativeException,
- IOException, ClassNotFoundException {
-
- TestProblem6 pb = new TestProblem6();
- double range = Math.abs(pb.getFinalTime() - pb.getInitialTime());
-
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- ObjectOutputStream oos = new ObjectOutputStream(bos);
- oos.writeObject(new AdamsMoultonIntegrator(5, 0, range, 1.0e-12, 1.0e-12));
- assertTrue(bos.size() > 2800);
- assertTrue(bos.size() < 3000);
-
- ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
- ObjectInputStream ois = new ObjectInputStream(bis);
- FirstOrderIntegrator integ = (AdamsMoultonIntegrator) ois.readObject();
- assertEquals("Adams-Moulton", integ.getName());
- TestProblemHandler handler = new TestProblemHandler(pb, integ);
- integ.addStepHandler(handler);
- integ.integrate(pb, pb.getInitialTime(), pb.getInitialState(),
- pb.getFinalTime(), new double[pb.getDimension()]);
- assertTrue(handler.getMaximalValueError() < 8.0e-11);
-
- }
-
}
Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaIntegratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaIntegratorTest.java?rev=786881&r1=786880&r2=786881&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaIntegratorTest.java (original)
+++ commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaIntegratorTest.java Sat Jun 20 18:53:08 2009
@@ -177,7 +177,6 @@
}
private static class KeplerHandler implements StepHandler {
- private static final long serialVersionUID = 7510061424396717277L;
public KeplerHandler(TestProblem3 pb) {
this.pb = pb;
reset();
@@ -215,7 +214,6 @@
final double step = 1.23456;
FirstOrderIntegrator integ = new ClassicalRungeKuttaIntegrator(step);
integ.addStepHandler(new StepHandler() {
- private static final long serialVersionUID = 0L;
public void handleStep(StepInterpolator interpolator, boolean isLast) {
if (! isLast) {
assertEquals(step,
Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince54IntegratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince54IntegratorTest.java?rev=786881&r1=786880&r2=786881&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince54IntegratorTest.java (original)
+++ commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince54IntegratorTest.java Sat Jun 20 18:53:08 2009
@@ -125,8 +125,6 @@
private static class DP54SmallLastHandler implements StepHandler {
- private static final long serialVersionUID = -8168590945325629799L;
-
public DP54SmallLastHandler(double minStep) {
lastSeen = false;
this.minStep = minStep;
@@ -270,8 +268,6 @@
}
private static class KeplerHandler implements StepHandler {
- private static final long serialVersionUID = -1645853847806655456L;
-
public KeplerHandler(TestProblem3 pb) {
this.pb = pb;
reset();
@@ -315,7 +311,6 @@
}
private static class VariableHandler implements StepHandler {
- private static final long serialVersionUID = -5196650833828379228L;
public VariableHandler() {
firstTime = true;
minStep = 0;
Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolatorTest.java?rev=786881&r1=786880&r2=786881&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolatorTest.java (original)
+++ commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince54StepInterpolatorTest.java Sat Jun 20 18:53:08 2009
@@ -114,7 +114,6 @@
scalAbsoluteTolerance,
scalRelativeTolerance);
integ.addStepHandler(new StepHandler() {
- private static final long serialVersionUID = -6768136169276197L;
public void handleStep(StepInterpolator interpolator, boolean isLast)
throws DerivativeException {
StepInterpolator cloned = interpolator.copy();
Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince853IntegratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince853IntegratorTest.java?rev=786881&r1=786880&r2=786881&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince853IntegratorTest.java (original)
+++ commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince853IntegratorTest.java Sat Jun 20 18:53:08 2009
@@ -264,7 +264,6 @@
}
private static class KeplerHandler implements StepHandler {
- private static final long serialVersionUID = -1752092987112788459L;
public KeplerHandler(TestProblem3 pb) {
this.pb = pb;
reset();
@@ -308,7 +307,6 @@
}
private static class VariableHandler implements StepHandler {
- private static final long serialVersionUID = 5542665697103383623L;
public VariableHandler() {
reset();
}
@@ -349,7 +347,6 @@
}
private static class InterpolatingStepHandler implements StepHandler {
- private static final long serialVersionUID = -5272695044664350727L;
public boolean requiresDenseOutput() {
return true;
}
Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolatorTest.java?rev=786881&r1=786880&r2=786881&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolatorTest.java (original)
+++ commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/DormandPrince853StepInterpolatorTest.java Sat Jun 20 18:53:08 2009
@@ -114,7 +114,6 @@
scalAbsoluteTolerance,
scalRelativeTolerance);
integ.addStepHandler(new StepHandler() {
- private static final long serialVersionUID = 2209212559670665268L;
public void handleStep(StepInterpolator interpolator, boolean isLast)
throws DerivativeException {
StepInterpolator cloned = interpolator.copy();
Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/EulerIntegratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/EulerIntegratorTest.java?rev=786881&r1=786880&r2=786881&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/EulerIntegratorTest.java (original)
+++ commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/EulerIntegratorTest.java Sat Jun 20 18:53:08 2009
@@ -150,7 +150,6 @@
final double step = 1.23456;
FirstOrderIntegrator integ = new EulerIntegrator(step);
integ.addStepHandler(new StepHandler() {
- private static final long serialVersionUID = 0L;
public void handleStep(StepInterpolator interpolator, boolean isLast) {
if (! isLast) {
assertEquals(step,
Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/GillIntegratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/GillIntegratorTest.java?rev=786881&r1=786880&r2=786881&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/GillIntegratorTest.java (original)
+++ commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/GillIntegratorTest.java Sat Jun 20 18:53:08 2009
@@ -167,7 +167,6 @@
}
private static class KeplerStepHandler implements StepHandler {
- private static final long serialVersionUID = 1250933165809631538L;
public KeplerStepHandler(TestProblem3 pb) {
this.pb = pb;
reset();
@@ -205,7 +204,6 @@
final double step = 1.23456;
FirstOrderIntegrator integ = new GillIntegrator(step);
integ.addStepHandler(new StepHandler() {
- private static final long serialVersionUID = 0L;
public void handleStep(StepInterpolator interpolator, boolean isLast) {
if (! isLast) {
assertEquals(step,
Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerIntegratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerIntegratorTest.java?rev=786881&r1=786880&r2=786881&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerIntegratorTest.java (original)
+++ commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerIntegratorTest.java Sat Jun 20 18:53:08 2009
@@ -273,7 +273,6 @@
}
private static class KeplerStepHandler implements StepHandler {
- private static final long serialVersionUID = -8231434585284002546L;
public KeplerStepHandler(TestProblem3 pb) {
this.pb = pb;
reset();
@@ -317,7 +316,6 @@
}
public static class VariableStepHandler implements StepHandler {
- private static final long serialVersionUID = -5955452449048688985L;
public VariableStepHandler() {
reset();
}
Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java?rev=786881&r1=786880&r2=786881&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java (original)
+++ commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/GraggBulirschStoerStepInterpolatorTest.java Sat Jun 20 18:53:08 2009
@@ -116,7 +116,6 @@
scalAbsoluteTolerance,
scalRelativeTolerance);
integ.addStepHandler(new StepHandler() {
- private static final long serialVersionUID = -5947183291381232297L;
public void handleStep(StepInterpolator interpolator, boolean isLast)
throws DerivativeException {
StepInterpolator cloned = interpolator.copy();
Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/HighamHall54IntegratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/HighamHall54IntegratorTest.java?rev=786881&r1=786880&r2=786881&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/HighamHall54IntegratorTest.java (original)
+++ commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/HighamHall54IntegratorTest.java Sat Jun 20 18:53:08 2009
@@ -360,7 +360,6 @@
}
private static class KeplerHandler implements StepHandler {
- private static final long serialVersionUID = 3200246026175251943L;
public KeplerHandler(TestProblem3 pb) {
this.pb = pb;
nbSteps = 0;
Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolatorTest.java?rev=786881&r1=786880&r2=786881&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolatorTest.java (original)
+++ commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/HighamHall54StepInterpolatorTest.java Sat Jun 20 18:53:08 2009
@@ -114,7 +114,6 @@
scalAbsoluteTolerance,
scalRelativeTolerance);
integ.addStepHandler(new StepHandler() {
- private static final long serialVersionUID = 9111679755950880352L;
public void handleStep(StepInterpolator interpolator, boolean isLast)
throws DerivativeException {
StepInterpolator cloned = interpolator.copy();
Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/MidpointIntegratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/MidpointIntegratorTest.java?rev=786881&r1=786880&r2=786881&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/MidpointIntegratorTest.java (original)
+++ commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/MidpointIntegratorTest.java Sat Jun 20 18:53:08 2009
@@ -150,7 +150,6 @@
final double step = 1.23456;
FirstOrderIntegrator integ = new MidpointIntegrator(step);
integ.addStepHandler(new StepHandler() {
- private static final long serialVersionUID = 0L;
public void handleStep(StepInterpolator interpolator, boolean isLast) {
if (! isLast) {
assertEquals(step,
Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/TestProblemHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/TestProblemHandler.java?rev=786881&r1=786880&r2=786881&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/TestProblemHandler.java (original)
+++ commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/TestProblemHandler.java Sat Jun 20 18:53:08 2009
@@ -29,9 +29,6 @@
class TestProblemHandler
implements StepHandler {
- /** Serializable version identifier. */
- private static final long serialVersionUID = 3589490480549900461L;
-
/** Associated problem. */
private TestProblemAbstract problem;
Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/ThreeEighthesIntegratorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/ThreeEighthesIntegratorTest.java?rev=786881&r1=786880&r2=786881&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/ThreeEighthesIntegratorTest.java (original)
+++ commons/proper/math/trunk/src/test/org/apache/commons/math/ode/nonstiff/ThreeEighthesIntegratorTest.java Sat Jun 20 18:53:08 2009
@@ -158,8 +158,6 @@
private static class KeplerHandler implements StepHandler {
- private static final long serialVersionUID = 4400497468419540899L;
-
public KeplerHandler(TestProblem3 pb) {
this.pb = pb;
maxError = 0;
@@ -202,7 +200,6 @@
final double step = 1.23456;
FirstOrderIntegrator integ = new ThreeEighthesIntegrator(step);
integ.addStepHandler(new StepHandler() {
- private static final long serialVersionUID = 0L;
public void handleStep(StepInterpolator interpolator, boolean isLast) {
if (! isLast) {
assertEquals(step,
@@ -217,7 +214,6 @@
}
});
integ.integrate(new FirstOrderDifferentialEquations() {
- private static final long serialVersionUID = 0L;
public void computeDerivatives(double t, double[] y, double[] dot) {
dot[0] = 1.0;
}
Modified: commons/proper/math/trunk/src/test/org/apache/commons/math/ode/sampling/StepInterpolatorTestUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/ode/sampling/StepInterpolatorTestUtils.java?rev=786881&r1=786880&r2=786881&view=diff
==============================================================================
--- commons/proper/math/trunk/src/test/org/apache/commons/math/ode/sampling/StepInterpolatorTestUtils.java (original)
+++ commons/proper/math/trunk/src/test/org/apache/commons/math/ode/sampling/StepInterpolatorTestUtils.java Sat Jun 20 18:53:08 2009
@@ -31,8 +31,6 @@
throws DerivativeException, IntegratorException {
integrator.addStepHandler(new StepHandler() {
- private static final long serialVersionUID = 2462564234755682953L;
-
public boolean requiresDenseOutput() {
return true;
}