nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

début des travaux sur les populations

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1837 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jhumeau 2010-06-04 13:06:35 +00:00
commit 585d90b082
7 changed files with 246 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

28
trunk/paradiseo-mo/src/problems/bitString/moPopBitNeighbor.h
View file

@ -40,12 +40,13 @@ Contact: paradiseo-help@lists.gforge.inria.fr
* Neighbor related to a vector of Bit
*/
template< class Fitness >
class moPopBitNeighbor : public moBackableNeighbor< moPopSol<eoBit<Fitness> > >, public moIndexNeighbor< moPopSol<eoBit<Fitness> > >
class moPopBitNeighbor : public moIndexNeighbor< moPopSol<eoBit<Fitness> > >
{
public:
typedef moPopSol<eoBit<Fitness> > EOT ;
typedef eoBit<Fitness> SUBEOT;
using moBackableNeighbor<EOT>::fitness;
using moIndexNeighbor<EOT>::fitness;
using moIndexNeighbor<EOT>::key;
/**
@ -53,23 +54,18 @@ public:
* @param _solution the solution to move
*/
virtual void move(EOT & _solution) {
if(_solution.size()>0){
size=_solution[0].size();
_solution[key/size][key%size] = !_solution[key/size][key%size];
// fit=_solution[key/size].fitness();
_solution[key/size].invalidate();
// fitSol=_solution.fitness();
if(_solution[0].size()>0){
unsigned size=_solution[0].size();
unsigned s = key/size;
unsigned b = key%size;
_solution[s][b] = !_solution[s][b];
_solution[s].fitness(subfit);
_solution.invalidate();
}
}
/**
* move back the solution (useful for the evaluation by modif)
* @param _solution the solution to move back
*/
virtual void moveBack(EOT & _solution) {
_solution[key/size][key%size] = !_solution[key/size][key%size];
// _solution[key/size].fitness(fit);
void setSubFit(Fitness _subfit){
subfit=_subfit;
}
/**
@ -113,7 +109,7 @@ public:
}
private:
unsigned int size;
Fitness subfit;
};
#endif