Author: sebb
Date: Sat May 23 11:26:56 2009
New Revision: 777892
URL: http://svn.apache.org/viewvc?rev=777892&view=rev
Log:
Move Serializable from interface to implementations
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/MultiStartMultivariateRealOptimizer.java
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/MultivariateRealOptimizer.java
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/RealConvergenceChecker.java
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/SimpleRealPointChecker.java
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/SimpleScalarValueChecker.java
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/SimpleVectorialPointChecker.java
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/SimpleVectorialValueChecker.java
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/VectorialConvergenceChecker.java
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/direct/DirectSearchOptimizer.java
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/direct/MultiDirectional.java
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/direct/NelderMead.java
commons/proper/math/trunk/src/java/org/apache/commons/math/stat/clustering/Clusterable.java
commons/proper/math/trunk/src/java/org/apache/commons/math/stat/clustering/EuclideanIntegerPoint.java
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/MultiStartMultivariateRealOptimizer.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/MultiStartMultivariateRealOptimizer.java?rev=777892&r1=777891&r2=777892&view=diff
==============================================================================
---
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/MultiStartMultivariateRealOptimizer.java
(original)
+++
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/MultiStartMultivariateRealOptimizer.java
Sat May 23 11:26:56 2009
@@ -17,6 +17,7 @@
package org.apache.commons.math.optimization;
+import java.io.Serializable;
import java.util.Arrays;
import java.util.Comparator;
@@ -37,7 +38,9 @@
* @version $Revision$ $Date$
* @since 2.0
*/
-public class MultiStartMultivariateRealOptimizer implements
MultivariateRealOptimizer {
+public class MultiStartMultivariateRealOptimizer implements
MultivariateRealOptimizer, Serializable {
+ // TODO: Add Serializable documentation
+ // TODO: Check Serializable implementation
/** Serializable version identifier. */
private static final long serialVersionUID = 5983375963110961019L;
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/MultivariateRealOptimizer.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/MultivariateRealOptimizer.java?rev=777892&r1=777891&r2=777892&view=diff
==============================================================================
---
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/MultivariateRealOptimizer.java
(original)
+++
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/MultivariateRealOptimizer.java
Sat May 23 11:26:56 2009
@@ -17,8 +17,6 @@
package org.apache.commons.math.optimization;
-import java.io.Serializable;
-
import org.apache.commons.math.FunctionEvaluationException;
import org.apache.commons.math.analysis.MultivariateRealFunction;
@@ -32,7 +30,7 @@
* @version $Revision$ $Date$
* @since 2.0
*/
-public interface MultivariateRealOptimizer extends Serializable {
+public interface MultivariateRealOptimizer {
/** Set the maximal number of iterations of the algorithm.
* @param maxIterations maximal number of function calls
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/RealConvergenceChecker.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/RealConvergenceChecker.java?rev=777892&r1=777891&r2=777892&view=diff
==============================================================================
---
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/RealConvergenceChecker.java
(original)
+++
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/RealConvergenceChecker.java
Sat May 23 11:26:56 2009
@@ -17,8 +17,6 @@
package org.apache.commons.math.optimization;
-import java.io.Serializable;
-
/** This interface specifies how to check if an {...@link
MultivariateRealOptimizer optimization
* algorithm} has converged.
*
@@ -36,7 +34,7 @@
* @since 2.0
*/
-public interface RealConvergenceChecker extends Serializable {
+public interface RealConvergenceChecker {
/** Check if the optimization algorithm has converged considering the last
points.
* <p>
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/SimpleRealPointChecker.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/SimpleRealPointChecker.java?rev=777892&r1=777891&r2=777892&view=diff
==============================================================================
---
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/SimpleRealPointChecker.java
(original)
+++
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/SimpleRealPointChecker.java
Sat May 23 11:26:56 2009
@@ -17,6 +17,8 @@
package org.apache.commons.math.optimization;
+import java.io.Serializable;
+
import org.apache.commons.math.util.MathUtils;
/**
@@ -31,7 +33,9 @@
* @version $Revision: 757180 $ $Date: 2009-03-22 13:54:45 +0100 (dim., 22
mars 2009) $
* @since 2.0
*/
-public class SimpleRealPointChecker implements RealConvergenceChecker {
+public class SimpleRealPointChecker implements RealConvergenceChecker,
Serializable {
+ // TODO: Add Serializable documentation
+ // TODO: Check Serializable implementation
/** Serializable version identifier. */
private static final long serialVersionUID = 2490271385513842607L;
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/SimpleScalarValueChecker.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/SimpleScalarValueChecker.java?rev=777892&r1=777891&r2=777892&view=diff
==============================================================================
---
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/SimpleScalarValueChecker.java
(original)
+++
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/SimpleScalarValueChecker.java
Sat May 23 11:26:56 2009
@@ -17,6 +17,8 @@
package org.apache.commons.math.optimization;
+import java.io.Serializable;
+
import org.apache.commons.math.util.MathUtils;
/**
@@ -31,7 +33,9 @@
* @version $Revision$ $Date$
* @since 2.0
*/
-public class SimpleScalarValueChecker implements RealConvergenceChecker {
+public class SimpleScalarValueChecker implements RealConvergenceChecker,
Serializable {
+ // TODO: Add Serializable documentation
+ // TODO: Check Serializable implementation
/** Serializable version identifier. */
private static final long serialVersionUID = 2490271385513842607L;
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/SimpleVectorialPointChecker.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/SimpleVectorialPointChecker.java?rev=777892&r1=777891&r2=777892&view=diff
==============================================================================
---
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/SimpleVectorialPointChecker.java
(original)
+++
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/SimpleVectorialPointChecker.java
Sat May 23 11:26:56 2009
@@ -17,6 +17,8 @@
package org.apache.commons.math.optimization;
+import java.io.Serializable;
+
import org.apache.commons.math.util.MathUtils;
/**
@@ -31,7 +33,9 @@
* @version $Revision$ $Date$
* @since 2.0
*/
-public class SimpleVectorialPointChecker implements
VectorialConvergenceChecker {
+public class SimpleVectorialPointChecker implements
VectorialConvergenceChecker, Serializable {
+ // TODO: Add Serializable documentation
+ // TODO: Check Serializable implementation
/** Serializable version identifier. */
private static final long serialVersionUID = 6571098732056285089L;
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/SimpleVectorialValueChecker.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/SimpleVectorialValueChecker.java?rev=777892&r1=777891&r2=777892&view=diff
==============================================================================
---
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/SimpleVectorialValueChecker.java
(original)
+++
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/SimpleVectorialValueChecker.java
Sat May 23 11:26:56 2009
@@ -17,6 +17,8 @@
package org.apache.commons.math.optimization;
+import java.io.Serializable;
+
import org.apache.commons.math.util.MathUtils;
/**
@@ -31,7 +33,9 @@
* @version $Revision$ $Date$
* @since 2.0
*/
-public class SimpleVectorialValueChecker implements
VectorialConvergenceChecker {
+public class SimpleVectorialValueChecker implements
VectorialConvergenceChecker, Serializable {
+ // TODO: Add Serializable documentation
+ // TODO: Check Serializable implementation
/** Serializable version identifier. */
private static final long serialVersionUID = -3892196630780700808L;
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/VectorialConvergenceChecker.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/VectorialConvergenceChecker.java?rev=777892&r1=777891&r2=777892&view=diff
==============================================================================
---
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/VectorialConvergenceChecker.java
(original)
+++
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/VectorialConvergenceChecker.java
Sat May 23 11:26:56 2009
@@ -17,8 +17,6 @@
package org.apache.commons.math.optimization;
-import java.io.Serializable;
-
/** This interface specifies how to check if an {...@link VectorialOptimizer
optimization
* algorithm} has converged.
*
@@ -36,7 +34,7 @@
* @since 2.0
*/
-public interface VectorialConvergenceChecker extends Serializable {
+public interface VectorialConvergenceChecker {
/** Check if the optimization algorithm has converged considering the last
points.
* <p>
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/direct/DirectSearchOptimizer.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/direct/DirectSearchOptimizer.java?rev=777892&r1=777891&r2=777892&view=diff
==============================================================================
---
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/direct/DirectSearchOptimizer.java
(original)
+++
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/direct/DirectSearchOptimizer.java
Sat May 23 11:26:56 2009
@@ -17,6 +17,7 @@
package org.apache.commons.math.optimization.direct;
+import java.io.Serializable;
import java.util.Arrays;
import java.util.Comparator;
@@ -76,13 +77,17 @@
* performed by the derived classes according to the implemented
* algorithms.</p>
*
+ * implements MultivariateRealOptimizer, Serializable since 2.0
+ *
* @see MultivariateRealFunction
* @see NelderMead
* @see MultiDirectional
* @version $Revision$ $Date$
* @since 1.2
*/
-public abstract class DirectSearchOptimizer implements
MultivariateRealOptimizer {
+public abstract class DirectSearchOptimizer implements
MultivariateRealOptimizer, Serializable {
+ // TODO: Add Serializable documentation
+ // TODO: Check Serializable implementation
/** Serializable version identifier. */
private static final long serialVersionUID = 4299910390345933369L;
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/direct/MultiDirectional.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/direct/MultiDirectional.java?rev=777892&r1=777891&r2=777892&view=diff
==============================================================================
---
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/direct/MultiDirectional.java
(original)
+++
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/direct/MultiDirectional.java
Sat May 23 11:26:56 2009
@@ -17,6 +17,7 @@
package org.apache.commons.math.optimization.direct;
+import java.io.Serializable;
import java.util.Comparator;
import org.apache.commons.math.FunctionEvaluationException;
@@ -26,11 +27,15 @@
/**
* This class implements the multi-directional direct search method.
*
+ * implements Serializable since 2.0
+ *
* @version $Revision$ $Date$
* @see NelderMead
* @since 1.2
*/
-public class MultiDirectional extends DirectSearchOptimizer {
+public class MultiDirectional extends DirectSearchOptimizer implements
Serializable {
+ // TODO: Add Serializable documentation
+ // TODO: Check Serializable implementation
/** Serializable version identifier. */
private static final long serialVersionUID = -5347711305645019145L;
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/direct/NelderMead.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/direct/NelderMead.java?rev=777892&r1=777891&r2=777892&view=diff
==============================================================================
---
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/direct/NelderMead.java
(original)
+++
commons/proper/math/trunk/src/java/org/apache/commons/math/optimization/direct/NelderMead.java
Sat May 23 11:26:56 2009
@@ -17,6 +17,7 @@
package org.apache.commons.math.optimization.direct;
+import java.io.Serializable;
import java.util.Comparator;
import org.apache.commons.math.FunctionEvaluationException;
@@ -26,11 +27,15 @@
/**
* This class implements the Nelder-Mead direct search method.
*
+ * implements Serializable since 2.0
+ *
* @version $Revision$ $Date$
* @see MultiDirectional
* @since 1.2
*/
-public class NelderMead extends DirectSearchOptimizer {
+public class NelderMead extends DirectSearchOptimizer implements Serializable {
+ // TODO: Add Serializable documentation
+ // TODO: Check Serializable implementation
/** Serializable version identifier. */
private static final long serialVersionUID = -5810365844886183056L;
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/stat/clustering/Clusterable.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/stat/clustering/Clusterable.java?rev=777892&r1=777891&r2=777892&view=diff
==============================================================================
---
commons/proper/math/trunk/src/java/org/apache/commons/math/stat/clustering/Clusterable.java
(original)
+++
commons/proper/math/trunk/src/java/org/apache/commons/math/stat/clustering/Clusterable.java
Sat May 23 11:26:56 2009
@@ -26,7 +26,7 @@
* @version $Revision$ $Date$
* @since 2.0
*/
-public interface Clusterable<T> extends Serializable {
+public interface Clusterable<T> {
/**
* Returns the distance from the given point.
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/stat/clustering/EuclideanIntegerPoint.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/stat/clustering/EuclideanIntegerPoint.java?rev=777892&r1=777891&r2=777892&view=diff
==============================================================================
---
commons/proper/math/trunk/src/java/org/apache/commons/math/stat/clustering/EuclideanIntegerPoint.java
(original)
+++
commons/proper/math/trunk/src/java/org/apache/commons/math/stat/clustering/EuclideanIntegerPoint.java
Sat May 23 11:26:56 2009
@@ -17,6 +17,7 @@
package org.apache.commons.math.stat.clustering;
+import java.io.Serializable;
import java.util.Collection;
import org.apache.commons.math.util.MathUtils;
@@ -26,7 +27,9 @@
* @version $Revision$ $Date$
* @since 2.0
*/
-public class EuclideanIntegerPoint implements
Clusterable<EuclideanIntegerPoint> {
+public class EuclideanIntegerPoint implements
Clusterable<EuclideanIntegerPoint>, Serializable {
+ // TODO: Add Serializable documentation
+ // TODO: Check Serializable implementation
/** Serializable version identifier. */
private static final long serialVersionUID = 3946024775784901369L;
