From 107abf44349c8cc90ba7c79c1b2c5f51d9afbf42 Mon Sep 17 00:00:00 2001 From: verel Date: Sun, 29 Aug 2010 09:21:37 +0000 Subject: [PATCH] ForwardVNselect compile et semble marcher, mais pas moBackwardVNSelection... git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1928 331e1502-861f-0410-8da2-ba01fb791d7f --- .../paradiseo-mo/src/explorer/moVNSexplorer.h | 3 +- .../moBackwardVectorVNSelection.h | 121 +++++++++--------- .../moVariableNeighborhoodSelection.h | 4 +- .../src/neighborhood/moVectorVNSelection.h | 6 +- 4 files changed, 69 insertions(+), 65 deletions(-) diff --git a/trunk/paradiseo-mo/src/explorer/moVNSexplorer.h b/trunk/paradiseo-mo/src/explorer/moVNSexplorer.h index 1eaf95159..515fc9949 100644 --- a/trunk/paradiseo-mo/src/explorer/moVNSexplorer.h +++ b/trunk/paradiseo-mo/src/explorer/moVNSexplorer.h @@ -104,7 +104,8 @@ public: shake(current); std::cout << "current apres shake: "<< current << std::endl; ls(current); - std::cout << "current apres ls: "<< ls.className() << " " << current << std::endl; + std::cout << "current apres ls: "<< ls.className() ; + std::cout << " sol: " << current << std::endl; } /** diff --git a/trunk/paradiseo-mo/src/neighborhood/moBackwardVectorVNSelection.h b/trunk/paradiseo-mo/src/neighborhood/moBackwardVectorVNSelection.h index a62085493..dd20cf97a 100644 --- a/trunk/paradiseo-mo/src/neighborhood/moBackwardVectorVNSelection.h +++ b/trunk/paradiseo-mo/src/neighborhood/moBackwardVectorVNSelection.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 _moBackwardVectorVNSelection_h @@ -35,52 +35,53 @@ Contact: paradiseo-help@lists.gforge.inria.fr template< class EOT > class moBackwardVectorVNSelection: public moVectorVNSelection{ - using moVectorVNSelection::LSvector; - using moVectorVNSelection::shakeVector; - using moVectorVNSelection::current; - + using moVectorVNSelection::LSvector; + using moVectorVNSelection::shakeVector; + using moVectorVNSelection::current; + public: + + moBackwardVectorVNSelection(eoMonOp& _firstLS, eoMonOp& _firstShake, bool _cycle):moVectorVNSelection(_firstLS, _firstShake), cycle(_cycle){} + + /** + * Return the class id. + * @return the class name as a std::string + */ + virtual std::string className() const { + return "moBackwardVectorVNSelection"; + } - moBackwardVectorVNSelection(eoMonOp& _firstLS, eoMonOp& _firstShake, bool _cycle):moVectorVNSelection(_firstLS, _firstShake), cycle(_cycle){} + /** + * 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 || (current > 0)); + } - /** - * Return the class id. - * @return the class name as a std::string - */ - virtual std::string className() const { - return "moBackwardVectorVNSelection"; - } + /** + * put the current neighborhood on the first one + */ + virtual void init(EOT& _solution){ + current = LSvector.size() - 1; + std::cout << "current LS: " << current << std::endl; + std::cout << _solution << std::endl; - /** - * 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 >0 )); - } + } - /** - * put the current neighborhood on the first one - */ - virtual void init(EOT& _solution, eoMonOp& _shake, eoMonOp& _ls){ - current=LSvector.size()-1; - _ls= *(LSvector[current]); - _shake = *(shakeVector[current]); - } + /** + * put the current neighborhood on the next one + */ + virtual void next(EOT& _solution){ + current = (current + LSvector.size() -1) % LSvector.size(); + std::cout << "current LS: " << current << std::endl; + std::cout << _solution << std::endl; - /** - * put the current neighborhood on the next one - */ - virtual void next(EOT& _solution, eoMonOp& _shake, eoMonOp& _ls){ - current= (current + LSvector.size() -1) % LSvector.size(); - _ls= *(LSvector[current]); - _shake = *(shakeVector[current]); - } + } private: - - bool cycle; - + bool cycle; + }; #endif diff --git a/trunk/paradiseo-mo/src/neighborhood/moVariableNeighborhoodSelection.h b/trunk/paradiseo-mo/src/neighborhood/moVariableNeighborhoodSelection.h index 6200d2eb3..5c4ee4f28 100644 --- a/trunk/paradiseo-mo/src/neighborhood/moVariableNeighborhoodSelection.h +++ b/trunk/paradiseo-mo/src/neighborhood/moVariableNeighborhoodSelection.h @@ -67,14 +67,14 @@ public: * * @return current shake operator */ - virtual const eoMon & getShake() = 0; + virtual eoMonOp & getShake() = 0; /** * Get the current local search based on the current neighborhood * * @return current local search */ - virtual const eoMon & getLocalSearch() = 0; + virtual eoMonOp & getLocalSearch() = 0; }; diff --git a/trunk/paradiseo-mo/src/neighborhood/moVectorVNSelection.h b/trunk/paradiseo-mo/src/neighborhood/moVectorVNSelection.h index d886e203a..83a7f394c 100644 --- a/trunk/paradiseo-mo/src/neighborhood/moVectorVNSelection.h +++ b/trunk/paradiseo-mo/src/neighborhood/moVectorVNSelection.h @@ -62,7 +62,7 @@ public: * * @return current shake operator */ - virtual const eoMon & getShake() { + virtual eoMonOp & getShake() { return *(shakeVector[current]); } @@ -71,7 +71,9 @@ public: * * @return current local search */ - virtual const eoMon & getLocalSearch() { + virtual eoMonOp & getLocalSearch() { + std::cout << "getLS : " << current << " sur " << LSvector.size() << std::endl; + std::cout << "getLS : ls = " << LSvector[current]->className() << std::endl; return *(LSvector[current]); }