diff --git a/trunk/paradiseo-mo/src/memory/moMonOpDiversification.h b/trunk/paradiseo-mo/src/memory/moMonOpDiversification.h new file mode 100644 index 000000000..d4ff55537 --- /dev/null +++ b/trunk/paradiseo-mo/src/memory/moMonOpDiversification.h @@ -0,0 +1,72 @@ +/* + +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 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 _moMonOpDiversification_h +#define _moMonOpDiversification_h + + +#include +#include +#include +#include + +/** + * Diversification strategy applies a "monOp" operator + */ +template< class Neighbor > +class moMonOpDiversification : public moDiversification, public moDummyMemory +{ +public: + typedef typename Neighbor::EOT EOT; + + /** + * Default Constructor + * @param _monOp an eoMonOp (diversification operator) + * @param _fullEval a full evaluation function + */ + moMonOpDiversification(eoMonOp& _monOp, eoEvalFunc& _fullEval):monOp(_monOp), fullEval(_fullEval){} + + /** + * Apply monOp on the solution + * @param _solution to diversify + * @return value of monOp + */ + bool operator()(EOT& _solution){ + bool res = monOp(_solution); + fullEval(_solution); + return res; + } + +private: + /** monOp */ + eoMonOp& monOp; + eoEvalFunc& fullEval; +}; + +#endif diff --git a/trunk/paradiseo-mo/src/mo.h b/trunk/paradiseo-mo/src/mo.h index 37ea65f71..e9aa9fce4 100755 --- a/trunk/paradiseo-mo/src/mo.h +++ b/trunk/paradiseo-mo/src/mo.h @@ -100,6 +100,7 @@ #include #include #include +#include #include #include diff --git a/trunk/paradiseo-mo/test/CMakeLists.txt b/trunk/paradiseo-mo/test/CMakeLists.txt index 0728e4941..caae4978f 100644 --- a/trunk/paradiseo-mo/test/CMakeLists.txt +++ b/trunk/paradiseo-mo/test/CMakeLists.txt @@ -79,6 +79,7 @@ SET (TEST_LIST t-moFirstImprHC t-moRandomBestHC t-moNeighborVectorTabuList + t-moMonOpDiversification ) FOREACH (test ${TEST_LIST}) diff --git a/trunk/paradiseo-mo/test/t-moMonOpDiversification.cpp b/trunk/paradiseo-mo/test/t-moMonOpDiversification.cpp new file mode 100644 index 000000000..f4db062e6 --- /dev/null +++ b/trunk/paradiseo-mo/test/t-moMonOpDiversification.cpp @@ -0,0 +1,74 @@ +/* + +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 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 +*/ + +#include +#include +#include + +#include + +#include +#include "moTestClass.h" +#include + + +class dummyMonOp: public eoMonOp{ + + bool operator()(bitVector& _sol){ + _sol[0]=!_sol[0]; + return true; + } + +}; + +int main(){ + + std::cout << "[t-moMonOpDiversification] => START" << std::endl; + + dummyMonOp op; + oneMaxEval eval; + + bitVector sol; + sol.push_back(1); + sol.push_back(0); + sol.push_back(1); + + sol.fitness(5); + + moMonOpDiversification test(op, eval); + + test(sol); + + assert(sol.fitness()==1); + + std::cout << "[t-moMonOpDiversification] => OK" << std::endl; + + return EXIT_SUCCESS; +} +