first improvement ajouter

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

branches/newMo/src/comparator/moNeighborComparator.h

@@ -53,10 +53,10 @@ public:
      * Compare two neighbors
      * @param _neighbor1 the first neighbor
      * @param _neighbor2 the second neighbor
-     * @return true if the neighbor1 is better than neighbor2
+     * @return true if the neighbor2 is better than neighbor1
      */
     virtual bool operator()(const Neighbor& _neighbor1, const Neighbor& _neighbor2) {
-    	return (_neighbor1.fitness() > _neighbor2.fitness());
+    	return (_neighbor1.fitness() < _neighbor2.fitness());
     }
 
     /**

branches/newMo/src/comparator/moSolNeighborComparator.h

@@ -0,0 +1,73 @@
+/*
+  <moSolNeighborComparator.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 _moSolNeighborComparator_h
+#define _moSolNeighborComparator_h
+
+#include <EO.h>
+#include <eoFunctor.h>
+
+#include <neighborhood/moNeighbor.h>
+
+
+/**
+ * Comparator of two neighbors
+ */
+template< class Neighbor >
+class moSolNeighborComparator : public eoBF<const typename Neighbor::EOT & , const Neighbor & , bool>
+{
+public:
+  typedef typename Neighbor::EOT EOT ;
+
+    /**
+     * Compare two neighbors
+     * @param _sol the solution
+     * @param _neighbor the neighbor
+     * @return true if the neighbor is better than sol
+     */
+    virtual bool operator()(const EOT& _sol, const Neighbor& _neighbor) {
+    	return (_sol.fitness() < _neighbor.fitness());
+    }
+
+    /**
+     * Return the class id.
+     * @return the class name as a std::string
+     */
+    virtual std::string className() const {
+    	return "moSolNeighborComparator";
+    }
+};
+
+
+#endif

branches/newMo/src/explorer/moFirstImprExplorer.h

@@ -0,0 +1,162 @@
+/*
+  <moFirstImprExplorer.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 _moFirstImprexplorer_h
+#define _moFirstImprexplorer_h
+
+#include <explorer/moNeighborhoodExplorer.h>
+#include <comparator/moNeighborComparator.h>
+#include <comparator/moSolNeighborComparator.h>
+
+/**
+ * Explorer for a first imporvement heuristic
+ */
+template< class Neighborhood >
+class moFirstImprExplorer : public moNeighborhoodExplorer<Neighborhood>
+{
+public:
+    typedef typename Neighborhood::EOT EOT ;
+    typedef typename Neighborhood::Neighbor Neighbor ;
+
+    using moNeighborhoodExplorer<Neighborhood>::neighborhood;
+    using moNeighborhoodExplorer<Neighborhood>::eval;
+
+	/**
+	 * Constructor
+	 * @param _neighborhood the neighborhood
+	 * @param _eval the evaluation function
+	 * @param _comparator a neighbor comparator
+	 */
+ moFirstImprExplorer(Neighborhood& _neighborhood, moEval<Neighbor>& _eval, moNeighborComparator<Neighbor>& _neighborComparator, moSolNeighborComparator<Neighbor>& _solNeighborComparator) : moNeighborhoodExplorer<Neighborhood>(_neighborhood, _eval), neighborComparator(_neighborComparator), solNeighborComparator(_solNeighborComparator) {
+    	isAccept = false;
+    	current=new Neighbor();
+    }
+
+	/**
+	 * Destructor
+	 */
+    ~moFirstImprExplorer(){
+    	delete current;
+    }
+
+	/**
+	 * initParam: NOTHING TO DO
+	 */
+    virtual void initParam(EOT & solution){};
+
+	/**
+	 * updateParam: NOTHING TO DO
+	 */
+    virtual void updateParam(EOT & solution){};
+
+	/**
+	 * terminate: NOTHING TO DO
+	 */
+    virtual void terminate(EOT & solution){};
+
+    /**
+     * Explore the neighborhood of a solution
+     * @param _solution
+     */
+    virtual void operator()(EOT & _solution){
+
+	//est qu'on peut initializer
+    	//Test if _solution has a Neighbor
+		if(neighborhood.hasNeighbor(_solution)){
+			//init the first neighbor
+			neighborhood.init(_solution, (*current));
+
+			//eval the _solution moved with the neighbor and stock the result in the neighbor
+			eval(_solution, (*current));
+
+			//test all others neighbors
+			while (! solNeighborComparator(_solution, *current) && neighborhood.cont(_solution)) {
+				//next neighbor
+				neighborhood.next(_solution, (*current));
+				//eval
+				eval(_solution, (*current));
+			}
+		}
+		else{
+			//if _solution hasn't neighbor,
+			isAccept=false;
+		}
+    };
+
+    /**
+     * continue if a move is accepted
+     * @param _solution the solution
+     * @return true if an ameliorated neighbor was be found
+     */
+    virtual bool isContinue(EOT & _solution) {
+    	return isAccept ;
+    };
+
+    /**
+     * move the solution with the best neighbor
+     * @param _solution the solution to move
+     */
+    virtual void move(EOT & _solution) {
+		//move the solution
+    	(*current).move(_solution);
+    	//update its fitness
+    	_solution.fitness((*current).fitness());
+    };
+
+    /**
+     * accept test if an amelirated neighbor was be found
+     * @param _solution the solution
+     * @return true if the best neighbor ameliorate the fitness
+     */
+    virtual bool accept(EOT & _solution) {
+		if(neighborhood.hasNeighbor(_solution)){
+		  isAccept = solNeighborComparator(_solution, (*current)) ;
+		}
+		return isAccept;
+    };
+
+private:
+    // comparator betwenn solution and neighbor or between neighbors
+    moNeighborComparator<Neighbor>& neighborComparator;
+    moSolNeighborComparator<Neighbor>& solNeighborComparator;
+
+    //Pointer on the best and the current neighbor
+    Neighbor* current;
+
+    // true if the move is accepted
+    bool isAccept ;
+};
+
+
+#endif

