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

Rectification des templates dans les VariableNeighborhood

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1731 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jhumeau 2010-04-02 15:50:55 +00:00
commit e3a9101595
2 changed files with 12 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

15
trunk/paradiseo-mo/src/neighborhood/moBackwardVariableNeighborhood.h
View file

@ -35,23 +35,20 @@ Contact: paradiseo-help@lists.gforge.inria.fr
/** /**
* A variable Neighborhood Search (VNS) in the Backward manner * A variable Neighborhood Search (VNS) in the Backward manner
*/ */
template< class Neighbor > template< class EOT, class Fitness >
class moBackwardVariableNeighborhood : public moVariableNeighborhood<Neighbor> class moBackwardVariableNeighborhood : public moVariableNeighborhood<EOT, Fitness>
{ {
public: public:
/** typedef moNeighbor<EOT, Fitness> Neighbor;
* Define type of a solution corresponding to Neighbor
*/
typedef typename Neighbor::EOT EOT;
using moVariableNeighborhood::currentNH; using moVariableNeighborhood<EOT, Fitness>::currentNH;
using moVariableNeighborhood::neighborhoodVector; using moVariableNeighborhood<EOT, Fitness>::neighborhoodVector;
/** /**
* Construction of at least one neighborhood * Construction of at least one neighborhood
* @param _firstNH first neighborhood in the vector * @param _firstNH first neighborhood in the vector
*/ */
moBackwardVariableNeighborhood(moNeighborhood<Neighbor>& _firstNH) : moVariableNeighborhood<Neighbor>(_firstNH) { } moBackwardVariableNeighborhood(moNeighborhood<Neighbor>& _firstNH) : moVariableNeighborhood<EOT, Fitness>(_firstNH) { }
/** /**
* Return the class id. * Return the class id.

15
trunk/paradiseo-mo/src/neighborhood/moRndVariableNeighborhood.h
View file

@ -36,23 +36,20 @@ Contact: paradiseo-help@lists.gforge.inria.fr
/** /**
* A variable Neighborhood Search (VNS) in the random manner * A variable Neighborhood Search (VNS) in the random manner
*/ */
template< class Neighbor > template< class EOT, class Fitness >
class moRndVariableNeighborhood : public moVariableNeighborhood<Neighbor> class moRndVariableNeighborhood : public moVariableNeighborhood<EOT, Fitness>
{ {
public: public:
/** typedef moNeighbor<EOT, Fitness> Neighbor;
* Define type of a solution corresponding to Neighbor
*/
typedef typename Neighbor::EOT EOT;
using moVariableNeighborhood::currentNH; using moVariableNeighborhood<EOT, Fitness>::currentNH;
using moVariableNeighborhood::neighborhoodVector; using moVariableNeighborhood<EOT, Fitness>::neighborhoodVector;
/** /**
* Construction of at least one neighborhood * Construction of at least one neighborhood
* @param _firstNH first neighborhood in the vector * @param _firstNH first neighborhood in the vector
*/ */
moRndVariableNeighborhood(moNeighborhood<Neighbor>& _firstNH) : moVariableNeighborhood<Neighbor>(_firstNH) { moRndVariableNeighborhood(moNeighborhood<Neighbor>& _firstNH) : moVariableNeighborhood<EOT, Fitness>(_firstNH) {
indexVector.push_back(0); indexVector.push_back(0);
} }