Skip to content

Commit 2176c1c

Browse files
committed
Merge branch 'feature/QPR-13337' into 'master'
QPR-13337 Authorize optional Covariance input for parametricVar in oreapp Closes QPR-13337 See merge request qs/oreplus!3097
2 parents 60ad207 + 21b2d62 commit 2176c1c

1 file changed

Lines changed: 41 additions & 4 deletions

File tree

OREAnalytics/orea/app/oreapp.cpp

Lines changed: 41 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1307,11 +1307,48 @@ void OREAppInputParameters::loadParameters() {
13071307
if (tmp != "")
13081308
setMcVarSeed(parseInteger(tmp));
13091309

1310+
tmp = params_->get("parametricVar", "mporDays", false);
1311+
if (tmp != "")
1312+
setMporDays(static_cast<Size>(parseInteger(tmp)));
1313+
1314+
tmp = params_->get("parametricVar", "mporCalendar", false);
1315+
if (tmp != "")
1316+
setMporCalendar(tmp);
1317+
1318+
tmp = params_->get("parametricVar", "mporOverlappingPeriods", false);
1319+
if (tmp != "")
1320+
setMporOverlappingPeriods(parseBool(tmp));
1321+
13101322
tmp = params_->get("parametricVar", "covarianceInputFile", false);
1311-
QL_REQUIRE(tmp != "", "covarianceInputFile not provided");
1312-
std::string covFile = (inputPath_ / tmp).generic_string();
1313-
LOG("Load Covariance Data from file " << covFile);
1314-
setCovarianceDataFromFile(covFile);
1323+
if (tmp != ""){
1324+
std::string covFile = (inputPath_ / tmp).generic_string();
1325+
LOG("Load Covariance Data from file " << covFile);
1326+
setCovarianceDataFromFile(covFile);
1327+
}
1328+
1329+
tmp = params_->get("parametricVar", "historicalPeriod", false);
1330+
if (tmp != "")
1331+
setBenchmarkVarPeriod(tmp);
1332+
1333+
tmp = params_->get("parametricVar", "sensitivityConfigFile", false);
1334+
if (tmp != "") {
1335+
string file = (inputPath_ / tmp).generic_string();
1336+
LOG("Load sensitivity scenario data from file" << file);
1337+
setSensiScenarioDataFromFile(file);
1338+
}
1339+
1340+
tmp = params_->get("parametricVar", "simulationConfigFile", false);
1341+
if (tmp != "") {
1342+
string file = (inputPath_ / tmp).generic_string();
1343+
LOG("Loading sensitivity scenario sim market parameters from file" << file);
1344+
setSensiSimMarketParamsFromFile(file);
1345+
}
1346+
1347+
tmp = params_->get("parametricVar", "scenarioFile", false);
1348+
if (tmp != "") {
1349+
std::string scenarioFile = (inputPath_ / tmp).generic_string();
1350+
setScenarioReader(scenarioFile);
1351+
}
13151352

13161353
tmp = params_->get("parametricVar", "sensitivityInputFile", false);
13171354
QL_REQUIRE(tmp != "", "sensitivityInputFile not provided");

0 commit comments

Comments
 (0)