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

Browse source
This commit is contained in:
jhumeau 2009-02-19 15:32:42 +00:00
commit db66347fb1
6 changed files with 150 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

40
contribution/branches/MOLS/src/moeoAllSolAllNeighborsExpl.h
View file

@ -59,26 +59,30 @@ public:
moeoAllSolAllNeighborsExpl( moeoAllSolAllNeighborsExpl(
moMoveInit < Move > & _moveInit, moMoveInit < Move > & _moveInit,
moNextMove < Move > & _nextMove, moNextMove < Move > & _nextMove,
eoEvalFunc < MOEOT > & _eval moMoveIncrEval < Move, ObjectiveVector > & _incrEval)
): moveInit(_moveInit), nextMove(_nextMove), eval(_eval){} : moveInit(_moveInit), nextMove(_nextMove), incrEval(_incrEval){}
void operator()(eoPop < MOEOT > & _src, eoPop < MOEOT > & _dest){ void operator()(eoPop < MOEOT > & _src, eoPop < MOEOT > & _dest)
{
Move move; Move move;
MOEOT * sol;
ObjectiveVector objVec; ObjectiveVector objVec;
for(unsigned int i=0; i<_src.size(); i++)
for(unsigned int i=0; i<_src.size(); i++){ {
if (_src[i].flag() == 0){ if (_src[i].flag() == 0)
{
moveInit(move, _src[i]); moveInit(move, _src[i]);
do{ do
_dest.push_back(_src[i]); {
sol = & _dest.back(); objVec = moveIncrEval(move, _src[i]);
//objVec = moveIncrEval(move, *sol); if (! comparator (objVec, _src[i].objectiveVector()))
move(*sol); {
sol->invalidate(); if (objVec != _src[i].objectiveVector())
eval(*sol); {
//sol->objectiveVector(objVec); _dest.push_back(_src[i]);
//if (comparator(sol, _src[i])) move(_dest.back());
_dest.back().objectiveVector(objVec);
}
}
} }
while(nextMove(move, _src[i])); while(nextMove(move, _src[i]));
_src[i].flag(1); _src[i].flag(1);
@ -92,7 +96,9 @@ private:
/** the neighborhood explorer */ /** the neighborhood explorer */
moNextMove < Move > & nextMove; moNextMove < Move > & nextMove;
/** the incremental evaluation */ /** the incremental evaluation */
eoEvalFunc < MOEOT > & eval; moMoveIncrEval < Move, ObjectiveVector > & incrEval;
/** comparator */
moeoParetoObjectiveVectorComparator<ObjectiveVector> comparator;
}; };

8
contribution/branches/MOLS/src/moeoAllSolOneNeighborExpl.h
View file

@ -60,8 +60,8 @@ public:
moeoAllSolOneNeighborExpl( moeoAllSolOneNeighborExpl(
moMoveInit < Move > & _moveInit, moMoveInit < Move > & _moveInit,
moNextMove < Move > & _nextMove, moNextMove < Move > & _nextMove,
eoEvalFunc < MOEOT > & _eval moMoveIncrEval < Move, ObjectiveVector > & _incrEval)
): moveInit(_moveInit), nextMove(_nextMove), eval(_eval){} : moveInit(_moveInit), nextMove(_nextMove), incrEval(_incrEval){}
void operator()(eoPop < MOEOT > & _src, eoPop < MOEOT > & _dest){ void operator()(eoPop < MOEOT > & _src, eoPop < MOEOT > & _dest){
//Move move; //Move move;
@ -160,6 +160,10 @@ private:
moNextMove < Move > & nextMove; moNextMove < Move > & nextMove;
/** the incremental evaluation */ /** the incremental evaluation */
eoEvalFunc < MOEOT > & eval; eoEvalFunc < MOEOT > & eval;
/** the incremental evaluation */
moMoveIncrEval < Move, ObjectiveVector > & incrEval;
/** comparator */
moeoParetoObjectiveVectorComparator<ObjectiveVector> comparator;
}; };

38
contribution/branches/MOLS/src/moeoOneSolAllNeighborsExpl.h
View file

@ -57,29 +57,31 @@ class moeoOneSolAllNeighborsExpl : public moeoPopNeighborhoodExplorer < Move >
public: public:
moeoOneSolAllNeighborsExpl( moeoOneSolAllNeighborsExpl(
moMoveInit < Move > & _moveInit, moMoveInit < Move > & _moveInit,
moNextMove < Move > & _nextMove, moNextMove < Move > & _nextMove,
eoEvalFunc < MOEOT > & _eval moMoveIncrEval < Move, ObjectiveVector > & _incrEval)
): moveInit(_moveInit), nextMove(_nextMove), eval(_eval){} : moveInit(_moveInit), nextMove(_nextMove), incrEval(_incrEval){}
void operator()(eoPop < MOEOT > & _src, eoPop < MOEOT > & _dest){ void operator()(eoPop < MOEOT > & _src, eoPop < MOEOT > & _dest)
{
Move move; Move move;
MOEOT * sol;
ObjectiveVector objVec; ObjectiveVector objVec;
unsigned int i = 0; unsigned int i = 0;
while(_src[i].flag() != 0) while(_src[i].flag() != 0)
i++; i++;
moveInit(move, _src[i]); moveInit(move, _src[i]);
do{ do
_dest.push_back(_src[i]); {
sol = & _dest.back(); objVec = moveIncrEval(move, _src[i]);
//objVec = moveIncrEval(move, *sol); if (! comparator (objVec, _src[i].objectiveVector()))
move(*sol); {
sol->invalidate(); if (objVec != _src[i].objectiveVector())
eval(*sol); {
//sol->objectiveVector(objVec); _dest.push_back(_src[i]);
//if (comparator(sol, _src[i])) move(_dest.back());
_dest.back().objectiveVector(objVec);
}
}
} }
while(nextMove(move, _src[i])); while(nextMove(move, _src[i]));
_src[i].flag(1); _src[i].flag(1);
@ -91,7 +93,9 @@ private:
/** the neighborhood explorer */ /** the neighborhood explorer */
moNextMove < Move > & nextMove; moNextMove < Move > & nextMove;
/** the incremental evaluation */ /** the incremental evaluation */
eoEvalFunc < MOEOT > & eval; moMoveIncrEval < Move, ObjectiveVector > & incrEval;
/** comparator */
moeoParetoObjectiveVectorComparator<ObjectiveVector> comparator;
}; };

112
contribution/branches/MOLS/src/moeoOneSolOneNeighborExpl.h
View file

@ -59,47 +59,60 @@ public:
moeoOneSolOneNeighborExpl( moeoOneSolOneNeighborExpl(
moMoveInit < Move > & _moveInit, moMoveInit < Move > & _moveInit,
moNextMove < Move > & _nextMove, moNextMove < Move > & _nextMove,
eoEvalFunc < MOEOT > & _eval moMoveIncrEval < Move, ObjectiveVector > & _incrEval)
):start(false), moveInit(_moveInit), nextMove(_nextMove), eval(_eval){} : moveInit(_moveInit), nextMove(_nextMove), incrEval(_incrEval){}
void operator()(eoPop < MOEOT > & _src, eoPop < MOEOT > & _dest){ void operator()(eoPop < MOEOT > & _src, eoPop < MOEOT > & _dest)
//Move move; {
MOEOT * sol;
ObjectiveVector objVec; ObjectiveVector objVec;
unsigned int i = 0; unsigned int i = 0;
while(_src[i].flag() != 0) // setting _src[i]
i++; if(!start)
if(!start){ {
while(_src[i].flag() != 0)
i++;
moveInit(move, _src[i]); moveInit(move, _src[i]);
_dest.push_back(_src[i]); _src[i].flag()=-1;
sol = & _dest.back(); }
move(*sol); else
sol->invalidate(); {
eval(*sol); while( (i < _src.size()) && (_src[i].flag() != -1) )
if(nextMove(move, _src[i])) i++;
start=true; if(_src[i].flag() != -1)
else{ {
start=false; i=0;
_src[i].flag(1); while(_src[i].flag() != 0)
i++;
moveInit(move, _src[i]);
_src[i].flag()=-1;
} }
} }
else{ // ttt
_dest.push_back(_src[i]); objVec = moveIncrEval(move, _src[i]);
sol = & _dest.back(); if (! comparator (objVec, _src[i].objectiveVector()))
//objVec = moveIncrEval(move, *sol); {
move(*sol); if (objVec != _src[i].objectiveVector())
sol->invalidate(); {
eval(*sol); _dest.push_back(_src[i]);
//sol->objectiveVector(objVec); move(_dest.back());
//if (comparator(sol, _src[i])) _dest.back().objectiveVector(objVec);
if(!nextMove(move, _src[i])){
start=false;
_src[i].flag(1);
} }
} }
// preparing the next iteration
if(nextMove(move, _src[i]))
{
start=true;
}
else
{
start=false;
_src[i].flag(1);
}
} }
private: private:
Move move; Move move;
bool start; bool start;
@ -108,7 +121,42 @@ private:
/** the neighborhood explorer */ /** the neighborhood explorer */
moNextMove < Move > & nextMove; moNextMove < Move > & nextMove;
/** the incremental evaluation */ /** the incremental evaluation */
eoEvalFunc < MOEOT > & eval; moMoveIncrEval < Move, ObjectiveVector > & incrEval;
/** comparator */
moeoParetoObjectiveVectorComparator<ObjectiveVector> comparator;
// if(!start){
// moveInit(move, _src[i]);
// _dest.push_back(_src[i]);
// sol = & _dest.back();
// move(*sol);
// sol->invalidate();
// eval(*sol);
// if(nextMove(move, _src[i]))
// start=true;
// else{
// start=false;
// _src[i].flag(1);
// }
// }
// else{
// _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]))
// if(!nextMove(move, _src[i])){
// start=false;
// _src[i].flag(1);
// }
// }
// }
}; };

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

