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

Add the moUpdater to the moCheckpoint

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2550 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
verel 2011-12-06 14:49:31 +00:00
commit 884f48642b
1 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

22
trunk/paradiseo-mo/src/continuator/moCheckpoint.h
View file

@ -39,6 +39,7 @@
#include <utils/eoMonitor.h> #include <utils/eoMonitor.h>
#include <continuator/moStatBase.h> #include <continuator/moStatBase.h>
#include <utils/eoUpdater.h> #include <utils/eoUpdater.h>
#include <continuator/moUpdater.h>
#include <neighborhood/moNeighborhood.h> #include <neighborhood/moNeighborhood.h>
/** /**
@ -56,7 +57,7 @@ public :
* @param _interval frequency to compute statistical operators * @param _interval frequency to compute statistical operators
*/ */
moCheckpoint(moContinuator<Neighbor>& _cont, unsigned int _interval=1):interval(_interval), counter(0) { moCheckpoint(moContinuator<Neighbor>& _cont, unsigned int _interval=1):interval(_interval), counter(0) {
continuators.push_back(&_cont); continuators.push_back(&_cont);
} }
/** /**
@ -91,6 +92,14 @@ public :
updaters.push_back(&_upd); updaters.push_back(&_upd);
} }
/**
* add a MO updater to the checkpoint
* @param _moupd an mo updater
*/
void add(eoUpdater& _moupd) {
moupdaters.push_back(&_moupd);
}
/** /**
* init all continuators containing in the checkpoint regarding a solution * init all continuators containing in the checkpoint regarding a solution
* @param _sol the corresponding solution * @param _sol the corresponding solution
@ -100,6 +109,9 @@ public :
stats[i]->init(_sol); stats[i]->init(_sol);
counter=1; counter=1;
for (unsigned i = 0; i < moupdaters.size(); ++i)
moupdaters[i]->init();
for (unsigned int i = 0; i < monitors.size(); ++i) for (unsigned int i = 0; i < monitors.size(); ++i)
(*monitors[i])(); (*monitors[i])();
@ -132,6 +144,9 @@ public :
for (i = 0; i < updaters.size(); ++i) for (i = 0; i < updaters.size(); ++i)
(*updaters[i])(); (*updaters[i])();
for (i = 0; i < moupdaters.size(); ++i)
(*moupdaters[i])();
for (i = 0; i < monitors.size(); ++i) for (i = 0; i < monitors.size(); ++i)
(*monitors[i])(); (*monitors[i])();
@ -154,6 +169,9 @@ public :
for (i = 0; i < updaters.size(); ++i) for (i = 0; i < updaters.size(); ++i)
updaters[i]->lastCall(); updaters[i]->lastCall();
for (i = 0; i < moupdaters.size(); ++i)
moupdaters[i]->lastCall();
for (i = 0; i < monitors.size(); ++i) for (i = 0; i < monitors.size(); ++i)
monitors[i]->lastCall(); monitors[i]->lastCall();
} }
@ -167,6 +185,8 @@ private :
std::vector<eoMonitor*> monitors; std::vector<eoMonitor*> monitors;
/** updaters vector */ /** updaters vector */
std::vector<eoUpdater*> updaters; std::vector<eoUpdater*> updaters;
/** MO updaters vector */
std::vector<moUpdater*> moupdaters;
unsigned int interval; unsigned int interval;
unsigned int counter; unsigned int counter;