git subrepo pull (merge) ore

subrepo:
  subdir:   "ore"
  merged:   "7458289532"
upstream:
  origin:   "git@gitlab.acadiasoft.net:qs/ore.git"
  branch:   "master"
  commit:   "265c600926"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"

Author: jenkins

Docs/UserGuide/tradecomponents/optiondata.tex

@@ -29,6 +29,14 @@ \subsubsection{Option Data}
     <ExerciseDate>2019-04-20</ExerciseDate>
     <ExerciseDate>2020-04-20</ExerciseDate>
   </ExerciseDates>
+  <!-- Alternative format for exercise dates using Schedule format -->
+  <ExerciseSchedule>
+    <Rules>
+      <StartDate>2019-04-20</StartDate>
+      <EndDate>2024-04-20</EndDate>
+      <Tenor>3M</Tenor>
+    </Rules>
+  </ExerciseSchedule>
   <Premiums>
     <Premium>
       <Amount>100000</Amount>
@@ -195,11 +203,16 @@ \subsubsection{Option Data}
   Allowable values: See Table \ref{tab:convention} Roll Convention.
 
 \item ExerciseDates: This node contains child elements of type
-  \lstinline!ExerciseDate!.  Options of style \emph{European} or
+  \lstinline!ExerciseDate!. Options of style \emph{European} or
   \emph{American} require a single exercise date expressed by one
   single \lstinline!ExerciseDate! child element.  \emph{Bermudan}
   style options must have two or more \lstinline!ExerciseDate! child
-  elements.
+  elements. One can alternatively use \lstinline!ExerciseSchedule! to
+  specify the option exercise dates.
+
+\item ExerciseSchedule [Optional]: This node can be provided instead of \lstinline!ExerciseDates! and
+should be specified in the same format as a Schedule (see Section \ref{ss:schedule_data}), e.g.\ for
+a list of Bermudan exercise dates.
 
 \item Premiums [Optional]: Option premium amounts paid by the option buyer to the option seller.
 

Docs/UserGuide/tradedata/fx_digitalbarrieroption.tex

@@ -67,9 +67,14 @@ \subsubsection{FX Digital Barrier Option}
 
 \end{itemize}
 
-\item BarrierData: This is a trade component sub-node outlined in section \ref{ss:barrier_data}.
+\item BarrierData: This is a trade component sub-node outlined in section \ref{ss:barrier_data}. 
+
+Note that the \emph{FxDigitalBarrierOption} is a single barrier instrument, and can have only one BarrierData node with one barrier level.
+
 Level specified in BarrierData should be quoted as the amount in DomesticCurrency per one unit of ForeignCurrency, with both currencies as defined in FxDigitalBarrierOptionData node.
 
