diff --git a/trunk/paradiseo-mo/src/continuator/moNeighborBestStat.h b/trunk/paradiseo-mo/src/continuator/moNeighborBestStat.h new file mode 100644 index 000000000..fa5dd16f4 --- /dev/null +++ b/trunk/paradiseo-mo/src/continuator/moNeighborBestStat.h @@ -0,0 +1,165 @@ +/* + + 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 moNeighborBestStat_h +#define moNeighborBestStat_h + +#include + +#include +#include +#include +#include + +/** + * Compute the fitness of the best solution among k neighbor or all neighbors + */ +template< class Neighbor > +class moNeighborBestStat : public moStat +{ +public : + typedef typename Neighbor::EOT EOT ; + typedef moNeighborhood Neighborhood ; + typedef typename EOT::Fitness Fitness ; + + using moStat< EOT, Fitness >::value; + + /** + * Default Constructor + * @param _neighborhood a neighborhood + * @param _eval an evaluation function + * @param _neighborComparator a neighbor Comparator + * @param _solNeighborComparator a comparator between a solution and a neighbor + */ + moNeighborBestStat(Neighborhood& _neighborhood, moEval& _eval, moNeighborComparator& _neighborComparator, moSolNeighborComparator& _solNeighborComparator, unsigned int _k = 0): + moStat(true, "neighborhood"), + neighborhood(_neighborhood), eval(_eval), + neighborComparator(_neighborComparator), + solNeighborComparator(_solNeighborComparator), + kmax(_k) + {} + + /** + * Default Constructor + * where the comparators are basic, there only compare the fitness values + * + * @param _neighborhood a neighborhood + * @param _eval an evaluation function + */ + moNeighborBestStat(Neighborhood& _neighborhood, moEval& _eval, unsigned _k = 0): + moStat(Fitness(), "best"), + neighborhood(_neighborhood), eval(_eval), + neighborComparator(defaultNeighborComp), + solNeighborComparator(defaultSolNeighborComp), + kmax(_k) + {} + + /** + * Compute classical statistics of the first solution's neighborhood + * @param _solution the first solution + */ + virtual void init(EOT & _solution) { + operator()(_solution); + } + + /** + * Compute the best fitness amoung all neighbors or k neighbors + * @param _solution the corresponding solution + */ + virtual void operator()(EOT & _solution) { + Neighbor current ; + Neighbor best ; + + 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); + + //initialize the best neighbor + best = current; + + // number of visited neighbors + unsigned int k = 1; + + //test all others neighbors + while ( ( (kmax == 0) || (k < kmax) ) && neighborhood.cont(_solution)) { + //next neighbor + neighborhood.next(_solution, current); + //eval + eval(_solution, current); + + //if we found a better neighbor, update the best + if (neighborComparator(best, current)) + best = current; + + k++; + } + + value() = best.fitness(); + } + else { + //if _solution hasn't neighbor, + value() = Fitness(); + } + } + + /** + * @return the class name + */ + virtual std::string className(void) const { + return "moNeighborBestStat"; + } + +private: + // to explore the neighborhood + Neighborhood& neighborhood ; + moEval& eval; + + // comparator betwenn solution and neighbor or between neighbors + moNeighborComparator& neighborComparator; + moSolNeighborComparator& solNeighborComparator; + + // default comparators + // compare the fitness values of neighbors: true is strictly greater + moNeighborComparator defaultNeighborComp; + // compare the fitness values of the solution and the neighbor: true if strictly greater + moSolNeighborComparator defaultSolNeighborComp; + + // number of neighbor to explore + unsigned int kmax; +}; + +#endif diff --git a/trunk/paradiseo-mo/src/mo.h b/trunk/paradiseo-mo/src/mo.h index a58229445..b25551b0b 100755 --- a/trunk/paradiseo-mo/src/mo.h +++ b/trunk/paradiseo-mo/src/mo.h @@ -59,6 +59,7 @@ #include #include #include +#include #include #include #include @@ -148,7 +149,9 @@ #include #include #include +#include #include +#include #include #include diff --git a/trunk/paradiseo-mo/src/sampling/moRndBestFitnessCloudSampling.h b/trunk/paradiseo-mo/src/sampling/moRndBestFitnessCloudSampling.h new file mode 100644 index 000000000..1ac80f37a --- /dev/null +++ b/trunk/paradiseo-mo/src/sampling/moRndBestFitnessCloudSampling.h @@ -0,0 +1,111 @@ +/* + + 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 moRndBestFitnessCloudSampling_h +#define moRndBestFitnessCloudSampling_h + +#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: + * + * Sample the fitness of random solution in the search space + * and the best fitness of k random neighbor + * + * The values are collected during the random search + * + */ +template +class moRndBestFitnessCloudSampling : public moFitnessCloudSampling +{ +public: + typedef typename Neighbor::EOT EOT ; + + using moSampling::localSearch; + using moSampling::checkpoint; + using moSampling::monitorVec; + using moSampling::continuator; + using moFitnessCloudSampling::fitnessStat; + + /** + * Default Constructor + * @param _init initialisation method of the solution + * @param _neighborhood neighborhood to get one random neighbor (supposed to be random neighborhood) + * @param _fullEval Fitness function, full evaluation function + * @param _eval neighbor evaluation, incremental evaluation function + * @param _nbSol Number of solutions in the sample + */ + moRndBestFitnessCloudSampling(eoInit & _init, + moNeighborhood & _neighborhood, + eoEvalFunc& _fullEval, + moEval& _eval, + unsigned int _nbSol) : + moFitnessCloudSampling(_init, _neighborhood, _fullEval, _eval, _nbSol), + neighborBestStat(_neighborhood, _eval) + { + // delete the dummy local search + delete localSearch; + + // random sampling + localSearch = new moRandomSearch(_init, _fullEval, _nbSol); + + // delete the checkpoint with the wrong continuator + delete checkpoint; + + // set the continuator + continuator = localSearch->getContinuator(); + + // re-construction of the checkpoint + checkpoint = new moCheckpoint(*continuator); + checkpoint->add(fitnessStat); + checkpoint->add(*monitorVec[0]); + + // one random neighbor + add(neighborBestStat); + } + +protected: + moNeighborBestStat< Neighbor > neighborBestStat; + +}; + + +#endif diff --git a/trunk/paradiseo-mo/tutorial/Lesson6/fitnessCloud.cpp b/trunk/paradiseo-mo/tutorial/Lesson6/fitnessCloud.cpp index e1e809110..2081439b0 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson6/fitnessCloud.cpp +++ b/trunk/paradiseo-mo/tutorial/Lesson6/fitnessCloud.cpp @@ -33,12 +33,13 @@ using namespace std; //----------------------------------------------------------------------------- // neighborhood description -#include // visit one random neighbor possibly the same one several times +#include // visit one random neighbor possibly the same one several times //----------------------------------------------------------------------------- // the sampling class #include #include +#include // Declaration of types //----------------------------------------------------------------------------- @@ -150,7 +151,7 @@ void main_function(int argc, char **argv) // Exploration of the neighborhood in random order // at each step one bit is randomly generated - moRndWithReplNeighborhood neighborhood(vecSize); + moRndWithoutReplNeighborhood neighborhood(vecSize); /* ========================================================= * @@ -166,7 +167,8 @@ void main_function(int argc, char **argv) // - number of solutions to sample // moRndRndFitnessCloudSampling sampling(random, neighborhood, fullEval, neighborEval, nbSol); - moMHRndFitnessCloudSampling sampling(random, neighborhood, fullEval, neighborEval, nbSol); + // moMHRndFitnessCloudSampling sampling(random, neighborhood, fullEval, neighborEval, nbSol); + moRndBestFitnessCloudSampling sampling(random, neighborhood, fullEval, neighborEval, nbSol); /* ========================================================= *