diff --git a/contribution/branches/MOLS/src/moeoSimpleAllSolOneNeighborExpl.h b/contribution/branches/MOLS/src/moeoSimpleAllSolOneNeighborExpl.h new file mode 100644 index 000000000..53896dffb --- /dev/null +++ b/contribution/branches/MOLS/src/moeoSimpleAllSolOneNeighborExpl.h @@ -0,0 +1,100 @@ +/* +* +* 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 _MOEOSIMPLEALLSOLONENEIGHBOREXPL_H +#define _MOEOSIMPLEALLSOLONENEIGHBOREXPL_H + +#include +#include +#include +#include +#include +#include +#include + +/** + * TODO + */ +template < class Move > +class moeoSimpleAllSolOneNeighborExpl : public moeoPopNeighborhoodExplorer < Move > +{ + typedef typename Move::EOType MOEOT; + typedef typename MOEOT::ObjectiveVector ObjectiveVector; + +public: + + moeoSimpleAllSolOneNeighborExpl( + moMoveInit < Move > & _moveInit, + moNextMove < Move > & _nextMove, + moMoveIncrEval < Move, ObjectiveVector > & _incrEval) + : moveInit(_moveInit), nextMove(_nextMove), incrEval(_incrEval){} + + + void operator()(eoPop < MOEOT > & _src, eoPop < MOEOT > & _dest) + { + for (unsigned int i=0; i<_src.size(); i++) + { + moveInit(move, _src[i]); + // Apply move or not + + ObjectiveVector objVec = incrEval(move, _src[i]); + _dest.push_back(_src[i]); + move(_dest.back()); + _dest.back().objectiveVector(objVec); + //_dest.back().flag(0); + //m(_src, _dest, i, move); + + + } + } +private: + + /** queue of available move */ + //std::queue < unsigned int > availableMove; + /** the move vector*/ + Move move; + /** the move initializer */ + moMoveInit < Move > & moveInit; + /** the neighborhood explorer */ + moNextMove < Move > & nextMove; + /** the incremental evaluation */ + moMoveIncrEval < Move, ObjectiveVector > & incrEval; + +}; + +#endif /*_MOEOSIMPLEALLSOLONENEIGHBOREXPL_H_*/ diff --git a/contribution/branches/MOLS/src/moeoSimpleOneSolOneNeighborExpl.h b/contribution/branches/MOLS/src/moeoSimpleOneSolOneNeighborExpl.h index 73f73b190..7bb0a9e18 100644 --- a/contribution/branches/MOLS/src/moeoSimpleOneSolOneNeighborExpl.h +++ b/contribution/branches/MOLS/src/moeoSimpleOneSolOneNeighborExpl.h @@ -71,7 +71,7 @@ public: _dest.push_back(_src[i]); move(_dest.back()); _dest.back().objectiveVector(objVec); - _dest.back().flag(0); + //_dest.back().flag(0); // si tous les voisins sont dominés (ie "! nextMove(move,_src[i])"), mettre le flag à ZERO !!!!!!!!!!!!!!!!!!!!!!!!!!! } @@ -84,11 +84,6 @@ private: moNextMove < Move > & nextMove; /** the incremental evaluation */ moMoveIncrEval < Move, ObjectiveVector > & incrEval; - /** comparator */ - moeoParetoObjectiveVectorComparator comparator; - - - /* la même solution est utilisée iteration après iteration (qd c'est possible) */