From 2a816665d781c39b039a585a8b4f6bc9582709bb Mon Sep 17 00:00:00 2001
From: canape <canape@331e1502-861f-0410-8da2-ba01fb791d7f>
Date: Thu, 24 Jan 2008 09:56:43 +0000
Subject: [PATCH] tutorial/Wrapper modified

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@901 331e1502-861f-0410-8da2-ba01fb791d7f
---
 trunk/paradiseo-peo/tutorial/Wrapper/CMakeLists.txt | 1 -
 trunk/paradiseo-peo/tutorial/Wrapper/main1.cpp      | 3 +++
 trunk/paradiseo-peo/tutorial/Wrapper/main2.cpp      | 3 +++
 trunk/paradiseo-peo/tutorial/Wrapper/main3.cpp      | 3 +++
 trunk/paradiseo-peo/tutorial/Wrapper/main4.cpp      | 2 ++
 trunk/paradiseo-peo/tutorial/Wrapper/main5.cpp      | 2 ++
 trunk/paradiseo-peo/tutorial/Wrapper/main6.cpp      | 2 ++
 trunk/paradiseo-peo/tutorial/Wrapper/main7.cpp      | 3 +++
 8 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/trunk/paradiseo-peo/tutorial/Wrapper/CMakeLists.txt b/trunk/paradiseo-peo/tutorial/Wrapper/CMakeLists.txt
index b77cfcb7e..f34c8fcbc 100644
--- a/trunk/paradiseo-peo/tutorial/Wrapper/CMakeLists.txt
+++ b/trunk/paradiseo-peo/tutorial/Wrapper/CMakeLists.txt
@@ -60,7 +60,6 @@ ADD_EXECUTABLE(example2 main2.cpp)
 ADD_DEPENDENCIES(example2 peo rmc_mpi)
 ADD_EXECUTABLE(example3 main3.cpp)
 ADD_DEPENDENCIES(example3 peo rmc_mpi)
-
 ADD_EXECUTABLE(example4 main4.cpp)
 ADD_DEPENDENCIES(example4 peo rmc_mpi)
 ADD_EXECUTABLE(example5 main5.cpp)
diff --git a/trunk/paradiseo-peo/tutorial/Wrapper/main1.cpp b/trunk/paradiseo-peo/tutorial/Wrapper/main1.cpp
index 9c2f7300f..e19e45a39 100644
--- a/trunk/paradiseo-peo/tutorial/Wrapper/main1.cpp
+++ b/trunk/paradiseo-peo/tutorial/Wrapper/main1.cpp
@@ -56,5 +56,8 @@ int main( int __argc, char** __argv )
   peo :: run();
   peo :: finalize();
   if (getNodeRank()==1)
+  {
+  	pop.sort();
    	std::cout << "Final population :\n" << pop << std::endl;
+  }
 }
diff --git a/trunk/paradiseo-peo/tutorial/Wrapper/main2.cpp b/trunk/paradiseo-peo/tutorial/Wrapper/main2.cpp
index 3f944d22c..a61318b44 100644
--- a/trunk/paradiseo-peo/tutorial/Wrapper/main2.cpp
+++ b/trunk/paradiseo-peo/tutorial/Wrapper/main2.cpp
@@ -92,5 +92,8 @@ int main( int __argc, char** __argv )
 
   
  if (getNodeRank()==1)
+ {
+ 	pop.sort();
     std::cout << "Final population :\n" << pop << std::endl;
+ }
 }
diff --git a/trunk/paradiseo-peo/tutorial/Wrapper/main3.cpp b/trunk/paradiseo-peo/tutorial/Wrapper/main3.cpp
index 9c5b20739..b9d1b512b 100644
--- a/trunk/paradiseo-peo/tutorial/Wrapper/main3.cpp
+++ b/trunk/paradiseo-peo/tutorial/Wrapper/main3.cpp
@@ -57,5 +57,8 @@ int main( int __argc, char** __argv )
   peo :: run();
   peo :: finalize();
   if (getNodeRank()==1)
+  {
+  	pop.sort();
     std::cout << "Final population :\n" << pop << std::endl;
+  }
 }
diff --git a/trunk/paradiseo-peo/tutorial/Wrapper/main4.cpp b/trunk/paradiseo-peo/tutorial/Wrapper/main4.cpp
index 87ae8a4ef..e69aac663 100644
--- a/trunk/paradiseo-peo/tutorial/Wrapper/main4.cpp
+++ b/trunk/paradiseo-peo/tutorial/Wrapper/main4.cpp
@@ -124,6 +124,8 @@ int main( int __argc, char** __argv )
   peo :: finalize();
   if (getNodeRank()==1)
   {
+  	pop.sort();
+  	pop2.sort();
     std::cout << "Final population :\n" << pop << std::endl;
     std::cout << "Final population :\n" << pop2	 << std::endl;
   }
diff --git a/trunk/paradiseo-peo/tutorial/Wrapper/main5.cpp b/trunk/paradiseo-peo/tutorial/Wrapper/main5.cpp
index 45000dada..8ea4264d0 100644
--- a/trunk/paradiseo-peo/tutorial/Wrapper/main5.cpp
+++ b/trunk/paradiseo-peo/tutorial/Wrapper/main5.cpp
@@ -54,6 +54,7 @@ int main (int __argc, char * * __argv)
 
   if (getNodeRank()==1)
   {
+  	pop.sort();
     std :: cout << "\nResult before the local search\n";
     for(unsigned i=0;i<pop.size();i++)
     	std::cout<<"\n"<<pop[i].fitness();
@@ -70,6 +71,7 @@ int main (int __argc, char * * __argv)
   if (getNodeRank()==1)
   {
     std :: cout << "\nResult after the local search\n";
+    pop.sort();
     for(unsigned i=0;i<pop.size();i++)
     	std::cout<<"\n"<<pop[i].fitness();
   }
diff --git a/trunk/paradiseo-peo/tutorial/Wrapper/main6.cpp b/trunk/paradiseo-peo/tutorial/Wrapper/main6.cpp
index 6075e6171..740d96d5b 100644
--- a/trunk/paradiseo-peo/tutorial/Wrapper/main6.cpp
+++ b/trunk/paradiseo-peo/tutorial/Wrapper/main6.cpp
@@ -47,6 +47,7 @@ int main (int __argc, char * * __argv)
   if (getNodeRank()==1)
   {
     std :: cout << "\nResult before the EA\n";
+    pop.sort();
     for(unsigned i=0;i<pop.size();i++)
     	std::cout<<"\n"<<pop[i].fitness();
     std :: cout << "\n\n";
@@ -69,6 +70,7 @@ int main (int __argc, char * * __argv)
   if (getNodeRank()==1)
   {
     std :: cout << "\nResult after the EA\n";
+    pop.sort();
     for(unsigned i=0;i<pop.size();i++)
     	std::cout<<"\n"<<pop[i].fitness();
     std :: cout << "\n\n";
diff --git a/trunk/paradiseo-peo/tutorial/Wrapper/main7.cpp b/trunk/paradiseo-peo/tutorial/Wrapper/main7.cpp
index 4a3a8aa57..46587e0fb 100644
--- a/trunk/paradiseo-peo/tutorial/Wrapper/main7.cpp
+++ b/trunk/paradiseo-peo/tutorial/Wrapper/main7.cpp
@@ -83,5 +83,8 @@ int main( int __argc, char** __argv )
   peo :: run();
   peo :: finalize();
   if (getNodeRank()==1)
+  {
+  	pop.sort();
     std::cout << "Final population :\n" << pop << std::endl;
+  }
 }