Test & Update for new version
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2685 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
parent
ab30bca097
commit
906cb818d5
2 changed files with 5 additions and 5 deletions
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
<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
|
||||
|
||||
|
|
|
|||
|
|
@ -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<solution> eval(_data);
|
||||
unsigned long int sizeMap=sizeMapping(Nd,NB_POS);
|
||||
moGPUPPPIncrEval<Neighbor> incr_eval;
|
||||
moGPUMappingEvalByModif<Neighbor,moGPUPPPIncrEval<Neighbor> > cueval(sizeMap,incr_eval);
|
||||
moGPUMappingEvalByModif<Neighbor,moGPUPPPIncrEval<Neighbor> > 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<Neighbor> tabuSearch(neighborhood, eval, cueval, comparator, solComparator, continuator, tl, inten, div, asp);
|
||||
moTS<Neighbor> tabuSearch(neighborhood, eval, gpueval, comparator, solComparator, continuator, tl, inten, div, asp);
|
||||
|
||||
/* =========================================================
|
||||
*
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue