nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2303 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
boufaras 2011-07-08 09:37:32 +00:00
commit 1ab2731502
1 changed files with 92 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

153
trunk/paradiseo-mo/src/neighborhood/moNeighbor.h
View file

@ -1,36 +1,36 @@
/* /*
<moNeighbor.h> <moNeighbor.h>
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 This software is governed by the CeCILL license under French law and
abiding by the rules of distribution of free software. You can use, abiding by the rules of distribution of free software. You can use,
modify and/ or redistribute the software under the terms of the CeCILL modify and/ or redistribute the software under the terms of the CeCILL
license as circulated by CEA, CNRS and INRIA at the following URL license as circulated by CEA, CNRS and INRIA at the following URL
"http://www.cecill.info". "http://www.cecill.info".
As a counterpart to the access to the source code and rights to copy, 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 modify and redistribute granted by the license, users are provided only
with a limited warranty and the software's author, the holder of the with a limited warranty and the software's author, the holder of the
economic rights, and the successive licensors have only limited liability. economic rights, and the successive licensors have only limited liability.
In this respect, the user's attention is drawn to the risks associated In this respect, the user's attention is drawn to the risks associated
with loading, using, modifying and/or developing or reproducing the with loading, using, modifying and/or developing or reproducing the
software by the user in light of its specific status of free software, 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 that may mean that it is complicated to manipulate, and that also
therefore means that it is reserved for developers and experienced therefore means that it is reserved for developers and experienced
professionals having in-depth computer knowledge. Users are therefore professionals having in-depth computer knowledge. Users are therefore
encouraged to load and test the software's suitability as regards their encouraged to load and test the software's suitability as regards their
requirements in conditions enabling the security of their systems and/or 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 data to be ensured and, more generally, to use and operate it in the
same conditions as regards security. same conditions as regards security.
The fact that you are presently reading this means that you have had The fact that you are presently reading this means that you have had
knowledge of the CeCILL license and that you accept its terms. knowledge of the CeCILL license and that you accept its terms.
ParadisEO WebSite : http://paradiseo.gforge.inria.fr ParadisEO WebSite : http://paradiseo.gforge.inria.fr
Contact: paradiseo-help@lists.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr
*/ */
#ifndef _moNeighbor_h #ifndef _moNeighbor_h
#define _moNeighbor_h #define _moNeighbor_h
@ -43,58 +43,67 @@
/** /**
* Container of the neighbor informations * Container of the neighbor informations
*/ */
template< class EOType, class Fitness=typename EOType::Fitness> template<class EOType, class Fitness = typename EOType::Fitness>
class moNeighbor : public EO<Fitness> class moNeighbor: public EO<Fitness> {
{
public: public:
typedef EOType EOT; typedef EOType EOT;
using EO<Fitness>::fitness; using EO<Fitness>::fitness;
/** /**
* Default Constructor * Default Constructor
*/ */
moNeighbor():EO<Fitness>() {} moNeighbor() :
EO<Fitness> () {
}
/** /**
* Copy Constructor * Copy Constructor
* @param _neighbor to copy * @param _neighbor to copy
*/ */
moNeighbor(const moNeighbor<EOT, Fitness>& _neighbor) { moNeighbor(const moNeighbor<EOT, Fitness>& _neighbor) {
fitness(_neighbor.fitness()); if (!(_neighbor.invalid()))
} fitness(_neighbor.fitness());
else
(*this).invalidate();
}
/** /**
* Assignment operator * Assignment operator
* @param _neighbor the neighbor to assign * @param _neighbor the neighbor to assign
* @return a neighbor equal to the other * @return a neighbor equal to the other
*/ */
virtual moNeighbor<EOT, Fitness>& operator=(const moNeighbor<EOT, Fitness>& _neighbor) { virtual moNeighbor<EOT, Fitness>& operator=(
fitness(_neighbor.fitness()); const moNeighbor<EOT, Fitness>& _neighbor) {
return (*this); if (!(_neighbor.invalid()))
} fitness(_neighbor.fitness());
else
(*this).invalidate();
/** return (*this);
* Move a solution }
* @param _solution the related solution
*/
virtual void move(EOT & _solution) = 0 ;
/** /**
* Test equality between two neighbors * Move a solution
* @param _neighbor a neighbor * @param _solution the related solution
* @return if _neighbor and this one are equals */
*/ virtual void move(EOT & _solution) = 0;
virtual bool equals(moNeighbor<EOT,Fitness> & _neighbor) {
return false;
}
/** /**
* Return the class Name * Test equality between two neighbors
* @return the class name as a std::string * @param _neighbor a neighbor
*/ * @return if _neighbor and this one are equals
virtual std::string className() const { */
return "moNeighbor"; virtual bool equals(moNeighbor<EOT, Fitness> & _neighbor) {
} return false;
}
/**
* Return the class Name
* @return the class name as a std::string
*/
virtual std::string className() const {
return "moNeighbor";
}
}; };