From 180855046b3abbb94093cc4de0f834c1bfe05e5c Mon Sep 17 00:00:00 2001
From: jhumeau <jhumeau@331e1502-861f-0410-8da2-ba01fb791d7f>
Date: Thu, 19 Feb 2009 16:30:43 +0000
Subject: [PATCH] git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1451
 331e1502-861f-0410-8da2-ba01fb791d7f

---
 .../branches/MOLS/src/moeoUnifiedDominanceBasedLS.h      | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/contribution/branches/MOLS/src/moeoUnifiedDominanceBasedLS.h b/contribution/branches/MOLS/src/moeoUnifiedDominanceBasedLS.h
index e2a0ab2fd..1d6f6074b 100644
--- a/contribution/branches/MOLS/src/moeoUnifiedDominanceBasedLS.h
+++ b/contribution/branches/MOLS/src/moeoUnifiedDominanceBasedLS.h
@@ -43,6 +43,7 @@
 #include <moeo>
 #include <moeoPopNeighborhoodExplorer.h>
 #include <moeoPopLS.h>
+#include <eoTenTimeContinue.h>
 
 /**
  * An easy class to design multi-objective evolutionary algorithms.
@@ -57,11 +58,10 @@ public:
 
 	moeoUnifiedDominanceBasedLS(
 			eoContinue < MOEOT > & _continuator,
-			eoEvalFunc < MOEOT > & _full_evaluation,
-//			eoPopEvalFunc < MOEOT > & _popEval,
+			eoEvalFunc < MOEOT > & _eval,
 			moeoArchive < MOEOT > & _archive,
 			moeoPopNeighborhoodExplorer < Move > & _explorer
-	):continuator(_continuator), full_evaluation(_full_evaluation), popEval(full_evaluation), archive(_archive), explorer(_explorer)
+	):continuator(_continuator), loopEval(_eval), popEval(loopEval), archive(_archive), explorer(_explorer)
 	{}
 
     /**
@@ -82,7 +82,7 @@ public:
         	//mise à jour de la pop ou archive
     		archive(tmp_pop);
     	}
-    	while(continuator(tmp_pop) && naturalContinuator(archive));
+    	while(continuator(archive) && naturalContinuator(archive));
     	
     	 std::cout << "Final archive\n";
         archive.sortedPrintOn(std::cout);
@@ -124,7 +124,6 @@ protected:
 //    }
 //    dummyEval;
 
-	eoEvalFunc < MOEOT > & full_evaluation;
 	eoPopLoopEval < MOEOT > loopEval;
 	eoPopEvalFunc < MOEOT > & popEval;