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

Ajout de moPopSolInit.h pour initialiser a solution-set

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1903 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
verel 2010-08-17 13:14:31 +00:00
commit 0ef7bc2165
3 changed files with 144 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,7 @@
<moPopBitNeighbor.h> <moPopBitNeighbor.h>
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
Sébastien Verel, Arnaud Liefooghe, Jérémie Humeau Sebastien Verel, Arnaud Liefooghe, Jeremie Humeau
This software is governed by the CeCILL license under French law and This software is governed by the CeCILL license under French law and
abiding by the rules of distribution of free software. You can ue, abiding by the rules of distribution of free software. You can ue,
@ -33,7 +33,6 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#include <eoPop.h> #include <eoPop.h>
#include <ga/eoBit.h> #include <ga/eoBit.h>
#include <problems/bitString/moPopSol.h> #include <problems/bitString/moPopSol.h>
#include <neighborhood/moBackableNeighbor.h>
#include <neighborhood/moIndexNeighbor.h> #include <neighborhood/moIndexNeighbor.h>
/** /**

2
trunk/paradiseo-mo/src/problems/bitString/moPopSol.h
View file

@ -36,6 +36,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
template <class EOT> template <class EOT>
class moPopSol : public EO<double>, public std::vector<EOT>{ class moPopSol : public EO<double>, public std::vector<EOT>{
public: public:
typedef EOT SUBEOT; // public type of the solution
typedef typename EO<double>::Fitness Fitness; typedef typename EO<double>::Fitness Fitness;
using EO<double>::invalidate; using EO<double>::invalidate;

52
trunk/paradiseo-mo/src/problems/eval/moPopBitEval.h
View file

@ -2,7 +2,7 @@
<moPopBitEval.h> <moPopBitEval.h>
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
Sébastien Verel, Arnaud Liefooghe, Jérémie Humeau Sebastien Verel, Arnaud Liefooghe, Jeremie Humeau
This software is governed by the CeCILL license under French law and This software is governed by the CeCILL license under French law and
abiding by the rules of distribution of free software. You can use, abiding by the rules of distribution of free software. You can use,
@ -39,46 +39,70 @@
#include <eval/moEval.h> #include <eval/moEval.h>
/** /**
* Abstract class for the evaluation * Class to compute the fitness of the solution-set after mutation of one bit
*/ */
template<class Neighbor> template<class Neighbor>
class moPopBitEval : public moEval<Neighbor> class moPopBitEval : public moEval<Neighbor>
{ {
public: public:
typedef typename Neighbor::EOT EOT; typedef typename Neighbor::EOT EOT;
typedef typename Neighbor::SUBEOT SUBEOT; typedef typename Neighbor::SUBEOT SUBEOT; // type of the solution
typedef typename EOT::Fitness Fitness; typedef typename SUBEOT::Fitness Fitness; // fitness type of the solution
/**
* Default constructor
*
* @param _eval evaluation function of the solution
* @param _p exponent of the p-norm to compute the fitness of the solution-set
*/
moPopBitEval(eoEvalFunc<SUBEOT>& _eval, unsigned int _p):eval(_eval), p(_p){ moPopBitEval(eoEvalFunc<SUBEOT>& _eval, unsigned int _p):eval(_eval), p(_p){
} }
/**
* Compute the fitness of the neighbor after one bit mutation
*
* @param _sol the solution-set
* @param _n the neighbor which is supposed to be indexed
*/
void operator()(EOT& _sol, Neighbor& _n){ void operator()(EOT& _sol, Neighbor& _n){
if(_sol[0].size()>0) { if(_sol[0].size()>0) {
// index of the solution and the bit
unsigned int size = _sol[0].size(); unsigned int size = _sol[0].size();
unsigned int s=_n.index()/size; unsigned int s = _n.index() / size; // solution index
unsigned int b=_n.index()%size; unsigned int b = _n.index() % size; // bit index
subfit=_sol[s].fitness();
// flip the right bit
_sol[s][b] = !_sol[s][b]; _sol[s][b] = !_sol[s][b];
// compute and save the fitness of the solution s
fitOfSol = _sol[s].fitness();
_sol[s].invalidate(); _sol[s].invalidate();
eval(_sol[s]); eval(_sol[s]);
double fit=0;
for (unsigned int i = 0; i < _sol.size(); i++){
fit+=pow((double) _sol[i].fitness(), (int) p);
}
fit=pow((double) fit, (double)1/p);
_n.setSubFit(_sol[s].fitness()); _n.setSubFit(_sol[s].fitness());
// compute the fitness of the solution-set
double fit = 0;
for (unsigned int i = 0; i < _sol.size(); i++)
fit += pow((double) _sol[i].fitness(), (int) p);
fit = pow((double) fit, (double)1/p);
_n.fitness(fit); _n.fitness(fit);
// come back to the initial solution
_sol[s][b] = !_sol[s][b]; _sol[s][b] = !_sol[s][b];
_sol[s].fitness(subfit); _sol[s].fitness(fitOfSol);
} }
} }
private: private:
eoEvalFunc<SUBEOT> & eval; eoEvalFunc<SUBEOT> & eval;
unsigned int p; unsigned int p;
Fitness subfit; Fitness fitOfSol;
}; };