git subrepo pull (merge) ore

subrepo:
  subdir:   "ore"
  merged:   "9d9d8d0c09"
upstream:
  origin:   "git@gitlab.acadiasoft.net:qs/ore.git"
  branch:   "master"
  commit:   "7c031c49b0"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "73a0129"

Author: jenkins

OREAnalytics/orea/aggregation/dimflatcalculator.cpp

@@ -49,7 +49,6 @@ const vector<Real>& FlatDynamicInitialMarginCalculator::dimResults(const std::st
 void FlatDynamicInitialMarginCalculator::build() {
     LOG("FlatDynamicInitialMarginCalculator:build() called");
 
-    Size stopDatesLoop = datesLoopSize_;
     Size samples = cube_->samples();
 
     if (!inputs_->collateralBalances()) {
@@ -65,7 +64,7 @@ void FlatDynamicInitialMarginCalculator::build() {
             LOG("Found initial margin balance " << currentIM << " for netting set " << n);
         }
 
-        for (Size j = 0; j < stopDatesLoop; ++j) {
+        for (Size j = 0; j < cube_->dates().size(); ++j) {
             nettingSetExpectedDIM_[n][j] = currentIM;
             for (Size k = 0; k < samples; ++k)
                 nettingSetDIM_[n][j][k] = currentIM;                

OREData/ored/portfolio/compositetrade.cpp

@@ -38,6 +38,7 @@ void CompositeTrade::build(const QuantLib::ext::shared_ptr<EngineFactory>& engin
     fxRates_.clear();
     fxRatesNotional_.clear();
     legs_.clear();
+    QL_REQUIRE(trades_.size() > 0, "Failed to build composite trade.");
     for (const QuantLib::ext::shared_ptr<Trade>& trade : trades_) {
 
 	trade->reset();