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

Minor bugs for Win quashed; fixed Win project files

Browse source
This commit is contained in:
jmerelo 2001-02-09 16:52:06 +00:00
commit 3c2df139bd
5 changed files with 677 additions and 695 deletions
Download patch file Download diff file Expand all files Collapse all files

27
eo/src/utils/checkpointing
View file

@ -1,13 +1,14 @@
#include <utils/eoParser.h> #include <utils/eoParser.h>
#include <utils/eoState.h> #include <utils/eoState.h>
#include <utils/eoUpdater.h> #include <utils/eoUpdater.h>
#include <utils/eoMonitor.h> #include <utils/eoMonitor.h>
#include <utils/eoFileMonitor.h> #include <utils/eoFileMonitor.h>
#include <utils/eoStdoutMonitor.h> #include <utils/eoStdoutMonitor.h>
#include <utils/eoGnuplot1DMonitor.h> #ifndef _MSC_VER
#include <utils/eoCheckPoint.h> #include <utils/eoGnuplot1DMonitor.h>
#include <utils/eoStat.h> #include <utils/eoGnuplot1DSnapshot.h>
#include <utils/eoScalarFitnessStat.h> #endif
#include <utils/eoGnuplot1DMonitor.h> #include <utils/eoCheckPoint.h>
#include <utils/eoGnuplot1DSnapshot.h> #include <utils/eoStat.h>
#include <utils/eoFDCStat.h> #include <utils/eoScalarFitnessStat.h>
#include <utils/eoFDCStat.h>

672
eo/src/utils/eoParser.cpp
View file

