DMLS intégré et testé

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

trunk/paradiseo-moeo/src/explorer/moeoExhaustiveNeighborhoodExplorer.h

@@ -48,12 +48,11 @@
 /**
  * Explorer which explore all the neighborhood
  */
-template < class Neighborhood >
-class moeoExhaustiveNeighborhoodExplorer : public moeoPopNeighborhoodExplorer < Neighborhood >
+template < class Neighbor>
+class moeoExhaustiveNeighborhoodExplorer : public moeoPopNeighborhoodExplorer <Neighbor>
 {
 	/** Alias for the type */
-    typedef typename Neighborhood::EOT MOEOT;
-    typedef typename Neighborhood::Neighbor Neighbor;
+    typedef typename Neighbor::EOT MOEOT;
     /** Alias for the objeciveVector */
     typedef typename MOEOT::ObjectiveVector ObjectiveVector;
 
@@ -90,13 +89,21 @@ private:
 	 */
 	void explore(MOEOT & _src , eoPop < MOEOT > & _dest)
 	{
+		//if the neighborhood is not empty
 		if(neighborhood.hasNeighbor(_src)){
+			//init the neighborhood
 			neighborhood.init(_src, neighbor);
+			//copy the solution (_src) at the end of the destination (_dest)
 			_dest.push_back(_src);
+			//eval the neighbor
 			eval(_dest.back(),neighbor);
+			//move the copy
 			neighbor.move(_dest.back());
+			//affect objective vector to the copy
 			_dest.back().objectiveVector(neighbor.fitness());
+			//fix its flag to 0 (unvisited solution)
 			_dest.back().flag(0);
+			//repeat all instructions for each neighbor in the neighborhood
 			while (neighborhood.cont(_src)){
 				neighborhood.next(_src, neighbor);
 				_dest.push_back(_src);
@@ -105,6 +112,7 @@ private:
 				_dest.back().objectiveVector(neighbor.fitness());
 				_dest.back().flag(0);
 			}
+			//fix the source flag to 1 (visited solution)
 			_src.flag(1);
 		}
 	}
@@ -113,8 +121,6 @@ private:
 	Neighbor neighbor;
 	/** Neighborhood */
 	moNeighborhood<Neighbor>& neighborhood;
-	/** ObjectiveVector */
-    ObjectiveVector objVec;
     /** the incremental evaluation */
     moEval < Neighbor > & eval;
 

trunk/paradiseo-moeo/src/explorer/moeoFirstImprovingNeighborhoodExplorer.h

@@ -0,0 +1,118 @@
+/*
+* <moeoFirstImprovingNeighborhoodExplorer.h>
+* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2008
+* (C) OPAC Team, LIFL, 2002-2008
+*
+* 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 _MOEOFIRSTIMPROVINGNEIGHBORHOODEXPLORER_H
+#define _MOEOFIRSTIMPROVINGNEIGHBORHOODEXPLORER_H
+
+#include <explorer/moeoSubNeighborhoodExplorer.h>
+
+/**
+ * Explorer which explore a part of the neighborhood
+ */
+template < class Neighbor >
+class moeoFirstImprovingNeighborhoodExplorer : public moeoSubNeighborhoodExplorer < Neighbor >
+{
+	/** Alias for the type */
+    typedef typename Neighbor::EOT MOEOT;
+    /** Alias for the objeciveVector */
+    typedef typename MOEOT::ObjectiveVector ObjectiveVector;
+
+    using moeoSubNeighborhoodExplorer<Neighbor>::neighborhood;
+    using moeoSubNeighborhoodExplorer<Neighbor>::neighbor;
+
+public:
+
+	/**
+	 * Ctor
+	 * @param _moveInit the move initializer
+	 * @param _nextMove allow to do or not a move
+	 * @param _incrEval a (generally) efficient evaluation fonction
+	 */
+    moeoFirstImprovingNeighborhoodExplorer(
+			moNeighborhood<Neighbor>& _neighborhood,
+        	moEval < Neighbor > & _eval):
+        		moeoSubNeighborhoodExplorer< Neighbor >(_neighborhood, 0), eval(_eval){}
+
+private:
+
+	/**
+	 * explorer of one individual
+	 * @param _src the individual to explore
+	 * @param _dest contains new generated individuals
+	 */
+	void explore(MOEOT & _src, eoPop < MOEOT > & _dest)
+	{
+		//if the neighborhood is not empty
+		if(neighborhood.hasNeighbor(_src)){
+			//init the neighborhood
+			neighborhood.init(_src, neighbor);
+			//eval the neighbor
+			cycle(_src, _dest);
+			//repeat all instructions for each neighbor in the neighborhood until a best neighbor is found
+			while (!comparator(_src.objectiveVector(), neighbor.fitness()) && neighborhood.cont(_src)){
+				neighborhood.next(_src, neighbor);
+				cycle(_src, _dest);
+			}
+			//if all neighbors are been visited, fix the source flag to 1 (visited solution)
+			if(!neighborhood.cont(_src))
+				_src.flag(1);
+		}
+	}
+
+	void cycle(MOEOT & _src, eoPop < MOEOT > & _dest){
+		eval(_src, neighbor);
+		if(!comparator(neighbor.fitness(), _src.objectiveVector())){
+			//copy the solution (_src) at the end of the destination (_dest)
+			_dest.push_back(_src);
+			//move the copy
+			neighbor.move(_dest.back());
+			//affect objective vector to the copy
+			_dest.back().objectiveVector(neighbor.fitness());
+			//fix its flag to 0 (unvisited solution)
+			_dest.back().flag(0);
+		}
+	}
+
+	/** Objective Vector Pareto Comparator */
+	moeoParetoObjectiveVectorComparator<ObjectiveVector> comparator;
+	/** Incremental evaluation of a neighbor */
+	moEval < Neighbor > & eval;
+
+};
+
+#endif /*_MOEOFIRSTIMPROVINGNEIGHBORHOODEXPLORER_H_*/

trunk/paradiseo-moeo/src/explorer/moeoNoDesimprovingNeighborhoodExplorer.h

@@ -0,0 +1,111 @@
+/*
+* <moeoNoDesimprovingNeighborhoodExplorer.h>
+* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2008
+* (C) OPAC Team, LIFL, 2002-2008
+*
+* 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 _MOEONODESIMPROVINGNEIGHBORHOODEXPLORER_H
+#define _MOEONODESIMPROVINGNEIGHBORHOODEXPLORER_H
+
+#include <explorer/moeoSubNeighborhoodExplorer.h>
+
+/**
+ * Explorer which explore a part of the neighborhood
+ */
+template < class Neighbor >
+class moeoNoDesimprovingNeighborhoodExplorer : public moeoSubNeighborhoodExplorer < Neighbor >
+{
+	/** Alias for the type */
+    typedef typename Neighbor::EOT MOEOT;
+    /** Alias for the objeciveVector */
+    typedef typename MOEOT::ObjectiveVector ObjectiveVector;
+
+    using moeoSubNeighborhoodExplorer<Neighbor>::neighborhood;
+    using moeoSubNeighborhoodExplorer<Neighbor>::neighbor;
+
+public:
+
+	/**
+	 * Ctor
+	 * @param _neighborhood a neighborhood
+	 */
+    moeoNoDesimprovingNeighborhoodExplorer(
+    		moNeighborhood<Neighbor>& _neighborhood,
+        	moEval < Neighbor > & _eval)
+            : moeoSubNeighborhoodExplorer< Neighbor >(_neighborhood, 0), eval(_eval){}
+
+private:
+
+	/**
+	 * explorer of one individual
+	 * @param _src the individual to explore
+	 * @param _dest contains new generated individuals
+	 */
+	void explore(MOEOT & _src, eoPop < MOEOT > & _dest)
+	{
+		bool tmp=true;
+		if(neighborhood.hasNeighbor(_src)){
+			neighborhood.init(_src, neighbor);
+			eval(_src,neighbor);
+			if(!comparator(neighbor.fitness(), _src.objectiveVector())){
+				_dest.push_back(_src);
+				neighbor.move(_dest.back());
+				_dest.back().objectiveVector(neighbor.fitness());
+				_dest.back().flag(0);
+				tmp=false;
+			}
+			while (neighborhood.cont(_src) && tmp){
+				neighborhood.next(_src, neighbor);
+				eval(_src,neighbor);
+				if(!comparator(neighbor.fitness(), _src.objectiveVector())){
+					_dest.push_back(_src);
+					neighbor.move(_dest.back());
+					_dest.back().objectiveVector(neighbor.fitness());
+					_dest.back().flag(0);
+					tmp=false;
+				}
+			}
+			if(!neighborhood.cont(_src))
+				_src.flag(1);
+		}
+	}
+
+	/** Objective Vector Pareto Comparator */
+	moeoParetoObjectiveVectorComparator<ObjectiveVector> comparator;
+	/** Incremental evaluation of a neighbor */
+	moEval < Neighbor > & eval;
+};
+
+#endif /*_MOEONODESIMPROVINGNEIGHBORHOODEXPLORER_H_*/

trunk/paradiseo-moeo/src/explorer/moeoPopNeighborhoodExplorer.h

@@ -44,14 +44,16 @@
 /**
  * Abstract class for multi-objective local search neighborhood exploration
  */
-template < class Neighborhood >
+template < class Neighbor >
 class moeoPopNeighborhoodExplorer: public eoFunctorBase{
 
 public:
+
+	typedef typename Neighbor::EOT MOEOT;
 	/**
 	 * abstract functor which realise exploration
 	 */
-	virtual void operator()(eoPop < typename Neighborhood::EOT > &, std::vector <unsigned int>, eoPop < typename Neighborhood::EOT > &) = 0;
+	virtual void operator()(eoPop<MOEOT> &, std::vector <unsigned int>, eoPop<MOEOT> &) = 0;
 
 };
 

trunk/paradiseo-moeo/src/explorer/moeoSimpleSubNeighborhoodExplorer.h

@@ -0,0 +1,120 @@
+/*
+* <moeoSubNeighborhoodExplorer.h>
+* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2008
+* (C) OPAC Team, LIFL, 2002-2008
+*
+* 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 _MOEOSIMPLESUBNEIGHBORHOODEXPLORER_H
+#define _MOEOSIMPLESUBNEIGHBORHOODEXPLORER_H
+
+#include <explorer/moeoSubNeighborhoodExplorer.h>
+
+/**
+ * Explorer which explore a part of the neighborhood
+ */
+template < class Neighbor >
+class moeoSimpleSubNeighborhoodExplorer : public moeoSubNeighborhoodExplorer < Neighbor >
+{
+	/** Alias for the type */
+    typedef typename Neighbor::EOT MOEOT;
+    /** Alias for the objeciveVector */
+    typedef typename MOEOT::ObjectiveVector ObjectiveVector;
+
+    using moeoSubNeighborhoodExplorer<Neighbor>::neighborhood;
+    using moeoSubNeighborhoodExplorer<Neighbor>::neighbor;
+    using moeoSubNeighborhoodExplorer<Neighbor>::number;
+
+public:
+
+	/**
+	 * Ctor
+	 * @param _moveInit the move initializer
+	 * @param _nextMove allow to do or not a move
+	 * @param _incrEval a (generally) efficient evaluation fonction
+	 * @param _number the number of neighbor to explore
+	 */
+    moeoSimpleSubNeighborhoodExplorer(
+			moNeighborhood<Neighbor>& _neighborhood,
+	        unsigned int _number,
+        	moEval < Neighbor > & _eval)
+            : moeoSubNeighborhoodExplorer<Neighbor>(_neighborhood, _number), eval(_eval){}
+
+private:
+
+	/**
+	 * explorer of one individual
+	 * @param _src the individual to explore
+	 * @param _dest contains new generated individuals
+	 */
+	void explore(MOEOT & _src, eoPop < MOEOT > & _dest)
+	{
+		unsigned int tmp=number;
+		//if the neighborhood is not empty
+		if(neighborhood.hasNeighbor(_src) && tmp>0){
+			//init the neighborhood
+			neighborhood.init(_src, neighbor);
+			//eval the neighbor
+			cycle(_src, _dest);
+			tmp--;
+			//repeat all instructions for each neighbor in the neighborhood until a best neighbor is found
+			while (neighborhood.cont(_src) && tmp>0){
+				neighborhood.next(_src, neighbor);
+				cycle(_src, _dest);
+				tmp--;
+			}
+			//if all neighbors are been visited, fix the source flag to 1 (visited solution)
+			if(!neighborhood.cont(_src))
+				_src.flag(1);
+		}
+	}
+
+	void cycle(MOEOT & _src, eoPop < MOEOT > & _dest){
+		eval(_src, neighbor);
+		//copy the solution (_src) at the end of the destination (_dest)
+		_dest.push_back(_src);
+		//move the copy
+		neighbor.move(_dest.back());
+		//affect objective vector to the copy
+		_dest.back().objectiveVector(neighbor.fitness());
+		//fix its flag to 0 (unvisited solution)
+		_dest.back().flag(0);
+	}
+
+	/** Incremental evaluation of a neighbor */
+	moEval < Neighbor > & eval;
+
+};
+
+#endif /*_MOEOSIMPLESUBNEIGHBORHOODEXPLORER_H_*/

trunk/paradiseo-moeo/src/explorer/moeoSubNeighborhoodExplorer.h

@@ -0,0 +1,101 @@
+/*
+* <moeoSubNeighborhoodExplorer.h>
+* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2008
+* (C) OPAC Team, LIFL, 2002-2008
+*
+* 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 _MOEOSUBNEIGHBORHOODEXPLORER_H
+#define _MOEOSUBNEIGHBORHOODEXPLORER_H
+
+#include <eoPop.h>
+#include <neighborhood/moNeighbor.h>
+#include <neighborhood/moNeighborhood.h>
+#include <explorer/moeoPopNeighborhoodExplorer.h>
+
+/**
+ * Explorer which explore a part of the neighborhood
+ */
+template < class Neighbor >
+class moeoSubNeighborhoodExplorer : public moeoPopNeighborhoodExplorer < Neighbor >
+{
+	/** Alias for the type */
+    typedef typename Neighbor::EOT MOEOT;
+    /** Alias for the objeciveVector */
+    typedef typename MOEOT::ObjectiveVector ObjectiveVector;
+
+public:
+
+	/**
+	 * Ctor
+	 * @param _neighborhood a neighborhood
+	 * @param _number the number of neighbor to explore
+	 */
+    moeoSubNeighborhoodExplorer(
+    		moNeighborhood<Neighbor>& _neighborhood,
+    		unsigned int _number)
+            : neighborhood(_neighborhood), number(_number){}
+
+	/**
+	 * functor to explore the neighborhood
+	 * @param _src the population to explore
+	 * @param _select contains index of individuals from the population to explore
+	 * @param _dest contains new generated individuals
+	 */
+    void operator()(eoPop < MOEOT > & _src, std::vector <unsigned int> _select, eoPop < MOEOT > & _dest)
+    {
+		for(unsigned int i=0; i<_select.size(); i++)
+			explore(_src[_select[i]], _dest);
+    }
+
+protected:
+
+	/**
+	 * explorer of one individual
+	 * @param _src the individual to explore
+	 * @param _dest contains new generated individuals
+	 */
+	virtual void explore(MOEOT & _src, eoPop < MOEOT > & _dest) = 0;
+
+	/** Neighbor */
+	Neighbor neighbor;
+	/** Neighborhood */
+	moNeighborhood<Neighbor> & neighborhood;
+
+    /** number of neighbor to explore for each selected individual*/
+    unsigned int number;
+
+};
+
+#endif /*_MOEOSUBNEIGHBORHOODEXPLORER_H_*/