nojhan/paradiseo
Watch
1
0
Fork
You've already forked paradiseo
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

renaming the classes and update the src

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2630 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
boufaras 2012-01-12 10:12:30 +00:00
commit cb5b442bd9
2 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

14
branches/ParadisEO-GPU/paradiseo-gpu/src/problems/neighborhood/moGPUCustomizedNeighbor.h
View file

@ -36,7 +36,7 @@
#define _moGPUCustomizedNeighbor_h #define _moGPUCustomizedNeighbor_h
#include <neighborhood/moBackableNeighbor.h> #include <neighborhood/moBackableNeighbor.h>
#include <neighborhood/moXChangeNeighbor.h> #include <neighborhood/moGPUXChangeNeighbor.h>
#include <problems/types/moGPUSolType2Vector.h> #include <problems/types/moGPUSolType2Vector.h>
/** /**
@ -45,19 +45,19 @@
template<class Fitness> template<class Fitness>
class moGPUCustomizedNeighbor: public moBackableNeighbor< moGPUSolType2Vector<Fitness> > , class moGPUCustomizedNeighbor: public moBackableNeighbor< moGPUSolType2Vector<Fitness> > ,
public moXChangeNeighbor< moGPUSolType2Vector<Fitness> > { public moGPUXChangeNeighbor< moGPUSolType2Vector<Fitness> > {
public: public:
using moXChangeNeighbor< moGPUSolType2Vector<Fitness> >::indices; using moGPUXChangeNeighbor< moGPUSolType2Vector<Fitness> >::indices;
using moXChangeNeighbor< moGPUSolType2Vector<Fitness> >::xChange; using moGPUXChangeNeighbor< moGPUSolType2Vector<Fitness> >::xChange;
using moXChangeNeighbor< moGPUSolType2Vector<Fitness> >::key; using moGPUXChangeNeighbor< moGPUSolType2Vector<Fitness> >::key;
/** /**
*Default Constructor *Default Constructor
*/ */
moGPUCustomizedNeighbor() : moGPUCustomizedNeighbor() :
moXChangeNeighbor< moGPUSolType2Vector<Fitness> > () { moGPUXChangeNeighbor< moGPUSolType2Vector<Fitness> > () {
} }
/** /**
@ -66,7 +66,7 @@ public:
*/ */
moGPUCustomizedNeighbor(unsigned int _xSwap) : moGPUCustomizedNeighbor(unsigned int _xSwap) :
moXChangeNeighbor< moGPUSolType2Vector<Fitness> > (_xSwap) { moGPUXChangeNeighbor< moGPUSolType2Vector<Fitness> > (_xSwap) {
} }
/** /**

100
branches/ParadisEO-GPU/paradiseo-gpu/src/problems/neighborhood/moGPUPPPNeighbor.h Normal file
View file

@ -0,0 +1,100 @@
/*
<moGPUPPPNeighbor.h>
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 __moGPUPPPNeighbor_h
#define __moGPUPPPNeighbor_h
#include <neighborhood/moBackableNeighbor.h>
#include <neighborhood/moGPUXChangeNeighbor.h>
/**
* A GPU X-BitFlipping Neighbor
*/
template<class EOT, class Fitness=typename EOT::Fitness>
class moGPUPPPNeighbor: public moBackableNeighbor<EOT> , public moGPUXChangeNeighbor<
EOT> {
public:
using moGPUXChangeNeighbor<EOT>::indices;
using moGPUXChangeNeighbor<EOT>::xChange;
using moGPUXChangeNeighbor<EOT>::key;
/**
*Default Constructor
*/
moGPUPPPNeighbor() :
moGPUXChangeNeighbor<EOT> () {
}
/**
* Constructor
* @param _xFlip the number of bit to flip
*/
moGPUPPPNeighbor(unsigned int _xFlip) :
moGPUXChangeNeighbor<EOT> (_xFlip) {
}
/**
* Apply the K-Flip in solution
* @param _solution the solution to move
*/
virtual void move(EOT& _solution) {
for (unsigned int i = 0; i < xChange; i++)
_solution[indices[i]] = -_solution[indices[i]];
_solution.invalidate();
}
/**
* apply the K-Flip to restore the solution (use by moFullEvalByModif)
* @param _solution the solution to move back
*/
virtual void moveBack(EOT& _solution) {
move(_solution);
}
/**
* Return the class name.
* @return the class name as a std::string
*/
virtual std::string className() const {
return "moGPUPPPNeighbor";
}
};
#endif