From 5da2d876a4f7040f0e95f6ad5a1c1ac171bba88e Mon Sep 17 00:00:00 2001
From: jhumeau <jhumeau@331e1502-861f-0410-8da2-ba01fb791d7f>
Date: Mon, 11 Aug 2008 09:50:37 +0000
Subject: [PATCH] moeoHyperVolumeUnaryMetric rename in moeoHyperVolumeMetric

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1233 331e1502-861f-0410-8da2-ba01fb791d7f
---
 ...VolumeUnaryMetric.h => moeoHyperVolumeMetric.h} | 14 +++++++-------
 trunk/paradiseo-moeo/src/moeo                      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename trunk/paradiseo-moeo/src/metric/{moeoHyperVolumeUnaryMetric.h => moeoHyperVolumeMetric.h} (96%)

diff --git a/trunk/paradiseo-moeo/src/metric/moeoHyperVolumeUnaryMetric.h b/trunk/paradiseo-moeo/src/metric/moeoHyperVolumeMetric.h
similarity index 96%
rename from trunk/paradiseo-moeo/src/metric/moeoHyperVolumeUnaryMetric.h
rename to trunk/paradiseo-moeo/src/metric/moeoHyperVolumeMetric.h
index 74d57475e..2ff11acc0 100644
--- a/trunk/paradiseo-moeo/src/metric/moeoHyperVolumeUnaryMetric.h
+++ b/trunk/paradiseo-moeo/src/metric/moeoHyperVolumeMetric.h
@@ -1,5 +1,5 @@
 /*
-* <moeoHyperVolumeUnaryMetric.h>
+* <moeoHyperVolumeMetric.h>
 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
 * (C) OPAC Team, LIFL, 2002-2007
 *
@@ -36,8 +36,8 @@
 */
 //-----------------------------------------------------------------------------
 
-#ifndef MOEOHYPERVOLUMEUNARYMETRIC_H_
-#define MOEOHYPERVOLUMEUNARYMETRIC_H_
+#ifndef MOEOHYPERVOLUMEMETRIC_H_
+#define MOEOHYPERVOLUMEMETRIC_H_
 
 #include <metric/moeoMetric.h>
 
@@ -46,7 +46,7 @@
  * (Meunier, Talbi, Reininger: 'A multiobjective genetic algorithm for radio network optimization', in Proc. of the 2000 Congress on Evolutionary Computation, IEEE Press, pp. 317-324)
  */
 template < class ObjectiveVector >
-class moeoHyperVolumeUnaryMetric : public moeoVectorUnaryMetric < ObjectiveVector , double >
+class moeoHyperVolumeMetric : public moeoVectorUnaryMetric < ObjectiveVector , double >
   {
   public:
 	  
@@ -55,7 +55,7 @@ class moeoHyperVolumeUnaryMetric : public moeoVectorUnaryMetric < ObjectiveVecto
      * @param _normalize allow to normalize data (default true)
      * @param _rho coefficient to determine the reference point.
      */
-    moeoHyperVolumeUnaryMetric(bool _normalize=true, double _rho=1.1): normalize(_normalize), rho(_rho), ref_point(NULL){
+    moeoHyperVolumeMetric(bool _normalize=true, double _rho=1.1): normalize(_normalize), rho(_rho), ref_point(NULL){
         bounds.resize(ObjectiveVector::Traits::nObjectives());
         // initialize bounds in case someone does not want to use them
         for (unsigned int i=0; i<ObjectiveVector::Traits::nObjectives(); i++)
@@ -69,7 +69,7 @@ class moeoHyperVolumeUnaryMetric : public moeoVectorUnaryMetric < ObjectiveVecto
      * @param _normalize allow to normalize data (default true)
      * @param _ref_point the reference point
      */
-    moeoHyperVolumeUnaryMetric(bool _normalize=true, ObjectiveVector _ref_point=NULL): normalize(_normalize), rho(0.0), ref_point(_ref_point){
+    moeoHyperVolumeMetric(bool _normalize=true, ObjectiveVector _ref_point=NULL): normalize(_normalize), rho(0.0), ref_point(_ref_point){
         bounds.resize(ObjectiveVector::Traits::nObjectives());
         // initialize bounds in case someone does not want to use them
         for (unsigned int i=0; i<ObjectiveVector::Traits::nObjectives(); i++)
@@ -342,4 +342,4 @@ class moeoHyperVolumeUnaryMetric : public moeoVectorUnaryMetric < ObjectiveVecto
 
   };
 
-#endif /*MOEOHYPERVOLUMEUNARYMETRIC_H_*/
+#endif /*MOEOHYPERVOLUMEMETRIC_H_*/
diff --git a/trunk/paradiseo-moeo/src/moeo b/trunk/paradiseo-moeo/src/moeo
index e4209b289..89d6520ad 100644
--- a/trunk/paradiseo-moeo/src/moeo
+++ b/trunk/paradiseo-moeo/src/moeo
@@ -114,7 +114,7 @@
 #include <metric/moeoVecVsVecEpsilonBinaryMetric.h>
 #include <metric/moeoVecVsVecAdditiveEpsilonBinaryMetric.h>
 #include <metric/moeoVecVsVecMultiplicativeEpsilonBinaryMetric.h>
-#include <metric/moeoHyperVolumeUnaryMetric.h>
+#include <metric/moeoHyperVolumeMetric.h>
 
 
 #include <replacement/moeoElitistReplacement.h>