nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1451 331e1502-861f-0410-8da2-ba01fb791d7f

Browse source
This commit is contained in:
jhumeau 2009-02-19 16:30:43 +00:00
commit 180855046b
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
contribution/branches/MOLS/src/moeoUnifiedDominanceBasedLS.h
View file

@ -43,6 +43,7 @@
#include <moeo> #include <moeo>
#include <moeoPopNeighborhoodExplorer.h> #include <moeoPopNeighborhoodExplorer.h>
#include <moeoPopLS.h> #include <moeoPopLS.h>
#include <eoTenTimeContinue.h>
/** /**
* An easy class to design multi-objective evolutionary algorithms. * An easy class to design multi-objective evolutionary algorithms.
@ -57,11 +58,10 @@ public:
moeoUnifiedDominanceBasedLS( moeoUnifiedDominanceBasedLS(
eoContinue < MOEOT > & _continuator, eoContinue < MOEOT > & _continuator,
eoEvalFunc < MOEOT > & _full_evaluation, eoEvalFunc < MOEOT > & _eval,
// eoPopEvalFunc < MOEOT > & _popEval,
moeoArchive < MOEOT > & _archive, moeoArchive < MOEOT > & _archive,
moeoPopNeighborhoodExplorer < Move > & _explorer 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 //mise à jour de la pop ou archive
archive(tmp_pop); archive(tmp_pop);
} }
while(continuator(tmp_pop) && naturalContinuator(archive)); while(continuator(archive) && naturalContinuator(archive));
std::cout << "Final archive\n"; std::cout << "Final archive\n";
archive.sortedPrintOn(std::cout); archive.sortedPrintOn(std::cout);
@ -124,7 +124,6 @@ protected:
// } // }
// dummyEval; // dummyEval;
eoEvalFunc < MOEOT > & full_evaluation;
eoPopLoopEval < MOEOT > loopEval; eoPopLoopEval < MOEOT > loopEval;
eoPopEvalFunc < MOEOT > & popEval; eoPopEvalFunc < MOEOT > & popEval;