@ -57,18 +57,11 @@ public:
moeoUnifiedDominanceBasedLS( moeoUnifiedDominanceBasedLS(
eoContinue < MOEOT > & _continuator, eoContinue < MOEOT > & _continuator,
//moeoContinue < MOEOT > & _naturalContinuator,
eoEvalFunc < MOEOT > & _full_evaluation, eoEvalFunc < MOEOT > & _full_evaluation,
eoPopEvalFunc < MOEOT > & _popEval, // eoPopEvalFunc < MOEOT > & _popEval,
moeoArchive < MOEOT > & _archive, moeoArchive < MOEOT > & _archive,
moeoPopNeighborhoodExplorer < Move > & _explorer moeoPopNeighborhoodExplorer < Move > & _explorer
):continuator(_continuator), naturalContinuator(defaultContinuator), full_evaluation(_full_evaluation), popEval(_popEval), archive(_archive), explorer(_explorer) ):continuator(_continuator), full_evaluation(_full_evaluation), popEval(full_evaluation), archive(_archive), explorer(_explorer)
{}
moeoUnifiedDominanceBasedLS(
eoContinue < MOEOT > & _continuator,
moeoPopNeighborhoodExplorer < Move > & _explorer
):continuator(_continuator), naturalContinuator(defaultContinuator), full_evaluation(dummyEval),loopEval(dummyEval), popEval(loopEval), archive(defaultArchive), explorer(_explorer)
{} {}
/** /**
@ -117,25 +110,25 @@ protected:
std::cout << res << std::endl; std::cout << res << std::endl;
return res; return res;
} }
}; } naturalContinuator;
moeoContinue < MOEOT > defaultContinuator; // moeoContinue < MOEOT > defaultContinuator;
moeoContinue < MOEOT > & naturalContinuator; // moeoContinue < MOEOT > & naturalContinuator;
/** a dummy eval */ /** a dummy eval */
class eoDummyEval : public eoEvalFunc < MOEOT > // class eoDummyEval : public eoEvalFunc < MOEOT >
{ // {
public: // public:
void operator()(MOEOT &) {} // void operator()(MOEOT &) {}
} // }
dummyEval; // dummyEval;
eoEvalFunc < MOEOT > & full_evaluation; eoEvalFunc < MOEOT > & full_evaluation;
eoPopLoopEval < MOEOT > loopEval; eoPopLoopEval < MOEOT > loopEval;
eoPopEvalFunc < MOEOT > & popEval; eoPopEvalFunc < MOEOT > & popEval;
moeoUnboundedArchive < MOEOT > defaultArchive; // moeoUnboundedArchive < MOEOT > defaultArchive;
moeoArchive < MOEOT > & archive; moeoArchive < MOEOT > & archive;
moeoPopNeighborhoodExplorer < Move > & explorer; moeoPopNeighborhoodExplorer < Move > & explorer;

