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

corrected moeo imports + comment old tests

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@884 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
legrand 2008-01-16 10:02:00 +00:00
commit d665afe0b1
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/paradiseo-peo/test/CMakeLists.txt
View file

@ -12,8 +12,10 @@
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src)
INCLUDE_DIRECTORIES(${MO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${MO_SRC_DIR}/src)
INCLUDE_DIRECTORIES(${MOEO_SRC_DIR}/src)
INCLUDE_DIRECTORIES(${ParadisEO-PEO_SOURCE_DIR}/src) INCLUDE_DIRECTORIES(${ParadisEO-PEO_SOURCE_DIR}/src)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
INCLUDE(CheckLibraryExists) INCLUDE(CheckLibraryExists)
SET (CMAKE_CXX_COMPILER mpicxx) SET (CMAKE_CXX_COMPILER mpicxx)

6
trunk/paradiseo-peo/test/t-peoInsularPSO.cpp
View file

@ -71,7 +71,7 @@ template < class POT > class eoPrint : public eoContinue <POT>
void peoPSOSeq () void peoPSOSeq ()
{ {
/*
const unsigned int VEC_SIZE = 4; const unsigned int VEC_SIZE = 4;
const unsigned int POP_SIZE = 10; const unsigned int POP_SIZE = 10;
const unsigned int NEIGHBORHOOD_SIZE= 5; const unsigned int NEIGHBORHOOD_SIZE= 5;
@ -80,6 +80,7 @@ void peoPSOSeq ()
const double INIT_POSITION_MAX = 50.0; const double INIT_POSITION_MAX = 50.0;
const double INIT_VELOCITY_MIN = -1; const double INIT_VELOCITY_MIN = -1;
const double INIT_VELOCITY_MAX = 1; const double INIT_VELOCITY_MAX = 1;
const double omega = 1.0;
const double C1 = 0.5; const double C1 = 0.5;
const double C2 = 2; const double C2 = 2;
rng.reseed (44); rng.reseed (44);
@ -102,7 +103,7 @@ void peoPSOSeq ()
eoLinearTopology<Indi> topologySeq(NEIGHBORHOOD_SIZE); eoLinearTopology<Indi> topologySeq(NEIGHBORHOOD_SIZE);
topologySeq.setup(popSeq); topologySeq.setup(popSeq);
eoRealVectorBounds bndsSeq(VEC_SIZE,INIT_VELOCITY_MIN,INIT_VELOCITY_MAX); 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); eoGenContinue < Indi > genContSeq (MAX_GEN);
eoPrint <Indi> printSeq; eoPrint <Indi> printSeq;
eoCombinedContinue <Indi> continuatorSeq(genContSeq); eoCombinedContinue <Indi> continuatorSeq(genContSeq);
@ -111,6 +112,7 @@ void peoPSOSeq ()
eoSyncEasyPSO < Indi > psaSeq(checkpointSeq, evalSeq, velocitySeq, flight); eoSyncEasyPSO < Indi > psaSeq(checkpointSeq, evalSeq, velocitySeq, flight);
psaSeq (popSeq); psaSeq (popSeq);
popSeq.sort (); popSeq.sort ();
*/
} }
void peoPSOPara() void peoPSOPara()

2
trunk/paradiseo-peo/test/t-peoPSO.cpp
View file

@ -52,6 +52,7 @@ double f (const Indi & _indi)
double peoPSOSeq () double peoPSOSeq ()
{ {
/*
clock_t beginSeq,endSeq; clock_t beginSeq,endSeq;
double timeSeq; double timeSeq;
const unsigned int VEC_SIZE = 2; const unsigned int VEC_SIZE = 2;
@ -98,6 +99,7 @@ double peoPSOSeq ()
endSeq=clock(); endSeq=clock();
timeSeq = endSeq-beginSeq; timeSeq = endSeq-beginSeq;
return timeSeq; return timeSeq;
*/
} }
void peoPSOPara(long int arg) void peoPSOPara(long int arg)