diff --git a/trunk/paradiseo-mo/src/sampling/moMHBestFitnessCloudSampling.h b/trunk/paradiseo-mo/src/sampling/moMHBestFitnessCloudSampling.h new file mode 100644 index 000000000..2a2c0f21e --- /dev/null +++ b/trunk/paradiseo-mo/src/sampling/moMHBestFitnessCloudSampling.h @@ -0,0 +1,113 @@ +/* + + 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 moMHBestFitnessCloudSampling_h +#define moMHBestFitnessCloudSampling_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: + * + * Here solution are sampled with Metropolis-Hasting method + * + * Sample the fitness of solutions from Metropolis-Hasting sampling + * and the best fitness of k random neighbor + * + * The values are collected during the Metropolis-Hasting walk + * + */ +template +class moMHBestFitnessCloudSampling : 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 _nbStep Number of step of the MH sampling + */ + moMHBestFitnessCloudSampling(eoInit & _init, + moNeighborhood & _neighborhood, + eoEvalFunc& _fullEval, + moEval& _eval, + unsigned int _nbStep) : + moFitnessCloudSampling(_init, _neighborhood, _fullEval, _eval, _nbStep), + neighborBestStat(_neighborhood, _eval) + { + // delete the dummy local search + delete localSearch; + + // Metropolis-Hasting sampling + localSearch = new moMetropolisHasting(_neighborhood, _fullEval, _eval, _nbStep); + + // 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/src/sampling/moMHRndFitnessCloudSampling.h b/trunk/paradiseo-mo/src/sampling/moMHRndFitnessCloudSampling.h index 78909a15b..dec8e01cc 100644 --- a/trunk/paradiseo-mo/src/sampling/moMHRndFitnessCloudSampling.h +++ b/trunk/paradiseo-mo/src/sampling/moMHRndFitnessCloudSampling.h @@ -86,7 +86,7 @@ public: // delete the dummy local search delete localSearch; - // random sampling + // Metropolis-Hasting sampling localSearch = new moMetropolisHasting(_neighborhood, _fullEval, _eval, _nbStep); // delete the checkpoint with the wrong continuator diff --git a/trunk/paradiseo-mo/tutorial/Lesson6/fitnessCloud.cpp b/trunk/paradiseo-mo/tutorial/Lesson6/fitnessCloud.cpp index 2081439b0..f2eb5188c 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson6/fitnessCloud.cpp +++ b/trunk/paradiseo-mo/tutorial/Lesson6/fitnessCloud.cpp @@ -40,6 +40,7 @@ using namespace std; #include #include #include +#include // Declaration of types //----------------------------------------------------------------------------- @@ -168,7 +169,8 @@ void main_function(int argc, char **argv) // moRndRndFitnessCloudSampling sampling(random, neighborhood, fullEval, neighborEval, nbSol); // moMHRndFitnessCloudSampling sampling(random, neighborhood, fullEval, neighborEval, nbSol); - moRndBestFitnessCloudSampling sampling(random, neighborhood, fullEval, neighborEval, nbSol); + // moRndBestFitnessCloudSampling sampling(random, neighborhood, fullEval, neighborEval, nbSol); + moMHBestFitnessCloudSampling sampling(random, neighborhood, fullEval, neighborEval, nbSol); /* ========================================================= *