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

Ajout des dummeLS et dummyExplorer. Travaux en cours sur RndRndFC

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1793 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
verel 2010-05-06 18:31:22 +00:00
commit 85fa0b461f
11 changed files with 299 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -65,7 +65,7 @@ public:
* @param _monitoring the statistic is saved into the monitor if true
*/
template <class ValueType>
moSampling(eoInit<EOT> & _init, moLocalSearch<Neighbor> & _localSearch, moStat<EOT,ValueType> & _stat, bool _monitoring = true) : 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, _monitoring);
@ -93,7 +93,7 @@ public:
checkpoint->add(_stat);
if (_monitoring) {
moVectorMonitor<EOT> * monitor = new moVectorMonitor<EOT>(_stat);
moVectorMonitor<EOT> * monitor = new moVectorMonitor<EOT>(_stat); // attention fuite memoire a la descruction !
monitorVec.push_back(monitor);
checkpoint->add(*monitor);
}
@ -109,7 +109,7 @@ public:
monitorVec[i]->clear();
// change the checkpoint to compute the statistics
localSearch.setContinuator(*checkpoint);
localSearch->setContinuator(*checkpoint);
// the initial solution
EOT solution;
@ -117,11 +117,13 @@ public:
// initialisation of the solution
init(solution);
std::cout << localSearch->className() << std::endl;
// compute the sampling
localSearch(solution);
(*localSearch)(solution);
// set back to initial continuator
localSearch.setContinuator(*continuator);
localSearch->setContinuator(*continuator);
}
/**
@ -180,7 +182,7 @@ public:
protected:
eoInit<EOT> & init;
moLocalSearch<Neighbor> & localSearch;
moLocalSearch<Neighbor> * localSearch;
moContinuator<Neighbor> * continuator;
moCheckpoint<Neighbor> * checkpoint;