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

moHC.h and iterated_local_search.cpp are updated

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@607 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jboisson 2007-09-20 14:08:55 +00:00
commit f37356d18a
3 changed files with 8 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -123,20 +123,17 @@ public:
cont.init ();
//some code has been duplicated in order to avoid one perturbation and one evaluation without adding a test in the loop.
// better than a do {} while; with a test in the loop.
//std::cout << "Before intensification: " << __sol.fitness() << std::endl;
algo(__sol);
//std::cout << "After intensification: " << __sol.fitness() << std::endl;
if(acceptance_criterion(__sol, __sol_saved))
{
std::cout << "Accepted: " << __sol.fitness() << std::endl;
__sol_saved=__sol;
}
else
{
//std::cout << "Refused" << std::endl;
__sol=__sol_saved;
}
@ -145,18 +142,14 @@ public:
perturbation(__sol);
full_eval(__sol);
//std::cout << "Before intensification: " << __sol.fitness() << std::endl;
algo(__sol);
//std::cout << "After intensification: " << __sol.fitness() << std::endl;
if(acceptance_criterion(__sol, __sol_saved))
{
std::cout << "Accepted: " << __sol.fitness() << std::endl;
__sol_saved=__sol;
}
else
{
//std::cout << "Refused" << std::endl;
__sol=__sol_saved;
}
}