From c95ec0de14bf574fc1ff4ec3e4366e9642b069a1 Mon Sep 17 00:00:00 2001 From: boufaras Date: Thu, 12 Jan 2012 10:34:43 +0000 Subject: [PATCH] clear and update srcs with # change git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2645 331e1502-861f-0410-8da2-ba01fb791d7f --- .../tutorial/Lesson10/CMakeLists.txt | 39 ---- .../Lesson10/testKswapNeighborhood.cu | 216 ------------------ 2 files changed, 255 deletions(-) delete mode 100644 branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Lesson10/CMakeLists.txt delete mode 100644 branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Lesson10/testKswapNeighborhood.cu diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Lesson10/CMakeLists.txt b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Lesson10/CMakeLists.txt deleted file mode 100644 index 0b12203e6..000000000 --- a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Lesson10/CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ -###################################################################################### -### 1) Include the sources -###################################################################################### - -INCLUDE_DIRECTORIES( - - # include EO source directory - ${EO_SRC_DIR}/src - # include MO source directory - ${MO_SRC_DIR}/src - # include problems directory - ${PROBLEMS_SRC_DIR} - # include GPU directory - ${GPU_SRC_DIR}/src - # include your source directory - ${CMAKE_CURRENT_SOURCE_DIR}/../src - ) - -###################################################################################### - -###################################################################################### -### 2) Specify where CMake can find the libraries -###################################################################################### - -LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${CUDA_DIR}/lib ) - -###################################################################################### - -###################################################################################### -### 3) Define your targets and link the librairies -###################################################################################### - -CUDA_ADD_EXECUTABLE(GPUtestKswapNeighborhood testKswapNeighborhood.cu) - -###################################################################################### -### 4) Link the librairies for your target(s) -###################################################################################### - -TARGET_LINK_LIBRARIES(GPUtestKswapNeighborhood eoutils ga eo) diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Lesson10/testKswapNeighborhood.cu b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Lesson10/testKswapNeighborhood.cu deleted file mode 100644 index b41209147..000000000 --- a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Lesson10/testKswapNeighborhood.cu +++ /dev/null @@ -1,216 +0,0 @@ -//----------------------------------------------------------------------------- -/** testKswapNeighborhood.cpp - * - * KB - 20/10/10 - * - */ -//----------------------------------------------------------------------------- - -// standard includes -#define HAVE_SSTREAM - -#include // runtime_error -#include // cout -#include // ostrstream, istrstream -#include -#include - -// the general include for eo -#include -#include - -using namespace std; - -//---------------------------------------------------------------------------- - -//Representation and initializer -#include -#include - -// fitness function -#include -#include -#include - -//Neighbors and Neighborhoods -#include -#include -#include - -#include -#include -#include - -#include -#include -#include - -// Define types of the representation solution, different neighbors and neighborhoods -//----------------------------------------------------------------------------- -typedef eoInt Queen; //Permutation (Queen's problem representation) - -typedef moSwapNeighbor swapNeighbor; //swap Neighbor -typedef moSwapNeighborhood swapNeighborhood; //classical swap Neighborhood - -typedef moXSwapNeighbor xSwapNeighbor; //X-Swap Neighbor -typedef moXChangeNeighborhood xSwapNeighborhood; // x-Swap Neighborhood - -void main_function(int argc, char **argv) { - - /* ========================================================= - * - * Parameters - * - * ========================================================= */ - - // First define a parser from the command-line arguments - eoParser parser(argc, argv); - - // For each parameter, define Parameter, read it through the parser, - // and assign the value to the variable - - eoValueParam - seedParam(time(0), "seed", "Random number seed", 'S'); - parser.processParam(seedParam); - unsigned seed = seedParam.value(); - - // description of genotype - eoValueParam vecSizeParam(6, "vecSize", "Genotype size", 'V'); - parser.processParam(vecSizeParam, "Representation"); - unsigned vecSize = vecSizeParam.value(); - - // Swap number - eoValueParam xSwapParam(2, "xSwap", "swap number", 'X'); - parser.processParam(xSwapParam, "xSwap"); - unsigned xSwap = xSwapParam.value(); - - // the name of the "status" file where all actual parameter values will be saved - string str_status = parser.ProgramName() + ".status"; // default value - eoValueParam statusParam(str_status.c_str(), "status", - "Status file"); - parser.processParam(statusParam, "Persistence"); - - // do the following AFTER ALL PARAMETERS HAVE BEEN PROCESSED - // i.e. in case you need parameters somewhere else, postpone these - if (parser.userNeedsHelp()) { - parser.printHelp(cout); - exit(1); - } - if (statusParam.value() != "") { - ofstream os(statusParam.value().c_str()); - os << parser;// and you can use that file as parameter file - } - - /* ========================================================= - * - * Random seed - * - * ========================================================= */ - - //reproducible random seed: if you don't change SEED above, - // you'll aways get the same result, NOT a random run - rng.reseed(seed); - - /* ========================================================= - * - * Eval fitness function - * - * ========================================================= */ - - queenEval fullEval; - - /* ========================================================= - * - * Initializer of the solution - * - * ========================================================= */ - - eoInitPermutation init(vecSize); - - /* ========================================================= - * - * evaluation operators of a neighbor solution - * - * ========================================================= */ - - moFullEvalByModif swapEval(fullEval); - - moFullEvalByModif xSwapEval(fullEval); - - /* ========================================================= - * - * Neighbors and Neighborhoods - * - * ========================================================= */ - - swapNeighborhood swapNH; - xSwapNeighborhood xSwapNH(sizeMapping(vecSize,xSwap), xSwap); - - swapNeighbor n1; - xSwapNeighbor nk(xSwap); - - /* ========================================================= - * - * Init and eval a Queen - * - * ========================================================= */ - - Queen solution; - - init(solution); - - fullEval(solution); - - std::cout << "Initial Solution:" << std::endl; - std::cout << solution << std::endl << std::endl; - - /* ========================================================= - * - * Use classical Neighbor and Neighborhood (swap) - * - * ========================================================= */ - - std::cout << "SWAP NEIGHBORHOOD" << std::endl; - std::cout << "-----------------" << std::endl; - std::cout << "Neighbors List: (Neighbor -> fitness)" << std::endl; - - swapNH.init(solution, n1); - swapEval(solution, n1); - n1.print(); - while (swapNH.cont(solution)) { - swapNH.next(solution, n1); - swapEval(solution, n1); - n1.print(); - } - - /* ========================================================= - * - * Use K-swap Neighbor and Neighborhood (swap) - * - * ========================================================= */ - - std::cout << "K-SWAP NEIGHBORHOOD" << std::endl; - std::cout << "-----------------" << std::endl; - std::cout << "Neighbors List: (Neighbor -> fitness)" << std::endl; - std::cout << solution << std::endl << std::endl; - xSwapNH.init(solution, nk); - xSwapEval(solution, nk); - nk.print(); - while (xSwapNH.cont(solution)) { - xSwapNH.next(solution, nk); - xSwapEval(solution, nk); - nk.print(); - } - -} - -// A main that catches the exceptions - -int main(int argc, char **argv) { - try { - main_function(argc, argv); - } catch (exception& e) { - cout << "Exception: " << e.what() << '\n'; - } - return 1; -}