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

Nettoyage des tutos ce coup ci c'est bon :)

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1815 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jhumeau 2010-05-17 15:20:12 +00:00
commit 961dcba259
21 changed files with 2697 additions and 2697 deletions
Download patch file Download diff file Expand all files Collapse all files

34
trunk/paradiseo-mo/tutorial/Lesson2/testNeighborhood.cpp
View file

@ -155,7 +155,7 @@ void main_function(int argc, char **argv)
fullEval(solution);
std::cout << "Initial Solution:" << std::endl;
std::cout << "Initial Solution:" << std::endl;
std::cout << solution << std::endl << std::endl;
/* =========================================================
@ -168,14 +168,14 @@ void main_function(int argc, char **argv)
std::cout << "-----------------" << std::endl;
std::cout << "Neighbors List: (Neighbor -> fitness)" << std::endl;
swapNeighbor n1;
swapNeighbor n1;
swapNH.init(solution, n1);
swapEval(solution,n1);
n1.print();
while(swapNH.cont(solution)){
swapNH.next(solution, n1);
while (swapNH.cont(solution)) {
swapNH.next(solution, n1);
swapEval(solution,n1);
n1.print();
n1.print();
}
/* =========================================================
@ -188,28 +188,28 @@ void main_function(int argc, char **argv)
std::cout << "------------------------" << std::endl;
std::cout << "Neighbors List: (key: Neighbor -> fitness)" << std::endl;
shiftNeighbor n2;
shiftNeighbor n2;
orderShiftNH.init(solution, n2);
orderShiftNH.init(solution, n2);
shiftEval(solution,n2);
n2.print();
while(orderShiftNH.cont(solution)){
orderShiftNH.next(solution, n2);
while (orderShiftNH.cont(solution)) {
orderShiftNH.next(solution, n2);
shiftEval(solution,n2);
n2.print();
n2.print();
}
std::cout << "\nSHIFT RANDOM WITHOUT REPLACEMENT NEIGHBORHOOD" << std::endl;
std::cout << "---------------------------------------------" << std::endl;
std::cout << "Neighbors List: (key: Neighbor -> fitness)" << std::endl;
rndNoReplShiftNH.init(solution, n2);
rndNoReplShiftNH.init(solution, n2);
shiftEval(solution,n2);
n2.print();
while(rndNoReplShiftNH.cont(solution)){
rndNoReplShiftNH.next(solution, n2);
while (rndNoReplShiftNH.cont(solution)) {
rndNoReplShiftNH.next(solution, n2);
shiftEval(solution,n2);
n2.print();
n2.print();
}
std::cout << "\nSHIFT RANDOM WITH REPLACEMENT NEIGHBORHOOD" << std::endl;
@ -219,10 +219,10 @@ void main_function(int argc, char **argv)
rndReplShiftNH.init(solution, n2);
shiftEval(solution,n2);
n2.print();
for(unsigned int i=0; i<100; i++){
rndReplShiftNH.next(solution, n2);
for (unsigned int i=0; i<100; i++) {
rndReplShiftNH.next(solution, n2);
shiftEval(solution,n2);
n2.print();
n2.print();
}
}