Fix UTF-8 strings in DESCRIPTION, fix imports

DESCRIPTION

@@ -12,6 +12,7 @@ Description: R6 classes to model traditional life insurance
 Authors@R: c(person("Reinhold", "Kainhofer", role=c("aut", "cre"), email="reinhold@kainhofer.com"))
 Author: Reinhold Kainhofer [aut, cre]
 Maintainer: Reinhold Kainhofer <reinhold@kainhofer.com>
+Encoding: UTF-8
 Imports:
     R6,
     MortalityTables,
@@ -24,7 +25,7 @@ Imports:
     stringr,
     methods
 License: GPL (>= 2)
-RoxygenNote: 6.0.1
+RoxygenNote: 6.1.1
 Collate:
     'HelperFunctions.R'
     'InsuranceParameters.R'

NAMESPACE

@@ -60,6 +60,7 @@ import(openxlsx)
 import(scales)
 import(stringr)
 importFrom(abind,abind)
+importFrom(lubridate,"year<-")
 importFrom(lubridate,days)
 importFrom(lubridate,month)
 importFrom(lubridate,year)

R/InsuranceTarif.R

@@ -2,7 +2,7 @@
 #'
 #' @import MortalityTables
 #' @import R6
-#' @importFrom lubridate year month years days
+#' @importFrom lubridate year month years days year<-
 #' @importFrom objectProperties setSingleEnum
 NULL
 

R/contractGrid.R

@@ -22,6 +22,7 @@ contractGrid = function(axes = list(age = seq(20, 60, 10), policyPeriod = seq(5,
 }
 
 makeContractGridDimname.InsuranceTarif = function(tarif) { tarif$name }
+makeContractGridDimname.R6 = function(tarif) { tarif$name }
 makeContractGridDimname.mortalityTable = function(table) { table@name }
 makeContractGridDimname.numeric = function(value) { value }
 makeContractGridDimname.default = function(value) { value }

man/InsuranceContract.ParametersFallback.Rd

@@ -4,7 +4,8 @@
 \alias{InsuranceContract.ParametersFallback}
 \title{InsuranceContract.ParametersFallback}
 \usage{
-InsuranceContract.ParametersFallback(params, fallback, ppParameters = TRUE)
+InsuranceContract.ParametersFallback(params, fallback,
+  ppParameters = TRUE)
 }
 \arguments{
 \item{params}{Current, explicitly set contract parameters. All NULL values

man/ProfitParticipationFunctions.Rd

@@ -64,32 +64,36 @@ profPart.rate.totalInterest2(rates, params, values, ...)
 
 profPart.rate.interestProfit2(rates, params, values, ...)
 
-profPart.calculate.RateOnBase(base, rate, waiting, rates, params, values, ...)
+profPart.calculate.RateOnBase(base, rate, waiting, rates, params, values,
+  ...)
 
-profPart.calculate.RatePlusGuaranteeOnBase(base, rate, waiting, rates, params,
-  values, ...)
+profPart.calculate.RatePlusGuaranteeOnBase(base, rate, waiting, rates,
+  params, values, ...)
 
 profPart.calculate.RateOnBaseSGFFactor(base, rate, waiting, rates, params,
   values, ...)
 
-profPart.benefit.ProfitPlusTerminalBonusReserve(profits, rates, params, values)
+profPart.benefit.ProfitPlusTerminalBonusReserve(profits, rates, params,
+  values)
 
 profPart.benefit.Profit(profits, rates, params, values)
 
-profPart.benefit.ProfitPlusGuaranteedInterest(profits, rates, params, values)
+profPart.benefit.ProfitPlusGuaranteedInterest(profits, rates, params,
+  values)
 
 profPart.benefit.ProfitPlusTotalInterest(profits, rates, params, values)
 
-profPart.benefit.ProfitPlusHalfTotalInterest(profits, rates, params, values)
+profPart.benefit.ProfitPlusHalfTotalInterest(profits, rates, params,
+  values)
 
 profPart.benefit.ProfitPlusHalfGuaranteedInterest(profits, rates, params,
   values)
 
-profPart.benefit.ProfitPlusInterestMinGuaranteeTotal(profits, rates, params,
-  values)
+profPart.benefit.ProfitPlusInterestMinGuaranteeTotal(profits, rates,
+  params, values)
 
-profPart.benefit.ProfitPlusHalfInterestMinGuaranteeTotal(profits, rates, params,
-  values)
+profPart.benefit.ProfitPlusHalfInterestMinGuaranteeTotal(profits, rates,
+  params, values)
 
 profPart.benefit.TerminalBonus5YearsProRata(profits, rates, params, values)
 }

man/addDataTableWorksheet.Rd

@@ -5,8 +5,8 @@
 \title{Add a new worksheet to the excel workbook and export the given data table x to it nicely formatted.}
 \usage{
 addDataTableWorksheet(wb, sheet, title = NULL, x = NULL, loopdim = 3,
-  style = NULL, tableStyle = "TableStyleMedium17", comparisons = NULL,
-  comparisonStyle = NULL, ...)
+  style = NULL, tableStyle = "TableStyleMedium17",
+  comparisons = NULL, comparisonStyle = NULL, ...)
 }
 \description{
 Add a new worksheet to the excel workbook and export the given data table x to it nicely formatted.

man/contractGrid.Rd

@@ -8,8 +8,8 @@ This function will return the full InsuranceContract objects, so apply can
 later be used to extract premiums, reserves and other values to display in
 a grid.}
 \usage{
-contractGrid(axes = list(age = seq(20, 60, 10), policyPeriod = seq(5, 35, 5)),
-  YOB = NULL, observationYear = NULL, ...)
+contractGrid(axes = list(age = seq(20, 60, 10), policyPeriod = seq(5, 35,
+  5)), YOB = NULL, observationYear = NULL, ...)
 }
 \description{
 Create a multi-dimensional grid of InsuranceContract objects, where the axes

man/showVmGlgExamples.Rd

@@ -4,8 +4,8 @@
 \alias{showVmGlgExamples}
 \title{Display insurance contract calculation example}
 \usage{
-showVmGlgExamples(contract, prf = 10, t = 10, t_prf = 12, file = "",
-  ...)
+showVmGlgExamples(contract, prf = 10, t = 10, t_prf = 12,
+  file = "", ...)
 }
 \arguments{
 \item{contract}{The insurance contract to calculate and show}