diff --git a/trunk/paradiseo-mo/src/continuator/moTimeContinuator.h b/trunk/paradiseo-mo/src/continuator/moTimeContinuator.h index cfe1ce9ee..e7a8ff3d2 100644 --- a/trunk/paradiseo-mo/src/continuator/moTimeContinuator.h +++ b/trunk/paradiseo-mo/src/continuator/moTimeContinuator.h @@ -47,7 +47,7 @@ public: * @param _max maximum running time * @param _verbose verbose mode true/false -> on/off */ - moTimeContinuator(time_t _max, bool _verbose=true): max(_max), verbose(_verbose) { + moTimeContinuator(time_t _max, bool _verbose = true): max(_max), verbose(_verbose) { external = false; start = time(NULL); } @@ -72,6 +72,16 @@ public: } + /** + * To set the maximum running time + * + * @param _maxTime maximum running time + */ + virtual void maxTime(time_t _maxTime) { + max = _maxTime + } + + /** * Returns false when the running time is reached. * @param _sol the current solution diff --git a/trunk/paradiseo-mo/src/continuator/moVectorMonitor.h b/trunk/paradiseo-mo/src/continuator/moVectorMonitor.h index b762ded7a..b04eb8adf 100644 --- a/trunk/paradiseo-mo/src/continuator/moVectorMonitor.h +++ b/trunk/paradiseo-mo/src/continuator/moVectorMonitor.h @@ -115,15 +115,14 @@ public: * @return this monitor (sorry I don't why, but it is like this in EO) */ eoMonitor& operator()(void) { - if (doubleParam != NULL) - valueVec.push_back(doubleParam->value()); - else - if (intParam != NULL) - valueVec.push_back((double) intParam->value()); - else - eotVec.push_back(eotParam->value()); - - return *this ; + if (doubleParam != NULL) + valueVec.push_back(doubleParam->value()); + else + if (intParam != NULL) + valueVec.push_back((double) intParam->value()); + else + eotVec.push_back(eotParam->value()); + return *this ; } /** diff --git a/trunk/paradiseo-mo/src/mo.h b/trunk/paradiseo-mo/src/mo.h index 950dd05b0..10a9b362c 100755 --- a/trunk/paradiseo-mo/src/mo.h +++ b/trunk/paradiseo-mo/src/mo.h @@ -103,6 +103,7 @@ #include #include #include +#include #include #include @@ -139,6 +140,7 @@ #include #include #include +#include #include #include