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 @@ /* -* +* * 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 @@ -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 #include #include -#include +#include #include