nojhan/paradiseo
Watch
1
0
Fork
You've already forked paradiseo
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update doc and sort files

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@211 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
liefooga 2007-04-12 08:26:52 +00:00
commit db21384417
17 changed files with 620 additions and 546 deletions
Download patch file Download diff file Expand all files Collapse all files

12
branches/paradiseo-moeo-1.0/src/moeoHybridLS.h
View file

@ -15,8 +15,8 @@
#include <eoContinue.h>
#include <eoPop.h>
#include <eoUpdater.h>
#include <eoSelect.h>
#include <utils/eoUpdater.h>
#include <moeoArchive.h>
#include <moeoLS.h>
@ -36,15 +36,17 @@ public:
* @param _mols a multi-objective local search
* @param _arch the archive
*/
eoHybridLS (eoContinue < MOEOT > & _term, eoSelect < MOEOT > & _select, moeoLS < MOEOT > & _mols, moeoArchive < MOEOT > & _arch) : term(_term), select(_select), mols(_mols), arch(_arch)
moeoHybridLS (eoContinue < MOEOT > & _term, eoSelect < MOEOT > & _select, moeoLS < MOEOT, MOEOT > & _mols, moeoArchive < MOEOT > & _arch) :
term(_term), select(_select), mols(_mols), arch(_arch)
{}
/**
* Applies the multi-objective local search to selected individuals contained in the archive if the stopping criteria is not verified
*/
void operator () ()
{
if (! cont (arch))
if (! term (arch))
{
// selection of solutions
eoPop < MOEOT > selectedSolutions;
@ -60,12 +62,12 @@ public:
private:
/** stopping criteria*/
/** stopping criteria */
eoContinue < MOEOT > & term;
/** selector */
eoSelect < MOEOT > & select;
/** multi-objective local search */
moeoLS < MOEOT > & mols;
moeoLS < MOEOT, MOEOT > & mols;
/** archive */
moeoArchive < MOEOT > & arch;