diff --git a/trunk/paradiseo-peo/tutorial/Walkthrough/CMakeLists.txt b/trunk/paradiseo-peo/tutorial/Walkthrough/CMakeLists.txt deleted file mode 100644 index 2b9f7fe96..000000000 --- a/trunk/paradiseo-peo/tutorial/Walkthrough/CMakeLists.txt +++ /dev/null @@ -1,116 +0,0 @@ - -###################################################################################### -### 0) Pre-config -###################################################################################### - -SET (CMAKE_CXX_COMPILER mpicxx) - -ADD_CUSTOM_TARGET(install DEPENDS ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Walkthrough/config) - -ADD_CUSTOM_COMMAND( - TARGET install - POST_BUILD - COMMAND ${CMAKE_COMMAND} - ARGS -E copy_directory - ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Walkthrough/config - ${ParadisEO-PEO_BINARY_DIR}/tutorial/Walkthrough/config) -ADD_CUSTOM_COMMAND( - TARGET install - POST_BUILD - COMMAND ${CMAKE_COMMAND} - ARGS -E copy_if_different - ${ParadisEO-PEO_SOURCE_DIR}/tutorial/Walkthrough/ParadisEO-PEO_Walkthrough.pdf - ${ParadisEO-PEO_BINARY_DIR}/tutorial/Walkthrough) -###################################################################################### - - -###################################################################################### -### 1) Include the sources -###################################################################################### - -INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src ${MO_SRC_DIR}/src ${ParadisEO-PEO_SOURCE_DIR}/src ${TSP_SRC_DIR}) - -###################################################################################### - - -###################################################################################### -### 2) Specify where CMake can find the libraries (mandatory: before 3) ) -###################################################################################### - -IF(NOT WIN32 OR CYGWIN) - LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${ParadisEO-PEO_BINARY_DIR}/lib ${TSP_BINARY_DIR}/lib) -ENDIF(NOT WIN32 OR CYGWIN) - -# especially for Visual Studio -IF(WIN32 AND NOT CYGWIN) - LINK_DIRECTORIES(${EO_BIN_DIR}\\lib\\${CMAKE_BUILD_TYPE} ${ParadisEO-PEO_BINARY_DIR}\\lib\\${CMAKE_BUILD_TYPE} ${TSP_BINARY_DIR}\\lib\\${CMAKE_BUILD_TYPE}) -ENDIF(WIN32 AND NOT CYGWIN) - -###################################################################################### - - -###################################################################################### -### 3) Define your target(s): just an executable here -###################################################################################### - -# no matter what is the OS, hopefully -ADD_EXECUTABLE(exampleA exampleA.cpp) -ADD_EXECUTABLE(exampleB exampleB.cpp) -ADD_EXECUTABLE(exampleC exampleC.cpp) -ADD_EXECUTABLE(exampleD exampleD.cpp) -ADD_EXECUTABLE(exampleE exampleE.cpp) - -ADD_DEPENDENCIES(exampleA tsp peo rmc_mpi) -ADD_DEPENDENCIES(exampleB tsp peo rmc_mpi) -ADD_DEPENDENCIES(exampleC tsp peo rmc_mpi) -ADD_DEPENDENCIES(exampleD tsp peo rmc_mpi) -ADD_DEPENDENCIES(exampleE tsp peo rmc_mpi) - -###################################################################################### - - -###################################################################################### -### 4) Optionnal: define your target's properties -###################################################################################### - -SET(WALKTHROUGH_VERSION ${GLOBAL_VERSION}) -SET_TARGET_PROPERTIES(exampleA PROPERTIES VERSION "${WALKTHROUGH_VERSION}") -SET_TARGET_PROPERTIES(exampleB PROPERTIES VERSION "${WALKTHROUGH_VERSION}") -SET_TARGET_PROPERTIES(exampleC PROPERTIES VERSION "${WALKTHROUGH_VERSION}") -SET_TARGET_PROPERTIES(exampleD PROPERTIES VERSION "${WALKTHROUGH_VERSION}") -SET_TARGET_PROPERTIES(exampleE PROPERTIES VERSION "${WALKTHROUGH_VERSION}") -###################################################################################### - - -###################################################################################### -### 5) Link the librairies -###################################################################################### - -TARGET_LINK_LIBRARIES(exampleA ${XML2_LIBS} tsp peo rmc_mpi eo eoutils) -TARGET_LINK_LIBRARIES(exampleB ${XML2_LIBS} tsp peo rmc_mpi eo eoutils) -TARGET_LINK_LIBRARIES(exampleC ${XML2_LIBS} tsp peo rmc_mpi eo eoutils) -TARGET_LINK_LIBRARIES(exampleD ${XML2_LIBS} tsp peo rmc_mpi eo eoutils) -TARGET_LINK_LIBRARIES(exampleE ${XML2_LIBS} tsp peo rmc_mpi eo eoutils) - -###################################################################################### - - -###################################################################################### -### 6) Windows advanced config - especially for Microsoft Visual Studio 8 -###################################################################################### - - IF(CMAKE_CXX_COMPILER MATCHES cl) - IF(NOT WITH_SHARED_LIBS) - IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005") - SET(CMAKE_CXX_FLAGS "/nologo /W3 /Gy") - SET(CMAKE_CXX_FLAGS_DEBUG "/MTd /Z7 /Od") - SET(CMAKE_CXX_FLAGS_RELEASE "/MT /O2") - SET(CMAKE_CXX_FLAGS_MINSIZEREL "/MT /O2") - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MTd /Z7 /Od") - SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:CONSOLE") - - ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005") - ENDIF(NOT WITH_SHARED_LIBS) - ENDIF(CMAKE_CXX_COMPILER MATCHES cl) -###################################################################################### - diff --git a/trunk/paradiseo-peo/tutorial/Walkthrough/ParadisEO-PEO_Walkthrough.pdf b/trunk/paradiseo-peo/tutorial/Walkthrough/ParadisEO-PEO_Walkthrough.pdf deleted file mode 100755 index 5c4fe7841..000000000 Binary files a/trunk/paradiseo-peo/tutorial/Walkthrough/ParadisEO-PEO_Walkthrough.pdf and /dev/null differ diff --git a/trunk/paradiseo-peo/tutorial/Walkthrough/config/lessonA.param b/trunk/paradiseo-peo/tutorial/Walkthrough/config/lessonA.param deleted file mode 100644 index 5719b59f3..000000000 --- a/trunk/paradiseo-peo/tutorial/Walkthrough/config/lessonA.param +++ /dev/null @@ -1,11 +0,0 @@ -## miscallenous parameters - ---debug=false - -## deployment schema - ---schema=config/schemaA.xml - -## parameters - ---inst=../examples/tsp/benchs/eil101.tsp diff --git a/trunk/paradiseo-peo/tutorial/Walkthrough/config/lessonB.param b/trunk/paradiseo-peo/tutorial/Walkthrough/config/lessonB.param deleted file mode 100644 index 873dffa40..000000000 --- a/trunk/paradiseo-peo/tutorial/Walkthrough/config/lessonB.param +++ /dev/null @@ -1,11 +0,0 @@ -## miscallenous parameters - ---debug=false - -## deployment schema - ---schema=config/schemaB.xml - -## parameters - ---inst=../examples/tsp/benchs/eil101.tsp diff --git a/trunk/paradiseo-peo/tutorial/Walkthrough/config/lessonC.param b/trunk/paradiseo-peo/tutorial/Walkthrough/config/lessonC.param deleted file mode 100644 index cb47c9bf3..000000000 --- a/trunk/paradiseo-peo/tutorial/Walkthrough/config/lessonC.param +++ /dev/null @@ -1,11 +0,0 @@ -## miscallenous parameters - ---debug=false - -## deployment schema - ---schema=config/schemaC.xml - -## parameters - ---inst=../examples/tsp/benchs/eil101.tsp diff --git a/trunk/paradiseo-peo/tutorial/Walkthrough/config/lessonD.param b/trunk/paradiseo-peo/tutorial/Walkthrough/config/lessonD.param deleted file mode 100644 index 8c177206b..000000000 --- a/trunk/paradiseo-peo/tutorial/Walkthrough/config/lessonD.param +++ /dev/null @@ -1,11 +0,0 @@ -## miscallenous parameters - ---debug=false - -## deployment schema - ---schema=config/schemaD.xml - -## parameters - ---inst=../examples/tsp/benchs/eil101.tsp diff --git a/trunk/paradiseo-peo/tutorial/Walkthrough/config/lessonE.param b/trunk/paradiseo-peo/tutorial/Walkthrough/config/lessonE.param deleted file mode 100644 index 336c8fdea..000000000 --- a/trunk/paradiseo-peo/tutorial/Walkthrough/config/lessonE.param +++ /dev/null @@ -1,11 +0,0 @@ -## miscallenous parameters - ---debug=false - -## deployment schema - ---schema=config/schemaE.xml - -## parameters - ---inst=../examples/tsp/benchs/eil101.tsp diff --git a/trunk/paradiseo-peo/tutorial/Walkthrough/config/schemaA.xml b/trunk/paradiseo-peo/tutorial/Walkthrough/config/schemaA.xml deleted file mode 100644 index 47b198b4c..000000000 --- a/trunk/paradiseo-peo/tutorial/Walkthrough/config/schemaA.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - 1 - - - - diff --git a/trunk/paradiseo-peo/tutorial/Walkthrough/config/schemaB.xml b/trunk/paradiseo-peo/tutorial/Walkthrough/config/schemaB.xml deleted file mode 100644 index 47b198b4c..000000000 --- a/trunk/paradiseo-peo/tutorial/Walkthrough/config/schemaB.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - 1 - - - - diff --git a/trunk/paradiseo-peo/tutorial/Walkthrough/config/schemaC.xml b/trunk/paradiseo-peo/tutorial/Walkthrough/config/schemaC.xml deleted file mode 100644 index 51754a346..000000000 --- a/trunk/paradiseo-peo/tutorial/Walkthrough/config/schemaC.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - 1 - 2 - - - - diff --git a/trunk/paradiseo-peo/tutorial/Walkthrough/config/schemaD.xml b/trunk/paradiseo-peo/tutorial/Walkthrough/config/schemaD.xml deleted file mode 100644 index b352f8b19..000000000 --- a/trunk/paradiseo-peo/tutorial/Walkthrough/config/schemaD.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - 1 - - - - - - - - diff --git a/trunk/paradiseo-peo/tutorial/Walkthrough/config/schemaE.xml b/trunk/paradiseo-peo/tutorial/Walkthrough/config/schemaE.xml deleted file mode 100644 index b352f8b19..000000000 --- a/trunk/paradiseo-peo/tutorial/Walkthrough/config/schemaE.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - 1 - - - - - - - - diff --git a/trunk/paradiseo-peo/tutorial/Walkthrough/exampleA.cpp b/trunk/paradiseo-peo/tutorial/Walkthrough/exampleA.cpp deleted file mode 100644 index 22a71196e..000000000 --- a/trunk/paradiseo-peo/tutorial/Walkthrough/exampleA.cpp +++ /dev/null @@ -1,108 +0,0 @@ -/* -* -* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 -* (C) OPAC Team, LIFL, 2002-2007 -* -* Sebastien Cahon, Alexandru-Adrian Tantar -* -* This software is governed by the CeCILL license under French law and -* abiding by the rules of distribution of free software. You can use, -* modify and/ or redistribute the software under the terms of the CeCILL -* license as circulated by CEA, CNRS and INRIA at the following URL -* "http://www.cecill.info". -* -* As a counterpart to the access to the source code and rights to copy, -* modify and redistribute granted by the license, users are provided only -* with a limited warranty and the software's author, the holder of the -* economic rights, and the successive licensors have only limited liability. -* -* In this respect, the user's attention is drawn to the risks associated -* with loading, using, modifying and/or developing or reproducing the -* software by the user in light of its specific status of free software, -* that may mean that it is complicated to manipulate, and that also -* therefore means that it is reserved for developers and experienced -* professionals having in-depth computer knowledge. Users are therefore -* encouraged to load and test the software's suitability as regards their -* requirements in conditions enabling the security of their systems and/or -* data to be ensured and, more generally, to use and operate it in the -* same conditions as regards security. -* The fact that you are presently reading this means that you have had -* knowledge of the CeCILL license and that you accept its terms. -* -* ParadisEO WebSite : http://paradiseo.gforge.inria.fr -* Contact: paradiseo-help@lists.gforge.inria.fr -* -*/ -// (c) OPAC Team, LIFL, July 2007 -// -// Contact: paradiseo-help@lists.gforge.inria.fr - -#include "param.h" -#include "route_init.h" -#include "route_eval.h" - -#include "order_xover.h" -#include "edge_xover.h" -#include "partial_mapped_xover.h" -#include "city_swap.h" -#include "part_route_eval.h" -#include "merge_route_eval.h" -#include "two_opt_init.h" -#include "two_opt_next.h" -#include "two_opt_incr_eval.h" - -#include - -#define POP_SIZE 10 -#define NUM_GEN 10 -#define CROSS_RATE 1.0 -#define MUT_RATE 0.01 - - -int main (int __argc, char * * __argv) { - - peo :: init (__argc, __argv); - - - loadParameters (__argc, __argv); /* Processing some parameters relative to the tackled - problem (TSP) */ - - RouteInit route_init; /* It builds random routes */ - RouteEval full_eval; /* Full route evaluator */ - - - OrderXover order_cross; /* Recombination */ - PartialMappedXover pm_cross; - EdgeXover edge_cross; - CitySwap city_swap_mut; /* Mutation */ - - - /** Local Search */ - TwoOptInit pmx_two_opt_init; - TwoOptNext pmx_two_opt_next; - TwoOptIncrEval pmx_two_opt_incr_eval; - moBestImprSelect pmx_two_opt_move_select; - moHC hc (pmx_two_opt_init, pmx_two_opt_next, pmx_two_opt_incr_eval, pmx_two_opt_move_select, full_eval); - - /** The EA */ - eoPop ox_pop (POP_SIZE, route_init); /* Population */ - - eoGenContinue ox_cont (NUM_GEN); /* A fixed number of iterations */ - eoCheckPoint ox_checkpoint (ox_cont); /* Checkpoint */ - peoSeqPopEval ox_pop_eval (full_eval); - eoStochTournamentSelect ox_select_one; - eoSelectNumber ox_select (ox_select_one, POP_SIZE); - eoSGATransform ox_transform (order_cross, CROSS_RATE, city_swap_mut, MUT_RATE); - peoSeqTransform ox_para_transform (ox_transform); - eoEPReplacement ox_replace (2); - - peoEA ox_ea (ox_checkpoint, ox_pop_eval, ox_select, ox_para_transform, ox_replace); - - ox_ea (ox_pop); /* Application to the given population */ - - peo :: run (); - peo :: finalize (); /* Termination */ - - - return 0; -} diff --git a/trunk/paradiseo-peo/tutorial/Walkthrough/exampleB.cpp b/trunk/paradiseo-peo/tutorial/Walkthrough/exampleB.cpp deleted file mode 100644 index e5a5a6039..000000000 --- a/trunk/paradiseo-peo/tutorial/Walkthrough/exampleB.cpp +++ /dev/null @@ -1,114 +0,0 @@ -/* -* -* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 -* (C) OPAC Team, LIFL, 2002-2007 -* -* Sebastien Cahon, Alexandru-Adrian Tantar -* -* This software is governed by the CeCILL license under French law and -* abiding by the rules of distribution of free software. You can use, -* modify and/ or redistribute the software under the terms of the CeCILL -* license as circulated by CEA, CNRS and INRIA at the following URL -* "http://www.cecill.info". -* -* As a counterpart to the access to the source code and rights to copy, -* modify and redistribute granted by the license, users are provided only -* with a limited warranty and the software's author, the holder of the -* economic rights, and the successive licensors have only limited liability. -* -* In this respect, the user's attention is drawn to the risks associated -* with loading, using, modifying and/or developing or reproducing the -* software by the user in light of its specific status of free software, -* that may mean that it is complicated to manipulate, and that also -* therefore means that it is reserved for developers and experienced -* professionals having in-depth computer knowledge. Users are therefore -* encouraged to load and test the software's suitability as regards their -* requirements in conditions enabling the security of their systems and/or -* data to be ensured and, more generally, to use and operate it in the -* same conditions as regards security. -* The fact that you are presently reading this means that you have had -* knowledge of the CeCILL license and that you accept its terms. -* -* ParadisEO WebSite : http://paradiseo.gforge.inria.fr -* Contact: paradiseo-help@lists.gforge.inria.fr -* -*/ -// (c) OPAC Team, LIFL, July 2007 -// -// Contact: paradiseo-help@lists.gforge.inria.fr - -#include "param.h" -#include "route_init.h" -#include "route_eval.h" - -#include "order_xover.h" -#include "edge_xover.h" -#include "partial_mapped_xover.h" -#include "city_swap.h" -#include "part_route_eval.h" -#include "merge_route_eval.h" -#include "two_opt_init.h" -#include "two_opt_next.h" -#include "two_opt_incr_eval.h" - -#include - -#define POP_SIZE 10 -#define NUM_GEN 10 -#define CROSS_RATE 1.0 -#define MUT_RATE 0.01 - - -int main (int __argc, char * * __argv) { - - peo :: init (__argc, __argv); - - - loadParameters (__argc, __argv); /* Processing some parameters relative to the tackled - problem (TSP) */ - - RouteInit route_init; /* Its builds random routes */ - RouteEval full_eval; /* Full route evaluator */ - - - OrderXover order_cross; /* Recombination */ - PartialMappedXover pm_cross; - EdgeXover edge_cross; - CitySwap city_swap_mut; /* Mutation */ - - - /** Local Search */ - TwoOptInit pmx_two_opt_init; - TwoOptNext pmx_two_opt_next; - TwoOptIncrEval pmx_two_opt_incr_eval; - moBestImprSelect pmx_two_opt_move_select; - moHC hc (pmx_two_opt_init, pmx_two_opt_next, pmx_two_opt_incr_eval, pmx_two_opt_move_select, full_eval); - - /** The EA */ - eoPop ox_pop (POP_SIZE, route_init); /* Population */ - - eoGenContinue ox_cont (NUM_GEN); /* A fixed number of iterations */ - eoCheckPoint ox_checkpoint (ox_cont); /* Checkpoint */ - peoSeqPopEval ox_pop_eval (full_eval); - eoStochTournamentSelect ox_select_one; - eoSelectNumber ox_select (ox_select_one, POP_SIZE); - eoSGATransform ox_transform (order_cross, CROSS_RATE, city_swap_mut, MUT_RATE); - peoSeqTransform ox_para_transform (ox_transform); - eoEPReplacement ox_replace (2); - - peoEA ox_ea (ox_checkpoint, ox_pop_eval, ox_select, ox_para_transform, ox_replace); - - ox_ea (ox_pop); /* Application to the given population */ - - - peo :: run (); - peo :: finalize (); /* Termination */ - - - std :: cout << ox_pop[ 0 ].fitness(); - hc( ox_pop[ 0 ] ); - std :: cout << " -> " << ox_pop[ 0 ].fitness() << std :: endl; - - - return 0; -} diff --git a/trunk/paradiseo-peo/tutorial/Walkthrough/exampleC.cpp b/trunk/paradiseo-peo/tutorial/Walkthrough/exampleC.cpp deleted file mode 100644 index 7676ac577..000000000 --- a/trunk/paradiseo-peo/tutorial/Walkthrough/exampleC.cpp +++ /dev/null @@ -1,166 +0,0 @@ -/* -* -* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 -* (C) OPAC Team, LIFL, 2002-2007 -* -* Sebastien Cahon, Alexandru-Adrian Tantar -* -* This software is governed by the CeCILL license under French law and -* abiding by the rules of distribution of free software. You can use, -* modify and/ or redistribute the software under the terms of the CeCILL -* license as circulated by CEA, CNRS and INRIA at the following URL -* "http://www.cecill.info". -* -* As a counterpart to the access to the source code and rights to copy, -* modify and redistribute granted by the license, users are provided only -* with a limited warranty and the software's author, the holder of the -* economic rights, and the successive licensors have only limited liability. -* -* In this respect, the user's attention is drawn to the risks associated -* with loading, using, modifying and/or developing or reproducing the -* software by the user in light of its specific status of free software, -* that may mean that it is complicated to manipulate, and that also -* therefore means that it is reserved for developers and experienced -* professionals having in-depth computer knowledge. Users are therefore -* encouraged to load and test the software's suitability as regards their -* requirements in conditions enabling the security of their systems and/or -* data to be ensured and, more generally, to use and operate it in the -* same conditions as regards security. -* The fact that you are presently reading this means that you have had -* knowledge of the CeCILL license and that you accept its terms. -* -* ParadisEO WebSite : http://paradiseo.gforge.inria.fr -* Contact: paradiseo-help@lists.gforge.inria.fr -* -*/ -// (c) OPAC Team, LIFL, July 2007 -// -// Contact: paradiseo-help@lists.gforge.inria.fr - -#include "param.h" -#include "route_init.h" -#include "route_eval.h" - -#include "order_xover.h" -#include "edge_xover.h" -#include "partial_mapped_xover.h" -#include "city_swap.h" -#include "part_route_eval.h" -#include "merge_route_eval.h" -#include "two_opt_init.h" -#include "two_opt_next.h" -#include "two_opt_incr_eval.h" - -#include - -#define POP_SIZE 10 -#define NUM_GEN 10 -#define CROSS_RATE 1.0 -#define MUT_RATE 0.01 - -#define MIG_FREQ 1 -#define MIG_SIZE 5 - - -int main (int __argc, char * * __argv) { - - peo :: init (__argc, __argv); - - - loadParameters (__argc, __argv); /* Processing some parameters relative to the tackled - problem (TSP) */ - - /* Migration topology */ - RingTopology topo; - - - - // The First EA ------------------------------------------------------------------------------------- - - RouteInit route_init; /* Its builds random routes */ - RouteEval full_eval; /* Full route evaluator */ - - OrderXover order_cross; /* Recombination */ - CitySwap city_swap_mut; /* Mutation */ - - eoPop ox_pop (POP_SIZE, route_init); /* Population */ - - eoGenContinue ox_cont (NUM_GEN); /* A fixed number of iterations */ - eoCheckPoint ox_checkpoint (ox_cont); /* Checkpoint */ - peoSeqPopEval ox_pop_eval (full_eval); - eoStochTournamentSelect ox_select_one; - eoSelectNumber ox_select (ox_select_one, POP_SIZE); - eoSGATransform ox_transform (order_cross, CROSS_RATE, city_swap_mut, MUT_RATE); - peoSeqTransform ox_seq_transform (ox_transform); - eoEPReplacement ox_replace (2); - - - /* The migration policy */ - eoPeriodicContinue ox_mig_cont (MIG_FREQ); /* Migration occurs periodically */ - eoStochTournamentSelect ox_mig_select_one; /* Emigrants are randomly selected */ - eoSelectNumber ox_mig_select (ox_mig_select_one, MIG_SIZE); - eoPlusReplacement ox_mig_replace; /* Immigrants replace the worse individuals */ - - peoAsyncIslandMig ox_mig (ox_mig_cont, ox_mig_select, ox_mig_replace, topo, ox_pop, ox_pop); - ox_checkpoint.add (ox_mig); - - peoEA ox_ea (ox_checkpoint, ox_pop_eval, ox_select, ox_seq_transform, ox_replace); - ox_mig.setOwner (ox_ea); - - ox_ea (ox_pop); /* Application to the given population */ - // -------------------------------------------------------------------------------------------------- - - - - // The Second EA ------------------------------------------------------------------------------------ - - RouteInit route_init2; /* Its builds random routes */ - RouteEval full_eval2; /* Full route evaluator */ - - OrderXover order_cross2; /* Recombination */ - CitySwap city_swap_mut2; /* Mutation */ - - - eoPop ox_pop2 (POP_SIZE, route_init2); /* Population */ - - - eoGenContinue ox_cont2 (NUM_GEN); /* A fixed number of iterations */ - eoCheckPoint ox_checkpoint2 (ox_cont2); /* Checkpoint */ - peoSeqPopEval ox_pop_eval2 (full_eval2); - eoStochTournamentSelect ox_select_one2; - eoSelectNumber ox_select2 (ox_select_one2, POP_SIZE); - eoSGATransform ox_transform2 (order_cross2, CROSS_RATE, city_swap_mut2, MUT_RATE); - peoSeqTransform ox_seq_transform2 (ox_transform2); - eoEPReplacement ox_replace2 (2); - - /* The migration policy */ - eoPeriodicContinue ox_mig_cont2 (MIG_FREQ); /* Migration occurs periodically */ - eoStochTournamentSelect ox_mig_select_one2; /* Emigrants are randomly selected */ - eoSelectNumber ox_mig_select2 (ox_mig_select_one2, MIG_SIZE); - eoPlusReplacement ox_mig_replace2; /* Immigrants replace the worse individuals */ - - peoAsyncIslandMig ox_mig2 (ox_mig_cont2, ox_mig_select2, ox_mig_replace2, topo, ox_pop2, ox_pop2); - ox_checkpoint2.add (ox_mig2); - - peoEA ox_ea2 (ox_checkpoint2, ox_pop_eval2, ox_select2, ox_seq_transform2, ox_replace2); - ox_mig2.setOwner (ox_ea2); - - ox_ea2 (ox_pop2); /* Application to the given population */ - // -------------------------------------------------------------------------------------------------- - - - - peo :: run (); - peo :: finalize (); /* Termination */ - - - // rank 0 is assigned to the scheduler in the XML mapping file - if ( getNodeRank() == 1 ) { - - std::cout << "EA[ 0 ] -----> " << ox_pop.best_element().fitness() << std::endl; - std::cout << "EA[ 1 ] -----> " << ox_pop2.best_element().fitness() << std::endl; - } - - - return 0; -} diff --git a/trunk/paradiseo-peo/tutorial/Walkthrough/exampleD.cpp b/trunk/paradiseo-peo/tutorial/Walkthrough/exampleD.cpp deleted file mode 100644 index 5e2c17271..000000000 --- a/trunk/paradiseo-peo/tutorial/Walkthrough/exampleD.cpp +++ /dev/null @@ -1,110 +0,0 @@ -/* -* -* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 -* (C) OPAC Team, LIFL, 2002-2007 -* -* Sebastien Cahon, Alexandru-Adrian Tantar -* -* This software is governed by the CeCILL license under French law and -* abiding by the rules of distribution of free software. You can use, -* modify and/ or redistribute the software under the terms of the CeCILL -* license as circulated by CEA, CNRS and INRIA at the following URL -* "http://www.cecill.info". -* -* As a counterpart to the access to the source code and rights to copy, -* modify and redistribute granted by the license, users are provided only -* with a limited warranty and the software's author, the holder of the -* economic rights, and the successive licensors have only limited liability. -* -* In this respect, the user's attention is drawn to the risks associated -* with loading, using, modifying and/or developing or reproducing the -* software by the user in light of its specific status of free software, -* that may mean that it is complicated to manipulate, and that also -* therefore means that it is reserved for developers and experienced -* professionals having in-depth computer knowledge. Users are therefore -* encouraged to load and test the software's suitability as regards their -* requirements in conditions enabling the security of their systems and/or -* data to be ensured and, more generally, to use and operate it in the -* same conditions as regards security. -* The fact that you are presently reading this means that you have had -* knowledge of the CeCILL license and that you accept its terms. -* -* ParadisEO WebSite : http://paradiseo.gforge.inria.fr -* Contact: paradiseo-help@lists.gforge.inria.fr -* -*/ -// (c) OPAC Team, LIFL, July 2007 -// -// Contact: paradiseo-help@lists.gforge.inria.fr - -#include "param.h" -#include "route_init.h" -#include "route_eval.h" - -#include "order_xover.h" -#include "edge_xover.h" -#include "partial_mapped_xover.h" -#include "city_swap.h" -#include "part_route_eval.h" -#include "merge_route_eval.h" -#include "two_opt_init.h" -#include "two_opt_next.h" -#include "two_opt_incr_eval.h" - -#include - -#define POP_SIZE 10 -#define NUM_GEN 10 -#define CROSS_RATE 1.0 -#define MUT_RATE 0.01 - - - -int main (int __argc, char * * __argv) { - - peo :: init (__argc, __argv); - - - loadParameters (__argc, __argv); /* Processing some parameters relative to the tackled - problem (TSP) */ - - RouteInit route_init; /* Its builds random routes */ - RouteEval full_eval; /* Full route evaluator */ - - - OrderXover order_cross; /* Recombination */ - CitySwap city_swap_mut; /* Mutation */ - - - /** The EA */ - eoPop ox_pop (POP_SIZE, route_init); /* Population */ - - eoGenContinue ox_cont (NUM_GEN); /* A fixed number of iterations */ - eoCheckPoint ox_checkpoint (ox_cont); /* Checkpoint */ - peoSeqPopEval ox_pop_eval (full_eval); - eoStochTournamentSelect ox_select_one; - eoSelectNumber ox_select (ox_select_one, POP_SIZE); - eoSGATransform ox_transform (order_cross, CROSS_RATE, city_swap_mut, MUT_RATE); - peoSeqTransform ox_para_transform (ox_transform); - eoEPReplacement ox_replace (2); - - - peoEA ox_ea (ox_checkpoint, ox_pop_eval, ox_select, ox_para_transform, ox_replace); - - - ox_ea (ox_pop); /* Application to the given population */ - - peo :: run (); - peo :: finalize (); /* Termination */ - - - - // rank 0 is assigned to the scheduler in the XML mapping file - if ( getNodeRank() == 1 ) { - - std::cout << "EA[ 0 ] -----> " << ox_pop.best_element().fitness() << std::endl; - } - - - return 0; -} diff --git a/trunk/paradiseo-peo/tutorial/Walkthrough/exampleE.cpp b/trunk/paradiseo-peo/tutorial/Walkthrough/exampleE.cpp deleted file mode 100644 index 0812ce9f5..000000000 --- a/trunk/paradiseo-peo/tutorial/Walkthrough/exampleE.cpp +++ /dev/null @@ -1,118 +0,0 @@ -/* -* -* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 -* (C) OPAC Team, LIFL, 2002-2007 -* -* Sebastien Cahon, Alexandru-Adrian Tantar -* -* This software is governed by the CeCILL license under French law and -* abiding by the rules of distribution of free software. You can use, -* modify and/ or redistribute the software under the terms of the CeCILL -* license as circulated by CEA, CNRS and INRIA at the following URL -* "http://www.cecill.info". -* -* As a counterpart to the access to the source code and rights to copy, -* modify and redistribute granted by the license, users are provided only -* with a limited warranty and the software's author, the holder of the -* economic rights, and the successive licensors have only limited liability. -* -* In this respect, the user's attention is drawn to the risks associated -* with loading, using, modifying and/or developing or reproducing the -* software by the user in light of its specific status of free software, -* that may mean that it is complicated to manipulate, and that also -* therefore means that it is reserved for developers and experienced -* professionals having in-depth computer knowledge. Users are therefore -* encouraged to load and test the software's suitability as regards their -* requirements in conditions enabling the security of their systems and/or -* data to be ensured and, more generally, to use and operate it in the -* same conditions as regards security. -* The fact that you are presently reading this means that you have had -* knowledge of the CeCILL license and that you accept its terms. -* -* ParadisEO WebSite : http://paradiseo.gforge.inria.fr -* Contact: paradiseo-help@lists.gforge.inria.fr -* -*/ -// (c) OPAC Team, LIFL, July 2007 -// -// Contact: paradiseo-help@lists.gforge.inria.fr - -#include "param.h" -#include "route_init.h" -#include "route_eval.h" - -#include "order_xover.h" -#include "edge_xover.h" -#include "partial_mapped_xover.h" -#include "city_swap.h" -#include "part_route_eval.h" -#include "merge_route_eval.h" -#include "two_opt_init.h" -#include "two_opt_next.h" -#include "two_opt_incr_eval.h" - -#include - -#define POP_SIZE 10 -#define NUM_GEN 10 -#define CROSS_RATE 1.0 -#define MUT_RATE 0.01 - -#define NUM_PART_EVALS 2 - - -int main (int __argc, char * * __argv) { - - peo :: init (__argc, __argv); - - - loadParameters (__argc, __argv); /* Processing some parameters relative to the tackled - problem (TSP) */ - - RouteInit route_init; /* Its builds random routes */ - RouteEval full_eval; /* Full route evaluator */ - - - MergeRouteEval merge_eval; - - std :: vector *> part_eval; - for (unsigned i = 1 ; i <= NUM_PART_EVALS ; i ++) - part_eval.push_back (new PartRouteEval ((float) (i - 1) / NUM_PART_EVALS, (float) i / NUM_PART_EVALS)); - - - OrderXover order_cross; /* Recombination */ - CitySwap city_swap_mut; /* Mutation */ - - - /** The EA */ - eoPop ox_pop (POP_SIZE, route_init); /* Population */ - - eoGenContinue ox_cont (NUM_GEN); /* A fixed number of iterations */ - eoCheckPoint ox_checkpoint (ox_cont); /* Checkpoint */ - peoParaPopEval ox_pop_eval (full_eval); - eoStochTournamentSelect ox_select_one; - eoSelectNumber ox_select (ox_select_one, POP_SIZE); - eoSGATransform ox_transform (order_cross, CROSS_RATE, city_swap_mut, MUT_RATE); - peoSeqTransform ox_para_transform (ox_transform); - eoEPReplacement ox_replace (2); - - - peoEA ox_ea (ox_checkpoint, ox_pop_eval, ox_select, ox_para_transform, ox_replace); - - - ox_ea (ox_pop); /* Application to the given population */ - - peo :: run (); - peo :: finalize (); /* Termination */ - - - - // rank 0 is assigned to the scheduler in the XML mapping file - if ( getNodeRank() == 1 ) { - - std::cout << "EA[ 0 ] -----> " << ox_pop.best_element().fitness() << std::endl; - } - - - return 0; -} diff --git a/trunk/paradiseo-peo/tutorial/Walkthrough/paradiseo-peo-lsn.doxyfile b/trunk/paradiseo-peo/tutorial/Walkthrough/paradiseo-peo-lsn.doxyfile deleted file mode 100644 index 9f9d15d8f..000000000 --- a/trunk/paradiseo-peo/tutorial/Walkthrough/paradiseo-peo-lsn.doxyfile +++ /dev/null @@ -1,241 +0,0 @@ -# Doxyfile 1.4.7 - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- -PROJECT_NAME = "ParadisEO-PEO Lesson1" -PROJECT_NUMBER = 0.1 -OUTPUT_DIRECTORY = ../../docs/html/lesson1 -CREATE_SUBDIRS = NO -OUTPUT_LANGUAGE = English -USE_WINDOWS_ENCODING = NO -BRIEF_MEMBER_DESC = YES -REPEAT_BRIEF = YES -ABBREVIATE_BRIEF = "The $name class" \ - "The $name widget" \ - "The $name file" \ - is \ - provides \ - specifies \ - contains \ - represents \ - a \ - an \ - the -ALWAYS_DETAILED_SEC = NO -INLINE_INHERITED_MEMB = NO -FULL_PATH_NAMES = NO -STRIP_FROM_PATH = -STRIP_FROM_INC_PATH = -SHORT_NAMES = NO -JAVADOC_AUTOBRIEF = YES -MULTILINE_CPP_IS_BRIEF = NO -DETAILS_AT_TOP = NO -INHERIT_DOCS = YES -SEPARATE_MEMBER_PAGES = NO -TAB_SIZE = 8 -ALIASES = -OPTIMIZE_OUTPUT_FOR_C = NO -OPTIMIZE_OUTPUT_JAVA = NO -BUILTIN_STL_SUPPORT = NO -DISTRIBUTE_GROUP_DOC = NO -SUBGROUPING = YES -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- -EXTRACT_ALL = NO -EXTRACT_PRIVATE = YES -EXTRACT_STATIC = YES -EXTRACT_LOCAL_CLASSES = YES -EXTRACT_LOCAL_METHODS = NO -HIDE_UNDOC_MEMBERS = YES -HIDE_UNDOC_CLASSES = YES -HIDE_FRIEND_COMPOUNDS = NO -HIDE_IN_BODY_DOCS = NO -INTERNAL_DOCS = NO -CASE_SENSE_NAMES = YES -HIDE_SCOPE_NAMES = NO -SHOW_INCLUDE_FILES = YES -INLINE_INFO = YES -SORT_MEMBER_DOCS = NO -SORT_BRIEF_DOCS = NO -SORT_BY_SCOPE_NAME = NO -GENERATE_TODOLIST = YES -GENERATE_TESTLIST = YES -GENERATE_BUGLIST = YES -GENERATE_DEPRECATEDLIST= YES -ENABLED_SECTIONS = -MAX_INITIALIZER_LINES = 30 -SHOW_USED_FILES = YES -SHOW_DIRECTORIES = NO -FILE_VERSION_FILTER = -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- -QUIET = YES -WARNINGS = YES -WARN_IF_UNDOCUMENTED = YES -WARN_IF_DOC_ERROR = YES -WARN_NO_PARAMDOC = NO -WARN_FORMAT = "$file:$line: $text" -WARN_LOGFILE = -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- -INPUT = . -FILE_PATTERNS = *.cpp \ - *.h \ - NEWS \ - README -RECURSIVE = YES -EXCLUDE = -EXCLUDE_SYMLINKS = NO -EXCLUDE_PATTERNS = -EXAMPLE_PATH = -EXAMPLE_PATTERNS = * -EXAMPLE_RECURSIVE = NO -IMAGE_PATH = ../../docs/images -INPUT_FILTER = -FILTER_PATTERNS = -FILTER_SOURCE_FILES = NO -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- -SOURCE_BROWSER = YES -INLINE_SOURCES = NO -STRIP_CODE_COMMENTS = YES -REFERENCED_BY_RELATION = YES -REFERENCES_RELATION = YES -REFERENCES_LINK_SOURCE = YES -USE_HTAGS = NO -VERBATIM_HEADERS = YES -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- -ALPHABETICAL_INDEX = YES -COLS_IN_ALPHA_INDEX = 3 -IGNORE_PREFIX = peo -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- -GENERATE_HTML = YES -HTML_OUTPUT = html -HTML_FILE_EXTENSION = .html -HTML_HEADER = -HTML_FOOTER = -HTML_STYLESHEET = -HTML_ALIGN_MEMBERS = YES -GENERATE_HTMLHELP = NO -CHM_FILE = -HHC_LOCATION = -GENERATE_CHI = NO -BINARY_TOC = NO -TOC_EXPAND = NO -DISABLE_INDEX = NO -ENUM_VALUES_PER_LINE = 4 -GENERATE_TREEVIEW = YES -TREEVIEW_WIDTH = 250 -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- -GENERATE_LATEX = YES -LATEX_OUTPUT = latex -LATEX_CMD_NAME = latex -MAKEINDEX_CMD_NAME = makeindex -COMPACT_LATEX = NO -PAPER_TYPE = a4wide -EXTRA_PACKAGES = -LATEX_HEADER = -PDF_HYPERLINKS = YES -USE_PDFLATEX = YES -LATEX_BATCHMODE = NO -LATEX_HIDE_INDICES = NO -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- -GENERATE_RTF = NO -RTF_OUTPUT = rtf -COMPACT_RTF = NO -RTF_HYPERLINKS = NO -RTF_STYLESHEET_FILE = -RTF_EXTENSIONS_FILE = -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- -GENERATE_MAN = YES -MAN_OUTPUT = man -MAN_EXTENSION = .3 -MAN_LINKS = NO -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- -GENERATE_XML = NO -XML_OUTPUT = xml -XML_SCHEMA = -XML_DTD = -XML_PROGRAMLISTING = YES -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- -GENERATE_AUTOGEN_DEF = NO -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- -GENERATE_PERLMOD = NO -PERLMOD_LATEX = NO -PERLMOD_PRETTY = YES -PERLMOD_MAKEVAR_PREFIX = -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- -ENABLE_PREPROCESSING = YES -MACRO_EXPANSION = NO -EXPAND_ONLY_PREDEF = NO -SEARCH_INCLUDES = YES -INCLUDE_PATH = -INCLUDE_FILE_PATTERNS = -PREDEFINED = -EXPAND_AS_DEFINED = -SKIP_FUNCTION_MACROS = YES -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- -TAGFILES = ../../../paradiseo-mo/docs/eo.doxytag=../../../../../paradiseo-mo/docs/html \ - ../../../paradiseo-mo/docs/mo.doxytag=../../../../../paradiseo-mo/docs/html \ - ../../docs/paradiseo-peo.doxytag=../../ \ - ../shared/paradiseo-peo-lsn-shared.doxytag=../../lsnshared/html -GENERATE_TAGFILE = ../../docs/paradiseo-peo-lsn.doxytag -ALLEXTERNALS = NO -EXTERNAL_GROUPS = YES -PERL_PATH = /usr/bin/perl -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- -CLASS_DIAGRAMS = YES -HIDE_UNDOC_RELATIONS = YES -HAVE_DOT = NO -CLASS_GRAPH = YES -COLLABORATION_GRAPH = YES -GROUP_GRAPHS = YES -UML_LOOK = NO -TEMPLATE_RELATIONS = NO -INCLUDE_GRAPH = YES -INCLUDED_BY_GRAPH = YES -CALL_GRAPH = NO -CALLER_GRAPH = NO -GRAPHICAL_HIERARCHY = YES -DIRECTORY_GRAPH = YES -DOT_IMAGE_FORMAT = png -DOT_PATH = -DOTFILE_DIRS = -MAX_DOT_GRAPH_WIDTH = 1024 -MAX_DOT_GRAPH_HEIGHT = 1024 -MAX_DOT_GRAPH_DEPTH = 0 -DOT_TRANSPARENT = NO -DOT_MULTI_TARGETS = NO -GENERATE_LEGEND = YES -DOT_CLEANUP = YES -#--------------------------------------------------------------------------- -# Configuration::additions related to the search engine -#--------------------------------------------------------------------------- -SEARCHENGINE = YES