From d6146b471d614b236244b0ba458ee978312cceb2 Mon Sep 17 00:00:00 2001 From: verel Date: Mon, 22 Feb 2010 15:40:13 +0000 Subject: [PATCH] =?UTF-8?q?Ajout=20de=20la=20marche=20al=C3=A9atoire=20neu?= =?UTF-8?q?tre=20avec=20le=20prg=20de=20test.?= 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@1689 331e1502-861f-0410-8da2-ba01fb791d7f --- .../explorer/moRandomNeutralWalkExplorer.h | 176 +++++++++++ .../oneMax/application/CMakeLists.txt | 2 + .../oneMax/application/testFirstImpr.cpp | 2 +- .../application/testRandomNeutralWalk.cpp | 278 ++++++++++++++++++ .../oneMax/application/testRandomWalk.cpp | 44 +-- .../newMo/tutorial/oneMax/src/funcRoyalRoad.h | 40 +++ 6 files changed, 501 insertions(+), 41 deletions(-) create mode 100644 branches/newMo/src/explorer/moRandomNeutralWalkExplorer.h create mode 100644 branches/newMo/tutorial/oneMax/application/testRandomNeutralWalk.cpp create mode 100644 branches/newMo/tutorial/oneMax/src/funcRoyalRoad.h diff --git a/branches/newMo/src/explorer/moRandomNeutralWalkExplorer.h b/branches/newMo/src/explorer/moRandomNeutralWalkExplorer.h new file mode 100644 index 000000000..fc1beba21 --- /dev/null +++ b/branches/newMo/src/explorer/moRandomNeutralWalkExplorer.h @@ -0,0 +1,176 @@ +/* + + 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 _moRandomNeutralWalkexplorer_h +#define _moRandomNeutralWalkexplorer_h + +#include +#include + +/** + * Explorer for a random neutral walk + * accept the movement when the neighbor has the same fitnes + * neighborhood must be explored in random order + */ +template< class Neighborhood > +class moRandomNeutralWalkExplorer : public moNeighborhoodExplorer +{ +public: + typedef typename Neighborhood::EOT EOT ; + typedef typename Neighborhood::Neighbor Neighbor ; + + using moNeighborhoodExplorer::neighborhood; + using moNeighborhoodExplorer::eval; + + /** + * Constructor + * @param _neighborhood the neighborhood + * @param _eval the evaluation function + * @param _comparator a neighbor comparator + */ + moRandomNeutralWalkExplorer(Neighborhood& _neighborhood, moEval& _eval, + moSolNeighborComparator& _solNeighborComparator, + unsigned _nbStep) + : moNeighborhoodExplorer(_neighborhood, _eval), + solNeighborComparator(_solNeighborComparator), + nbStep(_nbStep) { + isAccept = false; + current=new Neighbor(); + } + + /** + * Destructor + */ + ~moRandomNeutralWalkExplorer(){ + delete current; + } + + /** + * initialization of the number of step to be done + */ + virtual void initParam(EOT & solution){ + step = 0; + isAccept = true; + }; + + /** + * increase the number of step + */ + virtual void updateParam(EOT & solution){ + step++; + }; + + /** + * terminate: NOTHING TO DO + */ + virtual void terminate(EOT & solution){}; + + /** + * Explore the neighborhood of a solution + * @param _solution + */ + virtual void operator()(EOT & _solution){ + //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.equals(_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 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 ; + }; + + /** + * 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.equals(_solution, (*current)) ; + } + return isAccept; + }; + +private: + // comparator betwenn solution and neighbor or between neighbors + moSolNeighborComparator& solNeighborComparator; + + // current number of step + unsigned int step; + + // maximum number of steps to do + unsigned int nbStep; + + //Pointer on the best and the current neighbor + Neighbor* current; + + // true if the move is accepted + bool isAccept ; +}; + + +#endif diff --git a/branches/newMo/tutorial/oneMax/application/CMakeLists.txt b/branches/newMo/tutorial/oneMax/application/CMakeLists.txt index 07c4dd2bd..3de7b59f2 100644 --- a/branches/newMo/tutorial/oneMax/application/CMakeLists.txt +++ b/branches/newMo/tutorial/oneMax/application/CMakeLists.txt @@ -11,6 +11,7 @@ ADD_EXECUTABLE(testSimpleHCneutral testSimpleHCneutral.cpp) ADD_EXECUTABLE(testHCneutral testHCneutral.cpp) ADD_EXECUTABLE(testMetropolisHasting testMetropolisHasting.cpp) #ADD_EXECUTABLE(testWithMove testWithMove.cpp) +ADD_EXECUTABLE(testRandomNeutralWalk testRandomNeutralWalk.cpp) TARGET_LINK_LIBRARIES(testSimpleHC eoutils ga eo) TARGET_LINK_LIBRARIES(testFirstImpr eoutils ga eo) @@ -19,3 +20,4 @@ TARGET_LINK_LIBRARIES(testSimpleHCneutral eoutils ga eo) TARGET_LINK_LIBRARIES(testHCneutral eoutils ga eo) TARGET_LINK_LIBRARIES(testMetropolisHasting eoutils ga eo) #TARGET_LINK_LIBRARIES(testWithMove eoutils ga eo) +TARGET_LINK_LIBRARIES(testRandomNeutralWalk eoutils ga eo) diff --git a/branches/newMo/tutorial/oneMax/application/testFirstImpr.cpp b/branches/newMo/tutorial/oneMax/application/testFirstImpr.cpp index 6ae6251af..af728719b 100644 --- a/branches/newMo/tutorial/oneMax/application/testFirstImpr.cpp +++ b/branches/newMo/tutorial/oneMax/application/testFirstImpr.cpp @@ -1,5 +1,5 @@ //----------------------------------------------------------------------------- -/** testSimpleHC.cpp +/** testFirstImpr.cpp * * SV - 12/01/10 * diff --git a/branches/newMo/tutorial/oneMax/application/testRandomNeutralWalk.cpp b/branches/newMo/tutorial/oneMax/application/testRandomNeutralWalk.cpp new file mode 100644 index 000000000..9b6b46e03 --- /dev/null +++ b/branches/newMo/tutorial/oneMax/application/testRandomNeutralWalk.cpp @@ -0,0 +1,278 @@ +//----------------------------------------------------------------------------- +/** testRandomNeutralWalk.cpp + * + * SV - 22/02/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 + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +// REPRESENTATION +//----------------------------------------------------------------------------- +typedef eoBit Indi; +typedef moBitNeighbor Neighbor ; // incremental evaluation +typedef moRndWithoutReplNeighborhood 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 blockSizeParam(2, "blockSize", "Size of block in the royal road", 'k'); + parser.processParam( blockSizeParam, "Representation" ); + unsigned blockSize = blockSizeParam.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 + * + * ========================================================= */ + + FuncRoyalRoad eval(vecSize / blockSize, blockSize); + + + /* ========================================================= + * + * Initilisazor of the solution + * + * ========================================================= */ + + // a Indi random initializer + eoUniformGenerator uGen; + eoInitFixedLength random(vecSize, uGen); + + + /* ========================================================= + * + * Evaluation of a neighbor solution + * + * ========================================================= */ + + moFullEvalByModif nhEval(eval); + + //An eval by copy can be used instead of the eval by modif + //moFullEvalByCopy nhEval(eval); + + + /* ========================================================= + * + * Comparator of neighbors + * + * ========================================================= */ + + moNeighborComparator comparator; + moSolNeighborComparator solComparator; + + + /* ========================================================= + * + * the neighborhood of a solution + * + * ========================================================= */ + + Neighborhood neighborhood(vecSize); + + + /* ========================================================= + * + * a neighborhood explorer solution + * + * ========================================================= */ + + moRandomNeutralWalkExplorer explorer(neighborhood, nhEval, solComparator, nbStep); + + + /* ========================================================= + * + * initial random solution + * + * ========================================================= */ + + Indi solution; + + random(solution); + + //Can be eval here, else it will be done at the beginning of the localSearch + eval(solution); + + /* ========================================================= + * + * the continuator and the checkpoint + * + * ========================================================= */ + + moTrueContinuator continuator;//always continue + + moCheckpoint checkpoint(continuator); + + moFitnessStat fStat; + + eoHammingDistance distance; + moDistanceStat distStat(distance, solution); // distance from the intial solution + + moOrderNeighborhood nh(vecSize); + moNeigborhoodStat< moOrderNeighborhood > neighborhoodStat(nh, nhEval, comparator, solComparator); + moMinNeighborStat< moOrderNeighborhood > minStat(neighborhoodStat); + moSecondMomentNeighborStat< moOrderNeighborhood > secondMomentStat(neighborhoodStat); + moMaxNeighborStat< moOrderNeighborhood > maxStat(neighborhoodStat); + + moNbSupNeighborStat< moOrderNeighborhood > nbSupStat(neighborhoodStat); + moNbInfNeighborStat< moOrderNeighborhood > nbInfStat(neighborhoodStat); + moNeutralDegreeNeighborStat< moOrderNeighborhood > ndStat(neighborhoodStat); + moSizeNeighborStat< moOrderNeighborhood > sizeStat(neighborhoodStat); + + eoValueParam genCounter(-1,"Gen"); + eoIncrementor increm(genCounter.value()); + + checkpoint.add(fStat); + checkpoint.add(distStat); + checkpoint.add(neighborhoodStat); + checkpoint.add(minStat); + checkpoint.add(secondMomentStat); + checkpoint.add(maxStat); + checkpoint.add(nbInfStat); + checkpoint.add(ndStat); + checkpoint.add(nbSupStat); + checkpoint.add(sizeStat); + checkpoint.add(increm); + + eoFileMonitor outputfile("out.dat", " "); + checkpoint.add(outputfile); + + outputfile.add(genCounter); + outputfile.add(fStat); + outputfile.add(distStat); + outputfile.add(minStat); + outputfile.add(secondMomentStat); + outputfile.add(maxStat); + outputfile.add(nbInfStat); + outputfile.add(ndStat); + outputfile.add(nbSupStat); + outputfile.add(sizeStat); + + /* ========================================================= + * + * the local search algorithm + * + * ========================================================= */ + + moLocalSearch< moRandomNeutralWalkExplorer > localSearch(explorer, checkpoint, eval); + + /* ========================================================= + * + * execute the local search from random sollution + * + * ========================================================= */ + + 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; +} diff --git a/branches/newMo/tutorial/oneMax/application/testRandomWalk.cpp b/branches/newMo/tutorial/oneMax/application/testRandomWalk.cpp index 12a8daea6..6edd068db 100644 --- a/branches/newMo/tutorial/oneMax/application/testRandomWalk.cpp +++ b/branches/newMo/tutorial/oneMax/application/testRandomWalk.cpp @@ -38,17 +38,6 @@ using namespace std; #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include @@ -179,29 +168,9 @@ void main_function(int argc, char **argv) moDistanceStat distStat(distance, bestSolution); // moSolutionStat solStat; - moNeighborComparator comparator; - moSolNeighborComparator solComparator; - moOrderNeighborhood nh(vecSize); - moNeigborhoodStat< moOrderNeighborhood > neighborhoodStat(nh, nhEval, comparator, solComparator); - moMinNeighborStat< moOrderNeighborhood > minStat(neighborhoodStat); - moMaxNeighborStat< moOrderNeighborhood > maxStat(neighborhoodStat); - moSecondMomentNeighborStat< moOrderNeighborhood > secondMomentStat(neighborhoodStat); - moNbSupNeighborStat< moOrderNeighborhood > nbSupStat(neighborhoodStat); - moNbInfNeighborStat< moOrderNeighborhood > nbInfStat(neighborhoodStat); - moNeutralDegreeNeighborStat< moOrderNeighborhood > ndStat(neighborhoodStat); - moSizeNeighborStat< moOrderNeighborhood > sizeStat(neighborhoodStat); - checkpoint.add(fStat); checkpoint.add(distStat); // checkpoint.add(solStat); - checkpoint.add(neighborhoodStat); - checkpoint.add(minStat); - checkpoint.add(maxStat); - checkpoint.add(secondMomentStat); - checkpoint.add(nbInfStat); - checkpoint.add(nbSupStat); - checkpoint.add(ndStat); - checkpoint.add(sizeStat); eoValueParam genCounter(-1,"Gen"); eoIncrementor increm(genCounter.value()); @@ -214,21 +183,15 @@ void main_function(int argc, char **argv) outputfile.add(fStat); outputfile.add(distStat); // outputfile.add(solStat); - outputfile.add(minStat); - outputfile.add(maxStat); - outputfile.add(secondMomentStat); - outputfile.add(nbInfStat); - outputfile.add(nbSupStat); - outputfile.add(ndStat); - outputfile.add(sizeStat); + Indi solution; // current solution of the search process + + /* // to save the solution at each iteration eoState outState; // Register the algorithm into the state (so it has something to save!! - Indi solution; // current solution of the search process - outState.registerObject(solution); // and feed the state to state savers @@ -237,6 +200,7 @@ void main_function(int argc, char **argv) // Don't forget to add the two savers to the checkpoint checkpoint.add(stateSaver); + */ /* ========================================================= * diff --git a/branches/newMo/tutorial/oneMax/src/funcRoyalRoad.h b/branches/newMo/tutorial/oneMax/src/funcRoyalRoad.h new file mode 100644 index 000000000..d26e022a0 --- /dev/null +++ b/branches/newMo/tutorial/oneMax/src/funcRoyalRoad.h @@ -0,0 +1,40 @@ +// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- + +#ifndef __funcRoyalRoad +#define __funcRoyalRoad + +#include + +template< class EOT > +class FuncRoyalRoad : public eoEvalFunc +{ + // number of blocks + unsigned n; + + // size of a block + unsigned k; + +public: + FuncRoyalRoad(unsigned _n, unsigned _k) : n(_n), k(_k) {}; + + ~FuncRoyalRoad(void) {} ; + + virtual void operator() (EOT & _solution) + { + unsigned sum = 0; + unsigned i, j; + + for (i = 0; i < n; i++) { + j = 0; + while (_solution[i * n + j] && j < k) j++; + + if (j == k) + sum++; + } + + _solution.fitness(sum); + }; + +}; + +#endif