PLS1 and PLS2 added
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1598 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jhumeau
parent
7cdae60ddd
commit
70fea52db1
3 changed files with 115 additions and 51 deletions
|
|
@ -14,3 +14,6 @@
|
||||||
#include "moeoSimpleSubNeighborhoodExplorer.h"
|
#include "moeoSimpleSubNeighborhoodExplorer.h"
|
||||||
#include "moeoUnifiedDominanceBasedLS.h"
|
#include "moeoUnifiedDominanceBasedLS.h"
|
||||||
#include "moeoUnvisitedSelect.h"
|
#include "moeoUnvisitedSelect.h"
|
||||||
|
#include "moeoPLS1.h"
|
||||||
|
#include "moeoPLS2.h"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* <moeoRecursiveFirstImprovingNeighborhoodExplorer.h>
|
* <moeoPLS1.h>
|
||||||
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2008
|
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2008
|
||||||
* (C) OPAC Team, LIFL, 2002-2008
|
* (C) OPAC Team, LIFL, 2002-2008
|
||||||
*
|
*
|
||||||
|
|
@ -36,70 +36,48 @@
|
||||||
*/
|
*/
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
#ifndef _MOEORECURSIVEFIRSTIMPROVINGNEIGHBORHOODEXPLORER_H
|
#ifndef _MOEOPLS1_H
|
||||||
#define _MOEORECURSIVEFIRSTIMPROVINGNEIGHBORHOODEXPLORER_H
|
#define _MOEOPLS1_H
|
||||||
|
|
||||||
#include <moeoSubNeighborhoodExplorer.h>
|
#include <moeoUnifiedDominanceBasedLS.h>
|
||||||
|
#include <moeoNumberUnvisitedSelect.h>
|
||||||
|
#include <moeoExhaustiveNeighborhoodExplorer.h>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Explorer which explore a part of the neighborhood
|
* A class to design dominance based local searches
|
||||||
*/
|
*/
|
||||||
template < class Move >
|
template < class Move >
|
||||||
class moeoRecursiveFirstImprovingNeighborhoodExplorer : public moeoSubNeighborhoodExplorer < Move >
|
class moeoPLS1 : public moeoUnifiedDominanceBasedLS < Move >
|
||||||
{
|
{
|
||||||
/** Alias for the type */
|
|
||||||
typedef typename Move::EOType MOEOT;
|
|
||||||
/** Alias for the objeciveVector */
|
|
||||||
typedef typename MOEOT::ObjectiveVector ObjectiveVector;
|
|
||||||
|
|
||||||
using moeoSubNeighborhoodExplorer<Move>::move;
|
|
||||||
using moeoSubNeighborhoodExplorer<Move>::objVec;
|
|
||||||
using moeoSubNeighborhoodExplorer<Move>::number;
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
|
/** Alias for the type */
|
||||||
|
typedef typename Move::EOType MOEOT;
|
||||||
|
typedef typename MOEOT::ObjectiveVector ObjectiveVector;
|
||||||
/**
|
/**
|
||||||
* Ctor
|
* Ctor
|
||||||
|
* @param _continuator a stop creterion
|
||||||
|
* @param _eval a evaluation function
|
||||||
|
* @param _archive a archive to store no-dominated individuals
|
||||||
* @param _moveInit the move initializer
|
* @param _moveInit the move initializer
|
||||||
* @param _nextMove allow to do or not a move
|
* @param _nextMove allow to do or not a move
|
||||||
* @param _incrEval a (generally) efficient evaluation fonction
|
* @param _incrEval a (generally) efficient evaluation fonction
|
||||||
* @param _number the number of neighbor to explore
|
|
||||||
*/
|
*/
|
||||||
moeoRecursiveFirstImprovingNeighborhoodExplorer(
|
moeoPLS1(
|
||||||
|
eoContinue < MOEOT > & _continuator,
|
||||||
|
eoEvalFunc < MOEOT > & _eval,
|
||||||
|
moeoArchive < MOEOT > & _archive,
|
||||||
moMoveInit < Move > & _moveInit,
|
moMoveInit < Move > & _moveInit,
|
||||||
moNextMove < Move > & _nextMove,
|
moNextMove < Move > & _nextMove,
|
||||||
moMoveIncrEval < Move, ObjectiveVector > & _incrEval)
|
moMoveIncrEval < Move, ObjectiveVector > & _incrEval):
|
||||||
: moeoSubNeighborhoodExplorer< Move >(_moveInit, _nextMove, _incrEval, 0){}
|
moeoUnifiedDominanceBasedLS<Move>(
|
||||||
|
_continuator,
|
||||||
|
_eval,
|
||||||
|
_archive,
|
||||||
|
*(new moeoExhaustiveNeighborhoodExplorer<Move>(_moveInit, _nextMove, _incrEval)),
|
||||||
|
*(new moeoNumberUnvisitedSelect<MOEOT>(1))
|
||||||
|
){}
|
||||||
|
|
||||||
private:
|
|
||||||
|
|
||||||
/**
|
|
||||||
* explorer of one individual
|
|
||||||
* @param _src the individual to explore
|
|
||||||
* @param _dest contains new generated individuals
|
|
||||||
*/
|
|
||||||
void explore(MOEOT & _src, eoPop < MOEOT > & _dest)
|
|
||||||
{
|
|
||||||
moveInit(move, _src);
|
|
||||||
do
|
|
||||||
{
|
|
||||||
objVec = incrEval(move, _src);
|
|
||||||
if(!comparator(objVec, _src.objectiveVector())){
|
|
||||||
_dest.push_back(_src);
|
|
||||||
move(_dest.back());
|
|
||||||
_dest.back().objectiveVector(objVec);
|
|
||||||
_dest.back().flag(0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
while (nextMove(move, _src) && (!comparator( _src.objectiveVector(),objVec)));
|
|
||||||
if(comparator( _src.objectiveVector(),objVec))
|
|
||||||
explore(_dest.back(), _dest);
|
|
||||||
else
|
|
||||||
_src.flag(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Objective Vector Pareto Comparator */
|
|
||||||
moeoParetoObjectiveVectorComparator<ObjectiveVector> comparator;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /*_MOEORECURSIVEFIRSTIMPROVINGNEIGHBORHOODEXPLORER_H_*/
|
#endif /*MOEOPLS1_H_*/
|
||||||
83
contribution/branches/MOLS/src2/moeoPLS2.h
Normal file
83
contribution/branches/MOLS/src2/moeoPLS2.h
Normal file
|
|
@ -0,0 +1,83 @@
|
||||||
|
/*
|
||||||
|
* <moeoPLS2.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 _MOEOPLS2_H
|
||||||
|
#define _MOEOPLS2_H
|
||||||
|
|
||||||
|
#include <moeoUnifiedDominanceBasedLS.h>
|
||||||
|
#include <moeoExhaustiveUnvisitedSelect.h>
|
||||||
|
#include <moeoExhaustiveNeighborhoodExplorer.h>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A class to design dominance based local searches
|
||||||
|
*/
|
||||||
|
template < class Move >
|
||||||
|
class moeoPLS2 : public moeoUnifiedDominanceBasedLS < Move >
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
|
||||||
|
/** Alias for the type */
|
||||||
|
typedef typename Move::EOType MOEOT;
|
||||||
|
typedef typename MOEOT::ObjectiveVector ObjectiveVector;
|
||||||
|
/**
|
||||||
|
* Ctor
|
||||||
|
* @param _continuator a stop creterion
|
||||||
|
* @param _eval a evaluation function
|
||||||
|
* @param _archive a archive to store no-dominated individuals
|
||||||
|
* @param _moveInit the move initializer
|
||||||
|
* @param _nextMove allow to do or not a move
|
||||||
|
* @param _incrEval a (generally) efficient evaluation fonction
|
||||||
|
*/
|
||||||
|
moeoPLS2(
|
||||||
|
eoContinue < MOEOT > & _continuator,
|
||||||
|
eoEvalFunc < MOEOT > & _eval,
|
||||||
|
moeoArchive < MOEOT > & _archive,
|
||||||
|
moMoveInit < Move > & _moveInit,
|
||||||
|
moNextMove < Move > & _nextMove,
|
||||||
|
moMoveIncrEval < Move, ObjectiveVector > & _incrEval):
|
||||||
|
moeoUnifiedDominanceBasedLS<Move>(
|
||||||
|
_continuator,
|
||||||
|
_eval,
|
||||||
|
_archive,
|
||||||
|
*(new moeoExhaustiveNeighborhoodExplorer<Move>(_moveInit, _nextMove, _incrEval)),
|
||||||
|
*(new moeoExhaustiveUnvisitedSelect<MOEOT>())
|
||||||
|
){}
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif /*MOEOPLS2_H_*/
|
||||||
Loading…
Add table
Add a link
Reference in a new issue