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

moVectorMonitor peut enregistrer les EOT

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1779 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
verel 2010-05-05 08:33:04 +00:00
commit 29fe6eed3d
5 changed files with 77 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -90,7 +90,7 @@ public:
void add(moStat<EOT, ValueType> & _stat) {
// statVec.push_back(&_stat);
moVectorMonitor * monitor = new moVectorMonitor(_stat);
moVectorMonitor<EOT> * monitor = new moVectorMonitor<EOT>(_stat);
monitorVec.push_back(monitor);
checkpoint->add(_stat);
@ -140,14 +140,11 @@ public:
unsigned vecSize = monitorVec[0]->size();
for(unsigned int i = 0; i < vecSize; i++) {
std::vector<moVectorMonitor*>::iterator it = monitorVec.begin();
os << (*it)->getValue(i);
os << monitorVec[0]->getValue(i);
for(++it; it != monitorVec.end(); ++it)
{
os << _delim.c_str() << (*it)->getValue(i);
}
for(unsigned int j = 1; j < monitorVec.size(); j++) {
os << _delim.c_str() << monitorVec[j]->getValue(i);
}
os << std::endl ;
}
@ -159,8 +156,17 @@ public:
* @param _numStat number of stattistics to get (in order of creation)
* @return the vector of value (all values are converted in double)
*/
const std::vector<double> & getVector(unsigned int _numStat) {
return monitorVec[_numStat]->getVector();
const std::vector<double> & getValues(unsigned int _numStat) {
return monitorVec[_numStat]->getValues();
}
/**
* to get one vector of solutions values
* @param _numStat number of stattistics to get (in order of creation)
* @return the vector of value (all values are converted in double)
*/
const std::vector<EOT> & getSolutions(unsigned int _numStat) {
return monitorVec[_numStat]->getSolutions();
}
/**
@ -178,7 +184,7 @@ protected:
moCheckpoint<Neighbor> * checkpoint;
// std::vector<moStatBase<EOT>*> statVec;
std::vector<moVectorMonitor*> monitorVec;
std::vector< moVectorMonitor<EOT> *> monitorVec;
};