From 5d9433896e93c7391949292cd34baae3e8d7ee46 Mon Sep 17 00:00:00 2001 From: boufaras Date: Tue, 2 Nov 2010 10:41:11 +0000 Subject: [PATCH] git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1981 331e1502-861f-0410-8da2-ba01fb791d7f --- .../src/neighborhood/moOrderNeighborhood.h | 190 +++++++++--------- 1 file changed, 99 insertions(+), 91 deletions(-) diff --git a/trunk/paradiseo-mo/src/neighborhood/moOrderNeighborhood.h b/trunk/paradiseo-mo/src/neighborhood/moOrderNeighborhood.h index d5596163d..f27d5bda3 100644 --- a/trunk/paradiseo-mo/src/neighborhood/moOrderNeighborhood.h +++ b/trunk/paradiseo-mo/src/neighborhood/moOrderNeighborhood.h @@ -1,36 +1,36 @@ /* - - 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 + 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". + 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. + 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. + 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 _moOrderNeighborhood_h #define _moOrderNeighborhood_h @@ -40,82 +40,90 @@ /** * An ordered Neighborhood */ -template< class Neighbor > -class moOrderNeighborhood : public moIndexNeighborhood -{ +template +class moOrderNeighborhood: public moIndexNeighborhood { public: - /** - * Define type of a solution corresponding to Neighbor - */ - typedef typename Neighbor::EOT EOT; + /** + * Define type of a solution corresponding to Neighbor + */ + typedef typename Neighbor::EOT EOT; - using moIndexNeighborhood::neighborhoodSize; + using moIndexNeighborhood::neighborhoodSize; - /** - * Constructor - * @param _neighborhoodSize the size of the neighborhood - */ - moOrderNeighborhood(unsigned int _neighborhoodSize): moIndexNeighborhood(_neighborhoodSize), currentIndex(0) {} + /** + * Constructor + * @param _neighborhoodSize the size of the neighborhood + */ + moOrderNeighborhood(unsigned int _neighborhoodSize) : + moIndexNeighborhood (_neighborhoodSize), currentIndex(0) { + } - /** - * Test if a neighbor exists - * @param _solution the solution to explore - * @return true if the neighborhood was not empty - */ - virtual bool hasNeighbor(EOT& _solution) { - return neighborhoodSize > 0; - } + /** + * Test if a neighbor exists + * @param _solution the solution to explore + * @return true if the neighborhood was not empty + */ + virtual bool hasNeighbor(EOT& _solution) { + return neighborhoodSize > 0; + } - /** - * Initialization of the neighborhood - * @param _solution the solution to explore - * @param _neighbor the first neighbor - */ - virtual void init(EOT & _solution, Neighbor & _neighbor) { - currentIndex = 0 ; - _neighbor.index(currentIndex) ; - } + /** + * Initialization of the neighborhood + * @param _solution the solution to explore + * @param _neighbor the first neighbor + */ + virtual void init(EOT & _solution, Neighbor & _neighbor) { + currentIndex = 0; + _neighbor.index(currentIndex); + } - /** - * Give the next neighbor - * @param _solution the solution to explore - * @param _neighbor the next neighbor - */ - virtual void next(EOT & _solution, Neighbor & _neighbor) { - currentIndex++ ; - _neighbor.index(currentIndex); - } + /** + * Give the next neighbor + * @param _solution the solution to explore + * @param _neighbor the next neighbor + */ + virtual void next(EOT & _solution, Neighbor & _neighbor) { + currentIndex++; + _neighbor.index(currentIndex); + } - /** - * test if all neighbors are explore or not,if false, there is no neighbor left to explore - * currentIndex is the index which have been used before, it is not the next neighbor which can be possibly evaluated - * - * @param _solution the solution to explore - * @return true if there is again a neighbor to explore - */ - virtual bool cont(EOT & _solution) { - return (currentIndex < neighborhoodSize - 1) ; - } + /** + * test if all neighbors are explore or not,if false, there is no neighbor left to explore + * currentIndex is the index which have been used before, it is not the next neighbor which can be possibly evaluated + * + * @param _solution the solution to explore + * @return true if there is again a neighbor to explore + */ + virtual bool cont(EOT & _solution) { + return (currentIndex < neighborhoodSize - 1); + } - /** - * Getter - * @return the position in the Neighborhood - */ - unsigned int position() { - return currentIndex; - } + /** + * Getter + * @return the position in the Neighborhood + */ + unsigned int position() { + return currentIndex; + } - /** - * Return the class Name - * @return the class name as a std::string - */ - virtual std::string className() const { - return "moOrderNeighborhood"; - } + /** + * Setter the position in the Neighborhood + */ + unsigned int setPosition(unsigned int _currentIndex) { + currentIndex=_currentIndex; + } + + /** + * Return the class Name + * @return the class name as a std::string + */ + virtual std::string className() const { + return "moOrderNeighborhood"; + } protected: - unsigned int currentIndex; + unsigned int currentIndex; };