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

In hyp continue, do not declare unused variable and group using

Browse source
This commit is contained in:
Johann Dreo 2013-06-12 10:40:20 +02:00
commit 39621f8711
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -73,7 +73,7 @@ public:
/** Returns false when a ParetoSet is reached. */ /** Returns false when a ParetoSet is reached. */
virtual bool operator() ( const eoPop<MOEOT>& _pop ) virtual bool operator() ( const eoPop<MOEOT>& /*_pop*/ )
{ {
std::vector<ObjectiveVector> bestCurrentParetoSet = pareto( arch ); std::vector<ObjectiveVector> bestCurrentParetoSet = pareto( arch );
@ -143,6 +143,9 @@ protected:
using moeoHypContinue<MOEOT, MetricT>::arch; using moeoHypContinue<MOEOT, MetricT>::arch;
using moeoHypContinue<MOEOT, MetricT>::OptimSet; using moeoHypContinue<MOEOT, MetricT>::OptimSet;
using moeoHypContinue<MOEOT, MetricT>::pareto;
using moeoHypContinue<MOEOT, MetricT>::is_null_hypervolume;
public: public:
typedef typename MOEOT::ObjectiveVector ObjectiveVector; typedef typename MOEOT::ObjectiveVector ObjectiveVector;
typedef typename ObjectiveVector::Type AtomType; typedef typename ObjectiveVector::Type AtomType;
@ -174,7 +177,7 @@ public:
} }
/** Returns false when a ParetoSet is reached. */ /** Returns false when a ParetoSet is reached. */
virtual bool operator() ( const eoPop<MOEOT>& _pop ) virtual bool operator() ( const eoPop<MOEOT>& /*_pop*/ )
{ {
std::vector<ObjectiveVector> bestCurrentParetoSet = pareto( arch ); std::vector<ObjectiveVector> bestCurrentParetoSet = pareto( arch );
@ -196,9 +199,6 @@ public:
protected: protected:
using moeoHypContinue<MOEOT, MetricT>::pareto;
using moeoHypContinue<MOEOT, MetricT>::is_null_hypervolume;
/** Translate a vector given as param to the ParetoSet that should be reached. */ /** Translate a vector given as param to the ParetoSet that should be reached. */
virtual void vectorToParetoSet(const std::vector<AtomType> & _OptimVec) virtual void vectorToParetoSet(const std::vector<AtomType> & _OptimVec)
{ {