@ -1,336 +1,336 @@
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(disable:4786) #pragma warning(disable:4786)
#endif #endif
#include <stdexcept> #include <stdexcept>
#include <algorithm> #include <algorithm>
#include <fstream> #include <fstream>
#include <iomanip> #include <iomanip>
#include <utils/compatibility.h> #include <utils/compatibility.h>
#include <utils/eoParser.h> #include <utils/eoParser.h>
using namespace std; using namespace std;
void eoWarning(std::string str) void eoWarning(std::string str)
{ {
cout << str << '\n'; cout << str << '\n';
} }
std::ostream& printSectionHeader(std::ostream& os, std::string section) std::ostream& printSectionHeader(std::ostream& os, std::string section)
{ {
if (section == "") if (section == "")
section = "General"; section = "General";
os << '\n' << setw(10) << "###### " << setw(20) << section << setw(10) << " ######\n"; os << '\n' << setw(10) << "###### " << setw(20) << section << setw(10) << " ######\n";
return os; return os;
} }
eoParameterLoader::~eoParameterLoader() eoParameterLoader::~eoParameterLoader()
{ {
for (unsigned i = 0; i < ownedParams.size(); ++i) for (unsigned i = 0; i < ownedParams.size(); ++i)
{ {
delete ownedParams[i]; delete ownedParams[i];
} }
} }
eoParser::eoParser ( int _argc, char **_argv , string _programDescription, string _lFileParamName, char _shortHand) : eoParser::eoParser ( int _argc, char **_argv , string _programDescription, string _lFileParamName, char _shortHand) :
programName( _argv[0]), programName( _argv[0]),
programDescription( _programDescription), programDescription( _programDescription),
needHelp(false, "help", "Prints this message", 'h') needHelp(false, "help", "Prints this message", 'h')
{ {
// 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
char *pts = _argv[i]+1; // yes a char*, sorry :-) char *pts = _argv[i]+1; // yes a char*, sorry :-)
ifstream ifs (pts); ifstream ifs (pts);
ifs.peek(); // check if it exists ifs.peek(); // check if it exists
if (!ifs) if (!ifs)
{ {
string msg = (string)("Could not open response file: ") + pts; string msg = (string)("Could not open response file: ") + pts;
throw runtime_error(msg); throw runtime_error(msg);
} }
// read - will be overwritten by command-line // read - will be overwritten by command-line
readFrom(ifs); readFrom(ifs);
break; // stop reading command line args for '@' break; // stop reading command line args for '@'
} }
} }
// 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';
} }
readFrom(stream); readFrom(stream);
processParam(needHelp); processParam(needHelp);
} }
void eoParser::processParam(eoParam& param, std::string section) void eoParser::processParam(eoParam& param, std::string section)
{ {
doRegisterParam(param); // plainly register it doRegisterParam(param); // plainly register it
params.insert(make_pair(section, &param)); params.insert(make_pair(section, &param));
} }
void eoParser::doRegisterParam(eoParam& param) const void eoParser::doRegisterParam(eoParam& param) const
{ {
if (param.required() && !isItThere(param)) if (param.required() && !isItThere(param))
{ {
string msg = "Required parameter: " + param.longName() + " missing"; string msg = "Required parameter: " + param.longName() + " missing";
messages.push_back(msg); messages.push_back(msg);
} }
pair<bool, string> value = getValue(param); pair<bool, string> value = getValue(param);
if (value.first) if (value.first)
{ {
param.setValue(value.second); param.setValue(value.second);
} }
} }
pair<bool, string> eoParser::getValue(eoParam& _param) const pair<bool, string> eoParser::getValue(eoParam& _param) const
{ {
pair<bool, string> result(false, ""); pair<bool, string> result(false, "");
if (_param.shortName() != 0) if (_param.shortName() != 0)
{ {
map<char, string>::const_iterator it = shortNameMap.find(_param.shortName()); map<char, string>::const_iterator it = shortNameMap.find(_param.shortName());
if (it != shortNameMap.end()) if (it != shortNameMap.end())
{ {
result.second = it->second; result.second = it->second;
result.first = true; result.first = true;
return result; return result;
} }
} }
map<string, string>::const_iterator it = longNameMap.find(_param.longName()); map<string, string>::const_iterator it = longNameMap.find(_param.longName());
if (it != longNameMap.end()) if (it != longNameMap.end())
{ {
result.second = it->second; result.second = it->second;
result.first = true; result.first = true;
return result; return result;
} }
// else (TODO: check environment, just long names) // else (TODO: check environment, just long names)
return result; return result;
} }
void eoParser::updateParameters() const void eoParser::updateParameters() const
{ {
typedef MultiMapType::const_iterator It; typedef MultiMapType::const_iterator It;
for (It p = params.begin(); p != params.end(); ++p) for (It p = params.begin(); p != params.end(); ++p)
{ {
doRegisterParam(*p->second); doRegisterParam(*p->second);
} }
} }
void eoParser::readFrom(istream& is) void eoParser::readFrom(istream& is)
{ {
string str; string str;
while (is >> str) while (is >> str)
{ {
if (str[0] == '#') if (str[0] == '#')
{ // skip the rest of the line { // skip the rest of the line
string tempStr; string tempStr;
getline(is, tempStr); getline(is, tempStr);
} }
if (str[0] == '-') if (str[0] == '-')
{ {
if (str.size() < 2) if (str.size() < 2)
{ {
eoWarning("Missing parameter"); eoWarning("Missing parameter");
needHelp.value() = true; needHelp.value() = true;
return; return;
} }
if (str[1] == '-') // two consecutive dashes if (str[1] == '-') // two consecutive dashes
{ {
string::iterator equalLocation = find(str.begin() + 2, str.end(), '='); string::iterator equalLocation = find(str.begin() + 2, str.end(), '=');
string value; string value;
if (equalLocation == str.end()) if (equalLocation == str.end())
{ // TODO: it should be the next string { // TODO: it should be the next string
value = ""; value = "";
} }
else else
{ {
value = string(equalLocation + 1, str.end()); value = string(equalLocation + 1, str.end());
} }
string name(str.begin() + 2, equalLocation); string name(str.begin() + 2, equalLocation);
longNameMap[name] = value; longNameMap[name] = value;
} }
else // it should be a char else // it should be a char
{ {
string value(str.begin() + 3, str.end()); string value(str.begin() + 3, str.end());
shortNameMap[str[1]] = value; shortNameMap[str[1]] = value;
} }
} }
} }
updateParameters(); updateParameters();
} }
void eoParser::printOn(ostream& os) const void eoParser::printOn(ostream& os) const
{ {
typedef MultiMapType::const_iterator It; typedef MultiMapType::const_iterator It;
It p = params.begin(); It p = params.begin();
std::string section = p->first; std::string section = p->first;
printSectionHeader(os, section); printSectionHeader(os, section);
//print every param with its value //print every param with its value
for (; p != params.end(); ++p) for (; p != params.end(); ++p)
{ {
std::string newSection = p->first; std::string newSection = p->first;
if (newSection != section) if (newSection != section)
{ {
section = newSection; section = newSection;
printSectionHeader(os, section); printSectionHeader(os, section);
} }
eoParam* param = p->second; eoParam* param = p->second;
string str = "--" + param->longName() + "=" + param->getValue(); string str = "--" + param->longName() + "=" + param->getValue();
os.setf(ios_base::left, ios_base::adjustfield); os.setf(ios_base::left, ios_base::adjustfield);
os << setw(40) << str; os << setw(40) << str;
os << setw(0) << " # "; os << setw(0) << " # ";
if (param->shortName()) if (param->shortName())
os << '-' << param->shortName() << " : "; os << '-' << param->shortName() << " : ";
os << param->description(); os << param->description();
if (param->required()) if (param->required())
{ {
os << " REQUIRED "; os << " REQUIRED ";
} }
os << '\n'; os << '\n';
} }
} }
void eoParser::printHelp(ostream& os) void eoParser::printHelp(ostream& os)
{ {
if (needHelp.value() == false && !messages.empty()) if (needHelp.value() == false && !messages.empty())
{ {
std::copy(messages.begin(), messages.end(), ostream_iterator<string>(os, "\n")); std::copy(messages.begin(), messages.end(), ostream_iterator<string>(os, "\n"));
messages.clear(); messages.clear();
return; return;
} }
// print program name and description // print program name and description
os << this->programName <<": "<< programDescription << "\n\n"; os << this->programName <<": "<< programDescription << "\n\n";
// print the usage when calling the program from the command line // print the usage when calling the program from the command line
os << "Usage: "<< programName<<" [Options]\n"; os << "Usage: "<< programName<<" [Options]\n";
// only short usage! // only short usage!
os << "Options of the form \"-f[=Value]\" or \"--Name[=value]\"" << endl; os << "Options of the form \"-f[=Value]\" or \"--Name[=value]\"" << endl;
os << "Where:"<<endl; os << "Where:"<<endl;
typedef MultiMapType::const_iterator It; typedef MultiMapType::const_iterator It;
It p = params.begin(); It p = params.begin();
std::string section = p->first; std::string section = p->first;
printSectionHeader(os, section); printSectionHeader(os, section);
//print every param with its value //print every param with its value
for (; p != params.end(); ++p) for (; p != params.end(); ++p)
{ {
std::string newSection = p->first; std::string newSection = p->first;
if (newSection != section) if (newSection != section)
{ {
section = newSection; section = newSection;
printSectionHeader(os, section); printSectionHeader(os, section);
} }
if (p->second->shortName()) if (p->second->shortName())
os << "-" << p->second->shortName() << ", "; os << "-" << p->second->shortName() << ", ";
os << "--" <<p->second->longName() <<":\t" os << "--" <<p->second->longName() <<":\t"
<< p->second->description() ; << p->second->description() ;
os << "\n" << setw(20) << ( (p->second->required())?"Required":"Optional" ); os << "\n" << setw(20) << ( (p->second->required())?"Required":"Optional" );
os <<". By default: "<<p->second->defValue() << '\n'; os <<". By default: "<<p->second->defValue() << '\n';
} // for p } // for p
os << "\n@param_file \t defines a file where the parameters are stored\n"; os << "\n@param_file \t defines a file where the parameters are stored\n";
os << '\n'; os << '\n';
} }
bool eoParser::userNeedsHelp(void) bool eoParser::userNeedsHelp(void)
{ {
/* /*
check whether there are long or short names entered check whether there are long or short names entered
without a corresponding parameter without a corresponding parameter
*/ */
for (LongNameMapType::const_iterator lIt = longNameMap.begin(); lIt != longNameMap.end(); ++lIt) for (LongNameMapType::const_iterator lIt = longNameMap.begin(); lIt != longNameMap.end(); ++lIt)
{ {
string entry = lIt->first; string entry = lIt->first;
MultiMapType::const_iterator it; MultiMapType::const_iterator it;
for (it = params.begin(); it != params.end(); ++it) for (it = params.begin(); it != params.end(); ++it)
{ {
if (entry == it->second->longName()) if (entry == it->second->longName())
{ {
break; break;
} }
} }
if (it == params.end()) if (it == params.end())
{ {
string msg = "Unknown parameter: --" + entry + " entered, type -h or --help to see available parameters"; string msg = "Unknown parameter: --" + entry + " entered, type -h or --help to see available parameters";
messages.push_back(msg); messages.push_back(msg);
} }
} }
for (ShortNameMapType::const_iterator sIt = shortNameMap.begin(); sIt != shortNameMap.end(); ++sIt) for (ShortNameMapType::const_iterator sIt = shortNameMap.begin(); sIt != shortNameMap.end(); ++sIt)
{ {
char entry = sIt->first; char entry = sIt->first;
MultiMapType::const_iterator it; MultiMapType::const_iterator it;
for (it = params.begin(); it != params.end(); ++it) for (it = params.begin(); it != params.end(); ++it)
{ {
if (entry == it->second->shortName()) if (entry == it->second->shortName())
{ {
break; break;
} }
} }
if (it == params.end()) if (it == params.end())
{ {
string entryString(1, entry); string entryString(1, entry);
string msg = "Unknown parameter: -" + entryString + " entered, type -h or --help to see available parameters"; string msg = "Unknown parameter: -" + entryString + " entered, type -h or --help to see available parameters";
messages.push_back(msg); messages.push_back(msg);
} }
} }
return needHelp.value() || !messages.empty(); return needHelp.value() || !messages.empty();
} }

360
eo/win/eo.dsp
View file

@ -1,178 +1,182 @@
# Microsoft Developer Studio Project File - Name="eo" - Package Owner=<4> # Microsoft Developer Studio Project File - Name="eo" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00 # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT ** # ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104 # TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=eo - Win32 Debug CFG=eo - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run !MESSAGE use the Export Makefile command and run
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f "eo.mak". !MESSAGE NMAKE /f "eo.mak".
!MESSAGE !MESSAGE
!MESSAGE You can specify a configuration when running NMAKE !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f "eo.mak" CFG="eo - Win32 Debug" !MESSAGE NMAKE /f "eo.mak" CFG="eo - Win32 Debug"
!MESSAGE !MESSAGE
!MESSAGE Possible choices for configuration are: !MESSAGE Possible choices for configuration are:
!MESSAGE !MESSAGE
!MESSAGE "eo - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "eo - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "eo - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "eo - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE !MESSAGE
# Begin Project # Begin Project
# PROP AllowPerConfigDependencies 0 # PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName "" # PROP Scc_ProjName ""
# PROP Scc_LocalPath "" # PROP Scc_LocalPath ""
CPP=cl.exe CPP=cl.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "eo - Win32 Release" !IF "$(CFG)" == "eo - Win32 Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0 # PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release" # PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release" # PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 0 # PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release" # PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release" # PROP Intermediate_Dir "Release"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /W3 /GR /GX /O2 /I "../src" /I "eo/src" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c # ADD CPP /nologo /W3 /GR /GX /O2 /I "../src" /I "eo/src" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
# SUBTRACT CPP /YX # SUBTRACT CPP /YX
# ADD BASE RSC /l 0xc0a /d "NDEBUG" # ADD BASE RSC /l 0xc0a /d "NDEBUG"
# ADD RSC /l 0xc0a /d "NDEBUG" # ADD RSC /l 0xc0a /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LIB32=link.exe -lib LIB32=link.exe -lib
# ADD BASE LIB32 /nologo # ADD BASE LIB32 /nologo
# ADD LIB32 /nologo # ADD LIB32 /nologo
!ELSEIF "$(CFG)" == "eo - Win32 Debug" !ELSEIF "$(CFG)" == "eo - Win32 Debug"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "eo___Win32_Debug" # PROP BASE Output_Dir "eo___Win32_Debug"
# PROP BASE Intermediate_Dir "eo___Win32_Debug" # PROP BASE Intermediate_Dir "eo___Win32_Debug"
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1 # PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug" # PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug" # PROP Intermediate_Dir "Debug"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "../src" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c # ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "../src" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c
# SUBTRACT CPP /YX # SUBTRACT CPP /YX
# ADD BASE RSC /l 0xc0a /d "_DEBUG" # ADD BASE RSC /l 0xc0a /d "_DEBUG"
# ADD RSC /l 0xc0a /d "_DEBUG" # ADD RSC /l 0xc0a /d "_DEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LIB32=link.exe -lib LIB32=link.exe -lib
# ADD BASE LIB32 /nologo # ADD BASE LIB32 /nologo
# ADD LIB32 /nologo # ADD LIB32 /nologo
!ENDIF !ENDIF
# Begin Target # Begin Target
# Name "eo - Win32 Release" # Name "eo - Win32 Release"
# Name "eo - Win32 Debug" # Name "eo - Win32 Debug"
# Begin Group "Source Files" # Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File # Begin Source File
SOURCE=..\src\utils\eoFileMonitor.cpp SOURCE=..\src\utils\eoFileMonitor.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\src\utils\eoParser.cpp SOURCE=..\src\eoFunctorStore.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\src\eoPersistent.cpp SOURCE=..\src\utils\eoParser.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\src\eoPrintable.cpp SOURCE=..\src\eoPersistent.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\src\utils\eoRNG.cpp SOURCE=..\src\eoPrintable.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\src\utils\eoState.cpp SOURCE=..\src\utils\eoRNG.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\src\utils\eoStdoutMonitor.cpp SOURCE=..\src\utils\eoState.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\src\utils\eoUpdater.cpp SOURCE=..\src\utils\eoStdoutMonitor.cpp
# End Source File # End Source File
# End Group # Begin Source File
# Begin Group "Header Files"
SOURCE=..\src\utils\eoUpdater.cpp
# PROP Default_Filter "h;hpp;hxx;hm;inl" # End Source File
# Begin Source File # End Group
# Begin Group "Header Files"
SOURCE=..\src\utils\compatibility.h
# End Source File # PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File # Begin Source File
SOURCE=..\src\utils\eoData.h SOURCE=..\src\utils\compatibility.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\src\utils\eoFileMonitor.h SOURCE=..\src\utils\eoData.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\src\utils\eoMonitor.h SOURCE=..\src\utils\eoFileMonitor.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\src\eoObject.h SOURCE=..\src\utils\eoMonitor.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\src\utils\eoParam.h SOURCE=..\src\eoObject.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\src\utils\eoParser.h SOURCE=..\src\utils\eoParam.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\src\eoPersistent.h SOURCE=..\src\utils\eoParser.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\src\eoPrintable.h SOURCE=..\src\eoPersistent.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\src\utils\eoRNG.h SOURCE=..\src\eoPrintable.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\src\utils\eoStat.h SOURCE=..\src\utils\eoRNG.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\src\utils\eoState.h SOURCE=..\src\utils\eoStat.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\src\utils\eoUpdater.h SOURCE=..\src\utils\eoState.h
# End Source File # End Source File
# End Group # Begin Source File
# End Target
# End Project SOURCE=..\src\utils\eoUpdater.h
# End Source File
# End Group
# End Target
# End Project

31
eo/win/eo.dsw
View 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>
{{{ {{{

282
eo/win/esfull.dsp
View file

@ -1,139 +1,143 @@
# Microsoft Developer Studio Project File - Name="esfull" - Package Owner=<4> # Microsoft Developer Studio Project File - Name="esfull" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00 # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT ** # ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103 # TARGTYPE "Win32 (x86) Console Application" 0x0103
CFG=esfull - Win32 Debug CFG=esfull - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run !MESSAGE use the Export Makefile command and run
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f "esfull.mak". !MESSAGE NMAKE /f "esfull.mak".
!MESSAGE !MESSAGE
!MESSAGE You can specify a configuration when running NMAKE !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f "esfull.mak" CFG="esfull - Win32 Debug" !MESSAGE NMAKE /f "esfull.mak" CFG="esfull - Win32 Debug"
!MESSAGE !MESSAGE
!MESSAGE Possible choices for configuration are: !MESSAGE Possible choices for configuration are:
!MESSAGE !MESSAGE
!MESSAGE "esfull - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE "esfull - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "esfull - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE "esfull - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE !MESSAGE
# Begin Project # Begin Project
# PROP AllowPerConfigDependencies 0 # PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName "" # PROP Scc_ProjName ""
# PROP Scc_LocalPath "" # PROP Scc_LocalPath ""
CPP=cl.exe CPP=cl.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "esfull - Win32 Release" !IF "$(CFG)" == "esfull - Win32 Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0 # PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release" # PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release" # PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 0 # PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release" # PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release" # PROP Intermediate_Dir "Release"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /W3 /GR /GX /O2 /I "../src" /I "../test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # ADD CPP /nologo /W3 /GR /GX /O2 /I "../src" /I "../test" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX # SUBTRACT CPP /YX
# ADD BASE RSC /l 0xc0a /d "NDEBUG" # ADD BASE RSC /l 0xc0a /d "NDEBUG"
# ADD RSC /l 0xc0a /d "NDEBUG" # ADD RSC /l 0xc0a /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
!ELSEIF "$(CFG)" == "esfull - Win32 Debug" !ELSEIF "$(CFG)" == "esfull - Win32 Debug"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "esfull___Win32_Debug" # PROP BASE Output_Dir "esfull___Win32_Debug"
# PROP BASE Intermediate_Dir "esfull___Win32_Debug" # PROP BASE Intermediate_Dir "esfull___Win32_Debug"
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1 # PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug" # PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug" # PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "../src" /I "../test" /I "../win" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c # ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "../src" /I "../test" /I "../win" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# SUBTRACT CPP /YX # SUBTRACT CPP /YX
# ADD BASE RSC /l 0xc0a /d "_DEBUG" # ADD BASE RSC /l 0xc0a /d "_DEBUG"
# ADD RSC /l 0xc0a /d "_DEBUG" # ADD RSC /l 0xc0a /d "_DEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
!ENDIF !ENDIF
# Begin Target # Begin Target
# Name "esfull - Win32 Release" # Name "esfull - Win32 Release"
# Name "esfull - Win32 Debug" # Name "esfull - Win32 Debug"
# Begin Group "Source Files" # Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File # Begin Source File
SOURCE="..\test\t-eoESFull.cpp" SOURCE="..\test\t-eoESFull.cpp"
# End Source File # End Source File
# End Group # End Group
# Begin Group "Header Files" # Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl" # PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File # Begin Source File
SOURCE=..\src\es\eoEsChromInit.h SOURCE=..\src\es\eoEsChromInit.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\src\es\eoEsFull.h SOURCE=..\src\es\eoEsFull.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\src\es\eoEsMutate.h SOURCE=..\src\es\eoEsMutate.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\src\es\eoEsMutationInit.h SOURCE=..\src\es\eoEsMutationInit.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\src\es\eoEsObjectiveBounds.h SOURCE=..\src\es\eoEsObjectiveBounds.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\src\es\eoEsSimple.h SOURCE=..\src\es\eoEsSimple.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\src\es\eoEsStdev.h SOURCE=..\src\es\eoEsStdev.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\src\eoFixedLength.h SOURCE=..\src\eoFixedLength.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\test\real_value.h SOURCE=..\test\real_value.h
# End Source File # End Source File
# End Group # End Group
# Begin Group "Resource Files" # Begin Group "Resource Files"
# 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
# End Target # Begin Source File
# End Project
SOURCE=.\eolib___Win32_Debug\eolib.lib
# End Source File
# End Target
# End Project