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

contribution/branches/MOLS/src2/moeoFirstImprovingNeighborhoodExplorer.h

@@ -0,0 +1,103 @@
+/*
+* <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 <moeoSubNeighborhoodExplorer.h>
+
+/**
+ * Explorer which explore a part of the neighborhood
+ */
+template < class Move >
+class moeoFirstImprovingNeighborhoodExplorer : public moeoSubNeighborhoodExplorer < Move >
+{
+	/** Alias for the type */
+    typedef typename Move::EOType MOEOT;
+    /** Alias for the objeciveVector */
+    typedef typename MOEOT::ObjectiveVector ObjectiveVector;
+
+    using moeoSubNeighborhoodExplorer<Move>::move;
+    using moeoSubNeighborhoodExplorer<Move>::objVec;
+    using moeoSubNeighborhoodExplorer<Move>::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
+	 */
+    moeoFirstImprovingNeighborhoodExplorer(
+        moMoveInit < Move > & _moveInit,
+        moNextMove < Move > & _nextMove,
+        moMoveIncrEval < Move, ObjectiveVector > & _incrEval)
+            : moeoSubNeighborhoodExplorer< Move >(_moveInit, _nextMove, _incrEval, 0){}
+
+private:
+
+	/**
+	 * explorer of one individual
+	 * @param _src the individual to explore
+	 * @param _dest contains new generated individuals
+	 */
+	void explore(MOEOT & _src, eoPop < MOEOT > & _dest)
+	{
+		moveInit(move, _src);
+		do
+		{
+			objVec = incrEval(move, _src);
+			if(!comparator(objVec, _src.objectiveVector())){
+				_dest.push_back(_src);
+				move(_dest.back());
+				_dest.back().objectiveVector(objVec);
+				_dest.back().flag(0);
+			}
+		}
+		while (nextMove(move, _src) && (comparator( _src.objectiveVector(),objVec)));
+		if(!nextMove(move, _src))
+			_src.flag(1);
+	}
+
+	/** Objective Vector Pareto Comparator */
+	moeoParetoObjectiveVectorComparator<ObjectiveVector> comparator;
+};
+
+#endif /*_MOEOFIRSTIMPROVINGNEIGHBORHOODEXPLORER_H_*/

contribution/branches/MOLS/src2/moeoSimpleSubNeighborhoodExplorer.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 _MOEOSIMPLESUBNEIGHBORHOODEXPLORER_H
+#define _MOEOSIMPLESUBNEIGHBORHOODEXPLORER_H
+
+#include <moeoSubNeighborhoodExplorer.h>
+
+/**
+ * Explorer which explore a part of the neighborhood
+ */
+template < class Move >
+class moeoSimpleSubNeighborhoodExplorer : public moeoSubNeighborhoodExplorer < Move >
+{
+	/** Alias for the type */
+    typedef typename Move::EOType MOEOT;
+    /** Alias for the objeciveVector */
+    typedef typename MOEOT::ObjectiveVector ObjectiveVector;
+
+    using moeoSubNeighborhoodExplorer<Move>::move;
+    using moeoSubNeighborhoodExplorer<Move>::objVec;
+    using moeoSubNeighborhoodExplorer<Move>::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(
+        moMoveInit < Move > & _moveInit,
+        moNextMove < Move > & _nextMove,
+        moMoveIncrEval < Move, ObjectiveVector > & _incrEval,
+        unsigned int _number)
+            : moeoSubNeighborhoodExplorer< Move >(_moveInit, _nextMove, _incrEval, _number){}
+
+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;
+		moveInit(move, _src);
+		do
+		{
+			objVec = incrEval(move, _src);
+			_dest.push_back(_src);
+			move(_dest.back());
+			_dest.back().objectiveVector(objVec);
+			_dest.back().flag(0);
+			tmp--;
+		}
+		while (nextMove(move, _src) && (tmp > 0));
+		if(!nextMove(move, _src))
+			_src.flag(1);
+	}
+};
+
+#endif /*_MOEOSIMPLExSUBNEIGHBORHOODEXPLORER_H_*/

contribution/branches/MOLS/src2/moeoSubNeighborhoodExplorer.h

@@ -81,36 +81,18 @@ public:
 	 */
     void operator()(eoPop < MOEOT > & _src, std::vector <unsigned int> _select, eoPop < MOEOT > & _dest)
     {
-    	if(number > 0){
+		for(unsigned int i=0; i<_select.size(); i++)
-    		for(unsigned int i=0; i<_select.size(); i++)
+			explore(_src[_select[i]], _dest);
-    			explore(_src[_select[i]], _dest);
-    	}
     }
 
-private:
+protected:
 
 	/**
 	 * explorer of one individual
 	 * @param _src the individual to explore
 	 * @param _dest contains new generated individuals
 	 */
-	void explore(MOEOT & _src, eoPop < MOEOT > & _dest)
+	virtual void explore(MOEOT & _src, eoPop < MOEOT > & _dest) = 0;
-	{
-		unsigned int tmp = number;
-		moveInit(move, _src);
-		do
-		{
-			objVec = incrEval(move, _src);
-			_dest.push_back(_src);
-			move(_dest.back());
-			_dest.back().objectiveVector(objVec);
-			_dest.back().flag(0);
-			tmp--;
-		}
-		while (nextMove(move, _src) && (tmp > 0));
-		if(!nextMove(move, _src))
-			_src.flag(1);
-	}
 
 	/** Move */
 	Move move;

contribution/branches/MOLS/test/CMakeLists.txt

