Skip to content

Commit c3704fd

Browse files
GitHub 205 -- Update other paths to allow absolute paths
1 parent 7a24fb0 commit c3704fd

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

OREAnalytics/orea/app/oreapp.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,7 @@ void OREAppInputParameters::loadParameters() {
812812

813813
tmp = params_->get("scenario", "simulationConfigFile", false);
814814
if (tmp != "") {
815-
string simulationConfigFile = inputPath + "/" + tmp;
815+
string simulationConfigFile = (inputPath / tmp).generic_string();
816816
LOG("Loading scenario simulation config from file" << simulationConfigFile);
817817
setScenarioSimMarketParamsFromFile(simulationConfigFile);
818818
} else {
@@ -923,12 +923,12 @@ void OREAppInputParameters::loadParameters() {
923923

924924
tmp = params_->get("historicalSimulationVar", "historicalScenarioFile", false);
925925
QL_REQUIRE(tmp != "", "historicalScenarioFile not provided");
926-
std::string scenarioFile = inputPath + "/" + tmp;
927-
setHistoricalScenarioReader(scenarioFile);
926+
std::string scenarioFile = (inputPath / tmp).generic_string();
927+
setHistoricalScenarioReader(scenarioFile);
928928

929929
tmp = params_->get("historicalSimulationVar", "simulationConfigFile", false);
930930
QL_REQUIRE(tmp != "", "simulationConfigFile not provided");
931-
string simulationConfigFile = inputPath + "/" + tmp;
931+
string simulationConfigFile = (inputPath / tmp).generic_string();
932932
setHistVarSimMarketParamsFromFile(simulationConfigFile);
933933

934934
tmp = params_->get("historicalSimulationVar", "historicalPeriod", false);
@@ -984,7 +984,7 @@ void OREAppInputParameters::loadParameters() {
984984

985985
tmp = params_->get("simm", "simmCalibration", false);
986986
if (tmp != "") {
987-
string file = inputPath + "/" + tmp;
987+
string file = (inputPath / tmp).generic_string();
988988
if (boost::filesystem::exists(file))
989989
setSimmCalibrationDataFromFile(file);
990990
}
@@ -1044,7 +1044,7 @@ void OREAppInputParameters::loadParameters() {
10441044

10451045
tmp = params_->get("simulation", "xvaCgSensitivityConfigFile", false);
10461046
if (tmp != "") {
1047-
string file = inputPath + "/" + tmp;
1047+
string file = (inputPath / tmp).generic_string();
10481048
LOG("Load xva cg sensitivity scenario data from file" << file);
10491049
setXvaCgSensiScenarioDataFromFile(file);
10501050
}
@@ -1141,7 +1141,7 @@ void OREAppInputParameters::loadParameters() {
11411141
setLoadCube(true);
11421142
tmp = params_->get("xva", "cubeFile", false);
11431143
if (tmp != "") {
1144-
string cubeFile = resultsPath().string() + "/" + tmp;
1144+
string cubeFile = (resultsPath() / tmp).generic_string();
11451145
LOG("Load cube from file " << cubeFile);
11461146
setCubeFromFile(cubeFile);
11471147
LOG("Cube loading done: ids=" << cube()->numIds() << " dates=" << cube()->numDates()
@@ -1154,21 +1154,21 @@ void OREAppInputParameters::loadParameters() {
11541154
if (analytics().find("XVA") != analytics().end()) {
11551155
tmp = params_->get("xva", "csaFile", false);
11561156
QL_REQUIRE(tmp != "", "Netting set manager is required for XVA");
1157-
string csaFile = inputPath + "/" + tmp;
1157+
string csaFile = (inputPath / tmp).generic_string();
11581158
LOG("Loading netting and csa data from file " << csaFile);
11591159
setNettingSetManagerFromFile(csaFile);
11601160

11611161
tmp = params_->get("xva", "collateralBalancesFile", false);
11621162
if (tmp != "") {
1163-
string collBalancesFile = inputPath + "/" + tmp;
1163+
string collBalancesFile = (inputPath / tmp).generic_string();
11641164
LOG("Loading collateral balances from file " << collBalancesFile);
11651165
setCollateralBalancesFromFile(collBalancesFile);
11661166
}
11671167
}
11681168

11691169
tmp = params_->get("xva", "nettingSetCubeFile", false);
11701170
if (loadCube() && tmp != "") {
1171-
string cubeFile = resultsPath().string() + "/" + tmp;
1171+
string cubeFile = (resultsPath() / tmp).generic_string();
11721172
LOG("Load nettingset cube from file " << cubeFile);
11731173
setNettingSetCubeFromFile(cubeFile);
11741174
DLOG("NettingSetCube loading done: ids="
@@ -1435,7 +1435,7 @@ void OREAppInputParameters::loadParameters() {
14351435

14361436
tmp = params_->get("zeroToParSensiConversion", "sensitivityInputFile", false);
14371437
if (tmp != "") {
1438-
setParConversionInputFile(inputPath + "/" + tmp);
1438+
setParConversionInputFile((inputPath / tmp).generic_string());
14391439
}
14401440

14411441
tmp = params_->get("zeroToParSensiConversion", "idColumn", false);

0 commit comments

Comments
 (0)