+Type specified in BarrierData can be one of: \emph{UpAndIn, DownAndIn, UpAndOut, DownAndOut}
+
 \item StartDate[Optional]: The start date for checking if a barrier has been breached prior to today's date.  If omitted or left blank no check is made and it is assumed no barrier has been breached in the past. Has no impact if set to today's date or a date in the future. If`StartDate' is provided then the fixings for dates between this date and the asof date are checked to see if the option was triggered. If no fixing is available then we skip that date. This is to allow for backwards compatibility.
 
 Allowable values:  See \lstinline!Date! in Table \ref{tab:allow_stand_data}.

Docs/UserGuide/userguide.tex

@@ -4037,6 +4037,7 @@ \subsubsection{Analytics}\label{sec:analytics}
     <Parameter name="flipViewXVA">N</Parameter>
     <Parameter name="flipViewBorrowingCurvePostfix">_BORROW</Parameter>
     <Parameter name="flipViewLendingCurvePostfix">_LEND</Parameter>
+    <Parameter name="mporCashFlowMode">NonePay</Parameter>
   </Analytic>
 </Analytics>
 \end{minted}
@@ -4148,6 +4149,9 @@ \subsubsection{Analytics}\label{sec:analytics}
 \item {\tt flipViewXVA:} If set to {\tt Y}, the perspective in XVA calculations is switched to the cpty view, the npvs and the netting sets being reverted during calculation. In order to get the lending/borrowing curve, the calculation assumes these curves being set up with the cptyname + the postfix given in the next two settings.
 \item {\tt flipViewBorrowingCurvePostfix:} postfix for the borrowing curve, the calculation assumes this is curves being set up with cptyname + postfix given.
 \item {\tt flipViewLendingCurvePostfix:} postfix for the lending curve, the calculation assumes this is curve being set up with cptyname + postfix given.
+\item {\tt mporCashFlowMode:} Assumption about payment of cashflows within mpor period. One of NonePay, BothPay, WePay,
+  TheyPay, Unspecified. Defaults to Unspecified, in this case PP will assume NonePay if mpor sticky date is used,
+  otherwise to BothPay.
 \end{itemize}
 
 The two cube file outputs {\tt rawCubeOutputFile} and {\tt netCubeOutputFile} are provided for interactive analysis and visualisation purposes, see section

Examples/Example_54/ExpectedOutput/npv.csv

@@ -0,0 +1,2 @@
+#TradeId,TradeType,Maturity,MaturityTime,NPV,NpvCurrency,NPV(Base),BaseCurrency,Notional,NotionalCurrency,Notional(Base),NettingSet,CounterParty
+Swp,ScriptedTrade,2036-03-03,20.073770,52.637038,EUR,52.637038,EUR,#N/A,#N/A,#N/A,CPTY_A,CPTY_A

Examples/Example_54/ExpectedOutput/xvacg-cva-sensi-scenario.csv

@@ -0,0 +1,64 @@
+#TradeId,Factor,Up/Down,Base NPV,Scenario NPV,Difference
+CVA,DiscountCurve/EUR/3/6M,Up,11335.04,11335.04,0.00
+CVA,DiscountCurve/EUR/4/1Y,Up,11335.04,11335.03,0.00
+CVA,DiscountCurve/EUR/5/2Y,Up,11335.04,11335.03,0.00
+CVA,DiscountCurve/EUR/6/3Y,Up,11335.04,11335.00,-0.04
+CVA,DiscountCurve/EUR/7/5Y,Up,11335.04,11334.63,-0.41
+CVA,DiscountCurve/EUR/8/10Y,Up,11335.04,11332.57,-2.46
+CVA,DiscountCurve/EUR/9/15Y,Up,11335.04,11329.08,-5.96
+CVA,DiscountCurve/EUR/10/20Y,Up,11335.04,11326.46,-8.58
+CVA,DiscountCurve/EUR/11/30Y,Up,11335.04,11334.99,-0.05
+CVA,IndexCurve/EUR-EURIBOR-3M/9/15Y,Up,11335.04,11335.05,0.01
+CVA,IndexCurve/EUR-EURIBOR-3M/10/20Y,Up,11335.04,11335.02,-0.02
+CVA,IndexCurve/EUR-EURIBOR-6M/0/2W,Up,11335.04,11335.04,0.00
+CVA,IndexCurve/EUR-EURIBOR-6M/1/1M,Up,11335.04,11335.07,0.03
+CVA,IndexCurve/EUR-EURIBOR-6M/3/6M,Up,11335.04,11335.23,0.19
+CVA,IndexCurve/EUR-EURIBOR-6M/4/1Y,Up,11335.04,11335.67,0.64
+CVA,IndexCurve/EUR-EURIBOR-6M/5/2Y,Up,11335.04,11336.58,1.54
+CVA,IndexCurve/EUR-EURIBOR-6M/6/3Y,Up,11335.04,11338.34,3.30
+CVA,IndexCurve/EUR-EURIBOR-6M/7/5Y,Up,11335.04,11345.55,10.52
+CVA,IndexCurve/EUR-EURIBOR-6M/8/10Y,Up,11335.04,11358.75,23.71
+CVA,IndexCurve/EUR-EURIBOR-6M/9/15Y,Up,11335.04,11359.90,24.87
+CVA,IndexCurve/EUR-EURIBOR-6M/10/20Y,Up,11335.04,11148.05,-186.99
+CVA,IndexCurve/EUR-EURIBOR-6M/11/30Y,Up,11335.04,11332.33,-2.70
+CVA,SwaptionVolatility/EUR/8/1Y/15Y/ATM,Up,11335.04,11337.27,2.24
+CVA,SwaptionVolatility/EUR/9/1Y/20Y/ATM,Up,11335.04,11344.04,9.00
+CVA,SwaptionVolatility/EUR/19/2Y/15Y/ATM,Up,11335.04,11341.06,6.03
+CVA,SwaptionVolatility/EUR/20/2Y/20Y/ATM,Up,11335.04,11344.09,9.06
+CVA,SwaptionVolatility/EUR/30/3Y/15Y/ATM,Up,11335.04,11344.33,9.29
+CVA,SwaptionVolatility/EUR/31/3Y/20Y/ATM,Up,11335.04,11341.22,6.18
+CVA,SwaptionVolatility/EUR/41/4Y/15Y/ATM,Up,11335.04,11347.87,12.84
+CVA,SwaptionVolatility/EUR/42/4Y/20Y/ATM,Up,11335.04,11338.23,3.19
+CVA,SwaptionVolatility/EUR/51/5Y/12Y/ATM,Up,11335.04,11337.76,2.73
+CVA,SwaptionVolatility/EUR/52/5Y/15Y/ATM,Up,11335.04,11357.51,22.47
+CVA,SwaptionVolatility/EUR/61/7Y/10Y/ATM,Up,11335.04,11337.44,2.40
+CVA,SwaptionVolatility/EUR/62/7Y/12Y/ATM,Up,11335.04,11362.92,27.88
+CVA,SwaptionVolatility/EUR/63/7Y/15Y/ATM,Up,11335.04,11346.67,11.63
+CVA,SwaptionVolatility/EUR/71/10Y/7Y/ATM,Up,11335.04,11337.38,2.34
+CVA,SwaptionVolatility/EUR/72/10Y/10Y/ATM,Up,11335.04,11356.66,21.62
+CVA,SwaptionVolatility/EUR/73/10Y/12Y/ATM,Up,11335.04,11345.03,10.00
+CVA,SwaptionVolatility/EUR/81/12Y/5Y/ATM,Up,11335.04,11336.54,1.51
+CVA,SwaptionVolatility/EUR/82/12Y/7Y/ATM,Up,11335.04,11353.72,18.68
+CVA,SwaptionVolatility/EUR/83/12Y/10Y/ATM,Up,11335.04,11343.61,8.58
+CVA,SwaptionVolatility/EUR/88/15Y/1Y/ATM,Up,11335.04,11335.47,0.44
+CVA,SwaptionVolatility/EUR/89/15Y/2Y/ATM,Up,11335.04,11336.18,1.15
+CVA,SwaptionVolatility/EUR/90/15Y/3Y/ATM,Up,11335.04,11337.70,2.67
+CVA,SwaptionVolatility/EUR/91/15Y/4Y/ATM,Up,11335.04,11340.19,5.16
+CVA,SwaptionVolatility/EUR/92/15Y/5Y/ATM,Up,11335.04,11346.63,11.59
+CVA,SwaptionVolatility/EUR/93/15Y/7Y/ATM,Up,11335.04,11341.53,6.50
+CVA,SwaptionVolatility/EUR/99/20Y/1Y/ATM,Up,11335.04,11336.79,1.76
+CVA,SwaptionVolatility/EUR/100/20Y/2Y/ATM,Up,11335.04,11336.77,1.73
+CVA,SwaptionVolatility/EUR/101/20Y/3Y/ATM,Up,11335.04,11336.82,1.79
+CVA,SwaptionVolatility/EUR/102/20Y/4Y/ATM,Up,11335.04,11336.32,1.28
+CVA,SurvivalProbability/BANK/0/2W,Up,11335.04,11335.03,0.00
+CVA,SurvivalProbability/BANK/1/1M,Up,11335.04,11334.96,-0.08
+CVA,SurvivalProbability/BANK/2/3M,Up,11335.04,11334.86,-0.18
+CVA,SurvivalProbability/BANK/3/6M,Up,11335.04,11334.40,-0.63
+CVA,SurvivalProbability/BANK/4/1Y,Up,11335.04,11334.27,-0.76
+CVA,SurvivalProbability/BANK/5/2Y,Up,11335.04,11333.47,-1.57
+CVA,SurvivalProbability/BANK/6/3Y,Up,11335.04,11333.22,-1.82
+CVA,SurvivalProbability/BANK/7/5Y,Up,11335.04,11334.37,-0.67
+CVA,SurvivalProbability/BANK/8/10Y,Up,11335.04,11345.81,10.78
+CVA,SurvivalProbability/BANK/9/15Y,Up,11335.04,11361.85,26.82
+CVA,SurvivalProbability/BANK/10/20Y,Up,11335.04,11360.90,25.86
+CVA,SurvivalProbability/BANK/11/30Y,Up,11335.04,11335.17,0.14