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

Changed some files for compatibility with MSVC 2003 and 2005

Browse source
This commit is contained in:
jeggermo 2006-11-20 13:25:46 +00:00
commit 219e9bd648
7 changed files with 890 additions and 876 deletions
Download patch file Download diff file Expand all files Collapse all files

3
eo/src/do/make_checkpoint.h
View file

@ -208,6 +208,7 @@ eoCheckPoint<EOT>& do_make_checkpoint(eoParser& _parser, eoState& _state, eoEval
fileMonitor->add(*secondStat); fileMonitor->add(*secondStat);
} }
#if !defined(NO_GNUPLOT)
if (plotBestParam.value()) // an eoGnuplot1DMonitor for best & average if (plotBestParam.value()) // an eoGnuplot1DMonitor for best & average
{ {
std::string stmp = dirNameParam.value() + "/gnu_best.xg"; std::string stmp = dirNameParam.value() + "/gnu_best.xg";
@ -240,7 +241,7 @@ eoCheckPoint<EOT>& do_make_checkpoint(eoParser& _parser, eoState& _state, eoEval
// and of course add it to the checkpoint // and of course add it to the checkpoint
checkpoint->add(*fitSnapshot); checkpoint->add(*fitSnapshot);
} }
#endif
////////////////////////////////// //////////////////////////////////
// State savers // State savers
////////////////////////////// //////////////////////////////

5
eo/src/eoScalarFitness.h
View file

@ -59,6 +59,11 @@ class eoScalarFitness
bool operator<(const eoScalarFitness& other) const bool operator<(const eoScalarFitness& other) const
{ return Compare()(value, other.value); } { return Compare()(value, other.value); }
/// Comparison, using less by default
// needed for MSVC 8 (MSVC 2005) added by J.Eggermont 20-11-2006
bool operator<(const ScalarType& other) const
{ return Compare()(value, other); }
// implementation of the other operators // implementation of the other operators
bool operator>( const eoScalarFitness<ScalarType, Compare>& y ) const { return y < *this; } bool operator>( const eoScalarFitness<ScalarType, Compare>& y ) const { return y < *this; }
// implementation of the other operators // implementation of the other operators

2
eo/src/eoSelectOne.h
View file

@ -37,7 +37,7 @@
@see eoSelectMany, eoSelectRandom, eoDetTournament, eoStochTournament, eoProportional @see eoSelectMany, eoSelectRandom, eoDetTournament, eoStochTournament, eoProportional
*/ */
#ifdef _MSC_VER #if defined(_MSC_VER) && (_MSC_VER < 1300)
template<class EOT, class WorthT = EOT::Fitness> template<class EOT, class WorthT = EOT::Fitness>
#else #else
template<class EOT, class WorthT = typename EOT::Fitness> template<class EOT, class WorthT = typename EOT::Fitness>

8
eo/src/utils/eoRNG.h
View file

@ -32,11 +32,19 @@ Contact: todos@geneura.ugr.es, http://geneura.ugr.es
// //
// The C99-standard defines uint32_t to be declared in stdint.h, but some // The C99-standard defines uint32_t to be declared in stdint.h, but some
// systmes don't have that and implement it in inttypes.h. // systmes don't have that and implement it in inttypes.h.
// first if check added for MSVC by Jeroen Eggermont 20-11-2006, needed for MSVC 2003 (and 2005)
# if (defined _MSC_VER)
typedef unsigned long uint32_t;
#include <cmath>
#else
#if (! defined __sun) #if (! defined __sun)
#include <stdint.h> #include <stdint.h>
#else #else
#include <inttypes.h> #include <inttypes.h>
#endif #endif
#endif
#include <vector> #include <vector>
#include "eoPersistent.h" #include "eoPersistent.h"

6
eo/src/utils/eoStat.h
View file

@ -102,7 +102,7 @@ public :
( For eoScalarFitnessAssembled user eoAssembledFitnessStat classes.) ( For eoScalarFitnessAssembled user eoAssembledFitnessStat classes.)
*/ */
#ifdef _MSC_VER #if defined(_MSC_VER) && (_MSC_VER < 1300)
template <class EOT> class eoAverageStat : public eoStat<EOT, EOT::Fitness> template <class EOT> class eoAverageStat : public eoStat<EOT, EOT::Fitness>
#else #else
template <class EOT> class eoAverageStat : public eoStat<EOT, typename EOT::Fitness> template <class EOT> class eoAverageStat : public eoStat<EOT, typename EOT::Fitness>
@ -203,7 +203,7 @@ public :
/** /**
The n_th element fitness in the population (see eoBestFitnessStat) The n_th element fitness in the population (see eoBestFitnessStat)
*/ */
#ifdef _MSC_VER #if defined(_MSC_VER) && (_MSC_VER < 1300)
template <class EOT> template <class EOT>
class eoNthElementFitnessStat : public eoSortedStat<EOT, EOT::Fitness > class eoNthElementFitnessStat : public eoSortedStat<EOT, EOT::Fitness >
#else #else
@ -308,7 +308,7 @@ public :
( For eoScalarFitnessAssembled look at eoAssembledFitnessStat ) ( For eoScalarFitnessAssembled look at eoAssembledFitnessStat )
*/ */
#ifdef _MSC_VER #if defined(_MSC_VER) && (_MSC_VER < 1300)
template <class EOT> template <class EOT>
class eoBestFitnessStat : public eoStat<EOT, EOT::Fitness> class eoBestFitnessStat : public eoStat<EOT, EOT::Fitness>
#else #else