Test for new archives

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

trunk/paradiseo-moeo/test/CMakeLists.txt

@@ -65,7 +65,8 @@ SET (TEST_LIST
 		t-moeoHyperVolumeMetric
 		t-moeoHyperVolumeDifferenceMetric
 		t-moeoIntVector
-		t-moeoBoundedArchive
+		t-moeoImprOnlyBoundedArchive
+		t-moeoFitDivBoundedArchive
 )
 
 FOREACH (test ${TEST_LIST})

trunk/paradiseo-moeo/test/t-moeoFitDivBoundedArchive.cpp

@@ -0,0 +1,136 @@
+/*
+* <t-moeoFitDivBoundedArchive.cpp>
+* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+* (C) OPAC Team, LIFL, 2002-2007
+*
+* Arnaud Liefooghe
+*
+* This software is governed by the CeCILL license under French law and
+* abiding by the rules of distribution of free software.  You can  use,
+* modify and/ or redistribute the software under the terms of the CeCILL
+* license as circulated by CEA, CNRS and INRIA at the following URL
+* "http://www.cecill.info".
+*
+* As a counterpart to the access to the source code and  rights to copy,
+* modify and redistribute granted by the license, users are provided only
+* with a limited warranty  and the software's author,  the holder of the
+* economic rights,  and the successive licensors  have only  limited liability.
+*
+* In this respect, the user's attention is drawn to the risks associated
+* with loading,  using,  modifying and/or developing or reproducing the
+* software by the user in light of its specific status of free software,
+* that may mean  that it is complicated to manipulate,  and  that  also
+* therefore means  that it is reserved for developers  and  experienced
+* professionals having in-depth computer knowledge. Users are therefore
+* encouraged to load and test the software's suitability as regards their
+* requirements in conditions enabling the security of their systems and/or
+* data to be ensured and,  more generally, to use and operate it in the
+* same conditions as regards security.
+* The fact that you are presently reading this means that you have had
+* knowledge of the CeCILL license and that you accept its terms.
+*
+* ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+* Contact: paradiseo-help@lists.gforge.inria.fr
+*
+*/
+//-----------------------------------------------------------------------------
+// t-moeoFitDivBoundedArchive.cpp
+//-----------------------------------------------------------------------------
+
+#include <eo>
+#include <moeo>
+#include <cassert>
+
+//-----------------------------------------------------------------------------
+
+class ObjectiveVectorTraits : public moeoObjectiveVectorTraits
+{
+public:
+    static bool minimizing (int i)
+    {
+        return true;
+    }
+    static bool maximizing (int i)
+    {
+        return false;
+    }
+    static unsigned int nObjectives ()
+    {
+        return 2;
+    }
+};
+
+typedef moeoRealObjectiveVector < ObjectiveVectorTraits > ObjectiveVector;
+
+typedef MOEO < ObjectiveVector, double, double > Solution;
+
+//-----------------------------------------------------------------------------
+
+int main()
+{
+    std::cout << "[moeoFitDivBoundedArchive]\t=>\t";
+
+    // objective vectors
+    ObjectiveVector obj0, obj1, obj2, obj3, obj4, obj5, obj6;
+    obj0[0] = 2;
+    obj0[1] = 5;
+    obj1[0] = 3;
+    obj1[1] = 3;
+    obj2[0] = 4;
+    obj2[1] = 1;
+    obj3[0] = 5;
+    obj3[1] = 5;
+    obj4[0] = 5;
+    obj4[1] = 1;
+    obj5[0] = 3;
+    obj5[1] = 8;
+    obj6[0] = 2.5;
+    obj6[1] = 3.5;
+    
+
+    // population
+    eoPop < Solution > pop;
+    pop.resize(6);
+    pop[0].objectiveVector(obj0);
+    pop[1].objectiveVector(obj1);
+    pop[2].objectiveVector(obj2);
+    pop[3].objectiveVector(obj3);
+    pop[4].objectiveVector(obj4);
+    pop[5].objectiveVector(obj5);
+
+    moeoDummyFitnessAssignment < Solution > fitness;
+    
+    moeoDummyDiversityAssignment < Solution > diversity;
+    
+    moeoFitnessThenDiversityComparator < Solution > indiComparator;
+    
+    moeoParetoObjectiveVectorComparator < ObjectiveVector > comparator;
+    
+        
+    // archive
+    moeoFitDivBoundedArchive< Solution > arch(indiComparator, comparator, fitness, diversity, 50);
+    moeoFitDivBoundedArchive< Solution > arch2(indiComparator, fitness, diversity, 2);
+    
+    //test archive
+    arch(pop);
+    assert(arch.size()==3);
+    
+    arch2(pop);
+    assert(arch2.size()==2);
+    
+    pop.resize(7);
+    pop[6].objectiveVector(obj6);    
+    arch2(pop[6]);
+    assert(arch2.size()==2);
+    
+    obj6[0] = 0;
+    obj6[1] = 0;
+    pop[6].objectiveVector(obj6);
+    arch2(pop[6]);
+    assert(arch2.size()==1);
+    
+    std::cout << "OK" << std::endl;
+    return EXIT_SUCCESS;
+}
+
+//-----------------------------------------------------------------------------

trunk/paradiseo-moeo/test/t-moeoImprOnlyBoundedArchive.cpp

