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

documentation modifications

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@178 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
liefooga 2007-02-06 16:35:01 +00:00
commit 4b45aadd5d
16 changed files with 76 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

26
branches/paradiseo-moeo-1.0/src/moeoCombinedLS.h
View file

@ -19,27 +19,30 @@
/**
* This class allows to embed a set of local searches that are sequentially applied,
* and so working and updating the same archive of non-dominated solutions
* and so working and updating the same archive of non-dominated solutions.
*/
template < class MOEOT >
class moeoCombinedLS : public moeoLS < MOEOT > {
class moeoCombinedLS : public moeoLS < MOEOT >
{
public:
/**
* Ctor
* @param _eval the full evaluator of a solution
* @param _first_ls the first multi-objective local search to add
* @param _first_mols the first multi-objective local search to add
*/
moeoCombinedLS(moeoEvalFunc < MOEOT > & _eval, moeoLS < MOEOT > & _first_ls) : eval (_eval) {
combinedLS.push_back (& _first_ls);
moeoCombinedLS(moeoEvalFunc < MOEOT > & _eval, moeoLS < MOEOT > & _first_mols) : eval (_eval)
{
combinedLS.push_back (& _first_mols);
}
/**
* Adds a new local search to combine
* @param _ls the multi-objective local search to add
* @param _mols the multi-objective local search to add
*/
void add(moeoLS < MOEOT > & _ls) {
combinedMOLS.push_back(& _ls);
void add(moeoLS < MOEOT > & _mols)
{
combinedMOLS.push_back(& _mols);
}
/**
@ -48,10 +51,11 @@ public:
* @param _eo the solution
* @param _arch the archive of non-dominated solutions
*/
void operator () (const MOEOT & _eo, moeoArchive < MOEOT > & _arch) {
eval(const_cast < MOEOT & > (_eo));
void operator () (const MOEOT & _moeo, moeoArchive < MOEOT > & _arch)
{
eval(const_cast < MOEOT & > (_moeo));
for (unsigned i=0; i<combinedLS.size(); i++)
combinedLS[i] -> operator()(_eo, _arch);
combinedLS[i] -> operator()(_moeo, _arch);
}