Merge remote-tracking branch 'origin/master' into roland_interface

Author: rolandlichters

OREAnalytics/orea/app/oreapp.cpp

@@ -120,7 +120,35 @@ boost::shared_ptr<NPVCube> OREApp::getCube(std::string cubeName) {
                 return b.second;
         }
     }
-    QL_FAIL("report " << cubeName << " not found in results");
+    QL_FAIL("npv cube " << cubeName << " not found in results");
+}
+
+std::set<std::string> OREApp::getMarketCubeNames() {
+    QL_REQUIRE(analyticsManager_, "analyticsManager_ not set yet, call analytics first");
+    std::set<std::string> names;
+    for (const auto& c : analyticsManager_->mktCubes()) {
+        for (auto b : c.second) {
+            string cubeName = b.first;
+            if (names.find(cubeName) == names.end())
+                names.insert(cubeName);
+            else {
+                ALOG("market cube name " << cubeName
+                     << " occurs more than once, will retrieve the first cube with that name only");
+            }
+        }
+    }
+    return names;
+}
+    
+boost::shared_ptr<AggregationScenarioData> OREApp::getMarketCube(std::string cubeName) {
+    QL_REQUIRE(analyticsManager_, "analyticsManager_ not set yet, call analytics first");
+    for (const auto& c : analyticsManager_->mktCubes()) {
+        for (auto b : c.second) {
+            if (cubeName == b.first)
+                return b.second;
+        }
+    }
+    QL_FAIL("market cube " << cubeName << " not found in results");
 }
 
 std::vector<std::string> OREApp::getErrors() {

OREAnalytics/orea/app/oreapp.hpp

@@ -68,6 +68,9 @@ class OREApp {
     std::set<std::string> getCubeNames();
     boost::shared_ptr<NPVCube> getCube(std::string cubeName);
 
+    std::set<std::string> getMarketCubeNames();
+    boost::shared_ptr<AggregationScenarioData> getMarketCube(std::string cubeName);
+
     std::vector<std::string> getErrors();
 
     //! time for executing run(...) in seconds