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

update with the change

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2625 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
boufaras 2012-01-12 10:07:53 +00:00
commit 1dee27e4aa
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
branches/ParadisEO-GPU/paradiseo-gpu/src/neighborhood/moGPUXSwapNeighbor.h
View file

@ -30,7 +30,7 @@
#ifndef __moGPUXSwapNeighbor_h #ifndef __moGPUXSwapNeighbor_h
#define __moGPUXSwapNeighbor_h #define __moGPUXSwapNeighbor_h
#include <neighborhood/moBackableNeighbor.h> #include <neighborhood/moBackableNeighbor.h>
#include <neighborhood/moXChangeNeighbor.h> #include <neighborhood/moGPUXChangeNeighbor.h>
#include <GPUType/moGPUPermutationVector.h> #include <GPUType/moGPUPermutationVector.h>
/** /**
@ -39,21 +39,21 @@
template<class Fitness> template<class Fitness>
class moGPUXSwapNeighbor: public moBackableNeighbor<moGPUPermutationVector<Fitness> > , class moGPUXSwapNeighbor: public moBackableNeighbor<moGPUPermutationVector<Fitness> > ,
public moXChangeNeighbor<moGPUPermutationVector<Fitness> > { public moGPUXChangeNeighbor<moGPUPermutationVector<Fitness> > {
public: public:
typedef moGPUPermutationVector<Fitness> EOT ; typedef moGPUPermutationVector<Fitness> EOT ;
using moXChangeNeighbor<EOT>::indices; using moGPUXChangeNeighbor<EOT>::indices;
using moXChangeNeighbor<EOT>::xChange; using moGPUXChangeNeighbor<EOT>::xChange;
using moXChangeNeighbor<EOT>::key; using moGPUXChangeNeighbor<EOT>::key;
/** /**
*Default Constructor *Default Constructor
*/ */
moGPUXSwapNeighbor() : moGPUXSwapNeighbor() :
moXChangeNeighbor<EOT> () { moGPUXChangeNeighbor<EOT> () {
} }
/** /**
@ -62,7 +62,7 @@ public:
*/ */
moGPUXSwapNeighbor(unsigned int _xSwap) : moGPUXSwapNeighbor(unsigned int _xSwap) :
moXChangeNeighbor<EOT> (_xSwap) { moGPUXChangeNeighbor<EOT> (_xSwap) {
} }
/** /**