Skip to content

Commit 57b0779

Browse files
Roland Lichtersjenkins
authored andcommitted
Merge remote-tracking branch 'origin/master' into QPR-12456
2 parents ec65b96 + ddc0afe commit 57b0779

57 files changed

Lines changed: 19679 additions & 123 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Docs/UserGuide/curve_configurations/yieldcurves.tex

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,18 @@ \subsubsection{Yield Curves}
8383
\hline
8484
Linear & Linear interpolation \\ \hline
8585
LogLinear & Linear interpolation on the natural log of the interpolation variable \\ \hline
86-
NaturalCubic & Monotonic Kruger cubic interpolation with second derivative at left and right \\ \hline
87-
FinancialCubic & Monotonic Kruger cubic interpolation with second derivative at left and
88-
first derivative at right \\ \hline
86+
NaturalCubic & Monotonic Kruger cubic interpolation with zero second derivative at left and right \\ \hline
87+
FinancialCubic & Monotonic Kruger cubic interpolation with zero second derivative at left and
88+
zero first derivative at right \\ \hline
8989
ConvexMonotone & Convex Monotone Interpolation (Hagan, West) \\ \hline
9090
Quadratic & Quadratic interpolation \\ \hline
9191
LogQuadratic & Quadratic interpolation on the natural log of the interpolation variable \\ \hline
92+
LogNaturalCubic & Monotonic Kruger cubic interpolation with zero second derivative at left and right \\hline
93+
LogFinancialCubic & Monotonic Kruger cubic interpolation with zero second derivative at left and
94+
zero first derivative at right \\hline
95+
LogCubicSpline & Non-monotonic cubic spline interpolation with zero second derivative at left and right \\hline
9296
Hermite & Hermite cubic spline interpolation \\ \hline
93-
CubicSpline & Non-monotonic cubic spline interpolation with second derivative at left and right \\ \hline
97+
CubicSpline & Non-monotonic cubic spline interpolation with zero second derivative at left and right \\ \hline
9498
DefaultLogMixedLinearCubic & Mixed interpolation, first linear, then monotonic Kruger cubic spline \\ \hline
9599
MonotonicLogMixedLinearCubic & Mixed interpolation, first linear, then monotonic natural cubic spline \\ \hline
96100
KrugerLogMixedLinearCubic & Mixed interpolation, first linear, then non-monotonic Kruger cubic spline \\ \hline

