From d78c757aa95180e0cd2e623eeeeb20d76ee55ebe Mon Sep 17 00:00:00 2001 From: Luc Maisonobe Date: Fri, 1 Jul 2011 09:33:55 +0000 Subject: [PATCH] removed serialVersionUID for non-serializable classes. git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/trunk@1141890 13f79535-47bb-0310-9956-ffa450edef68 --- .../commons/math/ode/ContinuousOutputModelTest.java | 1 - .../java/org/apache/commons/math/ode/TestProblem1.java | 3 --- .../java/org/apache/commons/math/ode/TestProblem2.java | 3 --- .../java/org/apache/commons/math/ode/TestProblem3.java | 3 --- .../java/org/apache/commons/math/ode/TestProblem4.java | 6 ------ .../java/org/apache/commons/math/ode/TestProblem5.java | 3 --- .../java/org/apache/commons/math/ode/TestProblem6.java | 3 --- .../apache/commons/math/ode/TestProblemAbstract.java | 3 --- .../nonstiff/ClassicalRungeKuttaIntegratorTest.java | 1 - .../commons/math/ode/nonstiff/EulerIntegratorTest.java | 1 - .../commons/math/ode/nonstiff/GillIntegratorTest.java | 1 - .../math/ode/nonstiff/HighamHall54IntegratorTest.java | 3 --- .../math/ode/nonstiff/MidpointIntegratorTest.java | 1 - .../apache/commons/math/ode/nonstiff/StepProblem.java | 2 -- .../commons/math/ode/sampling/StepNormalizerTest.java | 2 -- ...fferentiableMultivariateVectorialOptimizerTest.java | 10 +++------- .../direct/SimplexOptimizerMultiDirectionalTest.java | 3 --- .../direct/SimplexOptimizerNelderMeadTest.java | 1 - .../math/optimization/general/CircleScalar.java | 2 -- .../math/optimization/general/CircleVectorial.java | 1 - .../optimization/general/GaussNewtonOptimizerTest.java | 1 - .../general/LevenbergMarquardtOptimizerTest.java | 2 -- .../commons/math/optimization/general/MinpackTest.java | 1 - .../NonLinearConjugateGradientOptimizerTest.java | 2 -- 24 files changed, 3 insertions(+), 56 deletions(-) diff --git a/src/test/java/org/apache/commons/math/ode/ContinuousOutputModelTest.java b/src/test/java/org/apache/commons/math/ode/ContinuousOutputModelTest.java index 35a417029..76440f844 100644 --- a/src/test/java/org/apache/commons/math/ode/ContinuousOutputModelTest.java +++ b/src/test/java/org/apache/commons/math/ode/ContinuousOutputModelTest.java @@ -90,7 +90,6 @@ public class ContinuousOutputModelTest { // theoretical solution: y[0] = cos(t), y[1] = sin(t) FirstOrderDifferentialEquations problem = new FirstOrderDifferentialEquations() { - private static final long serialVersionUID = 2472449657345878299L; public void computeDerivatives(double t, double[] y, double[] dot) throws MathUserException { dot[0] = -y[1]; diff --git a/src/test/java/org/apache/commons/math/ode/TestProblem1.java b/src/test/java/org/apache/commons/math/ode/TestProblem1.java index fc8a38180..fd786b621 100644 --- a/src/test/java/org/apache/commons/math/ode/TestProblem1.java +++ b/src/test/java/org/apache/commons/math/ode/TestProblem1.java @@ -36,9 +36,6 @@ import org.apache.commons.math.util.FastMath; public class TestProblem1 extends TestProblemAbstract { - /** Serializable version identifier. */ - private static final long serialVersionUID = 1977870815289373164L; - /** theoretical state */ private double[] y; diff --git a/src/test/java/org/apache/commons/math/ode/TestProblem2.java b/src/test/java/org/apache/commons/math/ode/TestProblem2.java index c5060059d..6fab74821 100644 --- a/src/test/java/org/apache/commons/math/ode/TestProblem2.java +++ b/src/test/java/org/apache/commons/math/ode/TestProblem2.java @@ -37,9 +37,6 @@ import org.apache.commons.math.util.FastMath; public class TestProblem2 extends TestProblemAbstract { - /** Serializable version identifier. */ - private static final long serialVersionUID = 8330741783213512366L; - /** theoretical state */ private double[] y; diff --git a/src/test/java/org/apache/commons/math/ode/TestProblem3.java b/src/test/java/org/apache/commons/math/ode/TestProblem3.java index cebdf9d9c..988387941 100644 --- a/src/test/java/org/apache/commons/math/ode/TestProblem3.java +++ b/src/test/java/org/apache/commons/math/ode/TestProblem3.java @@ -39,9 +39,6 @@ import org.apache.commons.math.util.FastMath; public class TestProblem3 extends TestProblemAbstract { - /** Serializable version identifier. */ - private static final long serialVersionUID = 8567328542728919999L; - /** Eccentricity */ double e; diff --git a/src/test/java/org/apache/commons/math/ode/TestProblem4.java b/src/test/java/org/apache/commons/math/ode/TestProblem4.java index b2f5e56e5..9c6f17d88 100644 --- a/src/test/java/org/apache/commons/math/ode/TestProblem4.java +++ b/src/test/java/org/apache/commons/math/ode/TestProblem4.java @@ -38,9 +38,6 @@ import org.apache.commons.math.util.FastMath; public class TestProblem4 extends TestProblemAbstract { - /** Serializable version identifier. */ - private static final long serialVersionUID = -5910438521889015745L; - /** Time offset. */ private double a; @@ -112,7 +109,6 @@ public TestProblem4 copy() { private static class Bounce implements EventHandler { - private static final long serialVersionUID = 1356097180027801200L; private int sign; public Bounce() { @@ -138,8 +134,6 @@ public TestProblem4 copy() { private static class Stop implements EventHandler { - private static final long serialVersionUID = 6975050568227951931L; - public Stop() { } diff --git a/src/test/java/org/apache/commons/math/ode/TestProblem5.java b/src/test/java/org/apache/commons/math/ode/TestProblem5.java index 8a5394173..246991a63 100644 --- a/src/test/java/org/apache/commons/math/ode/TestProblem5.java +++ b/src/test/java/org/apache/commons/math/ode/TestProblem5.java @@ -25,9 +25,6 @@ package org.apache.commons.math.ode; public class TestProblem5 extends TestProblem1 { - /** Serializable version identifier. */ - private static final long serialVersionUID = 7579233102411804237L; - /** * Simple constructor. */ diff --git a/src/test/java/org/apache/commons/math/ode/TestProblem6.java b/src/test/java/org/apache/commons/math/ode/TestProblem6.java index 32fcfda61..255706128 100644 --- a/src/test/java/org/apache/commons/math/ode/TestProblem6.java +++ b/src/test/java/org/apache/commons/math/ode/TestProblem6.java @@ -35,9 +35,6 @@ package org.apache.commons.math.ode; public class TestProblem6 extends TestProblemAbstract { - /** Serializable version identifier. */ - private static final long serialVersionUID = 1353409119804352378L; - /** theoretical state */ private double[] y; diff --git a/src/test/java/org/apache/commons/math/ode/TestProblemAbstract.java b/src/test/java/org/apache/commons/math/ode/TestProblemAbstract.java index f6492cef5..75c0e6bd8 100644 --- a/src/test/java/org/apache/commons/math/ode/TestProblemAbstract.java +++ b/src/test/java/org/apache/commons/math/ode/TestProblemAbstract.java @@ -27,9 +27,6 @@ import org.apache.commons.math.ode.events.EventHandler; public abstract class TestProblemAbstract implements FirstOrderDifferentialEquations { - /** Serializable version identifier. */ - private static final long serialVersionUID = -8521928974502839379L; - /** Dimension of the problem. */ protected int n; diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaIntegratorTest.java b/src/test/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaIntegratorTest.java index bd9d65949..d6d699e37 100644 --- a/src/test/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaIntegratorTest.java +++ b/src/test/java/org/apache/commons/math/ode/nonstiff/ClassicalRungeKuttaIntegratorTest.java @@ -293,7 +293,6 @@ public class ClassicalRungeKuttaIntegratorTest { } }); integ.integrate(new FirstOrderDifferentialEquations() { - private static final long serialVersionUID = 0L; public void computeDerivatives(double t, double[] y, double[] dot) { dot[0] = 1.0; } diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/EulerIntegratorTest.java b/src/test/java/org/apache/commons/math/ode/nonstiff/EulerIntegratorTest.java index 3ca80ffe5..991a74516 100644 --- a/src/test/java/org/apache/commons/math/ode/nonstiff/EulerIntegratorTest.java +++ b/src/test/java/org/apache/commons/math/ode/nonstiff/EulerIntegratorTest.java @@ -174,7 +174,6 @@ public class EulerIntegratorTest { } }); integ.integrate(new FirstOrderDifferentialEquations() { - private static final long serialVersionUID = 0L; public void computeDerivatives(double t, double[] y, double[] dot) { dot[0] = 1.0; } diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/GillIntegratorTest.java b/src/test/java/org/apache/commons/math/ode/nonstiff/GillIntegratorTest.java index d9570f6d6..db7c09e18 100644 --- a/src/test/java/org/apache/commons/math/ode/nonstiff/GillIntegratorTest.java +++ b/src/test/java/org/apache/commons/math/ode/nonstiff/GillIntegratorTest.java @@ -228,7 +228,6 @@ public class GillIntegratorTest { } }); integ.integrate(new FirstOrderDifferentialEquations() { - private static final long serialVersionUID = 0L; public void computeDerivatives(double t, double[] y, double[] dot) { dot[0] = 1.0; } diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/HighamHall54IntegratorTest.java b/src/test/java/org/apache/commons/math/ode/nonstiff/HighamHall54IntegratorTest.java index 76282f222..746798a79 100644 --- a/src/test/java/org/apache/commons/math/ode/nonstiff/HighamHall54IntegratorTest.java +++ b/src/test/java/org/apache/commons/math/ode/nonstiff/HighamHall54IntegratorTest.java @@ -43,7 +43,6 @@ public class HighamHall54IntegratorTest { new HighamHall54Integrator(0.0, 1.0, 1.0e-10, 1.0e-10); FirstOrderDifferentialEquations equations = new FirstOrderDifferentialEquations() { - private static final long serialVersionUID = -1157081786301178032L; public void computeDerivatives(double t, double[] y, double[] dot) throws MathUserException { if (t < -0.5) { @@ -222,7 +221,6 @@ public class HighamHall54IntegratorTest { } public void resetState(double t, double[] y) { } - private static final long serialVersionUID = 935652725339916361L; }, Double.POSITIVE_INFINITY, 1.0e-8 * maxStep, 1000); try { @@ -262,7 +260,6 @@ public class HighamHall54IntegratorTest { } public void resetState(double t, double[] y) { } - private static final long serialVersionUID = 935652725339916361L; }, Double.POSITIVE_INFINITY, 1.0e-8 * maxStep, 3); try { diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/MidpointIntegratorTest.java b/src/test/java/org/apache/commons/math/ode/nonstiff/MidpointIntegratorTest.java index 5481f422f..f3ac91e0c 100644 --- a/src/test/java/org/apache/commons/math/ode/nonstiff/MidpointIntegratorTest.java +++ b/src/test/java/org/apache/commons/math/ode/nonstiff/MidpointIntegratorTest.java @@ -174,7 +174,6 @@ public class MidpointIntegratorTest { } }); integ.integrate(new FirstOrderDifferentialEquations() { - private static final long serialVersionUID = 0L; public void computeDerivatives(double t, double[] y, double[] dot) { dot[0] = 1.0; } diff --git a/src/test/java/org/apache/commons/math/ode/nonstiff/StepProblem.java b/src/test/java/org/apache/commons/math/ode/nonstiff/StepProblem.java index dc5420b48..dad205241 100644 --- a/src/test/java/org/apache/commons/math/ode/nonstiff/StepProblem.java +++ b/src/test/java/org/apache/commons/math/ode/nonstiff/StepProblem.java @@ -59,6 +59,4 @@ public class StepProblem private double rateAfter; private double switchTime; - private static final long serialVersionUID = 7590601995477504318L; - } diff --git a/src/test/java/org/apache/commons/math/ode/sampling/StepNormalizerTest.java b/src/test/java/org/apache/commons/math/ode/sampling/StepNormalizerTest.java index 49cc4016f..7c7665992 100644 --- a/src/test/java/org/apache/commons/math/ode/sampling/StepNormalizerTest.java +++ b/src/test/java/org/apache/commons/math/ode/sampling/StepNormalizerTest.java @@ -45,7 +45,6 @@ public class StepNormalizerTest { setLastSeen(false); integ.addStepHandler(new StepNormalizer(range / 10.0, new FixedStepHandler() { - private static final long serialVersionUID = 1650337364641626444L; private boolean firstCall = true; public void handleStep(double t, double[] y, @@ -74,7 +73,6 @@ public class StepNormalizerTest { setLastSeen(false); integ.addStepHandler(new StepNormalizer(range / 10.5, new FixedStepHandler() { - private static final long serialVersionUID = 2228457391561277298L; public void handleStep(double t, double[] y, double[] yDot, diff --git a/src/test/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateVectorialOptimizerTest.java b/src/test/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateVectorialOptimizerTest.java index 056c26793..94d02054c 100644 --- a/src/test/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateVectorialOptimizerTest.java +++ b/src/test/java/org/apache/commons/math/optimization/MultiStartDifferentiableMultivariateVectorialOptimizerTest.java @@ -18,12 +18,10 @@ package org.apache.commons.math.optimization; -import java.io.Serializable; - -import org.apache.commons.math.exception.MathUserException; -import org.apache.commons.math.exception.MathIllegalStateException; import org.apache.commons.math.analysis.DifferentiableMultivariateVectorialFunction; import org.apache.commons.math.analysis.MultivariateMatrixFunction; +import org.apache.commons.math.exception.MathIllegalStateException; +import org.apache.commons.math.exception.MathUserException; import org.apache.commons.math.linear.BlockRealMatrix; import org.apache.commons.math.linear.RealMatrix; import org.apache.commons.math.optimization.general.GaussNewtonOptimizer; @@ -157,9 +155,8 @@ public class MultiStartDifferentiableMultivariateVectorialOptimizerTest { }, new double[] { 2 }, new double[] { 1 }, new double[] { 0 }); } - private static class LinearProblem implements DifferentiableMultivariateVectorialFunction, Serializable { + private static class LinearProblem implements DifferentiableMultivariateVectorialFunction { - private static final long serialVersionUID = -8804268799379350190L; final RealMatrix factors; final double[] target; public LinearProblem(double[][] factors, double[] target) { @@ -173,7 +170,6 @@ public class MultiStartDifferentiableMultivariateVectorialOptimizerTest { public MultivariateMatrixFunction jacobian() { return new MultivariateMatrixFunction() { - private static final long serialVersionUID = -8387467946663627585L; public double[][] value(double[] point) { return factors.getData(); } diff --git a/src/test/java/org/apache/commons/math/optimization/direct/SimplexOptimizerMultiDirectionalTest.java b/src/test/java/org/apache/commons/math/optimization/direct/SimplexOptimizerMultiDirectionalTest.java index 7e909d117..044a601c0 100644 --- a/src/test/java/org/apache/commons/math/optimization/direct/SimplexOptimizerMultiDirectionalTest.java +++ b/src/test/java/org/apache/commons/math/optimization/direct/SimplexOptimizerMultiDirectionalTest.java @@ -38,7 +38,6 @@ public class SimplexOptimizerMultiDirectionalTest { final double valueXpYm = -0.7290400707055187115322; // global minimum final double valueXpYp = -valueXpYm; // global maximum MultivariateRealFunction fourExtrema = new MultivariateRealFunction() { - private static final long serialVersionUID = -7039124064449091152L; public double value(double[] variables) { final double x = variables[0]; final double y = variables[1]; @@ -87,7 +86,6 @@ public class SimplexOptimizerMultiDirectionalTest { public void testRosenbrock() { MultivariateRealFunction rosenbrock = new MultivariateRealFunction() { - private static final long serialVersionUID = -9044950469615237490L; public double value(double[] x) { ++count; double a = x[1] - x[0] * x[0]; @@ -114,7 +112,6 @@ public class SimplexOptimizerMultiDirectionalTest { public void testPowell() { MultivariateRealFunction powell = new MultivariateRealFunction() { - private static final long serialVersionUID = -832162886102041840L; public double value(double[] x) { ++count; double a = x[0] + 10 * x[1]; diff --git a/src/test/java/org/apache/commons/math/optimization/direct/SimplexOptimizerNelderMeadTest.java b/src/test/java/org/apache/commons/math/optimization/direct/SimplexOptimizerNelderMeadTest.java index 94928eb2d..e8dee3a0c 100644 --- a/src/test/java/org/apache/commons/math/optimization/direct/SimplexOptimizerNelderMeadTest.java +++ b/src/test/java/org/apache/commons/math/optimization/direct/SimplexOptimizerNelderMeadTest.java @@ -43,7 +43,6 @@ public class SimplexOptimizerNelderMeadTest { final double valueXpYm = -0.7290400707055187115322; // global minimum final double valueXpYp = -valueXpYm; // global maximum MultivariateRealFunction fourExtrema = new MultivariateRealFunction() { - private static final long serialVersionUID = -7039124064449091152L; public double value(double[] variables) { final double x = variables[0]; final double y = variables[1]; diff --git a/src/test/java/org/apache/commons/math/optimization/general/CircleScalar.java b/src/test/java/org/apache/commons/math/optimization/general/CircleScalar.java index deb0fa456..95a0cd7eb 100644 --- a/src/test/java/org/apache/commons/math/optimization/general/CircleScalar.java +++ b/src/test/java/org/apache/commons/math/optimization/general/CircleScalar.java @@ -79,7 +79,6 @@ class CircleScalar implements DifferentiableMultivariateRealFunction { public MultivariateVectorialFunction gradient() { return new MultivariateVectorialFunction() { - private static final long serialVersionUID = 3174909643301201710L; public double[] value(double[] point) { return gradient(point); } @@ -88,7 +87,6 @@ class CircleScalar implements DifferentiableMultivariateRealFunction { public MultivariateRealFunction partialDerivative(final int k) { return new MultivariateRealFunction() { - private static final long serialVersionUID = 3073956364104833888L; public double value(double[] point) { return gradient(point)[k]; } diff --git a/src/test/java/org/apache/commons/math/optimization/general/CircleVectorial.java b/src/test/java/org/apache/commons/math/optimization/general/CircleVectorial.java index 992ff2c23..eea59c6c8 100644 --- a/src/test/java/org/apache/commons/math/optimization/general/CircleVectorial.java +++ b/src/test/java/org/apache/commons/math/optimization/general/CircleVectorial.java @@ -89,7 +89,6 @@ class CircleVectorial implements DifferentiableMultivariateVectorialFunction { public MultivariateMatrixFunction jacobian() { return new MultivariateMatrixFunction() { - private static final long serialVersionUID = -4340046230875165095L; public double[][] value(double[] point) { return jacobian(point); } diff --git a/src/test/java/org/apache/commons/math/optimization/general/GaussNewtonOptimizerTest.java b/src/test/java/org/apache/commons/math/optimization/general/GaussNewtonOptimizerTest.java index a3d7a667a..723e83d91 100644 --- a/src/test/java/org/apache/commons/math/optimization/general/GaussNewtonOptimizerTest.java +++ b/src/test/java/org/apache/commons/math/optimization/general/GaussNewtonOptimizerTest.java @@ -477,7 +477,6 @@ public class GaussNewtonOptimizerTest { public MultivariateMatrixFunction jacobian() { return new MultivariateMatrixFunction() { - private static final long serialVersionUID = -8387467946663627585L; public double[][] value(double[] point) { return factors.getData(); } diff --git a/src/test/java/org/apache/commons/math/optimization/general/LevenbergMarquardtOptimizerTest.java b/src/test/java/org/apache/commons/math/optimization/general/LevenbergMarquardtOptimizerTest.java index f6a111665..393967cec 100644 --- a/src/test/java/org/apache/commons/math/optimization/general/LevenbergMarquardtOptimizerTest.java +++ b/src/test/java/org/apache/commons/math/optimization/general/LevenbergMarquardtOptimizerTest.java @@ -530,7 +530,6 @@ public class LevenbergMarquardtOptimizerTest { public MultivariateMatrixFunction jacobian() { return new MultivariateMatrixFunction() { - private static final long serialVersionUID = 556396458721526234L; public double[][] value(double[] point) { return factors.getData(); } @@ -574,7 +573,6 @@ public class LevenbergMarquardtOptimizerTest { public MultivariateMatrixFunction jacobian() { return new MultivariateMatrixFunction() { - private static final long serialVersionUID = -8673650298627399464L; public double[][] value(double[] point) { return jacobian(point); } diff --git a/src/test/java/org/apache/commons/math/optimization/general/MinpackTest.java b/src/test/java/org/apache/commons/math/optimization/general/MinpackTest.java index 24b7a1e97..4fb92dfcb 100644 --- a/src/test/java/org/apache/commons/math/optimization/general/MinpackTest.java +++ b/src/test/java/org/apache/commons/math/optimization/general/MinpackTest.java @@ -595,7 +595,6 @@ public class MinpackTest { public MultivariateMatrixFunction jacobian() { return new MultivariateMatrixFunction() { - private static final long serialVersionUID = -2435076097232923678L; public double[][] value(double[] point) { return jacobian(point); } diff --git a/src/test/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizerTest.java b/src/test/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizerTest.java index 2142981d0..95c04a3a8 100644 --- a/src/test/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizerTest.java +++ b/src/test/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizerTest.java @@ -376,7 +376,6 @@ public class NonLinearConjugateGradientOptimizerTest { public MultivariateVectorialFunction gradient() { return new MultivariateVectorialFunction() { - private static final long serialVersionUID = 2621997811350805819L; public double[] value(double[] point) { return gradient(point); } @@ -385,7 +384,6 @@ public class NonLinearConjugateGradientOptimizerTest { public MultivariateRealFunction partialDerivative(final int k) { return new MultivariateRealFunction() { - private static final long serialVersionUID = -6186178619133562011L; public double value(double[] point) { return gradient(point)[k]; }