git subrepo pull (merge) ore

subrepo:
  subdir:   "ore"
  merged:   "49ad70d4c8"
upstream:
  origin:   "git@gitlab.acadiasoft.net:qs/ore.git"
  branch:   "master"
  commit:   "186cc746c6"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "73a0129"

Author: jenkins

Docker/.env

@@ -3,7 +3,7 @@ DEBIAN_TAG=11.7
 # it's recommended to include CMAKE_BUILD_TYPE and BOOST_VARIANT in QL_TAG, ORE_TAG, BOOST_TAG
 # to distinguish a release build from a debug build
 
-QL_TAG=1.31.1_ddda9430
+QL_TAG=1.31.1_f8955cf0
 ORE_TAG=latest
 
 # debug or release

Docs/UserGuide/tradedata/cpiswap.tex

@@ -1,13 +1,15 @@
 \subsubsection{CPI Swap}
 
-A CPI swap can be set up as a swap with trade type \emph{Swap}, with one leg of type {\tt CPI}. Listing \ref{lst:cpiswap}
-shows an example. The CPI leg contains an additional {\tt CPILegData} block. See \ref{ss:cpilegdata} for details on the
-CPI leg specification.
+A CPI inflation swap can be set up using the \emph{InflationSwap} trade type, with one leg of type {\tt CPI}. and the other leg(s) can be of any leg type. Listing \ref{lst:cpiinflationswap} shows an example. The CPI leg contains an additional {\tt CPILegData} block. See \ref{ss:cpilegdata} for details on the
+CPI leg specification. 
+
+Note that Cross Currency Inflation Swaps are supported, as the currencies on the legs of an  \emph{InflationSwap} do not need to be the same. 
+
 
 \begin{listing}[H]
 %\hrule\medskip
 \begin{minted}[fontsize=\footnotesize]{xml}
-    <SwapData>
+    <InflationSwapData>
       <LegData>
         <LegType>Floating</LegType>
         <Payer>true</Payer>
@@ -21,18 +23,19 @@ \subsubsection{CPI Swap}
         ...
         </CPILegData>
       </LegData>
-    </SwapData>
+    </InflationSwapData>
 \end{minted}
-\caption{CPI Swap Data (using \emph{Swap} trade type)}
-\label{lst:cpiswap}
+\caption{CPI Swap Data (using \emph{InflationSwap} trade type)}
+\label{lst:cpiinflationswap}
 \end{listing}
 
-Alternatively, a CPI swap can be set up using the \emph{InflationSwap} trade type, see Listing \ref{lst:cpiinflationswap}. The structure of the {\tt InflationSwapData} container is the same as for {\tt SwapData} above.
+
+Alternatively, a CPI swap can be set up as a swap with trade type \emph{Swap}, with one leg of type {\tt CPI}, see listing \ref{lst:cpiswap}.
 
 \begin{listing}[H]
 %\hrule\medskip
 \begin{minted}[fontsize=\footnotesize]{xml}
-    <InflationSwapData>
+    <SwapData>
       <LegData>
         <LegType>Floating</LegType>
         <Payer>true</Payer>
@@ -46,8 +49,9 @@ \subsubsection{CPI Swap}
         ...
         </CPILegData>
       </LegData>
-    </InflationSwapData>
+    </SwapData>
 \end{minted}
-\caption{CPI Swap Data (using \emph{InflationSwap} trade type)}
-\label{lst:cpiinflationswap}
-\end{listing}
+\caption{CPI Swap Data (using \emph{Swap} trade type)}
+\label{lst:cpiswap}
+\end{listing}
+

Examples/Example_60/ExpectedOutput/npv.csv

@@ -1,3 +1,3 @@
 #TradeId,TradeType,Maturity,MaturityTime,NPV,NpvCurrency,NPV(Base),BaseCurrency,Notional,NotionalCurrency,Notional(Base),NettingSet,CounterParty
 Cap_USD_SOFR,Swap,2025-03-21,1.003324,0.000931,USD,0.000931,USD,100000000.00,USD,100000000.00,DUMMY_NS,DUMMY_CP
