From 3512f82858cb8d691e10f08245d4dd900208c548 Mon Sep 17 00:00:00 2001 From: jhumeau Date: Thu, 22 Oct 2009 12:46:04 +0000 Subject: [PATCH] last modification invalidate git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1616 331e1502-861f-0410-8da2-ba01fb791d7f --- trunk/paradiseo-mo/src/moILS.h | 2 +- trunk/paradiseo-mo/src/moTS.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/trunk/paradiseo-mo/src/moILS.h b/trunk/paradiseo-mo/src/moILS.h index d8a4efd6f..48eac8565 100644 --- a/trunk/paradiseo-mo/src/moILS.h +++ b/trunk/paradiseo-mo/src/moILS.h @@ -186,7 +186,7 @@ class moILS:public moAlgo < typename M::EOType > while ( continu (_solution) ) { perturbation(_solution); - _solution.invalidate(); + //_solution.invalidate(); full_evaluation(_solution); (*algorithm)(_solution); diff --git a/trunk/paradiseo-mo/src/moTS.h b/trunk/paradiseo-mo/src/moTS.h index e519d4ae9..1aa5fb451 100755 --- a/trunk/paradiseo-mo/src/moTS.h +++ b/trunk/paradiseo-mo/src/moTS.h @@ -126,7 +126,7 @@ class moTS:public moAlgo < typename M::EOType > continu.init (); - while ( continu (_solution) ) + do { (*move_explorer) (_solution, new_solution); @@ -138,7 +138,7 @@ class moTS:public moAlgo < typename M::EOType > _solution = new_solution; } - + while ( continu (_solution) ); _solution = best_solution;