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

Ajout du neutral degree, et correction Royal Road

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1790 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
verel 2010-05-06 15:13:51 +00:00
commit 1f66526f43
12 changed files with 409 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
trunk/paradiseo-mo/src/sampling/moSampling.h
View file

@ -64,10 +64,10 @@ public:
* @param _stat statistic to compute during the search
*/
template <class ValueType>
moSampling(eoInit<EOT> & _init, moLocalSearch<Neighbor> & _localSearch, moStat<EOT,ValueType> & _stat) : init(_init), localSearch(_localSearch), continuator(_localSearch.getContinuator())
moSampling(eoInit<EOT> & _init, moLocalSearch<Neighbor> & _localSearch, moStat<EOT,ValueType> & _stat, bool _monitoring = true) : init(_init), localSearch(_localSearch), continuator(_localSearch.getContinuator())
{
checkpoint = new moCheckpoint<Neighbor>(*continuator);
add(_stat);
add(_stat, _monitoring);
}
/**
@ -87,14 +87,14 @@ public:
* @param _stat another statistic to compute during the search
*/
template< class ValueType >
void add(moStat<EOT, ValueType> & _stat) {
// statVec.push_back(&_stat);
moVectorMonitor<EOT> * monitor = new moVectorMonitor<EOT>(_stat);
monitorVec.push_back(monitor);
void add(moStat<EOT, ValueType> & _stat, bool _monitoring = true) {
checkpoint->add(_stat);
checkpoint->add(*monitor);
if (_monitoring) {
moVectorMonitor<EOT> * monitor = new moVectorMonitor<EOT>(_stat);
monitorVec.push_back(monitor);
checkpoint->add(*monitor);
}
}
/**