Ajout d'un HC tenant compte du cas d'égalité dans les best, et pouvant explorer les plateaux

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

branches/newMo/src/explorer/moHCneutralExplorer.h

@@ -0,0 +1,133 @@
+/*
+  <moHCneutralExplorer.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 _moHCneutralExplorer_h
+#define _moHCneutralExplorer_h
+
+#include <explorer/moSimpleHCneutralExplorer.h>
+#include <comparator/moNeighborComparator.h>
+#include <comparator/moSolNeighborComparator.h>
+
+/**
+ * Explorer for a simple Hill-climbing
+ */
+template< class Neighborhood >
+class moHCneutralExplorer : public moSimpleHCneutralExplorer<Neighborhood>
+{
+public:
+    typedef typename Neighborhood::EOT EOT ;
+    typedef typename Neighborhood::Neighbor Neighbor ;
+
+    using moNeighborhoodExplorer<Neighborhood>::neighborhood;
+    using moSimpleHCneutralExplorer<Neighborhood>::solNeighborComparator;
+    using moSimpleHCneutralExplorer<Neighborhood>::isAccept;
+    using moSimpleHCneutralExplorer<Neighborhood>::bestVector;
+    using moSimpleHCneutralExplorer<Neighborhood>::initParam;
+    using moSimpleHCneutralExplorer<Neighborhood>::updateParam;
+
+	/**
+	 * Constructor
+	 * @param _neighborhood the neighborhood
+	 * @param _eval the evaluation function
+	 * @param _comparator a neighbor comparator
+	 */
+ moHCneutralExplorer(Neighborhood& _neighborhood, 
+			   moEval<Neighbor>& _eval, 
+			   moNeighborComparator<Neighbor>& _neighborComparator, 
+		     moSolNeighborComparator<Neighbor>& _solNeighborComparator,
+		     unsigned _nbStep) : 
+    moSimpleHCneutralExplorer<Neighborhood>(_neighborhood, _eval, _neighborComparator, _solNeighborComparator), nbStep(_nbStep) {
+    }
+
+	/**
+	 * Destructor
+	 */
+    ~moHCneutralExplorer(){
+    }
+
+	/**
+	 *  initial number of step
+	 */
+    virtual void initParam(EOT & solution){
+      moSimpleHCneutralExplorer<Neighborhood>::initParam(solution);
+
+      step = 0;
+    };
+
+	/**
+	 * one more step
+	 */
+    virtual void updateParam(EOT & solution){
+      moSimpleHCneutralExplorer<Neighborhood>::updateParam(solution);
+      
+      step++;
+    };
+
+    /**
+     * continue if there is a neighbor and it is remainds some steps to do
+     * @param _solution the solution
+     * @return true there is some steps to do
+     */
+    virtual bool isContinue(EOT & _solution) {
+      return (step < nbStep)  && isAccept ;
+    };
+
+    /**
+     * accept test if an amelirated neighbor was be found
+     * @param _solution the solution
+     * @return true if the best neighbor ameliorate the fitness or is equals
+     */
+    virtual bool accept(EOT & _solution) {
+      if(neighborhood.hasNeighbor(_solution)){
+	isAccept = solNeighborComparator(_solution, bestVector[0]) || solNeighborComparator.equals(_solution, bestVector[0]) ;
+	std::cout << bestVector.size() << " " << bestVector[0] << " " ;
+	if (isAccept)
+	  std::cout << "true" << std::endl;
+	else
+	  std::cout << "false" << std::endl;
+      }
+      return isAccept;
+    };
+
+private:
+    // current number of step
+    unsigned int step;
+
+    // maximum number of steps to do
+    unsigned int nbStep;
+
+};
+
+
+#endif

branches/newMo/src/explorer/moSimpleHCneutralExplorer.h

@@ -172,7 +172,7 @@ public:
       return isAccept;
     };
 
-private:
+protected:
     // comparator betwenn solution and neighbor or between neighbors
     moNeighborComparator<Neighbor>& neighborComparator;
     moSolNeighborComparator<Neighbor>& solNeighborComparator;

branches/newMo/src/neighborhood/moOrderNeighborhood.h

@@ -92,11 +92,13 @@ public:
 
     /**
      * test if all neighbors are explore or not,if false, there is no neighbor left to explore
+     * currentIndex is the index which have been used before, it is not the next neighbor which can be possibly evaluated
+     *
      * @param _solution the solution to explore
      * @return true if there is again a neighbor to explore
      */
     virtual bool cont(EOT & _solution) {
-    	return (currentIndex < neighborhoodSize) ;
+    	return (currentIndex < neighborhoodSize - 1) ;
     }
 
     /**

branches/newMo/src/neighborhood/moRndWithoutReplNeighborhood.h

@@ -106,11 +106,12 @@ public:
 
     /**
      * test if all neighbors are explore or not,if false, there is no neighbor left to explore
+     * maxIndex is number of neighbors 
      * @param _solution the solution to explore
      * @return true if there is again a neighbor to explore
      */
     virtual bool cont(EOT & _solution) {
-    	return (maxIndex > 0) ;
+    	return (maxIndex > 1) ;
     }
 
     /**

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

@@ -8,10 +8,12 @@ ADD_EXECUTABLE(testSimpleHC testSimpleHC.cpp)
 ADD_EXECUTABLE(testFirstImpr testFirstImpr.cpp) 
 ADD_EXECUTABLE(testRandomWalk testRandomWalk.cpp) 
 ADD_EXECUTABLE(testSimpleHCneutral testSimpleHCneutral.cpp) 
+ADD_EXECUTABLE(testHCneutral testHCneutral.cpp) 
 #ADD_EXECUTABLE(testWithMove testWithMove.cpp) 
 
 TARGET_LINK_LIBRARIES(testSimpleHC eoutils ga eo) 
 TARGET_LINK_LIBRARIES(testFirstImpr eoutils ga eo) 
 TARGET_LINK_LIBRARIES(testRandomWalk eoutils ga eo) 
 TARGET_LINK_LIBRARIES(testSimpleHCneutral eoutils ga eo) 
+TARGET_LINK_LIBRARIES(testHCneutral eoutils ga eo) 
 #TARGET_LINK_LIBRARIES(testWithMove eoutils ga eo) 

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

@@ -0,0 +1,201 @@
+//-----------------------------------------------------------------------------
+/** testHCneutral.cpp
+ *
+ * SV - 24/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/moOrderNeighborhood.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/moHCneutralExplorer.h>
+
+// REPRESENTATION
+//-----------------------------------------------------------------------------
+typedef eoBit<unsigned> Indi;	
+typedef moBitNeighbor<unsigned int> Neighbor ; // incremental evaluation
+typedef moOrderNeighborhood<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();
+
+	eoValueParam<unsigned int> stepParam(10, "nbStep", "Number of steps of the random walk", 'n');
+	parser.processParam( stepParam, "Representation" );
+	unsigned nbStep = stepParam.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
+	 *
+	 * ========================================================= */
+  
+	moHCneutralExplorer<Neighborhood> explorer(neighborhood, fulleval, comparator, solComparator, nbStep);
+
+
+	/* =========================================================
+	 *
+	 * the local search algorithm
+	 *
+	 * ========================================================= */
+
+	moTrueContinuator<Neighborhood> continuator;//always continue
+
+	moLocalSearch< moHCneutralExplorer<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;
+}