diff --git a/branches/ParadisEO-GPU/tutoriel/OneMax/testSimulatedAnnealing.cu b/branches/ParadisEO-GPU/tutoriel/OneMax/testSimulatedAnnealing.cu index 1605da75f..19f9cf020 100644 --- a/branches/ParadisEO-GPU/tutoriel/OneMax/testSimulatedAnnealing.cu +++ b/branches/ParadisEO-GPU/tutoriel/OneMax/testSimulatedAnnealing.cu @@ -44,14 +44,15 @@ using namespace std; #include // OneMax full eval function #include -// OneMax increment eval function +//Parallel evaluation of neighborhood on GPU #include +// OneMax increment eval function #include // One Max solution #include -// One Max neighbor +// Bit neighbor #include -// One Max ordered neighborhood +// Random with replacement neighborhood #include // The Solution and neighbor comparator #include @@ -73,7 +74,7 @@ using namespace std; //------------------------------------------------------------------------------------ // Define types of the representation solution, different neighbors and neighborhoods //------------------------------------------------------------------------------------ -// REPRESENTATION + typedef moGPUBitVector solution; typedef moGPUBitNeighbor Neighbor; typedef moGPURndWithReplNeighborhoodByModif Neighborhood; @@ -96,16 +97,6 @@ void main_function(int argc, char **argv) parser.processParam( seedParam ); unsigned seed = seedParam.value(); - // description of genotype - eoValueParam vecSizeParam(8, "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"); @@ -138,7 +129,7 @@ void main_function(int argc, char **argv) * * ========================================================= */ - solution sol(vecSize); + solution sol(SIZE); /* ========================================================= * @@ -155,7 +146,7 @@ void main_function(int argc, char **argv) * ========================================================= */ OneMaxIncrEval incr_eval; - moGPUEvalByModif > cueval(vecSize,incr_eval); + moGPUEvalByModif > gpuEval(SIZE,incr_eval); /* ========================================================= * @@ -163,7 +154,7 @@ void main_function(int argc, char **argv) * * ========================================================= */ - Neighborhood neighborhood(vecSize,cueval); + Neighborhood neighborhood(SIZE,gpuEval); /* ========================================================= * @@ -181,7 +172,7 @@ void main_function(int argc, char **argv) * * ========================================================= */ - moSA SA(neighborhood, eval, cueval,coolingSchedule); + moSA SA(neighborhood, eval, gpuEval,coolingSchedule); /* ========================================================= * @@ -191,15 +182,12 @@ void main_function(int argc, char **argv) //init(solution); eval(sol); - - 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();