diff --git a/eo/src/utils/checkpointing b/eo/src/utils/checkpointing index d4bf89ae..c8fe220f 100644 --- a/eo/src/utils/checkpointing +++ b/eo/src/utils/checkpointing @@ -1,13 +1,14 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#ifndef _MSC_VER +#include +#include +#endif +#include +#include +#include +#include diff --git a/eo/src/utils/eoParser.cpp b/eo/src/utils/eoParser.cpp index a069ff07..ffbcffc9 100644 --- a/eo/src/utils/eoParser.cpp +++ b/eo/src/utils/eoParser.cpp @@ -1,336 +1,336 @@ -#ifdef _MSC_VER -#pragma warning(disable:4786) -#endif - -#include -#include -#include -#include - -#include - -#include - -using namespace std; - -void eoWarning(std::string str) -{ - cout << str << '\n'; -} - -std::ostream& printSectionHeader(std::ostream& os, std::string section) -{ - if (section == "") - section = "General"; - - os << '\n' << setw(10) << "###### " << setw(20) << section << setw(10) << " ######\n"; - return os; -} - -eoParameterLoader::~eoParameterLoader() -{ - for (unsigned i = 0; i < ownedParams.size(); ++i) - { - delete ownedParams[i]; - } -} - - -eoParser::eoParser ( int _argc, char **_argv , string _programDescription, string _lFileParamName, char _shortHand) : - programName( _argv[0]), - programDescription( _programDescription), - needHelp(false, "help", "Prints this message", 'h') -{ - // need to process the param file first - // if we want command-line to have highest priority - - for (int i = 1; i < _argc; ++i) - { - if (_argv[i][0] == '@') - { // read response file - char *pts = _argv[i]+1; // yes a char*, sorry :-) - - ifstream ifs (pts); - - ifs.peek(); // check if it exists - - if (!ifs) - { - string msg = (string)("Could not open response file: ") + pts; - throw runtime_error(msg); - } - - // read - will be overwritten by command-line - readFrom(ifs); - break; // stop reading command line args for '@' - } - } - - // now read arguments on command-line - strstream stream; - - for (int i = 1; i < _argc; ++i) - { - stream << _argv[i] << '\n'; - } - - readFrom(stream); - - processParam(needHelp); -} - -void eoParser::processParam(eoParam& param, std::string section) -{ - doRegisterParam(param); // plainly register it - params.insert(make_pair(section, ¶m)); -} - -void eoParser::doRegisterParam(eoParam& param) const -{ - if (param.required() && !isItThere(param)) - { - string msg = "Required parameter: " + param.longName() + " missing"; - messages.push_back(msg); - } - - pair value = getValue(param); - - if (value.first) - { - param.setValue(value.second); - } -} - -pair eoParser::getValue(eoParam& _param) const -{ - pair result(false, ""); - - if (_param.shortName() != 0) - { - map::const_iterator it = shortNameMap.find(_param.shortName()); - if (it != shortNameMap.end()) - { - result.second = it->second; - result.first = true; - return result; - } - } - - map::const_iterator it = longNameMap.find(_param.longName()); - - if (it != longNameMap.end()) - { - result.second = it->second; - result.first = true; - return result; - } - // else (TODO: check environment, just long names) - - return result; -} - -void eoParser::updateParameters() const -{ - typedef MultiMapType::const_iterator It; - - for (It p = params.begin(); p != params.end(); ++p) - { - doRegisterParam(*p->second); - } -} - -void eoParser::readFrom(istream& is) -{ - string str; - - while (is >> str) - { - if (str[0] == '#') - { // skip the rest of the line - string tempStr; - getline(is, tempStr); - } - if (str[0] == '-') - { - if (str.size() < 2) - { - eoWarning("Missing parameter"); - needHelp.value() = true; - return; - } - - if (str[1] == '-') // two consecutive dashes - { - string::iterator equalLocation = find(str.begin() + 2, str.end(), '='); - string value; - - if (equalLocation == str.end()) - { // TODO: it should be the next string - value = ""; - } - else - { - value = string(equalLocation + 1, str.end()); - } - - string name(str.begin() + 2, equalLocation); - longNameMap[name] = value; - - } - else // it should be a char - { - string value(str.begin() + 3, str.end()); - shortNameMap[str[1]] = value; - } - } - } - - updateParameters(); -} - -void eoParser::printOn(ostream& os) const -{ - typedef MultiMapType::const_iterator It; - - It p = params.begin(); - - std::string section = p->first; - - printSectionHeader(os, section); - //print every param with its value - for (; p != params.end(); ++p) - { - std::string newSection = p->first; - - if (newSection != section) - { - section = newSection; - printSectionHeader(os, section); - } - - eoParam* param = p->second; - - string str = "--" + param->longName() + "=" + param->getValue(); - - os.setf(ios_base::left, ios_base::adjustfield); - os << setw(40) << str; - - os << setw(0) << " # "; - if (param->shortName()) - os << '-' << param->shortName() << " : "; - os << param->description(); - - if (param->required()) - { - os << " REQUIRED "; - } - - os << '\n'; - } -} - -void eoParser::printHelp(ostream& os) -{ - if (needHelp.value() == false && !messages.empty()) - { - std::copy(messages.begin(), messages.end(), ostream_iterator(os, "\n")); - messages.clear(); - return; - } - - // print program name and description - os << this->programName <<": "<< programDescription << "\n\n"; - - // print the usage when calling the program from the command line - os << "Usage: "<< programName<<" [Options]\n"; - // only short usage! - os << "Options of the form \"-f[=Value]\" or \"--Name[=value]\"" << endl; - - os << "Where:"<first; - - printSectionHeader(os, section); - - //print every param with its value - for (; p != params.end(); ++p) - { - std::string newSection = p->first; - - if (newSection != section) - { - section = newSection; - printSectionHeader(os, section); - } - - if (p->second->shortName()) - os << "-" << p->second->shortName() << ", "; - - os << "--" <second->longName() <<":\t" - << p->second->description() ; - - os << "\n" << setw(20) << ( (p->second->required())?"Required":"Optional" ); - os <<". By default: "<second->defValue() << '\n'; - } // for p - - os << "\n@param_file \t defines a file where the parameters are stored\n"; - os << '\n'; - -} - -bool eoParser::userNeedsHelp(void) -{ - /* - check whether there are long or short names entered - without a corresponding parameter - */ - - for (LongNameMapType::const_iterator lIt = longNameMap.begin(); lIt != longNameMap.end(); ++lIt) - { - string entry = lIt->first; - - MultiMapType::const_iterator it; - - for (it = params.begin(); it != params.end(); ++it) - { - if (entry == it->second->longName()) - { - break; - } - } - - if (it == params.end()) - { - string msg = "Unknown parameter: --" + entry + " entered, type -h or --help to see available parameters"; - messages.push_back(msg); - } - } - - for (ShortNameMapType::const_iterator sIt = shortNameMap.begin(); sIt != shortNameMap.end(); ++sIt) - { - char entry = sIt->first; - - MultiMapType::const_iterator it; - - for (it = params.begin(); it != params.end(); ++it) - { - if (entry == it->second->shortName()) - { - break; - } - } - - if (it == params.end()) - { - string entryString(1, entry); - string msg = "Unknown parameter: -" + entryString + " entered, type -h or --help to see available parameters"; - messages.push_back(msg); - } - } - - return needHelp.value() || !messages.empty(); -} +#ifdef _MSC_VER +#pragma warning(disable:4786) +#endif + +#include +#include +#include +#include + +#include + +#include + +using namespace std; + +void eoWarning(std::string str) +{ + cout << str << '\n'; +} + +std::ostream& printSectionHeader(std::ostream& os, std::string section) +{ + if (section == "") + section = "General"; + + os << '\n' << setw(10) << "###### " << setw(20) << section << setw(10) << " ######\n"; + return os; +} + +eoParameterLoader::~eoParameterLoader() +{ + for (unsigned i = 0; i < ownedParams.size(); ++i) + { + delete ownedParams[i]; + } +} + + +eoParser::eoParser ( int _argc, char **_argv , string _programDescription, string _lFileParamName, char _shortHand) : + programName( _argv[0]), + programDescription( _programDescription), + needHelp(false, "help", "Prints this message", 'h') +{ + // need to process the param file first + // if we want command-line to have highest priority + unsigned i; + for (i = 1; i < _argc; ++i) + { + if (_argv[i][0] == '@') + { // read response file + char *pts = _argv[i]+1; // yes a char*, sorry :-) + + ifstream ifs (pts); + + ifs.peek(); // check if it exists + + if (!ifs) + { + string msg = (string)("Could not open response file: ") + pts; + throw runtime_error(msg); + } + + // read - will be overwritten by command-line + readFrom(ifs); + break; // stop reading command line args for '@' + } + } + + // now read arguments on command-line + strstream stream; + + for (i = 1; i < _argc; ++i) + { + stream << _argv[i] << '\n'; + } + + readFrom(stream); + + processParam(needHelp); +} + +void eoParser::processParam(eoParam& param, std::string section) +{ + doRegisterParam(param); // plainly register it + params.insert(make_pair(section, ¶m)); +} + +void eoParser::doRegisterParam(eoParam& param) const +{ + if (param.required() && !isItThere(param)) + { + string msg = "Required parameter: " + param.longName() + " missing"; + messages.push_back(msg); + } + + pair value = getValue(param); + + if (value.first) + { + param.setValue(value.second); + } +} + +pair eoParser::getValue(eoParam& _param) const +{ + pair result(false, ""); + + if (_param.shortName() != 0) + { + map::const_iterator it = shortNameMap.find(_param.shortName()); + if (it != shortNameMap.end()) + { + result.second = it->second; + result.first = true; + return result; + } + } + + map::const_iterator it = longNameMap.find(_param.longName()); + + if (it != longNameMap.end()) + { + result.second = it->second; + result.first = true; + return result; + } + // else (TODO: check environment, just long names) + + return result; +} + +void eoParser::updateParameters() const +{ + typedef MultiMapType::const_iterator It; + + for (It p = params.begin(); p != params.end(); ++p) + { + doRegisterParam(*p->second); + } +} + +void eoParser::readFrom(istream& is) +{ + string str; + + while (is >> str) + { + if (str[0] == '#') + { // skip the rest of the line + string tempStr; + getline(is, tempStr); + } + if (str[0] == '-') + { + if (str.size() < 2) + { + eoWarning("Missing parameter"); + needHelp.value() = true; + return; + } + + if (str[1] == '-') // two consecutive dashes + { + string::iterator equalLocation = find(str.begin() + 2, str.end(), '='); + string value; + + if (equalLocation == str.end()) + { // TODO: it should be the next string + value = ""; + } + else + { + value = string(equalLocation + 1, str.end()); + } + + string name(str.begin() + 2, equalLocation); + longNameMap[name] = value; + + } + else // it should be a char + { + string value(str.begin() + 3, str.end()); + shortNameMap[str[1]] = value; + } + } + } + + updateParameters(); +} + +void eoParser::printOn(ostream& os) const +{ + typedef MultiMapType::const_iterator It; + + It p = params.begin(); + + std::string section = p->first; + + printSectionHeader(os, section); + //print every param with its value + for (; p != params.end(); ++p) + { + std::string newSection = p->first; + + if (newSection != section) + { + section = newSection; + printSectionHeader(os, section); + } + + eoParam* param = p->second; + + string str = "--" + param->longName() + "=" + param->getValue(); + + os.setf(ios_base::left, ios_base::adjustfield); + os << setw(40) << str; + + os << setw(0) << " # "; + if (param->shortName()) + os << '-' << param->shortName() << " : "; + os << param->description(); + + if (param->required()) + { + os << " REQUIRED "; + } + + os << '\n'; + } +} + +void eoParser::printHelp(ostream& os) +{ + if (needHelp.value() == false && !messages.empty()) + { + std::copy(messages.begin(), messages.end(), ostream_iterator(os, "\n")); + messages.clear(); + return; + } + + // print program name and description + os << this->programName <<": "<< programDescription << "\n\n"; + + // print the usage when calling the program from the command line + os << "Usage: "<< programName<<" [Options]\n"; + // only short usage! + os << "Options of the form \"-f[=Value]\" or \"--Name[=value]\"" << endl; + + os << "Where:"<first; + + printSectionHeader(os, section); + + //print every param with its value + for (; p != params.end(); ++p) + { + std::string newSection = p->first; + + if (newSection != section) + { + section = newSection; + printSectionHeader(os, section); + } + + if (p->second->shortName()) + os << "-" << p->second->shortName() << ", "; + + os << "--" <second->longName() <<":\t" + << p->second->description() ; + + os << "\n" << setw(20) << ( (p->second->required())?"Required":"Optional" ); + os <<". By default: "<second->defValue() << '\n'; + } // for p + + os << "\n@param_file \t defines a file where the parameters are stored\n"; + os << '\n'; + +} + +bool eoParser::userNeedsHelp(void) +{ + /* + check whether there are long or short names entered + without a corresponding parameter + */ + + for (LongNameMapType::const_iterator lIt = longNameMap.begin(); lIt != longNameMap.end(); ++lIt) + { + string entry = lIt->first; + + MultiMapType::const_iterator it; + + for (it = params.begin(); it != params.end(); ++it) + { + if (entry == it->second->longName()) + { + break; + } + } + + if (it == params.end()) + { + string msg = "Unknown parameter: --" + entry + " entered, type -h or --help to see available parameters"; + messages.push_back(msg); + } + } + + for (ShortNameMapType::const_iterator sIt = shortNameMap.begin(); sIt != shortNameMap.end(); ++sIt) + { + char entry = sIt->first; + + MultiMapType::const_iterator it; + + for (it = params.begin(); it != params.end(); ++it) + { + if (entry == it->second->shortName()) + { + break; + } + } + + if (it == params.end()) + { + string entryString(1, entry); + string msg = "Unknown parameter: -" + entryString + " entered, type -h or --help to see available parameters"; + messages.push_back(msg); + } + } + + return needHelp.value() || !messages.empty(); +} diff --git a/eo/win/eo.dsp b/eo/win/eo.dsp index abdd0510..4ab4d716 100644 --- a/eo/win/eo.dsp +++ b/eo/win/eo.dsp @@ -1,178 +1,182 @@ -# Microsoft Developer Studio Project File - Name="eo" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=eo - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "eo.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "eo.mak" CFG="eo - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "eo - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "eo - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "eo - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# 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 -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0xc0a /d "NDEBUG" -# ADD RSC /l 0xc0a /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "eo - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "eo___Win32_Debug" -# PROP BASE Intermediate_Dir "eo___Win32_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# 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 CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "../src" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0xc0a /d "_DEBUG" -# ADD RSC /l 0xc0a /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "eo - Win32 Release" -# Name "eo - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\src\utils\eoFileMonitor.cpp -# End Source File -# Begin Source File - -SOURCE=..\src\utils\eoParser.cpp -# End Source File -# Begin Source File - -SOURCE=..\src\eoPersistent.cpp -# End Source File -# Begin Source File - -SOURCE=..\src\eoPrintable.cpp -# End Source File -# Begin Source File - -SOURCE=..\src\utils\eoRNG.cpp -# End Source File -# Begin Source File - -SOURCE=..\src\utils\eoState.cpp -# End Source File -# Begin Source File - -SOURCE=..\src\utils\eoStdoutMonitor.cpp -# End Source File -# Begin Source File - -SOURCE=..\src\utils\eoUpdater.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\src\utils\compatibility.h -# End Source File -# Begin Source File - -SOURCE=..\src\utils\eoData.h -# End Source File -# Begin Source File - -SOURCE=..\src\utils\eoFileMonitor.h -# End Source File -# Begin Source File - -SOURCE=..\src\utils\eoMonitor.h -# End Source File -# Begin Source File - -SOURCE=..\src\eoObject.h -# End Source File -# Begin Source File - -SOURCE=..\src\utils\eoParam.h -# End Source File -# Begin Source File - -SOURCE=..\src\utils\eoParser.h -# End Source File -# Begin Source File - -SOURCE=..\src\eoPersistent.h -# End Source File -# Begin Source File - -SOURCE=..\src\eoPrintable.h -# End Source File -# Begin Source File - -SOURCE=..\src\utils\eoRNG.h -# End Source File -# Begin Source File - -SOURCE=..\src\utils\eoStat.h -# End Source File -# Begin Source File - -SOURCE=..\src\utils\eoState.h -# End Source File -# Begin Source File - -SOURCE=..\src\utils\eoUpdater.h -# End Source File -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="eo" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=eo - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "eo.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "eo.mak" CFG="eo - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "eo - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "eo - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "eo - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# 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 +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0xc0a /d "NDEBUG" +# ADD RSC /l 0xc0a /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "eo - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "eo___Win32_Debug" +# PROP BASE Intermediate_Dir "eo___Win32_Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# 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 CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "../src" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0xc0a /d "_DEBUG" +# ADD RSC /l 0xc0a /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ENDIF + +# Begin Target + +# Name "eo - Win32 Release" +# Name "eo - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\src\utils\eoFileMonitor.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\eoFunctorStore.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\utils\eoParser.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\eoPersistent.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\eoPrintable.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\utils\eoRNG.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\utils\eoState.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\utils\eoStdoutMonitor.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\utils\eoUpdater.cpp +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\src\utils\compatibility.h +# End Source File +# Begin Source File + +SOURCE=..\src\utils\eoData.h +# End Source File +# Begin Source File + +SOURCE=..\src\utils\eoFileMonitor.h +# End Source File +# Begin Source File + +SOURCE=..\src\utils\eoMonitor.h +# End Source File +# Begin Source File + +SOURCE=..\src\eoObject.h +# End Source File +# Begin Source File + +SOURCE=..\src\utils\eoParam.h +# End Source File +# Begin Source File + +SOURCE=..\src\utils\eoParser.h +# End Source File +# Begin Source File + +SOURCE=..\src\eoPersistent.h +# End Source File +# Begin Source File + +SOURCE=..\src\eoPrintable.h +# End Source File +# Begin Source File + +SOURCE=..\src\utils\eoRNG.h +# End Source File +# Begin Source File + +SOURCE=..\src\utils\eoStat.h +# End Source File +# Begin Source File + +SOURCE=..\src\utils\eoState.h +# End Source File +# Begin Source File + +SOURCE=..\src\utils\eoUpdater.h +# End Source File +# End Group +# End Target +# End Project diff --git a/eo/win/eo.dsw b/eo/win/eo.dsw index 176e8932..2a046f5f 100644 --- a/eo/win/eo.dsw +++ b/eo/win/eo.dsw @@ -3,19 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ############################################################################### -Project: "atomops"=".\atomops.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "eo"=".\eo.dsp" - Package Owner=<4> +Project: "eo"=.\eo.dsp - Package Owner=<4> Package=<5> {{{ @@ -29,26 +17,11 @@ Package=<4> Begin Project Dependency Project_Dep_Name atomops End Project Dependency - Begin Project Dependency - Project_Dep_Name esfull - End Project Dependency }}} ############################################################################### -Project: "esfull"=".\esfull.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "random"=".\random.dsp" - Package Owner=<4> +Project: "esfull"=.\esfull.dsp - Package Owner=<4> Package=<5> {{{ diff --git a/eo/win/esfull.dsp b/eo/win/esfull.dsp index 791ddeb0..5089fadb 100644 --- a/eo/win/esfull.dsp +++ b/eo/win/esfull.dsp @@ -1,139 +1,143 @@ -# Microsoft Developer Studio Project File - Name="esfull" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=esfull - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "esfull.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "esfull.mak" CFG="esfull - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "esfull - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "esfull - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "esfull - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# 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 -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0xc0a /d "NDEBUG" -# ADD RSC /l 0xc0a /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -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 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" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "esfull___Win32_Debug" -# PROP BASE Intermediate_Dir "esfull___Win32_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# 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 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 -# ADD BASE RSC /l 0xc0a /d "_DEBUG" -# ADD RSC /l 0xc0a /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -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 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 - -# Begin Target - -# Name "esfull - Win32 Release" -# Name "esfull - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE="..\test\t-eoESFull.cpp" -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\src\es\eoEsChromInit.h -# End Source File -# Begin Source File - -SOURCE=..\src\es\eoEsFull.h -# End Source File -# Begin Source File - -SOURCE=..\src\es\eoEsMutate.h -# End Source File -# Begin Source File - -SOURCE=..\src\es\eoEsMutationInit.h -# End Source File -# Begin Source File - -SOURCE=..\src\es\eoEsObjectiveBounds.h -# End Source File -# Begin Source File - -SOURCE=..\src\es\eoEsSimple.h -# End Source File -# Begin Source File - -SOURCE=..\src\es\eoEsStdev.h -# End Source File -# Begin Source File - -SOURCE=..\src\eoFixedLength.h -# End Source File -# Begin Source File - -SOURCE=..\test\real_value.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="esfull" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=esfull - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "esfull.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "esfull.mak" CFG="esfull - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "esfull - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "esfull - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "esfull - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# 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 +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0xc0a /d "NDEBUG" +# ADD RSC /l 0xc0a /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +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 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" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "esfull___Win32_Debug" +# PROP BASE Intermediate_Dir "esfull___Win32_Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# 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 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 +# ADD BASE RSC /l 0xc0a /d "_DEBUG" +# ADD RSC /l 0xc0a /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +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 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 + +# Begin Target + +# Name "esfull - Win32 Release" +# Name "esfull - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE="..\test\t-eoESFull.cpp" +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\src\es\eoEsChromInit.h +# End Source File +# Begin Source File + +SOURCE=..\src\es\eoEsFull.h +# End Source File +# Begin Source File + +SOURCE=..\src\es\eoEsMutate.h +# End Source File +# Begin Source File + +SOURCE=..\src\es\eoEsMutationInit.h +# End Source File +# Begin Source File + +SOURCE=..\src\es\eoEsObjectiveBounds.h +# End Source File +# Begin Source File + +SOURCE=..\src\es\eoEsSimple.h +# End Source File +# Begin Source File + +SOURCE=..\src\es\eoEsStdev.h +# End Source File +# Begin Source File + +SOURCE=..\src\eoFixedLength.h +# End Source File +# Begin Source File + +SOURCE=..\test\real_value.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# Begin Source File + +SOURCE=.\eolib___Win32_Debug\eolib.lib +# End Source File +# End Target +# End Project