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

tests corrected

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1095 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
canape 2008-03-07 11:16:55 +00:00
commit 0499c8a022
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
trunk/paradiseo-peo/src/peo.h
View file

@ -331,6 +331,7 @@
#include "peoTransform.h" #include "peoTransform.h"
#include "peoEvalFunc.h" #include "peoEvalFunc.h"
#include "peoPopEval.h" #include "peoPopEval.h"
#include "peoMoeoPopEval.h"
/* Cooperative island model */ /* Cooperative island model */
#include "core/ring_topo.h" #include "core/ring_topo.h"
@ -340,6 +341,8 @@
#include "peoData.h" #include "peoData.h"
#include "peoSyncIslandMig.h" #include "peoSyncIslandMig.h"
#include "peoAsyncIslandMig.h" #include "peoAsyncIslandMig.h"
#include "peoAsyncDataTransfer.h"
#include "peoSyncDataTransfer.h"
/* Synchronous multi-start model */ /* Synchronous multi-start model */
#include "peoMultiStart.h" #include "peoMultiStart.h"

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

@ -61,12 +61,12 @@ SET (TEST_LIST t-ParallelEval
t-EAAsyncIsland t-EAAsyncIsland
t-EASyncIsland t-EASyncIsland
t-PSOGlobalBest t-PSOGlobalBest
t-PSOWorstPosition t-PSOWorstPosition)
t-Mpdallexit)
SET (TEST_STOP t-Mpdallexit) SET (TEST_STOP t-Mpdallexit)
FOREACH (test ${TEST_LIST} ${TEST_RUN} ${TEST_STOP}) FOREACH (test ${TEST_RUN} ${TEST_LIST} ${TEST_STOP})
SET ("T_${test}_SOURCES" "${test}.cpp") SET ("T_${test}_SOURCES" "${test}.cpp")
ENDFOREACH (test) ENDFOREACH (test)
@ -74,7 +74,7 @@ ENDFOREACH (test)
IF(ENABLE_CMAKE_TESTING) IF(ENABLE_CMAKE_TESTING)
# Add the tests # Add the tests
FOREACH (test ${TEST_LIST} ${TEST_RUN} ${TEST_STOP}) FOREACH (test ${TEST_RUN} ${TEST_LIST} ${TEST_STOP})
ADD_EXECUTABLE(${test} ${T_${test}_SOURCES}) ADD_EXECUTABLE(${test} ${T_${test}_SOURCES})
ENDFOREACH (test) ENDFOREACH (test)
@ -91,8 +91,8 @@ IF(ENABLE_CMAKE_TESTING)
ENDFOREACH (test) ENDFOREACH (test)
# Link the librairies # Link the librairies
FOREACH (test ${TEST_LIST}) FOREACH (test ${TEST_RUN} ${TEST_LIST} ${TEST_STOP})
TARGET_LINK_LIBRARIES(${test} peo ${XML2_LIBS} rmc_mpi ga es eoutils eo) TARGET_LINK_LIBRARIES(${test} peo ${XML2_LIBS} rmc_mpi ga es eoutils eo peo)
ENDFOREACH (test) ENDFOREACH (test)
ENDIF(ENABLE_CMAKE_TESTING) ENDIF(ENABLE_CMAKE_TESTING)