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

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1569 331e1502-861f-0410-8da2-ba01fb791d7f

Browse source
This commit is contained in:
jhumeau 2009-03-25 10:33:12 +00:00
commit 950ec58a6e
3 changed files with 81 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
contribution/branches/MOLS/src2/moeoNewBoundedArchive.h
View file

@ -63,7 +63,7 @@ public:
* Default ctor.
* The moeoObjectiveVectorComparator used to compare solutions is based on Pareto dominance
*/
moeoNewBoundedArchive(unsigned int _maxSize=100) : moeoArchive < MOEOT >(), comparator(paretoComparator), maxSize(_maxSize)
moeoNewBoundedArchive(unsigned int _maxSize=100) : moeoArchive < MOEOT >(), comparator(paretoComparator), maxSize(_maxSize), isModified(false)
{}
@ -71,7 +71,7 @@ public:
* Ctor
* @param _comparator the moeoObjectiveVectorComparator used to compare solutions
*/
moeoNewBoundedArchive(moeoObjectiveVectorComparator < ObjectiveVector > & _comparator, unsigned int _maxSize=100) : eoPop < MOEOT >(), comparator(_comparator), maxSize(_maxSize)
moeoNewBoundedArchive(moeoObjectiveVectorComparator < ObjectiveVector > & _comparator, unsigned int _maxSize=100) : eoPop < MOEOT >(), comparator(_comparator), maxSize(_maxSize), isModified(false)
{}
@ -160,6 +160,12 @@ public:
return true;
}
bool modified(){
bool tmp = isModified;
isModified = false;
return tmp;
}
private:
@ -169,6 +175,8 @@ private:
moeoParetoObjectiveVectorComparator < ObjectiveVector > paretoComparator;
/** Max size of archive*/
unsigned int maxSize;
/** bool */
bool isModified;
/**
* Updates the archive with a given individual _moeo *** NEW ***
@ -217,10 +225,12 @@ private:
}
if (!dom)
{
//if(size()<maxSize)
push_back(_moeo);
//else
//dom=!dom;
if(size()<maxSize){
push_back(_moeo);
isModified=true;
}
else
dom=!dom;
}
return !dom;
}