-Swaption_USD_SOFR,Swaption,2046-01-12,21.817022,250911.447892,USD,250911.447892,USD,100000000.00,USD,100000000.00,DUMMY_NS,DUMMY_CP
+Swaption_USD_SOFR,Swaption,2046-01-12,21.817022,250911.447904,USD,250911.447904,USD,100000000.00,USD,100000000.00,DUMMY_NS,DUMMY_CP

OREData/test/fittedbondcurve.cpp

@@ -24,6 +24,7 @@
 #include <ored/marketdata/fittedbondcurvehelpermarket.hpp>
 #include <ored/portfolio/enginefactory.hpp>
 #include <ored/portfolio/portfolio.hpp>
+#include <ored/portfolio/trade.hpp>
 
 #include <ql/pricingengines/bond/discountingbondengine.hpp>
 #include <ql/termstructures/yield/bondhelpers.hpp>
@@ -38,37 +39,37 @@ BOOST_AUTO_TEST_SUITE(FittedBondCurveTests)
 
 BOOST_AUTO_TEST_CASE(testCurveFromFixedRateBonds) {
 
-#if QL_HEX_VERSION >= 0x01190000 || defined(QL_ORE_PATCH)
+
     // will work in QL 1.19
     Date asof(6, April, 2020);
     Settings::instance().evaluationDate() = asof;
 
     BOOST_TEST_MESSAGE("read pricing engine config");
-    auto engineData = QuantLib::ext::make_shared<EngineData>();
+    QuantLib::ext::shared_ptr<EngineData> engineData = QuantLib::ext::make_shared<EngineData>();
     engineData->fromFile(TEST_INPUT_FILE("pricingengine.xml"));
 
     BOOST_TEST_MESSAGE("read portfolio of bonds");
-    auto portfolio = QuantLib::ext::make_shared<Portfolio>();
-    portfolio->load(TEST_INPUT_FILE("portfolio1.xml"));
+    QuantLib::ext::shared_ptr<Portfolio> portfolio = QuantLib::ext::make_shared<Portfolio>();
+    portfolio->fromFile(TEST_INPUT_FILE("portfolio1.xml"));
 
     BOOST_TEST_MESSAGE("build portfolio against FittedBondCurveHelperMarket");
-    auto engineFactory =
+    QuantLib::ext::shared_ptr < EngineFactory> engineFactory =
         QuantLib::ext::make_shared<EngineFactory>(engineData, QuantLib::ext::make_shared<FittedBondCurveHelperMarket>());
     portfolio->build(engineFactory);
 
     BOOST_TEST_MESSAGE("set up bond helpers");
     std::vector<QuantLib::ext::shared_ptr<Bond>> bonds;
     std::vector<QuantLib::ext::shared_ptr<BondHelper>> helpers;
-    for (auto const& t : portfolio->trades()) {
-        auto bond = QuantLib::ext::dynamic_pointer_cast<Bond>(t->instrument()->qlInstrument());
+    for (auto const& [tradeId, trade] : portfolio->trades()) {
+        QuantLib::ext::shared_ptr<QuantLib::Bond> bond =
+            QuantLib::ext::dynamic_pointer_cast<Bond>(trade->instrument()->qlInstrument());
         BOOST_REQUIRE(bond);
         bonds.push_back(bond);
         helpers.push_back(QuantLib::ext::make_shared<BondHelper>(Handle<Quote>(QuantLib::ext::make_shared<SimpleQuote>(100.0)), bond));
     }
 
     BOOST_TEST_MESSAGE("build fitted bond curve");
-    Array guess(4);
-    guess << 0.03, 0.03, 0.03, 0.5;
+    Array guess({0.03, 0.03, 0.03, 0.5});
     NelsonSiegelFitting method((Array(), QuantLib::ext::shared_ptr<OptimizationMethod>(), Array()));
     auto curve =
         QuantLib::ext::make_shared<FittedBondDiscountCurve>(asof, helpers, Actual365Fixed(), method, 1E-10, 10000, guess);
@@ -82,7 +83,6 @@ BOOST_AUTO_TEST_CASE(testCurveFromFixedRateBonds) {
                                                    << " discount factor is " << curve->discount(b->maturityDate()));
         BOOST_CHECK_CLOSE(b->cleanPrice(), 100.0, 0.01); // 1bp tolerance in absolute price
     }
-#endif
 }
 
 BOOST_AUTO_TEST_SUITE_END()