@@ -2,7 +2,8 @@ SET (TEST_LIST
 		t-moeoExhaustiveUnvisitedSelect
 		t-moeoNumberUnvisitedSelect
 		t-moeoExhaustiveNeighborhoodExplorer
-		t-moeoSubNeighborhoodExplorer
+		t-moeoSimpleSubNeighborhoodExplorer
+		t-moeoFirstImprovingNeighborhoodExplorer
 		t-moeoUnifiedDominanceBasedLS
 	)
 

contribution/branches/MOLS/test/t-moeoFirstImprovingNeighborhoodExplorer.cpp

@@ -0,0 +1,136 @@
+/*
+* <t-moeoFirstImprovingNeighborhoodExplorer.cpp>
+* Copyright (C) DOLPHIN Project-Team, INRIA Lille-Nord Europe, 2006-2008
+* (C) OPAC Team, LIFL, 2002-2008
+*
+* 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  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
+*
+*/
+//-----------------------------------------------------------------------------
+// t-moeoFirstImprovingNeighborhoodExplorer.cpp
+//-----------------------------------------------------------------------------
+
+#include <eo>
+#include <mo>
+#include <moeo>
+#include <assert.h>
+#include <iostream>
+#include <moeoFirstImprovingNeighborhoodExplorer.h>
+#include <moeoTestClass.h>
+//-----------------------------------------------------------------------------
+
+
+
+//-----------------------------------------------------------------------------
+
+int main()
+{
+    std::cout << "[moeoSubNeighborhoodExplorer]\n\n";
+
+    // objective vectors
+    ObjectiveVector obj0, obj1;
+    obj0[0]=0;
+    obj0[1]=1;
+    obj1[0]=10;
+    obj1[1]=11;
+    eoPop < Solution > src;
+    eoPop < Solution > dest;
+    std::vector < unsigned int > select;
+    src.resize(5);
+    src[2].objectiveVector(obj0);
+    src[4].objectiveVector(obj1);
+    src[0].flag(0);
+    src[1].flag(0);
+    src[2].flag(0);
+    src[3].flag(0);
+    src[4].flag(0);
+    dest.resize(0);
+    select.resize(2);
+    select[0]=2;
+    select[1]=4;
+
+    testMoveInit init;
+    testMoveNext next;
+    testMoveIncrEval incr;
+
+    moeoFirstImprovingNeighborhoodExplorer < testMove > explorer(init, next, incr);
+
+    explorer(src, select, dest);
+    assert(dest.size()==10);
+    assert(src[0].flag()==0);
+    assert(src[1].flag()==0);
+    assert(src[2].flag()==1);
+    assert(src[3].flag()==0);
+    assert(src[4].flag()==1);
+    for(int i=0 ; i< 10 ; i++)
+    	assert(dest[i].flag()==0);
+    assert(dest[0].objectiveVector()[0]==2);
+    assert(dest[1].objectiveVector()[1]==3);
+    assert(dest[2].objectiveVector()[0]==2);
+    assert(dest[3].objectiveVector()[1]==3);
+    assert(dest[4].objectiveVector()[0]==2);
+
+    assert(dest[5].objectiveVector()[0]==12);
+    assert(dest[6].objectiveVector()[1]==13);
+    assert(dest[7].objectiveVector()[0]==12);
+    assert(dest[8].objectiveVector()[1]==13);
+    assert(dest[9].objectiveVector()[0]==12);
+
+    src[2].flag(0);
+    src[4].flag(0);
+    dest.resize(0);
+
+    moeoFirstImprovingNeighborhoodExplorer < testMove > explorer2(init, next, incr);
+
+    explorer2(src, select, dest);
+    assert(dest.size()==6);
+    assert(src[0].flag()==0);
+    assert(src[1].flag()==0);
+    assert(src[2].flag()==0);
+    assert(src[3].flag()==0);
+    assert(src[4].flag()==0);
+    for(int i=0 ; i< 6 ; i++)
+    	assert(dest[i].flag()==0);
+    assert(dest[0].objectiveVector()[0]==2);
+    assert(dest[1].objectiveVector()[1]==3);
+    assert(dest[2].objectiveVector()[0]==2);
+
+    assert(dest[3].objectiveVector()[0]==12);
+    assert(dest[4].objectiveVector()[1]==13);
+    assert(dest[5].objectiveVector()[0]==12);
+
+
+    std::cout << "OK" << std::endl;
+    return EXIT_SUCCESS;
+
+}
+
+//-----------------------------------------------------------------------------

contribution/branches/MOLS/test/t-moeoSimpleSubNeighborhoodExplorer.cpp

@@ -44,7 +44,7 @@
 #include <assert.h>
 #include <set>
 #include <iostream>
-#include <moeoSubNeighborhoodExplorer.h>
+#include <moeoSimpleSubNeighborhoodExplorer.h>
 #include <moeoTestClass.h>
 //-----------------------------------------------------------------------------
 
@@ -82,7 +82,7 @@ int main()
     testMoveNext next;
     testMoveIncrEval incr;
 
-    moeoSubNeighborhoodExplorer < testMove > explorer(init, next, incr, 6);
+    moeoSimpleSubNeighborhoodExplorer < testMove > explorer(init, next, incr, 6);
 
     explorer(src, select, dest);
     assert(dest.size()==10);
@@ -109,7 +109,7 @@ int main()
     src[4].flag(0);
     dest.resize(0);
 
-    moeoSubNeighborhoodExplorer < testMove > explorer2(init, next, incr, 3);
+    moeoSimpleSubNeighborhoodExplorer < testMove > explorer2(init, next, incr, 3);
 
     explorer2(src, select, dest);
     assert(dest.size()==6);