renaming the classes and update the src

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2629 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
boufaras 2012-01-12 10:11:58 +00:00
commit 80c51911da
6 changed files with 40 additions and 40 deletions

View file

@ -1,5 +1,5 @@
/* /*
<EvalOneMax.h> <moGPUEvalOneMax.h>
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
Karima Boufaras, Thé Van LUONG Karima Boufaras, Thé Van LUONG
@ -32,15 +32,15 @@
Contact: paradiseo-help@lists.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr
*/ */
#ifndef __EvalOneMax_H #ifndef __moGPUEvalOneMax_H
#define __EvalOneMax_H #define __moGPUEvalOneMax_H
/** /**
* Full Evaluation of the solution * Full Evaluation of the solution
*/ */
template<class EOT> template<class EOT>
class EvalOneMax: public eoEvalFunc<EOT> { class moGPUEvalOneMax: public eoEvalFunc<EOT> {
public: public:
@ -48,14 +48,14 @@ class EvalOneMax: public eoEvalFunc<EOT> {
* Constructor * Constructor
*/ */
EvalOneMax() { moGPUEvalOneMax() {
} }
/** /**
* Destructor * Destructor
*/ */
~EvalOneMax(void) { ~moGPUEvalOneMax(void) {
} }
/** /**

View file

@ -1,5 +1,5 @@
/* /*
<OneMaxIncrEval.h> <moGPUOneMaxIncrEval.h>
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
Karima Boufaras, Thé Van LUONG Karima Boufaras, Thé Van LUONG
@ -32,8 +32,8 @@
Contact: paradiseo-help@lists.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr
*/ */
#ifndef __OneMaxIncrEval_H #ifndef __moGPUOneMaxIncrEval_H
#define __OneMaxIncrEval_H #define __moGPUOneMaxIncrEval_H
#include <eval/moGPUEvalFunc.h> #include <eval/moGPUEvalFunc.h>
@ -42,7 +42,7 @@
*/ */
template<class Neighbor> template<class Neighbor>
class OneMaxIncrEval: public moGPUEvalFunc<Neighbor> { class moGPUOneMaxIncrEval: public moGPUEvalFunc<Neighbor> {
public: public:
@ -54,14 +54,14 @@ public:
* Constructor * Constructor
*/ */
OneMaxIncrEval() { moGPUOneMaxIncrEval() {
} }
/** /**
* Destructor * Destructor
*/ */
~OneMaxIncrEval() { ~moGPUOneMaxIncrEval() {
} }
/** /**

View file

@ -1,5 +1,5 @@
/* /*
<PPPEval.h> <moGPUPPPEval.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
@ -32,13 +32,13 @@
Contact: paradiseo-help@lists.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr
*/ */
#ifndef __PPPEval_H #ifndef __moGPUPPPEval_H
#define __PPPEval_H #define __moGPUPPPEval_H
#include <problems/data/PPPData.h> #include <problems/data/moGPUPPPData.h>
template<class EOT, class ElemType = typename EOT::ElemType> template<class EOT, class ElemType = typename EOT::ElemType>
class PPPEval: public eoEvalFunc<EOT> { class moGPUPPPEval: public eoEvalFunc<EOT> {
public: public:
@ -47,7 +47,7 @@ public:
* @param _pppData the specific data problem useful to evalute solution( vector of 1 & _1 for PPP) * @param _pppData the specific data problem useful to evalute solution( vector of 1 & _1 for PPP)
*/ */
PPPEval(PPPData<ElemType> & _pppData) { moGPUPPPEval(moGPUPPPData<ElemType> & _pppData) {
pppData = _pppData; pppData = _pppData;
} }
@ -55,7 +55,7 @@ public:
* Destructor * Destructor
*/ */
~PPPEval() { ~moGPUPPPEval() {
} }
/** /**
@ -95,7 +95,7 @@ public:
protected: protected:
PPPData<ElemType> pppData; moGPUPPPData<ElemType> pppData;
}; };

View file

@ -1,5 +1,5 @@
/* /*
<PPPIncrEval.h> <moGPUPPPIncrEval.h>
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
Karima Boufaras, Thé Van LUONG Karima Boufaras, Thé Van LUONG
@ -32,8 +32,8 @@
Contact: paradiseo-help@lists.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr
*/ */
#ifndef __PPPIncrEval_H #ifndef __moGPUPPPIncrEval_H
#define __PPPIncrEval_H #define __moGPUPPPIncrEval_H
#include <eval/moGPUEvalFunc.h> #include <eval/moGPUEvalFunc.h>
@ -42,7 +42,7 @@
*/ */
template<class Neighbor> template<class Neighbor>
class PPPIncrEval: public moGPUEvalFunc<Neighbor> { class moGPUPPPIncrEval: public moGPUEvalFunc<Neighbor> {
public: public:
@ -54,14 +54,14 @@ public:
* Constructor * Constructor
*/ */
PPPIncrEval() { moGPUPPPIncrEval() {
} }
/** /**
* Destructor * Destructor
*/ */
~PPPIncrEval() { ~moGPUPPPIncrEval() {
} }
/** /**

View file

@ -1,5 +1,5 @@
/* /*
<QAPEval.h> <moGPUQAPEval.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
@ -32,13 +32,13 @@
Contact: paradiseo-help@lists.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr
*/ */
#ifndef __QAPEval_H #ifndef __moGPUQAPEval_H
#define __QAPEval_H #define __moGPUQAPEval_H
#include <problems/data/QAPData.h> #include <problems/data/moGPUQAPData.h>
template<class EOT, class ElemType = typename EOT::ElemType> template<class EOT, class ElemType = typename EOT::ElemType>
class QAPEval: public eoEvalFunc<EOT> { class moGPUQAPEval: public eoEvalFunc<EOT> {
public: public:
@ -47,7 +47,7 @@ public:
* @param _qapData the specific data problem useful to evalute solution(flow & distance matrices of QAP problem) * @param _qapData the specific data problem useful to evalute solution(flow & distance matrices of QAP problem)
*/ */
QAPEval(QAPData<ElemType> & _qapData) { moGPUQAPEval(moGPUQAPData<ElemType> & _qapData) {
qapData = _qapData; qapData = _qapData;
} }
@ -55,7 +55,7 @@ public:
* Destructor * Destructor
*/ */
~QAPEval() { ~moGPUQAPEval() {
} }
/** /**
@ -77,7 +77,7 @@ public:
protected: protected:
QAPData<ElemType> qapData; moGPUQAPData<ElemType> qapData;
}; };

View file

@ -1,5 +1,5 @@
/* /*
<QAPIncrEval.h> <moGPUQAPIncrEval.h>
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
Karima Boufaras, Thé Van LUONG Karima Boufaras, Thé Van LUONG
@ -32,8 +32,8 @@
Contact: paradiseo-help@lists.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr
*/ */
#ifndef __QAPIncrEval_H #ifndef __moGPUQAPIncrEval_H
#define __QAPIncrEval_H #define __moGPUQAPIncrEval_H
#include <eval/moGPUEvalFunc.h> #include <eval/moGPUEvalFunc.h>
@ -42,7 +42,7 @@
*/ */
template<class Neighbor> template<class Neighbor>
class QAPIncrEval: public moGPUEvalFunc<Neighbor> { class moGPUQAPIncrEval: public moGPUEvalFunc<Neighbor> {
public: public:
@ -54,14 +54,14 @@ public:
* Constructor * Constructor
*/ */
QAPIncrEval() { moGPUQAPIncrEval() {
} }
/** /**
* Destructor * Destructor
*/ */
~QAPIncrEval() { ~moGPUQAPIncrEval() {
} }
/** /**