From a05ae42c0b5493b5654128d6503e7825f48aa48d Mon Sep 17 00:00:00 2001 From: boufaras Date: Wed, 14 Sep 2011 12:31:49 +0000 Subject: [PATCH] git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2362 331e1502-861f-0410-8da2-ba01fb791d7f --- .../neighborhood/moGPUCustomizeNeighborhood.h | 122 ------------------ ...zeNeighbor.h => moGPUCustomizedNeighbor.h} | 53 ++++---- 2 files changed, 28 insertions(+), 147 deletions(-) delete mode 100644 branches/ParadisEO-GPU/src/problems/neighborhood/moGPUCustomizeNeighborhood.h rename branches/ParadisEO-GPU/src/problems/neighborhood/{moGPUCustomizeNeighbor.h => moGPUCustomizedNeighbor.h} (61%) diff --git a/branches/ParadisEO-GPU/src/problems/neighborhood/moGPUCustomizeNeighborhood.h b/branches/ParadisEO-GPU/src/problems/neighborhood/moGPUCustomizeNeighborhood.h deleted file mode 100644 index 66f2c758c..000000000 --- a/branches/ParadisEO-GPU/src/problems/neighborhood/moGPUCustomizeNeighborhood.h +++ /dev/null @@ -1,122 +0,0 @@ -/* - - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 - - Boufaras Karima, Thé Van Luong - - This software is governed by the CeCILL license under French law and - abiding by the rules of distribution of free software. You can ue, - modify and/ or redistribute the software under the terms of the CeCILL - license as circulated by CEA, CNRS and INRIA at the following URL - "http://www.cecill.info". - - In this respect, the user's attention is drawn to the risks associated - with loading, using, modifying and/or developing or reproducing the - software by the user in light of its specific status of free software, - that may mean that it is complicated to manipulate, and that also - therefore means that it is reserved for developers and experienced - professionals having in-depth computer knowledge. Users are therefore - encouraged to load and test the software's suitability as regards their - requirements in conditions enabling the security of their systems and/or - data to be ensured and, more generally, to use and operate it in the - same conditions as regards security. - The fact that you are presently reading this means that you have had - knowledge of the CeCILL license and that you accept its terms. - - ParadisEO WebSite : http://paradiseo.gforge.inria.fr - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#ifndef _moCudaKswapNeighborhood_h -#define _moCudaKswapNeighborhood_h - -#include -#include - -/** - * K-flip Neighborhood - */ -template -class moCudaTypeNeighborhood: public moKswapNeighborhood { - - public: - - /** - * Define a type of a solution corresponding to Neighbor - */ - - typedef typename Neighbor::EOT EOT; - - using moKswapNeighborhood::neighborhoodSize; - using moKswapNeighborhood::currentIndex; - using moKswapNeighborhood::indices; - using moKswapNeighborhood::mapping; - using moKswapNeighborhood::Kswap; - using moKswapNeighborhood::size; - using moKswapNeighborhood::mutex; - - /** - * Constructor - * @param _size the solution size - * @param _Kpos the number of element to change in solution - * @param _eval show how to evaluate neighborhood of a solution at one time - */ - - moCudaTypeNeighborhood(unsigned int _size,unsigned int Kpos,moCudaEval& _eval) : - moKswapNeighborhood (_size, Kpos), eval(_eval) { - sendMapping = true; - cudaMalloc((void**) &device_Mapping, sizeof(unsigned int) - * neighborhoodSize * (Kswap + 1)); - } - ; - - /** - *Destructor - */ - - ~moCudaTypeNeighborhood() { - - cudaFree(device_Mapping); - } - - /** - * Initialization of the neighborhood - * @param _solution the solution to explore - * @param _current the first neighbor - */ - - virtual void init(EOT& _solution, Neighbor& _current) { - - moKswapNeighborhood::init(_solution, _current); - if (sendMapping) { - cudaMemcpy(device_Mapping, mapping, (Kswap + 1) * neighborhoodSize - * sizeof(unsigned int), cudaMemcpyHostToDevice); - sendMapping = false; - } - int fitness=_solution.fitness(); - //Compute all neighbors fitness at one time - eval.neighborhoodEval1(_solution, device_Mapping); - } - - virtual void next(EOT& _solution, Neighbor& _current) { - - moKswapNeighborhood::next(_solution, _current); - } - - /** - * Return the class Name - * @return the class name as a std::string - */ - virtual std::string className() const { - return "moCudaTypeNeighborhood"; - } - - protected: - - moCudaEval& eval; - bool sendMapping; - unsigned int * device_Mapping; - -}; - -#endif diff --git a/branches/ParadisEO-GPU/src/problems/neighborhood/moGPUCustomizeNeighbor.h b/branches/ParadisEO-GPU/src/problems/neighborhood/moGPUCustomizedNeighbor.h similarity index 61% rename from branches/ParadisEO-GPU/src/problems/neighborhood/moGPUCustomizeNeighbor.h rename to branches/ParadisEO-GPU/src/problems/neighborhood/moGPUCustomizedNeighbor.h index 39f229e73..65657a315 100644 --- a/branches/ParadisEO-GPU/src/problems/neighborhood/moGPUCustomizeNeighbor.h +++ b/branches/ParadisEO-GPU/src/problems/neighborhood/moGPUCustomizedNeighbor.h @@ -1,5 +1,5 @@ /* - + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 Jerémie Humeau, Boufaras Karima, Thé Van LUONG @@ -32,40 +32,41 @@ Contact: paradiseo-help@lists.gforge.inria.fr */ -#ifndef _moCudaTypeNeighbor_h -#define _moCudaTypeNeighbor_h +#ifndef _moGPUCustomizedNeighbor_h +#define _moGPUCustomizedNeighbor_h #include -#include +#include +#include /** - * Neighbor related to a solution vector of EOT (type) + * Neighbor related to a solution vector composed by two vectors */ -template -class moCudaTypeNeighbor: public moBackableNeighbor , - public moIndexSwapNeighbor { +template +class moGPUCustomizedNeighbor: public moBackableNeighbor< moGPUSolType2Vector > , +public moXChangeNeighbor< moGPUSolType2Vector > { + public: - using moIndexSwapNeighbor::indices; - using moIndexSwapNeighbor::Kswap; - using moIndexSwapNeighbor::size; - + using moXChangeNeighbor< moGPUSolType2Vector >::indices; + using moXChangeNeighbor< moGPUSolType2Vector >::xChange; + using moXChangeNeighbor< moGPUSolType2Vector >::key; /** *Default Constructor */ - moCudaTypeNeighbor() : - moIndexSwapNeighbor () { + moGPUCustomizedNeighbor() : + moXChangeNeighbor< moGPUSolType2Vector > () { } /** * Constructor - * @param _Kpos the number of bit to flip + * @param _xSwap the number of bit to swap */ - moCudaTypeNeighbor(unsigned int _Kpos) : - moIndexSwapNeighbor (_Kpos) { + moGPUCustomizedNeighbor(unsigned int _xSwap) : + moXChangeNeighbor< moGPUSolType2Vector > (_xSwap) { } /** @@ -73,20 +74,22 @@ public: * @param _solution the solution to move */ - virtual void move(EOT & _solution) { - int tmp; - tmp = _solution[0].tab1[indices[0]]; - _solution[0].tab1[indices[0]] = _solution[0].tab1[indices[1]]; - _solution[0].tab1[indices[1]] = tmp; + virtual void move(moGPUSolType2Vector & _solution) { + std::cout<<"_solution"< & _solution) { move(_solution); } @@ -95,7 +98,7 @@ public: * @return the class name as a std::string */ virtual std::string className() const { - return "moCudaTypeNeighbor"; + return "moGPUCustomizedNeighbor"; } };