From e2546ca8d54e37b719c78d0268b0a65170b1d5e2 Mon Sep 17 00:00:00 2001 From: jhumeau Date: Tue, 23 Mar 2010 17:42:46 +0000 Subject: [PATCH] Ils added git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1711 331e1502-861f-0410-8da2-ba01fb791d7f --- branches/newMo/src/explorer/moILSexplorer.h | 168 ++++++++++++++++++++ branches/newMo/test/t-moILSexplorer.cpp | 43 +++++ 2 files changed, 211 insertions(+) create mode 100644 branches/newMo/src/explorer/moILSexplorer.h create mode 100644 branches/newMo/test/t-moILSexplorer.cpp diff --git a/branches/newMo/src/explorer/moILSexplorer.h b/branches/newMo/src/explorer/moILSexplorer.h new file mode 100644 index 000000000..7fe196265 --- /dev/null +++ b/branches/newMo/src/explorer/moILSexplorer.h @@ -0,0 +1,168 @@ +/* + + 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 _moILSexplorer_h +#define _moILSexplorer_h + +#include +#include +#include +#include + +/** + * Explorer for an Iterated Local Search + */ +template< class NHE > +class moILSexplorer : public moNeighborhoodExplorer +{ +public: + typedef typename NHE::Neighborhood Neighborhood ; + typedef typename Neighborhood::EOT EOT ; + typedef typename Neighborhood::Neighbor Neighbor ; + + using moNeighborhoodExplorer::neighborhood; + using moNeighborhoodExplorer::eval; + + /** + * Constructor + * @param _ls a local search + * @param _perturb a perturbation operator + * @param _acceptCrit a acceptance criteria + */ + moILSexplorer(moLocalSearch& _ls, moPerturbation& _perturb, moAcceptanceCriterion& _acceptCrit) : ls(_ls), perturb(_perturb), acceptCrit(_acceptCrit){ + firstIteration=true; + } + + /** + * Destructor + */ + ~moILSexplorer(){ + + } + + /** + * Init perturbation and acceptance criteria + * @param _solution the current solution + */ + virtual void initParam(EOT & _solution){ + firstIteration=true; + perturb.init(_solution); + acceptCrit.init(_solution); + }; + + /** + * Update perturbation and acceptance criteria + * @param _solution the current solution + */ + virtual void updateParam(EOT & _solution){ + + if((*this).isMoved()){ + perturb.add(_solution,emptyNeighbor); + acceptCrit.add(_solution,emptyNeighbor); + } + perturb.update(_solution, emptyNeighbor); + acceptCrit.update(_solution, emptyNeighbor); + }; + + /** + * terminate: NOTHING TO DO + */ + virtual void terminate(EOT & _solution){}; + + /** + * Explore the neighborhood of a solution + * @param _solution + */ + virtual void operator()(EOT & _solution){ + //copy the solution to perform new local search + current=_solution; + + //perturb solution exept at the first iteration + if(!firstIteration) + perturb(current); + else + firstIteration=false; + + //apply the local search on the copy + ls(current); + + }; + + /** + * Always continue + * @param _solution the solution + * @return always true + */ + virtual bool isContinue(EOT & _solution) { + return true; + }; + + /** + * move the solution with the best neighbor + * @param _solution the solution to move + */ + virtual void move(EOT & _solution) { + _solution=current; + }; + + /** + * accept test if an ameliorated neighbor was be found + * @param _solution the solution + * @return true if acceptance criteria is verified + */ + virtual bool accept(EOT & _solution) { + return acceptCrit(_solution, current); + }; + + /** + * Return the class id. + * @return the class name as a std::string + */ + virtual std::string className() const { + return "moILSexplorer"; + } + +private: + //Usefull to use the momory of tabuSearch + Neighbor emptyNeighbor; + EOT current; + moLocalSearch& ls; + moPerturbation & perturb; + moAcceptanceCriterion& acceptCrit; + + bool firstIteration; +}; + + +#endif diff --git a/branches/newMo/test/t-moILSexplorer.cpp b/branches/newMo/test/t-moILSexplorer.cpp new file mode 100644 index 000000000..6928aa5ab --- /dev/null +++ b/branches/newMo/test/t-moILSexplorer.cpp @@ -0,0 +1,43 @@ +/* + +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 + +int main(){ + + std::cout << "[t-moILSexplorer] => START" << std::endl; + + + std::cout << "[t-moILSexplorer] => OK" << std::endl; + + return EXIT_SUCCESS; +} +