nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

moILS has been updated to avoid initial solution without fitness

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1264 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jboisson 2008-11-19 08:22:18 +00:00
commit 4f804ac318
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
trunk/paradiseo-mo/src/moILS.h
View file

@ -157,14 +157,15 @@ class moILS:public moAlgo < typename M::EOType >
*/ */
bool operator()(EOT & _solution) bool operator()(EOT & _solution)
{ {
if ( _solution.invalid() ) EOT _solution_saved;
{
full_evaluation(_solution); if ( _solution.invalid() )
} {
full_evaluation(_solution);
EOT _solution_saved=_solution; }
_solution_saved=_solution;
continu.init (); continu.init ();
// some code has been duplicated in order to avoid one perturbation and one evaluation without adding a test in the loop. // some code has been duplicated in order to avoid one perturbation and one evaluation without adding a test in the loop.

2
trunk/paradiseo-mo/src/moTSMoveLoopExpl.h
View file

@ -107,6 +107,8 @@ class moTSMoveLoopExpl:public moMoveLoopExpl < M >
move_selection.init( _old_solution.fitness() ); move_selection.init( _old_solution.fitness() );
selection_update_is_ok=true;
do do
{ {
fitness = incremental_evaluation(move, _old_solution); fitness = incremental_evaluation(move, _old_solution);