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

Some more small changes for MSVC++ compatibility

Browse source
This commit is contained in:
evomarc 2001-11-12 14:17:58 +00:00
commit 4ad58c360e
5 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -188,6 +188,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
{ {
string stmp = dirNameParam.value() + "_gnu_best.xg"; string stmp = dirNameParam.value() + "_gnu_best.xg";
@ -218,6 +219,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

1
eo/src/eoGenOp.h
View file

@ -29,6 +29,7 @@
#include <eoOp.h> #include <eoOp.h>
#include <eoPopulator.h> #include <eoPopulator.h>
#include <eoFunctorStore.h> #include <eoFunctorStore.h>
#include <assert.h>
/** @name General variation operators /** @name General variation operators

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

@ -28,7 +28,7 @@
#define _make_genotype_h #define _make_genotype_h
#include <es/eoReal.h> #include <es/eoReal.h>
#include <eoEsChromInit.h> #include <es/eoEsChromInit.h>
#include <utils/eoRealVectorBounds.h> #include <utils/eoRealVectorBounds.h>
// also need the parser and param includes // also need the parser and param includes
#include <utils/eoParser.h> #include <utils/eoParser.h>

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

@ -409,8 +409,8 @@ public:
while ( (pos=t.find_first_not_of(delim)) < t.size()) while ( (pos=t.find_first_not_of(delim)) < t.size())
{ {
size_t posEnd = t.find_first_of(delim, pos); size_t posEnd = t.find_first_of(delim, pos);
std::string u(t,pos); std::string u = t.substr(pos,posEnd);//(t, pos);
u.resize(posEnd-pos); /*u.resize(posEnd - pos);*/
second.push_back(u); second.push_back(u);
t = t.substr(posEnd); t = t.substr(posEnd);
} }

4
eo/src/utils/make_help.cpp
View file

@ -29,9 +29,11 @@
#endif #endif
#include <utils/eoParser.h> #include <utils/eoParser.h>
#include <fstream.h> #include <fstream>
#include <stdexcept> #include <stdexcept>
using namespace std;
/** Generation of the status file, and output of the help message if needed /** Generation of the status file, and output of the help message if needed
* *
* MUST be called after ALL parameters have been read in order to list them * MUST be called after ALL parameters have been read in order to list them