From 5ccbfa458de7a943ebe5cfa2d42fd0d056343ecb Mon Sep 17 00:00:00 2001 From: jboisson Date: Tue, 20 Nov 2007 08:30:11 +0000 Subject: [PATCH] HC and TS MoveLoopExpl modification, final move made before fitness update git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@793 331e1502-861f-0410-8da2-ba01fb791d7f --- trunk/paradiseo-mo/src/moHCMoveLoopExpl.h | 4 ++-- trunk/paradiseo-mo/src/moTSMoveLoopExpl.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/trunk/paradiseo-mo/src/moHCMoveLoopExpl.h b/trunk/paradiseo-mo/src/moHCMoveLoopExpl.h index ec3c23d2d..0dac7447c 100755 --- a/trunk/paradiseo-mo/src/moHCMoveLoopExpl.h +++ b/trunk/paradiseo-mo/src/moHCMoveLoopExpl.h @@ -101,8 +101,8 @@ template < class M > class moHCMoveLoopExpl:public moMoveLoopExpl < M > Fitness best_move_fit; move_select (best_move, best_move_fit); - __new_sol.fitness (best_move_fit); - best_move (__new_sol); + best_move (__new_sol); + __new_sol.fitness (best_move_fit); } catch (EmptySelection & __ex) diff --git a/trunk/paradiseo-mo/src/moTSMoveLoopExpl.h b/trunk/paradiseo-mo/src/moTSMoveLoopExpl.h index 9b05d02d9..ae7653e8d 100755 --- a/trunk/paradiseo-mo/src/moTSMoveLoopExpl.h +++ b/trunk/paradiseo-mo/src/moTSMoveLoopExpl.h @@ -122,9 +122,9 @@ template < class M > class moTSMoveLoopExpl:public moMoveLoopExpl < M > move_select (best_move, best_move_fit); - __new_sol.fitness (best_move_fit); best_move (__new_sol); - + __new_sol.fitness (best_move_fit); + /* Removing moves that are no more tabu */ tabu_list.update ();