Provide Austrian Annuity and Population tables also in an array (for quicker access)

inst/extdata/MortalityTables_Austria_Annuities_AVOe1996R.R

@@ -92,5 +92,21 @@ AVOe1996R.female.av325 = mortalityTable.ageShift(
     )
 )
 
+
+AVOe1996R = array(
+    data = c(mortalityTable.NA),
+    dim = c(2, 2, 2),
+    dimnames = list(Geschlecht = c("m", "w"), Collar = c("Einzel", "Gruppe", "AV"))
+)
+
+AVOe1996R[["m", "Einzel"]] = AVOe1996R.male
+AVOe1996R[["w", "Einzel"]] = AVOe1996R.female
+
+AVOe1996R[["m", "Gruppe"]] = AVOe1996R.male.group
+AVOe1996R[["w", "Gruppe"]] = AVOe1996R.female.group
+AVOe1996R[["m", "AV"]] = AVOe1996R.male.av325
+AVOe1996R[["w", "AV"]] = AVOe1996R.female.av325
+
+
 rm(AVOe1996R.exakt.data)
 

inst/extdata/MortalityTables_Austria_Annuities_AVOe2005R.R

@@ -27,7 +27,7 @@ AVOe2005R_gen = function(nm, probs, trend, sex = "m", data = "loaded") {
             trend = AVOe2005R.exakt.data[[trend]],
             dampingFunction = AVOe2005R.trend.damping,
             data = list(
-                dim = list(sex = sex, collar = "Rententafel", type = "Rententafel Österreich", data = data, year = "AVÖ 2005-R")
+                dim = list(sex = sex, collar = "Rententafel", type = "Rententafel Österreich", data = data, year = "AVÖ 2005-R", table = "AVÖ 2005-R")
             )
         )
     )
@@ -103,6 +103,58 @@ AVOe2005R.unisex.group.av = AVOe2005R_gen.av(
     "qu1972G", "shiftUG", sex = "u", data = "age-shift, loaded, group")
 
 
+AVOe2005R = array(
+    data = c(mortalityTable.NA),
+    dim = c(3, 2, 2),
+    dimnames = list(Geschlecht = c("m", "w", "u"), Collar = c("Einzel", "Gruppe"), Type = c("loaded", "unloaded"))
+)
+
+AVOe2005R.nodamping = array(
+    data = c(mortalityTable.NA),
+    dim = c(3, 2, 2),
+    dimnames = list(Geschlecht = c("m", "w", "u"), Collar = c("Einzel", "Gruppe"), Type = c("loaded", "unloaded"))
+)
+
+AVOe2005R[["m", "Einzel", "loaded"]] =   AVOe2005R.male
+AVOe2005R[["w", "Einzel", "loaded"]] =   AVOe2005R.female
+AVOe2005R[["u", "Einzel", "loaded"]] =   AVOe2005R.unisex
+AVOe2005R[["m", "Gruppe", "loaded"]] =   AVOe2005R.male.group
+AVOe2005R[["w", "Gruppe", "loaded"]] =   AVOe2005R.female.group
+AVOe2005R[["u", "Gruppe", "loaded"]] =   AVOe2005R.unisex.group
+
+AVOe2005R[,, "unloaded"] = NA
+AVOe2005R[["m", "Einzel", "unloaded"]] = AVOe2005R.male.unloaded
+AVOe2005R[["w", "Einzel", "unloaded"]] = AVOe2005R.female.unloaded
+
+
+
+
+AVOe2005R.nodamping[["m", "Einzel", "loaded"]] =     AVOe2005R.male.nodamping
+AVOe2005R.nodamping[["w", "Einzel", "loaded"]] =     AVOe2005R.female.nodamping
+AVOe2005R.nodamping[["u", "Einzel", "loaded"]] =     AVOe2005R.unisex.nodamping
+AVOe2005R.nodamping[["m", "Gruppe", "loaded"]] =     AVOe2005R.male.nodamping.group
+AVOe2005R.nodamping[["w", "Gruppe", "loaded"]] =     AVOe2005R.female.nodamping.group
+AVOe2005R.nodamping[["u", "Gruppe", "loaded"]] =     AVOe2005R.unisex.nodamping.group
+
+AVOe2005R.nodamping[, , "unloaded"] = NA
+AVOe2005R.nodamping[["m", "Einzel", "unloaded"]] = AVOe2005R.male.nodamping.unloaded
+AVOe2005R.nodamping[["w", "Einzel", "unloaded"]] = AVOe2005R.female.nodamping.unloaded
+
+
+AVOe2005R.av = array(
+    data = c(mortalityTable.NA),
+    dim = c(3, 2),
+    dimnames = list(Geschlecht = c("m", "w", "u"), Collar = c("Einzel", "Gruppe"))
+)
+
+AVOe2005R.av[["m", "Einzel"]] = AVOe2005R.male.av
+AVOe2005R.av[["w", "Einzel"]] = AVOe2005R.female.av
+AVOe2005R.av[["u", "Einzel"]] = AVOe2005R.unisex.av
+AVOe2005R.av[["m", "Gruppe"]] = AVOe2005R.male.group.av
+AVOe2005R.av[["w", "Gruppe"]] = AVOe2005R.female.group.av
+AVOe2005R.av[["u", "Gruppe"]] = AVOe2005R.unisex.group.av
+
+
 
 ###############################################################################
 

