diff --git a/eo/src/do/make_checkpoint.h b/eo/src/do/make_checkpoint.h index 94110188..f48a2d66 100644 --- a/eo/src/do/make_checkpoint.h +++ b/eo/src/do/make_checkpoint.h @@ -51,6 +51,7 @@ eoCheckPoint& do_make_checkpoint(eoParser& _parser, eoState& _state, eoEval ////////////////// // is nb Eval to be used as counter? eoValueParam& useEvalParam = _parser.createParam(true, "useEval", "Use nb of eval. as counter (vs nb of gen.)", '\0', "Output"); + eoValueParam& useTimeParam = _parser.createParam(true, "useTime", "Display time (s) every generation", '\0', "Output"); // Create anyway a generation-counter parameter eoValueParam *generationCounter = new eoValueParam(0, "Gen."); @@ -159,6 +160,13 @@ eoCheckPoint& do_make_checkpoint(eoParser& _parser, eoState& _state, eoEval monitor->add(*generationCounter); if (useEvalParam.value()) // we want nb of evaluations monitor->add(_eval); + if (useTimeParam.value()) // we want time + { + eoTimeCounter * tCounter = new eoTimeCounter; + _state.storeFunctor(tCounter); + checkpoint->add(*tCounter); + monitor->add(*tCounter); + } if (printBestParam.value()) { monitor->add(*bestStat); diff --git a/eo/src/do/make_continue.h b/eo/src/do/make_continue.h index 3531c619..5d36f3be 100644 --- a/eo/src/do/make_continue.h +++ b/eo/src/do/make_continue.h @@ -94,7 +94,7 @@ eoContinue & do_make_continue(eoParser& _parser, eoState& _state, eoEvalFu } // Same thing with Eval - but here default value is 0 - eoValueParam& maxEvalParam = _parser.createParam(unsigned(0), "maxEval", "Maximum number of evaluations (0 = none)",'E',"Stopping criterion"); + eoValueParam& maxEvalParam = _parser.createParam((unsigned long)0, "maxEval", "Maximum number of evaluations (0 = none)",'E',"Stopping criterion"); if (maxEvalParam.value()) // positive: -> define and store {