Some more small changes for MSVC++ compatibility
This commit is contained in:
parent
0e4df9e404
commit
4ad58c360e
5 changed files with 9 additions and 4 deletions
|
|
@ -188,6 +188,7 @@ eoCheckPoint<EOT>& do_make_checkpoint(eoParser& _parser, eoState& _state, eoEval
|
|||
fileMonitor->add(*secondStat);
|
||||
}
|
||||
|
||||
#if !defined(NO_GNUPLOT)
|
||||
if (plotBestParam.value()) // an eoGnuplot1DMonitor for best & average
|
||||
{
|
||||
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
|
||||
checkpoint->add(*fitSnapshot);
|
||||
}
|
||||
#endif
|
||||
|
||||
//////////////////////////////////
|
||||
// State savers
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@
|
|||
#include <eoOp.h>
|
||||
#include <eoPopulator.h>
|
||||
#include <eoFunctorStore.h>
|
||||
#include <assert.h>
|
||||
|
||||
/** @name General variation operators
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
#define _make_genotype_h
|
||||
|
||||
#include <es/eoReal.h>
|
||||
#include <eoEsChromInit.h>
|
||||
#include <es/eoEsChromInit.h>
|
||||
#include <utils/eoRealVectorBounds.h>
|
||||
// also need the parser and param includes
|
||||
#include <utils/eoParser.h>
|
||||
|
|
|
|||
|
|
@ -409,8 +409,8 @@ public:
|
|||
while ( (pos=t.find_first_not_of(delim)) < t.size())
|
||||
{
|
||||
size_t posEnd = t.find_first_of(delim, pos);
|
||||
std::string u(t,pos);
|
||||
u.resize(posEnd-pos);
|
||||
std::string u = t.substr(pos,posEnd);//(t, pos);
|
||||
/*u.resize(posEnd - pos);*/
|
||||
second.push_back(u);
|
||||
t = t.substr(posEnd);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,9 +29,11 @@
|
|||
#endif
|
||||
|
||||
#include <utils/eoParser.h>
|
||||
#include <fstream.h>
|
||||
#include <fstream>
|
||||
#include <stdexcept>
|
||||
|
||||
using namespace std;
|
||||
|
||||
/** 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
|
||||
|
|
|
|||
Reference in a new issue