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

Revisions of archives

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1255 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jhumeau 2008-11-17 10:17:43 +00:00
commit 43419002fa
4 changed files with 234 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

47
trunk/paradiseo-moeo/src/archive/moeoUnboundedArchive.h
View file

@ -52,13 +52,6 @@ class moeoUnboundedArchive : public moeoArchive < MOEOT >
{
public:
using moeoArchive < MOEOT > :: size;
using moeoArchive < MOEOT > :: resize;
using moeoArchive < MOEOT > :: operator[];
using moeoArchive < MOEOT > :: back;
using moeoArchive < MOEOT > :: pop_back;
/**
* The type of an objective vector for a solution
*/
@ -85,40 +78,7 @@ public:
*/
void operator()(const MOEOT & _moeo)
{
// first step: removing the dominated solutions from the archive
for (unsigned int j=0; j<size();)
{
// if the jth solution contained in the archive is dominated by _moeo
if ( comparator(operator[](j).objectiveVector(), _moeo.objectiveVector()) )
{
operator[](j) = back();
pop_back();
}
else if (_moeo.objectiveVector() == operator[](j).objectiveVector())
{
operator[](j) = back();
pop_back();
}
else
{
j++;
}
}
// second step: is _moeo dominated?
bool dom = false;
for (unsigned int j=0; j<size(); j++)
{
// if _moeo is dominated by the jth solution contained in the archive
if ( comparator(_moeo.objectiveVector(), operator[](j).objectiveVector()) )
{
dom = true;
break;
}
}
if (!dom)
{
push_back(_moeo);
}
update(_moeo);
}
@ -128,10 +88,7 @@ public:
*/
void operator()(const eoPop < MOEOT > & _pop)
{
for (unsigned int i=0; i<_pop.size(); i++)
{
(*this)(_pop[i]);
}
update(_pop);
}
};