From 2b96354018ee4506c845712160440a02726a68f4 Mon Sep 17 00:00:00 2001 From: boufaras Date: Wed, 25 May 2011 21:55:00 +0000 Subject: [PATCH] test for different algorithm using oneMax problem git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2273 331e1502-861f-0410-8da2-ba01fb791d7f --- .../tutoriel/OneMax/CMakeLists.txt | 24 +- .../tutoriel/OneMax/moGPUConfig.h | 50 ++++ .../tutoriel/OneMax/testFirstImpr.cu | 38 +-- .../tutoriel/OneMax/testNeutralHC.cu | 42 +-- .../tutoriel/OneMax/testSimpleHC.cu | 36 +-- .../tutoriel/OneMax/testSimpleHCByCpy.cu | 255 ++++++++++++++++++ .../tutoriel/OneMax/testSimpleTS.cu | 47 ++-- .../tutoriel/OneMax/testSimulatedAnnealing.cu | 44 +-- 8 files changed, 434 insertions(+), 102 deletions(-) create mode 100644 branches/ParadisEO-GPU/tutoriel/OneMax/moGPUConfig.h create mode 100644 branches/ParadisEO-GPU/tutoriel/OneMax/testSimpleHCByCpy.cu diff --git a/branches/ParadisEO-GPU/tutoriel/OneMax/CMakeLists.txt b/branches/ParadisEO-GPU/tutoriel/OneMax/CMakeLists.txt index 8fd27fc1b..66f7db766 100644 --- a/branches/ParadisEO-GPU/tutoriel/OneMax/CMakeLists.txt +++ b/branches/ParadisEO-GPU/tutoriel/OneMax/CMakeLists.txt @@ -40,17 +40,19 @@ LINK_DIRECTORIES(${PARADISEO_EO_BIN_DIR}/lib ${NVIDIA_LIB_DIR} ${CUDA_LIB_DIR} ###################################################################################### ### 3) Define your targets and link the librairies ###################################################################################### - -CUDA_ADD_EXECUTABLE(CutestFirstImpr testFirstImpr.cu) -CUDA_ADD_EXECUTABLE(CutestNeutralHC testNeutralHC.cu) -CUDA_ADD_EXECUTABLE(CutestSimpleHC testSimpleHC.cu) -CUDA_ADD_EXECUTABLE(CutestSimpleTS testSimpleTS.cu) -CUDA_ADD_EXECUTABLE(CutestSimulatedAnnealing testSimulatedAnnealing.cu) -TARGET_LINK_LIBRARIES(CutestFirstImpr eoutils ga eo ${cutil}) -TARGET_LINK_LIBRARIES(CutestNeutralHC eoutils ga eo ${cutil}) -TARGET_LINK_LIBRARIES(CutestSimpleHC eoutils ga eo ${cutil}) -TARGET_LINK_LIBRARIES(CutestSimpleTS eoutils ga eo ${cutil}) -TARGET_LINK_LIBRARIES(CutestSimulatedAnnealing eoutils ga eo ${cutil}) +CUDA_ADD_EXECUTABLE(GPUtestFirstImpr testFirstImpr.cu) +CUDA_ADD_EXECUTABLE(GPUtestNeutralHC testNeutralHC.cu) +CUDA_ADD_EXECUTABLE(GPUtestSimpleHC testSimpleHC.cu) +CUDA_ADD_EXECUTABLE(GPUtestSimpleHCByCpy testSimpleHCByCpy.cu) +CUDA_ADD_EXECUTABLE(GPUtestSimpleTS testSimpleTS.cu) +CUDA_ADD_EXECUTABLE(GPUtestSimulatedAnnealing testSimulatedAnnealing.cu) + +TARGET_LINK_LIBRARIES(GPUtestFirstImpr eoutils ga eo ${cutil}) +TARGET_LINK_LIBRARIES(GPUtestNeutralHC eoutils ga eo ${cutil}) +TARGET_LINK_LIBRARIES(GPUtestSimpleHC eoutils ga eo ${cutil}) +TARGET_LINK_LIBRARIES(GPUtestSimpleHCByCpy eoutils ga eo ${cutil}) +TARGET_LINK_LIBRARIES(GPUtestSimpleTS eoutils ga eo ${cutil}) +TARGET_LINK_LIBRARIES(GPUtestSimulatedAnnealing eoutils ga eo ${cutil}) ###################################################################################### diff --git a/branches/ParadisEO-GPU/tutoriel/OneMax/moGPUConfig.h b/branches/ParadisEO-GPU/tutoriel/OneMax/moGPUConfig.h new file mode 100644 index 000000000..5a0cfe05b --- /dev/null +++ b/branches/ParadisEO-GPU/tutoriel/OneMax/moGPUConfig.h @@ -0,0 +1,50 @@ +/* + + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 + + Karima Boufaras, Thé Van LUONG + + 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 + */ + +#ifndef __moGPUConfig_H +#define __moGPUConfig_H + +#define BLOCK_SIZE 8 +#ifndef NB_POS +#define NB_POS 1 +#endif +#ifndef SIZE +#define SIZE 1 +#endif +#endif + + + + + diff --git a/branches/ParadisEO-GPU/tutoriel/OneMax/testFirstImpr.cu b/branches/ParadisEO-GPU/tutoriel/OneMax/testFirstImpr.cu index e1429951f..5901d87f0 100644 --- a/branches/ParadisEO-GPU/tutoriel/OneMax/testFirstImpr.cu +++ b/branches/ParadisEO-GPU/tutoriel/OneMax/testFirstImpr.cu @@ -32,27 +32,26 @@ Contact: paradiseo-help@lists.gforge.inria.fr */ -//Init the number of threads per block -#define BLOCK_SIZE 256 - #include #include using namespace std; +//Include GPU Config File +#include "moGPUConfig.h" // The general include for eo #include #include // OneMax full eval function #include // OneMax increment eval function -#include +#include #include // One Max solution -#include +#include // One Max neighbor -#include +#include // One Max ordered neighborhood -#include +#include // The Solution and neighbor comparator #include #include @@ -65,15 +64,15 @@ using namespace std; // The First Improvment algorithm explorer #include //To compute execution time -#include +#include //------------------------------------------------------------------------------------ // Define types of the representation solution, different neighbors and neighborhoods //------------------------------------------------------------------------------------ // REPRESENTATION -typedef moCudaBitVector solution; -typedef moCudaBitNeighbor Neighbor; -typedef moCudaOrderNeighborhood Neighborhood; +typedef moGPUBitVector solution; +typedef moGPUBitNeighbor Neighbor; +typedef moGPUOrderNeighborhoodByModif Neighborhood; void main_function(int argc, char **argv) { @@ -83,7 +82,7 @@ void main_function(int argc, char **argv) * * ========================================================= */ - // First define a parser from the command-line arguments + // First define a parser from the command-line arguments eoParser parser(argc, argv); // For each parameter, define Parameter, read it through the parser, @@ -95,10 +94,15 @@ void main_function(int argc, char **argv) unsigned seed = seedParam.value(); // description of genotype - eoValueParam vecSizeParam(8, "vecSize", "Genotype size", 'V'); + eoValueParam vecSizeParam(1, "vecSize", "Genotype size", 'V'); parser.processParam( vecSizeParam, "Representation" ); unsigned vecSize = vecSizeParam.value(); + //Number of position to change + eoValueParam nbPosParam(1, "nbPos", "X Change", 'N'); + parser.processParam( nbPosParam, "Exchange" ); + unsigned nbPos = nbPosParam.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"); @@ -148,7 +152,7 @@ void main_function(int argc, char **argv) * ========================================================= */ OneMaxIncrEval incr_eval; - moCudaVectorEval > cueval(vecSize,incr_eval); + moGPUEvalByModif > cueval(vecSize,incr_eval); /* ========================================================= * @@ -205,7 +209,7 @@ void main_function(int argc, char **argv) eval(sol); std::cout << "initial: " << sol<< std::endl; - moCudaTimer timer; + moGPUTimer timer; timer.start(); localSearch(sol); timer.stop(); @@ -224,12 +228,12 @@ void main_function(int argc, char **argv) std::cout<< std::endl; std::cout << "initial: " << sol1<< std::endl; - moCudaTimer timer1; + moGPUTimer timer1; timer1.start(); firstImprHC(sol1); timer1.stop(); std::cout << "final: " << sol1 << std::endl; - printf("CUDA execution time = %f ms\n",timer1.getTime()); + printf("Execution time = %f ms\n",timer1.getTime()); timer1.deleteTimer(); } diff --git a/branches/ParadisEO-GPU/tutoriel/OneMax/testNeutralHC.cu b/branches/ParadisEO-GPU/tutoriel/OneMax/testNeutralHC.cu index 50fb22e2d..c097086c4 100644 --- a/branches/ParadisEO-GPU/tutoriel/OneMax/testNeutralHC.cu +++ b/branches/ParadisEO-GPU/tutoriel/OneMax/testNeutralHC.cu @@ -32,27 +32,26 @@ Contact: paradiseo-help@lists.gforge.inria.fr */ -//Init the number of threads per block -#define BLOCK_SIZE 256 - #include #include using namespace std; +//Include GPU Config File +#include "moGPUConfig.h" // The general include for eo #include #include // OneMax full eval function #include // OneMax increment eval function -#include +#include #include // One Max solution -#include +#include // One Max neighbor -#include +#include // One Max ordered neighborhood -#include +#include // The Solution and neighbor comparator #include #include @@ -61,15 +60,15 @@ using namespace std; // Simple HC algorithm #include //To compute execution time -#include +#include //------------------------------------------------------------------------------------ // Define types of the representation solution, different neighbors and neighborhoods //------------------------------------------------------------------------------------ // REPRESENTATION -typedef moCudaBitVector solution; -typedef moCudaBitNeighbor Neighbor; -typedef moCudaOrderNeighborhood Neighborhood; +typedef moGPUBitVector solution; +typedef moGPUBitNeighbor Neighbor; +typedef moGPUOrderNeighborhoodByModif Neighborhood; void main_function(int argc, char **argv) { @@ -92,16 +91,20 @@ void main_function(int argc, char **argv) unsigned seed = seedParam.value(); // description of genotype - eoValueParam vecSizeParam(8, "vecSize", "Genotype size", 'V'); + eoValueParam vecSizeParam(1, "vecSize", "Genotype size", 'V'); parser.processParam( vecSizeParam, "Representation" ); unsigned vecSize = vecSizeParam.value(); - //nbStep maximum step to do - eoValueParam nbStepParam(10, "nbStep", "maximum number of step", 'N'); + //Number of position to change + eoValueParam nbPosParam(1, "nbPos", "X Change", 'N'); + parser.processParam( nbPosParam, "Exchange" ); + unsigned nbPos = nbPosParam.value(); + + //nbStep maximum step to do + eoValueParam nbStepParam(10, "nbStep", "maximum number of step", 'n'); parser.processParam( nbStepParam, "numberStep" ); unsigned nbStep = nbStepParam.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"); @@ -117,6 +120,7 @@ void main_function(int argc, char **argv) ofstream os(statusParam.value().c_str()); os << parser;// and you can use that file as parameter file } + /* ========================================================= * * Random seed @@ -151,7 +155,7 @@ void main_function(int argc, char **argv) * ========================================================= */ OneMaxIncrEval incr_eval; - moCudaVectorEval > cueval(vecSize,incr_eval); + moGPUEvalByModif > cueval(vecSize,incr_eval); /* ========================================================= * @@ -190,12 +194,12 @@ void main_function(int argc, char **argv) eval(sol); std::cout << "initial: " << sol<< std::endl; - moCudaTimer timer; + moGPUTimer timer; timer.start(); neutralHC(sol); timer.stop(); std::cout << "final: " << sol << std::endl; - printf("CUDA execution time = %f ms\n",timer.getTime()); + printf("Execution time = %f ms\n",timer.getTime()); timer.deleteTimer(); } diff --git a/branches/ParadisEO-GPU/tutoriel/OneMax/testSimpleHC.cu b/branches/ParadisEO-GPU/tutoriel/OneMax/testSimpleHC.cu index 6a4d5d51b..5468b8e7a 100644 --- a/branches/ParadisEO-GPU/tutoriel/OneMax/testSimpleHC.cu +++ b/branches/ParadisEO-GPU/tutoriel/OneMax/testSimpleHC.cu @@ -32,27 +32,27 @@ Contact: paradiseo-help@lists.gforge.inria.fr */ -//Init the number of threads per block -#define BLOCK_SIZE 256 #include #include using namespace std; +//Include GPU Config File +#include "moGPUConfig.h" // The general include for eo #include #include // OneMax full eval function #include // OneMax increment eval function -#include +#include #include // One Max solution -#include +#include // One Max neighbor -#include +#include // One Max ordered neighborhood -#include +#include // The Solution and neighbor comparator #include #include @@ -65,15 +65,15 @@ using namespace std; // The simple HC algorithm explorer #include //To compute execution time -#include +#include //------------------------------------------------------------------------------------ // Define types of the representation solution, different neighbors and neighborhoods //------------------------------------------------------------------------------------ // REPRESENTATION -typedef moCudaBitVector solution; -typedef moCudaBitNeighbor Neighbor; -typedef moCudaOrderNeighborhood Neighborhood; +typedef moGPUBitVector solution; +typedef moGPUBitNeighbor Neighbor; +typedef moGPUOrderNeighborhoodByModif Neighborhood; void main_function(int argc, char **argv) { @@ -96,10 +96,15 @@ void main_function(int argc, char **argv) unsigned seed = seedParam.value(); // description of genotype - eoValueParam vecSizeParam(8, "vecSize", "Genotype size", 'V'); + eoValueParam vecSizeParam(1, "vecSize", "Genotype size", 'V'); parser.processParam( vecSizeParam, "Representation" ); unsigned vecSize = vecSizeParam.value(); + //Number of position to change + eoValueParam nbPosParam(1, "nbPos", "X Change", 'N'); + parser.processParam( nbPosParam, "Exchange" ); + unsigned nbPos = nbPosParam.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"); @@ -115,6 +120,7 @@ void main_function(int argc, char **argv) ofstream os(statusParam.value().c_str()); os << parser;// and you can use that file as parameter file } + /* ========================================================= * * Random seed @@ -150,7 +156,7 @@ void main_function(int argc, char **argv) * ========================================================= */ OneMaxIncrEval incr_eval; - moCudaVectorEval > cueval(vecSize,incr_eval); + moGPUEvalByModif > cueval(vecSize,incr_eval); /* ========================================================= * @@ -208,7 +214,7 @@ void main_function(int argc, char **argv) std::cout << "initial: " << sol<< std::endl; // Create timer for timing CUDA calculation - moCudaTimer timer; + moGPUTimer timer; timer.start(); localSearch(sol); timer.stop(); @@ -226,12 +232,12 @@ void main_function(int argc, char **argv) eval(sol1); std::cout << "initial: " << sol1<< std::endl; // Create timer for timing CUDA calculation - moCudaTimer timer1; + moGPUTimer timer1; timer1.start(); simpleHC(sol1); timer1.stop(); std::cout << "final: " << sol1 << std::endl; - printf("CUDA execution time = %f ms\n",timer1.getTime()); + printf("Execution time = %f ms\n",timer1.getTime()); timer1.deleteTimer(); } diff --git a/branches/ParadisEO-GPU/tutoriel/OneMax/testSimpleHCByCpy.cu b/branches/ParadisEO-GPU/tutoriel/OneMax/testSimpleHCByCpy.cu new file mode 100644 index 000000000..e088007d9 --- /dev/null +++ b/branches/ParadisEO-GPU/tutoriel/OneMax/testSimpleHCByCpy.cu @@ -0,0 +1,255 @@ +/* + + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 + + Karima Boufaras, Thé Van LUONG + + 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 +*/ + + +#include +#include +using namespace std; + +//Include GPU Config File +#include "moGPUConfig.h" +// The general include for eo +#include +#include +// OneMax full eval function +#include +// OneMax increment eval function +#include +#include +// One Max solution +#include +// One Max neighbor +#include +// One Max ordered neighborhood +#include +// The Solution and neighbor comparator +#include +#include +// The continuator +#include +// Local search algorithm +#include +// Simple HC algorithm +#include +// The simple HC algorithm explorer +#include +//To compute execution time +#include + +//------------------------------------------------------------------------------------ +// Define types of the representation solution, different neighbors and neighborhoods +//------------------------------------------------------------------------------------ +// REPRESENTATION +typedef moGPUBitVector solution; +typedef moGPUBitNeighbor Neighbor; +typedef moGPUOrderNeighborhoodByCpy 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 + + // seed + eoValueParam seedParam(time(0), "seed", "Random number seed", 'S'); + parser.processParam( seedParam ); + unsigned seed = seedParam.value(); + + // description of genotype + eoValueParam vecSizeParam(1, "vecSize", "Genotype size", 'V'); + parser.processParam( vecSizeParam, "Representation" ); + unsigned vecSize = vecSizeParam.value(); + + //Number of position to change + eoValueParam nbPosParam(1, "nbPos", "X Change", 'N'); + parser.processParam( nbPosParam, "Exchange" ); + unsigned nbPos = nbPosParam.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); + srand(seed); + + + /* ========================================================= + * + * Initilisation of the solution + * + * ========================================================= */ + + solution sol(vecSize); + + /* ========================================================= + * + * Eval fitness function + * + * ========================================================= */ + + EvalOneMax eval; + + /* ========================================================= + * + * Evaluation of a solution neighbor's + * + * ========================================================= */ + + OneMaxIncrEval incr_eval; + moGPUEvalByCpy > cueval(vecSize,incr_eval); + + /* ========================================================= + * + * Comparator of solutions and neighbors + * + * ========================================================= */ + + moNeighborComparator comparator; + moSolNeighborComparator solComparator; + + /* ========================================================= + * + * a solution neighborhood + * + * ========================================================= */ + + Neighborhood neighborhood(vecSize,cueval); + + /* ========================================================= + * + * An explorer of solution neighborhood's + * + * ========================================================= */ + + moSimpleHCexplorer explorer(neighborhood, cueval, + comparator, solComparator); + + /* ========================================================= + * + * The local search algorithm + * + * ========================================================= */ + //True continuator <=> Always continue + + moTrueContinuator continuator; + + moLocalSearch localSearch(explorer,continuator, eval); + + /* ========================================================= + * + * The simple Hill Climbing algorithm + * + * ========================================================= */ + + moSimpleHC simpleHC(neighborhood,eval,cueval); + + /* ========================================================= + * + * Execute the local search from random sollution + * + * ========================================================= */ + + //Can be eval here, else it will be done at the beginning of the localSearch + eval(sol); + + std::cout << "initial: " << sol<< std::endl; + // Create timer for timing CUDA calculation + moGPUTimer timer; + timer.start(); + localSearch(sol); + timer.stop(); + printf("CUDA execution time = %f ms\n",timer.getTime()); + timer.deleteTimer(); + std::cout << "final: " << sol << std::endl; + + /* ========================================================= + * + * Execute the Simple Hill climbing from random sollution + * + * ========================================================= */ + cout< #include using namespace std; +//Include GPU Config File +#include "moGPUConfig.h" // The general include for eo #include #include // OneMax full eval function #include // OneMax increment eval function -#include +#include #include // One Max solution -#include -//To compute execution time -#include +#include // One Max neighbor -#include +#include // One Max ordered neighborhood -#include +#include // The Solution and neighbor comparator #include #include @@ -72,16 +69,17 @@ using namespace std; #include #include #include +//To compute execution time +#include //------------------------------------------------------------------------------------ // Define types of the representation solution, different neighbors and neighborhoods //------------------------------------------------------------------------------------ // REPRESENTATION - -typedef moCudaBitVector solution; -typedef moCudaBitNeighbor Neighbor; -typedef moCudaOrderNeighborhood Neighborhood; +typedef moGPUBitVector solution; +typedef moGPUBitNeighbor Neighbor; +typedef moGPUOrderNeighborhoodByModif Neighborhood; void main_function(int argc, char **argv) @@ -109,6 +107,11 @@ void main_function(int argc, char **argv) parser.processParam( vecSizeParam, "Representation" ); unsigned vecSize = vecSizeParam.value(); + //Number of position to change + eoValueParam nbPosParam(1, "nbPos", "X Change", 'N'); + parser.processParam( nbPosParam, "Exchange" ); + unsigned nbPos = nbPosParam.value(); + // size tabu list eoValueParam sizeTabuListParam(7, "sizeTabuList", "size of the tabu list", 'T'); parser.processParam( sizeTabuListParam, "Search Parameters" ); @@ -159,7 +162,7 @@ void main_function(int argc, char **argv) * ========================================================= */ OneMaxIncrEval incr_eval; - moCudaVectorEval > cueval(vecSize,incr_eval); + moGPUEvalByModif > cueval(vecSize,incr_eval); /* ========================================================= * @@ -243,12 +246,12 @@ void main_function(int argc, char **argv) std::cout << "Tabu Search 1:" << std::endl; std::cout << "---------------------" << std::endl; std::cout << "initial: " << sol1<< std::endl; - moCudaTimer timer1; + moGPUTimer timer1; timer1.start(); localSearch1(sol1); timer1.stop(); std::cout << "final: " << sol1 << std::endl< #include using namespace std; +//Include GPU Config File +#include "moGPUConfig.h" // The general include for eo #include #include // OneMax full eval function #include // OneMax increment eval function +#include #include // One Max solution -#include -#include -//To compute execution time -#include +#include // One Max neighbor -#include +#include // One Max ordered neighborhood -#include +#include +// The Solution and neighbor comparator +#include +#include +//To compute execution time +#include //Algorithm and its components #include #include - // The simulated annealing algorithm explorer #include - -//comparator -#include - //continuators #include #include @@ -76,10 +74,9 @@ using namespace std; // Define types of the representation solution, different neighbors and neighborhoods //------------------------------------------------------------------------------------ // REPRESENTATION - -typedef moCudaBitVector solution; -typedef moCudaBitNeighbor Neighbor; -typedef moCudaRndWithReplNeighborhood Neighborhood; +typedef moGPUBitVector solution; +typedef moGPUBitNeighbor Neighbor; +typedef moGPURndWithReplNeighborhoodByModif Neighborhood; void main_function(int argc, char **argv) { @@ -104,6 +101,11 @@ void main_function(int argc, char **argv) parser.processParam( vecSizeParam, "Representation" ); unsigned vecSize = vecSizeParam.value(); + //Number of position to change + eoValueParam nbPosParam(1, "nbPos", "X Change", 'N'); + parser.processParam( nbPosParam, "Exchange" ); + unsigned nbPos = nbPosParam.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"); @@ -153,7 +155,7 @@ void main_function(int argc, char **argv) * ========================================================= */ OneMaxIncrEval incr_eval; - moCudaVectorEval > cueval(vecSize,incr_eval); + moGPUEvalByModif > cueval(vecSize,incr_eval); /* ========================================================= * @@ -192,9 +194,15 @@ void main_function(int argc, char **argv) std::cout << "#########################################" << std::endl; std::cout << "initial : " << sol << std::endl; + moGPUTimer timer1; + timer1.start(); SA(sol); + timer1.stop(); std::cout << "final : " << sol << std::endl; std::cout << "#########################################" << std::endl; + printf("Execution time = %f ms\n",timer1.getTime()); + timer1.deleteTimer(); + }