From 0efbf2f43e003b59e16c3a4a9c3188bc0e8d3760 Mon Sep 17 00:00:00 2001 From: boufaras Date: Wed, 14 Sep 2011 13:29:13 +0000 Subject: [PATCH] clear src git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2372 331e1502-861f-0410-8da2-ba01fb791d7f --- .../ParadisEO-GPU/tutoriel/QAP/testSimpleHC.cu | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/branches/ParadisEO-GPU/tutoriel/QAP/testSimpleHC.cu b/branches/ParadisEO-GPU/tutoriel/QAP/testSimpleHC.cu index 10926c33e..b17574f4d 100644 --- a/branches/ParadisEO-GPU/tutoriel/QAP/testSimpleHC.cu +++ b/branches/ParadisEO-GPU/tutoriel/QAP/testSimpleHC.cu @@ -105,11 +105,6 @@ int main(int argc, char **argv) parser.processParam( seedParam ); unsigned seed = seedParam.value(); - // description of genotype - eoValueParam vecSizeParam(20, "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" ); @@ -147,14 +142,14 @@ int main(int argc, char **argv) * ========================================================= */ QAPData _data(argv[1]); - vecSize=_data.sizeData; + /* ========================================================= * * Initilisation of the solution and specific data * * ========================================================= */ - solution sol(vecSize); + solution sol(_data.sizeData); _data.GPUObject.memCopyGlobalVariable(dev_a,_data.a_d); _data.GPUObject.memCopyGlobalVariable(dev_b,_data.b_d); @@ -164,7 +159,7 @@ int main(int argc, char **argv) * * ========================================================= */ QAPEval eval(_data); - unsigned long int sizeMap=sizeMapping(vecSize,NB_POS); + unsigned long int sizeMap=sizeMapping(_data.sizeData,NB_POS); QAPIncrEval incr_eval; moGPUMappingEvalByCpy > cueval(sizeMap,incr_eval); @@ -221,7 +216,6 @@ int main(int argc, char **argv) //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; @@ -231,7 +225,7 @@ int main(int argc, char **argv) timer.stop(); printf("Execution time = %f ms\n",timer.getTime()); timer.deleteTimer(); - + _data.GPUObject.free(dev_a); _data.GPUObject.free(dev_b);