Docs/UserGuide/tradedata/doubledigitaloption.tex

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ \subsubsection{Double Digital Option}
1212
<BinaryPayout>12000000</BinaryPayout>
1313
<BinaryLevel1>1.1</BinaryLevel1>
1414
<BinaryLevel2>0.006</BinaryLevel2>
15-
<BinaryLevelCollarUpperBound2>0.008</BinaryLevelCollarUpperBound2>
15+
<BinaryLevelUpper2>0.008</BinaryLevelUpper2>
1616
<Type1>Call</Type1>
1717
<Type2>Collar</Type2>
1818
<Position>Long</Position>
@@ -44,17 +44,19 @@ \subsubsection{Double Digital Option}
4444
CCY2 per units of CCY1. For an Equity underlying this is the equity price expressed in the equity ccy. For a Commodity underlying this is the commodity price expressed in the commodity ccy. For an IR underlying this is the rate expressed in decimal form. Allowable values
4545
are non-negative numbers.
4646
\item Type1: The option type that applies to underlying 1. Allowable values: {\em Call}, {\em Put} or {\em Collar}. Underlying 1 is
47-
considered to be in the money if the spot is above (Call) / below (Put) the BinaryLevel1 resp. between (Collar) the BinaryLevel1 and BinaryLevelCollarUpperBound1 at the expiry.
47+
considered to be in the money if the spot is above (Call) / below (Put) the BinaryLevel1 resp. between (Collar) the BinaryLevel1 and BinaryLevelUpper1 at the expiry.
4848
\item Type2: The option type that applies to underlying 2. Allowable values: {\em Call}, {\em Put} or {\em Collar}. Underlying 2 is
49-
considered to be in the money if the spot is above (Call) / below (Put) the BinaryLevel1 resp. between (Collar) the BinaryLevel2 andthe BinaryLevelCollarUpperBound2 at the expiry.
49+
considered to be in the money if the spot is above (Call) / below (Put) the BinaryLevel1 resp. between (Collar) the BinaryLevel2 andthe BinaryLevelUpper2 at the expiry.
5050
\item Position: The option position type. Allowable values: {\em Long} or {\em Short}.
5151
\item Underlying1: The first underlying, see \ref{ss:underlying}.
5252
\item Underlying2: The second underlying, see \ref{ss:underlying}. Note that Type for both underlyings has allowable values \emph{Equity}, \emph{Commodity}, \emph{FX}, and \emph{IR}.
53+
\item Underlying3 [Optional]: If defined, the first underlying in this transaction is treated as a spread between Underlying1 and Underlying3 (i.e.\ Underlying1 fixing minus Underlying3 fixing), see \ref{ss:underlying}. Underlying3 Type must be the same as Underlying1 Type.
54+
\item Underlying4 [Optional]: If defined, the second underlying in this transaction is treated as a spread between Underlying2 and Underlying4 (i.e.\ Underlying2 fixing minus Underlying4 fixing), see \ref{ss:underlying}. Underlying4 Type must be the same as Underlying2 Type.
5355
\item PayCcy: The currency in which the \verb+BinaryPayout+ is paid. See Table \ref{tab:currency} for allowable currency codes.
54-
\item BinaryLevelCollarUpperBound1: Optional field used only for Collar option. The upper bound for underlying 1. For an FX underlying (SOURCE-CCY1-CCY2) this is the number of units of
56+
\item BinaryLevelUpper1 [Optional]: This is field is used only for Collar option. The upper bound for underlying 1. For an FX underlying (SOURCE-CCY1-CCY2) this is the number of units of
5557
CCY2 per units of CCY1. For an Equity underlying this is the equity price expressed in the equity ccy. For a Commodity underlying this is the commodity price expressed in the commodity ccy. For an IR underlying this is the rate expressed in decimal form. Allowable values
5658
are non-negative numbers.
57-
\item BinaryLevelCollarUpperBound2: Optional field used only for Collar option. The upper bound for underlying 2. For an FX underlying (SOURCE-CCY1-CCY2) this is the number of units of
59+
\item BinaryLevelUpper2 [Optional]: This field is used only for Collar option. The upper bound for underlying 2. For an FX underlying (SOURCE-CCY1-CCY2) this is the number of units of
5860
CCY2 per units of CCY1. For an Equity underlying this is the equity price expressed in the equity ccy. For a Commodity underlying this is the commodity price expressed in the commodity ccy. For an IR underlying this is the rate expressed in decimal form. Allowable values
5961
are non-negative numbers.
6062

Docs/UserGuide/tradedata/fx_barrieroption.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ \subsubsection{FX Barrier Option}
8282

8383

8484
\item \lstinline!BarrierData!: This is a trade component sub-node outlined in section \ref{ss:barrier_data}.
85-
Level specified in BarrierData should be quoted as the amount in SoldCurrency per unit BoughtCurrency, with both currencies as defined in FxBarrierOptionData node.
86-
Changing the option from Call to Put or vice versa does not require switching the barrier level, i.e. the level stays quoted as SoldCurrency per unit BoughtCurrency, regardless of Put/Call.
85+
\lstinline!Level! specified in BarrierData should be quoted as the amount in SoldCurrency per unit BoughtCurrency, with both currencies as defined in FxBarrierOptionData node.
86+
Note that the barrier \lstinline!Level! stays quoted as SoldCurrency per unit BoughtCurrency, regardless of Put/Call.
8787

8888
\item \lstinline!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.
8989

Examples/Example_56/Input/ore_bump.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<Parameter name="active">Y</Parameter>
4646
<Parameter name="amc">Y</Parameter>
4747
<Parameter name="amcCg">Y</Parameter>
48-
<Parameter name="cvaBumpSensis">Y</Parameter>
48+
<Parameter name="xvaCgBumpSensis">Y</Parameter>
4949
<Parameter name="xvaCgSensitivityConfigFile">xvasensiconfig.xml</Parameter>
5050
<Parameter name="amcTradeTypes">Swap</Parameter>
5151
<Parameter name="simulationConfigFile">simulation.xml</Parameter>

Examples/Example_56/ore.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
"\n",
153153
"This engine performes AMC valuation, exposure aggregation and XVA calculation in one shot on ORE's ComputationGraph. \n",
154154
"\n",
155-
"We can force calculation of sensitivities by bump & revalue if parameter **cvaBumpSensis=true**, see ore_bump.xml. This is what we do below, to generate \"reference\" sensitivities.\n"
155+
"We can force calculation of sensitivities by bump & revalue if parameter **xvaCgBumpSensis=true**, see ore_bump.xml. This is what we do below, to generate \"reference\" sensitivities.\n"
156156
]
157157
},
158158
{

0 commit comments

Comments
 (0)