QPR-12329 simplify the code

Author: pcaspers

OREData/ored/model/crossassetmodelbuilder.cpp

@@ -92,7 +92,11 @@ CrossAssetModelBuilder::CrossAssetModelBuilder(
       optimizationMethod_(boost::shared_ptr<OptimizationMethod>(new LevenbergMarquardt(1E-8, 1E-8, 1E-8))),
       endCriteria_(EndCriteria(1000, 500, 1E-8, 1E-8, 1E-8)) {
     buildModel();
-    registerWithSubBuilders();
+    // register with sub builders
+    for (auto okv : subBuilders_)
+        for (auto ikv : okv.second) {
+            registerWith(ikv.second);
+        }
     // register market observer with correlations
     marketObserver_ = boost::make_shared<MarketObserver>();
     for (auto const& c : config->correlations())
@@ -127,18 +131,6 @@ const std::vector<Real>& CrossAssetModelBuilder::comOptionCalibrationErrors() {
     return comOptionCalibrationErrors_;
 }
 
-void CrossAssetModelBuilder::unregisterWithSubBuilders() {
-    for (auto okv : subBuilders_)
-        for (auto ikv : okv.second)
-            unregisterWith(ikv.second);
-}
-
-void CrossAssetModelBuilder::registerWithSubBuilders() {
-    for (auto okv : subBuilders_)
-        for (auto ikv : okv.second)
-            registerWith(ikv.second);
-}
-
 bool CrossAssetModelBuilder::requiresRecalibration() const {
     for (auto okv : subBuilders_)
         for (auto ikv : okv.second)

OREData/ored/model/crossassetmodelbuilder.hpp

@@ -110,8 +110,6 @@ class CrossAssetModelBuilder : public QuantExt::ModelBuilder {
 private:
     void performCalculations() const override;
     void buildModel() const;
-    void registerWithSubBuilders();
-    void unregisterWithSubBuilders();
 
     mutable std::vector<std::vector<boost::shared_ptr<BlackCalibrationHelper>>> swaptionBaskets_;
     mutable std::vector<std::vector<boost::shared_ptr<BlackCalibrationHelper>>> fxOptionBaskets_;