diff --git a/trunk/paradiseo-mo/src/neighborhood/moBackwardVariableNeighborhood.h b/trunk/paradiseo-mo/src/neighborhood/moBackwardVariableNeighborhood.h index 25978990d..d9ecdf504 100644 --- a/trunk/paradiseo-mo/src/neighborhood/moBackwardVariableNeighborhood.h +++ b/trunk/paradiseo-mo/src/neighborhood/moBackwardVariableNeighborhood.h @@ -35,23 +35,20 @@ Contact: paradiseo-help@lists.gforge.inria.fr /** * A variable Neighborhood Search (VNS) in the Backward manner */ -template< class Neighbor > -class moBackwardVariableNeighborhood : public moVariableNeighborhood +template< class EOT, class Fitness > +class moBackwardVariableNeighborhood : public moVariableNeighborhood { public: - /** - * Define type of a solution corresponding to Neighbor - */ - typedef typename Neighbor::EOT EOT; + typedef moNeighbor Neighbor; - using moVariableNeighborhood::currentNH; - using moVariableNeighborhood::neighborhoodVector; + using moVariableNeighborhood::currentNH; + using moVariableNeighborhood::neighborhoodVector; /** * Construction of at least one neighborhood * @param _firstNH first neighborhood in the vector */ - moBackwardVariableNeighborhood(moNeighborhood& _firstNH) : moVariableNeighborhood(_firstNH) { } + moBackwardVariableNeighborhood(moNeighborhood& _firstNH) : moVariableNeighborhood(_firstNH) { } /** * Return the class id. diff --git a/trunk/paradiseo-mo/src/neighborhood/moRndVariableNeighborhood.h b/trunk/paradiseo-mo/src/neighborhood/moRndVariableNeighborhood.h index e6d3fd83e..e0c32050e 100644 --- a/trunk/paradiseo-mo/src/neighborhood/moRndVariableNeighborhood.h +++ b/trunk/paradiseo-mo/src/neighborhood/moRndVariableNeighborhood.h @@ -36,23 +36,20 @@ Contact: paradiseo-help@lists.gforge.inria.fr /** * A variable Neighborhood Search (VNS) in the random manner */ -template< class Neighbor > -class moRndVariableNeighborhood : public moVariableNeighborhood +template< class EOT, class Fitness > +class moRndVariableNeighborhood : public moVariableNeighborhood { public: - /** - * Define type of a solution corresponding to Neighbor - */ - typedef typename Neighbor::EOT EOT; + typedef moNeighbor Neighbor; - using moVariableNeighborhood::currentNH; - using moVariableNeighborhood::neighborhoodVector; + using moVariableNeighborhood::currentNH; + using moVariableNeighborhood::neighborhoodVector; /** * Construction of at least one neighborhood * @param _firstNH first neighborhood in the vector */ - moRndVariableNeighborhood(moNeighborhood& _firstNH) : moVariableNeighborhood(_firstNH) { + moRndVariableNeighborhood(moNeighborhood& _firstNH) : moVariableNeighborhood(_firstNH) { indexVector.push_back(0); }