From 7870d8dcfe6f5ecad1c5b17885ac6e19521be9b8 Mon Sep 17 00:00:00 2001 From: verel Date: Sun, 29 Aug 2010 13:03:23 +0000 Subject: [PATCH] Tous les *VNselect compilent et marchent git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1929 331e1502-861f-0410-8da2-ba01fb791d7f --- .../src/neighborhood/moRndVectorVNSelection.h | 129 +++++++++--------- 1 file changed, 65 insertions(+), 64 deletions(-) diff --git a/trunk/paradiseo-mo/src/neighborhood/moRndVectorVNSelection.h b/trunk/paradiseo-mo/src/neighborhood/moRndVectorVNSelection.h index e375a6efa..e7b7d2e0c 100644 --- a/trunk/paradiseo-mo/src/neighborhood/moRndVectorVNSelection.h +++ b/trunk/paradiseo-mo/src/neighborhood/moRndVectorVNSelection.h @@ -1,30 +1,30 @@ /* - -Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 + + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 -Sébastien Verel, Arnaud Liefooghe, Jérémie Humeau + 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 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". + 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. + 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 + ParadisEO WebSite : http://paradiseo.gforge.inria.fr + Contact: paradiseo-help@lists.gforge.inria.fr */ #ifndef _moRndVectorVNSelection_h @@ -38,58 +38,59 @@ Contact: paradiseo-help@lists.gforge.inria.fr template< class EOT > class moRndVectorVNSelection: public moVectorVNSelection{ - using moVectorVNSelection::LSvector; - using moVectorVNSelection::shakeVector; - using moVectorVNSelection::current; + using moVectorVNSelection::LSvector; + using moVectorVNSelection::shakeVector; + using moVectorVNSelection::current; public: - moRndVectorVNSelection(eoMonOp& _firstLS, eoMonOp& _firstShake, bool _cycle):moVectorVNSelection(_firstLS, _firstShake), cycle(_cycle){} + moRndVectorVNSelection(eoMonOp& _firstLS, eoMonOp& _firstShake, bool _cycle = true):moVectorVNSelection(_firstLS, _firstShake), cycle(_cycle){} - /** - * Return the class id. - * @return the class name as a std::string - */ - virtual std::string className() const { - return "moRndVectorVNSelection"; - } + /** + * Return the class id. + * @return the class name as a std::string + */ + virtual std::string className() const { + return "moRndVectorVNSelection"; + } - /** - * test if there is still some neighborhood to explore - * @return true if there is some neighborhood to explore - */ - virtual bool cont(EOT& _solution, eoMonOp& _shake, eoMonOp& _ls){ - return (cycle || (current <= (LSvector.size()-2))); - } + /** + * test if there is still some neighborhood to explore + * @return true if there is some neighborhood to explore + */ + virtual bool cont(EOT& _solution){ + return ( cycle || (currentOrder <= (order.size() - 2)) ); + } - /** - * put the current neighborhood on the first one - */ - virtual void init(EOT& _solution, eoMonOp& _shake, eoMonOp& _ls){ - if(order.size()==0){ - for(unsigned int i=0; i& _shake, eoMonOp& _ls){ - current= (current+1) % LSvector.size(); - _ls=*(LSvector[order[current]]); - _shake=*(shakeVector[order[current]]); - } + currentOrder = 0; + current = order[currentOrder]; + } + + /** + * put the current neighborhood on the next one + */ + virtual void next(EOT& _solution){ + currentOrder = (currentOrder + 1) % order.size(); + + current = order[currentOrder]; + } private: - bool cycle; - std::vector order; - UF_random_generator gen; + bool cycle; + unsigned int currentOrder; + std::vector order; + UF_random_generator gen; };