git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1542 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jhumeau
parent
e0956d8083
commit
73bcab1f2b
5 changed files with 298 additions and 2 deletions
|
|
@ -0,0 +1,99 @@
|
|||
/*
|
||||
* <moeoExhaustiveNeighborhoodExplorer.h>
|
||||
* 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 _MOEOEXHAUSTIVENEIGHBORHOODEXPLORER_H
|
||||
#define _MOEOEXHAUSTIVENEIGHBORHOODEXPLORER_H
|
||||
|
||||
#include <eo>
|
||||
#include <moeo>
|
||||
#include <moMove.h>
|
||||
#include <moMoveInit.h>
|
||||
#include <moNextMove.h>
|
||||
#include <moMoveIncrEval.h>
|
||||
|
||||
/**
|
||||
* TODO
|
||||
*/
|
||||
template < class Move >
|
||||
class moeoExhaustiveNeighborhoodExplorer : public moeoPopNeighborhoodExplorer < Move >
|
||||
{
|
||||
typedef typename Move::EOType MOEOT;
|
||||
typedef typename MOEOT::ObjectiveVector ObjectiveVector;
|
||||
|
||||
public:
|
||||
|
||||
moeoExhaustiveNeighborhoodExplorer(
|
||||
moMoveInit < Move > & _moveInit,
|
||||
moNextMove < Move > & _nextMove,
|
||||
moMoveIncrEval < Move, ObjectiveVector > & _incrEval)
|
||||
: moveInit(_moveInit), nextMove(_nextMove), incrEval(_incrEval){}
|
||||
|
||||
void operator()(eoPop < MOEOT > & _src, std::vector<unsigned int> & _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);
|
||||
}
|
||||
}
|
||||
|
||||
private:
|
||||
/** 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;
|
||||
/** comparator */
|
||||
moeoParetoObjectiveVectorComparator<ObjectiveVector> comparator;
|
||||
|
||||
};
|
||||
|
||||
#endif /*_MOEOEXHAUSTIVENEIGHBORHOODEXPLORER_H_*/
|
||||
|
|
@ -0,0 +1,71 @@
|
|||
/*
|
||||
* <moeoExhaustiveUnvisitedSelect.h>
|
||||
* 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 _MOEOEXHAUSTIVEUNVISITEDSELECT_H
|
||||
#define _MOEOEXHAUSTIVEUNVISITEDSELECT_H
|
||||
|
||||
#include <eo>
|
||||
#include <moeo>
|
||||
|
||||
/**
|
||||
* TODO
|
||||
*/
|
||||
template < class Move >
|
||||
class moeoExhaustiveUnvisitedSelect : public moeoUnvisitedSelect < Move >
|
||||
{
|
||||
typedef typename Move::EOType MOEOT;
|
||||
|
||||
public:
|
||||
|
||||
moeoExhaustiveUnvisitedSelect(){}
|
||||
|
||||
std::vector <unsigned int> operator()(eoPop < MOEOT > & _src)
|
||||
{
|
||||
std::vector <unsigned int> res;
|
||||
res.resize(0);
|
||||
for (unsigned int i=0; i<_src.size(); i++)
|
||||
{
|
||||
if (_src[i].flag() == 0)
|
||||
res.push_back(i);
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
#endif /*_MOEOEXHAUSTIVEUNVISITEDSELECT_H_*/
|
||||
76
contribution/branches/MOLS/src/moeoNumberUnvisitedSelect.h
Normal file
76
contribution/branches/MOLS/src/moeoNumberUnvisitedSelect.h
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
/*
|
||||
* <moeoNumberUnvisitedSelect.h>
|
||||
* 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 _MOEONUMBERUNVISITEDSELECT_H
|
||||
#define _MOEONUMBERUNVISITEDSELECT_H
|
||||
|
||||
#include <eo>
|
||||
#include <moeo>
|
||||
|
||||
/**
|
||||
* TODO
|
||||
*/
|
||||
template < class Move >
|
||||
class moeoNumberUnvisitedSelect : public moeoUnvisitedSelect < Move >
|
||||
{
|
||||
typedef typename Move::EOType MOEOT;
|
||||
|
||||
public:
|
||||
|
||||
moeoNumberUnvisitedSelect(){}
|
||||
|
||||
std::vector <unsigned int> operator()(eoPop < MOEOT > & _src, unsigned int _number)
|
||||
{
|
||||
std::vector <unsigned int> res;
|
||||
res.resize(0);
|
||||
for (unsigned int i=0; i<_src.size(); i++)
|
||||
{
|
||||
if (_src[i].flag() == 0)
|
||||
res.push_back(i);
|
||||
}
|
||||
if(_number < res.size()){
|
||||
UF_random_generator<unsigned int> rndGen;
|
||||
std::random_shuffle(res.begin(), res.end(), rndGen);
|
||||
res.resize(_number);
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
#endif /*_MOEONUMBERUNVISITEDSELECT_H_*/
|
||||
|
|
@ -46,7 +46,6 @@
|
|||
* TODO
|
||||
*/
|
||||
template < class Move >
|
||||
class moeoPopNeighborhoodExplorer : public eoBF <eoPop < typename Move::EOType > &, eoPop < typename Move::EOType > &, void>
|
||||
{};
|
||||
class moeoPopNeighborhoodExplorer{};
|
||||
|
||||
#endif /*MOEONEIGHBORHOODEXPLORER_H_*/
|
||||
|
|
|
|||
51
contribution/branches/MOLS/src/moeoUnvisitedSelect.h
Normal file
51
contribution/branches/MOLS/src/moeoUnvisitedSelect.h
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
/*
|
||||
* <moeoUnvisitedSelect.h>
|
||||
* 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 _MOEOUNVISITEDSELECT_H
|
||||
#define _MOEOUNVISITEDSELECT_H
|
||||
|
||||
#include <eo>
|
||||
#include <moeo>
|
||||
|
||||
/**
|
||||
* TODO
|
||||
*/
|
||||
template < class Move >
|
||||
class moeoUnvisitedSelect{};
|
||||
|
||||
#endif /*MOEOUNVISITEDSELECT_H_*/
|
||||
Loading…
Add table
Add a link
Reference in a new issue