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

mon dernier commit :) On en a chier encore jusqu'au bout !!!

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1926 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jhumeau 2010-08-27 15:59:23 +00:00
commit 7631f6e040
5 changed files with 85 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -39,13 +39,16 @@ using namespace std;
#include <neighborhood/moRndWithoutReplNeighborhood.h>
#include <neighborhood/moOrderNeighborhood.h>
#include <explorer/moVNSexplorer.h>
#include <neighborhood/moBackwardVectorVNSelection.h>
//#include <neighborhood/moBackwardVectorVNSelection.h>
#include <neighborhood/moForwardVectorVNSelection.h>
#include <neighborhood/moRndVectorVNSelection.h>
//#include <neighborhood/moRndVectorVNSelection.h>
//Algorithm and its components
#include <coolingSchedule/moCoolingSchedule.h>
#include <algo/moSA.h>
#include <algo/moSimpleHC.h>
#include <algo/moLocalSearch.h>
#include <continuator/moTimeContinuator.h>
//comparator
#include <comparator/moSolNeighborComparator.h>
@ -57,6 +60,11 @@ using namespace std;
#include <utils/eoFileMonitor.h>
#include <continuator/moCounterMonitorSaver.h>
#include <eoSwapMutation.h>
#include <eoShiftMutation.h>
#include <acceptCrit/moBetterAcceptCrit.h>
#include <acceptCrit/moAlwaysAcceptCrit.h>
//-----------------------------------------------------------------------------
// Define types of the representation solution, different neighbors and neighborhoods
@ -143,6 +151,7 @@ void main_function(int argc, char **argv)
* ========================================================= */
moFullEvalByCopy<shiftNeighbor> shiftEval(fullEval);
moFullEvalByCopy<swapNeighbor> swapEval(fullEval);
/* =========================================================
*
@ -153,40 +162,50 @@ void main_function(int argc, char **argv)
shiftNeighborhood shiftNH((vecSize-1) * (vecSize-1));
swapNeighborhood swapNH(100);
Queen sol;
init(sol);
shiftNeighbor n;
/* =========================================================
*
* the local search algorithm
*
* ========================================================= */
// moSA<shiftNeighbor> localSearch1(shiftNH, fullEval, shiftEval);
//
// /* =========================================================
// *
// * execute the local search from random solution
// *
// * ========================================================= */
//
// Queen solution1, solution2;
//
// init(solution1);
//
// fullEval(solution1);
//
// std::cout << "#########################################" << std::endl;
// std::cout << "initial solution1: " << solution1 << std::endl ;
//
// localSearch1(solution1);
//
// std::cout << "final solution1: " << solution1 << std::endl ;
// std::cout << "#########################################" << std::endl;
moSimpleHC<shiftNeighbor> ls1(shiftNH, fullEval, shiftEval);
moSimpleHC<swapNeighbor> ls2(swapNH, fullEval, swapEval);
eoSwapMutation<Queen> swapMut;
eoShiftMutation<Queen> shiftMut;
moForwardVectorVNSelection<Queen> selectNH(ls1, shiftMut, true);
selectNH.add(ls2, swapMut);
moAlwaysAcceptCrit<shiftNeighbor> acceptCrit;
moVNSexplorer<shiftNeighbor> explorer(selectNH, acceptCrit);
moTimeContinuator<shiftNeighbor> cont(5);
moLocalSearch<shiftNeighbor> vns(explorer, cont, fullEval);
/* =========================================================
*
* execute the local search from random solution
*
* ========================================================= */
Queen sol;
init(sol);
fullEval(sol);
std::cout << "#########################################" << std::endl;
std::cout << "initial sol: " << sol << std::endl ;
vns(sol);
std::cout << "final sol: " << sol << std::endl ;
std::cout << "#########################################" << std::endl;
//
//
// /* =========================================================