QPR-11568 reorganize, init builders in test fixture

Author: pcaspers

App/ore.cpp

@@ -27,7 +27,7 @@
 #include <iostream>
 
 #include <orea/app/oreapp.hpp>
-#include <orea/app/initbuilders.hpp>
+#include <ored/utilities/initbuilders.hpp>
 
 #ifdef BOOST_MSVC
 #include <orea/auto_link.hpp>
@@ -67,7 +67,7 @@ int main(int argc, char** argv) {
         return -1;
     }
 
-    ore::analytics::initBuilders();
+    ore::data::initBuilders();
 
     string inputFile(argv[1]);
 

OREAnalytics/orea/CMakeLists.txt

@@ -14,7 +14,6 @@ aggregation/staticcreditxvacalculator.cpp
 aggregation/xvacalculator.cpp
 app/analytic.cpp
 app/analyticsmanager.cpp
-app/initbuilders.cpp
 app/inputparameters.cpp
 app/marketcalibrationreport.cpp
 app/marketdatacsvloader.cpp
@@ -93,7 +92,6 @@ aggregation/staticcreditxvacalculator.hpp
 aggregation/xvacalculator.hpp
 app/analytic.hpp
 app/analyticsmanager.hpp
-app/initbuilders.hpp
 app/inputparameters.hpp
 app/marketcalibrationreport.hpp
 app/marketdatacsvloader.hpp

OREAnalytics/orea/app/initbuilders.cpp

@@ -19,7 +19,6 @@
 #include <orea/aggregation/xvacalculator.hpp>
 #include <orea/app/analytic.hpp>
 #include <orea/app/analyticsmanager.hpp>
-#include <orea/app/initbuilders.hpp>
 #include <orea/app/inputparameters.hpp>
 #include <orea/app/marketcalibrationreport.hpp>
 #include <orea/app/marketdatacsvloader.hpp>

OREAnalytics/orea/app/initbuilders.hpp

@@ -264,6 +264,7 @@ utilities/flowanalysis.cpp
 utilities/indexnametranslator.cpp
 utilities/indexparser.cpp
 utilities/inflationstartdate.cpp
+utilities/initbuilders.cpp
 utilities/log.cpp
 utilities/marketdata.cpp
 utilities/osutils.cpp
@@ -566,6 +567,7 @@ utilities/flowanalysis.hpp
 utilities/indexnametranslator.hpp
 utilities/indexparser.hpp
 utilities/inflationstartdate.hpp
+utilities/initbuilders.hpp
 utilities/log.hpp
 utilities/marketdata.hpp
 utilities/osutils.hpp

OREAnalytics/orea/orea.hpp

@@ -294,6 +294,7 @@
 #include <ored/utilities/indexnametranslator.hpp>
 #include <ored/utilities/indexparser.hpp>
 #include <ored/utilities/inflationstartdate.hpp>
+#include <ored/utilities/initbuilders.hpp>
 #include <ored/utilities/log.hpp>
 #include <ored/utilities/marketdata.hpp>
 #include <ored/utilities/osutils.hpp>

OREData/ored/CMakeLists.txt

@@ -0,0 +1,64 @@
+/*
+ Copyright (C) 2023 Quaternion Risk Management Ltd
+ All rights reserved.
+
+ This file is part of ORE, a free-software/open-source library
+ for transparent pricing and risk analysis - http://opensourcerisk.org
+
+ ORE is free software: you can redistribute it and/or modify it
+ under the terms of the Modified BSD License.  You should have received a
+ copy of the license along with this program.
+ The license is also available online at <http://opensourcerisk.org>
+
+ This program is distributed on the basis that it will form a useful
+ contribution to risk analytics and model standardisation, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the license for more details.
+*/
+
+/*! \file orea/app/initbuilders.hpp
+    \brief add builders to factories
+*/
+
+#pragma once
+
+#define ORE_REGISTER_LEG_DATA(NAME, CLASS, OVERWRITE)                                                                  \
+    ore::data::LegDataFactory::instance().addBuilder(NAME, &ore::data::createLegData<CLASS>, OVERWRITE);
+
+#define ORE_REGISTER_CALIBRATION_INSTRUMENT(NAME, CLASS, OVERWRITE)                                                    \
+    ore::data::CalibrationInstrumentFactory::instance().addBuilder(                                                    \
+        NAME, &ore::data::createCalibrationInstrument<CLASS>, OVERWRITE);
+
+#define ORE_REGISTER_REFERENCE_DATUM(NAME, CLASS, OVERWRITE)                                                           \
+    ore::data::ReferenceDatumFactory::instance().addBuilder(                                                           \
+        NAME, &ore::data::createReferenceDatumBuilder<ore::data::ReferenceDatumBuilder<CLASS>>, OVERWRITE);
+
+#define ORE_REGISTER_BOND_BUILDER(NAME, CLASS, OVERWRITE)                                                              \
+    ore::data::BondFactory::instance().addBuilder(NAME, boost::make_shared<CLASS>(), OVERWRITE);
+
+#define ORE_REGISTER_TRADE_BUILDER(NAME, CLASS, OVERWRITE)                                                             \
+    ore::data::TradeFactory::instance().addBuilder(NAME, boost::make_shared<ore::data::TradeBuilder<CLASS>>(),         \
+                                                   OVERWRITE);
+
+#define ORE_REGISTER_LEGBUILDER(NAME, CLASS, OVERWRITE)                                                                \
+    ore::data::EngineBuilderFactory::instance().addLegBuilder([]() { return boost::make_shared<CLASS>(); }, OVERWRITE);
+
+#define ORE_REGISTER_AMC_ENGINE_BUILDER(CLASS, OVERWRITE)                                                              \
+    ore::data::EngineBuilderFactory::instance().addAmcEngineBuilder(                                                   \
+        [](const boost::shared_ptr<QuantExt::CrossAssetModel>& cam, const std::vector<ore::data::Date>& grid) {        \
+            return boost::make_shared<CLASS>(cam, grid);                                                               \
+        },                                                                                                             \
+        OVERWRITE);
+
+#define ORE_REGISTER_ENGINE_BUILDER(CLASS, OVERWRITE)                                                                  \
+    ore::data::EngineBuilderFactory::instance().addEngineBuilder([]() { return boost::make_shared<CLASS>(); },         \
+                                                                 OVERWRITE);
+
+#define ORE_REGISTER_TRS_UNDERLYING_BUILDER(NAME, CLASS, OVERWRITE)                                                    \
+    oreplus::data::TrsUnderlyingBuilderFactory::instance().addBuilder(NAME, boost::make_shared<CLASS>(), OVERWRITE);
+
+namespace ore::data {
+
+void initBuilders();
+
+} // namespace ore::data

OREData/ored/ored.hpp

@@ -32,6 +32,7 @@
 #include <ored/utilities/indexnametranslator.hpp>
 #include <ored/utilities/calendarparser.hpp>
 #include <ored/utilities/currencyparser.hpp>
+#include <ored/utilities/initbuilders.hpp>
 
 using QuantExt::SavedObservableSettings;
 using QuantLib::IndexManager;
@@ -50,7 +51,7 @@ class TopLevelFixture {
     /*! Constructor
         Add things here that you want to happen at the start of every test case
     */
-    TopLevelFixture() {}
+    TopLevelFixture() { ore::data::initBuilders(); }
 
     /*! Destructor
         Add things here that you want to happen after _every_ test case