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

renaming the classes and update the src

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

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

@ -36,7 +36,7 @@
#define _moGPUCustomizedNeighbor_h #define _moGPUCustomizedNeighbor_h
#include <neighborhood/moBackableNeighbor.h> #include <neighborhood/moBackableNeighbor.h>
#include <neighborhood/moXChangeNeighbor.h> #include <neighborhood/moGPUXChangeNeighbor.h>
#include <problems/types/moGPUSolType2Vector.h> #include <problems/types/moGPUSolType2Vector.h>
/** /**
@ -45,19 +45,19 @@
template<class Fitness> template<class Fitness>
class moGPUCustomizedNeighbor: public moBackableNeighbor< moGPUSolType2Vector<Fitness> > , class moGPUCustomizedNeighbor: public moBackableNeighbor< moGPUSolType2Vector<Fitness> > ,
public moXChangeNeighbor< moGPUSolType2Vector<Fitness> > { public moGPUXChangeNeighbor< moGPUSolType2Vector<Fitness> > {
public: public:
using moXChangeNeighbor< moGPUSolType2Vector<Fitness> >::indices; using moGPUXChangeNeighbor< moGPUSolType2Vector<Fitness> >::indices;
using moXChangeNeighbor< moGPUSolType2Vector<Fitness> >::xChange; using moGPUXChangeNeighbor< moGPUSolType2Vector<Fitness> >::xChange;
using moXChangeNeighbor< moGPUSolType2Vector<Fitness> >::key; using moGPUXChangeNeighbor< moGPUSolType2Vector<Fitness> >::key;
/** /**
*Default Constructor *Default Constructor
*/ */
moGPUCustomizedNeighbor() : moGPUCustomizedNeighbor() :
moXChangeNeighbor< moGPUSolType2Vector<Fitness> > () { moGPUXChangeNeighbor< moGPUSolType2Vector<Fitness> > () {
} }
/** /**
@ -66,7 +66,7 @@ public:
*/ */
moGPUCustomizedNeighbor(unsigned int _xSwap) : moGPUCustomizedNeighbor(unsigned int _xSwap) :
moXChangeNeighbor< moGPUSolType2Vector<Fitness> > (_xSwap) { moGPUXChangeNeighbor< moGPUSolType2Vector<Fitness> > (_xSwap) {
} }
/** /**

26
branches/ParadisEO-GPU/paradiseo-gpu/src/problems/neighborhood/PPPNeighbor.h → branches/ParadisEO-GPU/paradiseo-gpu/src/problems/neighborhood/moGPUPPPNeighbor.h
View file

@ -1,5 +1,5 @@
/* /*
<PPPNeighbor.h> <moGPUPPPNeighbor.h>
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
Boufaras Karima, Thé Van Luong Boufaras Karima, Thé Van Luong
@ -27,31 +27,31 @@
Contact: paradiseo-help@lists.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr
*/ */
#ifndef __PPPNeighbor_h #ifndef __moGPUPPPNeighbor_h
#define __PPPNeighbor_h #define __moGPUPPPNeighbor_h
#include <neighborhood/moBackableNeighbor.h> #include <neighborhood/moBackableNeighbor.h>
#include <neighborhood/moXChangeNeighbor.h> #include <neighborhood/moGPUXChangeNeighbor.h>
/** /**
* A GPU X-BitFlipping Neighbor * A GPU X-BitFlipping Neighbor
*/ */
template<class EOT, class Fitness=typename EOT::Fitness> template<class EOT, class Fitness=typename EOT::Fitness>
class PPPNeighbor: public moBackableNeighbor<EOT> , public moXChangeNeighbor< class moGPUPPPNeighbor: public moBackableNeighbor<EOT> , public moGPUXChangeNeighbor<
EOT> { EOT> {
public: public:
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
*/ */
PPPNeighbor() : moGPUPPPNeighbor() :
moXChangeNeighbor<EOT> () { moGPUXChangeNeighbor<EOT> () {
} }
/** /**
@ -59,8 +59,8 @@ public:
* @param _xFlip the number of bit to flip * @param _xFlip the number of bit to flip
*/ */
PPPNeighbor(unsigned int _xFlip) : moGPUPPPNeighbor(unsigned int _xFlip) :
moXChangeNeighbor<EOT> (_xFlip) { moGPUXChangeNeighbor<EOT> (_xFlip) {
} }
/** /**
@ -91,7 +91,7 @@ public:
*/ */
virtual std::string className() const { virtual std::string className() const {
return "PPPNeighbor"; return "moGPUPPPNeighbor";
} }
}; };