diff --git a/contribution/branches/MOLS/src/moeoSimpleOneSolOneNeighborExpl.h b/contribution/branches/MOLS/src/moeoSimpleOneSolOneNeighborExpl.h new file mode 100644 index 000000000..73f73b190 --- /dev/null +++ b/contribution/branches/MOLS/src/moeoSimpleOneSolOneNeighborExpl.h @@ -0,0 +1,181 @@ +/* +* +* Copyright (C) DOLPHIN project-team, LIFL, INRIA Lille, 2009 +* 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 _MOEOSIMPLEONESOLONENEIGHBOREXPL_H +#define _MOEOSIMPLEONESOLONENEIGHBOREXPL_H + +#include +#include +#include +#include +#include +#include + +template < class Move > +class moeoSimpleOneSolOneNeighborExpl : public moeoPopNeighborhoodExplorer < Move > +{ + typedef typename Move::EOType MOEOT; + typedef typename MOEOT::ObjectiveVector ObjectiveVector; + +public: + + moeoSimpleOneSolOneNeighborExpl( + moMoveInit < Move > & _moveInit, + moNextMove < Move > & _nextMove, + moMoveIncrEval < Move, ObjectiveVector > & _incrEval) + : moveInit(_moveInit), nextMove(_nextMove), incrEval(_incrEval) {} + + + void operator()(eoPop < MOEOT > & _src, eoPop < MOEOT > & _dest) + { + // init + Move move; + ObjectiveVector objVec; + unsigned int i = eo::rng.random(_src.size()); // "-1" ??? + moveInit(move, _src[i]); + // ttt + objVec = incrEval(move, _src[i]); + _dest.push_back(_src[i]); + move(_dest.back()); + _dest.back().objectiveVector(objVec); + _dest.back().flag(0); + // si tous les voisins sont dominés (ie "! nextMove(move,_src[i])"), mettre le flag à ZERO !!!!!!!!!!!!!!!!!!!!!!!!!!! + } + + +private: + + /** the move initializer */ + moMoveInit < Move > & moveInit; + /** the neighborhood explorer */ + 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) */ +// void operator()(eoPop < MOEOT > & _src, eoPop < MOEOT > & _dest) +// { +// ObjectiveVector objVec; +// unsigned int i = 0; +// // setting _src[i] +// if (!start) +// { +// while (_src[i].flag() != 0) +// i++; +// moveInit(move, _src[i]); +// _src[i].flag(-1); +// } +// else +// { +// while ( (i < _src.size()) && (_src[i].flag() != -1) ) +// i++; +// if (_src[i].flag() != -1) +// { +// i=0; +// while (_src[i].flag() != 0) +// i++; +// moveInit(move, _src[i]); +// _src[i].flag(-1); +// } +// } +// // ttt +// objVec = incrEval(move, _src[i]); +// if (! comparator (objVec, _src[i].objectiveVector())) +// { +// if (objVec != _src[i].objectiveVector()) +// { +// _dest.push_back(_src[i]); +// move(_dest.back()); +// _dest.back().objectiveVector(objVec); +// _dest.back().flag(0); +// } +// } +// // preparing the next iteration +// if (nextMove(move, _src[i])) +// { +// start=true; +// } +// else +// { +// start=false; +// _src[i].flag(1); +// } +// } + + + + + + /* version 1 */ +// if(!start){ +// moveInit(move, _src[i]); +// _dest.push_back(_src[i]); +// sol = & _dest.back(); +// move(*sol); +// sol->invalidate(); +// eval(*sol); +// if(nextMove(move, _src[i])) +// start=true; +// else{ +// start=false; +// _src[i].flag(1); +// } +// } +// else{ +// _dest.push_back(_src[i]); +// sol = & _dest.back(); +// //objVec = moveIncrEval(move, *sol); +// move(*sol); +// sol->invalidate(); +// eval(*sol); +// //sol->objectiveVector(objVec); +// //if (comparator(sol, _src[i])) +// if(!nextMove(move, _src[i])){ +// start=false; +// _src[i].flag(1); +// } +// } +// } + +}; + +#endif /*_MOEOSIMPLEONESOLONENEIGHBOREXPL_H_*/