nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

warning deleted

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1372 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jhumeau 2009-01-27 13:24:02 +00:00
commit 0ef9dab410
5 changed files with 74 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

26
trunk/paradiseo-moeo/src/archive/moeoBoundedArchive.h
View file

@ -71,7 +71,7 @@ public:
*/
typedef typename MOEOT::ObjectiveVector ObjectiveVector;
/**
* Ctor where you can choose your own moeoComparator, moeoObjectiveVectorComparator, moeoFitnessAssignment, moeoDiversityAssignment and archive size.
* @param _indiComparator the functor used to compare MOEOT
@ -82,7 +82,7 @@ public:
*/
moeoBoundedArchive(moeoComparator < MOEOT > & _indiComparator, moeoObjectiveVectorComparator < ObjectiveVector > & _comparator, moeoFitnessAssignment < MOEOT > & _fitness, moeoDiversityAssignment < MOEOT > & _diversity, unsigned int _maxSize=100) : moeoArchive < MOEOT >(_comparator), maxSize(_maxSize), indiComparator(_indiComparator), fitness(_fitness), diversity(_diversity)
{}
/**
* Ctor with moeoParetoObjectiveVectorComparator where you can choose your own moeoComparator, moeoFitnessAssignment, moeoDiversityAssignment and archive size.
* @param _indiComparator the functor used to compare MOEOT
@ -92,8 +92,8 @@ public:
*/
moeoBoundedArchive(moeoComparator < MOEOT > & _indiComparator, moeoFitnessAssignment < MOEOT > & _fitness, moeoDiversityAssignment < MOEOT > & _diversity, unsigned int _maxSize=100) : moeoArchive < MOEOT >(), maxSize(_maxSize), indiComparator(_indiComparator), fitness(_fitness), diversity(_diversity)
{}
/**
@ -103,7 +103,7 @@ public:
void operator()(const MOEOT & _moeo)
{
update(_moeo);
if(size() > maxSize){
fitness(*this);
diversity(*this);
@ -120,7 +120,7 @@ public:
void operator()(const eoPop < MOEOT > & _pop)
{
update(_pop);
if(size() > maxSize){
fitness(*this);
diversity(*this);
@ -133,11 +133,6 @@ private:
/** archive max size */
unsigned int maxSize;
/** fitness assignment */
moeoFitnessAssignment < MOEOT > & fitness;
/** diversity assignment */
moeoDiversityAssignment < MOEOT > & diversity;
/**
* Wrapper which allow to used an moeoComparator in std::sort
* @param _comp the comparator to used
@ -164,7 +159,12 @@ private:
moeoComparator < MOEOT > & comp;
}
indiComparator;
/** fitness assignment */
moeoFitnessAssignment < MOEOT > & fitness;
/** diversity assignment */
moeoDiversityAssignment < MOEOT > & diversity;
};
#endif /*MOEOBOUNDEDARCHIVE_H_*/