diff --git a/trunk/paradiseo-mo/src/mo.h b/trunk/paradiseo-mo/src/mo.h index 44d987966..0c00b5930 100755 --- a/trunk/paradiseo-mo/src/mo.h +++ b/trunk/paradiseo-mo/src/mo.h @@ -125,6 +125,7 @@ #include #include #include +#include #include #include diff --git a/trunk/paradiseo-mo/src/perturb/moLocalSearchInit.h b/trunk/paradiseo-mo/src/perturb/moLocalSearchInit.h new file mode 100644 index 000000000..7280e70a1 --- /dev/null +++ b/trunk/paradiseo-mo/src/perturb/moLocalSearchInit.h @@ -0,0 +1,66 @@ +/* + +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 _moLocalSearchInit_h +#define _moLocalSearchInit_h + +#include +#include + +/** + * Initialization of the solution with a local search + */ +template< class Neighbor > +class moLocalSearchInit : public eoInit { +public: + typedef typename Neighbor::EOT EOT; + + /** + * Default Constructor + * @param _init initialization of the solution before the local search + * @param _ls the local search to apply to the solution + */ + moLocalSearchInit(eoInit& _init, moLocalSearch& _ls) : init(_init), ls(_ls) { + } + + /** + * Apply the local search on the solution + * @param _solution to perturb + */ + void operator()(EOT& _solution){ + init(solution); + ls(solution); + } + +private: + eoInit& init; + moLocalSearch & ls; +}; + +#endif