diff --git a/contribution/branches/MOLS/src2/moeoExhaustiveNeighborhoodExplorer.h b/contribution/branches/MOLS/src2/moeoExhaustiveNeighborhoodExplorer.h index c75910a7f..b444f2009 100644 --- a/contribution/branches/MOLS/src2/moeoExhaustiveNeighborhoodExplorer.h +++ b/contribution/branches/MOLS/src2/moeoExhaustiveNeighborhoodExplorer.h @@ -65,22 +65,26 @@ public: void operator()(eoPop < MOEOT > & _src, std::vector & _select, eoPop < MOEOT > & _dest) { - for(unsigned int i=0; i<_select.size(); i++){ - moveInit(move, _src[_select[i]]); - do - { - objVec = incrEval(move, _src[_select[i]]); - _dest.push_back(_src[_select[i]]); - move(_dest.back()); - _dest.back().objectiveVector(objVec); - _dest.back().flag(0); - } - while (nextMove(move, _src[_select[i]])); - _src[_select[i]].flag(1); - } + for(unsigned int i=0; i<_select.size(); i++) + explore(_src, _select[i], _dest); } private: + + void explore(eoPop < MOEOT > & _src, unsigned int _i, eoPop < MOEOT > & _dest) + { + moveInit(move, _src[_i]); + do + { + objVec = incrEval(move, _src[_i]); + _dest.push_back(_src[_i]); + move(_dest.back()); + _dest.back().objectiveVector(objVec); + _dest.back().flag(0); + } + while (nextMove(move, _src[_i])); + _src[_i].flag(1); + } /** Move */ Move move; /** ObjectiveVector */ @@ -91,8 +95,6 @@ private: moNextMove < Move > & nextMove; /** the incremental evaluation */ moMoveIncrEval < Move, ObjectiveVector > & incrEval; - /** comparator */ - moeoParetoObjectiveVectorComparator comparator; }; diff --git a/contribution/branches/MOLS/src2/moeoSubNeighborhoodExplorer.h b/contribution/branches/MOLS/src2/moeoSubNeighborhoodExplorer.h new file mode 100644 index 000000000..52e48f364 --- /dev/null +++ b/contribution/branches/MOLS/src2/moeoSubNeighborhoodExplorer.h @@ -0,0 +1,105 @@ +/* +* +* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2008 +* (C) OPAC Team, LIFL, 2002-2008 +* +* Arnaud Liefooghe +* Jérémie 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 _MOEOSUBNEIGHBORHOODEXPLORER_H +#define _MOEOSUBNEIGHBORHOODEXPLORER_H + +#include +#include +#include +#include +#include +#include + +/** + * TODO + */ +template < class Move > +class moeoSubNeighborhoodExplorer : public moeoPopNeighborhoodExplorer < Move > +{ + typedef typename Move::EOType MOEOT; + typedef typename MOEOT::ObjectiveVector ObjectiveVector; + +public: + + moeoSubNeighborhoodExplorer( + moMoveInit < Move > & _moveInit, + moNextMove < Move > & _nextMove, + moMoveIncrEval < Move, ObjectiveVector > & _incrEval) + : moveInit(_moveInit), nextMove(_nextMove), incrEval(_incrEval){} + + void operator()(eoPop < MOEOT > & _src, std::vector & _select, eoPop < MOEOT > & _dest, unsigned int _number) + { + if(_number > 0){ + for(unsigned int i=0; i<_select.size(); i++) + explore(_src, _select[i], _dest); + } + } + +private: + + void explore(eoPop < MOEOT > & _src, unsigned int _i, eoPop < MOEOT > & _dest, unsigned int _number) + { + unsigned int tmp= _number; + moveInit(move, _src[_i]); + do + { + objVec = incrEval(move, _src[_i]); + _dest.push_back(_src[_i]); + move(_dest.back()); + _dest.back().objectiveVector(objVec); + _dest.back().flag(0); + tmp--; + } + while (nextMove(move, _src[_i]) && (tmp > 0)); + _src[_i].flag(1); + } + /** Move */ + Move move; + /** ObjectiveVector */ + ObjectiveVector objVec; + /** the move initializer */ + moMoveInit < Move > & moveInit; + /** the neighborhood explorer */ + moNextMove < Move > & nextMove; + /** the incremental evaluation */ + moMoveIncrEval < Move, ObjectiveVector > & incrEval; + +}; + +#endif /*_MOEOEXHAUSTIVENEIGHBORHOODEXPLORER_H_*/