From cb5b442bd9ff7f75e5f09345b5a2de1336b20078 Mon Sep 17 00:00:00 2001 From: boufaras Date: Thu, 12 Jan 2012 10:12:30 +0000 Subject: [PATCH] renaming the classes and update the src git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2630 331e1502-861f-0410-8da2-ba01fb791d7f --- .../neighborhood/moGPUCustomizedNeighbor.h | 14 +++++----- .../{PPPNeighbor.h => moGPUPPPNeighbor.h} | 26 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) rename branches/ParadisEO-GPU/paradiseo-gpu/src/problems/neighborhood/{PPPNeighbor.h => moGPUPPPNeighbor.h} (81%) diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/neighborhood/moGPUCustomizedNeighbor.h b/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/neighborhood/moGPUCustomizedNeighbor.h index 65657a315..464826b39 100644 --- a/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/neighborhood/moGPUCustomizedNeighbor.h +++ b/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/neighborhood/moGPUCustomizedNeighbor.h @@ -36,7 +36,7 @@ #define _moGPUCustomizedNeighbor_h #include -#include +#include #include /** @@ -45,19 +45,19 @@ template class moGPUCustomizedNeighbor: public moBackableNeighbor< moGPUSolType2Vector > , -public moXChangeNeighbor< moGPUSolType2Vector > { +public moGPUXChangeNeighbor< moGPUSolType2Vector > { public: - using moXChangeNeighbor< moGPUSolType2Vector >::indices; - using moXChangeNeighbor< moGPUSolType2Vector >::xChange; - using moXChangeNeighbor< moGPUSolType2Vector >::key; + using moGPUXChangeNeighbor< moGPUSolType2Vector >::indices; + using moGPUXChangeNeighbor< moGPUSolType2Vector >::xChange; + using moGPUXChangeNeighbor< moGPUSolType2Vector >::key; /** *Default Constructor */ moGPUCustomizedNeighbor() : - moXChangeNeighbor< moGPUSolType2Vector > () { + moGPUXChangeNeighbor< moGPUSolType2Vector > () { } /** @@ -66,7 +66,7 @@ public: */ moGPUCustomizedNeighbor(unsigned int _xSwap) : - moXChangeNeighbor< moGPUSolType2Vector > (_xSwap) { + moGPUXChangeNeighbor< moGPUSolType2Vector > (_xSwap) { } /** diff --git a/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/neighborhood/PPPNeighbor.h b/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/neighborhood/moGPUPPPNeighbor.h similarity index 81% rename from branches/ParadisEO-GPU/paradiseo-gpu/src/problems/neighborhood/PPPNeighbor.h rename to branches/ParadisEO-GPU/paradiseo-gpu/src/problems/neighborhood/moGPUPPPNeighbor.h index 0d0d2009d..f95b4207b 100644 --- a/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/neighborhood/PPPNeighbor.h +++ b/branches/ParadisEO-GPU/paradiseo-gpu/src/problems/neighborhood/moGPUPPPNeighbor.h @@ -1,5 +1,5 @@ /* - + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 Boufaras Karima, Thé Van Luong @@ -27,31 +27,31 @@ Contact: paradiseo-help@lists.gforge.inria.fr */ -#ifndef __PPPNeighbor_h -#define __PPPNeighbor_h +#ifndef __moGPUPPPNeighbor_h +#define __moGPUPPPNeighbor_h #include -#include +#include /** * A GPU X-BitFlipping Neighbor */ template -class PPPNeighbor: public moBackableNeighbor , public moXChangeNeighbor< +class moGPUPPPNeighbor: public moBackableNeighbor , public moGPUXChangeNeighbor< EOT> { public: - using moXChangeNeighbor::indices; - using moXChangeNeighbor::xChange; - using moXChangeNeighbor::key; + using moGPUXChangeNeighbor::indices; + using moGPUXChangeNeighbor::xChange; + using moGPUXChangeNeighbor::key; /** *Default Constructor */ - PPPNeighbor() : - moXChangeNeighbor () { + moGPUPPPNeighbor() : + moGPUXChangeNeighbor () { } /** @@ -59,8 +59,8 @@ public: * @param _xFlip the number of bit to flip */ - PPPNeighbor(unsigned int _xFlip) : - moXChangeNeighbor (_xFlip) { + moGPUPPPNeighbor(unsigned int _xFlip) : + moGPUXChangeNeighbor (_xFlip) { } /** @@ -91,7 +91,7 @@ public: */ virtual std::string className() const { - return "PPPNeighbor"; + return "moGPUPPPNeighbor"; } };