diff --git a/ParadisEO-GPU/tutoriel/QAP_CPU/application/testSimpleTS_CPU.cu b/ParadisEO-GPU/tutoriel/QAP_CPU/application/testSimpleTS_CPU.cu index c357ff7ce..29b02f4cd 100644 --- a/ParadisEO-GPU/tutoriel/QAP_CPU/application/testSimpleTS_CPU.cu +++ b/ParadisEO-GPU/tutoriel/QAP_CPU/application/testSimpleTS_CPU.cu @@ -1,11 +1,46 @@ +/* + + 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 #include #include using namespace std; -int * a; -int * b; -int n; +//Specific data problem +unsigned * a; +unsigned * b; +unsigned n; // The general include for eo #include @@ -15,14 +50,11 @@ int n; // Cuda Fitness function #include // QAP solution -#include #include -//To compute execution time -#include +#include //QAP neighbor #include //QAP neighborhood -//#include #include //QAP data #include @@ -33,25 +65,19 @@ int n; #include // Local search algorithm #include -// The Tabou Search algorithm explorer -//#include //Algorithm and its components #include //Tabu list -//#include #include //Memories #include #include #include -//#include - - +//To compute execution time +#include typedef eoInt solution; -//typedef moSwapNeighbor Neighbor; typedef moIndexedSwapNeighbor Neighbor; -//typedef moSwapNeighborhood Neighborhood; typedef moOrderNeighborhood Neighborhood; int main(int argc, char **argv) @@ -105,6 +131,7 @@ int main(int argc, char **argv) ofstream os(statusParam.value().c_str()); os << parser;// and you can use that file as parameter file } + /* ========================================================= * * Random seed @@ -113,8 +140,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); + rng.reseed(seed); /* ========================================================= * @@ -129,9 +155,10 @@ int main(int argc, char **argv) * Initilisation of the solution * * ========================================================= */ - - solution sol(n); - create(sol); + + eoInitPermutation init(n); + solution sol; + init(sol); /*========================================================= *