diff --git a/branches/ParadisEO-GPU/tutoriel/OneMax/testSimpleHC.cu b/branches/ParadisEO-GPU/tutoriel/OneMax/testSimpleHC.cu index 5468b8e7a..afb5f98b6 100644 --- a/branches/ParadisEO-GPU/tutoriel/OneMax/testSimpleHC.cu +++ b/branches/ParadisEO-GPU/tutoriel/OneMax/testSimpleHC.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 evaluation function #include // One Max solution #include -// One Max neighbor +// Bit neighbor #include -// One Max ordered neighborhood +// Ordered neighborhood #include // The Solution and neighbor comparator #include @@ -70,7 +71,7 @@ using namespace std; //------------------------------------------------------------------------------------ // Define types of the representation solution, different neighbors and neighborhoods //------------------------------------------------------------------------------------ -// REPRESENTATION + typedef moGPUBitVector solution; typedef moGPUBitNeighbor Neighbor; typedef moGPUOrderNeighborhoodByModif Neighborhood; @@ -95,16 +96,6 @@ void main_function(int argc, char **argv) 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"); @@ -139,7 +130,7 @@ void main_function(int argc, char **argv) * * ========================================================= */ - solution sol(vecSize); + solution sol(SIZE); /* ========================================================= * @@ -156,7 +147,7 @@ void main_function(int argc, char **argv) * ========================================================= */ OneMaxIncrEval incr_eval; - moGPUEvalByModif > cueval(vecSize,incr_eval); + moGPUEvalByModif > cueval(SIZE,incr_eval); /* ========================================================= * @@ -173,7 +164,7 @@ void main_function(int argc, char **argv) * * ========================================================= */ - Neighborhood neighborhood(vecSize,cueval); + Neighborhood neighborhood(SIZE,cueval); /* ========================================================= * @@ -228,7 +219,7 @@ void main_function(int argc, char **argv) * * ========================================================= */ cout<