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

Add the number of neighbor evaluations in moAdaptiveWalk

Browse source
This commit is contained in:
verel 2014-10-18 16:15:49 +02:00
commit a3288caf6d
5 changed files with 151 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

19
mo/src/continuator/moValueStat.h
View file

@ -45,12 +45,15 @@ template <class EOT, class ValueType>
class moValueStat : public moStat<EOT, double>
{
public :
using moStat< EOT, double>::value;
using moStat<EOT, double>::value;
/**
* Default Constructor
*
* @param _valueParam the value to report in the statistic
* @param _restart if true, the value is initialized at 0 for each init (restart)
*/
moValueStat(eoValueParam<ValueType> & _valueParam): moStat<EOT, double>(0, "value"), valueParam(_valueParam) {
moValueStat(eoValueParam<ValueType> & _valueParam, bool _restart = false): moStat<EOT, double>(0, "value"), valueParam(_valueParam), restart(_restart) {
}
/**
@ -58,7 +61,12 @@ public :
* @param _sol a solution
*/
virtual void init(EOT & _sol) {
value() = (double) valueParam.value();
if (restart)
value_start = valueParam.value();
else
value_start = 0;
value() = (double) (valueParam.value() - value_start);
}
/**
@ -66,7 +74,7 @@ public :
* @param _sol a solution
*/
virtual void operator()(EOT & _sol) {
value() = (double) valueParam.value() ;
value() = (double) (valueParam.value() - value_start);
}
/**
@ -79,6 +87,9 @@ public :
private:
eoValueParam<ValueType> & valueParam;
bool restart;
ValueType value_start ;
};
#endif