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

check for self assignement in copy operator of eoDualFitness

Browse source
This commit is contained in:
Johann Dreo 2010-11-08 18:27:58 +01:00
commit f4351c0c11
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
eo/src/eoDualFitness.h
View file

@ -104,14 +104,6 @@ public:
return _is_feasible; return _is_feasible;
} }
//! Copy operator
eoDualFitness& operator=(const eoDualFitness& other)
{
_value = other._value;
_is_feasible = other._is_feasible;
return *this;
}
//! Copy operator from a std::pair //! Copy operator from a std::pair
eoDualFitness& operator=(const std::pair<BaseType,bool>& v) eoDualFitness& operator=(const std::pair<BaseType,bool>& v)
{ {
@ -119,6 +111,18 @@ public:
_is_feasible = v.second; _is_feasible = v.second;
return *this; return *this;
} }
//! Copy operator from another eoDualFitness
template <class F, class Cmp>
eoDualFitness<F,Cmp> & operator=(const eoDualFitness<BaseType, Compare>& other )
{
if (this != &other) {
this->_value = other._value;
this->_is_feasible = other._is_feasible;
}
return *this;
}
//! Comparison that separate feasible individuals from unfeasible ones. Feasible are always better //! Comparison that separate feasible individuals from unfeasible ones. Feasible are always better
/*! /*!
@ -155,6 +159,7 @@ public:
//! Greater or equal: if the other is not greater than me //! Greater or equal: if the other is not greater than me
bool operator>=(const eoDualFitness<BaseType, Compare>& other ) const { return !(*this < other); } bool operator>=(const eoDualFitness<BaseType, Compare>& other ) const { return !(*this < other); }
public: public:
//! Add a given fitness to the current one //! Add a given fitness to the current one