diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/data/PPPData.h b/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/data/moGPUPPPData.h similarity index 93% rename from branches/ParadisEO-GPU/paradiseo-gpu/src/problems/data/PPPData.h rename to branches/ParadisEO-GPU/paradiseo-gpu/src/problems/data/moGPUPPPData.h index 3be2c103e..87ffd4b79 100644 --- a/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/data/PPPData.h +++ b/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/data/moGPUPPPData.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 _PPPData_H_ -#define _PPPData_H_ +#ifndef _moGPUPPPData_H_ +#define _moGPUPPPData_H_ #include template -class PPPData: public moGPUSpecificData { +class moGPUPPPData: public moGPUSpecificData { public: @@ -48,7 +48,7 @@ public: * Default Constructor */ - PPPData() : + moGPUPPPData() : moGPUSpecificData() { //(*this).load(); @@ -59,7 +59,7 @@ public: * @param _pppData the specific data of PPP */ - PPPData(const PPPData & _pppData) { + moGPUPPPData(const moGPUPPPData & _pppData) { a_h = new int[Md * Nd]; H_h = new int[Nd]; @@ -83,7 +83,7 @@ public: * @return a PPP Data */ - PPPData & operator=(const PPPData & _pppData) { + moGPUPPPData & operator=(const moGPUPPPData & _pppData) { a_h = new int[Md * Nd]; H_h = new int[Nd]; @@ -105,7 +105,7 @@ public: * Destructor */ - ~PPPData() { + ~moGPUPPPData() { GPUObject.memFree(a_d); GPUObject.memFree(H_d); delete[] a_h; diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/data/QAPData.h b/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/data/moGPUQAPData.h similarity index 93% rename from branches/ParadisEO-GPU/paradiseo-gpu/src/problems/data/QAPData.h rename to branches/ParadisEO-GPU/paradiseo-gpu/src/problems/data/moGPUQAPData.h index 60d079c7a..7202f0159 100644 --- a/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/data/QAPData.h +++ b/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/data/moGPUQAPData.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 _QAPData_H_ -#define _QAPData_H_ +#ifndef _moGPUQAPData_H_ +#define _moGPUQAPData_H_ #include template -class QAPData: public moGPUSpecificData { +class moGPUQAPData: public moGPUSpecificData { public: @@ -49,7 +49,7 @@ public: * Default Constructor */ - QAPData() : + moGPUQAPData() : moGPUSpecificData() { } @@ -58,7 +58,7 @@ public: * @param _fileName the data file name */ - QAPData(char* _fileName) { + moGPUQAPData(char* _fileName) { (*this).load(_fileName); @@ -69,7 +69,7 @@ public: * @param _qapData the specific data of QAP */ - QAPData(const QAPData & _qapData) { + moGPUQAPData(const moGPUQAPData & _qapData) { sizeData = _qapData.sizeData; a_h = new int[sizeData * sizeData]; @@ -94,7 +94,7 @@ public: * @return a QAP Data */ - QAPData & operator=(const QAPData & _qapData) { + moGPUQAPData & operator=(const moGPUQAPData & _qapData) { sizeData = _qapData.sizeData; a_h = new int[sizeData * sizeData]; @@ -116,7 +116,7 @@ public: * Destructor */ - ~QAPData() { + ~moGPUQAPData() { GPUObject.memFree(a_d); GPUObject.memFree(b_d); delete[] a_h;