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

Use EOType as a ref to the template in stats

Browse source
This commit is contained in:
Johann Dreo 2013-06-13 14:45:51 +02:00
commit 67e4bb01fd
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
eo/src/eoDualFitness.h
View file

@ -438,22 +438,24 @@ public:
* the second one on the unfeasible ones, merge the two resulting value in * the second one on the unfeasible ones, merge the two resulting value in
* a string, separated by a given marker. * a string, separated by a given marker.
*/ */
template<class EOT, class EOSTAT> template<class EOSTAT>
class eoDualStatSwitch : public eoStat< EOT, std::string > class eoDualStatSwitch : public eoStat< typename EOSTAT::EOType, std::string >
{ {
public:
typedef typename EOSTAT::EOType EOType;
protected: protected:
EOSTAT & _stat_feasible; EOSTAT & _stat_feasible;
EOSTAT & _stat_unfeasible; EOSTAT & _stat_unfeasible;
std::string _sep; std::string _sep;
eoDualPopSplit<EOT> _pop_split; eoDualPopSplit<EOType> _pop_split;
public: public:
using eoStat<EOT,std::string>::value; using eoStat<EOType,std::string>::value;
eoDualStatSwitch( EOSTAT & stat_feasible, EOSTAT & stat_unfeasible, std::string sep=" " ) : eoDualStatSwitch( EOSTAT & stat_feasible, EOSTAT & stat_unfeasible, std::string sep=" " ) :
eoStat<EOT,std::string>( eoStat<EOType,std::string>(
"?"+sep+"?", "?"+sep+"?",
stat_feasible.longName()+sep+stat_unfeasible.longName() stat_feasible.longName()+sep+stat_unfeasible.longName()
), ),
@ -462,7 +464,7 @@ public:
_sep(sep) _sep(sep)
{ } { }
virtual void operator()( const eoPop<EOT> & pop ) virtual void operator()( const eoPop<EOType> & pop )
{ {
// create two separated pop in this operator // create two separated pop in this operator
_pop_split( pop ); _pop_split( pop );