diff --git a/trunk/paradiseo-mo/src/explorer/moILSexplorer.h b/trunk/paradiseo-mo/src/explorer/moILSexplorer.h index ed95f4520..a590d217f 100644 --- a/trunk/paradiseo-mo/src/explorer/moILSexplorer.h +++ b/trunk/paradiseo-mo/src/explorer/moILSexplorer.h @@ -41,20 +41,26 @@ #include #include #include -#include -#include +//#include +//#include /** * Explorer for an Iterated Local Search */ -template< class Neighbor > -class moILSexplorer : public moNeighborhoodExplorer< moDummyNeighbor > + +//template< class Neighbor > +//class moILSexplorer : public moNeighborhoodExplorer< moDummyNeighbor > + +template< class Neighbor, class NeighborLO > +class moILSexplorer : public moNeighborhoodExplorer< NeighborLO > { public: - typedef moNeighborhood Neighborhood ; - typedef typename Neighbor::EOT EOT; - typedef moDummyNeighbor dummyNeighbor; - typedef moDummyNeighborhood dummyNeighborhood; + typedef moNeighborhood Neighborhood ; + typedef typename Neighbor::EOT EOT; + typedef moNeighborhood NeighborhoodLO; + + //typedef moDummyNeighbor dummyNeighbor; + //typedef moDummyNeighborhood dummyNeighborhood; /** * Constructor @@ -62,7 +68,7 @@ public: * @param _perturb a perturbation operator * @param _acceptCrit a acceptance criteria */ - moILSexplorer(moLocalSearch& _ls, moPerturbation& _perturb, moAcceptanceCriterion& _acceptCrit) : moNeighborhoodExplorer(), ls(_ls), perturb(_perturb), acceptCrit(_acceptCrit) { + moILSexplorer(moLocalSearch& _ls, moPerturbation& _perturb, moAcceptanceCriterion& _acceptCrit) : moNeighborhoodExplorer(), ls(_ls), perturb(_perturb), acceptCrit(_acceptCrit) { firstIteration=true; }