From 53dec9c78800d656fa818dd843fc7728d6e657b6 Mon Sep 17 00:00:00 2001
From: liefooga <liefooga@331e1502-861f-0410-8da2-ba01fb791d7f>
Date: Tue, 19 Jun 2007 07:29:20 +0000
Subject: [PATCH] update the use of comparator

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@310 331e1502-861f-0410-8da2-ba01fb791d7f
---
 branches/paradiseo-moeo-1.0/src/moeoArchive.h | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/branches/paradiseo-moeo-1.0/src/moeoArchive.h b/branches/paradiseo-moeo-1.0/src/moeoArchive.h
index d9dfa0a01..d77808206 100644
--- a/branches/paradiseo-moeo-1.0/src/moeoArchive.h
+++ b/branches/paradiseo-moeo-1.0/src/moeoArchive.h
@@ -60,7 +60,8 @@ public:
     {
         for (unsigned i = 0; i<size(); i++)
         {
-            if ( comparator(operator[](i).fitness(), _objectiveVector) )
+            // if _objectiveVector is dominated by the ith individual of the archive...
+            if ( comparator(_objectiveVector, operator[](i).objectiveVector()) )
             {
                 return true;
             }
@@ -95,8 +96,8 @@ public:
         // first step: removing the dominated solutions from the archive
         for (unsigned j=0; j<size();)
         {
-            // if _moeo dominates the jth solution contained in the archive
-            if ( comparator(_moeo.objectiveVector(), operator[](j).objectiveVector()) )
+            // if the jth solution contained in the archive is dominated by _moeo
+            if ( comparator(operator[](j).objectiveVector(), _moeo.objectiveVector()) )
             {
                 operator[](j) = back();
                 pop_back();
@@ -115,8 +116,8 @@ public:
         bool dom = false;
         for (unsigned j=0; j<size(); j++)
         {
-            // if the jth solution contained in the archive dominates _moeo
-            if ( comparator(operator[](j).objectiveVector(), _moeo.objectiveVector()) )
+            // if _moeo is dominated by the jth solution contained in the archive
+            if ( comparator(_moeo.objectiveVector(), operator[](j).objectiveVector()) )
             {
                 dom = true;
                 break;