nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use generic objective vector atomic type in HV continuator

Browse source 
One should not use specific OV types in continuators, but get it from ObjectiveVector::Type instead.
This commit is contained in:
Johann Dreo 2013-06-07 11:22:26 +02:00
commit 54e181d460
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
moeo/src/continue/moeoHypContinue.h
View file

@ -56,15 +56,16 @@ class moeoHypContinue: public eoContinue<MOEOT>
public:
typedef typename MOEOT::ObjectiveVector ObjectiveVector;
typedef typename ObjectiveVector::Type AtomType;
/// Ctor
moeoHypContinue( const std::vector<double> & _OptimVec, moeoArchive < MOEOT > & _archive, bool _normalize=true, double _rho=1.1)
moeoHypContinue( const std::vector<AtomType> & _OptimVec, moeoArchive < MOEOT > & _archive, bool _normalize=true, AtomType _rho=1.1)
: eoContinue<MOEOT>(), arch(_archive), metric(_normalize,_rho)
{
vectorToParetoSet(_OptimVec);
}
moeoHypContinue( const std::vector<double> & _OptimVec, moeoArchive < MOEOT > & _archive, bool _normalize=true, ObjectiveVector& _ref_point=NULL)
moeoHypContinue( const std::vector<AtomType> & _OptimVec, moeoArchive < MOEOT > & _archive, bool _normalize=true, ObjectiveVector& _ref_point=NULL)
: eoContinue<MOEOT> (), arch(_archive), metric(_normalize,_ref_point)
{
vectorToParetoSet(_OptimVec);
@ -79,7 +80,7 @@ public:
bestCurrentParetoSet.push_back(arch[i].objectiveVector());
}
double hypervolume= metric(bestCurrentParetoSet,OptimSet );
AtomType hypervolume= metric(bestCurrentParetoSet,OptimSet );
if (hypervolume==0) {
eo::log << eo::logging << "STOP in moeoHypContinue: Best ParetoSet has been reached "
@ -90,7 +91,7 @@ public:
}
/** Translate a vector given as param to the ParetoSet that should be reached. */
void vectorToParetoSet(const std::vector<double> & _OptimVec)
void vectorToParetoSet(const std::vector<AtomType> & _OptimVec)
{
unsigned dim = (unsigned)(_OptimVec.size()/ObjectiveVector::Traits::nObjectives());
OptimSet.resize(dim);