From d665afe0b18b7765771dcc9b04caf2250b466b4b Mon Sep 17 00:00:00 2001
From: legrand <legrand@331e1502-861f-0410-8da2-ba01fb791d7f>
Date: Wed, 16 Jan 2008 10:02:00 +0000
Subject: [PATCH] corrected moeo imports + comment old tests

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@884 331e1502-861f-0410-8da2-ba01fb791d7f
---
 trunk/paradiseo-peo/test/CMakeLists.txt      | 2 ++
 trunk/paradiseo-peo/test/t-peoInsularPSO.cpp | 6 ++++--
 trunk/paradiseo-peo/test/t-peoPSO.cpp        | 2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/trunk/paradiseo-peo/test/CMakeLists.txt b/trunk/paradiseo-peo/test/CMakeLists.txt
index 5bfa40daf..83974ee36 100644
--- a/trunk/paradiseo-peo/test/CMakeLists.txt
+++ b/trunk/paradiseo-peo/test/CMakeLists.txt
@@ -12,8 +12,10 @@
 
 INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src)
 INCLUDE_DIRECTORIES(${MO_SRC_DIR}/src)
+INCLUDE_DIRECTORIES(${MOEO_SRC_DIR}/src)
 INCLUDE_DIRECTORIES(${ParadisEO-PEO_SOURCE_DIR}/src)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+
 INCLUDE(CheckLibraryExists)
 
 SET (CMAKE_CXX_COMPILER mpicxx)
diff --git a/trunk/paradiseo-peo/test/t-peoInsularPSO.cpp b/trunk/paradiseo-peo/test/t-peoInsularPSO.cpp
index cf8830459..4aad5eec3 100644
--- a/trunk/paradiseo-peo/test/t-peoInsularPSO.cpp
+++ b/trunk/paradiseo-peo/test/t-peoInsularPSO.cpp
@@ -71,7 +71,7 @@ template < class POT > class eoPrint : public eoContinue <POT>
 
 void peoPSOSeq ()
 {
-
+/*
   const unsigned int VEC_SIZE = 4;
   const unsigned int POP_SIZE = 10;
   const unsigned int NEIGHBORHOOD_SIZE= 5;
@@ -80,6 +80,7 @@ void peoPSOSeq ()
   const double INIT_POSITION_MAX = 50.0;
   const double INIT_VELOCITY_MIN = -1;
   const double INIT_VELOCITY_MAX = 1;
+  const double omega = 1.0;
   const double C1 = 0.5;
   const double C2 = 2;
   rng.reseed (44);
@@ -102,7 +103,7 @@ void peoPSOSeq ()
   eoLinearTopology<Indi> topologySeq(NEIGHBORHOOD_SIZE);
   topologySeq.setup(popSeq);
   eoRealVectorBounds bndsSeq(VEC_SIZE,INIT_VELOCITY_MIN,INIT_VELOCITY_MAX);
-  eoStandardVelocity < Indi > velocitySeq (topologySeq,C1,C2,bndsSeq);
+  eoStandardVelocity < Indi > velocitySeq (topologySeq,omega,C1,C2,bndsSeq);
   eoGenContinue < Indi > genContSeq (MAX_GEN);
   eoPrint <Indi>  printSeq;
   eoCombinedContinue <Indi> continuatorSeq(genContSeq);
@@ -111,6 +112,7 @@ void peoPSOSeq ()
   eoSyncEasyPSO < Indi > psaSeq(checkpointSeq, evalSeq, velocitySeq, flight);
   psaSeq (popSeq);
   popSeq.sort ();
+  */
 }
 
 void peoPSOPara()
diff --git a/trunk/paradiseo-peo/test/t-peoPSO.cpp b/trunk/paradiseo-peo/test/t-peoPSO.cpp
index 936f0b04a..3d5a088c8 100644
--- a/trunk/paradiseo-peo/test/t-peoPSO.cpp
+++ b/trunk/paradiseo-peo/test/t-peoPSO.cpp
@@ -52,6 +52,7 @@ double f (const Indi & _indi)
 
 double peoPSOSeq ()
 {
+	/*
   clock_t	beginSeq,endSeq;
   double timeSeq;
   const unsigned int VEC_SIZE = 2;
@@ -98,6 +99,7 @@ double peoPSOSeq ()
   endSeq=clock();
   timeSeq = endSeq-beginSeq;
   return timeSeq;
+  */
 }
 
 void peoPSOPara(long int arg)