From 906cb818d56e13740c70c366c66a17b4cac8b5e3 Mon Sep 17 00:00:00 2001 From: boufaras Date: Tue, 24 Jan 2012 01:38:28 +0000 Subject: [PATCH] Test & Update for new version git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2685 331e1502-861f-0410-8da2-ba01fb791d7f --- .../paradiseo-gpu/tutorial/PPP_GPU/moGPUConfig.h | 2 +- .../paradiseo-gpu/tutorial/PPP_GPU/testSimpleTS_PPP.cu | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/PPP_GPU/moGPUConfig.h b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/PPP_GPU/moGPUConfig.h index d556dfd08..95d6550fd 100644 --- a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/PPP_GPU/moGPUConfig.h +++ b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/PPP_GPU/moGPUConfig.h @@ -1,6 +1,6 @@ /* - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012 Karima Boufaras, Thé Van LUONG diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/PPP_GPU/testSimpleTS_PPP.cu b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/PPP_GPU/testSimpleTS_PPP.cu index 3f89677b7..ca18ba805 100644 --- a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/PPP_GPU/testSimpleTS_PPP.cu +++ b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/PPP_GPU/testSimpleTS_PPP.cu @@ -135,7 +135,7 @@ int main(int argc, char **argv) /* ========================================================= * - * Initilisation of QAP data + * Initilisation of PPP data * * ========================================================= */ @@ -161,7 +161,7 @@ int main(int argc, char **argv) moGPUPPPEval eval(_data); unsigned long int sizeMap=sizeMapping(Nd,NB_POS); moGPUPPPIncrEval incr_eval; - moGPUMappingEvalByModif > cueval(sizeMap,incr_eval); + moGPUMappingEvalByModif > gpueval(sizeMap,incr_eval); /* ========================================================= * @@ -178,7 +178,7 @@ int main(int argc, char **argv) * * ========================================================= */ - Neighborhood neighborhood(sizeMap,NB_POS,cueval); + Neighborhood neighborhood(sizeMap,NB_POS,gpueval); /* ========================================================= * @@ -215,7 +215,7 @@ int main(int argc, char **argv) * * ========================================================= */ - moTS tabuSearch(neighborhood, eval, cueval, comparator, solComparator, continuator, tl, inten, div, asp); + moTS tabuSearch(neighborhood, eval, gpueval, comparator, solComparator, continuator, tl, inten, div, asp); /* ========================================================= *