From f0acb7c0ef3b9606e143f9bbe72eeb57438587b6 Mon Sep 17 00:00:00 2001 From: verel Date: Mon, 25 Jan 2010 10:40:07 +0000 Subject: [PATCH] =?UTF-8?q?Ajout=20d'un=20HC=20tenant=20compte=20du=20cas?= =?UTF-8?q?=20d'=C3=A9galit=C3=A9=20dans=20les=20best,=20et=20pouvant=20ex?= =?UTF-8?q?plorer=20les=20plateaux?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1672 331e1502-861f-0410-8da2-ba01fb791d7f --- .../newMo/src/explorer/moHCneutralExplorer.h | 133 ++++++++++++ .../src/explorer/moSimpleHCneutralExplorer.h | 2 +- .../src/neighborhood/moOrderNeighborhood.h | 4 +- .../moRndWithoutReplNeighborhood.h | 3 +- .../oneMax/application/CMakeLists.txt | 2 + .../oneMax/application/testHCneutral.cpp | 201 ++++++++++++++++++ 6 files changed, 342 insertions(+), 3 deletions(-) create mode 100644 branches/newMo/src/explorer/moHCneutralExplorer.h create mode 100644 branches/newMo/tutorial/oneMax/application/testHCneutral.cpp diff --git a/branches/newMo/src/explorer/moHCneutralExplorer.h b/branches/newMo/src/explorer/moHCneutralExplorer.h new file mode 100644 index 000000000..1bbf18bed --- /dev/null +++ b/branches/newMo/src/explorer/moHCneutralExplorer.h @@ -0,0 +1,133 @@ +/* + + 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 +#include +#include + +/** + * Explorer for a simple Hill-climbing + */ +template< class Neighborhood > +class moHCneutralExplorer : public moSimpleHCneutralExplorer +{ +public: + typedef typename Neighborhood::EOT EOT ; + typedef typename Neighborhood::Neighbor Neighbor ; + + using moNeighborhoodExplorer::neighborhood; + using moSimpleHCneutralExplorer::solNeighborComparator; + using moSimpleHCneutralExplorer::isAccept; + using moSimpleHCneutralExplorer::bestVector; + using moSimpleHCneutralExplorer::initParam; + using moSimpleHCneutralExplorer::updateParam; + + /** + * Constructor + * @param _neighborhood the neighborhood + * @param _eval the evaluation function + * @param _comparator a neighbor comparator + */ + moHCneutralExplorer(Neighborhood& _neighborhood, + moEval& _eval, + moNeighborComparator& _neighborComparator, + moSolNeighborComparator& _solNeighborComparator, + unsigned _nbStep) : + moSimpleHCneutralExplorer(_neighborhood, _eval, _neighborComparator, _solNeighborComparator), nbStep(_nbStep) { + } + + /** + * Destructor + */ + ~moHCneutralExplorer(){ + } + + /** + * initial number of step + */ + virtual void initParam(EOT & solution){ + moSimpleHCneutralExplorer::initParam(solution); + + step = 0; + }; + + /** + * one more step + */ + virtual void updateParam(EOT & solution){ + moSimpleHCneutralExplorer::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 diff --git a/branches/newMo/src/explorer/moSimpleHCneutralExplorer.h b/branches/newMo/src/explorer/moSimpleHCneutralExplorer.h index 50422adf3..3561cc005 100644 --- a/branches/newMo/src/explorer/moSimpleHCneutralExplorer.h +++ b/branches/newMo/src/explorer/moSimpleHCneutralExplorer.h @@ -172,7 +172,7 @@ public: return isAccept; }; -private: +protected: // comparator betwenn solution and neighbor or between neighbors moNeighborComparator& neighborComparator; moSolNeighborComparator& solNeighborComparator; diff --git a/branches/newMo/src/neighborhood/moOrderNeighborhood.h b/branches/newMo/src/neighborhood/moOrderNeighborhood.h index 3df825d5e..80b10e831 100644 --- a/branches/newMo/src/neighborhood/moOrderNeighborhood.h +++ b/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) ; } /** diff --git a/branches/newMo/src/neighborhood/moRndWithoutReplNeighborhood.h b/branches/newMo/src/neighborhood/moRndWithoutReplNeighborhood.h index f4bd90339..c6fe1d803 100644 --- a/branches/newMo/src/neighborhood/moRndWithoutReplNeighborhood.h +++ b/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) ; } /** diff --git a/branches/newMo/tutorial/oneMax/application/CMakeLists.txt b/branches/newMo/tutorial/oneMax/application/CMakeLists.txt index afb0c5e64..720933d01 100644 --- a/branches/newMo/tutorial/oneMax/application/CMakeLists.txt +++ b/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) diff --git a/branches/newMo/tutorial/oneMax/application/testHCneutral.cpp b/branches/newMo/tutorial/oneMax/application/testHCneutral.cpp new file mode 100644 index 000000000..f4de90dfb --- /dev/null +++ b/branches/newMo/tutorial/oneMax/application/testHCneutral.cpp @@ -0,0 +1,201 @@ +//----------------------------------------------------------------------------- +/** testHCneutral.cpp + * + * SV - 24/01/10 + * + */ +//----------------------------------------------------------------------------- + +// standard includes +#define HAVE_SSTREAM + +#include // runtime_error +#include // cout +#include // ostrstream, istrstream +#include +#include + +// the general include for eo +#include +#include + +using namespace std; + +//----------------------------------------------------------------------------- +// fitness function +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +// REPRESENTATION +//----------------------------------------------------------------------------- +typedef eoBit Indi; +typedef moBitNeighbor Neighbor ; // incremental evaluation +typedef moOrderNeighborhood 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 seedParam(time(0), "seed", "Random number seed", 'S'); + parser.processParam( seedParam ); + unsigned seed = seedParam.value(); + + // description of genotype + eoValueParam vecSizeParam(8, "vecSize", "Genotype size", 'V'); + parser.processParam( vecSizeParam, "Representation" ); + unsigned vecSize = vecSizeParam.value(); + + eoValueParam 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 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 eval(vecSize); + + + /* ========================================================= + * + * Initilisation of the solution + * + * ========================================================= */ + + // a Indi random initializer + eoUniformGenerator uGen; + eoInitFixedLength random(vecSize, uGen); + + + /* ========================================================= + * + * evaluation of a neighbor solution + * + * ========================================================= */ + + moFullEvalByModif fulleval(eval); + + //An eval by copy can be used instead of the eval by modif + //moFullEvalByCopy fulleval(eval); + + + /* ========================================================= + * + * Comparator of neighbors + * + * ========================================================= */ + + moNeighborComparator comparator; + moSolNeighborComparator solComparator; + + + /* ========================================================= + * + * the neighborhood of a solution + * + * ========================================================= */ + + Neighborhood neighborhood(vecSize); + + + /* ========================================================= + * + * a neighborhood explorer solution + * + * ========================================================= */ + + moHCneutralExplorer explorer(neighborhood, fulleval, comparator, solComparator, nbStep); + + + /* ========================================================= + * + * the local search algorithm + * + * ========================================================= */ + + moTrueContinuator continuator;//always continue + + moLocalSearch< moHCneutralExplorer, moTrueContinuator > 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; +}