@@ -0,0 +1,158 @@
+/*
+* <t-moeoImprOnlyBoundedArchive.cpp>
+* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
+* (C) OPAC Team, LIFL, 2002-2007
+*
+* Arnaud Liefooghe
+*
+* This software is governed by the CeCILL license under French law and
+* abiding by the rules of distribution of free software.  You can  use,
+* modify and/ or redistribute the software under the terms of the CeCILL
+* license as circulated by CEA, CNRS and INRIA at the following URL
+* "http://www.cecill.info".
+*
+* As a counterpart to the access to the source code and  rights to copy,
+* modify and redistribute granted by the license, users are provided only
+* with a limited warranty  and the software's author,  the holder of the
+* economic rights,  and the successive licensors  have only  limited liability.
+*
+* In this respect, the user's attention is drawn to the risks associated
+* with loading,  using,  modifying and/or developing or reproducing the
+* software by the user in light of its specific status of free software,
+* that may mean  that it is complicated to manipulate,  and  that  also
+* therefore means  that it is reserved for developers  and  experienced
+* professionals having in-depth computer knowledge. Users are therefore
+* encouraged to load and test the software's suitability as regards their
+* requirements in conditions enabling the security of their systems and/or
+* data to be ensured and,  more generally, to use and operate it in the
+* same conditions as regards security.
+* The fact that you are presently reading this means that you have had
+* knowledge of the CeCILL license and that you accept its terms.
+*
+* ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+* Contact: paradiseo-help@lists.gforge.inria.fr
+*
+*/
+//-----------------------------------------------------------------------------
+// t-moeoImprOnlyBoundedArchive.cpp
+//-----------------------------------------------------------------------------
+
+#include <eo>
+#include <moeo>
+#include <cassert>
+
+//-----------------------------------------------------------------------------
+
+class ObjectiveVectorTraits : public moeoObjectiveVectorTraits
+{
+public:
+    static bool minimizing (int i)
+    {
+        return true;
+    }
+    static bool maximizing (int i)
+    {
+        return false;
+    }
+    static unsigned int nObjectives ()
+    {
+        return 2;
+    }
+};
+
+typedef moeoRealObjectiveVector < ObjectiveVectorTraits > ObjectiveVector;
+
+typedef MOEO < ObjectiveVector, double, double > Solution;
+
+//-----------------------------------------------------------------------------
+
+int main()
+{
+    std::cout << "[moeoImprOnlyBoundedArchive]\t=>\t";
+
+    // objective vectors
+    ObjectiveVector obj0, obj1, obj2, obj3, obj4, obj5, obj6;
+    obj0[0] = 2;
+    obj0[1] = 5;
+    obj1[0] = 3;
+    obj1[1] = 3;
+    obj2[0] = 4;
+    obj2[1] = 1;
+    obj3[0] = 5;
+    obj3[1] = 5;
+    obj4[0] = 5;
+    obj4[1] = 1;
+    obj5[0] = 3;
+    obj5[1] = 8;
+    obj6[0] = 2.5;
+    obj6[1] = 3.5;
+    
+
+    // population
+    eoPop < Solution > pop;
+    pop.resize(6);
+    pop[0].objectiveVector(obj0);
+    pop[1].objectiveVector(obj1);
+    pop[2].objectiveVector(obj2);
+    pop[3].objectiveVector(obj3);
+    pop[4].objectiveVector(obj4);
+    pop[5].objectiveVector(obj5);
+
+    moeoDummyFitnessAssignment < Solution > fitness;
+    
+    moeoDummyDiversityAssignment < Solution > diversity;
+    
+    moeoFitnessThenDiversityComparator < Solution > indiComparator;
+    
+    moeoParetoObjectiveVectorComparator < ObjectiveVector > comparator;
+    
+        
+    // archive
+    moeoImprOnlyBoundedArchive< Solution > arch(comparator, 50);
+    moeoImprOnlyBoundedArchive< Solution > arch2(2, false);
+    
+    //test archive
+    arch(pop);
+    assert(arch.size()==3);
+    assert(arch[0].flag()==0);
+    assert(arch[1].flag()==0);
+    assert(arch[2].flag()==0);
+    
+    arch2(pop);
+    assert(arch2.size()==2);
+    assert(arch[0].flag()==0);
+    assert(arch[1].flag()==0);
+    assert(arch[0].objectiveVector()[0]==2);
+    assert(arch[0].objectiveVector()[1]==5);
+    assert(arch[1].objectiveVector()[0]==3);
+    assert(arch[1].objectiveVector()[1]==3);
+    
+    obj0[0]=0;
+    obj0[1]=1;
+    pop[0].objectiveVector(obj0);
+    
+    arch(pop[0]);
+    assert(arch.size()==1);
+    assert(arch[0].flag()==0);
+    
+    pop[0].flag(1);
+    arch(pop[0]);
+    assert(arch.size()==1);
+    assert(arch[0].flag()==1);
+    
+    pop[0].flag(0);
+    arch2(pop[0]);
+    assert(arch2.size()==1);
+    assert(arch2[0].flag()==0);
+    
+    pop[0].flag(1);
+    arch2(pop[0]);
+    assert(arch2.size()==1);
+    assert(arch2[0].flag()==0);
+
+    
+    std::cout << "OK" << std::endl;
+    return EXIT_SUCCESS;
+}
+
+//-----------------------------------------------------------------------------