From 80c51911da4d4dbebd82f7670d5360ee59020ca4 Mon Sep 17 00:00:00 2001 From: boufaras Date: Thu, 12 Jan 2012 10:11:58 +0000 Subject: [PATCH] renaming the classes and update the src git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2629 331e1502-861f-0410-8da2-ba01fb791d7f --- .../eval/{EvalOneMax.h => moGPUEvalOneMax.h} | 12 ++++++------ .../{OneMaxIncrEval.h => moGPUOneMaxIncrEval.h} | 12 ++++++------ .../problems/eval/{PPPEval.h => moGPUPPPEval.h} | 16 ++++++++-------- .../eval/{PPPIncrEval.h => moGPUPPPIncrEval.h} | 12 ++++++------ .../problems/eval/{QAPEval.h => moGPUQAPEval.h} | 16 ++++++++-------- .../eval/{QAPIncrEval.h => moGPUQAPIncrEval.h} | 12 ++++++------ 6 files changed, 40 insertions(+), 40 deletions(-) rename branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/{EvalOneMax.h => moGPUEvalOneMax.h} (92%) rename branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/{OneMaxIncrEval.h => moGPUOneMaxIncrEval.h} (92%) rename branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/{PPPEval.h => moGPUPPPEval.h} (90%) rename branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/{PPPIncrEval.h => moGPUPPPIncrEval.h} (94%) rename branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/{QAPEval.h => moGPUQAPEval.h} (90%) rename branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/{QAPIncrEval.h => moGPUQAPIncrEval.h} (95%) diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/EvalOneMax.h b/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/moGPUEvalOneMax.h similarity index 92% rename from branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/EvalOneMax.h rename to branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/moGPUEvalOneMax.h index a177b447a..e5bf7d8ec 100644 --- a/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/EvalOneMax.h +++ b/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/moGPUEvalOneMax.h @@ -1,5 +1,5 @@ /* - + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 Karima Boufaras, Thé Van LUONG @@ -32,15 +32,15 @@ Contact: paradiseo-help@lists.gforge.inria.fr */ -#ifndef __EvalOneMax_H -#define __EvalOneMax_H +#ifndef __moGPUEvalOneMax_H +#define __moGPUEvalOneMax_H /** * Full Evaluation of the solution */ template -class EvalOneMax: public eoEvalFunc { +class moGPUEvalOneMax: public eoEvalFunc { public: @@ -48,14 +48,14 @@ class EvalOneMax: public eoEvalFunc { * Constructor */ - EvalOneMax() { + moGPUEvalOneMax() { } /** * Destructor */ - ~EvalOneMax(void) { + ~moGPUEvalOneMax(void) { } /** diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/OneMaxIncrEval.h b/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/moGPUOneMaxIncrEval.h similarity index 92% rename from branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/OneMaxIncrEval.h rename to branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/moGPUOneMaxIncrEval.h index 7af4dc890..3e30bd6d5 100644 --- a/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/OneMaxIncrEval.h +++ b/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/moGPUOneMaxIncrEval.h @@ -1,5 +1,5 @@ /* - + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 Karima Boufaras, Thé Van LUONG @@ -32,8 +32,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr */ -#ifndef __OneMaxIncrEval_H -#define __OneMaxIncrEval_H +#ifndef __moGPUOneMaxIncrEval_H +#define __moGPUOneMaxIncrEval_H #include @@ -42,7 +42,7 @@ */ template -class OneMaxIncrEval: public moGPUEvalFunc { +class moGPUOneMaxIncrEval: public moGPUEvalFunc { public: @@ -54,14 +54,14 @@ public: * Constructor */ - OneMaxIncrEval() { + moGPUOneMaxIncrEval() { } /** * Destructor */ - ~OneMaxIncrEval() { + ~moGPUOneMaxIncrEval() { } /** diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/PPPEval.h b/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/moGPUPPPEval.h similarity index 90% rename from branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/PPPEval.h rename to branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/moGPUPPPEval.h index 39899c8d3..dfdd433de 100644 --- a/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/PPPEval.h +++ b/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/moGPUPPPEval.h @@ -1,5 +1,5 @@ /* - + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 Boufaras Karima, Thé Van Luong @@ -32,13 +32,13 @@ Contact: paradiseo-help@lists.gforge.inria.fr */ -#ifndef __PPPEval_H -#define __PPPEval_H +#ifndef __moGPUPPPEval_H +#define __moGPUPPPEval_H -#include +#include template -class PPPEval: public eoEvalFunc { +class moGPUPPPEval: public eoEvalFunc { public: @@ -47,7 +47,7 @@ public: * @param _pppData the specific data problem useful to evalute solution( vector of 1 & _1 for PPP) */ - PPPEval(PPPData & _pppData) { + moGPUPPPEval(moGPUPPPData & _pppData) { pppData = _pppData; } @@ -55,7 +55,7 @@ public: * Destructor */ - ~PPPEval() { + ~moGPUPPPEval() { } /** @@ -95,7 +95,7 @@ public: protected: - PPPData pppData; + moGPUPPPData pppData; }; diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/PPPIncrEval.h b/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/moGPUPPPIncrEval.h similarity index 94% rename from branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/PPPIncrEval.h rename to branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/moGPUPPPIncrEval.h index 9ce5d22fc..a7219adb2 100644 --- a/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/PPPIncrEval.h +++ b/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/moGPUPPPIncrEval.h @@ -1,5 +1,5 @@ /* - + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 Karima Boufaras, Thé Van LUONG @@ -32,8 +32,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr */ -#ifndef __PPPIncrEval_H -#define __PPPIncrEval_H +#ifndef __moGPUPPPIncrEval_H +#define __moGPUPPPIncrEval_H #include @@ -42,7 +42,7 @@ */ template -class PPPIncrEval: public moGPUEvalFunc { +class moGPUPPPIncrEval: public moGPUEvalFunc { public: @@ -54,14 +54,14 @@ public: * Constructor */ - PPPIncrEval() { + moGPUPPPIncrEval() { } /** * Destructor */ - ~PPPIncrEval() { + ~moGPUPPPIncrEval() { } /** diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/QAPEval.h b/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/moGPUQAPEval.h similarity index 90% rename from branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/QAPEval.h rename to branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/moGPUQAPEval.h index 250f19240..a3568158d 100644 --- a/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/QAPEval.h +++ b/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/moGPUQAPEval.h @@ -1,5 +1,5 @@ /* - + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 Boufaras Karima, Thé Van Luong @@ -32,13 +32,13 @@ Contact: paradiseo-help@lists.gforge.inria.fr */ -#ifndef __QAPEval_H -#define __QAPEval_H +#ifndef __moGPUQAPEval_H +#define __moGPUQAPEval_H -#include +#include template -class QAPEval: public eoEvalFunc { +class moGPUQAPEval: public eoEvalFunc { public: @@ -47,7 +47,7 @@ public: * @param _qapData the specific data problem useful to evalute solution(flow & distance matrices of QAP problem) */ - QAPEval(QAPData & _qapData) { + moGPUQAPEval(moGPUQAPData & _qapData) { qapData = _qapData; } @@ -55,7 +55,7 @@ public: * Destructor */ - ~QAPEval() { + ~moGPUQAPEval() { } /** @@ -77,7 +77,7 @@ public: protected: - QAPData qapData; + moGPUQAPData qapData; }; diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/QAPIncrEval.h b/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/moGPUQAPIncrEval.h similarity index 95% rename from branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/QAPIncrEval.h rename to branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/moGPUQAPIncrEval.h index 71a316e32..f824d7610 100644 --- a/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/QAPIncrEval.h +++ b/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/eval/moGPUQAPIncrEval.h @@ -1,5 +1,5 @@ /* - + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 Karima Boufaras, Thé Van LUONG @@ -32,8 +32,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr */ -#ifndef __QAPIncrEval_H -#define __QAPIncrEval_H +#ifndef __moGPUQAPIncrEval_H +#define __moGPUQAPIncrEval_H #include @@ -42,7 +42,7 @@ */ template -class QAPIncrEval: public moGPUEvalFunc { +class moGPUQAPIncrEval: public moGPUEvalFunc { public: @@ -54,14 +54,14 @@ public: * Constructor */ - QAPIncrEval() { + moGPUQAPIncrEval() { } /** * Destructor */ - ~QAPIncrEval() { + ~moGPUQAPIncrEval() { } /**