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

Add the precision of double in the ouput of moSampling and moMonitor

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2043 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
verel 2010-12-29 10:48:18 +00:00
commit b9d12d7f6d
2 changed files with 32 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/paradiseo-mo/src/continuator/moSolutionStat.h
View file

@ -53,7 +53,7 @@ public :
* @param _description a description of the parameter * @param _description a description of the parameter
*/ */
moSolutionStat(std::string _description = "solution"): moSolutionStat(std::string _description = "solution"):
moStat<EOT, EOT>(EOT(), _description) {} moStat<EOT, EOT>(EOT(), _description) { }
/** /**
* Initialization the solution by copy * Initialization the solution by copy

35
trunk/paradiseo-mo/src/continuator/moVectorMonitor.h
View file

@ -54,21 +54,30 @@ public:
* @param _param the parameter of type double to save in the vector * @param _param the parameter of type double to save in the vector
*/ */
moVectorMonitor(eoValueParam<double> & _param) : doubleParam(&_param), intParam(NULL), eotParam(NULL) moVectorMonitor(eoValueParam<double> & _param) : doubleParam(&_param), intParam(NULL), eotParam(NULL)
{ } {
// precision of the output by default
precisionOutput = std::cout.precision();
}
/** /**
* Default Constructor * Default Constructor
* @param _param the parameter of type unsigned int to save in the vector * @param _param the parameter of type unsigned int to save in the vector
*/ */
moVectorMonitor(eoValueParam<unsigned int> & _param) : doubleParam(NULL), intParam(&_param), eotParam(NULL) moVectorMonitor(eoValueParam<unsigned int> & _param) : doubleParam(NULL), intParam(&_param), eotParam(NULL)
{ } {
// precision of the output by default
precisionOutput = std::cout.precision();
}
/** /**
* Default Constructor * Default Constructor
* @param _param the parameter of type EOT to save in the vector * @param _param the parameter of type EOT to save in the vector
*/ */
moVectorMonitor(eoValueParam<EOT> & _param) : doubleParam(NULL), intParam(NULL), eotParam(&_param) moVectorMonitor(eoValueParam<EOT> & _param) : doubleParam(NULL), intParam(NULL), eotParam(&_param)
{ } {
// precision of the output by default
precisionOutput = std::cout.precision();
}
/** /**
* Default Constructor * Default Constructor
@ -76,7 +85,10 @@ public:
*/ */
template <class ScalarType, class Compare> template <class ScalarType, class Compare>
moVectorMonitor(eoValueParam<eoScalarFitness<ScalarType, Compare> > & _param) : doubleParam( & (eoValueParam<double>&)_param), intParam(NULL), eotParam(NULL) moVectorMonitor(eoValueParam<eoScalarFitness<ScalarType, Compare> > & _param) : doubleParam( & (eoValueParam<double>&)_param), intParam(NULL), eotParam(NULL)
{ } {
// precision of the output by default
precisionOutput = std::cout.precision();
}
/** /**
* Default Constructor * Default Constructor
@ -139,6 +151,9 @@ public:
std::string getValue(unsigned int i) const { std::string getValue(unsigned int i) const {
std::ostringstream os; std::ostringstream os;
// set the precision of the output
os.precision(precisionOutput);
if (eotParam == NULL) if (eotParam == NULL)
os << (valueVec[i]) ; os << (valueVec[i]) ;
else else
@ -166,6 +181,14 @@ public:
return eotVec.size(); return eotVec.size();
} }
/**
* to set the precision of the output file
* @param _precision precision of the output (number of digit)
*/
void precision(unsigned int _precision) {
precisionOutput = _precision;
}
/** /**
* to export the vector of values into one file * to export the vector of values into one file
* @param _filename file name * @param _filename file name
@ -209,6 +232,10 @@ protected:
std::vector<double> valueVec; std::vector<double> valueVec;
std::vector<EOT> eotVec; std::vector<EOT> eotVec;
// precision of the output
unsigned int precisionOutput;
}; };