From ad17e34cfe253587a470db1e9bdd6258731c36eb Mon Sep 17 00:00:00 2001
From: boufaras <boufaras@331e1502-861f-0410-8da2-ba01fb791d7f>
Date: Thu, 29 Sep 2011 15:31:38 +0000
Subject: [PATCH] updated

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2465 331e1502-861f-0410-8da2-ba01fb791d7f
---
 .../QAP_CPU/application/testSimpleTS_CPU.cu   | 20 ++++---------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/branches/ParadisEO-GPU/tutorial/QAP_CPU/application/testSimpleTS_CPU.cu b/branches/ParadisEO-GPU/tutorial/QAP_CPU/application/testSimpleTS_CPU.cu
index 8ec4eb52f..428a648cc 100644
--- a/branches/ParadisEO-GPU/tutorial/QAP_CPU/application/testSimpleTS_CPU.cu
+++ b/branches/ParadisEO-GPU/tutorial/QAP_CPU/application/testSimpleTS_CPU.cu
@@ -101,21 +101,10 @@ int main(int argc, char **argv)
   unsigned seed = seedParam.value();
 
   // Iteration number
-  eoValueParam<unsigned int> nbIterationParam(1, "nbIteration", "TS Iteration number", 'I');
+  eoValueParam<unsigned int> nbIterationParam(100, "nbIteration", "TS Iteration number", 'I');
   parser.processParam( nbIterationParam, "TS Iteration number" );
   unsigned nbIteration = nbIterationParam.value();
 
-  // size tabu list
-  eoValueParam<unsigned int> sizeTabuListParam(7, "sizeTabuList", "size of the tabu list", 'T');
-  parser.processParam( sizeTabuListParam, "Search Parameters" );
-  unsigned sizeTabuList = sizeTabuListParam.value();
-
- // duration tabu list
-  eoValueParam<unsigned int> durationParam(7, "duration", "duration of the tabu list", 'D');
-  parser.processParam( durationParam, "Search Parameters" );
-  unsigned duration = durationParam.value();
-
-
   // the name of the "status" file where all actual parameter values will be saved
   string str_status = parser.ProgramName() + ".status"; // default value
   eoValueParam<string> statusParam(str_status.c_str(), "status", "Status file");
@@ -200,8 +189,8 @@ int main(int argc, char **argv)
    *
    * ========================================================= */
 
-    sizeTabuList=(n*(n-1))/2;
-    duration=sizeTabuList/8;
+    unsigned sizeTabuList=(n*(n-1))/2;
+    unsigned duration=sizeTabuList/8;
     // tabu list
     moIndexedVectorTabuList<Neighbor> tl(sizeTabuList,duration);
 
@@ -240,8 +229,7 @@ int main(int argc, char **argv)
   tabuSearch(sol);
   timer.stop();
   std::cout << "final:   " << sol << std::endl;
-  printf("CUDA execution time = %f ms\n",timer.getTime());
-  timer.deleteTimer();
+  printf("Execution time = %.2lf s\n",timer.getTime());
  
   delete[] a;
   delete[] b;