git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2125 331e1502-861f-0410-8da2-ba01fb791d7f

ParadisEO-GPU/tutoriel/QAP_CPU/application/testSimpleHC_CPU.cu

@@ -1,11 +1,46 @@
+/*
+  <testSimpleHC_CPU.cu>
+  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 <iostream>
 #include <stdlib.h>
 #include <stdio.h>
 using namespace std;
 
-int * a;
+//Specific data problem
-int * b;
+unsigned * a;
-int n;
+unsigned * b;
+unsigned n;
 
 // The general include for eo
 #include <eo>
@@ -15,30 +50,30 @@ int n;
 // Cuda Fitness function
 #include <QapIncrEval.h>
 // QAP solution
-#include <eoVector.h>
 #include <eoInt.h>
-//To compute execution time
+#include <eoInit.h>
-#include <performance/moCudaTimer.h>
 //QAP neighbor
-#include <problems/permutation/moSwapNeighbor.h>
+#include <problems/permutation/moIndexedSwapNeighbor.h>
 //QAP neighborhood 
-#include <problems/permutation/moSwapNeighborhood.h>
+#include <neighborhood/moOrderNeighborhood.h>
 //QAP data
 #include <Problem.h>
 // The Solution and neighbor comparator
 #include <comparator/moNeighborComparator.h>
 #include <comparator/moSolNeighborComparator.h>
 // The Iter continuator
-#include <continuator/moIterContinuator.h>
+#include <continuator/moTrueContinuator.h>
 // Local search algorithm
 #include <algo/moLocalSearch.h>
 // The Tabou Search algorithm explorer
 #include <explorer/moSimpleHCexplorer.h>
+//To compute execution time
+#include <performance/moCudaTimer.h>
 
 
 typedef eoInt<eoMinimizingFitness> solution;
-typedef moSwapNeighbor<solution> Neighbor;
+typedef moIndexedSwapNeighbor<solution> Neighbor;
-typedef moSwapNeighborhood<solution> Neighborhood;
+typedef moOrderNeighborhood<Neighbor> Neighborhood;
 
 
 int main(int argc, char **argv)
@@ -61,11 +96,6 @@ int main(int argc, char **argv)
   parser.processParam( seedParam );
   unsigned seed = seedParam.value();
 
-  // Iteration number
-  eoValueParam<unsigned int> nbIterationParam(1, "nbIteration", "TS Iteration number", 'I');
-  parser.processParam( nbIterationParam, "TS Iteration number" );
-  unsigned nbIteration = nbIterationParam.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");
@@ -89,9 +119,7 @@ int main(int argc, char **argv)
 
   //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);
 
   /* =========================================================
    *
@@ -107,8 +135,9 @@ int main(int argc, char **argv)
    *
    * ========================================================= */
 
-   solution sol(n);
+  eoInitPermutation<solution> init(n);
-   create<solution>(sol);
+  solution sol;
+  init(sol);
 
   /* =========================================================
    *
@@ -134,7 +163,7 @@ int main(int argc, char **argv)
    *
    * ========================================================= */
  
-  Neighborhood neighborhood;
+  Neighborhood neighborhood((n*(n-1))/2);
 
   /* =========================================================
    *
@@ -142,7 +171,7 @@ int main(int argc, char **argv)
    *
    * ========================================================= */
 
-   moIterContinuator <Neighbor> continuator(nbIteration);
+  moTrueContinuator <Neighbor> continuator;
 
   /* =========================================================
    *
@@ -186,4 +215,3 @@ int main(int argc, char **argv)
 
   return 0;
 }
-