Minor bugs for Win quashed; fixed Win project files
This commit is contained in:
parent
d58511132c
commit
3c2df139bd
5 changed files with 677 additions and 695 deletions
|
|
@ -4,10 +4,11 @@
|
||||||
#include <utils/eoMonitor.h>
|
#include <utils/eoMonitor.h>
|
||||||
#include <utils/eoFileMonitor.h>
|
#include <utils/eoFileMonitor.h>
|
||||||
#include <utils/eoStdoutMonitor.h>
|
#include <utils/eoStdoutMonitor.h>
|
||||||
|
#ifndef _MSC_VER
|
||||||
#include <utils/eoGnuplot1DMonitor.h>
|
#include <utils/eoGnuplot1DMonitor.h>
|
||||||
|
#include <utils/eoGnuplot1DSnapshot.h>
|
||||||
|
#endif
|
||||||
#include <utils/eoCheckPoint.h>
|
#include <utils/eoCheckPoint.h>
|
||||||
#include <utils/eoStat.h>
|
#include <utils/eoStat.h>
|
||||||
#include <utils/eoScalarFitnessStat.h>
|
#include <utils/eoScalarFitnessStat.h>
|
||||||
#include <utils/eoGnuplot1DMonitor.h>
|
|
||||||
#include <utils/eoGnuplot1DSnapshot.h>
|
|
||||||
#include <utils/eoFDCStat.h>
|
#include <utils/eoFDCStat.h>
|
||||||
|
|
|
||||||
|
|
@ -43,8 +43,8 @@ eoParser::eoParser ( int _argc, char **_argv , string _programDescription, strin
|
||||||
{
|
{
|
||||||
// need to process the param file first
|
// need to process the param file first
|
||||||
// if we want command-line to have highest priority
|
// if we want command-line to have highest priority
|
||||||
|
unsigned i;
|
||||||
for (int i = 1; i < _argc; ++i)
|
for (i = 1; i < _argc; ++i)
|
||||||
{
|
{
|
||||||
if (_argv[i][0] == '@')
|
if (_argv[i][0] == '@')
|
||||||
{ // read response file
|
{ // read response file
|
||||||
|
|
@ -69,7 +69,7 @@ eoParser::eoParser ( int _argc, char **_argv , string _programDescription, strin
|
||||||
// now read arguments on command-line
|
// now read arguments on command-line
|
||||||
strstream stream;
|
strstream stream;
|
||||||
|
|
||||||
for (int i = 1; i < _argc; ++i)
|
for (i = 1; i < _argc; ++i)
|
||||||
{
|
{
|
||||||
stream << _argv[i] << '\n';
|
stream << _argv[i] << '\n';
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -91,6 +91,10 @@ SOURCE=..\src\utils\eoFileMonitor.cpp
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=..\src\eoFunctorStore.cpp
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=..\src\utils\eoParser.cpp
|
SOURCE=..\src\utils\eoParser.cpp
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
|
||||||
|
|
@ -3,19 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
Project: "atomops"=".\atomops.dsp" - Package Owner=<4>
|
Project: "eo"=.\eo.dsp - Package Owner=<4>
|
||||||
|
|
||||||
Package=<5>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
Package=<4>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
Project: "eo"=".\eo.dsp" - Package Owner=<4>
|
|
||||||
|
|
||||||
Package=<5>
|
Package=<5>
|
||||||
{{{
|
{{{
|
||||||
|
|
@ -29,26 +17,11 @@ Package=<4>
|
||||||
Begin Project Dependency
|
Begin Project Dependency
|
||||||
Project_Dep_Name atomops
|
Project_Dep_Name atomops
|
||||||
End Project Dependency
|
End Project Dependency
|
||||||
Begin Project Dependency
|
|
||||||
Project_Dep_Name esfull
|
|
||||||
End Project Dependency
|
|
||||||
}}}
|
}}}
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
Project: "esfull"=".\esfull.dsp" - Package Owner=<4>
|
Project: "esfull"=.\esfull.dsp - Package Owner=<4>
|
||||||
|
|
||||||
Package=<5>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
Package=<4>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
Project: "random"=".\random.dsp" - Package Owner=<4>
|
|
||||||
|
|
||||||
Package=<5>
|
Package=<5>
|
||||||
{{{
|
{{{
|
||||||
|
|
|
||||||
|
|
@ -135,5 +135,9 @@ SOURCE=..\test\real_value.h
|
||||||
|
|
||||||
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
|
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
|
||||||
# End Group
|
# End Group
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\eolib___Win32_Debug\eolib.lib
|
||||||
|
# End Source File
|
||||||
# End Target
|
# End Target
|
||||||
# End Project
|
# End Project
|
||||||
|
|
|
||||||
Reference in a new issue