inst/extdata/MortalityTables_Austria_Census.R

@@ -55,6 +55,56 @@ mort.AT.census.2001.unisex = mortalityTable.mixed(table1 = mort.AT.census.2001.m
 )
 mort.AT.census.2011.unisex = censtable(a.vz.dataU, name = "ÖVSt 2010/2012 U", baseYear = 2011, qslot = "X2010.12", sex = "u")
 
+mort.AT.census = array(
+  data = c(mortalityTable.NA),
+  dim = c(3, 13),
+  dimnames = list(Geschlecht = c("m", "w", "u"), Jahr = c("1869", "1880", "1890", "1900", "1910", "1931", "1951", "1961", "1971", "1981", "1991", "2001", "2011"))
+)
+mort.AT.census[["m", "1869"]] = mort.AT.census.1869.male
+mort.AT.census[["m", "1880"]] = mort.AT.census.1880.male
+mort.AT.census[["m", "1890"]] = mort.AT.census.1890.male
+mort.AT.census[["m", "1900"]] = mort.AT.census.1900.male
+mort.AT.census[["m", "1910"]] = mort.AT.census.1910.male
+mort.AT.census[["m", "1931"]] = mort.AT.census.1931.male
+mort.AT.census[["m", "1951"]] = mort.AT.census.1951.male
+mort.AT.census[["m", "1961"]] = mort.AT.census.1961.male
+mort.AT.census[["m", "1971"]] = mort.AT.census.1971.male
+mort.AT.census[["m", "1981"]] = mort.AT.census.1981.male
+mort.AT.census[["m", "1991"]] = mort.AT.census.1991.male
+mort.AT.census[["m", "2001"]] = mort.AT.census.2001.male
+mort.AT.census[["m", "2011"]] = mort.AT.census.2011.male
+
+mort.AT.census[["w", "1869"]] = mort.AT.census.1869.female
+mort.AT.census[["w", "1880"]] = mort.AT.census.1880.female
+mort.AT.census[["w", "1890"]] = mort.AT.census.1890.female
+mort.AT.census[["w", "1900"]] = mort.AT.census.1900.female
+mort.AT.census[["w", "1910"]] = mort.AT.census.1910.female
+mort.AT.census[["w", "1931"]] = mort.AT.census.1931.female
+mort.AT.census[["w", "1951"]] = mort.AT.census.1951.female
+mort.AT.census[["w", "1961"]] = mort.AT.census.1961.female
+mort.AT.census[["w", "1971"]] = mort.AT.census.1971.female
+mort.AT.census[["w", "1981"]] = mort.AT.census.1981.female
+mort.AT.census[["w", "1991"]] = mort.AT.census.1991.female
+mort.AT.census[["w", "2001"]] = mort.AT.census.2001.female
+mort.AT.census[["w", "2011"]] = mort.AT.census.2011.female
+
+mort.AT.census[["u", "1869"]] = NA
+mort.AT.census[["u", "1880"]] = NA
+mort.AT.census[["u", "1890"]] = NA
+mort.AT.census[["u", "1900"]] = NA
+mort.AT.census[["u", "1910"]] = NA
+mort.AT.census[["u", "1931"]] = NA
+mort.AT.census[["u", "1951"]] = NA
+mort.AT.census[["u", "1961"]] = NA
+mort.AT.census[["u", "1971"]] = NA
+mort.AT.census[["u", "1981"]] = NA
+mort.AT.census[["u", "1991"]] = NA
+mort.AT.census[["u", "2001"]] = mort.AT.census.2001.unisex
+mort.AT.census[["u", "2011"]] = mort.AT.census.2011.unisex
+
+
+
+
 mort.AT.census.ALL.male = MortalityTables::makeQxDataFrame(
               mort.AT.census.1869.male,
               mort.AT.census.1880.male,