VNS modif et template de moLocalSearch Modifié

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1730 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jhumeau 2010-04-02 15:46:03 +00:00
commit bd92e945f8
6 changed files with 82 additions and 29 deletions

View file

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