Skip to content

Commit 9a33831

Browse files
mgronckijenkins
mgroncki
authored and
jenkins
committed
Merge branch 'master' into QPR-12108
2 parents f118fef + 63e73dd commit 9a33831

101 files changed

Lines changed: 1151 additions & 1614 deletions

File tree

Some content is hidden

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

‎Docs/UserGuide/tradecomponents/underlying.tex‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ \subsubsection{Underlying}
106106
<FutureMonthOffset>0</FutureMonthOffset>
107107
<DeliveryRollDays>0</DeliveryRollDays>
108108
<DeliveryRollCalendar>TARGET</DeliveryRollCalendar>
109+
<FutureContractMonth>Nov2023</FutureContractMonth>
109110
</Underlying>
110111
\end{minted}
111112
\caption{Commodity Underlying}
@@ -242,6 +243,14 @@ \subsubsection{Underlying}
242243

243244
Allowable values: See Table \ref{tab:calendar}. Defaults to the null calendar if left blank or omitted, and \lstinline!Type!: is \emph{Commodity}.
244245

246+
\item \lstinline!FutureContractMonth! [Optional]:
247+
Only valid when \lstinline!Type! is \emph{Commodity}, \lstinline!PriceType! is FutureSettlement and there is no \lstinline!FutureExpiryDate! node. It specifies the underlying future contract month in the format \emph{MonYYYY}, for example Nov2023.
248+
249+
\item \lstinline!FutureExpiryDate! [Optional]:
250+
Only valid when \lstinline!Type! is \emph{Commodity}, \lstinline!PriceType! is FutureSettlement and there is no \lstinline!FutureContractMonth! node. This gives the expiration date of the underlying commodity future contract.
251+
252+
If the field \lstinline!FutureExpiryDate! and \lstinline!FutureContractMonth! are omitted, the expiration date of the underlying commodity future contract is set to the prompt future, adjusted for any \lstinline!FutureMonthOffset!.
253+
245254
\item \lstinline!Interpolation! [Optional]:
246255
Only valid when \lstinline!Type! is \emph{Inflation}. The index observation interpolation between fixings.
247256

‎Docs/UserGuide/userguide.tex‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6135,10 +6135,15 @@ \subsection{Stress Scenario Analysis: {\tt stressconfig.xml}}\label{sec:stress}
61356135
In case of the swaption volatility shifts, the single value given as {\tt Shift} (without the attributes {\tt expiry}
61366136
and {\tt term}) represents a default value that is used whenever no explicit value is given for a expiry / term pair.
61376137

6138+
UseSpreadedTermStructures: If set to true, spreaded termstructures over t0 will be used for the scenario calculation, to
6139+
improve the alignment of the scenario sim market and t0 curves.
6140+
6141+
61386142
\begin{longlisting}
61396143
%\hrule\medskip
61406144
\begin{minted}[fontsize=\scriptsize]{xml}
61416145
<StressTesting>
6146+
<UseSpreadedTermStructures>false</UseSpreadedTermStructures>
61426147
<StressTest id="parallel_rates">
61436148
<DiscountCurves>
61446149
<DiscountCurve ccy="EUR">

‎Examples/Example_10/ExpectedOutput/log_structured.json‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎Examples/Example_10/Input/ore.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
</Setup>
1818
<Markets>
1919
<Parameter name="lgmcalibration">collateral_inccy</Parameter>
20-
<Parameter name="fxcalibration">collateral_eur</Parameter>
21-
<Parameter name="pricing">collateral_eur</Parameter>
22-
<Parameter name="simulation">collateral_eur</Parameter>
20+
<Parameter name="fxcalibration">xois_eur</Parameter>
21+
<Parameter name="pricing">xois_eur</Parameter>
22+
<Parameter name="simulation">xois_eur</Parameter>
2323
</Markets>
2424
<Analytics>
2525
<Analytic type="npv">

‎Examples/Example_10/Input/ore_mpor.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
</Setup>
1818
<Markets>
1919
<Parameter name="lgmcalibration">collateral_inccy</Parameter>
20-
<Parameter name="fxcalibration">collateral_eur</Parameter>
21-
<Parameter name="pricing">collateral_eur</Parameter>
22-
<Parameter name="simulation">collateral_eur</Parameter>
20+
<Parameter name="fxcalibration">xois_eur</Parameter>
21+
<Parameter name="pricing">xois_eur</Parameter>
22+
<Parameter name="simulation">xois_eur</Parameter>
2323
</Markets>
2424
<Analytics>
2525
<Analytic type="npv">

‎Examples/Example_10/Input/ore_mta.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
</Setup>
1818
<Markets>
1919
<Parameter name="lgmcalibration">collateral_inccy</Parameter>
20-
<Parameter name="fxcalibration">collateral_eur</Parameter>
21-
<Parameter name="pricing">collateral_eur</Parameter>
22-
<Parameter name="simulation">collateral_eur</Parameter>
20+
<Parameter name="fxcalibration">xois_eur</Parameter>
21+
<Parameter name="pricing">xois_eur</Parameter>
22+
<Parameter name="simulation">xois_eur</Parameter>
2323
</Markets>
2424
<Analytics>
2525
<Analytic type="npv">

‎Examples/Example_10/Input/ore_threshold.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
</Setup>
1818
<Markets>
1919
<Parameter name="lgmcalibration">collateral_inccy</Parameter>
20-
<Parameter name="fxcalibration">collateral_eur</Parameter>
21-
<Parameter name="pricing">collateral_eur</Parameter>
22-
<Parameter name="simulation">collateral_eur</Parameter>
20+
<Parameter name="fxcalibration">xois_eur</Parameter>
21+
<Parameter name="pricing">xois_eur</Parameter>
22+
<Parameter name="simulation">xois_eur</Parameter>
2323
</Markets>
2424
<Analytics>
2525
<Analytic type="npv">

‎Examples/Example_10/Input/ore_threshold_break.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
</Setup>
1818
<Markets>
1919
<Parameter name="lgmcalibration">collateral_inccy</Parameter>
20-
<Parameter name="fxcalibration">collateral_eur</Parameter>
21-
<Parameter name="pricing">collateral_eur</Parameter>
22-
<Parameter name="simulation">collateral_eur</Parameter>
20+
<Parameter name="fxcalibration">xois_eur</Parameter>
21+
<Parameter name="pricing">xois_eur</Parameter>
22+
<Parameter name="simulation">xois_eur</Parameter>
2323
</Markets>
2424
<Analytics>
2525
<Analytic type="npv">

‎Examples/Example_10/Input/ore_threshold_dim.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
</Setup>
1818
<Markets>
1919
<Parameter name="lgmcalibration">collateral_inccy</Parameter>
20-
<Parameter name="fxcalibration">collateral_eur</Parameter>
21-
<Parameter name="pricing">collateral_eur</Parameter>
22-
<Parameter name="simulation">collateral_eur</Parameter>
20+
<Parameter name="fxcalibration">xois_eur</Parameter>
21+
<Parameter name="pricing">xois_eur</Parameter>
22+
<Parameter name="simulation">xois_eur</Parameter>
2323
</Markets>
2424
<Analytics>
2525
<Analytic type="npv">

‎Examples/Example_14/ExpectedOutput/log_structured.json‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)