Test & Update for new version
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2682 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
parent
89af347c09
commit
07865322f4
7 changed files with 11 additions and 12 deletions
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
<moGPUConfig.h>
|
<moGPUConfig.h>
|
||||||
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
|
Karima Boufaras, Thé Van LUONG
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
<testFirstImpr.cu>
|
<testFirstImpr.cu>
|
||||||
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
|
Karima Boufaras, Thé Van LUONG
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
<testNeutralHC.cu>
|
<testNeutralHC.cu>
|
||||||
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
|
Karima Boufaras, Thé Van LUONG
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
<testSimpleHC.cu>
|
<testSimpleHC.cu>
|
||||||
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
|
Karima Boufaras, Thé Van LUONG
|
||||||
|
|
||||||
|
|
@ -145,7 +145,7 @@ void main_function(int argc, char **argv)
|
||||||
* ========================================================= */
|
* ========================================================= */
|
||||||
|
|
||||||
moGPUOneMaxIncrEval<Neighbor> incr_eval;
|
moGPUOneMaxIncrEval<Neighbor> incr_eval;
|
||||||
moGPUEvalByModif<Neighbor,moGPUOneMaxIncrEval<Neighbor> > cueval(SIZE,incr_eval);
|
moGPUEvalByModif<Neighbor,moGPUOneMaxIncrEval<Neighbor> > 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<Neighbor> explorer(neighborhood, cueval,
|
moSimpleHCexplorer<Neighbor> explorer(neighborhood, gpueval,
|
||||||
comparator, solComparator);
|
comparator, solComparator);
|
||||||
|
|
||||||
/* =========================================================
|
/* =========================================================
|
||||||
|
|
@ -190,7 +190,7 @@ void main_function(int argc, char **argv)
|
||||||
*
|
*
|
||||||
* ========================================================= */
|
* ========================================================= */
|
||||||
|
|
||||||
moSimpleHC<Neighbor> simpleHC(neighborhood,eval,cueval);
|
moSimpleHC<Neighbor> simpleHC(neighborhood,eval,gpueval);
|
||||||
|
|
||||||
/* =========================================================
|
/* =========================================================
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
<testSimpleHCByCpy.cu>
|
<testSimpleHCByCpy.cu>
|
||||||
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
|
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,
|
//reproducible random seed: if you don't change SEED above,
|
||||||
// you'll aways get the same result, NOT a random run
|
// you'll aways get the same result, NOT a random run
|
||||||
rng.reseed(seed);
|
rng.reseed(seed);
|
||||||
srand(seed);
|
|
||||||
|
|
||||||
/* =========================================================
|
/* =========================================================
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
<testSimpleTS.cu>
|
<testSimpleTS.cu>
|
||||||
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
|
Karima Boufaras, Thé Van LUONG
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
<testSimulatedAnnealing.cu>
|
<testSimulatedAnnealing.cu>
|
||||||
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
|
Karima Boufaras, Thé Van LUONG
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue