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

new Lesson for K-exchange neighborhood

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2311 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
boufaras 2011-07-08 15:21:54 +00:00
commit d9aa9a26c6
1 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

33
trunk/paradiseo-mo/tutorial/Lesson10/testKswapNeighborhood.cpp
View file

@ -37,8 +37,9 @@ using namespace std;
#include <problems/permutation/moSwapNeighbor.h> #include <problems/permutation/moSwapNeighbor.h>
#include <problems/permutation/moSwapNeighborhood.h> #include <problems/permutation/moSwapNeighborhood.h>
#include <neighborhood/moKswapNeighbor.h> #include <neighborhood/moXSwapNeighbor.h>
#include <neighborhood/moKswapNeighborhood.h> #include <neighborhood/moXChangeNeighborhood.h>
#include <neighborhood/moNeighborhoodSizeUtils.h>
#include <neighborhood/moRndWithReplNeighborhood.h> #include <neighborhood/moRndWithReplNeighborhood.h>
#include <neighborhood/moRndWithoutReplNeighborhood.h> #include <neighborhood/moRndWithoutReplNeighborhood.h>
@ -51,8 +52,8 @@ typedef eoInt<unsigned int> Queen; //Permutation (Queen's problem representation
typedef moSwapNeighbor<Queen> swapNeighbor; //swap Neighbor typedef moSwapNeighbor<Queen> swapNeighbor; //swap Neighbor
typedef moSwapNeighborhood<Queen> swapNeighborhood; //classical swap Neighborhood typedef moSwapNeighborhood<Queen> swapNeighborhood; //classical swap Neighborhood
typedef moKswapNeighbor<Queen> kswapNeighbor; //k-swap Neighbor typedef moXSwapNeighbor<Queen> xSwapNeighbor; //X-Swap Neighbor
typedef moKswapNeighborhood<kswapNeighbor> kswapNeighborhood; // k- swap Neighborhood typedef moXChangeNeighborhood<xSwapNeighbor> xSwapNeighborhood; // x-Swap Neighborhood
void main_function(int argc, char **argv) { void main_function(int argc, char **argv) {
@ -79,9 +80,9 @@ void main_function(int argc, char **argv) {
unsigned vecSize = vecSizeParam.value(); unsigned vecSize = vecSizeParam.value();
// Swap number // Swap number
eoValueParam<unsigned int> KswapParam(1, "Kswap", "swap number", 'N'); eoValueParam<unsigned int> xSwapParam(1, "xSwap", "swap number", 'X');
parser.processParam(KswapParam, "Kswap"); parser.processParam(xSwapParam, "xSwap");
unsigned Kswap = KswapParam.value(); unsigned xSwap = xSwapParam.value();
// the name of the "status" file where all actual parameter values will be saved // the name of the "status" file where all actual parameter values will be saved
string str_status = parser.ProgramName() + ".status"; // default value string str_status = parser.ProgramName() + ".status"; // default value
@ -134,7 +135,7 @@ void main_function(int argc, char **argv) {
moFullEvalByModif<swapNeighbor> swapEval(fullEval); moFullEvalByModif<swapNeighbor> swapEval(fullEval);
moFullEvalByModif<kswapNeighbor> kswapEval(fullEval); moFullEvalByModif<xSwapNeighbor> xSwapEval(fullEval);
/* ========================================================= /* =========================================================
* *
@ -143,10 +144,10 @@ void main_function(int argc, char **argv) {
* ========================================================= */ * ========================================================= */
swapNeighborhood swapNH; swapNeighborhood swapNH;
kswapNeighborhood kswapNH(vecSize, Kswap); xSwapNeighborhood xSwapNH(sizeMapping(vecSize,xSwap), xSwap);
swapNeighbor n1; swapNeighbor n1;
kswapNeighbor nk(Kswap); xSwapNeighbor nk(xSwap);
/* ========================================================= /* =========================================================
* *
@ -191,13 +192,13 @@ void main_function(int argc, char **argv) {
std::cout << "K-SWAP NEIGHBORHOOD" << std::endl; std::cout << "K-SWAP NEIGHBORHOOD" << std::endl;
std::cout << "-----------------" << std::endl; std::cout << "-----------------" << std::endl;
std::cout << "Neighbors List: (Neighbor -> fitness)" << std::endl; std::cout << "Neighbors List: (Neighbor -> fitness)" << std::endl;
std::cout << solution << std::endl << std::endl;
kswapNH.init(solution, nk); xSwapNH.init(solution, nk);
kswapEval(solution, nk); xSwapEval(solution, nk);
nk.print(); nk.print();
while (kswapNH.cont(solution)) { while (xSwapNH.cont(solution)) {
kswapNH.next(solution, nk); xSwapNH.next(solution, nk);
kswapEval(solution, nk); xSwapEval(solution, nk);
nk.print(); nk.print();
} }