From 1cc70b9d9137bd4c76b05c1a2216275954ef7cc1 Mon Sep 17 00:00:00 2001 From: verel Date: Fri, 7 May 2010 14:59:45 +0000 Subject: [PATCH] Des oublies git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1802 331e1502-861f-0410-8da2-ba01fb791d7f --- .../src/algo/moRandomNeutralWalk.h | 102 ++++++++++++++++++ .../src/sampling/moFitnessCloudSampling.h | 102 ++++++++++++++++++ 2 files changed, 204 insertions(+) create mode 100644 trunk/paradiseo-mo/src/algo/moRandomNeutralWalk.h create mode 100644 trunk/paradiseo-mo/src/sampling/moFitnessCloudSampling.h diff --git a/trunk/paradiseo-mo/src/algo/moRandomNeutralWalk.h b/trunk/paradiseo-mo/src/algo/moRandomNeutralWalk.h new file mode 100644 index 000000000..308f8d925 --- /dev/null +++ b/trunk/paradiseo-mo/src/algo/moRandomNeutralWalk.h @@ -0,0 +1,102 @@ +/* + +Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 + +Sebastien Verel, 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 ue, +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". + +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 _moRandomNeutralWalk_h +#define _moRandomNeutralWalk_h + +#include +#include +#include +#include +#include + +/******************************************************** + * Random Neutral Walk: + * Random Neutral walk local search + * + * At each iteration, + * one random neighbor with the same fitness is selected and replace the current solution + * the algorithm stops when the number of steps is reached + ********************************************************/ +template +class moRandomNeutralWalk: public moLocalSearch +{ +public: + typedef typename Neighbor::EOT EOT; + typedef moNeighborhood Neighborhood ; + + /** + * Simple constructor for a random walk + * @param _neighborhood the neighborhood + * @param _fullEval the full evaluation function + * @param _eval neighbor's evaluation function + * @param _nbStepMax number of step of the walk + */ + moRandomNeutralWalk(Neighborhood& _neighborhood, eoEvalFunc& _fullEval, moEval& _eval, unsigned _nbStepMax): + moLocalSearch(explorer, trueCont, _fullEval), + explorer(_neighborhood, _eval, defaultSolNeighborComp, _nbStepMax) + {} + + /** + * Simple constructor for a random walk + * @param _neighborhood the neighborhood + * @param _fullEval the full evaluation function + * @param _eval neighbor's evaluation function + * @param _nbStepMax number of step of the walk + * @param _cont an external continuator + */ + moRandomNeutralWalk(Neighborhood& _neighborhood, eoEvalFunc& _fullEval, moEval& _eval, unsigned _nbStepMax, moContinuator& _cont): + moLocalSearch(explorer, _cont, _fullEval), + explorer(_neighborhood, _eval, defaultSolNeighborComp, _nbStepMax) + {} + + /** + * Simple constructor for a random walk + * @param _neighborhood the neighborhood + * @param _fullEval the full evaluation function + * @param _eval neighbor's evaluation function + * @param _nbStepMax number of step of the walk + * @param _cont an external continuator + * @param _comp a solution vs neighbor comparator + */ + moRandomNeutralWalk(Neighborhood& _neighborhood, eoEvalFunc& _fullEval, moEval& _eval, unsigned _nbStepMax, moContinuator& _cont, moSolNeighborComparator& _comp): + moLocalSearch(explorer, _cont, _fullEval), + explorer(_neighborhood, _eval, _comp, _nbStepMax) + {} + +private: + // always true continuator + moTrueContinuator trueCont; + // the explorer of the random walk + moRandomNeutralWalkExplorer explorer; + // compare the fitness values of the solution and the neighbor: true if strictly greater + moSolNeighborComparator defaultSolNeighborComp; +}; + +#endif diff --git a/trunk/paradiseo-mo/src/sampling/moFitnessCloudSampling.h b/trunk/paradiseo-mo/src/sampling/moFitnessCloudSampling.h new file mode 100644 index 000000000..b5459ce0c --- /dev/null +++ b/trunk/paradiseo-mo/src/sampling/moFitnessCloudSampling.h @@ -0,0 +1,102 @@ +/* + + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 + + Sebastien Verel, 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 +*/ + +#ifndef moFitnessCloudSampling_h +#define moFitnessCloudSampling_h + +#include +#include +#include +#include +#include +#include +#include +#include + +/** + * To compute an estimation of the fitness cloud, + * i.e. the scatter plot of solution fitness versus neighbor fitness: + * + * This class do nothing. See others mo(...)FitnessCloudSampling classes + * with different fitness sampling methods + */ +template +class moFitnessCloudSampling : public moSampling +{ +public: + typedef typename Neighbor::EOT EOT ; + + using moSampling::localSearch; + + /** + * Default Constructor + * @param _init initialisation method of the solution + * @param _neighborhood neighborhood to get a neighbor + * @param _fullEval Fitness function, full evaluation function + * @param _eval neighbor evaluation, incremental evaluation function + * @param _nbSol Number of solutions in the sample + */ + moFitnessCloudSampling(eoInit & _init, + moNeighborhood & _neighborhood, + eoEvalFunc& _fullEval, + moEval& _eval, + unsigned int _nbSol) : + moSampling(_init, * new moDummyLS(_fullEval), fitnessStat), + neighborhood(_neighborhood), + fullEval(_fullEval), + eval(_eval), + nbSol(_nbSol) + { + // std::cout << "moFitnessCloudSampling: Warming to nothing will be sample." << std::endl; + } + + /** + * default destructor + */ + ~moFitnessCloudSampling() { + // delete the pointer on the local search which has been constructed in the constructor + delete localSearch; + } + +protected: + moNeighborhood & neighborhood; + eoEvalFunc& fullEval; + moEval& eval; + unsigned int nbSol; + moFitnessStat fitnessStat; + +}; + + +#endif