From 2487a0198116a7d314cdbbd7a9050669a467300d Mon Sep 17 00:00:00 2001 From: Reinhold Kainhofer <reinhold@kainhofer.com> Date: Tue, 15 Sep 2020 00:12:30 +0200 Subject: [PATCH] V0.0.2 (second CRAN submission): Fix links with R6 method links workaround --- R/InsuranceTarif.R | 2 +- R/ProfitParticipation.R | 6 +++--- R/contractGrid.R | 4 ++-- man/InsuranceTarif.Rd | 2 +- man/ProfitParticipation.Rd | 6 +++--- man/contractGrid.Rd | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/R/InsuranceTarif.R b/R/InsuranceTarif.R index 20b31e6..258446f 100644 --- a/R/InsuranceTarif.R +++ b/R/InsuranceTarif.R @@ -1128,7 +1128,7 @@ InsuranceTarif = R6Class( #' #' @details Not to be called directly, but implicitly by the [InsuranceContract] object. #' @param ... Additional parameters for the profit participation calculation, passed - #' through to the profit participation scheme's \href{ProfitParticipation.html#method-getProfitParticipation}{\code{ProfitParticipation$getProfitParticipation()}} + #' through to the profit participation scheme's \href{../../LifeInsuranceContracts/html/ProfitParticipation.html#method-getProfitParticipation}{\code{ProfitParticipation$getProfitParticipation()}} calculateProfitParticipation = function(params, ...) { ppScheme = params$ProfitParticipation$profitParticipationScheme; if (!is.null(ppScheme)) { diff --git a/R/ProfitParticipation.R b/R/ProfitParticipation.R index 88ce7ef..c176775 100644 --- a/R/ProfitParticipation.R +++ b/R/ProfitParticipation.R @@ -52,8 +52,8 @@ ProfitParticipation = R6Class( #' #' All elements defined in the profit scheme can be overriden per contract #' in the call to \code{[InsuranceContract]$new} or even in the explicit - #' call to \ifelse{html}{\href{InsuranceContract.html#method-profitScenario}{\code{InsuranceContract$profitScenario()}}}{\code{InsuranceContract$profitScenario()()}} - #' or \ifelse{html}{\href{InsuranceContract.html#method-addProfitScenario}{\code{InsuranceContract$addProfitScenario()}}}{\code{InsuranceContract$addProfitScenario()()}}. + #' call to \ifelse{html}{\href{../../LifeInsuranceContracts/html/InsuranceContract.html#method-profitScenario}{\code{InsuranceContract$profitScenario()}}}{\code{InsuranceContract$profitScenario()()}} + #' or \ifelse{html}{\href{../../LifeInsuranceContracts/html/InsuranceContract.html#method-addProfitScenario}{\code{InsuranceContract$addProfitScenario()}}}{\code{InsuranceContract$addProfitScenario()()}}. #' #' Parameters = InsuranceContract.ParameterStructure$ProfitParticipation, @@ -367,7 +367,7 @@ ProfitParticipation = R6Class( #' @param profitScenario profit participation values from a previous calculation #' (NULL if profit calculation is to be calculated from the contract inception). #' Values before \code{calculateFrom} will be used from this data.frame. - #' @param ... additional parameters to be passed to \href{ProfitParticipation.html#method-setupRates}{\code{ProfitParticipation$setupRates()}} + #' @param ... additional parameters to be passed to \href{../../LifeInsuranceContracts/html/ProfitParticipation.html#method-setupRates}{\code{ProfitParticipation$setupRates()}} getProfitParticipation = function(calculateFrom = 0, profitScenario = NULL, params, values, ...) { waiting = valueOrFunction(params$ProfitParticipation$waitingPeriod, params = params, values = values); if (is.numeric(waiting) && waiting > 0) { diff --git a/R/contractGrid.R b/R/contractGrid.R index 53a58a9..407e9f7 100644 --- a/R/contractGrid.R +++ b/R/contractGrid.R @@ -23,7 +23,7 @@ #' The \code{axes} list describing the parameters changing along the axes of the #' resulting grid is internally expanded with [expand.grid()]. The resulting flat #' list of parameter (together with the fixed parameters passed as \code{...}) -#' is then passed to the \ifelse{html}{\href{InsuranceContract.html#method-new}{\code{InsuranceContract$new()}}}{\code{InsuranceContract$new()()}} call to create the corresponding +#' is then passed to the \ifelse{html}{\href{../../LifeInsuranceContracts/html/InsuranceContract.html#method-new}{\code{InsuranceContract$new()}}}{\code{InsuranceContract$new()()}} call to create the corresponding #' contract object. #' #' To create the human-readable row-/columnnames of the resulting array, @@ -36,7 +36,7 @@ #' @param axes List of paramters spanning the dimensions of the grid. #' @param YOB optional year of bith. If missing, the \code{observationYear} and the contract's age #' @param observationYear The observation year, for which the grid shall be calculated. If given, the YOB is calculated from it, otherwise the contract's YOB is used -#' @param ... In \code{contractGrid}: Additional parameters to be passed to \ifelse{html}{\href{InsuranceContract.html#method-new}{\code{InsuranceContract$new()}}}{\code{InsuranceContract$new()()}}; In \code{contractGridPremium}: Additional parameters to be passed to \code{contractGrid}. +#' @param ... In \code{contractGrid}: Additional parameters to be passed to \ifelse{html}{\href{../../LifeInsuranceContracts/html/InsuranceContract.html#method-new}{\code{InsuranceContract$new()}}}{\code{InsuranceContract$new()()}}; In \code{contractGridPremium}: Additional parameters to be passed to \code{contractGrid}. # # Params of the contractGridPreimium function: #' @param contractGrid (optional) existing contract grid from which to derive diff --git a/man/InsuranceTarif.Rd b/man/InsuranceTarif.Rd index 8d34830..872286f 100644 --- a/man/InsuranceTarif.Rd +++ b/man/InsuranceTarif.Rd @@ -988,7 +988,7 @@ parameters and the already calculated reserves of the contract. scheme and the contract)} \item{\code{...}}{Additional parameters for the profit participation calculation, passed -through to the profit participation scheme's \href{ProfitParticipation.html#method-getProfitParticipation}{\code{ProfitParticipation$getProfitParticipation()}}} +through to the profit participation scheme's \href{../../LifeInsuranceContracts/html/ProfitParticipation.html#method-getProfitParticipation}{\code{ProfitParticipation$getProfitParticipation()}}} } \if{html}{\out{</div>}} } diff --git a/man/ProfitParticipation.Rd b/man/ProfitParticipation.Rd index f28b884..38d6832 100644 --- a/man/ProfitParticipation.Rd +++ b/man/ProfitParticipation.Rd @@ -71,8 +71,8 @@ parameters, i.e. the \code{ProfitParticipation} element of the All elements defined in the profit scheme can be overriden per contract in the call to \code{[InsuranceContract]$new} or even in the explicit -call to \ifelse{html}{\href{InsuranceContract.html#method-profitScenario}{\code{InsuranceContract$profitScenario()}}}{\code{InsuranceContract$profitScenario()()}} -or \ifelse{html}{\href{InsuranceContract.html#method-addProfitScenario}{\code{InsuranceContract$addProfitScenario()}}}{\code{InsuranceContract$addProfitScenario()()}}.} +call to \ifelse{html}{\href{../../LifeInsuranceContracts/html/InsuranceContract.html#method-profitScenario}{\code{InsuranceContract$profitScenario()}}}{\code{InsuranceContract$profitScenario()()}} +or \ifelse{html}{\href{../../LifeInsuranceContracts/html/InsuranceContract.html#method-addProfitScenario}{\code{InsuranceContract$addProfitScenario()}}}{\code{InsuranceContract$addProfitScenario()()}}.} \item{\code{Functions}}{list of functions defined to calculate the individual components. For each of the profit components @@ -346,7 +346,7 @@ scheme and the contract)} \item{\code{values}}{Contract values calculated so far (guaranteed component of the insurance contract, including cash flows, premiums, reserves etc.).} -\item{\code{...}}{additional parameters to be passed to \href{ProfitParticipation.html#method-setupRates}{\code{ProfitParticipation$setupRates()}}} +\item{\code{...}}{additional parameters to be passed to \href{../../LifeInsuranceContracts/html/ProfitParticipation.html#method-setupRates}{\code{ProfitParticipation$setupRates()}}} } \if{html}{\out{</div>}} } diff --git a/man/contractGrid.Rd b/man/contractGrid.Rd index b9b21cc..e0f6359 100644 --- a/man/contractGrid.Rd +++ b/man/contractGrid.Rd @@ -26,7 +26,7 @@ contractGridPremium( \item{observationYear}{The observation year, for which the grid shall be calculated. If given, the YOB is calculated from it, otherwise the contract's YOB is used} -\item{...}{In \code{contractGrid}: Additional parameters to be passed to \ifelse{html}{\href{InsuranceContract.html#method-new}{\code{InsuranceContract$new()}}}{\code{InsuranceContract$new()()}}; In \code{contractGridPremium}: Additional parameters to be passed to \code{contractGrid}.} +\item{...}{In \code{contractGrid}: Additional parameters to be passed to \ifelse{html}{\href{../../LifeInsuranceContracts/html/InsuranceContract.html#method-new}{\code{InsuranceContract$new()}}}{\code{InsuranceContract$new()()}}; In \code{contractGridPremium}: Additional parameters to be passed to \code{contractGrid}.} \item{contractGrid}{(optional) existing contract grid from which to derive premiums. If not given, \link{contractGrid} is called with all parameters, so @@ -64,7 +64,7 @@ function \code{contractGridPremium}. The \code{axes} list describing the parameters changing along the axes of the resulting grid is internally expanded with \code{\link[=expand.grid]{expand.grid()}}. The resulting flat list of parameter (together with the fixed parameters passed as \code{...}) -is then passed to the \ifelse{html}{\href{InsuranceContract.html#method-new}{\code{InsuranceContract$new()}}}{\code{InsuranceContract$new()()}} call to create the corresponding +is then passed to the \ifelse{html}{\href{../../LifeInsuranceContracts/html/InsuranceContract.html#method-new}{\code{InsuranceContract$new()}}}{\code{InsuranceContract$new()()}} call to create the corresponding contract object. To create the human-readable row-/columnnames of the resulting array, -- GitLab