Code lesson1_simpleHC.cpp ajouter au tutorial

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

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

@@ -0,0 +1,115 @@
+/*
+  <moDynSpanCoolingSchedule.h>
+  Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
+
+  Sébastien Verel, Arnaud Liefooghe, Jérémie Humeau
+
+  This software is governed by the CeCILL license under French law and
+  abiding by the rules of distribution of free software.  You can  use,
+  modify and/ or redistribute the software under the terms of the CeCILL
+  license as circulated by CEA, CNRS and INRIA at the following URL
+  "http://www.cecill.info".
+
+  As a counterpart to the access to the source code and  rights to copy,
+  modify and redistribute granted by the license, users are provided only
+  with a limited warranty  and the software's author,  the holder of the
+  economic rights,  and the successive licensors  have only  limited liability.
+
+  In this respect, the user's attention is drawn to the risks associated
+  with loading,  using,  modifying and/or developing or reproducing the
+  software by the user in light of its specific status of free software,
+  that may mean  that it is complicated to manipulate,  and  that  also
+  therefore means  that it is reserved for developers  and  experienced
+  professionals having in-depth computer knowledge. Users are therefore
+  encouraged to load and test the software's suitability as regards their
+  requirements in conditions enabling the security of their systems and/or
+  data to be ensured and,  more generally, to use and operate it in the
+  same conditions as regards security.
+  The fact that you are presently reading this means that you have had
+  knowledge of the CeCILL license and that you accept its terms.
+
+  ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+  Contact: paradiseo-help@lists.gforge.inria.fr
+*/
+
+#ifndef _moDynSpanCoolingSchedule_h
+#define _moDynSpanCoolingSchedule_h
+
+#include <coolingSchedule/moCoolingSchedule.h>
+
+/**
+ * Cooling Schedule of the temperature in the simulated algorithm
+ * 
+ */
+template< class EOT >
+class moDynSpanCoolingSchedule : public moCoolingSchedule<EOT>
+{
+public:
+  /**
+   * default constructor
+   * @param _initT initial temperature
+   * @param _alpha factor of decreasing
+   * @param _spanMove maximum number of move with equal temperature
+   * @param _spanNoMove maximum number of no improvement with equal temperature
+   * @param _nbSpan maximum number of span with no improvmement before stopping the search
+   */
+  moDynSpanCoolingSchedule(double _initT, double _alpha, unsigned _spanMove, unsigned _spanNoMove, unsigned _nbSpan) : initT(_initT), alpha(_alpha), spanMove(_spanMove), spanNoMove(_spanNoMove), nbSpan(_nbSpan) {
+  }
+
+  /**
+   * Initial temperature
+   * @param _solution initial solution 
+   */
+  virtual double init(EOT & _solution) {
+    // number of successive moves since the last temperature change
+    nbMove = 0;
+
+    // number of no improvement since the last temperature change
+    nbNoMove = 0;
+
+    // number of span with no improvement
+    nbSpan = 0;
+
+    return initT;
+  }
+
+  /**
+   * update the temperature by a factor
+   * @param _temp current temperature to update
+   */
+  virtual void update(double& _temp) {
+    if (nbMove >= spanMove || nbNoMove >= spanNoMove) {
+      _temp *= alpha;
+
+      nbMove   = 0;
+      nbNoMove = 0;
+    } else {
+      nbMove++;
+      nbNoMove++;
+    }
+  }
+
+  /**
+   * compare the temperature to the threshold
+   * @param _temp current temperature 
+   * @return true if the current temperature is over the threshold (final temperature) 
+   */
+  virtual bool operator()(double _temp) {
+    return _temp > finalT;
+  }
+
+private:
+  // initial temperature
+  double initT;
+  // coefficient of decrease
+  double alpha;
+  // maximum number of iterations at the same temperature
+  unsigned int span;
+  // threshold temperature
+  double finalT;
+  // number of steps with the same temperature
+  unsigned int step;
+};
+
+
+#endif

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

@@ -36,10 +36,9 @@
 #define _moSimpleCoolingSchedule_h
 
 #include <coolingSchedule/moCoolingSchedule.h>
-#include <eoFunctor.h>
 
 /**
- * Cooling Schedule of the temperature in the simulated algorithm
+ * Classical cooling Schedule of the temperature in the simulated algorithm with initial and final temperature and a factor of decrease
  * 
  */
 template< class EOT >
@@ -50,8 +49,8 @@ public:
    * default constructor
    * @param _initT initial temperature
    * @param _alpha factor of decreasing
-   * @param span number of iteration with equal temperature
-   * @param finalT final temperature, threshold of the stopping criteria
+   * @param _span number of iteration with equal temperature
+   * @param _finalT final temperature, threshold of the stopping criteria
    */
   moSimpleCoolingSchedule(double _initT, double _alpha, unsigned _span, double _finalT) : initT(_initT), alpha(_alpha), span(_span), finalT(_finalT) {
   }
@@ -61,7 +60,7 @@ public:
    * @param _solution initial solution
    * @return the initial temperature
    */
-  double init(EOT & _solution) {
+  virtual double init(EOT & _solution) {
     // number of iteration with the same temperature
     step = 0;
 
@@ -72,7 +71,7 @@ public:
    * update the temperature by a factor
    * @param _temp current temperature to update
    */
-  void update(double& _temp) {
+  virtual void update(double& _temp) {
     if (step >= span) {
       _temp *= alpha;
       step = 0;
@@ -85,7 +84,7 @@ public:
    * @param _temp current temperature 
    * @return true if the current temperature is over the threshold (final temperature) 
    */
-  bool operator()(double _temp) {
+  virtual bool operator()(double _temp) {
     return _temp > finalT;
   }