Modifications 22/02/2007
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@183 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
parent
dccd731ad3
commit
8312d91a84
19 changed files with 930 additions and 805 deletions
|
|
@ -19,53 +19,53 @@
|
|||
|
||||
/**
|
||||
* 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 >
|
||||
template < class MOEOT > class moeoCombinedLS:public moeoLS < MOEOT >
|
||||
{
|
||||
public:
|
||||
|
||||
|
||||
/**
|
||||
* Ctor
|
||||
* @param _eval the full evaluator of a solution
|
||||
* @param _first_mols the first multi-objective local search to add
|
||||
* @param _first_ls the first multi-objective local search to add
|
||||
*/
|
||||
moeoCombinedLS(moeoEvalFunc < MOEOT > & _eval, moeoLS < MOEOT > & _first_mols) : eval (_eval)
|
||||
{
|
||||
combinedLS.push_back (& _first_mols);
|
||||
}
|
||||
|
||||
moeoCombinedLS (moeoEvalFunc < MOEOT > &_eval, moeoLS < MOEOT > &_first_ls):eval
|
||||
(_eval)
|
||||
{
|
||||
combinedLS.push_back (&_first_ls);
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds a new local search to combine
|
||||
* @param _mols the multi-objective local search to add
|
||||
* @param _ls the multi-objective local search to add
|
||||
*/
|
||||
void add(moeoLS < MOEOT > & _mols)
|
||||
{
|
||||
combinedMOLS.push_back(& _mols);
|
||||
}
|
||||
|
||||
void add (moeoLS < MOEOT > &_ls)
|
||||
{
|
||||
combinedMOLS.push_back (&_ls);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gives a new solution in order to explore the neigborhood.
|
||||
* The new non-dominated solutions are added to the archive
|
||||
* @param _moeo the solution
|
||||
* @param _eo the solution
|
||||
* @param _arch the archive of non-dominated solutions
|
||||
*/
|
||||
void operator () (const MOEOT & _moeo, moeoArchive < MOEOT > & _arch)
|
||||
{
|
||||
eval(const_cast < MOEOT & > (_moeo));
|
||||
for (unsigned i=0; i<combinedLS.size(); i++)
|
||||
combinedLS[i] -> operator()(_moeo, _arch);
|
||||
}
|
||||
void operator () (const MOEOT & _eo, moeoArchive < MOEOT > &_arch)
|
||||
{
|
||||
eval (const_cast < MOEOT & >(_eo));
|
||||
for (unsigned i = 0; i < combinedLS.size (); i++)
|
||||
combinedLS[i]->operator ()(_eo, _arch);
|
||||
}
|
||||
|
||||
|
||||
private:
|
||||
|
||||
/** the full evaluator of a solution */
|
||||
moeoEvalFunc < MOEOT > & eval;
|
||||
moeoEvalFunc < MOEOT > &eval;
|
||||
/** the vector that contains the combined LS */
|
||||
std::vector< moeoLS < MOEOT > * > combinedLS;
|
||||
std::vector < moeoLS < MOEOT > *>combinedLS;
|
||||
|
||||
};
|
||||
|
||||
#endif /*MOEOCOMBINEDLS_H_*/
|
||||
#endif /*MOEOCOMBINEDLS_H_ */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue