From b37b5887f64158849717c51a90ac07f9b26a1876 Mon Sep 17 00:00:00 2001 From: liefooga Date: Wed, 4 Jul 2007 14:00:17 +0000 Subject: [PATCH] new architecture git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@510 331e1502-861f-0410-8da2-ba01fb791d7f --- .../tutorial/Lesson1/CMakeLists.txt | 134 ++++++++++++++++- .../tutorial/Lesson1/{src => }/FlowShopEA.cpp | 0 .../tutorial/Lesson1/src/CMakeLists.txt | 142 ------------------ .../src => examples}/flowshop/CMakeLists.txt | 0 .../src => examples}/flowshop/FlowShop.cpp | 0 .../src => examples}/flowshop/FlowShop.h | 0 .../flowshop/FlowShopBenchmarkParser.cpp | 0 .../flowshop/FlowShopBenchmarkParser.h | 0 .../flowshop/FlowShopEval.cpp | 0 .../src => examples}/flowshop/FlowShopEval.h | 0 .../flowshop/FlowShopInit.cpp | 0 .../src => examples}/flowshop/FlowShopInit.h | 0 .../flowshop/FlowShopObjectiveVector.h | 0 .../FlowShopObjectiveVectorTraits.cpp | 0 .../flowshop/FlowShopObjectiveVectorTraits.h | 0 .../flowshop/FlowShopOpCrossoverQuad.cpp | 0 .../flowshop/FlowShopOpCrossoverQuad.h | 0 .../flowshop/FlowShopOpMutationExchange.cpp | 0 .../flowshop/FlowShopOpMutationExchange.h | 0 .../flowshop/FlowShopOpMutationShift.cpp | 0 .../flowshop/FlowShopOpMutationShift.h | 0 .../flowshop}/benchs/020_05_01.txt | 0 .../flowshop}/benchs/020_05_02.txt | 0 .../flowshop}/benchs/020_10_01.txt | 0 .../flowshop}/benchs/020_10_02.txt | 0 .../flowshop}/benchs/020_20_01.txt | 0 .../flowshop}/benchs/050_05_01.txt | 0 .../flowshop}/benchs/050_10_01.txt | 0 .../flowshop}/benchs/050_20_01.txt | 0 .../flowshop}/benchs/100_05_01.txt | 0 .../flowshop}/benchs/100_10_01.txt | 0 .../flowshop}/benchs/100_20_01.txt | 0 .../flowshop}/benchs/200_10_01.txt | 0 .../flowshop}/benchs/README | 0 .../flowshop/make_eval_FlowShop.h | 0 .../flowshop/make_genotype_FlowShop.h | 0 .../flowshop/make_op_FlowShop.h | 0 37 files changed, 130 insertions(+), 146 deletions(-) rename trunk/paradiseo-moeo/tutorial/Lesson1/{src => }/FlowShopEA.cpp (100%) delete mode 100644 trunk/paradiseo-moeo/tutorial/Lesson1/src/CMakeLists.txt rename trunk/paradiseo-moeo/tutorial/{Lesson1/src => examples}/flowshop/CMakeLists.txt (100%) rename trunk/paradiseo-moeo/tutorial/{Lesson1/src => examples}/flowshop/FlowShop.cpp (100%) rename trunk/paradiseo-moeo/tutorial/{Lesson1/src => examples}/flowshop/FlowShop.h (100%) rename trunk/paradiseo-moeo/tutorial/{Lesson1/src => examples}/flowshop/FlowShopBenchmarkParser.cpp (100%) rename trunk/paradiseo-moeo/tutorial/{Lesson1/src => examples}/flowshop/FlowShopBenchmarkParser.h (100%) rename trunk/paradiseo-moeo/tutorial/{Lesson1/src => examples}/flowshop/FlowShopEval.cpp (100%) rename trunk/paradiseo-moeo/tutorial/{Lesson1/src => examples}/flowshop/FlowShopEval.h (100%) rename trunk/paradiseo-moeo/tutorial/{Lesson1/src => examples}/flowshop/FlowShopInit.cpp (100%) rename trunk/paradiseo-moeo/tutorial/{Lesson1/src => examples}/flowshop/FlowShopInit.h (100%) rename trunk/paradiseo-moeo/tutorial/{Lesson1/src => examples}/flowshop/FlowShopObjectiveVector.h (100%) rename trunk/paradiseo-moeo/tutorial/{Lesson1/src => examples}/flowshop/FlowShopObjectiveVectorTraits.cpp (100%) rename trunk/paradiseo-moeo/tutorial/{Lesson1/src => examples}/flowshop/FlowShopObjectiveVectorTraits.h (100%) rename trunk/paradiseo-moeo/tutorial/{Lesson1/src => examples}/flowshop/FlowShopOpCrossoverQuad.cpp (100%) rename trunk/paradiseo-moeo/tutorial/{Lesson1/src => examples}/flowshop/FlowShopOpCrossoverQuad.h (100%) rename trunk/paradiseo-moeo/tutorial/{Lesson1/src => examples}/flowshop/FlowShopOpMutationExchange.cpp (100%) rename trunk/paradiseo-moeo/tutorial/{Lesson1/src => examples}/flowshop/FlowShopOpMutationExchange.h (100%) rename trunk/paradiseo-moeo/tutorial/{Lesson1/src => examples}/flowshop/FlowShopOpMutationShift.cpp (100%) rename trunk/paradiseo-moeo/tutorial/{Lesson1/src => examples}/flowshop/FlowShopOpMutationShift.h (100%) rename trunk/paradiseo-moeo/tutorial/{Lesson1 => examples/flowshop}/benchs/020_05_01.txt (100%) rename trunk/paradiseo-moeo/tutorial/{Lesson1 => examples/flowshop}/benchs/020_05_02.txt (100%) rename trunk/paradiseo-moeo/tutorial/{Lesson1 => examples/flowshop}/benchs/020_10_01.txt (100%) rename trunk/paradiseo-moeo/tutorial/{Lesson1 => examples/flowshop}/benchs/020_10_02.txt (100%) rename trunk/paradiseo-moeo/tutorial/{Lesson1 => examples/flowshop}/benchs/020_20_01.txt (100%) rename trunk/paradiseo-moeo/tutorial/{Lesson1 => examples/flowshop}/benchs/050_05_01.txt (100%) rename trunk/paradiseo-moeo/tutorial/{Lesson1 => examples/flowshop}/benchs/050_10_01.txt (100%) rename trunk/paradiseo-moeo/tutorial/{Lesson1 => examples/flowshop}/benchs/050_20_01.txt (100%) rename trunk/paradiseo-moeo/tutorial/{Lesson1 => examples/flowshop}/benchs/100_05_01.txt (100%) rename trunk/paradiseo-moeo/tutorial/{Lesson1 => examples/flowshop}/benchs/100_10_01.txt (100%) rename trunk/paradiseo-moeo/tutorial/{Lesson1 => examples/flowshop}/benchs/100_20_01.txt (100%) rename trunk/paradiseo-moeo/tutorial/{Lesson1 => examples/flowshop}/benchs/200_10_01.txt (100%) rename trunk/paradiseo-moeo/tutorial/{Lesson1 => examples/flowshop}/benchs/README (100%) rename trunk/paradiseo-moeo/tutorial/{Lesson1/src => examples}/flowshop/make_eval_FlowShop.h (100%) rename trunk/paradiseo-moeo/tutorial/{Lesson1/src => examples}/flowshop/make_genotype_FlowShop.h (100%) rename trunk/paradiseo-moeo/tutorial/{Lesson1/src => examples}/flowshop/make_op_FlowShop.h (100%) diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/CMakeLists.txt b/trunk/paradiseo-moeo/tutorial/Lesson1/CMakeLists.txt index 777ecfb42..d29b34f5a 100644 --- a/trunk/paradiseo-moeo/tutorial/Lesson1/CMakeLists.txt +++ b/trunk/paradiseo-moeo/tutorial/Lesson1/CMakeLists.txt @@ -1,16 +1,142 @@ + ###################################################################################### -### 0) Need lesson1 directory +### 0) Need flowhsop directory ###################################################################################### -SET(TUTORIAL_LESSON1_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +SET(FLOWSHOP_EXAMPLE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/flowshop) ###################################################################################### + + ###################################################################################### -### 5) Where should CMake go now ? +### 1) Include the sources ###################################################################################### -SUBDIRS(src) +INCLUDE_DIRECTORIES(${EO_SRC_DIR}) +INCLUDE_DIRECTORIES(${EO_SRC_DIR}/utils) +INCLUDE_DIRECTORIES(${MOEO_SRC_DIR}) +INCLUDE_DIRECTORIES(${FLOWSHOP_EXAMPLE_DIR}) +###################################################################################### + + + +###################################################################################### +### 2) Specify where CMake can find the libraries (mandatory: before 3) ) +###################################################################################### + +# --> UNIX +IF(UNIX) + LINK_DIRECTORIES(${EO_SRC_DIR} ${EO_SRC_DIR}/utils ${MOEO_DIR}/build ${TUTORIAL_LESSON1_DIR}/build) + +# --> WIN +ELSEIF(WIN32) + # "CMAKE_BUILD_TYPE" supposed to be given on the command line, default=Debug + IF (NOT DEFINED CMAKE_BUILD_TYPE) + set (CMAKE_BUILD_TYPE Debug) + ENDIF (NOT DEFINED CMAKE_BUILD_TYPE) + + IF (CMAKE_BUILD_TYPE STREQUAL Debug) + LINK_DIRECTORIES(${TUTORIAL_LESSON1_DIR}\\build\\debug) + LINK_DIRECTORIES(${EO_LIB_DIR}\\debug) + ELSEIF(CMAKE_BUILD_TYPE STREQUAL Release) + LINK_DIRECTORIES(${TUTORIAL_LESSON1_DIR}\\build\\release) + LINK_DIRECTORIES(${EO_LIB_DIR}\\release) + ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug) + +ENDIF(UNIX) + +###################################################################################### + + + +###################################################################################### +### 3) Define your target(s): just an executable here +###################################################################################### + +# no matter what is the OS, hopefully +ADD_EXECUTABLE(FlowShopEA FlowShopEA.cpp) + +ADD_DEPENDENCIES(FlowShopEA moeo) +ADD_DEPENDENCIES(FlowShopEA flowshop) + +SET(EXECUTABLE_OUTPUT_PATH ${TUTORIAL_LESSON1_DIR}/build) +###################################################################################### + + + +###################################################################################### +### 4) Optionnal: define your target(s)'s version: no effect for windows +###################################################################################### + +SET(FLOWSHOPEA_VERSION "1.0.beta") +SET_TARGET_PROPERTIES(FlowShopEA PROPERTIES VERSION "${FLOWSHOPEA_VERSION}") +###################################################################################### + + + +###################################################################################### +### 5) Link the librairies for your target(s) +###################################################################################### + +# --> UNIX +IF(UNIX) + TARGET_LINK_LIBRARIES(FlowShopEA moeo) + TARGET_LINK_LIBRARIES(FlowShopEA flowshop) + TARGET_LINK_LIBRARIES(FlowShopEA eo) + TARGET_LINK_LIBRARIES(FlowShopEA eoutils) + +# --> WIN +ELSEIF(WIN32) + # "CMAKE_BUILD_TYPE" supposed to be given on the command line, default=Debug + IF (NOT DEFINED CMAKE_BUILD_TYPE) + set (CMAKE_BUILD_TYPE Debug) + ENDIF (NOT DEFINED CMAKE_BUILD_TYPE) + + IF (CMAKE_BUILD_TYPE STREQUAL Debug) + TARGET_LINK_LIBRARIES(FlowShopEA moeo) + TARGET_LINK_LIBRARIES(FlowShopEA flowshop) + TARGET_LINK_LIBRARIES(FlowShopEA eod) + TARGET_LINK_LIBRARIES(FlowShopEA eoutilsd) + ELSEIF(CMAKE_BUILD_TYPE STREQUAL Release) + TARGET_LINK_LIBRARIES(FlowShopEA moeo) + TARGET_LINK_LIBRARIES(FlowShopEA flowshop) + TARGET_LINK_LIBRARIES(FlowShopEA eo) + TARGET_LINK_LIBRARIES(FlowShopEA eoutils) + ELSE(CMAKE_BUILD_TYPE STREQUAL Debug) + MESSAGE(FATAL_ERROR " Cmake build type can only be \"Debug\" or \"Release\" ") + ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug) + +ENDIF(UNIX) +###################################################################################### + + + +###################################################################################### +### 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) +###################################################################################### + + +###################################################################################### +### 7) Where should CMake go now ? +###################################################################################### + +SUBDIRS(${FLOWSHOP_EXAMPLE_DIR}) ###################################################################################### diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/src/FlowShopEA.cpp b/trunk/paradiseo-moeo/tutorial/Lesson1/FlowShopEA.cpp similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/src/FlowShopEA.cpp rename to trunk/paradiseo-moeo/tutorial/Lesson1/FlowShopEA.cpp diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/src/CMakeLists.txt b/trunk/paradiseo-moeo/tutorial/Lesson1/src/CMakeLists.txt deleted file mode 100644 index d29b34f5a..000000000 --- a/trunk/paradiseo-moeo/tutorial/Lesson1/src/CMakeLists.txt +++ /dev/null @@ -1,142 +0,0 @@ - -###################################################################################### -### 0) Need flowhsop directory -###################################################################################### - -SET(FLOWSHOP_EXAMPLE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/flowshop) - -###################################################################################### - - - -###################################################################################### -### 1) Include the sources -###################################################################################### - -INCLUDE_DIRECTORIES(${EO_SRC_DIR}) -INCLUDE_DIRECTORIES(${EO_SRC_DIR}/utils) -INCLUDE_DIRECTORIES(${MOEO_SRC_DIR}) -INCLUDE_DIRECTORIES(${FLOWSHOP_EXAMPLE_DIR}) -###################################################################################### - - - -###################################################################################### -### 2) Specify where CMake can find the libraries (mandatory: before 3) ) -###################################################################################### - -# --> UNIX -IF(UNIX) - LINK_DIRECTORIES(${EO_SRC_DIR} ${EO_SRC_DIR}/utils ${MOEO_DIR}/build ${TUTORIAL_LESSON1_DIR}/build) - -# --> WIN -ELSEIF(WIN32) - # "CMAKE_BUILD_TYPE" supposed to be given on the command line, default=Debug - IF (NOT DEFINED CMAKE_BUILD_TYPE) - set (CMAKE_BUILD_TYPE Debug) - ENDIF (NOT DEFINED CMAKE_BUILD_TYPE) - - IF (CMAKE_BUILD_TYPE STREQUAL Debug) - LINK_DIRECTORIES(${TUTORIAL_LESSON1_DIR}\\build\\debug) - LINK_DIRECTORIES(${EO_LIB_DIR}\\debug) - ELSEIF(CMAKE_BUILD_TYPE STREQUAL Release) - LINK_DIRECTORIES(${TUTORIAL_LESSON1_DIR}\\build\\release) - LINK_DIRECTORIES(${EO_LIB_DIR}\\release) - ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug) - -ENDIF(UNIX) - -###################################################################################### - - - -###################################################################################### -### 3) Define your target(s): just an executable here -###################################################################################### - -# no matter what is the OS, hopefully -ADD_EXECUTABLE(FlowShopEA FlowShopEA.cpp) - -ADD_DEPENDENCIES(FlowShopEA moeo) -ADD_DEPENDENCIES(FlowShopEA flowshop) - -SET(EXECUTABLE_OUTPUT_PATH ${TUTORIAL_LESSON1_DIR}/build) -###################################################################################### - - - -###################################################################################### -### 4) Optionnal: define your target(s)'s version: no effect for windows -###################################################################################### - -SET(FLOWSHOPEA_VERSION "1.0.beta") -SET_TARGET_PROPERTIES(FlowShopEA PROPERTIES VERSION "${FLOWSHOPEA_VERSION}") -###################################################################################### - - - -###################################################################################### -### 5) Link the librairies for your target(s) -###################################################################################### - -# --> UNIX -IF(UNIX) - TARGET_LINK_LIBRARIES(FlowShopEA moeo) - TARGET_LINK_LIBRARIES(FlowShopEA flowshop) - TARGET_LINK_LIBRARIES(FlowShopEA eo) - TARGET_LINK_LIBRARIES(FlowShopEA eoutils) - -# --> WIN -ELSEIF(WIN32) - # "CMAKE_BUILD_TYPE" supposed to be given on the command line, default=Debug - IF (NOT DEFINED CMAKE_BUILD_TYPE) - set (CMAKE_BUILD_TYPE Debug) - ENDIF (NOT DEFINED CMAKE_BUILD_TYPE) - - IF (CMAKE_BUILD_TYPE STREQUAL Debug) - TARGET_LINK_LIBRARIES(FlowShopEA moeo) - TARGET_LINK_LIBRARIES(FlowShopEA flowshop) - TARGET_LINK_LIBRARIES(FlowShopEA eod) - TARGET_LINK_LIBRARIES(FlowShopEA eoutilsd) - ELSEIF(CMAKE_BUILD_TYPE STREQUAL Release) - TARGET_LINK_LIBRARIES(FlowShopEA moeo) - TARGET_LINK_LIBRARIES(FlowShopEA flowshop) - TARGET_LINK_LIBRARIES(FlowShopEA eo) - TARGET_LINK_LIBRARIES(FlowShopEA eoutils) - ELSE(CMAKE_BUILD_TYPE STREQUAL Debug) - MESSAGE(FATAL_ERROR " Cmake build type can only be \"Debug\" or \"Release\" ") - ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug) - -ENDIF(UNIX) -###################################################################################### - - - -###################################################################################### -### 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) -###################################################################################### - - -###################################################################################### -### 7) Where should CMake go now ? -###################################################################################### - -SUBDIRS(${FLOWSHOP_EXAMPLE_DIR}) - -###################################################################################### - diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/CMakeLists.txt b/trunk/paradiseo-moeo/tutorial/examples/flowshop/CMakeLists.txt similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/CMakeLists.txt rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/CMakeLists.txt diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShop.cpp b/trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShop.cpp similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShop.cpp rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShop.cpp diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShop.h b/trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShop.h similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShop.h rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShop.h diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShopBenchmarkParser.cpp b/trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShopBenchmarkParser.cpp similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShopBenchmarkParser.cpp rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShopBenchmarkParser.cpp diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShopBenchmarkParser.h b/trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShopBenchmarkParser.h similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShopBenchmarkParser.h rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShopBenchmarkParser.h diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShopEval.cpp b/trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShopEval.cpp similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShopEval.cpp rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShopEval.cpp diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShopEval.h b/trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShopEval.h similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShopEval.h rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShopEval.h diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShopInit.cpp b/trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShopInit.cpp similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShopInit.cpp rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShopInit.cpp diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShopInit.h b/trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShopInit.h similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShopInit.h rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShopInit.h diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShopObjectiveVector.h b/trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShopObjectiveVector.h similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShopObjectiveVector.h rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShopObjectiveVector.h diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShopObjectiveVectorTraits.cpp b/trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShopObjectiveVectorTraits.cpp similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShopObjectiveVectorTraits.cpp rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShopObjectiveVectorTraits.cpp diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShopObjectiveVectorTraits.h b/trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShopObjectiveVectorTraits.h similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShopObjectiveVectorTraits.h rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShopObjectiveVectorTraits.h diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShopOpCrossoverQuad.cpp b/trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShopOpCrossoverQuad.cpp similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShopOpCrossoverQuad.cpp rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShopOpCrossoverQuad.cpp diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShopOpCrossoverQuad.h b/trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShopOpCrossoverQuad.h similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShopOpCrossoverQuad.h rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShopOpCrossoverQuad.h diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShopOpMutationExchange.cpp b/trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShopOpMutationExchange.cpp similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShopOpMutationExchange.cpp rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShopOpMutationExchange.cpp diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShopOpMutationExchange.h b/trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShopOpMutationExchange.h similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShopOpMutationExchange.h rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShopOpMutationExchange.h diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShopOpMutationShift.cpp b/trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShopOpMutationShift.cpp similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShopOpMutationShift.cpp rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShopOpMutationShift.cpp diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShopOpMutationShift.h b/trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShopOpMutationShift.h similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/FlowShopOpMutationShift.h rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/FlowShopOpMutationShift.h diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/benchs/020_05_01.txt b/trunk/paradiseo-moeo/tutorial/examples/flowshop/benchs/020_05_01.txt similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/benchs/020_05_01.txt rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/benchs/020_05_01.txt diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/benchs/020_05_02.txt b/trunk/paradiseo-moeo/tutorial/examples/flowshop/benchs/020_05_02.txt similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/benchs/020_05_02.txt rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/benchs/020_05_02.txt diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/benchs/020_10_01.txt b/trunk/paradiseo-moeo/tutorial/examples/flowshop/benchs/020_10_01.txt similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/benchs/020_10_01.txt rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/benchs/020_10_01.txt diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/benchs/020_10_02.txt b/trunk/paradiseo-moeo/tutorial/examples/flowshop/benchs/020_10_02.txt similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/benchs/020_10_02.txt rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/benchs/020_10_02.txt diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/benchs/020_20_01.txt b/trunk/paradiseo-moeo/tutorial/examples/flowshop/benchs/020_20_01.txt similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/benchs/020_20_01.txt rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/benchs/020_20_01.txt diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/benchs/050_05_01.txt b/trunk/paradiseo-moeo/tutorial/examples/flowshop/benchs/050_05_01.txt similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/benchs/050_05_01.txt rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/benchs/050_05_01.txt diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/benchs/050_10_01.txt b/trunk/paradiseo-moeo/tutorial/examples/flowshop/benchs/050_10_01.txt similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/benchs/050_10_01.txt rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/benchs/050_10_01.txt diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/benchs/050_20_01.txt b/trunk/paradiseo-moeo/tutorial/examples/flowshop/benchs/050_20_01.txt similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/benchs/050_20_01.txt rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/benchs/050_20_01.txt diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/benchs/100_05_01.txt b/trunk/paradiseo-moeo/tutorial/examples/flowshop/benchs/100_05_01.txt similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/benchs/100_05_01.txt rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/benchs/100_05_01.txt diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/benchs/100_10_01.txt b/trunk/paradiseo-moeo/tutorial/examples/flowshop/benchs/100_10_01.txt similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/benchs/100_10_01.txt rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/benchs/100_10_01.txt diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/benchs/100_20_01.txt b/trunk/paradiseo-moeo/tutorial/examples/flowshop/benchs/100_20_01.txt similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/benchs/100_20_01.txt rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/benchs/100_20_01.txt diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/benchs/200_10_01.txt b/trunk/paradiseo-moeo/tutorial/examples/flowshop/benchs/200_10_01.txt similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/benchs/200_10_01.txt rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/benchs/200_10_01.txt diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/benchs/README b/trunk/paradiseo-moeo/tutorial/examples/flowshop/benchs/README similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/benchs/README rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/benchs/README diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/make_eval_FlowShop.h b/trunk/paradiseo-moeo/tutorial/examples/flowshop/make_eval_FlowShop.h similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/make_eval_FlowShop.h rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/make_eval_FlowShop.h diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/make_genotype_FlowShop.h b/trunk/paradiseo-moeo/tutorial/examples/flowshop/make_genotype_FlowShop.h similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/make_genotype_FlowShop.h rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/make_genotype_FlowShop.h diff --git a/trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/make_op_FlowShop.h b/trunk/paradiseo-moeo/tutorial/examples/flowshop/make_op_FlowShop.h similarity index 100% rename from trunk/paradiseo-moeo/tutorial/Lesson1/src/flowshop/make_op_FlowShop.h rename to trunk/paradiseo-moeo/tutorial/examples/flowshop/make_op_FlowShop.h