Merge branch 'github-205' into 'master'

GitHub 205 -- Allow absolute paths in master input file

See merge request qs/ore-github!35

Author: NathanielVolfango

OREAnalytics/orea/app/inputparameters.cpp

@@ -34,12 +34,12 @@
 namespace ore {
 namespace analytics {
 
-vector<string> getFileNames(const string& fileString, const string& path) {
+vector<string> getFileNames(const string& fileString, const std::filesystem::path& path) {
     vector<string> fileNames;
     boost::split(fileNames, fileString, boost::is_any_of(",;"), boost::token_compress_on);
     for (auto it = fileNames.begin(); it < fileNames.end(); it++) {
         boost::trim(*it);
-        *it = path + "/" + *it;
+        *it = (path / *it).generic_string();
     }
     return fileNames;
 }
@@ -140,7 +140,7 @@ void InputParameters::setPortfolio(const std::string& xml) {
     portfolio_->fromXMLString(xml);
 }
 
-void InputParameters::setPortfolioFromFile(const std::string& fileNameString, const std::string& inputPath) {
+void InputParameters::setPortfolioFromFile(const std::string& fileNameString, const std::filesystem::path& inputPath) {
     vector<string> files = getFileNames(fileNameString, inputPath);
     portfolio_ = boost::make_shared<Portfolio>(buildFailedTrades_);
     for (auto file : files) {

OREAnalytics/orea/app/inputparameters.hpp

@@ -53,6 +53,8 @@
 #include <ored/portfolio/portfolio.hpp>
 #include <ored/portfolio/referencedata.hpp>
 #include <ored/utilities/csvfilereader.hpp>
+#include <boost/filesystem/path.hpp>
+#include <filesystem>
 
 namespace ore {
 namespace analytics {
@@ -92,7 +94,7 @@ class InputParameters {
     void setTodaysMarketParams(const std::string& xml);
     void setTodaysMarketParamsFromFile(const std::string& fileName);
     void setPortfolio(const std::string& xml); 
-    void setPortfolioFromFile(const std::string& fileNameString, const std::string& inputPath); 
+    void setPortfolioFromFile(const std::string& fileNameString, const std::filesystem::path& inputPath); 
     void setMarketConfigs(const std::map<std::string, std::string>& m);
     void setThreads(int i) { nThreads_ = i; }
     void setEntireMarket(bool b) { entireMarket_ = b; }
@@ -875,6 +877,7 @@ inline const std::string& InputParameters::marketConfig(const std::string& conte
     auto it = marketConfigs_.find(context);
     return (it != marketConfigs_.end() ? it->second : Market::defaultConfiguration);
 }
+std::vector<std::string> getFileNames(const std::string& fileString, const std::filesystem::path& path);
 
 //! Traditional ORE input via ore.xml and various files, output into files
 class OutputParameters {