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

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

@ -172,7 +172,7 @@ void main_function(int argc, char **argv)
swapNH.init(solution, n1); swapNH.init(solution, n1);
swapEval(solution,n1); swapEval(solution,n1);
n1.print(); n1.print();
while(swapNH.cont(solution)){ while (swapNH.cont(solution)) {
swapNH.next(solution, n1); swapNH.next(solution, n1);
swapEval(solution,n1); swapEval(solution,n1);
n1.print(); n1.print();
@ -193,7 +193,7 @@ void main_function(int argc, char **argv)
orderShiftNH.init(solution, n2); orderShiftNH.init(solution, n2);
shiftEval(solution,n2); shiftEval(solution,n2);
n2.print(); n2.print();
while(orderShiftNH.cont(solution)){ while (orderShiftNH.cont(solution)) {
orderShiftNH.next(solution, n2); orderShiftNH.next(solution, n2);
shiftEval(solution,n2); shiftEval(solution,n2);
n2.print(); n2.print();
@ -206,7 +206,7 @@ void main_function(int argc, char **argv)
rndNoReplShiftNH.init(solution, n2); rndNoReplShiftNH.init(solution, n2);
shiftEval(solution,n2); shiftEval(solution,n2);
n2.print(); n2.print();
while(rndNoReplShiftNH.cont(solution)){ while (rndNoReplShiftNH.cont(solution)) {
rndNoReplShiftNH.next(solution, n2); rndNoReplShiftNH.next(solution, n2);
shiftEval(solution,n2); shiftEval(solution,n2);
n2.print(); n2.print();
@ -219,7 +219,7 @@ void main_function(int argc, char **argv)
rndReplShiftNH.init(solution, n2); rndReplShiftNH.init(solution, n2);
shiftEval(solution,n2); shiftEval(solution,n2);
n2.print(); n2.print();
for(unsigned int i=0; i<100; i++){ for (unsigned int i=0; i<100; i++) {
rndReplShiftNH.next(solution, n2); rndReplShiftNH.next(solution, n2);
shiftEval(solution,n2); shiftEval(solution,n2);
n2.print(); n2.print();

2
trunk/paradiseo-mo/tutorial/Lesson6/autocorrelation.cpp
View file

@ -207,7 +207,7 @@ void main_function(int argc, char **argv)
statistics.autocorrelation(fitnessValues, 10, rho, phi); statistics.autocorrelation(fitnessValues, 10, rho, phi);
for(unsigned s = 0; s < rho.size(); s++) for (unsigned s = 0; s < rho.size(); s++)
std::cout << s << " " << "rho=" << rho[s] << ", phi=" << phi[s] << std::endl; std::cout << s << " " << "rho=" << rho[s] << ", phi=" << phi[s] << std::endl;
} }

6
trunk/paradiseo-mo/tutorial/Lesson6/neutralWalk.cpp
View file

@ -177,7 +177,7 @@ void main_function(int argc, char **argv)
* ========================================================= */ * ========================================================= */
// nearly 2 blocks are complete // nearly 2 blocks are complete
for(unsigned i = 0; i < blockSize - 1; i++) { for (unsigned i = 0; i < blockSize - 1; i++) {
initialSol[i] = true; initialSol[i] = true;
initialSol[blockSize + i] = true; initialSol[blockSize + i] = true;
initialSol[2 * blockSize + i] = true; initialSol[2 * blockSize + i] = true;
@ -222,8 +222,8 @@ void main_function(int argc, char **argv)
statistics.distances(solutions, distance, dist); statistics.distances(solutions, distance, dist);
for(unsigned i = 0; i < dist.size(); i++) { for (unsigned i = 0; i < dist.size(); i++) {
for(unsigned j = 0; j < dist.size(); j++) { for (unsigned j = 0; j < dist.size(); j++) {
std::cout << dist[i][j] << " " ; std::cout << dist[i][j] << " " ;
if (j < i) if (j < i)
v.push_back(dist[i][j]); v.push_back(dist[i][j]);

6
trunk/paradiseo-mo/tutorial/Lesson7/hybridAlgo.cpp
View file

@ -133,7 +133,7 @@ void main_function(int argc, char **argv)
Queen tmp; Queen tmp;
for(unsigned int i=0; i<20; i++){ for (unsigned int i=0; i<20; i++) {
init(tmp); init(tmp);
fullEval(tmp); fullEval(tmp);
pop.push_back(tmp); pop.push_back(tmp);
@ -193,7 +193,7 @@ void main_function(int argc, char **argv)
std::cout << "INITIAL POPULATION:" << std::endl; std::cout << "INITIAL POPULATION:" << std::endl;
std::cout << "-------------------" << std::endl; std::cout << "-------------------" << std::endl;
for(unsigned int i=0; i<pop.size(); i++) for (unsigned int i=0; i<pop.size(); i++)
std::cout << pop[i] << std::endl; std::cout << pop[i] << std::endl;
hybridAlgo(pop); hybridAlgo(pop);
@ -201,7 +201,7 @@ void main_function(int argc, char **argv)
std::cout << std::endl; std::cout << std::endl;
std::cout << "FINAL POPULATION:" << std::endl; std::cout << "FINAL POPULATION:" << std::endl;
std::cout << "-------------------" << std::endl; std::cout << "-------------------" << std::endl;
for(unsigned int i=0; i<pop.size(); i++) for (unsigned int i=0; i<pop.size(); i++)
std::cout << pop[i] << std::endl; std::cout << pop[i] << std::endl;