Merge remote-tracking branch 'origin/master' into github_modules

Author: rolandlichters

.gitmodules

@@ -1,5 +1,5 @@
 [submodule "QuantLib"]
 	path = QuantLib
-	url = https://github.com/OpenSourceRisk/QuantLib.git
+	url = git@gitlab.acadiasoft.net:qs/quantlib.git
 	branch = master
 	ignore = dirty

CMakePresets.json

@@ -2,21 +2,21 @@
   "version": 2,
   "configurePresets": [
     {
-      "name": "windows-ninja-x64-relWithDebInfo",
+      "name": "windows-ninja-x64-debug",
       "binaryDir": "${sourceDir}/build",
-      "generator": "Ninja",
+      "generator": "Ninja Multi-Config",
       "cacheVariables": {
-        "CMAKE_C_COMPILER": "cl.exe",
         "CMAKE_CXX_COMPILER": "cl.exe",
-        "CMAKE_BUILD_TYPE": "RelWithDebInfo",
+        "CMAKE_BUILD_TYPE": "Debug",
         "BOOST_INCLUDEDIR": "$env{BOOST}",
         "BOOST_LIBRARYDIR": "$env{BOOST_LIB64}",
         "QL_BUILD_EXAMPLES": false,
         "QL_BUILD_TEST_SUITE": false,
         "QL_BUILD_BENCHMARK": false,
         "MSVC_LINK_DYNAMIC_RUNTIME": true,
-        "MSVC_WHOLE_PROGRAM_OPTIMIZATION": true,
+        "MSVC_WHOLE_PROGRAM_OPTIMIZATION": false,
         "ENABLE_SESSIONS": true,
+        "ORE_BUILD_DOC": false
       },
       "architecture": {
         "value": "x64",
@@ -32,22 +32,21 @@
       }
     },
     {
-      "name": "windows-ninja-x64-debug",
+      "name": "windows-ninja-x64-relWithDebInfo",
       "binaryDir": "${sourceDir}/build",
-      "generator": "Ninja",
+      "generator": "Ninja Multi-Config",
       "cacheVariables": {
-        "CMAKE_C_COMPILER": "cl.exe",
         "CMAKE_CXX_COMPILER": "cl.exe",
-        "CMAKE_BUILD_TYPE": "Debug",
+        "CMAKE_BUILD_TYPE": "RelWithDebInfo",
         "BOOST_INCLUDEDIR": "$env{BOOST}",
         "BOOST_LIBRARYDIR": "$env{BOOST_LIB64}",
         "QL_BUILD_EXAMPLES": false,
         "QL_BUILD_TEST_SUITE": false,
         "QL_BUILD_BENCHMARK": false,
-        "MSVC_LINK_DYNAMIC_RUNTIME": false,
-        "MSVC_WHOLE_PROGRAM_OPTIMIZATION": false,
+        "MSVC_LINK_DYNAMIC_RUNTIME": true,
+        "MSVC_WHOLE_PROGRAM_OPTIMIZATION": true,
         "ENABLE_SESSIONS": true,
-        "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
+        "ORE_BUILD_DOC": false
       },
       "architecture": {
         "value": "x64",
@@ -73,9 +72,9 @@
         "QL_BUILD_TEST_SUITE": false,
         "QL_BUILD_BENCHMARK": false,
         "MSVC_LINK_DYNAMIC_RUNTIME": true,
-        "MSVC_WHOLE_PROGRAM_OPTIMIZATION": true,
+        "MSVC_WHOLE_PROGRAM_OPTIMIZATION": false,
         "ENABLE_SESSIONS": true,
-        "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
+        "ORE_BUILD_DOC": false
       },
       "architecture": {
         "value": "x64",
@@ -103,7 +102,7 @@
         "MSVC_LINK_DYNAMIC_RUNTIME": false,
         "MSVC_WHOLE_PROGRAM_OPTIMIZATION": true,
         "ENABLE_SESSIONS": true,
-        "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
+        "ORE_BUILD_DOC": false
       },
       "architecture": {
         "value": "x64",

Docs/UserGuide/parameterisation/curveconfig.tex

@@ -101,7 +101,7 @@ \subsubsection{Swaption Volatility Structures}
 \subsubsection{FX Volatility Structures}
 
 Listings \ref{lst:fxoptionvol_configuration_atm}, \ref{lst:fxoptionvol_configuration_smile_vv},
-\ref{lst:fxoptionvol_configuration_smile_delta}, \ref{lst:fxoptionvol_configuration_smile_bfrr},
+\ref{lst:fxoptionvol_configuration_smile_delta}, \ref{lst:fxoptionvol_configuration_smile_bfrr}, \ref{lst:fxoptionvol_configuration_smile_absolute},
 \ref{lst:fxoptionvol_configuration_atm_triangulated} shows examples of FX volatility structure configurations.
 
 \begin{longlisting}
@@ -189,6 +189,27 @@ \subsubsection{FX Volatility Structures}
 \label{lst:fxoptionvol_configuration_smile_bfrr}
 \end{longlisting}
 
+\begin{longlisting}
+\begin{minted}[fontsize=\footnotesize]{xml}
+  <FXVolatility>
+    <CurveId>USDJPY</CurveId>
+    <CurveDescription />
+    <Dimension>Smile</Dimension> 
+    <SmileType>Absolute</SmileType> 
+    <SmileInterpolation>Cubic</SmileInterpolation>
+    <Expiries>1M,3M,6M,1Y,2Y,3Y,10Y</Expiries>
+    <FXSpotID>FX/USD/JPY</FXSpotID>
+    <FXForeignCurveID>Yield/USD/USD1D</FXForeignCurveID>
+    <FXDomesticCurveID>Yield/JPY/JPY-IN-USD</FXDomesticCurveID>
+    <DayCounter>A365</DayCounter>
+    <Calendar>US,JP</Calendar>
+    <Conventions>USD-JPY-FXOPTION</Conventions>
+  </FXVolatility>
+\end{minted}
+\caption{FX option volatility configuration Smile / Absolute vols}
+\label{lst:fxoptionvol_configuration_smile_absolute}
+\end{longlisting}
+
 \begin{longlisting}
 \begin{minted}[fontsize=\footnotesize]{xml}
   <FXVolatility>
@@ -208,15 +229,15 @@ \subsubsection{FX Volatility Structures}
 
 The meaning of each of the elements in Listings \ref{lst:fxoptionvol_configuration_atm},
 \ref{lst:fxoptionvol_configuration_smile_vv}, \ref{lst:fxoptionvol_configuration_smile_delta},
-\ref{lst:fxoptionvol_configuration_smile_bfrr}, \ref{lst:fxoptionvol_configuration_atm_triangulated} is given below.
+\ref{lst:fxoptionvol_configuration_smile_bfrr}, \ref{lst:fxoptionvol_configuration_smile_absolute}, \ref{lst:fxoptionvol_configuration_atm_triangulated} is given below.
 
 \begin{itemize}
 \item CurveId: Unique identifier of the FX volatility structure
 \item CurveDescription [Optional]: A description of the volatility structure, may be left blank.
 \item Dimension: Distinguishes at-the-money volatility curves from volatility surfaces. An `ATMTriangulated' value
   denotes a curve triangulated from two other surfaces.\\ Allowable values: {\tt ATM, Smile, ATMTriangulated}
 \item SmileType [Optional]: Required field in case of Dimension {\tt Smile}, otherwise it can be omitted. \\ Allowable
-  values: {\tt VannaVolga} as per (Castagna \& Mercurio - 2006), {\tt Delta}, {\tt BFRR}, with default value {\tt
+  values: {\tt VannaVolga} as per (Castagna \& Mercurio - 2006), {\tt Delta}, {\tt BFRR}, {\tt Absolute}, with default value {\tt
     VannaVolga} if left blank.
 \item SmileInterpolation [Optional]: Smile interpolation method applied, required field in case of Dimension {\tt
   Smile}, otherwise it can be omitted. \\ Allowable values:
@@ -225,11 +246,11 @@ \subsubsection{FX Volatility Structures}
   blank.  VannaVolga1/VannaVolga2 refer to the first/second approximation in (eq. 13) and (eq. 14) of the reference
   above.
 \item {\tt Linear} or {\tt Cubic} in case of SmileType {\tt Delta} or {\tt BFRR} with default {\tt Linear} for SmileType
-  Delta and {\tt Cubic} for SmileType BFRR if left blank
+  Delta and {\tt Cubic} for SmileType BFRR and Absolute if left blank
 \end{itemize}
 \item Expiries: Option expiries in period form. A wildcard may also be used. In the wildcard case, it will look for any
   matching quotes provided in the loader, and construct the curve from these. This is currently only supported for {\tt
-    ATM} or {\tt Delta} or {\tt BFRR} curves.
+    ATM} or {\tt Delta} or {\tt BFRR} or {\tt Absolute} curves.
 \item Deltas [Optional]: Strike grid, required in case of SmileType {\tt Delta} \\ Allowable values: {\tt ATM, *P, *C},
   see example in Listing \ref{lst:fxoptionvol_configuration_smile_delta}
 \item SmileDelta [Optional]: Strike grid for SmileType {\tt VannaVolga} and {\tt BFRR}, defaults to 25 for VannaVolga