diff --git a/trunk/paradiseo-mo/src/problems/eval/moPopBitEval.h b/trunk/paradiseo-mo/src/problems/eval/moPopBitEval.h deleted file mode 100644 index d856bfd00..000000000 --- a/trunk/paradiseo-mo/src/problems/eval/moPopBitEval.h +++ /dev/null @@ -1,109 +0,0 @@ -/* - - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 - - Sebastien Verel, Arnaud Liefooghe, Jeremie Humeau - - This software is governed by the CeCILL license under French law and - abiding by the rules of distribution of free software. You can use, - 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". - - As a counterpart to the access to the source code and rights to copy, - modify and redistribute granted by the license, users are provided only - with a limited warranty and the software's author, the holder of the - economic rights, and the successive licensors have only limited liability. - - 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 moPopBitEval_H -#define moPopBitEval_H - -#include -#include - -/** - * Class to compute the fitness of the solution-set after mutation of one bit - */ -template -class moPopBitEval : public moEval -{ -public: - typedef typename Neighbor::EOT EOT; - typedef typename Neighbor::SUBEOT SUBEOT; // type of the solution - - 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& _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){ - if(_sol[0].size()>0) { - // index of the solution and the bit - unsigned int size = _sol[0].size(); - unsigned int s = _n.index() / size; // solution index - unsigned int b = _n.index() % size; // bit index - - // flip the right bit - _sol[s][b] = !_sol[s][b]; - - // compute and save the fitness of the solution s - fitOfSol = _sol[s].fitness(); - - _sol[s].invalidate(); - eval(_sol[s]); - - _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); - - // come back to the initial solution - _sol[s][b] = !_sol[s][b]; - _sol[s].fitness(fitOfSol); - } - } - -private: - eoEvalFunc & eval; - unsigned int p; - Fitness fitOfSol; - -}; - -#endif diff --git a/trunk/paradiseo-mo/src/problems/eval/moPopBitsEval.h b/trunk/paradiseo-mo/src/problems/eval/moPopBitsEval.h deleted file mode 100644 index 2c079ca66..000000000 --- a/trunk/paradiseo-mo/src/problems/eval/moPopBitsEval.h +++ /dev/null @@ -1,109 +0,0 @@ -/* - - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 - - Sebastien Verel, Arnaud Liefooghe, Jeremie Humeau - - This software is governed by the CeCILL license under French law and - abiding by the rules of distribution of free software. You can use, - 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". - - As a counterpart to the access to the source code and rights to copy, - modify and redistribute granted by the license, users are provided only - with a limited warranty and the software's author, the holder of the - economic rights, and the successive licensors have only limited liability. - - 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 moPopBitsEval_H -#define moPopBitsEval_H - -#include -#include - -/** - * Class to compute the fitness of the solution-set after one bit flip of several solutions - */ -template -class moPopBitsEval : public moEval -{ -public: - typedef typename Neighbor::EOT EOT; - typedef typename Neighbor::SUBEOT SUBEOT; // type of the solution - - typedef typename SUBEOT::Fitness SUBFitness; // 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 - */ - moPopBitsEval(eoEvalFunc& _eval, unsigned int _p) : eval(_eval), p(_p) { - } - - /** - * Compute the fitness of the neighbor after the bit flip mutations - * - * @param _sol the solution-set - * @param _n the neighbor which is supposed to be a "bits" neighbor - */ - void operator()(EOT& _sol, Neighbor& _n) { - double fit = 0; - - for(unsigned int i = 0; i < _sol.size(); i++) { - if (_n.mutate[i]) { - // save the fitness of the solution i - SUBFitness f = _sol[i].fitness(); - - // modify the solution - _sol[i][ _n.bits[i] ] = !_sol[i][ _n.bits[i] ]; - _sol[i].invalidate(); - - // evaluation of the solution - eval(_sol[i]); - - // save the fitness in the neighbor - _n.fitSol[i] = _sol[i].fitness(); - - // compute the fitness of the solution-set - fit += pow((double) _sol[i].fitness(), (int) p); - - // come back to the fitness of the initial solution - _sol[i].fitness(f); - _sol[i][ _n.bits[i] ] = !_sol[i][ _n.bits[i] ]; - } else - // compute the fitness of the solution-set - fit += pow((double) _sol[i].fitness(), (int) p); - - } - - fit = pow((double) fit, (double)1/p); - - _n.fitness(fit); - } - -private: - eoEvalFunc & eval; - unsigned int p; - -}; - -#endif diff --git a/trunk/paradiseo-mo/src/problems/eval/moPopXoverEval.h b/trunk/paradiseo-mo/src/problems/eval/moPopXoverEval.h deleted file mode 100644 index 04fd8db30..000000000 --- a/trunk/paradiseo-mo/src/problems/eval/moPopXoverEval.h +++ /dev/null @@ -1,106 +0,0 @@ -/* - - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 - - Sebastien Verel, Arnaud Liefooghe, Jeremie Humeau - - This software is governed by the CeCILL license under French law and - abiding by the rules of distribution of free software. You can use, - 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". - - As a counterpart to the access to the source code and rights to copy, - modify and redistribute granted by the license, users are provided only - with a limited warranty and the software's author, the holder of the - economic rights, and the successive licensors have only limited liability. - - 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 moPopXoverEval_H -#define moPopXoverEval_H - -#include -#include - -/** - * Class to compute the fitness of the solution-set after the crossover - */ -template -class moPopXoverEval : public moEval -{ -public: - typedef typename Neighbor::EOT EOT; - typedef typename Neighbor::SUBEOT SUBEOT; // type of the solution - - 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 - */ - moPopXoverEval(eoEvalFunc& _eval, unsigned int _p) : eval(_eval), p(_p) { - } - - /** - * Compute the fitness of the neighbor after the crossover - * - * @param _sol the solution-set - * @param _n the neighbor which is supposed to be a "crossover" neighbor - */ - void operator()(EOT& _sol, Neighbor& _n){ - if (_sol[0].size() > 0) { - // index of the solutions - unsigned int i1 = _n.index1(); - unsigned int i2 = _n.index2(); - - // evaluation of the solutions which are moved - eval(_n.solution1()); - eval(_n.solution2()); - - // save the fitness of the solution i1 and i2 - Fitness f1 = _sol[i1].fitness(); - Fitness f2 = _sol[i2].fitness(); - - _sol[i1].fitness(_n.solution1().fitness()); - _sol[i2].fitness(_n.solution2().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); - - // come back to the fitness of the initial solution - _sol[i1].fitness(f1); - _sol[i2].fitness(f2); - } - } - -private: - eoEvalFunc & eval; - unsigned int p; - -}; - -#endif