Make more objects serializable.

org.sat4j.core/src/main/java/org/sat4j/minisat/core/ConflictTimer.java

@@ -29,6 +29,8 @@
  *******************************************************************************/
 package org.sat4j.minisat.core;
 
+import java.io.Serializable;
+
 /**
  * Conflict based timer.
  * 
@@ -37,7 +39,7 @@ package org.sat4j.minisat.core;
  * @author daniel
  * 
  */
-public interface ConflictTimer {
+public interface ConflictTimer extends Serializable {
 
     void reset();
 

org.sat4j.core/src/main/java/org/sat4j/minisat/core/ConflictTimerContainer.java

@@ -29,8 +29,6 @@
  *******************************************************************************/
 package org.sat4j.minisat.core;
 
-import java.io.Serializable;
-
 import org.sat4j.core.Vec;
 import org.sat4j.specs.IVec;
 
@@ -40,11 +38,11 @@ import org.sat4j.specs.IVec;
  * @author daniel
  * 
  */
-public class ConflictTimerContainer implements Serializable, ConflictTimer {
+public class ConflictTimerContainer implements ConflictTimer {
 
     /**
-	 * 
-	 */
+     * 
+     */
     private static final long serialVersionUID = 1L;
 
     private final IVec<ConflictTimer> timers = new Vec<ConflictTimer>();

org.sat4j.core/src/main/java/org/sat4j/minisat/core/IOrder.java

@@ -30,6 +30,7 @@
 package org.sat4j.minisat.core;
 
 import java.io.PrintWriter;
+import java.io.Serializable;
 
 /**
  * Interface for the variable ordering heuristics. It has both the
@@ -39,7 +40,7 @@ import java.io.PrintWriter;
  * @author daniel
  * 
  */
-public interface IOrder {
+public interface IOrder extends Serializable {
 
     /**
      * Method used to provide an easy access the the solver vocabulary.