branches/newMo/src/explorer/moNeighborhoodExplorer.h

@@ -40,7 +40,6 @@
 
 #include <neighborhood/moNeighborhood.h>
 #include <eval/moEval.h>
-#include <comparator/moNeighborComparator.h>
 
 /**
  * Explore the neighborhood
@@ -59,7 +58,7 @@ public:
      * @param _eval the evaluation function
      * @param _comparator a neighbor comparator
      */
-    moNeighborhoodExplorer(Neighborhood& _neighborhood, moEval<Neighbor>& _eval, moNeighborComparator<Neighbor>& _comparator):neighborhood(_neighborhood), eval(_eval), comparator(_comparator) {}
+    moNeighborhoodExplorer(Neighborhood& _neighborhood, moEval<Neighbor>& _eval):neighborhood(_neighborhood), eval(_eval) {}
 
     /**
      * Init Search parameters
@@ -110,7 +109,6 @@ public:
 protected:
     Neighborhood & neighborhood;
     moEval<Neighbor>& eval;
-    moNeighborComparator<Neighbor>& comparator;
 };
 
 #endif

branches/newMo/src/explorer/moSimpleHCexplorer.h

@@ -36,6 +36,8 @@
 #define _moSimpleHCexplorer_h
 
 #include <explorer/moNeighborhoodExplorer.h>
+#include <comparator/moNeighborComparator.h>
+#include <comparator/moSolNeighborComparator.h>
 
 /**
  * Explorer for a simple Hill-climbing
@@ -49,7 +51,6 @@ public:
 
     using moNeighborhoodExplorer<Neighborhood>::neighborhood;
     using moNeighborhoodExplorer<Neighborhood>::eval;
-    using moNeighborhoodExplorer<Neighborhood>::comparator;
 
 	/**
 	 * Constructor
@@ -57,7 +58,7 @@ public:
 	 * @param _eval the evaluation function
 	 * @param _comparator a neighbor comparator
 	 */
