From 66bcbe833307d3ec81ded165dce1a1c99cd6d25a Mon Sep 17 00:00:00 2001
From: verel <verel@331e1502-861f-0410-8da2-ba01fb791d7f>
Date: Wed, 28 Jul 2010 13:04:31 +0000
Subject: [PATCH] Important (a discuter) : remplacement du dummyNeighbor par un
 template dans moExplorer

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1899 331e1502-861f-0410-8da2-ba01fb791d7f
---
 .../paradiseo-mo/src/explorer/moILSexplorer.h | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

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 <algo/moLocalSearch.h>
 #include <perturb/moPerturbation.h>
 #include <acceptCrit/moAcceptanceCriterion.h>
-#include <neighborhood/moDummyNeighborhood.h>
-#include <neighborhood/moDummyNeighbor.h>
+//#include <neighborhood/moDummyNeighborhood.h>
+//#include <neighborhood/moDummyNeighbor.h>
 
 /**
  * Explorer for an Iterated Local Search
  */
-template< class Neighbor >
-class moILSexplorer : public moNeighborhoodExplorer< moDummyNeighbor<typename Neighbor::EOT> >
+
+//template< class Neighbor >
+//class moILSexplorer : public moNeighborhoodExplorer< moDummyNeighbor<typename Neighbor::EOT> >
+
+template< class Neighbor, class NeighborLO >
+class moILSexplorer : public moNeighborhoodExplorer< NeighborLO >
 {
 public:
-    typedef moNeighborhood<Neighbor> Neighborhood ;
-    typedef typename Neighbor::EOT EOT;
-    typedef moDummyNeighbor<EOT> dummyNeighbor;
-    typedef moDummyNeighborhood<dummyNeighbor> dummyNeighborhood;
+  typedef moNeighborhood<Neighbor> Neighborhood ;
+  typedef typename Neighbor::EOT EOT;
+  typedef moNeighborhood<NeighborLO> NeighborhoodLO;
+  
+  //typedef moDummyNeighbor<EOT> dummyNeighbor;
+  //typedef moDummyNeighborhood<dummyNeighbor> dummyNeighborhood;
 
     /**
      * Constructor
@@ -62,7 +68,7 @@ public:
      * @param _perturb a perturbation operator
      * @param _acceptCrit a acceptance criteria
      */
-    moILSexplorer(moLocalSearch<Neighbor>& _ls, moPerturbation<Neighbor>& _perturb, moAcceptanceCriterion<Neighbor>& _acceptCrit) : moNeighborhoodExplorer<dummyNeighbor>(), ls(_ls), perturb(_perturb), acceptCrit(_acceptCrit) {
+    moILSexplorer(moLocalSearch<Neighbor>& _ls, moPerturbation<Neighbor>& _perturb, moAcceptanceCriterion<Neighbor>& _acceptCrit) : moNeighborhoodExplorer<NeighborLO>(), ls(_ls), perturb(_perturb), acceptCrit(_acceptCrit) {
         firstIteration=true;
     }