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

Ajout de la statistique distance pour pouvoir calculer le FDC

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1686 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
verel 2010-02-19 17:11:20 +00:00
commit e25dcd2f8f
2 changed files with 81 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
branches/newMo/tutorial/oneMax/application/testRandomWalk.cpp
View file

@ -36,6 +36,8 @@ using namespace std;
#include <continuator/moCheckpoint.h>
#include <continuator/moFitnessStat.h>
#include <continuator/moSolutionStat.h>
#include <utils/eoDistance.h>
#include <continuator/moDistanceStat.h>
#include <utils/eoFileMonitor.h>
@ -160,19 +162,24 @@ void main_function(int argc, char **argv)
moTrueContinuator<Neighborhood> continuator;//always continue
moFitnessStat<Indi, unsigned> fStat;
moSolutionStat<Indi> solStat;
eoHammingDistance<Indi> distance;
Indi bestSolution(vecSize, true);
moDistanceStat<Indi, unsigned> distStat(distance, bestSolution);
// moSolutionStat<Indi> solStat;
moCheckpoint<Neighborhood> checkpoint(continuator);
eoFileMonitor outputfile("out.dat", " ");
checkpoint.add(outputfile);
checkpoint.add(fStat);
checkpoint.add(solStat);
checkpoint.add(distStat);
// checkpoint.add(solStat);
eoValueParam<unsigned int> genCounter(-1,"Gen");
eoIncrementor<unsigned int> increm(genCounter.value());
checkpoint.add(increm);
outputfile.add(genCounter);
outputfile.add(fStat);
outputfile.add(solStat);
outputfile.add(distStat);
// outputfile.add(solStat);
moLocalSearch< moRandomWalkExplorer<Neighborhood> > localSearch(explorer, checkpoint, eval);