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

Minor changes to make it run under Visual Studio 6.0

Browse source
This commit is contained in:
okoenig 2003-04-03 16:47:47 +00:00
commit f587793a6a
1 changed files with 10 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

35
eo/src/eoScalarFitnessAssembled.h
View file

@ -88,36 +88,31 @@ template <class ScalarType, class Compare, class FitnessTraits = eoScalarFitness
class eoScalarFitnessAssembled : public std::vector<ScalarType> { class eoScalarFitnessAssembled : public std::vector<ScalarType> {
public: public:
typedef typename std::vector<ScalarType> baseVector;
typedef typename std::vector<ScalarType>::size_type size_type; typedef typename baseVector::size_type size_type;
// Basic constructors and assignments // Basic constructors and assignments
eoScalarFitnessAssembled() eoScalarFitnessAssembled()
: std::vector<ScalarType>( FitnessTraits::size() ) {} : baseVector( FitnessTraits::size() ) {}
eoScalarFitnessAssembled( size_type _n, eoScalarFitnessAssembled( size_type _n,
const ScalarType& _val, const ScalarType& _val,
const std::string& _descr="Unnamed variable" ) const std::string& _descr="Unnamed variable" )
: std::vector<ScalarType>(_n, _val) : baseVector(_n, _val)
{ {
if ( _n > FitnessTraits::size() ) if ( _n > FitnessTraits::size() )
FitnessTraits::resize(_n, _descr); FitnessTraits::resize(_n, _descr);
} }
eoScalarFitnessAssembled( const eoScalarFitnessAssembled& other) : std::vector<ScalarType>( other ) {} eoScalarFitnessAssembled( const eoScalarFitnessAssembled& other) : baseVector( other ) {}
eoScalarFitnessAssembled& operator=( const eoScalarFitnessAssembled& other) { eoScalarFitnessAssembled& operator=( const eoScalarFitnessAssembled& other) {
#ifdef _MSC_VER baseVector::operator=( other );
typedef std::vector<ScalarType> myvector;
myvector::operator=( other );
#else
std::vector<ScalarType>::operator=( other );
#endif
return *this; return *this;
} }
// Constructors and assignments to work with scalar type // Constructors and assignments to work with scalar type
eoScalarFitnessAssembled( const ScalarType& v ) : std::vector<ScalarType>( 1, v ) {} eoScalarFitnessAssembled( const ScalarType& v ) : baseVector( 1, v ) {}
eoScalarFitnessAssembled& operator=( const ScalarType& v ) { eoScalarFitnessAssembled& operator=( const ScalarType& v ) {
if ( empty() ) if ( empty() )
@ -130,30 +125,20 @@ public:
//! Overload push_back() //! Overload push_back()
void push_back(const ScalarType& _val ){ void push_back(const ScalarType& _val ){
#ifdef _MSC_VER baseVector::push_back( _val );
typedef std::vector<ScalarType> myvector;
myvector::push_back( _val );
#else
std::vector<ScalarType>::push_back( _val );
#endif
if ( size() > FitnessTraits::size() ) if ( size() > FitnessTraits::size() )
FitnessTraits::setDescription( size()-1, "Unnamed variable"); FitnessTraits::setDescription( size()-1, "Unnamed variable");
} }
//! Overload push_back() //! Overload push_back()
void push_back(const ScalarType& _val, const std::string& _descr ){ void push_back(const ScalarType& _val, const std::string& _descr ){
#ifdef _MSC_VER baseVector::push_back( _val );
typedef std::vector<ScalarType> myvector;
myvector::push_back( _val );
#else
std::vector<ScalarType>::push_back( _val );
#endif
FitnessTraits::setDescription( size()-1, _descr ); FitnessTraits::setDescription( size()-1, _descr );
} }
//! Overload resize() //! Overload resize()
void resize( size_type _n, const ScalarType& _val = ScalarType(), const std::string& _descr = "Unnamed variable" ){ void resize( size_type _n, const ScalarType& _val = ScalarType(), const std::string& _descr = "Unnamed variable" ){
std::vector<ScalarType>::resize(_n, _val); baseVector::resize(_n, _val);
FitnessTraits::resize(_n, _descr); FitnessTraits::resize(_n, _descr);
} }