nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2032 331e1502-861f-0410-8da2-ba01fb791d7f

Browse source
This commit is contained in:
boufaras 2010-12-21 16:39:11 +00:00
commit c8fac579e7
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ParadisEO-GPU/src/neighborhood/moCudaKswapNeighborhood.h
View file

@ -41,6 +41,10 @@ class moCudaKswapNeighborhood: public moKswapNeighborhood<N> {
public: public:
/**
* Define a Neighbor and type of a solution corresponding
*/
typedef N Neighbor; typedef N Neighbor;
typedef typename Neighbor::EOT EOT; typedef typename Neighbor::EOT EOT;
@ -55,7 +59,6 @@ public:
/** /**
* Constructor * Constructor
* @param _size the size of solution * @param _size the size of solution
* @param _size the solution size
* @param _Kswap the number of swap * @param _Kswap the number of swap
* @param _eval show how to evaluate neighborhood of a solution at one time * @param _eval show how to evaluate neighborhood of a solution at one time
*/ */
@ -87,13 +90,14 @@ public:
virtual void init(EOT& _solution, Neighbor& _current) { virtual void init(EOT& _solution, Neighbor& _current) {
moKswapNeighborhood<Neighbor>::init(_solution, _current); moKswapNeighborhood<Neighbor>::init(_solution, _current);
//Send Mapping for only the first time
if (sendMapping) { if (sendMapping) {
cudaMemcpy(device_Mapping, mapping, (Kswap + 1) * neighborhoodSize cudaMemcpy(device_Mapping, mapping, (Kswap + 1) * neighborhoodSize
* sizeof(unsigned int), cudaMemcpyHostToDevice); * sizeof(unsigned int), cudaMemcpyHostToDevice);
sendMapping = false; sendMapping = false;
} }
//Compute all neighbors fitness at one time //Compute all neighbors fitness at one time
eval.neighborhoodEval(_solution, device_Mapping, Kswap); eval.neighborhoodKswapEval(_solution, device_Mapping, Kswap);
} }
/** /**