-    moSimpleHCexplorer(Neighborhood& _neighborhood, moEval<Neighbor>& _eval, moNeighborComparator<Neighbor>& _comparator) : moNeighborhoodExplorer<Neighborhood>(_neighborhood, _eval, _comparator){
+ moSimpleHCexplorer(Neighborhood& _neighborhood, moEval<Neighbor>& _eval, moNeighborComparator<Neighbor>& _neighborComparator, moSolNeighborComparator<Neighbor>& _solNeighborComparator) : moNeighborhoodExplorer<Neighborhood>(_neighborhood, _eval), neighborComparator(_neighborComparator), solNeighborComparator(_solNeighborComparator) {
     	isAccept = false;
     	current=new Neighbor();
     	best=new Neighbor();
@@ -111,7 +112,7 @@ public:
 				//eval
 				eval(_solution, (*current));
 				//if we found a better neighbor, update the best
-				if (comparator((*current), (*best))) {
+				if (neighborComparator((*best), (*current))) {
 					(*best) = (*current);
 				}
 			}
@@ -149,12 +150,15 @@ public:
      */
     virtual bool accept(EOT & _solution) {
 		if(neighborhood.hasNeighbor(_solution)){
-			isAccept = (_solution.fitness() < (*best).fitness()) ;
+		  isAccept = solNeighborComparator(_solution, (*best)) ;
 		}
 		return isAccept;
     };
 
 private:
+    // comparator betwenn solution and neighbor or between neighbors
+    moNeighborComparator<Neighbor>& neighborComparator;
+    moSolNeighborComparator<Neighbor>& solNeighborComparator;
 
     //Pointer on the best and the current neighbor
     Neighbor* best;

branches/newMo/src/newmo.h

@@ -39,6 +39,7 @@
 
 #include <comparator/moComparator.h>
 #include <comparator/moNeighborComparator.h>
+#include <comparator/moSolNeighborComparator.h>
 
 #include <continuator/moContinuator.h>
 #include <continuator/moTrueContinuator.h>

branches/newMo/test/t-moSimpleHCexplorer.cpp

@@ -36,6 +36,7 @@
 #include <eval/moFullEvalByCopy.h>
 #include <explorer/moSimpleHCexplorer.h>
 #include <comparator/moNeighborComparator.h>
+#include <comparator/moSolNeighborComparator.h>
 
 #include <cstdlib>
 #include <cassert>
@@ -52,9 +53,10 @@ int main(){
 	moDummyNeighborhood nh;
 	moFullEvalByCopy<moDummyNeighbor> fulleval(eval);
 	moNeighborComparator<moDummyNeighbor> comp;
+	moSolNeighborComparator<moDummyNeighbor> solNeighborComp;
 
 	//verif constructor
-	moSimpleHCexplorer<moDummyNeighborhood> test(nh, fulleval, comp);
+	moSimpleHCexplorer<moDummyNeighborhood> test(nh, fulleval, comp, solNeighborComp);
 
 	//verif operator() et accept: le neigorhood est construit pour qu'on tombe dans les 3 cas suivants:
 	//hasNeighbor() retourne faux a l'entrée de l'operator() donc on doit pas continuer

branches/newMo/tutorial/oneMax/application/CMakeLists.txt

@@ -5,7 +5,9 @@ INCLUDE_DIRECTORIES(${PARADISEO_EO_SRC_DIR}/src
 LINK_DIRECTORIES(${PARADISEO_EO_BIN_DIR}/lib)	
 
 ADD_EXECUTABLE(testSimpleHC testSimpleHC.cpp) 
+ADD_EXECUTABLE(testFirstImpr testFirstImpr.cpp) 
 #ADD_EXECUTABLE(testWithMove testWithMove.cpp) 
 
 TARGET_LINK_LIBRARIES(testSimpleHC eoutils ga eo) 
-#TARGET_LINK_LIBRARIES(testWithMove eoutils ga eo) 
+TARGET_LINK_LIBRARIES(testFirstImpr eoutils ga eo) 
+#TARGET_LINK_LIBRARIES(testWithMove eoutils ga eo) 

branches/newMo/tutorial/oneMax/application/testFirstImpr.cpp

@@ -0,0 +1,197 @@
+//-----------------------------------------------------------------------------
+/** testSimpleHC.cpp
+ *
+ * SV - 12/01/10 
+ *
+ */
+//-----------------------------------------------------------------------------
+
+// standard includes
+#define HAVE_SSTREAM
+
+#include <stdexcept>  // runtime_error 
+#include <iostream>   // cout
+#include <sstream>  // ostrstream, istrstream
+#include <fstream>
+#include <string.h>
+
+// the general include for eo
+#include <eo>
+#include <ga.h>
+
+using namespace std;
+
+//-----------------------------------------------------------------------------
+// fitness function
+#include <funcOneMax.h>
+#include <eoInt.h>
+#include <neighborhood/moRndWithoutReplNeighborhood.h>
+#include <oneMaxBitNeighbor.h>
+
+#include <eval/moFullEvalByModif.h>
+#include <eval/moFullEvalByCopy.h>
+#include <comparator/moNeighborComparator.h>
+#include <comparator/moSolNeighborComparator.h>
+#include <continuator/moTrueContinuator.h>
+#include <algo/moLocalSearch.h>
+#include <explorer/moFirstImprExplorer.h>
+
+// REPRESENTATION
+//-----------------------------------------------------------------------------
+typedef eoBit<unsigned> Indi;	
+typedef moBitNeighbor<unsigned int> Neighbor ; // incremental evaluation
+typedef moRndWithoutReplNeighborhood<Neighbor> Neighborhood ;
+
+void main_function(int argc, char **argv)
+{
+	/* =========================================================
+	*
+	* Parameters
+	*
+	* ========================================================= */
+
+	// First define a parser from the command-line arguments
+	eoParser parser(argc, argv);
+
+	// For each parameter, define Parameter, read it through the parser,
+	// and assign the value to the variable
+
+	eoValueParam<uint32_t> seedParam(time(0), "seed", "Random number seed", 'S');
+	parser.processParam( seedParam );
+	unsigned seed = seedParam.value();
+
+	// description of genotype
+	eoValueParam<unsigned int> vecSizeParam(8, "vecSize", "Genotype size", 'V');
+	parser.processParam( vecSizeParam, "Representation" );
+	unsigned vecSize = vecSizeParam.value();
+
+	// the name of the "status" file where all actual parameter values will be saved
+	string str_status = parser.ProgramName() + ".status"; // default value
+	eoValueParam<string> statusParam(str_status.c_str(), "status", "Status file");
+	parser.processParam( statusParam, "Persistence" );
+
+	// do the following AFTER ALL PARAMETERS HAVE BEEN PROCESSED
+	// i.e. in case you need parameters somewhere else, postpone these
+	if (parser.userNeedsHelp()){
+		parser.printHelp(cout);
+		exit(1);
+	}
+	if (statusParam.value() != ""){
+		ofstream os(statusParam.value().c_str());
+		os << parser;// and you can use that file as parameter file
+	}
+
+	/* =========================================================
+	 *
+	 * Random seed
+	 *
+	 * ========================================================= */
+
+	//reproducible random seed: if you don't change SEED above,
+	// you'll aways get the same result, NOT a random run
+	rng.reseed(seed);
+
+
+	/* =========================================================
+	 *
+	 * Eval fitness function
+	 *
+	 * ========================================================= */
+
+	FuncOneMax<Indi> eval(vecSize);
+
+
+	/* =========================================================
+	 *
+	 * Initilisation of the solution
+	 *
+	 * ========================================================= */
+
+	// a Indi random initializer
+	eoUniformGenerator<bool> uGen;
+	eoInitFixedLength<Indi> random(vecSize, uGen);
+
+
+	/* =========================================================
+	 *
+	 * evaluation of a neighbor solution
+	 *
+	 * ========================================================= */
+
+	moFullEvalByModif<Neighbor> fulleval(eval);
+
+	//An eval by copy can be used instead of the eval by modif
+	//moFullEvalByCopy<Neighbor> fulleval(eval);
+
+
+	/* =========================================================
+	 *
+	 * Comparator of neighbors
+	 *
+	 * ========================================================= */
+
+	moNeighborComparator<Neighbor> comparator;
+	moSolNeighborComparator<Neighbor> solComparator;
+
+
+	/* =========================================================
+	 *
+	 * the neighborhood of a solution
+	 *
+	 * ========================================================= */
+
+	Neighborhood neighborhood(vecSize);
+
+
+	/* =========================================================
+	 *
+	 * a neighborhood explorer solution
+	 *
+	 * ========================================================= */
+  
+	moFirstImprExplorer<Neighborhood> explorer(neighborhood, fulleval, comparator, solComparator);
+
+
+	/* =========================================================
+	 *
+	 * the local search algorithm
+	 *
+	 * ========================================================= */
+
+	moTrueContinuator<Neighborhood> continuator;//always continue
+
+	moLocalSearch< moFirstImprExplorer<Neighborhood>, moTrueContinuator<Neighborhood> > localSearch(explorer, continuator, eval);
+
+	/* =========================================================
+	 *
+	 * execute the local search from random sollution
+	 *
+	 * ========================================================= */
+
+	Indi solution;
+
+	random(solution);
+
+	//Can be eval here, else it will be done at the beginning of the localSearch
+	//eval(solution);
+
+	std::cout << "initial: " << solution << std::endl ;
+
+	localSearch(solution);
+  
+	std::cout << "final:   " << solution << std::endl ;
+
+}
+
+// A main that catches the exceptions
+
+int main(int argc, char **argv)
+{
+	try{
+		main_function(argc, argv);
+	}
+	catch(exception& e){
+		cout << "Exception: " << e.what() << '\n';
+	}
+	return 1;
+}

branches/newMo/tutorial/oneMax/application/testSimpleHC.cpp

@@ -31,6 +31,7 @@ using namespace std;
 #include <eval/moFullEvalByModif.h>
 #include <eval/moFullEvalByCopy.h>
 #include <comparator/moNeighborComparator.h>
+#include <comparator/moSolNeighborComparator.h>
 #include <continuator/moTrueContinuator.h>
 #include <algo/moLocalSearch.h>
 #include <explorer/moSimpleHCexplorer.h>
@@ -130,6 +131,7 @@ void main_function(int argc, char **argv)
 	 * ========================================================= */
 
 	moNeighborComparator<Neighbor> comparator;
+	moSolNeighborComparator<Neighbor> solComparator;
 
 
 	/* =========================================================
@@ -147,7 +149,7 @@ void main_function(int argc, char **argv)
 	 *
 	 * ========================================================= */
   
-	moSimpleHCexplorer<Neighborhood> explorer(neighborhood, fulleval, comparator);
+	moSimpleHCexplorer<Neighborhood> explorer(neighborhood, fulleval, comparator, solComparator);
 
 
 	/* =========================================================