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

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1961 331e1502-861f-0410-8da2-ba01fb791d7f

Browse source
This commit is contained in:
boufaras 2010-10-13 15:37:15 +00:00
commit 4a7433478e
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
trunk/paradiseo-mo/tutorial/Lesson9/VNS.cpp
View file

@ -48,7 +48,7 @@ using namespace std;
#include <algo/moSimpleHC.h> #include <algo/moSimpleHC.h>
#include <algo/moLocalSearch.h> #include <algo/moLocalSearch.h>
#include <algo/moVNS.h> #include <algo/moVNS.h>
#include <algo/moSimpleVNS.h> //#include <algo/moSimpleVNS.h>
#include <continuator/moTimeContinuator.h> #include <continuator/moTimeContinuator.h>
@ -191,8 +191,8 @@ void main_function(int argc, char **argv)
// moLocalSearch<shiftNeighbor> vns(explorer, cont, fullEval); // moLocalSearch<shiftNeighbor> vns(explorer, cont, fullEval);
moVNS<shiftNeighbor> vns(selectNH, acceptCrit, fullEval, cont); moVNS<shiftNeighbor> vns(selectNH, acceptCrit, fullEval, cont);
moSimpleVNS<shiftNeighbor> svns(ls1, shiftMut, fullEval, cont); /* moSimpleVNS<shiftNeighbor> svns(ls1, shiftMut, fullEval, cont);
svns.add(ls2, swapMut); svns.add(ls2, swapMut);*/
/* ========================================================= /* =========================================================
* *
@ -221,7 +221,7 @@ void main_function(int argc, char **argv)
std::cout << "#########################################" << std::endl; std::cout << "#########################################" << std::endl;
std::cout << "initial sol: " << sol << std::endl ; std::cout << "initial sol: " << sol << std::endl ;
svns(sol); //svns(sol);
std::cout << "final sol: " << sol << std::endl ; std::cout << "final sol: " << sol << std::endl ;
std::cout << "#########################################" << std::endl; std::cout << "#########################################" << std::endl;