Skip to content

Commit dd68288

Browse files
pcaspersjenkins
pcaspers
authored and
jenkins
committed
QPR-11568 remove auto-register for leg data
1 parent d6b4dda commit dd68288

6 files changed

Lines changed: 0 additions & 60 deletions

File tree

‎OREData/ored/portfolio/commoditylegdata.cpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include <boost/make_shared.hpp>
3131

3232
using boost::iequals;
33-
using ore::data::LegDataRegister;
3433
using ore::data::parseBool;
3534
using ore::data::parseCommodityQuantityFrequency;
3635
using ore::data::parseInteger;
@@ -50,8 +49,6 @@ using std::vector;
5049
namespace ore {
5150
namespace data {
5251

53-
LegDataRegister<CommodityFixedLegData> CommodityFixedLegData::reg_("CommodityFixed");
54-
5552
CommodityPayRelativeTo parseCommodityPayRelativeTo(const string& s) {
5653
if (iequals(s, "CalculationPeriodEndDate")) {
5754
return CommodityPayRelativeTo::CalculationPeriodEndDate;
@@ -171,8 +168,6 @@ XMLNode* CommodityFixedLegData::toXML(XMLDocument& doc) {
171168
return node;
172169
}
173170

174-
LegDataRegister<CommodityFloatingLegData> CommodityFloatingLegData::reg_("CommodityFloating");
175-
176171
CommodityFloatingLegData::CommodityFloatingLegData()
177172
: ore::data::LegAdditionalData("CommodityFloating"),
178173
priceType_(CommodityPriceType::FutureSettlement),

‎OREData/ored/portfolio/commoditylegdata.hpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ class CommodityFixedLegData : public ore::data::LegAdditionalData {
9191
std::vector<std::string> priceDates_;
9292
CommodityPayRelativeTo commodityPayRelativeTo_;
9393
std::string tag_;
94-
95-
static ore::data::LegDataRegister<CommodityFixedLegData> reg_;
9694
};
9795

9896
class CommodityFloatingLegData : public ore::data::LegAdditionalData {
@@ -184,8 +182,6 @@ class CommodityFloatingLegData : public ore::data::LegAdditionalData {
184182
bool unrealisedQuantity_;
185183
QuantLib::Natural lastNDays_;
186184
std::string fxIndex_;
187-
188-
static ore::data::LegDataRegister<CommodityFloatingLegData> reg_;
189185
};
190186

191187
} // namespace data

‎OREData/ored/portfolio/durationadjustedcmslegdata.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ XMLNode* DurationAdjustedCmsLegData::toXML(XMLDocument& doc) {
3939
return node;
4040
}
4141

42-
LegDataRegister<DurationAdjustedCmsLegData> DurationAdjustedCmsLegData::reg_("DurationAdjustedCMS");
43-
4442
void DurationAdjustedCmsLegData::fromXML(XMLNode* node) {
4543
XMLUtils::checkNode(node, legNodeName());
4644
swapIndex_ = XMLUtils::getChildValue(node, "Index", true);

‎OREData/ored/portfolio/durationadjustedcmslegdata.hpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,6 @@ class DurationAdjustedCmsLegData : public ore::data::LegAdditionalData {
9999
std::vector<double> gearings_;
100100
std::vector<std::string> gearingDates_;
101101
bool nakedOption_;
102-
103-
static LegDataRegister<DurationAdjustedCmsLegData> reg_;
104102
};
105103

106104
} // namespace data

‎OREData/ored/portfolio/legdata.cpp‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,6 @@ namespace data {
8484

8585
bool lessThan(const string& s1, const string& s2) { return s1 < s2; }
8686

87-
LegDataRegister<CashflowData> CashflowData::reg_("Cashflow");
88-
8987
void CashflowData::fromXML(XMLNode* node) {
9088
// allow for empty Cashflow legs without any payments
9189
if(node == nullptr)
@@ -105,8 +103,6 @@ XMLNode* CashflowData::toXML(XMLDocument& doc) {
105103
return node;
106104
}
107105

108-
LegDataRegister<FixedLegData> FixedLegData::reg_("Fixed");
109-
110106
void FixedLegData::fromXML(XMLNode* node) {
111107
XMLUtils::checkNode(node, legNodeName());
112108
rates_ = XMLUtils::getChildrenValuesWithAttributes<Real>(node, "Rates", "Rate", "startDate", rateDates_, parseReal,
@@ -119,8 +115,6 @@ XMLNode* FixedLegData::toXML(XMLDocument& doc) {
119115
return node;
120116
}
121117

122-
LegDataRegister<ZeroCouponFixedLegData> ZeroCouponFixedLegData::reg_("ZeroCouponFixed");
123-
124118
void ZeroCouponFixedLegData::fromXML(XMLNode* node) {
125119
XMLUtils::checkNode(node, legNodeName());
126120
rates_ = XMLUtils::getChildrenValuesWithAttributes<Real>(node, "Rates", "Rate", "startDate", rateDates_, &parseReal,
@@ -147,8 +141,6 @@ XMLNode* ZeroCouponFixedLegData::toXML(XMLDocument& doc) {
147141
return node;
148142
}
149143

150-
LegDataRegister<FloatingLegData> FloatingLegData::reg_("Floating");
151-
152144
void FloatingLegData::fromXML(XMLNode* node) {
153145
XMLUtils::checkNode(node, legNodeName());
154146
index_ = internalIndexName(XMLUtils::getChildValue(node, "Index", true));
@@ -227,8 +219,6 @@ XMLNode* FloatingLegData::toXML(XMLDocument& doc) {
227219
return node;
228220
}
229221

230-
LegDataRegister<CPILegData> CPILegData::reg_("CPI");
231-
232222
void CPILegData::fromXML(XMLNode* node) {
233223
XMLUtils::checkNode(node, legNodeName());
234224
index_ = XMLUtils::getChildValue(node, "Index", true);
@@ -309,8 +299,6 @@ XMLNode* CPILegData::toXML(XMLDocument& doc) {
309299
return node;
310300
}
311301

312-
LegDataRegister<YoYLegData> YoYLegData::reg_("YY");
313-
314302
void YoYLegData::fromXML(XMLNode* node) {
315303
XMLUtils::checkNode(node, legNodeName());
316304
index_ = XMLUtils::getChildValue(node, "Index", true);
@@ -371,8 +359,6 @@ XMLNode* CMSLegData::toXML(XMLDocument& doc) {
371359
return node;
372360
}
373361

374-
LegDataRegister<CMSLegData> CMSLegData::reg_("CMS");
375-
376362
void CMSLegData::fromXML(XMLNode* node) {
377363
XMLUtils::checkNode(node, legNodeName());
378364
swapIndex_ = XMLUtils::getChildValue(node, "Index", true);
@@ -415,8 +401,6 @@ XMLNode* CMBLegData::toXML(XMLDocument& doc) {
415401
return node;
416402
}
417403

418-
LegDataRegister<CMBLegData> CMBLegData::reg_("CMB");
419-
420404
void CMBLegData::fromXML(XMLNode* node) {
421405
XMLUtils::checkNode(node, legNodeName());
422406
genericBond_ = XMLUtils::getChildValue(node, "Index", true);
@@ -467,8 +451,6 @@ XMLNode* DigitalCMSLegData::toXML(XMLDocument& doc) {
467451
return node;
468452
}
469453

470-
LegDataRegister<DigitalCMSLegData> DigitalCMSLegData::reg_("DigitalCMS");
471-
472454
void DigitalCMSLegData::fromXML(XMLNode* node) {
473455
XMLUtils::checkNode(node, legNodeName());
474456

@@ -514,8 +496,6 @@ XMLNode* CMSSpreadLegData::toXML(XMLDocument& doc) {
514496
return node;
515497
}
516498

517-
LegDataRegister<CMSSpreadLegData> CMSSpreadLegData::reg_("CMSSpread");
518-
519499
void CMSSpreadLegData::fromXML(XMLNode* node) {
520500
XMLUtils::checkNode(node, legNodeName());
521501
swapIndex1_ = XMLUtils::getChildValue(node, "Index1", true);
@@ -566,8 +546,6 @@ XMLNode* DigitalCMSSpreadLegData::toXML(XMLDocument& doc) {
566546
return node;
567547
}
568548

569-
LegDataRegister<DigitalCMSSpreadLegData> DigitalCMSSpreadLegData::reg_("DigitalCMSSpread");
570-
571549
void DigitalCMSSpreadLegData::fromXML(XMLNode* node) {
572550
XMLUtils::checkNode(node, legNodeName());
573551

@@ -597,8 +575,6 @@ void DigitalCMSSpreadLegData::fromXML(XMLNode* node) {
597575
}
598576
}
599577

600-
LegDataRegister<EquityLegData> EquityLegData::reg_("Equity");
601-
602578
void EquityLegData::fromXML(XMLNode* node) {
603579
XMLUtils::checkNode(node, legNodeName());
604580
returnType_ = parseEquityReturnType(XMLUtils::getChildValue(node, "ReturnType"));

‎OREData/ored/portfolio/legdata.hpp‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,6 @@ class CashflowData : public LegAdditionalData {
105105
private:
106106
vector<double> amounts_;
107107
vector<string> dates_;
108-
109-
static LegDataRegister<CashflowData> reg_;
110108
};
111109

112110
//! Serializable Fixed Leg Data
@@ -135,8 +133,6 @@ class FixedLegData : public LegAdditionalData {
135133
private:
136134
vector<double> rates_;
137135
vector<string> rateDates_;
138-
139-
static LegDataRegister<FixedLegData> reg_;
140136
};
141137

142138
//! Serializable Fixed Leg Data
@@ -171,8 +167,6 @@ class ZeroCouponFixedLegData : public LegAdditionalData {
171167
vector<string> rateDates_;
172168
string compounding_;
173169
bool subtractNotional_;
174-
175-
static LegDataRegister<ZeroCouponFixedLegData> reg_;
176170
};
177171

178172
//! Serializable Floating Leg Data
@@ -269,7 +263,6 @@ class FloatingLegData : public LegAdditionalData {
269263
boost::optional<Period> lastRecentPeriod_;
270264
std::string lastRecentPeriodCalendar_;
271265
bool telescopicValueDates_;
272-
static LegDataRegister<FloatingLegData> reg_;
273266
};
274267

275268
//! Serializable CPI Leg Data
@@ -339,8 +332,6 @@ class CPILegData : public LegAdditionalData {
339332
double finalFlowFloor_;
340333
bool nakedOption_;
341334
bool subtractInflationNominalCoupons_;
342-
343-
static LegDataRegister<CPILegData> reg_;
344335
};
345336

346337
//! Serializable YoY Leg Data
@@ -406,8 +397,6 @@ class YoYLegData : public LegAdditionalData {
406397
bool nakedOption_;
407398
bool addInflationNotional_;
408399
bool irregularYoY_;
409-
410-
static LegDataRegister<YoYLegData> reg_;
411400
};
412401

413402
//! Serializable CMS Leg Data
@@ -473,8 +462,6 @@ class CMSLegData : public LegAdditionalData {
473462
vector<double> gearings_;
474463
vector<string> gearingDates_;
475464
bool nakedOption_;
476-
477-
static LegDataRegister<CMSLegData> reg_;
478465
};
479466

480467
//! Serializable Digital CMS Leg Data
@@ -544,8 +531,6 @@ class DigitalCMSLegData : public LegAdditionalData {
544531
vector<string> putStrikeDates_;
545532
vector<double> putPayoffs_;
546533
vector<string> putPayoffDates_;
547-
548-
static LegDataRegister<DigitalCMSLegData> reg_;
549534
};
550535

551536
//! Serializable CMS Spread Leg Data
@@ -618,8 +603,6 @@ class CMSSpreadLegData : public LegAdditionalData {
618603
vector<double> gearings_;
619604
vector<string> gearingDates_;
620605
bool nakedOption_;
621-
622-
static LegDataRegister<CMSSpreadLegData> reg_;
623606
};
624607

625608
//! Serializable Digital CMS Spread Leg Data
@@ -687,8 +670,6 @@ class DigitalCMSSpreadLegData : public LegAdditionalData {
687670
vector<string> putStrikeDates_;
688671
vector<double> putPayoffs_;
689672
vector<string> putPayoffDates_;
690-
691-
static LegDataRegister<DigitalCMSSpreadLegData> reg_;
692673
};
693674

694675
//! Serializable Constant Maturity Bond Yield Leg Data
@@ -756,8 +737,6 @@ class CMBLegData : public LegAdditionalData {
756737
vector<double> gearings_;
757738
vector<string> gearingDates_;
758739
bool nakedOption_;
759-
760-
static LegDataRegister<CMBLegData> reg_;
761740
};
762741

763742
//! Serializable Fixed Leg Data
@@ -812,8 +791,6 @@ class EquityLegData : public LegAdditionalData {
812791
string fxIndex_ = "";
813792
Real quantity_;
814793
string initialPriceCurrency_;
815-
816-
static LegDataRegister<EquityLegData> reg_;
817794
};
818795

819796
//! Serializable object holding amortization rules

0 commit comments

Comments
 (0)