Doc of DMLS updated
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1818 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
parent
6720152ff7
commit
259ef86e96
5 changed files with 22 additions and 12 deletions
|
|
@ -64,6 +64,8 @@ public:
|
||||||
* @param _continuator a stop creterion
|
* @param _continuator a stop creterion
|
||||||
* @param _eval a evaluation function
|
* @param _eval a evaluation function
|
||||||
* @param _archive a archive to store no-dominated individuals
|
* @param _archive a archive to store no-dominated individuals
|
||||||
|
* @param _neighborhood a neighborhood
|
||||||
|
* @param _incrEval neighbor evaluation function
|
||||||
*/
|
*/
|
||||||
moeoPLS1(
|
moeoPLS1(
|
||||||
eoContinue < MOEOT > & _continuator,
|
eoContinue < MOEOT > & _continuator,
|
||||||
|
|
|
||||||
|
|
@ -73,9 +73,8 @@ public:
|
||||||
* @param _continuator a stop creterion
|
* @param _continuator a stop creterion
|
||||||
* @param _eval a evaluation function
|
* @param _eval a evaluation function
|
||||||
* @param _archive a archive to store no-dominated individuals
|
* @param _archive a archive to store no-dominated individuals
|
||||||
* @param _moveInit the move initializer
|
* @param _neighborhood a neighborhood
|
||||||
* @param _nextMove allow to do or not a move
|
* @param _incrEval neighbor evaluation function
|
||||||
* @param _incrEval a (generally) efficient evaluation fonction
|
|
||||||
*/
|
*/
|
||||||
moeoPLS2(
|
moeoPLS2(
|
||||||
eoContinue < MOEOT > & _continuator,
|
eoContinue < MOEOT > & _continuator,
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,8 @@
|
||||||
#include <explorer/moeoSubNeighborhoodExplorer.h>
|
#include <explorer/moeoSubNeighborhoodExplorer.h>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Explorer which explore a part of the neighborhood
|
* Explorer which explore the neighborhood until a improving neighbor is found.
|
||||||
|
* No dominating neighbor are keeped.
|
||||||
*/
|
*/
|
||||||
template < class Neighbor >
|
template < class Neighbor >
|
||||||
class moeoFirstImprovingNeighborhoodExplorer : public moeoSubNeighborhoodExplorer < Neighbor >
|
class moeoFirstImprovingNeighborhoodExplorer : public moeoSubNeighborhoodExplorer < Neighbor >
|
||||||
|
|
@ -59,9 +60,8 @@ public:
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Ctor
|
* Ctor
|
||||||
* @param _moveInit the move initializer
|
* @param _neighborhood a neighborhood
|
||||||
* @param _nextMove allow to do or not a move
|
* @param _eval neighbor evaluation funtion
|
||||||
* @param _incrEval a (generally) efficient evaluation fonction
|
|
||||||
*/
|
*/
|
||||||
moeoFirstImprovingNeighborhoodExplorer(
|
moeoFirstImprovingNeighborhoodExplorer(
|
||||||
moNeighborhood<Neighbor>& _neighborhood,
|
moNeighborhood<Neighbor>& _neighborhood,
|
||||||
|
|
@ -94,6 +94,11 @@ private:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* subfunction of explore
|
||||||
|
* @param _src the individual to explore
|
||||||
|
* @param _dest contains new generated individuals
|
||||||
|
*/
|
||||||
void cycle(MOEOT & _src, eoPop < MOEOT > & _dest){
|
void cycle(MOEOT & _src, eoPop < MOEOT > & _dest){
|
||||||
eval(_src, neighbor);
|
eval(_src, neighbor);
|
||||||
if(!comparator(neighbor.fitness(), _src.objectiveVector())){
|
if(!comparator(neighbor.fitness(), _src.objectiveVector())){
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,7 @@
|
||||||
#include <explorer/moeoSubNeighborhoodExplorer.h>
|
#include <explorer/moeoSubNeighborhoodExplorer.h>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Explorer which explore a part of the neighborhood
|
* Explorer which explore the neighborhood until a no desimproving neighbor is found.
|
||||||
*/
|
*/
|
||||||
template < class Neighbor >
|
template < class Neighbor >
|
||||||
class moeoNoDesimprovingNeighborhoodExplorer : public moeoSubNeighborhoodExplorer < Neighbor >
|
class moeoNoDesimprovingNeighborhoodExplorer : public moeoSubNeighborhoodExplorer < Neighbor >
|
||||||
|
|
@ -60,6 +60,7 @@ public:
|
||||||
/**
|
/**
|
||||||
* Ctor
|
* Ctor
|
||||||
* @param _neighborhood a neighborhood
|
* @param _neighborhood a neighborhood
|
||||||
|
* @param _eval a neighbor evaluation function
|
||||||
*/
|
*/
|
||||||
moeoNoDesimprovingNeighborhoodExplorer(
|
moeoNoDesimprovingNeighborhoodExplorer(
|
||||||
moNeighborhood<Neighbor>& _neighborhood,
|
moNeighborhood<Neighbor>& _neighborhood,
|
||||||
|
|
|
||||||
|
|
@ -60,10 +60,8 @@ public:
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Ctor
|
* Ctor
|
||||||
* @param _moveInit the move initializer
|
* @param _neighborhood a neighborhood
|
||||||
* @param _nextMove allow to do or not a move
|
* @param _eval an neighbor evaluation function
|
||||||
* @param _incrEval a (generally) efficient evaluation fonction
|
|
||||||
* @param _number the number of neighbor to explore
|
|
||||||
*/
|
*/
|
||||||
moeoSimpleSubNeighborhoodExplorer(
|
moeoSimpleSubNeighborhoodExplorer(
|
||||||
moNeighborhood<Neighbor>& _neighborhood,
|
moNeighborhood<Neighbor>& _neighborhood,
|
||||||
|
|
@ -100,6 +98,11 @@ private:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* subfunction of explore
|
||||||
|
* @param _src the individual to explore
|
||||||
|
* @param _dest contains new generated individuals
|
||||||
|
*/
|
||||||
void cycle(MOEOT & _src, eoPop < MOEOT > & _dest){
|
void cycle(MOEOT & _src, eoPop < MOEOT > & _dest){
|
||||||
eval(_src, neighbor);
|
eval(_src, neighbor);
|
||||||
//copy the solution (_src) at the end of the destination (_dest)
|
//copy the solution (_src) at the end of the destination (_dest)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue