diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/OneMax/moGPUConfig.h b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/OneMax/moGPUConfig.h index 726e0db0d..aa19b2f73 100644 --- a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/OneMax/moGPUConfig.h +++ b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/OneMax/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/OneMax/testFirstImpr.cu b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/OneMax/testFirstImpr.cu index ca87253e7..f3b5773d9 100644 --- a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/OneMax/testFirstImpr.cu +++ b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/OneMax/testFirstImpr.cu @@ -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/OneMax/testNeutralHC.cu b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/OneMax/testNeutralHC.cu index 1b9873935..69f0b8e47 100644 --- a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/OneMax/testNeutralHC.cu +++ b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/OneMax/testNeutralHC.cu @@ -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/OneMax/testSimpleHC.cu b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/OneMax/testSimpleHC.cu index 02ed56768..acd2d5d70 100644 --- a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/OneMax/testSimpleHC.cu +++ b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/OneMax/testSimpleHC.cu @@ -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 @@ -145,7 +145,7 @@ void main_function(int argc, char **argv) * ========================================================= */ moGPUOneMaxIncrEval incr_eval; - moGPUEvalByModif > cueval(SIZE,incr_eval); + moGPUEvalByModif > gpueval(SIZE,incr_eval); /* ========================================================= * @@ -162,7 +162,7 @@ void main_function(int argc, char **argv) * * ========================================================= */ - Neighborhood neighborhood(SIZE,cueval); + Neighborhood neighborhood(SIZE,gpueval); /* ========================================================= * @@ -170,7 +170,7 @@ void main_function(int argc, char **argv) * * ========================================================= */ - moSimpleHCexplorer explorer(neighborhood, cueval, + moSimpleHCexplorer explorer(neighborhood, gpueval, comparator, solComparator); /* ========================================================= @@ -190,7 +190,7 @@ void main_function(int argc, char **argv) * * ========================================================= */ - moSimpleHC simpleHC(neighborhood,eval,cueval); + moSimpleHC simpleHC(neighborhood,eval,gpueval); /* ========================================================= * diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/OneMax/testSimpleHCByCpy.cu b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/OneMax/testSimpleHCByCpy.cu index cc6233083..3c005e070 100644 --- a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/OneMax/testSimpleHCByCpy.cu +++ b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/OneMax/testSimpleHCByCpy.cu @@ -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 @@ -121,7 +121,6 @@ void main_function(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); /* ========================================================= * diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/OneMax/testSimpleTS.cu b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/OneMax/testSimpleTS.cu index caf20d6f4..064903900 100644 --- a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/OneMax/testSimpleTS.cu +++ b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/OneMax/testSimpleTS.cu @@ -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/OneMax/testSimulatedAnnealing.cu b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/OneMax/testSimulatedAnnealing.cu index bf793f5c9..57aeb05aa 100644 --- a/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/OneMax/testSimulatedAnnealing.cu +++ b/branches/ParadisEO-GPU/paradiseo-gpu/tutorial/OneMax/testSimulatedAnnealing.cu @@ -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