From 1ab2731502893e78e2a34dc6c70ec54be11cda2b Mon Sep 17 00:00:00 2001 From: boufaras Date: Fri, 8 Jul 2011 09:37:32 +0000 Subject: [PATCH] Verify if the neighbor fitness is invalid or not before the copy of fitness, if it is, the neighbor will copy an invalid fitness else the neighbor fitness will be set with the fitness of the copied neighbor git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2303 331e1502-861f-0410-8da2-ba01fb791d7f --- .../src/neighborhood/moNeighbor.h | 153 +++++++++--------- 1 file changed, 81 insertions(+), 72 deletions(-) diff --git a/trunk/paradiseo-mo/src/neighborhood/moNeighbor.h b/trunk/paradiseo-mo/src/neighborhood/moNeighbor.h index f14e834b2..889dd6817 100644 --- a/trunk/paradiseo-mo/src/neighborhood/moNeighbor.h +++ b/trunk/paradiseo-mo/src/neighborhood/moNeighbor.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 _moNeighbor_h #define _moNeighbor_h @@ -43,58 +43,67 @@ /** * Container of the neighbor informations */ -template< class EOType, class Fitness=typename EOType::Fitness> -class moNeighbor : public EO -{ +template +class moNeighbor: public EO { public: - typedef EOType EOT; - using EO::fitness; + typedef EOType EOT; + using EO::fitness; - /** - * Default Constructor - */ - moNeighbor():EO() {} + /** + * Default Constructor + */ + moNeighbor() : + EO () { + } - /** - * Copy Constructor - * @param _neighbor to copy - */ - moNeighbor(const moNeighbor& _neighbor) { - fitness(_neighbor.fitness()); - } + /** + * Copy Constructor + * @param _neighbor to copy + */ + moNeighbor(const moNeighbor& _neighbor) { + if (!(_neighbor.invalid())) + fitness(_neighbor.fitness()); + else + (*this).invalidate(); + } - /** - * Assignment operator - * @param _neighbor the neighbor to assign - * @return a neighbor equal to the other - */ - virtual moNeighbor& operator=(const moNeighbor& _neighbor) { - fitness(_neighbor.fitness()); - return (*this); - } + /** + * Assignment operator + * @param _neighbor the neighbor to assign + * @return a neighbor equal to the other + */ + virtual moNeighbor& operator=( + const moNeighbor& _neighbor) { + if (!(_neighbor.invalid())) + fitness(_neighbor.fitness()); + else + (*this).invalidate(); - /** - * Move a solution - * @param _solution the related solution - */ - virtual void move(EOT & _solution) = 0 ; + return (*this); + } - /** - * Test equality between two neighbors - * @param _neighbor a neighbor - * @return if _neighbor and this one are equals - */ - virtual bool equals(moNeighbor & _neighbor) { - return false; - } + /** + * Move a solution + * @param _solution the related solution + */ + virtual void move(EOT & _solution) = 0; - /** - * Return the class Name - * @return the class name as a std::string - */ - virtual std::string className() const { - return "moNeighbor"; - } + /** + * Test equality between two neighbors + * @param _neighbor a neighbor + * @return if _neighbor and this one are equals + */ + virtual bool equals(moNeighbor & _neighbor) { + return false; + } + + /** + * Return the class Name + * @return the class name as a std::string + */ + virtual std::string className() const { + return "moNeighbor"; + } };