QuantExt/qle/termstructures/parametricvolatility.cpp

@@ -57,20 +57,21 @@ Real ParametricVolatility::convert(const Real inputQuote, const MarketQuoteType
     Real forwardPremium;
     switch (marketModelType_) {
     case MarketModelType::Black76:
-        if (inputMarketQuoteType_ == MarketQuoteType::Price) {
+        if (inputMarketQuoteType == MarketQuoteType::Price) {
             forwardPremium = inputQuote / (discountCurve_.empty() ? 1.0 : discountCurve_->discount(timeToExpiry));
-        } else if (inputMarketQuoteType_ == MarketQuoteType::NormalVolatility) {
+        } else if (inputMarketQuoteType == MarketQuoteType::NormalVolatility) {
             forwardPremium =
                 bachelierBlackFormula(inputOptionType, strike, forward, inputQuote * std::sqrt(timeToExpiry));
-        } else if (inputMarketQuoteType_ == MarketQuoteType::ShiftedLognormalVolatility) {
+        } else if (inputMarketQuoteType == MarketQuoteType::ShiftedLognormalVolatility) {
             if (strike < -inputLognormalShift)
                 forwardPremium = inputOptionType == Option::Call ? forward - strike : 0.0;
-            else
+            else {
                 forwardPremium = blackFormula(inputOptionType, strike, forward, inputQuote * std::sqrt(timeToExpiry),
-                                              inputLognormalShift);
+                                              1.0, inputLognormalShift);
+            }
         } else {
             QL_FAIL("ParametricVolatility::convert(): MarketQuoteType ("
-                    << static_cast<int>(inputMarketQuoteType_) << ") not handled. Internal error, contact dev.");
+                    << static_cast<int>(inputMarketQuoteType) << ") not handled. Internal error, contact dev.");
         }
         break;
     default:

QuantExt/qle/termstructures/sabrparametricvolatility.cpp

@@ -123,27 +123,22 @@ std::vector<std::pair<Real, bool>> SabrParametricVolatility::defaultModelParamet
 std::vector<Real> SabrParametricVolatility::direct(const std::vector<Real>& x, const Real forward,
                                                    const Real lognormalShift) const {
     std::vector<Real> y(4);
-    // beta as in QuantLib::SABRSpecs
-    y[1] = std::fabs(x[1]) < std::sqrt(-std::log(eps1)) ? std::exp(-(x[1] * x[1])) : eps1;
-    // max 0.02 normal vol equivalent
-    Real fbeta = std::pow(forward + lognormalShift, y[1]);
-    y[0] =
-        (std::fabs(x[0]) < std::sqrt(-std::log(fbeta * eps1 / 0.02)) ? 0.02 * std::exp(-(x[0] * x[0])) / fbeta : eps1);
-    // nu max 5.0
-    y[2] = (std::fabs(x[2]) < std::sqrt(-std::log(2.0 * eps1)) ? 2.0 * std::exp(-(x[2] * x[2])) : eps1);
-    // rho as in QuantLib::SABRSpecs
+    y[1] = std::max(eps1, std::min(1.0 - eps1, std::exp(-(x[1] * x[1]))));
+    Real fbeta = std::pow(std::max(forward + lognormalShift, eps1), y[1]);
+    y[0] = std::max(eps1, std::exp(-(x[0] * x[0])) / fbeta * max_nvol_equiv);
+    y[2] = std::max(eps1, std::exp(-(x[2] * x[2])) * max_nu);
     y[3] = std::fabs(x[3]) < 2.5 * M_PI ? eps2 * std::sin(x[3]) : eps2 * (x[3] > 0.0 ? 1.0 : (-1.0));
     return y;
 }
 
 std::vector<Real> SabrParametricVolatility::inverse(const std::vector<Real>& y, const Real forward,
                                                     const Real lognormalShift) const {
     std::vector<Real> x(4);
-    x[1] = std::sqrt(-std::log(y[1]));
-    Real fbeta = std::pow(forward + lognormalShift, y[1]);
-    x[0] = std::sqrt(-std::log(y[0] * fbeta / 0.02));
-    x[2] = std::sqrt(-std::log(y[2] / 2.0));
-    x[3] = std::asin(y[3] / eps2);
+    x[1] = std::sqrt(-std::log(std::min(1.0 - eps1, std::max(eps1, y[1]))));
+    Real fbeta = std::pow(std::max(forward + lognormalShift, eps1), y[1]);
+    x[0] = std::sqrt(-std::log(std::min(1.0 - eps1, std::max(eps1, y[0] * fbeta / max_nvol_equiv))));
+    x[2] = std::sqrt(-std::log(std::min(1.0 - eps1, std::max(eps1, y[2] / max_nu))));
+    x[3] = std::asin(std::max(-eps2, std::min(eps2, y[3])));
     return x;
 }
 
@@ -267,9 +262,9 @@ SabrParametricVolatility::calibrateModelParameters(const MarketSmile& marketSmil
 
     // if there are no free parameters, we just pass back the fixed parameters as the result
 
-    if(noFreeParams == 0) {
+    if (noFreeParams == 0) {
         std::vector<Real> resultParams;
-        for(auto const& p : params)
+        for (auto const& p : params)
             resultParams.push_back(p.first);
         return std::make_tuple(resultParams, 0.0, 0);
     }
@@ -286,6 +281,7 @@ SabrParametricVolatility::calibrateModelParameters(const MarketSmile& marketSmil
         Real lognormalShift_;
         std::vector<Real> strikes_;
         std::vector<Real> marketQuotes_;
+        Real refQuote_;
         std::function<std::vector<Real>(const std::vector<Real>&, const Real, const Real, const Real,
                                         const std::vector<Real>&)>
             evalSabr_;
@@ -310,23 +306,10 @@ SabrParametricVolatility::calibrateModelParameters(const MarketSmile& marketSmil
             Array result(strikes_.size());
             auto sabr = evalSabr(x);
             for (Size i = 0; i < strikes_.size(); ++i) {
-                result[i] = (marketQuotes_[i] - sabr[i]);
+                result[i] = (marketQuotes_[i] - sabr[i]) / refQuote_;
             }
             return result;
         }
-
-        Real normalizedError(const Array& x) const {
-            auto sabr = evalSabr(x);
-            Real maxQuote = *std::max_element(marketQuotes_.begin(), marketQuotes_.end());
-            Real result = 0.0;
-            for (Size i = 0; i < strikes_.size(); ++i) {
-                /* we want a relative error measure, but can't do this point by point, because for far-ootm strikes
-                 * premiums are close to zero */
-                result += std::pow((marketQuotes_[i] - sabr[i]) / maxQuote, 2.0);
-            }
-            result = std::sqrt(result / static_cast<Real>(strikes_.size()));
-            return result;
-        }
     };
 
     /* build the target function and populate the members:
@@ -364,6 +347,8 @@ SabrParametricVolatility::calibrateModelParameters(const MarketSmile& marketSmil
             marketSmile.timeToExpiry, marketSmile.strikes[i], marketSmile.forward, preferredOutputQuoteType(),
             marketSmile.lognormalShift, boost::none));
     }
+    // we use relative errors w.r.t. the max market quote, because far otm quotes are close to zero
+    t.refQuote_ = *std::max_element(t.marketQuotes_.begin(), t.marketQuotes_.end());
 
     // perform the calibration (this step might throw if all minimizations go wrong)
 
@@ -406,7 +391,7 @@ SabrParametricVolatility::calibrateModelParameters(const MarketSmile& marketSmil
             continue;
         }
 
-        Real thisError = t.normalizedError(problem.currentValue());
+        Real thisError = problem.functionValue();
         if (thisError < bestError) {
             bestError = thisError;
             for (Size i = 0, j = 0; i < bestResult.size(); ++i) {
@@ -427,6 +412,17 @@ SabrParametricVolatility::calibrateModelParameters(const MarketSmile& marketSmil
     return std::make_tuple(bestResult, bestError, ++attempt);
 }
 
+namespace {
+void laplaceInterpolationWithErrorHandling(Matrix& m, const std::vector<Real>& x, const std::vector<Real>& y) {
+    try {
+        laplaceInterpolation(m, x, y, 1E-6, 100);
+    } catch (const std::exception& e) {
+        QL_FAIL("Error during laplaceInterpolation() in SabrParametricVolatility: "
+                << e.what() << ", this might be related to the numerical parameters relTol, maxIterMult. Contact dev.");
+    }
+}
+} // namespace
+
 void SabrParametricVolatility::calculate() {
 
     // if no model parameters are given, we provide the default ones
@@ -515,10 +511,10 @@ void SabrParametricVolatility::calculate() {
 
     // interpolate the null values
 
-    laplaceInterpolation(alpha_, timeToExpiries_, underlyingLengths_);
-    laplaceInterpolation(beta_, timeToExpiries_, underlyingLengths_);
-    laplaceInterpolation(nu_, timeToExpiries_, underlyingLengths_);
-    laplaceInterpolation(rho_, timeToExpiries_, underlyingLengths_);
+    laplaceInterpolationWithErrorHandling(alpha_, timeToExpiries_, underlyingLengths_);
+    laplaceInterpolationWithErrorHandling(beta_, timeToExpiries_, underlyingLengths_);
+    laplaceInterpolationWithErrorHandling(nu_, timeToExpiries_, underlyingLengths_);
+    laplaceInterpolationWithErrorHandling(rho_, timeToExpiries_, underlyingLengths_);
 
     // sanitize values produced by the the interpolation that are not allowed
 

QuantExt/qle/termstructures/sabrparametricvolatility.hpp

@@ -74,6 +74,8 @@ class SabrParametricVolatility final : public ParametricVolatility {
 private:
     static constexpr double eps1 = .0000001;
     static constexpr double eps2 = .9999;
+    static constexpr double max_nvol_equiv = 0.02;
+    static constexpr double max_nu = 2.0;
 
     void calculate();
 

QuantExt/qle/termstructures/swaptionsabrcube.cpp

@@ -46,6 +46,17 @@ SwaptionSabrCube::SwaptionSabrCube(
             registerWith(s);
 }
 
+namespace {
+void laplaceInterpolationWithErrorHandling(Matrix& m, const std::vector<Real>& x, const std::vector<Real>& y) {
+    try {
+        laplaceInterpolation(m, x, y, 1e-6, 100);
+    } catch (const std::exception& e) {
+        QL_FAIL("Error during laplaceInterpolation() in SwaptionSabrCube: "
+                << e.what() << ", this might be related to the numerical parameters relTol, maxIterMult. Contact dev.");
+    }
+}
+} // namespace
+
 void SwaptionSabrCube::performCalculations() const {
 
     SwaptionVolatilityCube::performCalculations();
@@ -81,7 +92,7 @@ void SwaptionSabrCube::performCalculations() const {
     }
 
     for (auto& v : interpolatedVolSpreads) {
-        laplaceInterpolation(v, allOptionTimes, allSwapLengths);
+        laplaceInterpolationWithErrorHandling(v, allOptionTimes, allSwapLengths);
     }
 
     // build market smiles on the grid