bug IBEA-hypervolume corrected

moeo/src/metric/moeoHypervolumeBinaryMetric.h

@@ -3,7 +3,8 @@
 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
 * (C) OPAC Team, LIFL, 2002-2007
 *
-* Arnaud Liefooghe
+* July 2013: Bug fix in the recursive call of hypervolume (corrected thanks to Yann Semet and Dimo Brockhoff)
+*
 *
 * This software is governed by the CeCILL license under French law and
 * abiding by the rules of distribution of free software.  You can  use,
@@ -46,9 +47,13 @@
  * Hypervolume binary metric allowing to compare two objective vectors as proposed in
  * Zitzler E., Künzli S.: Indicator-Based Selection in Multiobjective Search. In Parallel Problem Solving from Nature (PPSN VIII).
  * Lecture Notes in Computer Science 3242, Springer, Birmingham, UK pp.832–842 (2004).
+ *
  * This indicator is based on the hypervolume concept introduced in
  * Zitzler, E., Thiele, L.: Multiobjective Optimization Using Evolutionary Algorithms - A Comparative Case Study.
  * Parallel Problem Solving from Nature (PPSN-V), pp.292-301 (1998).
+ *
+ * This code is adapted from the PISA implementation of IBEA (http://www.tik.ee.ethz.ch/sop/pisa/)
+ *
  */
 template < class ObjectiveVector >
 class moeoHypervolumeBinaryMetric : public moeoNormalizedSolutionVsSolutionBinaryMetric < ObjectiveVector, double >
@@ -155,7 +160,7 @@ class moeoHypervolumeBinaryMetric : public moeoNormalizedSolutionVsSolutionBinar
             }
           else
             {
-              result = hypervolume(_o1, _o2, _obj-1) * (max - v2) / range;
+              result = hypervolume(_o1, _o2, _obj-1) * (max - v1) / range;
             }
         }
       return result;

moeo/test/CMakeLists.txt

@@ -44,6 +44,7 @@ set(TEST_LIST
 		t-moeoDominanceMatrix
 		t-moeoVecVsVecAdditiveEpsilonBinaryMetric
 		t-moeoVecVsVecMultiplicativeEpsilonBinaryMetric
+		t-moeoHypervolumeBinaryMetric
 		t-moeoHyperVolumeMetric
 		t-moeoHyperVolumeDifferenceMetric
 		t-moeoIntVector

moeo/test/t-moeoHypervolumeBinaryMetric.cpp

@@ -0,0 +1,104 @@
+/*
+* <t-moeoHypervolumeBinaryMetric.cpp>
+* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2014
+* 
+* Suggested by Yann Semet
+*
+* 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-moeoHypervolumeBinaryMetric.cpp
+//-----------------------------------------------------------------------------
+
+#include <eo>
+#include <moeo>
+
+//-----------------------------------------------------------------------------
+
+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 > Solution;
+
+//-----------------------------------------------------------------------------
+
+int main()
+{
+    std::cout << "[moeoHypervolumeBinaryMetric]\t=>\t";
+
+    // objective vectors
+    ObjectiveVector obj1;
+    obj1[0] = 133.0;
+    obj1[1] = 240.0;
+    ObjectiveVector obj2;
+    obj2[0] = 122.0;
+    obj2[1] = 290.0;
+    ObjectiveVector obj3;
+    obj3[0] = 145.0;
+    obj3[1] = 240.0;
+
+    // indicator
+    moeoHypervolumeBinaryMetric<ObjectiveVector> indicator(1.1);
+    indicator.setup(122.0, 145.0, 0);
+    indicator.setup(240.0, 290.0, 1);
+    
+    
+    if ( (indicator(obj1, obj2) < 0.039525) || (indicator(obj1, obj2) > 0.039526))
+    {
+        std::cout << "ERROR (indicator-value I(obj1,obj2))" << std::endl;
+        return EXIT_FAILURE;
+    }
+    
+    if ( (indicator(obj2, obj1) < 0.51383) || (indicator(obj2, obj1) > 0.51384))
+    {
+        std::cout << "ERROR (indicator-value I(obj1,obj2))" << std::endl;
+        return EXIT_FAILURE;
+    }
+
+    std::cout << "OK" << std::endl;
+    return EXIT_SUCCESS;
+}
+
+//-----------------------------------------------------------------------------