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

Fix using directives for gcc-4.1

Browse source
This commit is contained in:
kuepper 2006-03-27 18:55:20 +00:00
commit 10d582b31d
19 changed files with 86 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

2
eo/app/gpsymreg/fitness.h
View file

@ -172,7 +172,7 @@ class RegFitness: public eoEvalFunc< eoParseTree<FitnessType, Node> >
{ {
vector< double > input(1); // the input variable(s) vector< double > input(1); // the input variable(s)
double output; double output(0.);
double target; double target;
FitnessType fitness; FitnessType fitness;

2
eo/src/eoLinearFitScaling.h
View file

@ -44,7 +44,7 @@ class eoLinearFitScaling : public eoPerf2Worth<EOT> // false: do not cache fitne
{ {
public: public:
using eoLinearFitScaling< EOT >::value; using eoPerf2Worth<EOT>::value;
/* Ctor: /* Ctor:
@param _p selective pressure (in (1,2]) @param _p selective pressure (in (1,2])

7
eo/src/eoNDSorting.h
View file

@ -43,9 +43,10 @@ class eoNDSorting : public eoPerf2WorthCached<EOT, double>
{ {
public : public :
using eoNDSorting< EOT >::value; using eoPerf2WorthCached<EOT, double>::value;
eoNDSorting(bool nasty_flag_ = false) : nasty_declone_flag_that_only_is_implemented_for_two_objectives(nasty_flag_) eoNDSorting(bool nasty_flag_ = false)
{} : nasty_declone_flag_that_only_is_implemented_for_two_objectives(nasty_flag_)
{}
eoNDSorting() eoNDSorting()

4
eo/src/eoOpContainer.h
View file

@ -89,8 +89,8 @@ class eoSequentialOp : public eoOpContainer<EOT>
{ {
public: public:
using eoOpContainer< EOT >::ops; using eoOpContainer<EOT>::ops;
using eoOpContainer< EOT >::rates; using eoOpContainer<EOT>::rates;
typedef unsigned position_type; typedef unsigned position_type;

2
eo/src/eoParetoRanking.h
View file

@ -41,7 +41,7 @@ class eoParetoRanking : public eoPerf2WorthCached<EOT, double>
{ {
public: public:
using eoParetoRanking< EOT>::value; using eoPerf2WorthCached<EOT, double>::value;
eoParetoRanking(eoDominanceMap<EOT>& _dominanceMap) eoParetoRanking(eoDominanceMap<EOT>& _dominanceMap)
: eoPerf2WorthCached<EOT, double>(), dominanceMap(_dominanceMap) : eoPerf2WorthCached<EOT, double>(), dominanceMap(_dominanceMap)

2
eo/src/eoPerf2Worth.h
View file

@ -44,7 +44,7 @@ class eoPerf2Worth : public eoUF<const eoPop<EOT>&, void>, public eoValueParam<s
{ {
public: public:
using eoPerf2Worth<EOT, WorthT>::value; using eoValueParam<std::vector<WorthT> >::value;
/** @brief default constructor */ /** @brief default constructor */
eoPerf2Worth(std::string _description = "Worths") eoPerf2Worth(std::string _description = "Worths")

2
eo/src/eoRanking.h
View file

@ -39,7 +39,7 @@ class eoRanking : public eoPerf2Worth<EOT> // false: do not cache fitness
{ {
public: public:
using eoRanking< EOT >::value; using eoPerf2Worth<EOT>::value;
/* Ctor: /* Ctor:
@param _p selective pressure (in (1,2] @param _p selective pressure (in (1,2]

2
eo/src/eoSharing.h
View file

@ -80,7 +80,7 @@ class eoSharing : public eoPerf2Worth<EOT>
{ {
public: public:
using eoSharing< EOT >::value; using eoPerf2Worth<EOT>::value;
/* Ctor requires a distance - cannot have a default distance! */ /* Ctor requires a distance - cannot have a default distance! */

4
eo/src/es/eoEsChromInit.h
View file

@ -56,8 +56,8 @@ class eoEsChromInit : public eoRealInitBounded<EOT>
{ {
public: public:
using eoEsChromInit<EOT>::size; using eoRealInitBounded<EOT>::size;
using eoEsChromInit<EOT>::theBounds; using eoRealInitBounded<EOT>::theBounds;
typedef typename EOT::Fitness FitT; typedef typename EOT::Fitness FitT;

2
eo/src/es/eoEsFull.h
View file

@ -41,7 +41,7 @@ class eoEsFull : public eoVector<Fit, double>
{ {
public: public:
using eoEsFull< Fit >::size; using eoVector<Fit, double>::size;
typedef double Type; typedef double Type;

2
eo/src/es/eoEsStdev.h
View file

@ -38,7 +38,7 @@ class eoEsStdev : public eoVector<Fit, double>
{ {
public: public:
using eoEsStdev<Fit>::size; using eoVector<Fit, double>::size;
typedef double Type; typedef double Type;

8
eo/src/gp/eoParseTree.h
View file

@ -55,10 +55,10 @@ class eoParseTree : public EO<FType>, public parse_tree<Node>
{ {
public: public:
using eoParseTree<FType, Node >::back; using parse_tree<Node>::back;
using eoParseTree<FType, Node >::ebegin; using parse_tree<Node>::ebegin;
using eoParseTree<FType, Node >::eend; using parse_tree<Node>::eend;
using eoParseTree<FType, Node >::size; using parse_tree<Node>::size;
typedef typename parse_tree<Node>::subtree Subtree; typedef typename parse_tree<Node>::subtree Subtree;

4
eo/src/utils/eoAssembledFitnessStat.h
View file

@ -47,7 +47,7 @@ class eoAssembledFitnessAverageStat : public eoStat<EOT, double>
{ {
public : public :
using eoAssembledFitnessAverageStat< EOT >::value; using eoStat<EOT, double>::value;
typedef typename EOT::Fitness Fitness; typedef typename EOT::Fitness Fitness;
@ -88,7 +88,7 @@ class eoAssembledFitnessBestStat : public eoStat<EOT, double>
{ {
public: public:
using eoAssembledFitnessBestStat< EOT >::value; using eoStat<EOT, double>::value;
typedef typename EOT::Fitness Fitness; typedef typename EOT::Fitness Fitness;

2
eo/src/utils/eoFDCStat.h
View file

@ -40,7 +40,7 @@ class eoFDCStat : public eoStat<EOT, double>
{ {
public: public:
using eoFDCStat < EOT>::value; using eoStat<EOT, double>::value;
/** Ctor without the optimum */ /** Ctor without the optimum */
eoFDCStat(eoDistance<EOT> & _dist, std::string _description = "FDC") : eoFDCStat(eoDistance<EOT> & _dist, std::string _description = "FDC") :

4
eo/src/utils/eoMOFitnessStat.h
View file

@ -37,7 +37,7 @@ class eoFitnessStat : public eoSortedStat<EOT, std::vector<FitT> >
{ {
public : public :
using eoFitnessStat< EOT, FitT >::value; using eoSortedStat<EOT, std::vector<FitT> >::value;
eoFitnessStat(std::string _description = "AllFitnesses") : eoFitnessStat(std::string _description = "AllFitnesses") :
eoSortedStat<EOT,std::vector<FitT> >(std::vector<FitT>(0), _description) {} eoSortedStat<EOT,std::vector<FitT> >(std::vector<FitT>(0), _description) {}
@ -67,7 +67,7 @@ class eoMOFitnessStat : public eoSortedStat<EOT, std::vector<PartFitT> >
{ {
public: public:
using eoMOFitnessStat< EOT, PartFitT >::value; using eoSortedStat<EOT, std::vector<PartFitT> >::value;
/** Ctor: say what component you want /** Ctor: say what component you want
*/ */

4
eo/src/utils/eoPopStat.h
View file

@ -52,7 +52,7 @@ class eoPopStat : public eoStat<EOT, std::string>
{ {
public: public:
using eoPopStat< EOT>::value; using eoStat<EOT, std::string>::value;
/** default Ctor, void std::string by default, as it appears /** default Ctor, void std::string by default, as it appears
on the description line once at beginning of evolution. and on the description line once at beginning of evolution. and
@ -97,7 +97,7 @@ class eoSortedPopStat : public eoSortedStat<EOT, std::string>
{ {
public: public:
using eoSortedPopStat< EOT>::value; using eoSortedStat<EOT, std::string>::value;
/** default Ctor, void std::string by default, as it appears on /** default Ctor, void std::string by default, as it appears on
the description line once at beginning of evolution. and is the description line once at beginning of evolution. and is

10
eo/src/utils/eoScalarFitnessStat.h
View file

@ -38,13 +38,13 @@ class eoScalarFitnessStat : public eoSortedStat<EOT, std::vector<double> >
{ {
public: public:
using eoScalarFitnessStat< EOT, FitT >::value; using eoSortedStat<EOT, std::vector<double> >::value;
eoScalarFitnessStat(std::string _description = "FitnessES", eoScalarFitnessStat(std::string _description = "FitnessES",
eoRealVectorBounds & _bounds = eoDummyVectorNoBounds) : eoRealVectorBounds & _bounds = eoDummyVectorNoBounds)
eoSortedStat<EOT, std::vector<double> >(std::vector<double>(0), _description) , : eoSortedStat<EOT, std::vector<double> >(std::vector<double>(0), _description),
range(*_bounds[0]) range(*_bounds[0])
{} {}
virtual void operator()(const std::vector<const EOT*>& _popPters) virtual void operator()(const std::vector<const EOT*>& _popPters)
{ {

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

@ -110,7 +110,7 @@ template <class EOT> class eoAverageStat : public eoStat<EOT, typename EOT::Fitn
{ {
public : public :
using eoAverageStat< EOT >::value; using eoStat<EOT, typename EOT::Fitness>::value;
typedef typename EOT::Fitness Fitness; typedef typename EOT::Fitness Fitness;
@ -169,7 +169,7 @@ class eoSecondMomentStats : public eoStat<EOT, std::pair<double, double> >
{ {
public : public :
using eoSecondMomentStats< EOT >::value; using eoStat<EOT, std::pair<double, double> >::value;
typedef typename EOT::Fitness fitness_type; typedef typename EOT::Fitness fitness_type;
@ -212,7 +212,7 @@ class eoNthElementFitnessStat : public eoSortedStat<EOT, typename EOT::Fitness >
#endif #endif
{ {
public : public :
using eoNthElementFitnessStat< EOT >::value; using eoSortedStat<EOT, typename EOT::Fitness >::value;
typedef typename EOT::Fitness Fitness; typedef typename EOT::Fitness Fitness;
@ -318,7 +318,7 @@ class eoBestFitnessStat : public eoStat<EOT, typename EOT::Fitness>
{ {
public: public:
using eoBestFitnessStat< EOT >::value; using eoStat<EOT, typename EOT::Fitness>::value;
typedef typename EOT::Fitness Fitness; typedef typename EOT::Fitness Fitness;

2
eo/src/utils/eoUpdater.h
View file

@ -72,7 +72,7 @@ class eoIncrementorParam : public eoUpdater, public eoValueParam<T>
{ {
public: public:
using eoIncrementorParam< T >::value; using eoValueParam<T>::value;
/** Default Ctor : a name and optionally an increment*/ /** Default Ctor : a name and optionally an increment*/
eoIncrementorParam( std::string _name, T _stepsize = 1) : eoIncrementorParam( std::string _name, T _stepsize = 1) :