3
contribution/branches/MOLS/test/t-moeoUnifiedDominanceBasedLS.cpp
View file

@ -4,6 +4,7 @@
#include <moeoAllSolAllNeighborsExpl.h> #include <moeoAllSolAllNeighborsExpl.h>
#include <moeoOneSolAllNeighborsExpl.h> #include <moeoOneSolAllNeighborsExpl.h>
#include <moeoOneSolOneNeighborExpl.h> #include <moeoOneSolOneNeighborExpl.h>
#include <moeoAllSolOneNeighborExpl.h>
#include <moeoPopLS.h> #include <moeoPopLS.h>
#include <moeoUnifiedDominanceBasedLS.h> #include <moeoUnifiedDominanceBasedLS.h>
#include <moMove.h> #include <moMove.h>
@ -36,7 +37,7 @@ int main(int argc, char* argv[])
eoPop<FlowShop>& pop = do_make_pop(parser, state, init); eoPop<FlowShop>& pop = do_make_pop(parser, state, init);
eoTimeContinue < FlowShop > continuator(10000000); eoTimeContinue < FlowShop > continuator(10000000);
moeoOneSolOneNeighborExpl < ExchangeMove > explorer(moveInit,moveNext, eval); moeoAllSolOneNeighborExpl < ExchangeMove > explorer(moveInit,moveNext, eval);
// //
moeoUnifiedDominanceBasedLS < ExchangeMove > algo(continuator, explorer); moeoUnifiedDominanceBasedLS < ExchangeMove > algo(continuator, explorer);