Ajout du moNeutralHC.h, et update de la lesson 1

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

trunk/paradiseo-mo/src/algo/moFirstImprHC.h

@@ -36,6 +36,16 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #include <eval/moEval.h>
 #include <eoEvalFunc.h>
 
+/********************************************************
+ * First improvement HC:
+ * Hill-Climber local search
+ * 
+ * At each iteration,
+ *   one of the random solution in the neighborhood is selected
+ *   if the selected neighbor have higher fitness than the current solution
+ *       then the solution is replaced by the selected neighbor
+ *   the algorithm stops when there is no higher neighbor
+ ********************************************************/
 template<class Neighbor>
 class moFirstImprHC: public moLocalSearch<Neighbor>
 {

trunk/paradiseo-mo/src/algo/moNeutralHC.h

@@ -0,0 +1,103 @@
+/*
+<moNeutralHC.h>
+Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
+
+Sebastien Verel, Arnaud Liefooghe, Jeremie Humeau
+
+This software is governed by the CeCILL license under French law and
+abiding by the rules of distribution of free software.  You can  ue,
+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".
+
+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 _moNeutralHC_h
+#define _moNeutralHC_h
+
+#include <algo/moLocalSearch.h>
+#include <explorer/moNeutralHCexplorer.h>
+#include <continuator/moTrueContinuator.h>
+#include <eval/moEval.h>
+#include <eoEvalFunc.h>
+
+/********************************************************
+ * Hill-Climber local search
+ *
+ * At each iteration,
+ *   one of the random best solution in the neighborhood is selected
+ *   if the selected neighbor have higher or equal fitness than the current solution
+ *       then the solution is replaced by the selected neighbor
+ *   the algorithm stops when there is no higher or equal neighbor, or if the number of iterations is too large
+ ********************************************************/
+template<class Neighbor>
+class moNeutralHC: public moLocalSearch<Neighbor>
+{
+public:
+  typedef typename Neighbor::EOT EOT;
+  typedef moNeighborhood<Neighbor> Neighborhood ;
+
+  /**
+   * Simple constructor for a hill-climber
+   * @param _neighborhood the neighborhood
+   * @param _fullEval the full evaluation function
+   * @param _eval neighbor's evaluation function
+   */
+  moNeutralHC(Neighborhood& _neighborhood, eoEvalFunc<EOT>& _fullEval, moEval<Neighbor>& _eval, unsigned int _nbStep):
+    moLocalSearch<Neighbor>(explorer, trueCont, _fullEval),
+    explorer(_neighborhood, _eval, defaultNeighborComp, defaultSolNeighborComp, _nbStep)
+  {}
+  
+  /**
+   * Simple constructor for a hill-climber
+   * @param _neighborhood the neighborhood
+   * @param _fullEval the full evaluation function
+   * @param _eval neighbor's evaluation function
+   * @param _cont an external continuator
+   */
+  moNeutralHC(Neighborhood& _neighborhood, eoEvalFunc<EOT>& _fullEval, moEval<Neighbor>& _eval, unsigned int _nbStep, moContinuator<Neighbor>& _cont):
+    moLocalSearch<Neighbor>(explorer, _cont, _fullEval),
+    explorer(_neighborhood, _eval, defaultNeighborComp, defaultSolNeighborComp, _nbStep)
+  {}
+  
+  /**
+   * Simple constructor for a hill-climber
+   * @param _neighborhood the neighborhood
+   * @param _fullEval the full evaluation function
+   * @param _eval neighbor's evaluation function
+   * @param _cont an external continuator
+   * @param _compN  a neighbor vs neighbor comparator
+   * @param _compSN a solution vs neighbor comparator
+   */
+  moNeutralHC(Neighborhood& _neighborhood, eoEvalFunc<EOT>& _fullEval, moEval<Neighbor>& _eval, unsigned int _nbStep, moContinuator<Neighbor>& _cont, moNeighborComparator<Neighbor>& _compN, moSolNeighborComparator<Neighbor>& _compSN):
+    moLocalSearch<Neighbor>(explorer, _cont, _fullEval),
+    explorer(_neighborhood, _eval, _compN, _compSN, _nbStep)
+  {}
+  
+private:
+  // always true continuator
+  moTrueContinuator<Neighbor> trueCont;
+  // compare the fitness values of neighbors: true is strictly greater
+  moNeighborComparator<Neighbor> defaultNeighborComp;
+  // compare the fitness values of the solution and the neighbor: true if strictly greater 
+  moSolNeighborComparator<Neighbor> defaultSolNeighborComp;
+  // the explorer of the HC with neutral move (equals fitness move)
+  moNeutralHCexplorer<Neighbor> explorer;
+};
+
+#endif

trunk/paradiseo-mo/src/algo/moRandomBestHC.h

@@ -36,6 +36,16 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #include <eval/moEval.h>
 #include <eoEvalFunc.h>
 
+/********************************************************
+ * Random Best HC:
+ * Hill-Climber local search
+ * 
+ * At each iteration,
+ *   one of the random best solution in the neighborhood is selected
+ *   if the selected neighbor have higher fitness than the current solution
+ *       then the solution is replaced by the selected neighbor
+ *   the algorithm stops when there is no higher neighbor
+ ********************************************************/
 template<class Neighbor>
 class moRandomBestHC: public moLocalSearch<Neighbor>
 {

trunk/paradiseo-mo/src/algo/moSimpleHC.h

@@ -36,6 +36,16 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #include <eval/moEval.h>
 #include <eoEvalFunc.h>
 
+/********************************************************
+ * Simple HC:
+ * Hill-Climber local search
+ * 
+ * At each iteration,
+ *   the first best solution in the neighborhood is selected
+ *   if the selected neighbor have higher fitness than the current solution
+ *       then the solution is replaced by the selected neighbor
+ *   the algorithm stops when there is no higher neighbor
+ ********************************************************/
 template<class Neighbor>
 class moSimpleHC: public moLocalSearch<Neighbor>
 {

trunk/paradiseo-mo/src/explorer/moNeutralHCexplorer.h

@@ -73,9 +73,6 @@ public:
                         	moRandomBestHCexplorer<Neighbor>(_neighborhood, _eval, _neighborComparator, _solNeighborComparator),
             nbStep(_nbStep) {
         //Some cycle is possible with equals fitness solutions if the neighborhood is not random
-        if (!neighborhood.isRandom()) {
-            std::cout << "moNeutralHCexplorer::Warning -> the neighborhood used is not random" << std::endl;
-        }
     }
 
     /**

trunk/paradiseo-mo/src/mo.h

@@ -40,6 +40,7 @@
 #include <algo/moSimpleHC.h>
 #include <algo/moFirstImprHC.h>
 #include <algo/moRandomBestHC.h>
+#include <algo/moNeutralHC.h>
 
 #include <comparator/moComparator.h>
 #include <comparator/moNeighborComparator.h>