ILS v1 :)

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1727 331e1502-861f-0410-8da2-ba01fb791d7f

trunk/paradiseo-mo/src/coolingSchedule/moCoolingSchedule.h

@@ -35,6 +35,8 @@
 #ifndef _moCoolingSchedule_h
 #define _moCoolingSchedule_h
 
+#include <eoFunctor.h>
+
 /**
  * Cooling Schedule of the temperature in the simulated algorithm
  * 
@@ -47,20 +49,14 @@ public:
    * Initial temperature
    * @param _solution initial solution 
    */
-  double init(EOT & _solution) = 0;
+  virtual double init(EOT & _solution) = 0;
 
   /**
    * update the temperature
    * @param _temp current temperature to update
    */
-  void update(double& _temp) = 0;
+  virtual void update(double& _temp) = 0;
 
-  /**
-   * test the ending of the process
-   * @param _temp current temperature 
-   * @return true if the process could be continue 
-   */
-  // bool operator()(double _temp) = 0;
 };
 
 

trunk/paradiseo-mo/src/coolingSchedule/moSimpleCoolingSchedule.h

@@ -43,7 +43,7 @@
  * 
  */
 template< class EOT >
-class moSimpleCoolingSchedule : public eoUF<double, bool>
+class moSimpleCoolingSchedule : public moCoolingSchedule<EOT>
 {
 public:
   /**
@@ -91,18 +91,14 @@ public:
 private:
   // initial temperature
   double initT;
-
-  // threshold temperature
-  double finalT;
-
   // coefficient of decrease
   double alpha;
-
   // maximum number of iterations at the same temperature
-  unisgned span;
-
+  unsigned int span;
+  // threshold temperature
+  double finalT;
   // number of steps with the same temperature
-  unsigned step;
+  unsigned int step;
 };