mortalityTable: Add data slot, store raw data of whittaker graduatino; Fix wrong NULL check

R/mortalityTable.R

@@ -19,6 +19,9 @@
 #'        to give the user a way to modify the final probabilities
 #' @slot loading  Additional security loading on the resulting table (single numeric
 #'        value, e.g. 0.05 adds 5\% security margin to the probabilities)
+#' @slot data Placeholder list to make it possible to store any kind of data
+#'        associated with the object inside the object (e.g. the underlying
+#'        data used to derive the death probabilities, parameters for adjustment, etc.)
 #'
 #' @export mortalityTable
 #' @exportClass mortalityTable
@@ -28,13 +31,15 @@ mortalityTable = setClass(
         name = "character",
         baseYear = "numeric",
         loading = "numeric",
-        modification = "function"
+        modification = "function",
+        data = "list"
     ),
     prototype = list(
         name = "Actuarial Mortality Table",
         baseYear = 0,
         loading = 0,
-        modification = identity
+        modification = identity,
+        data = list()
     ),
     contains = "VIRTUAL"
 )

R/whittaker.mortalityTable.R

@@ -80,7 +80,7 @@ whittaker.mortalityTable = function(table, lambda = 10, d = 2, name.postfix = ",
     ages = table@ages
 
     if (missing(weights) || is.null(weights)) {
-        if (is.na(table@exposures) || is.null(table@exposures)) {
+        if (is.null(table@exposures) || is.na(table@exposures)) {
             weights = rep(1, length(ages))
         } else {
             weights = table@exposures
@@ -114,6 +114,8 @@ whittaker.mortalityTable = function(table, lambda = 10, d = 2, name.postfix = ",
     # above the last raw probability to NA
     probsToClear = (cumsum(!is.na(orig.probs)) == 0) | (rev(cumsum(rev(!is.na(orig.probs)))) == 0)
     probs.smooth[probsToClear] = NA_real_
+    table@data$rawProbs = orig.probs
+    table@data$whittaker = list(weights = weights)
     table@deathProbs = probs.smooth
 
     table