Merge branch 'fix_ore_simmcalc' into 'master'

QPR-12356 update bucketmapper from crif before running simmcalc

See merge request qs/ore-github!36

Author: mgroncki

OREAnalytics/orea/app/analytics/simmanalytic.cpp

@@ -67,9 +67,12 @@ void SimmAnalyticImpl::runAnalytic(const boost::shared_ptr<ore::data::InMemoryLo
     if (inputs_->simmCalibrationData())
         inputs_->simmCalibrationData()->toFile((inputs_->resultsPath() / "simmcalibration.xml").string());
 
+    auto simmConfig = inputs_->getSimmConfiguration();
+    simmConfig->bucketMapper()->updateFromCrif(simmAnalytic->crif());
+
     // Calculate SIMM
     auto simm = boost::make_shared<SimmCalculator>(simmAnalytic->crif(),
-                                                   inputs_->getSimmConfiguration(),
+                                                   simmConfig,
                                                    inputs_->simmCalculationCurrency(),
                                                    inputs_->simmResultCurrency(),
                                                    analytic()->market(),

OREAnalytics/orea/app/inputparameters.cpp

@@ -461,20 +461,19 @@ void InputParameters::setCreditSimulationParametersFromBuffer(const std::string&
 } 
 
 void InputParameters::setCrifFromFile(const std::string& fileName, char eol, char delim, char quoteChar, char escapeChar) {
-    boost::shared_ptr<SimmConfiguration> configuration =
-        buildSimmConfiguration(simmVersion_, boost::make_shared<SimmBucketMapperBase>(),simmCalibrationData(), mporDays());
     bool updateMappings = true;
     bool aggregateTrades = false;
-    auto crifLoader = CsvFileCrifLoader(fileName, configuration, CrifRecord::additionalHeaders, updateMappings, aggregateTrades, eol, delim, quoteChar, escapeChar, reportNaString());
+    auto crifLoader = CsvFileCrifLoader(fileName, getSimmConfiguration(), CrifRecord::additionalHeaders, updateMappings,
+                                        aggregateTrades, eol, delim, quoteChar, escapeChar, reportNaString());
     crif_ = crifLoader.loadCrif();
 }
 
 void InputParameters::setCrifFromBuffer(const std::string& csvBuffer, char eol, char delim, char quoteChar, char escapeChar) {
-    boost::shared_ptr<SimmConfiguration> configuration =
-        buildSimmConfiguration(simmVersion_, boost::make_shared<SimmBucketMapperBase>(), simmCalibrationData(), mporDays());
     bool updateMappings = true;
     bool aggregateTrades = false;
-    auto crifLoader = CsvBufferCrifLoader(csvBuffer, configuration, CrifRecord::additionalHeaders, updateMappings, aggregateTrades, eol, delim, quoteChar, escapeChar, reportNaString());
+    auto crifLoader =
+        CsvBufferCrifLoader(csvBuffer, getSimmConfiguration(), CrifRecord::additionalHeaders, updateMappings,
+                            aggregateTrades, eol, delim, quoteChar, escapeChar, reportNaString());
     crif_ = crifLoader.loadCrif();
 }