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@1405 331e1502-861f-0410-8da2-ba01fb791d7f

Browse source
This commit is contained in:
jhumeau 2009-02-06 09:32:07 +00:00
commit 37cff602fb
2 changed files with 110 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

100
contribution/branches/MOLS/src/moeoAllSolAllNeighborsExpl.h Executable file
View file

@ -0,0 +1,100 @@
/*
* <moeoAllSolAllNeighborsExpl.h>
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2008
* (C) OPAC Team, LIFL, 2002-2008
*
* Arnaud Liefooghe
* Jérémie Humeau
*
* This software is governed by the CeCILL license under French law and
* abiding by the rules of distribution of free software. You can use,
* modify and/ or redistribute the software under the terms of the CeCILL
* license as circulated by CEA, CNRS and INRIA at the following URL
* "http://www.cecill.info".
*
* As a counterpart to the access to the source code and rights to copy,
* modify and redistribute granted by the license, users are provided only
* with a limited warranty and the software's author, the holder of the
* economic rights, and the successive licensors have only limited liability.
*
* In this respect, the user's attention is drawn to the risks associated
* with loading, using, modifying and/or developing or reproducing the
* software by the user in light of its specific status of free software,
* that may mean that it is complicated to manipulate, and that also
* therefore means that it is reserved for developers and experienced
* professionals having in-depth computer knowledge. Users are therefore
* encouraged to load and test the software's suitability as regards their
* requirements in conditions enabling the security of their systems and/or
* data to be ensured and, more generally, to use and operate it in the
* same conditions as regards security.
* The fact that you are presently reading this means that you have had
* knowledge of the CeCILL license and that you accept its terms.
*
* ParadisEO WebSite : http://paradiseo.gforge.inria.fr
* Contact: paradiseo-help@lists.gforge.inria.fr
*
*/
//-----------------------------------------------------------------------------
#ifndef _MOEOALLSOLALLNEIGHBOREXPL_H
#define _MOEOALLSOLALLNEIGHBOREXPL_H
#include <eo>
#include <moeo>
#include <moMove.h>
#include <moMoveInit.h>
#include <moNextMove.h>
#include <move/moeoMoveIncrEval.h>
/**
* TODO
*/
template < class Move >
class moeoAllSolAllNeighborsExpl : public moeoPopNeighborhoodExplorer < Move >
{
typedef typename Move::EOType MOEOT;
typedef typename MOEOT::ObjectiveVector ObjectiveVector;
public:
moeoAllSolAllNeighborsExpl(
moMoveInit < Move > & _moveInit,
moNextMove < Move > & _nextMove,
eoEvalFunc < MOEOT > & _eval
): moveInit(_moveInit), nextMove(_nextMove), eval(_eval){}
void operator()(eoPop < MOEOT > & _src, eoPop < MOEOT > & _dest){
Move move;
MOEOT * sol;
ObjectiveVector objVec;
for(unsigned int i=0; i<_src.size(); i++){
if (_src[i].flag() == 0){
moveInit(move, _src[i]);
do{
_dest.push_back(_src[i]);
sol = & _dest.back();
//objVec = moveIncrEval(move, *sol);
move(*sol);
sol->invalidate();
eval(*sol);
//sol->objectiveVector(objVec);
//if (comparator(sol, _src[i]))
}
while(nextMove(move, _src[i]));
_src[i].flag(1);
}
}
}
private:
/** the move initializer */
moMoveInit < Move > & moveInit;
/** the neighborhood explorer */
moNextMove < Move > & nextMove;
/** the incremental evaluation */
eoEvalFunc < MOEOT > & eval;
};
#endif /*_MOEOALLSOLALLNEIGHBOREXPL_H_*/

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

@ -66,8 +66,9 @@ public:
{}
moeoUnifiedDominanceBasedLS(
eoContinue < MOEOT > & _continuator
):continuator(_continuator), naturalContinuator(defaultContinuator), full_evaluation(dummyEval),loopEval(dummyEval), popEval(loopEval), archive(defaultArchive), explorer(defaultPerturb)
eoContinue < MOEOT > & _continuator,
moeoPopNeighborhoodExplorer < Move > & _explorer
):continuator(_continuator), naturalContinuator(defaultContinuator), full_evaluation(dummyEval),loopEval(dummyEval), popEval(loopEval), archive(defaultArchive), explorer(_explorer)
{}
/**
@ -76,18 +77,19 @@ public:
*/
virtual void operator()(eoPop < MOEOT > & _pop)
{
eoPop < MOEOT > empty_pop;
popEval(empty_pop, _pop);// A first eval of pop.
eoPop < MOEOT > tmp_pop;
popEval(tmp_pop, _pop);// A first eval of pop.
archive(_pop);
do{
tmp_pop.resize(0);
//"perturber" la population
explorer(archive, _pop);
explorer(archive, tmp_pop);
//mise à jour de la pop ou archive
archive(_pop);
archive(tmp_pop);
}
while(continuator(_pop) && naturalContinuator(archive));
while(continuator(tmp_pop) && naturalContinuator(archive));
}
protected:
@ -105,7 +107,7 @@ protected:
bool res = false;
unsigned int i=0;
while(!res && i < _pop.size()){
res = _pop[i].getFlag() == 0;
res = (_pop[i].flag() == 0);
i++;
}
return res;
@ -131,17 +133,6 @@ protected:
moeoUnboundedArchive < MOEOT > defaultArchive;
moeoArchive < MOEOT > & archive;
class moeoDummyPerturb : public moeoPopNeighborhoodExplorer < Move >
{
typedef typename Move::EOType MOEOT;
public:
moeoDummyPerturb(){}
void operator()(eoPop < MOEOT > & _pop1, eoPop < MOEOT > & _pop2){}
}
defaultPerturb;
moeoPopNeighborhoodExplorer < Move > & explorer;
};