diff --git a/branches/newMo/src/algo/moLocalSearch.h b/branches/newMo/src/algo/moLocalSearch.h index a8f06dc37..c28f8b927 100644 --- a/branches/newMo/src/algo/moLocalSearch.h +++ b/branches/newMo/src/algo/moLocalSearch.h @@ -65,34 +65,34 @@ public: if(_solution.invalid()) fullEval(_solution); - // initialization of the parameter of the search (for example fill empty the tabu list) - searchExplorer.initParam(_solution); + // initialization of the parameter of the search (for example fill empty the tabu list) + searchExplorer.initParam(_solution); - // initialization of the external continuator (for example the time, or the number of generations) - continuator.init(_solution); + // initialization of the external continuator (for example the time, or the number of generations) + continuator.init(_solution); + + bool b=continuator(_solution); - bool b=continuator(_solution); - - do{ - // explore the neighborhood of the solution - searchExplorer(_solution); - - // if a solution in the neighborhood can be accepted - if (searchExplorer.accept(_solution)) - searchExplorer.move(_solution); - - // update the parameter of the search (for ex. Temperature of the SA) - searchExplorer.updateParam(_solution); - - b=continuator(_solution); - }while (b && searchExplorer.isContinue(_solution)); - - searchExplorer.terminate(_solution); - - continuator.lastCall(_solution); - - //A CHANGER - return true; + do { + // explore the neighborhood of the solution + searchExplorer(_solution); + + // if a solution in the neighborhood can be accepted + if (searchExplorer.accept(_solution)) + searchExplorer.move(_solution); + + // update the parameter of the search (for ex. Temperature of the SA) + searchExplorer.updateParam(_solution); + + b=continuator(_solution); + } while (b && searchExplorer.isContinue(_solution)); + + searchExplorer.terminate(_solution); + + continuator.lastCall(_solution); + + //A CHANGER + return true; }; diff --git a/branches/newMo/src/continuator/moContinuator.h b/branches/newMo/src/continuator/moContinuator.h index 92eedad84..57061a115 100644 --- a/branches/newMo/src/continuator/moContinuator.h +++ b/branches/newMo/src/continuator/moContinuator.h @@ -51,7 +51,7 @@ public: * Init Continuator parameters * @param _solution the related solution */ - virtual void init(EOT& _solution) = 0 ; + virtual void init(EOT& _solution) { } ; /** * Last Call to terminate the checkpoint