Author: sebb
Date: Sat May 23 11:44:01 2009
New Revision: 777894
URL: http://svn.apache.org/viewvc?rev=777894&view=rev
Log:
Move Serializable from interface to implementations
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/MultivariateRealFunction.java
commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/MultivariateVectorialFunction.java
commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/UnivariateMatrixFunction.java
commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/UnivariateRealFunction.java
commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/UnivariateVectorialFunction.java
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/LeastSquaresConverter.java
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizer.java
commons/proper/math/trunk/src/test/org/apache/commons/math/analysis/Expm1Function.java
commons/proper/math/trunk/src/test/org/apache/commons/math/analysis/MonitoredFunction.java
commons/proper/math/trunk/src/test/org/apache/commons/math/analysis/SinFunction.java
commons/proper/math/trunk/src/test/org/apache/commons/math/optimization/general/GaussNewtonOptimizerTest.java
commons/proper/math/trunk/src/test/org/apache/commons/math/optimization/general/LevenbergMarquardtOptimizerTest.java
commons/proper/math/trunk/src/test/org/apache/commons/math/optimization/general/MinpackTest.java
commons/proper/math/trunk/src/test/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizerTest.java
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/MultivariateRealFunction.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/MultivariateRealFunction.java?rev=777894&r1=777893&r2=777894&view=diff
==============================================================================
---
commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/MultivariateRealFunction.java
(original)
+++
commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/MultivariateRealFunction.java
Sat May 23 11:44:01 2009
@@ -17,8 +17,6 @@
package org.apache.commons.math.analysis;
-import java.io.Serializable;
-
import org.apache.commons.math.FunctionEvaluationException;
/**
@@ -26,7 +24,7 @@
* @version $Revision$ $Date$
* @since 2.0
*/
-public interface MultivariateRealFunction extends Serializable {
+public interface MultivariateRealFunction {
/**
* Compute the value for the function at the given point.
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/MultivariateVectorialFunction.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/MultivariateVectorialFunction.java?rev=777894&r1=777893&r2=777894&view=diff
==============================================================================
---
commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/MultivariateVectorialFunction.java
(original)
+++
commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/MultivariateVectorialFunction.java
Sat May 23 11:44:01 2009
@@ -17,8 +17,6 @@
package org.apache.commons.math.analysis;
-import java.io.Serializable;
-
import org.apache.commons.math.FunctionEvaluationException;
/**
@@ -26,7 +24,7 @@
* @version $Revision$ $Date$
* @since 2.0
*/
-public interface MultivariateVectorialFunction extends Serializable {
+public interface MultivariateVectorialFunction {
/**
* Compute the value for the function at the given point.
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/UnivariateMatrixFunction.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/UnivariateMatrixFunction.java?rev=777894&r1=777893&r2=777894&view=diff
==============================================================================
---
commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/UnivariateMatrixFunction.java
(original)
+++
commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/UnivariateMatrixFunction.java
Sat May 23 11:44:01 2009
@@ -16,8 +16,6 @@
*/
package org.apache.commons.math.analysis;
-import java.io.Serializable;
-
import org.apache.commons.math.FunctionEvaluationException;
/**
@@ -26,7 +24,7 @@
* @version $Revision$ $Date$
* @since 2.0
*/
-public interface UnivariateMatrixFunction extends Serializable {
+public interface UnivariateMatrixFunction {
/**
* Compute the value for the function.
* @param x the point for which the function value should be computed
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/UnivariateRealFunction.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/UnivariateRealFunction.java?rev=777894&r1=777893&r2=777894&view=diff
==============================================================================
---
commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/UnivariateRealFunction.java
(original)
+++
commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/UnivariateRealFunction.java
Sat May 23 11:44:01 2009
@@ -16,8 +16,6 @@
*/
package org.apache.commons.math.analysis;
-import java.io.Serializable;
-
import org.apache.commons.math.FunctionEvaluationException;
/**
@@ -25,7 +23,7 @@
*
* @version $Revision$ $Date$
*/
-public interface UnivariateRealFunction extends Serializable {
+public interface UnivariateRealFunction {
/**
* Compute the value for the function.
* @param x the point for which the function value should be computed
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/UnivariateVectorialFunction.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/UnivariateVectorialFunction.java?rev=777894&r1=777893&r2=777894&view=diff
==============================================================================
---
commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/UnivariateVectorialFunction.java
(original)
+++
commons/proper/math/trunk/src/java/org/apache/commons/math/analysis/UnivariateVectorialFunction.java
Sat May 23 11:44:01 2009
@@ -16,8 +16,6 @@
*/
package org.apache.commons.math.analysis;
-import java.io.Serializable;
-
import org.apache.commons.math.FunctionEvaluationException;
/**
@@ -26,7 +24,7 @@
* @version $Revision$ $Date$
* @since 2.0
*/
-public interface UnivariateVectorialFunction extends Serializable {
+public interface UnivariateVectorialFunction {
/**
* Compute the value for the function.
* @param x the point for which the function value should be computed
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/LeastSquaresConverter.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/LeastSquaresConverter.java?rev=777894&r1=777893&r2=777894&view=diff
==============================================================================
---
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/LeastSquaresConverter.java
(original)
+++
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/LeastSquaresConverter.java
Sat May 23 11:44:01 2009
@@ -17,6 +17,8 @@
package org.apache.commons.math.optimization;
+import java.io.Serializable;
+
import org.apache.commons.math.FunctionEvaluationException;
import org.apache.commons.math.MathRuntimeException;
import org.apache.commons.math.analysis.MultivariateRealFunction;
@@ -54,7 +56,9 @@
* @since 2.0
*/
-public class LeastSquaresConverter implements MultivariateRealFunction {
+public class LeastSquaresConverter implements MultivariateRealFunction,
Serializable {
+ // TODO: Add Serializable documentation
+ // TODO: Check Serializable implementation
/** Serializable version identifier. */
private static final long serialVersionUID = -4369653306135732243L;
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizer.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizer.java?rev=777894&r1=777893&r2=777894&view=diff
==============================================================================
---
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizer.java
(original)
+++
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizer.java
Sat May 23 11:44:01 2009
@@ -17,6 +17,8 @@
package org.apache.commons.math.optimization.general;
+import java.io.Serializable;
+
import org.apache.commons.math.ConvergenceException;
import org.apache.commons.math.FunctionEvaluationException;
import org.apache.commons.math.analysis.UnivariateRealFunction;
@@ -261,7 +263,9 @@
* extremum along the search direction.
* </p>
*/
- private class LineSearchFunction implements UnivariateRealFunction {
+ private class LineSearchFunction implements UnivariateRealFunction,
Serializable {
+ // TODO: Add Serializable documentation
+ // TODO: Check Serializable implementation
/** Serializable version identifier. */
private static final long serialVersionUID = 8184683950487801424L;
Modified:
commons/proper/math/trunk/src/test/org/apache/commons/math/analysis/Expm1Function.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/analysis/Expm1Function.java?rev=777894&r1=777893&r2=777894&view=diff
==============================================================================
---
commons/proper/math/trunk/src/test/org/apache/commons/math/analysis/Expm1Function.java
(original)
+++
commons/proper/math/trunk/src/test/org/apache/commons/math/analysis/Expm1Function.java
Sat May 23 11:44:01 2009
@@ -16,6 +16,8 @@
*/
package org.apache.commons.math.analysis;
+import java.io.Serializable;
+
import org.apache.commons.math.FunctionEvaluationException;
/**
@@ -23,7 +25,7 @@
*
* @version $Revision$ $Date$
*/
-public class Expm1Function implements DifferentiableUnivariateRealFunction {
+public class Expm1Function implements DifferentiableUnivariateRealFunction,
Serializable {
private static final long serialVersionUID = 1410052725961159179L;
Modified:
commons/proper/math/trunk/src/test/org/apache/commons/math/analysis/MonitoredFunction.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/analysis/MonitoredFunction.java?rev=777894&r1=777893&r2=777894&view=diff
==============================================================================
---
commons/proper/math/trunk/src/test/org/apache/commons/math/analysis/MonitoredFunction.java
(original)
+++
commons/proper/math/trunk/src/test/org/apache/commons/math/analysis/MonitoredFunction.java
Sat May 23 11:44:01 2009
@@ -16,6 +16,8 @@
*/
package org.apache.commons.math.analysis;
+import java.io.Serializable;
+
import org.apache.commons.math.FunctionEvaluationException;
/**
@@ -23,7 +25,7 @@
*
* @version $Revision$ $Date$
*/
-public class MonitoredFunction implements UnivariateRealFunction {
+public class MonitoredFunction implements UnivariateRealFunction, Serializable
{
private static final long serialVersionUID = -8403645545888892674L;
Modified:
commons/proper/math/trunk/src/test/org/apache/commons/math/analysis/SinFunction.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/analysis/SinFunction.java?rev=777894&r1=777893&r2=777894&view=diff
==============================================================================
---
commons/proper/math/trunk/src/test/org/apache/commons/math/analysis/SinFunction.java
(original)
+++
commons/proper/math/trunk/src/test/org/apache/commons/math/analysis/SinFunction.java
Sat May 23 11:44:01 2009
@@ -16,6 +16,8 @@
*/
package org.apache.commons.math.analysis;
+import java.io.Serializable;
+
import org.apache.commons.math.FunctionEvaluationException;
/**
@@ -28,7 +30,7 @@
*
* @version $Revision$ $Date$
*/
-public class SinFunction implements DifferentiableUnivariateRealFunction {
+public class SinFunction implements DifferentiableUnivariateRealFunction,
Serializable {
private static final long serialVersionUID = 6422911699694536977L;
Modified:
commons/proper/math/trunk/src/test/org/apache/commons/math/optimization/general/GaussNewtonOptimizerTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/optimization/general/GaussNewtonOptimizerTest.java?rev=777894&r1=777893&r2=777894&view=diff
==============================================================================
---
commons/proper/math/trunk/src/test/org/apache/commons/math/optimization/general/GaussNewtonOptimizerTest.java
(original)
+++
commons/proper/math/trunk/src/test/org/apache/commons/math/optimization/general/GaussNewtonOptimizerTest.java
Sat May 23 11:44:01 2009
@@ -18,6 +18,7 @@
package org.apache.commons.math.optimization.general;
import java.awt.geom.Point2D;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
@@ -478,7 +479,7 @@
}
- private static class LinearProblem implements
DifferentiableMultivariateVectorialFunction {
+ private static class LinearProblem implements
DifferentiableMultivariateVectorialFunction, Serializable {
private static final long serialVersionUID = -8804268799379350190L;
final RealMatrix factors;
@@ -503,7 +504,7 @@
}
- private static class Circle implements
DifferentiableMultivariateVectorialFunction {
+ private static class Circle implements
DifferentiableMultivariateVectorialFunction, Serializable {
private static final long serialVersionUID = -7165774454925027042L;
private ArrayList<Point2D.Double> points;
Modified:
commons/proper/math/trunk/src/test/org/apache/commons/math/optimization/general/LevenbergMarquardtOptimizerTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/optimization/general/LevenbergMarquardtOptimizerTest.java?rev=777894&r1=777893&r2=777894&view=diff
==============================================================================
---
commons/proper/math/trunk/src/test/org/apache/commons/math/optimization/general/LevenbergMarquardtOptimizerTest.java
(original)
+++
commons/proper/math/trunk/src/test/org/apache/commons/math/optimization/general/LevenbergMarquardtOptimizerTest.java
Sat May 23 11:44:01 2009
@@ -18,6 +18,7 @@
package org.apache.commons.math.optimization.general;
import java.awt.geom.Point2D;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -518,7 +519,7 @@
}
- private static class LinearProblem implements
DifferentiableMultivariateVectorialFunction {
+ private static class LinearProblem implements
DifferentiableMultivariateVectorialFunction, Serializable {
private static final long serialVersionUID = 703247177355019415L;
final RealMatrix factors;
@@ -543,7 +544,7 @@
}
- private static class Circle implements
DifferentiableMultivariateVectorialFunction {
+ private static class Circle implements
DifferentiableMultivariateVectorialFunction, Serializable {
private static final long serialVersionUID = -4711170319243817874L;
@@ -624,7 +625,7 @@
}
- private static class QuadraticProblem implements
DifferentiableMultivariateVectorialFunction {
+ private static class QuadraticProblem implements
DifferentiableMultivariateVectorialFunction, Serializable {
private static final long serialVersionUID = 7072187082052755854L;
private List<Double> x;
Modified:
commons/proper/math/trunk/src/test/org/apache/commons/math/optimization/general/MinpackTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/optimization/general/MinpackTest.java?rev=777894&r1=777893&r2=777894&view=diff
==============================================================================
---
commons/proper/math/trunk/src/test/org/apache/commons/math/optimization/general/MinpackTest.java
(original)
+++
commons/proper/math/trunk/src/test/org/apache/commons/math/optimization/general/MinpackTest.java
Sat May 23 11:44:01 2009
@@ -17,6 +17,7 @@
package org.apache.commons.math.optimization.general;
+import java.io.Serializable;
import java.util.Arrays;
import junit.framework.Test;
@@ -510,7 +511,7 @@
}
private static abstract class MinpackFunction
- implements DifferentiableMultivariateVectorialFunction {
+ implements DifferentiableMultivariateVectorialFunction, Serializable {
private static final long serialVersionUID = -6209760235478794233L;
protected int n;
Modified:
commons/proper/math/trunk/src/test/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizerTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizerTest.java?rev=777894&r1=777893&r2=777894&view=diff
==============================================================================
---
commons/proper/math/trunk/src/test/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizerTest.java
(original)
+++
commons/proper/math/trunk/src/test/org/apache/commons/math/optimization/general/NonLinearConjugateGradientOptimizerTest.java
Sat May 23 11:44:01 2009
@@ -18,6 +18,7 @@
package org.apache.commons.math.optimization.general;
import java.awt.geom.Point2D;
+import java.io.Serializable;
import java.util.ArrayList;
import junit.framework.Test;
@@ -363,7 +364,7 @@
assertEquals(48.135167894, center.y, 1.0e-8);
}
- private static class LinearProblem implements
DifferentiableMultivariateRealFunction {
+ private static class LinearProblem implements
DifferentiableMultivariateRealFunction, Serializable {
private static final long serialVersionUID = 703247177355019415L;
final RealMatrix factors;
@@ -415,7 +416,7 @@
}
- private static class Circle implements
DifferentiableMultivariateRealFunction {
+ private static class Circle implements
DifferentiableMultivariateRealFunction, Serializable {
private static final long serialVersionUID = -4711170319243817874L;
