diff --git a/R/Tables/AVOe_R.xlsx b/R/Tables/AVOe_R.xlsx
deleted file mode 100644
index 1e57b8f0169f4fa112da8885708f54192a2e8848..0000000000000000000000000000000000000000
Binary files a/R/Tables/AVOe_R.xlsx and /dev/null differ
diff --git a/R/Tables/Overview_Tables.ods b/R/Tables/Overview_Tables.ods
deleted file mode 100644
index 1a52a0cf19a36a1c5e93546f76698fdae7c2f256..0000000000000000000000000000000000000000
Binary files a/R/Tables/Overview_Tables.ods and /dev/null differ
diff --git a/R/ValuationTables_Austria_Annuities.R b/R/ValuationTables_Austria_Annuities.R
deleted file mode 100644
index 5ccfd271eee00c85cee91b30770d3cce5627791e..0000000000000000000000000000000000000000
--- a/R/ValuationTables_Austria_Annuities.R
+++ /dev/null
@@ -1,201 +0,0 @@
-# frame_files = lapply(sys.frames(), function(x) x$ofile)
-# frame_files = Filter(Negate(is.null), frame_files)
-# PATH <- dirname(frame_files[[length(frame_files)]])
-# rm(frame_files)
-# setwd(dirname(PATH))
-
-# setwd("R")
-library("openxlsx")
-
-
-
-###############################################################################
-### RR67 Rententafel für Männer, 3%
-###############################################################################
-
-rr67.data=openxlsx::read.xlsx("Tables/AVOe_R.xlsx",
- sheet="OeVM59-61 RR67", startRow = 3, colNames = TRUE);
-
-rr67=valuationTable.period(
- name="ÖVM 59/61 RR67", ages=rr67.data$Alter, deathProbs=rr67.data$qx
-);
-# rm(rr67.data);
-
-
-###############################################################################
-### EROM/EROF 85 and G 1985 (period and age-shifted generation)
-###############################################################################
-
-eromf.data=openxlsx::read.xlsx("Tables/AVOe_R.xlsx", sheet="EROM-F Basistafeln", startRow = 3)
-
-erom85.male=valuationTable.period(
- name="EROM 85, male", ages=eromf.data$Alter, deathProbs=eromf.data$EROM.85
-);
-erom85.female=valuationTable.period(
- name="EROF 85, female", ages=eromf.data$Alter, deathProbs=eromf.data$EROF.85
-);
-
-EROM.G1950.male=valuationTable.period(
- name="EROM G 1950 Basistafel, male",
- ages=eromf.data$Alter,
- deathProbs=eromf.data$EROM.G1950,
- baseYear=1950
-);
-EROF.G1950.female=valuationTable.period(
- name="EROF G 1950 Basistafel, female",
- ages=eromf.data$Alter,
- deathProbs=eromf.data$EROF.G1950,
- baseYear=1950
-);
-
-eromf.data.av=openxlsx::read.xlsx("Tables/AVOe_R.xlsx", sheet="EROM-F G AV", startRow = 3, rowNames = TRUE, colNames = TRUE)
-
-EROM.G1950.male.av=valuationTable.ageShift(
- name="EROM G 1950 mit Altersverschiebung, male",
- ages=eromf.data$Alter,
- deathProbs=eromf.data$EROM.G1950,
- ageShifts=eromf.data.av["Shift.M"],
- baseYear=1950
-);
-EROF.G1950.female.av=valuationTable.ageShift(
- name="EROF G 1950 mit Altersverschiebung, female",
- ages=eromf.data$Alter,
- deathProbs=eromf.data$EROF.G1950,
- ageShifts=eromf.data.av["Shift.F"],
- baseYear=1950
-);
-
-
-###############################################################################
-# AVÖ 1996R exact (Male, Female), 1st-order only
-###############################################################################
-
-AVOe1996R.exakt.data=openxlsx::read.xlsx("Tables/AVOe_R.xlsx",
- sheet="AVOe 1996R exakt", startRow = 3, cols=c(1:6, 8:12));
-
-AVOe1996R.exakt.data
-AVOe1996R.trend.switching=function(year) {
- if (year<=1971) {
- 15/(1991-year)
- } else if (1971<year && year<1981) {
- 1+(year-1981)^2/(year-1991)/20
- } else if (1981<=year && year<=2000) {
- 1
- } else if (2000<year && year<2010) {
- 1-(year-2000)^2/(year-1991)/20
- } else if (year>=2010) {
- 14/(year-1991)
- }
-}
-
-AVÖ1996R.male=valuationTable.trendProjection(
- name="AVÖ 1996R male",
- ages=AVOe1996R.exakt.data$age, baseYear=1991,
- deathProbs=AVOe1996R.exakt.data$qx1991 * AVOe1996R.exakt.data$factorM,
- trend=AVOe1996R.exakt.data$trendM.long,
- trend2=AVOe1996R.exakt.data$trendM.short,
- dampingFunction=AVOe1996R.trend.switching
-);
-AVÖ1996R.female=valuationTable.trendProjection(
- name="AVÖ 1996R female",
- ages=AVOe1996R.exakt.data$age, baseYear=1991,
- deathProbs=AVOe1996R.exakt.data$qy1991 * AVOe1996R.exakt.data$factorF,
- trend=AVOe1996R.exakt.data$trendF.long,
- trend2=AVOe1996R.exakt.data$trendF.short,
- dampingFunction=AVOe1996R.trend.switching
-);
-AVÖ1996R.male.group=valuationTable.trendProjection(
- name="AVÖ 1996R male, group",
- ages=AVOe1996R.exakt.data$age, baseYear=1991,
- deathProbs=AVOe1996R.exakt.data$qx1991 * AVOe1996R.exakt.data$factorMG,
- trend=AVOe1996R.exakt.data$trendM.long,
- trend2=AVOe1996R.exakt.data$trendM.short,
- dampingFunction=AVOe1996R.trend.switching
-);
-AVÖ1996R.female.group=valuationTable.trendProjection(
- name="AVÖ 1996R female, group",
- ages=AVOe1996R.exakt.data$age, baseYear=1991,
- deathProbs=AVOe1996R.exakt.data$qy1991 * AVOe1996R.exakt.data$factorFG,
- trend=AVOe1996R.exakt.data$trendF.long,
- trend2=AVOe1996R.exakt.data$trendF.short,
- dampingFunction=AVOe1996R.trend.switching
-);
-
-
-
-###############################################################################
-# AVÖ 2005R exact (Male, Female, unisex)
-# gender-specific tables also have 2nd-order tables, unisex only 1st-order table
-###############################################################################
-
-AVOe2005R.exakt.data=openxlsx::read.xlsx("Tables/AVOe_R.xlsx", sheet="AVOe 2005R", startRow = 3, cols=c(1:7, 9:14, 16:18));
-
-AVOe2005R.trend.damping=function(t) {
- 100*atan(t/100)
-}
-AVOe2005R_gen=function(nm, probs, trend) {
- with(
- AVOe2005R.exakt.data,
- valuationTable.trendProjection(
- name=nm,
- ages=age, baseYear=2001,
- deathProbs=AVOe2005R.exakt.data[[probs]], trend=AVOe2005R.exakt.data[[trend]],
- dampingFunction=AVOe2005R.trend.damping
- )
- )
-}
-
-AVOe2005R.male =AVOe2005R_gen("AVÖ 2005R male (exact), loaded", "qx2001", "trendM");
-AVOe2005R.female=AVOe2005R_gen("AVÖ 2005R female (exact), loaded", "qy2001", "trendF");
-AVOe2005R.unisex=AVOe2005R_gen("AVÖ 2005R unisex (exact), loaded", "qu2001", "trendU");
-AVOe2005R.male.unloaded =AVOe2005R_gen("AVÖ 2005R male (exact), unloaded", "qx2001.2Ord", "trendM.2Ord");
-AVOe2005R.female.unloaded=AVOe2005R_gen("AVÖ 2005R female (exact), unloaded", "qy2001.2Ord", "trendF.2Ord");
-AVOe2005R.male.group =AVOe2005R_gen("AVÖ 2005R male group (exact), loaded", "qx2001G", "trendM");
-AVOe2005R.female.group=AVOe2005R_gen("AVÖ 2005R female group (exact), loaded", "qy2001G", "trendF");
-AVOe2005R.unisex.group=AVOe2005R_gen("AVÖ 2005R unisex group (exact), loaded", "qu2001G", "trendU");
-
-AVOe2005R.male.nodamping = undampenTrend(AVOe2005R.male);
-AVOe2005R.female.nodamping = undampenTrend(AVOe2005R.female);
-AVOe2005R.unisex.nodamping = undampenTrend(AVOe2005R.unisex);
-AVOe2005R.male.nodamping.unloaded = undampenTrend(AVOe2005R.male.unloaded);
-AVOe2005R.female.nodamping.unloaded = undampenTrend(AVOe2005R.female.unloaded);
-AVOe2005R.male.nodamping.group = undampenTrend(AVOe2005R.male.group);
-AVOe2005R.female.nodamping.group = undampenTrend(AVOe2005R.female.group);
-AVOe2005R.unisex.nodamping.group = undampenTrend(AVOe2005R.unisex.group);
-
-
-###############################################################################
-#AVÖ 2005R with age-shifting (Male, Female, unisex), 1st-order only
-###############################################################################
-
-AVOe2005R.av.base = openxlsx::read.xlsx("Tables/AVOe_R.xlsx", sheet="AVOe 2005R AV Basistafel", startRow = 3, rowNames = FALSE);
-AVOe2005R.av.verschiebung = openxlsx::read.xlsx("Tables/AVOe_R.xlsx", sheet="AVOe 2005R AV Verschiebung", startRow = 3, rowNames = TRUE);
-
-AVOe2005R_gen.av=function(nm, probs, shft) {
- valuationTable.ageShift(
- name=nm,
- ages=AVOe2005R.av.base$age,
- deathProbs=AVOe2005R.av.base[[probs]],
- ageShifts=na.omit(AVOe2005R.av.verschiebung[shft])
- )
-}
-
-AVOe2005R.male.av =AVOe2005R_gen.av("AVÖ 2005R male (age-shifted), loaded", "qx1965", "shiftM");
-AVOe2005R.female.av=AVOe2005R_gen.av("AVÖ 2005R female (age-shifted), loaded", "qy1965", "shiftF");
-AVOe2005R.unisex.av=AVOe2005R_gen.av("AVÖ 2005R unisex (age-shifted), loaded", "qu1972", "shiftU");
-AVOe2005R.male.group.av =AVOe2005R_gen.av("AVÖ 2005R male group (age-shifted), loaded", "qx1965G", "shiftMG");
-AVOe2005R.female.group.av=AVOe2005R_gen.av("AVÖ 2005R female group (age-shifted), loaded", "qy1965G", "shiftFG");
-AVOe2005R.unisex.group.av=AVOe2005R_gen.av("AVÖ 2005R unisex group (age-shifted), loaded", "qu1972G", "shiftUG");
-
-
-
-###############################################################################
-
-# options("scipen" = 3, "digits"=10)
-# t=AVOe2005R.unisex;
-# deathProbabilities(t, YOB=1981)
-
-# plotValuationTables(mort.AT.census.1869.male, mort.AT.census.1869.female, mort.AT.census.2011.male, mort.AT.census.2011.female, AVOe2005R.male, AVOe2005R.female, YOB=1972,title="Vergleich österreichische Sterbetafeln, YOB=1972 (bei Generationentafeln)")
-#
-# plotValuationTables(mort.AT.census.2001.male, AVOe2005R.male, YOB=1972, title="Vergleich österreichische Sterbetafeln")
-plotValuationTables(getCohortTable(AVOe2005R.male, YOB=1972), getCohortTable(AVOe2005R.male, YOB=2016), title="Vergleich österreichische Sterbetafeln")
diff --git a/data/Austria_Annuities_AVOe1996R.csv b/data/Austria_Annuities_AVOe1996R.csv
new file mode 100644
index 0000000000000000000000000000000000000000..158b7b884f24864b50324fde3ff8a345c2018cf3
--- /dev/null
+++ b/data/Austria_Annuities_AVOe1996R.csv
@@ -0,0 +1,117 @@
+AVÖ 1996R Generationentafeln,,,,,,,,,,
+,Männer,,,,,Frauen,,,,
+age,qx1991,trendM long,trendM short,factorMG,factorM,qy1991,trendF long,trendF short,factorFG,factorF
+0,0.0084686,0.045780839322034,0.062792362,0.8,0.8,0.0067104,0.049763218294738,0.049763218294738,0.8,0.8
+1,0.0005477,0.0455624991333896,0.046734646,0.8,0.8,0.0005155,0.0463588998451518,0.0463588998451518,0.8,0.8
+2,0.0004539,0.0445589383626771,0.046695544,0.8,0.8,0.0004117,0.045568312499516,0.045568312499516,0.8,0.8
+3,0.0003739,0.0429663572317243,0.046656442,0.8,0.8,0.0003175,0.044453791013854,0.044453791013854,0.8,0.8
+4,0.0003086,0.0410116158440628,0.046617341,0.8,0.8,0.0002377,0.0431260876112459,0.0431260876112459,0.8,0.8
+5,0.0002571,0.0389562493886482,0.046578239,0.8,0.8,0.0001803,0.0417058756205811,0.0417058756205811,0.8,0.8
+6,0.0002165,0.0371009184621877,0.046539137,0.8,0.8,0.0001413,0.0403248573727864,0.0403248573727864,0.8,0.8
+7,0.0001897,0.0357903018243682,0.046500036,0.8,0.8,0.0001183,0.0391269753222444,0.0391269753222444,0.8,0.8
+8,0.0001677,0.035418452426267,0.046460934,0.8,0.8,0.0001066,0.0382697173174771,0.0382697173174771,0.8,0.8
+9,0.0001532,0.0354636812851688,0.046421832,0.8,0.8,0.0001012,0.0375563071959882,0.0375563071959882,0.8,0.8
+10,0.0001495,0.0350190955,0.04638273,0.8,0.8,0.0000992,0.03667394928,0.0369984,0.8,0.8
+11,0.0001565,0.0339619677534714,0.046343629,0.8,0.8,0.0001005,0.0356215813061646,0.036432,0.8,0.8
+12,0.0001716,0.0321995390445823,0.046304527,0.8,0.8,0.000107,0.0344046249791861,0.0359904,0.8,0.8
+13,0.0001979,0.0296723266432079,0.046265425,0.8,0.8,0.0001205,0.0330356125475103,0.035616,0.8,0.8
+14,0.000262,0.026357509630484,0.045430811,0.8,0.8,0.0001495,0.0315648,0.0353285088,0.8,0.8
+15,0.0003961,0.0222722741962857,0.043005172,0.8,0.8,0.000207,0.0301152,0.0350799264,0.8,0.8
+16,0.0006237,0.01928,0.038988508,0.8,0.8,0.0002816,0.0290592,0.034831344,0.8,0.8
+17,0.0009624,0.01751,0.03474,0.8,0.8,0.0003294,0.02808,0.0345827616,0.8,0.8
+18,0.0013468,0.01673,0.0319,0.8,0.8,0.0003751,0.0274848,0.0343341792,0.8,0.8
+19,0.0015062,0.01634,0.03063,0.8,0.8,0.0004028,0.0271584,0.0340855968,0.8,0.8
+20,0.0014673,0.016,0.03006854,0.8,0.8,0.0004047,0.02680536,0.0338370144,0.8,0.8
+21,0.0013739,0.01591546,0.02988563,0.8,0.8,0.0003893,0.0265969632,0.033588432,0.8,0.8
+22,0.0012821,0.01582696,0.02970619,0.8,0.8,0.0003696,0.0263868576,0.033341616,0.8,0.8
+23,0.0012317,0.01573457,0.02952998,0.8,0.8,0.0003553,0.0261750336,0.0330964608,0.8,0.8
+24,0.0012004,0.01563835,0.02935677,0.8,0.8,0.0003446,0.0259614912,0.0328528608,0.8,0.8
+25,0.0011736,0.01553836,0.02918632,0.8,0.8,0.0003383,0.0257462016,0.0326107008,0.8,0.8
+26,0.001159,0.01543467,0.02901841,0.8,0.8,0.0003501,0.0255291552,0.0323698752,0.8,0.8
+27,0.0011614,0.01532733,0.0288528,0.8,0.8,0.0003747,0.0253103616,0.0321302688,0.8,0.8
+28,0.0011766,0.01521642,0.02868925,0.8,0.8,0.0004077,0.025089792,0.0318917664,0.8,0.8
+29,0.0012047,0.015102,0.02852754,0.8,0.8,0.0004413,0.0248674368,0.031654272,0.8,0.8
+30,0.0012464,0.01498413,0.02836743,0.8,0.8,0.0004719,0.0246433056,0.0314176704,0.8,0.8
+31,0.0013043,0.01486287,0.02820869,0.8,0.8,0.0005098,0.02441736,0.031181856,0.8,0.8
+32,0.0013837,0.01473829,0.02805109,0.8,0.8,0.0005565,0.0241896096,0.030946704,0.8,0.8
+33,0.0014691,0.01461044,0.02789439,0.8,0.8,0.0006056,0.0239600352,0.030712128,0.8,0.8
+34,0.0015485,0.01447941,0.02773836,0.8,0.8,0.000655,0.0237286272,0.0304779936,0.8,0.8
+35,0.0016246,0.01434524,0.02758277,0.8,0.8,0.0007127,0.023495376,0.0302442144,0.8,0.8
+36,0.0017037,0.014208,0.02742738,0.8,0.8,0.0007879,0.023260272,0.0300106656,0.8,0.8
+37,0.0017987,0.01406776,0.02727197,0.8,0.8,0.0008761,0.0230233056,0.029777232,0.8,0.8
+38,0.001941,0.01392457,0.0271163,0.8,0.8,0.0009748,0.0227844576,0.0295438272,0.8,0.8
+39,0.0021488,0.01377851,0.02696014,0.8,0.8,0.0010854,0.0225437376,0.0293103168,0.8,0.8
+40,0.0024129,0.01362963,0.02680325,0.8,0.8,0.0012084,0.0223011168,0.0290766048,0.8,0.8
+41,0.0027102,0.013478,0.0266454,0.8,0.8,0.0013513,0.0220565856,0.028842576,0.8,0.8
+42,0.003018,0.01332368,0.02648636,0.8,0.8,0.0015136,0.021810144,0.0286081344,0.8,0.8
+43,0.0033313,0.01316674,0.0263259,0.8,0.8,0.0016826,0.0215617824,0.0283731456,0.8,0.8
+44,0.0036547,0.01300724,0.02616378,0.8,0.8,0.0018489,0.021311472,0.0281375232,0.8,0.8
+45,0.0039948,0.01284524,0.02599978,0.8,0.8,0.0020112,0.0210592224,0.0279011424,0.8,0.8
+46,0.0043519,0.0126808,0.02583365,0.8,0.8,0.0021721,0.0208050144,0.0276638976,0.8,0.8
+47,0.0047251,0.012514,0.02566517,0.8,0.8,0.0023381,0.0205488384,0.0274256832,0.8,0.8
+48,0.0051126,0.01234489,0.0254941,0.8,0.8,0.0025167,0.0202906848,0.027186384,0.8,0.8
+49,0.005521,0.01217353,0.02532021,0.8,0.8,0.0027108,0.020030544,0.0269458944,0.8,0.8
+50,0.0059701,0.012,0.02514327,0.8,0.8,0.0029238,0.0197684064,0.0267041088,0.8,0.8
+51,0.0064826,0.01182435,0.02496304,0.78,0.78,0.0031576,0.0195042528,0.0264609024,0.78,0.78
+52,0.0070816,0.01164665,0.0247793,0.76,0.76,0.0034169,0.0192380832,0.0262161792,0.76,0.76
+53,0.0077817,0.01146695,0.0245918,0.74,0.74,0.0037033,0.0189698784,0.025969824,0.74,0.74
+54,0.0085851,0.01128533,0.02440032,0.72,0.72,0.0040175,0.0186996384,0.0257217312,0.72,0.72
+55,0.0094913,0.01110185,0.02420463,0.7,0.7,0.0043607,0.018427344,0.0254717856,0.7,0.7
+56,0.0104969,0.01091657,0.02400449,0.68,0.68,0.0047324,0.0181529952,0.0252198816,0.68,0.68
+57,0.0115953,0.01072956,0.02379966,0.67,0.66,0.0051322,0.0178765728,0.024965904,0.67,0.66
+58,0.0127831,0.01054087,0.02358992,0.67,0.64,0.0055619,0.0175980672,0.0247097472,0.67,0.64
+59,0.0140661,0.01035057,0.02337503,0.67,0.62,0.0060314,0.0173174592,0.0244513056,0.67,0.62
+60,0.0154529,0.01015873,0.02315477,0.67,0.6,0.0065642,0.0170347584,0.024190464,0.67,0.6
+61,0.0169422,0.00996541,0.02292889,0.67567911,0.606497636946269,0.0071846,0.0167499456,0.0239271168,0.67018259,0.601563894964179
+62,0.0185334,0.00977067,0.02269716,0.68138971,0.613047339086567,0.0079052,0.0164630112,0.0236611488,0.67058979,0.603330634943284
+63,0.0202352,0.00957457,0.02245936,0.68713219,0.619649655519403,0.0087342,0.016173936,0.0233924544,0.67122483,0.605304540725373
+64,0.0220656,0.00937719,0.02221525,0.69290692,0.626305120525373,0.009681,0.0158827104,0.0231209184,0.67209093,0.607489951056716
+65,0.0240385,0.00917857,0.02196459,0.69871429,0.633014289597015,0.0107563,0.015589344,0.0228464352,0.67319131,0.609891231597015
+66,0.0261662,0.00897879,0.02170716,0.70455467,0.639777703325373,0.0119709,0.015293808,0.0225688992,0.67452918,0.612512765838806
+67,0.0284651,0.00877792,0.02144272,0.71042844,0.646595914495522,0.0133398,0.0149960928,0.0222881952,0.67610778,0.615358991408955
+68,0.0309598,0.008576,0.02117104,0.716336,0.653469497313433,0.0148837,0.0146961888,0.0220042176,0.67793031,0.618434336525373
+69,0.0336572,0.00837311,0.02089188,0.72227771,0.660398992755224,0.0166275,0.014394096,0.0217168512,0.68,0.62174328358209
+70,0.0365059,0.00816931,0.02060502,0.72825397,0.667384981462687,0.018601,0.0140897952,0.0214259904,0.68232007,0.62529033280597
+71,0.0395594,0.00796467,0.02031021,0.73426514,0.674428010680597,0.0208415,0.0137832672,0.02113152,0.68489374,0.629080011337313
+72,0.0429954,0.00775924,0.02000724,0.74031162,0.681528667486567,0.0233941,0.0134745216,0.0208333344,0.68772422,0.633116864023881
+73,0.0470208,0.00755309,0.01969586,0.74639378,0.688687514620896,0.026311,0.0131635392,0.020531328,0.69081475,0.637405490223881
+74,0.0517327,0.00734629,0.01937584,0.752512,0.695905127164179,0.0296518,0.0128503008,0.0202253856,0.69416853,0.641950479385075
+75,0.0571156,0.00713889,0.01904695,0.75866667,0.703182092641791,0.0334821,0.0125348064,0.0199154016,0.6977888,0.646756484776119
+76,0.0631044,0.00693096,0.01870895,0.76485816,0.710518983259701,0.0378743,0.0122170464,0.0196012608,0.70167876,0.65182814958806
+77,0.0697074,0.00672257,0.01836162,0.77108686,0.717916392937313,0.0429098,0.0118970016,0.0192828576,0.70584164,0.657170171689552
+78,0.0769878,0.00651378,0.01800473,0.77735314,0.725374900191045,0.0486813,0.011574672,0.0189600768,0.71028066,0.662787266614925
+79,0.0850452,0.00630465,0.01763803,0.7836574,0.732895114686567,0.055294,0.0112500384,0.0186328224,0.71499904,0.66868417681194
+80,0.0939633,0.00609524,0.01726129,0.79,0.740477611940298,0.0628663,0.0109230912,0.0183009696,0.72,0.674865671641791
+81,0.1038265,0.00588562,0.01687429,0.79638133,0.748122998659701,0.0715314,0.0105938208,0.0179644128,0.72528676,0.681336547379104
+82,0.1147278,0.00567585,0.01647679,0.80280178,0.75583188481194,0.0814414,0.0102622272,0.0176230464,0.73086254,0.68810162721194
+83,0.1267711,0.005466,0.01606856,0.80926171,0.763604855316418,0.0927706,0.0099282912,0.0172767552,0.73673056,0.695165761241791
+84,0.1393243,0.00525613,0.01564936,0.81576152,0.771442535928358,0.1057192,0.0095919936,0.0169254336,0.74289403,0.702533817026866
+85,0.1515216,0.0050463,0.01521896,0.82230159,0.779345536791045,0.1195473,0.009253344,0.016568976,0.74935619,0.71021071738806
+86,0.1638862,0.00483657,0.01477714,0.82888229,0.787314461725373,0.1333896,0.0089123136,0.0162072576,0.75611914,0.718200329397015
+87,0.1767471,0.00462702,0.01432365,0.835504,0.795349927164179,0.1474734,0.0085689024,0.0158401824,0.76318052,0.726502292023881
+88,0.1903175,0.00441769,0.01385826,0.84216711,0.803452562256716,0.1620554,0.0082230912,0.0154676448,0.77053688,0.735115184620896
+89,0.2050741,0.00420867,0.01338074,0.848872,0.811622989850746,0.1773108,0.00787488,0.01508952,0.77818476,0.744037548143284
+90,0.2213,0.004,0.01289087,0.85561905,0.819861835970149,0.1935492,0.0075242592,0.0147057024,0.78612069,0.753267885044776
+91,0.2390753,0.00379176,0.0123884,0.86240863,0.82816972021194,0.2110395,0.0071712096,0.0143160864,0.79434121,0.762804678379105
+92,0.2583662,0.003584,0.0118731,0.86924114,0.836547294137313,0.2299318,0.0068157216,0.0139205664,0.80284287,0.772646391904478
+93,0.2788847,0.00337679,0.01134474,0.87611695,0.844995183716418,0.2501231,0.0064577856,0.0135190272,0.81162219,0.782791431608955
+94,0.3002757,0.0031702,0.01080309,0.88303644,0.853514027677612,0.2714322,0.0060974016,0.0131113536,0.82067572,0.793238203391045
+95,0.3222411,0.00296429,0.01024792,0.89,0.86210447761194,0.2935812,0.0057345408,0.01269744,0.83,0.803985074626866
+96,0.3444248,0.00275911,0.00967898,0.897008,0.870767168955224,0.3162299,0.0053692128,0.0122771904,0.83959156,0.815030374065672
+97,0.3665705,0.00255474,0.00909606,0.90406083,0.879502759692537,0.3391737,0.0050013888,0.0118504704,0.84944695,0.826372420910448
+98,0.3886051,0.00235124,0.00849891,0.91115886,0.888311891570149,0.3623051,0.0046310688,0.0114171936,0.8595627,0.838009486029851
+99,0.4105795,0.00214867,0.00788731,0.91830248,0.897195228967164,0.3855587,0.0042582432,0.0109772352,0.86993535,0.849939821059702
+100,0.4325524,0.00194709,0.00726102,0.92549206,0.906153419940298,0.4088902,0.0038828928,0.0105304896,0.88056145,0.862161658507463
+101,0.4545267,0.00174657,0.0066198,0.932728,0.915187145074627,0.4322712,0.0035050176,0.0100768416,0.89143751,0.874673162797015
+102,0.4764936,0.00154717,0.00596344,0.94001067,0.9242970588,0.4556875,0.0031245984,0.0096161952,0.9025601,0.887472528179104
+103,0.4984594,0.00134896,0.00529168,0.94734044,0.933483818638806,0.4791264,0.0027416352,0.0091484352,0.91392574,0.900557870967164
+104,0.5204247,0.001152,0.00460431,0.95471771,0.942748114829851,0.5025801,0.0023561088,0.0086734368,0.92553097,0.913927298137313
+105,0.54239,0.00095635,0.00390108,0.96214286,0.952090621164179,0.5260412,0.0019680096,0.0081911136,0.93737234,0.927578897641791
+106,0.5643566,0.00076207,0.00318177,0.96961625,0.961511994776119,0.5495039,0.0015773376,0.0077013408,0.94944638,0.941510708764179
+107,0.5863258,0.00056924,0.00244614,0.97713829,0.971012945495522,0.5729665,0.001184064,0.0072040224,0.96174962,0.955720741785075
+108,0.6082989,0.0003779,0.00169396,0.98470933,0.980594126829851,0.5964286,0.0007881888,0.0066990336,0.97427862,0.970207007856716
+109,0.6302772,0.00018814,0.000925,0.99232978,0.990256255086567,0.6198894,0.0003897024,0.0061862688,0.9870299,0.984967449462686
+110,0.6522621,0.00018814,0.000925,1,1,0.6433484,0.0003897024,0.0061862688,1,1
+111,0.6742548,0.00018814,0.000925,1,1,0.6668048,0.0003897024,0.0061862688,1,1
+112,0.6962566,0.00018814,0.000925,1,1,0.6902582,0.0003897024,0.0061862688,1,1
+113,1,0,0,1,1,1,0,0,1,1
diff --git a/data/Austria_Annuities_AVOe2005R.csv b/data/Austria_Annuities_AVOe2005R.csv
new file mode 100644
index 0000000000000000000000000000000000000000..e951935c28ee0c42d3cb3da293d104192125c42a
--- /dev/null
+++ b/data/Austria_Annuities_AVOe2005R.csv
@@ -0,0 +1,125 @@
+Rententafel AVÖ 2005R,,,,,,,"Rententafel AVÖ 2005R, 2. Ordnung",,,,,,,Rententafel AVÖ 2005R Unisex,,,
+,,,,,,,,,,,,,,,,,
+age,qx2001,qx2001G,trendM,qy2001,qy2001G,trendF,,qx2001.2Ord,qx2001G.2Ord,trendM.2Ord,qy2001.2Ord,qy2001G.2Ord,trendF.2Ord,,qu2001,qu2001G,trendU
+0,0.0042744,0.0042744,0.05,0.00300856,0.00300856,0.05,0,0.0042744,0.0042744,0.058061531466665,0.003196595,0.00300856,0.0551941064856084,0,0.003388312,0.003388312,0.05
+1,0.00027616,0.00027616,0.05,0.00026128,0.00026128,0.05,1,0.00027616,0.00027616,0.0543394056969959,0.00027761,0.00026128,0.054231119735258,1,0.000265744,0.000265744,0.05
+2,0.00021112,0.00021112,0.05,0.00016864,0.00016864,0.05,2,0.00021112,0.00021112,0.0514362765666983,0.00017918,0.00016864,0.0540704457871836,2,0.000181384,0.000181384,0.05
+3,0.00015872,0.00015872,0.05,0.00010544,0.00010544,0.05,3,0.00015872,0.00015872,0.0498313916542513,0.00011203,0.00010544,0.0539429431597211,3,0.000121424,0.000121424,0.05
+4,0.00012096,0.00012096,0.05,0.00007976,0.00007976,0.05,4,0.00012096,0.00012096,0.0499021714103831,0.000084745,0.00007976,0.0537162559658205,4,0.00009212,0.00009212,0.05
+5,0.0001036,0.0001036,0.05,0.00006864,0.00006864,0.05,5,0.0001036,0.0001036,0.0513354987949862,0.00007293,0.00006864,0.0528361056032539,5,0.000079128,0.000079128,0.05
+6,0.00009808,0.00009808,0.05,0.00006808,0.00006808,0.05,6,0.00009808,0.00009808,0.0529722921385592,0.000072335,0.00006808,0.0500243875786214,6,0.00007708,0.00007708,0.05
+7,0.0000936,0.0000936,0.05,0.000072,0.000072,0.0488816408359534,7,0.0000936,0.0000936,0.0535725855350999,0.0000765,0.000072,0.0458816408359534,7,0.0000784739942467295,0.0000784739942467295,0.0492885669188458
+8,0.00008848,0.00008848,0.05,0.00007408,0.00007408,0.044497293704924,8,0.00008848,0.00008848,0.052521785752795,0.00007871,0.00007408,0.041497293704924,8,0.0000782676027061438,0.0000782676027061438,0.0465162575956133
+9,0.00008912,0.00008912,0.05,0.00007472,0.00007472,0.0412883559119129,9,0.00008912,0.00008912,0.0503544002353672,0.00007939,0.00007472,0.0382883559119129,9,0.000078731370668686,0.000078731370668686,0.0446126877520273
+10,0.00009104,0.00009104,0.05,0.00007696,0.00007696,0.0392864509723522,10,0.00009104,0.00009104,0.0485671342813596,0.00008177,0.00007696,0.0362864509723522,10,0.0000807471101064143,0.0000807471101064143,0.0434376823794315
+11,0.0000904,0.0000904,0.05,0.0000812,0.0000812,0.0373612908074432,11,0.0000904,0.0000904,0.0471674577930159,0.000086275,0.0000812,0.0343612908074432,11,0.0000833985720085164,0.0000833985720085164,0.042159912026332
+12,0.000092,0.000092,0.0485448463510291,0.00008776,0.00008776,0.0356133788921363,12,0.000092,0.000092,0.0455448463510291,0.000093245,0.00008776,0.0326133788921363,12,0.0000884825262875602,0.0000884825262875602,0.0403214468336618
+13,0.00011424,0.00011424,0.0471081810575084,0.00010344,0.00010344,0.0344611144124694,13,0.00011424,0.00011424,0.0441081810575084,0.000109905,0.00010344,0.0314611144124694,13,0.000106111140763526,0.000106111140763526,0.0391673610851127
+14,0.00017736,0.00017736,0.0454721006206707,0.00013352,0.00013352,0.0337711569484547,14,0.00017736,0.00017736,0.0424721006206707,0.000141865,0.00013352,0.0307711569484547,14,0.00014605389474101,0.00014605389474101,0.0385607876869148
+15,0.00029432,0.00029432,0.0432823840729827,0.00016656,0.00016656,0.0331606078259385,15,0.00029432,0.00029432,0.0402823840729827,0.00017697,0.00016656,0.0301606078259385,15,0.000204298414971022,0.000204298414971022,0.0379238579187071
+16,0.00045048,0.00045048,0.0406339168458941,0.00019864,0.00019864,0.0324368873331601,16,0.00045048,0.00045048,0.0376339168458941,0.000211055,0.00019864,0.0294368873331601,16,0.000273739732082167,0.000273739732082167,0.0367263803531131
+17,0.00061952,0.00061952,0.037322800889047,0.00023904,0.00023904,0.0312415686869022,17,0.00061952,0.00061952,0.034322800889047,0.00025398,0.00023904,0.0282415686869022,17,0.000352910769544999,0.000352910769544999,0.0345692515318594
+18,0.00075808,0.00075808,0.0341904276276448,0.0002676,0.0002676,0.0311782868686286,18,0.00075808,0.00075808,0.0311904276276448,0.000284325,0.0002676,0.0268665124135983,18,0.000414677935699556,0.000414677935699556,0.0328589049766882
+19,0.00081656,0.00081656,0.0318145669624632,0.0002704,0.0002704,0.031115005050355,19,0.00081656,0.00081656,0.0288145669624632,0.0002873,0.0002704,0.0258111400534971,19,0.000434244927509251,0.000434244927509251,0.0315110747706305
+20,0.00082144,0.00082144,0.0302065804901763,0.00025872,0.00025872,0.0310517232320813,20,0.00082144,0.00082144,0.0272065804901763,0.00027489,0.00025872,0.024869421060333,20,0.000427532452111041,0.000427532452111041,0.0305664899020742
+21,0.00081912,0.00081912,0.0301569403600779,0.00024656,0.00024656,0.0309884414138077,21,0.00081912,0.00081912,0.0259433319505929,0.00026197,0.00024656,0.0245597931670693,21,0.000418325390512078,0.000418325390512078,0.03050166483976
+22,0.00081328,0.00081328,0.0301073002299795,0.00023784,0.00023784,0.0309251595955341,22,0.00081328,0.00081328,0.0248849707167126,0.000252705,0.00023784,0.0246499557293957,22,0.000410470157840376,0.000410470157840376,0.0304404700952955
+23,0.00080488,0.00080488,0.0300576600998812,0.00022648,0.00022648,0.0308618777772604,23,0.00080488,0.00080488,0.0238335623184755,0.000240635,0.00022648,0.0255590410043908,23,0.000399998799051157,0.000399998799051157,0.0303776369081774
+24,0.00079976,0.00079976,0.0300080199697828,0.00021584,0.00021584,0.0307985959589868,24,0.00079976,0.00079976,0.0229739499497548,0.00022933,0.00021584,0.0266511644655463,24,0.000391015307506615,0.000391015307506615,0.0303145311631286
+25,0.00079784,0.00079784,0.0299583798396844,0.0002156,0.0002156,0.0307353141407132,25,0.00079784,0.00079784,0.0227868094155549,0.000229075,0.0002156,0.0272857070724851,25,0.000390271693737423,0.000390271693737423,0.0302596803012472
+26,0.00078848,0.00078848,0.029908739709586,0.00022392,0.00022392,0.0306720323224395,26,0.00078848,0.00078848,0.0232883517076833,0.000237915,0.00022392,0.0274286910949794,26,0.000393288,0.000393288,0.0302136445001346
+27,0.00077016,0.00077016,0.0298590995794876,0.00023248,0.00023248,0.0306087505041659,27,0.00077016,0.00077016,0.0242484314569102,0.00024701,0.00023248,0.0280390611017755,27,0.000393784240893496,0.000393784240893496,0.0301694455221354
+28,0.00074288,0.00074288,0.0298094594493892,0.00024032,0.00024032,0.0305454686858923,28,0.00074288,0.00074288,0.0254072469530663,0.00025534,0.00024032,0.0285368989839434,28,0.000391088414588147,0.000391088414588147,0.0301264464694379
+29,0.00071688,0.00071688,0.0297598193192908,0.00024736,0.00024736,0.0304821868676186,29,0.00071688,0.00071688,0.0265887968545626,0.00026282,0.00024736,0.0288763528060719,29,0.000388216524607466,0.000388216524607466,0.0300822667575306
+30,0.00070344,0.00070344,0.0297101791891925,0.000258,0.000258,0.030418905049345,30,0.00070344,0.00070344,0.0273960878394973,0.000274125,0.000258,0.0292323424815338,30,0.000391632585584901,0.000391632585584901,0.0300371306661252
+31,0.0007124,0.0007124,0.0296605390590941,0.00028248,0.00028248,0.0303556232310714,31,0.0007124,0.0007124,0.0278513028072715,0.000300135,0.00028248,0.0293010708250839,31,0.000411456619254812,0.000411456619254812,0.0299945800486625
+32,0.00074744,0.00074744,0.0296108989289957,0.00031728,0.00031728,0.0302923414127978,32,0.00074744,0.00074744,0.0278375648712523,0.00033711,0.00031728,0.0289980589805858,32,0.000446328620684889,0.000446328620684889,0.0299498737819552
+33,0.00079304,0.00079304,0.0295612587988973,0.0003608,0.0003608,0.0302290595945241,33,0.00079304,0.00079304,0.0275850907113652,0.00038335,0.0003608,0.0285728354301894,33,0.000490472572562963,0.000490472572562963,0.029904908959992
+34,0.00084224,0.00084224,0.0295116186687989,0.0004,0.0004,0.0301657777762505,34,0.00084224,0.00084224,0.0270413766419788,0.000425,0.0004,0.0281618039372965,34,0.000532672453689864,0.000532672453689864,0.029855159350435
+35,0.00089312,0.00089312,0.0294619785387005,0.00043152,0.00043152,0.0301024959579769,35,0.00089312,0.00089312,0.0264380431288123,0.00045849,0.00043152,0.027482806346449,35,0.000570000261451089,0.000570000261451089,0.0298010047125014
+36,0.00095784,0.00095784,0.0294123384086021,0.000468,0.000468,0.0300392141397032,36,0.00095784,0.00095784,0.0260204478640094,0.00049725,0.000468,0.0265627792260841,36,0.000614952,0.000614952,0.0297458029150338
+37,0.00105272,0.00105272,0.0293626982785037,0.00052264,0.00052264,0.0299759323214296,37,0.00105272,0.00105272,0.0256679459794742,0.000555305,0.00052264,0.02550053845789,37,0.000681663650779649,0.000681663650779649,0.029691260952021
+38,0.00117568,0.00117568,0.0293130581484053,0.00059296,0.00059296,0.029912650503156,38,0.00117568,0.00117568,0.0252919393235466,0.00063002,0.00059296,0.0245432368716514,38,0.000767775181233486,0.000767775181233486,0.0296365848229842
+39,0.00131792,0.00131792,0.029263418018307,0.00067296,0.00067296,0.0298493686848824,39,0.00131792,0.00131792,0.0248417127061183,0.00071502,0.00067296,0.0237315004407851,39,0.000866446568902826,0.000866446568902826,0.0295813102620163
+40,0.001472,0.001472,0.0292137778882086,0.00076016,0.00076016,0.0297860868666087,40,0.001472,0.001472,0.0245252116677536,0.00080767,0.00076016,0.0228201126550093,40,0.000973709801575405,0.000973709801575405,0.0295258050201177
+41,0.0016005348,0.0016107228,0.0291641377581102,0.00083734875,0.0008417348625,0.0297228050483351,41,0.0016005348,0.0016107228,0.0245207552725241,0.00089051375,0.0008417348625,0.0216698700438472,41,0.00106630150009295,0.00107243063714174,0.0294704669937604
+42,0.0017253438,0.0017477218,0.0291144976280118,0.0009136475,0.000923373425,0.0296595232300615,42,0.0017253438,0.0017477218,0.0247181351326821,0.0009725925,0.000923373425,0.0204171918520374,42,0.00115715234843354,0.00117067960272198,0.0294149270530787
+43,0.0018520633,0.0018887863,0.0290648574979134,0.00099117375,0.0010072600125,0.0295962414117878,43,0.0018520633,0.0018887863,0.0249429021854995,0.00105616875,0.0010072600125,0.0194132700433862,43,0.00124943548635555,0.00127172261860903,0.0293591070327675
+44,0.0019907118,0.0020443698,0.029015217367815,0.001069425,0.00109295235,0.0295329595935142,44,0.0019907118,0.0020443698,0.0247684566637935,0.00114072,0.00109295235,0.0188470327469658,44,0.0013458047068789,0.00137838628122094,0.0293023540526809
+45,0.00214634325,0.00222010075,0.0289655772377166,0.0011541875,0.001186465625,0.0294696777752406,45,0.00214634325,0.00222010075,0.024328852975591,0.0012324375,0.001186465625,0.0185294741410904,45,0.00145182654805087,0.00149656996029764,0.0292452335180344
+46,0.0023211715,0.0024188365,0.0289159371076183,0.00125454,0.0012973674,0.0294063959569669,46,0.0023211715,0.0024188365,0.0239111169939007,0.00134106,0.0012973674,0.0184662100463181,46,0.00157452025459767,0.00163382845168795,0.029188603906363
+47,0.00251215525,0.00263803275,0.0288662969775199,0.00136849875,0.0014239589625,0.0293431141386933,47,0.00251215525,0.00263803275,0.0234937649774401,0.00146453375,0.0014239589625,0.0184989465903868,47,0.0017115848196425,0.00178820964119617,0.0291322757011375
+48,0.0027240984,0.0028834024,0.0288166568474215,0.00148666,0.0015567454,0.0292798323204197,48,0.0027240984,0.0028834024,0.0230860692484797,0.00159285,0.0015567454,0.0186486799931016,48,0.00185787881341198,0.00195478121196633,0.0290752072615657
+49,0.0029607968,0.0031598048,0.0287670167173231,0.0016061375,0.001692868925,0.029216550502146,49,0.0029607968,0.0031598048,0.0225821398705572,0.0017229475,0.001692868925,0.0190026341567773,49,0.0020125206283666,0.0021330008242006,0.0290172616230009
+50,0.003220635,0.003466485,0.0287173765872247,0.0017318475,0.001837682625,0.0291532686838724,50,0.003220635,0.003466485,0.0218858075920151,0.0018601325,0.001837682625,0.0191196118807543,50,0.0021784670046516,0.00232638954963603,0.0289590651099526
+51,0.00349463205,0.00379471755,0.0286677364571263,0.00185983625,0.0019872174875,0.0290899868655988,51,0.00349463205,0.00379471755,0.0211854766836963,0.00200020125,0.0019872174875,0.0192694814378922,51,0.002350256095529,0.00252955163265599,0.0289007651938317
+52,0.0037690208,0.0041302688,0.0286180963270279,0.00198471,0.0021358533,0.0290267050473251,52,0.0037690208,0.0041302688,0.0207226509012074,0.00213738,0.0021358533,0.0194485969164009,52,0.00251998222685212,0.00273428280822406,0.0288425121505947
+53,0.00403412665,0.00446293815,0.0285684561969296,0.0021010725,0.002277809775,0.0289634232290515,53,0.00403412665,0.00446293815,0.020521699247899,0.0022658625,0.002277809775,0.0195688137129844,53,0.00268096573656236,0.00293347655615138,0.0287842942818097
+54,0.0042847884,0.0047871924,0.0285188160668312,0.0022094375,0.002413589525,0.0289001414107779,54,0.0042847884,0.0047871924,0.0206274211339129,0.0023861925,0.002413589525,0.0199074260704199,54,0.00283201794216608,0.00312582469647972,0.028726248288868
+55,0.00452060775,0.00510266025,0.0284691759367328,0.00231329,0.0025469795,0.0288368595925043,55,0.00452060775,0.00510266025,0.0208895405945864,0.00250213,0.0025469795,0.0205377023217661,55,0.00297545887198214,0.00331386679866709,0.0286684864347558
+56,0.0047466624,0.0054152064,0.0284195358066344,0.0024147,0.002680317,0.0287735777742306,56,0.0047466624,0.0054152064,0.0212310164990709,0.002615925,0.002680317,0.0212890740262422,56,0.00311426083881547,0.00350099857804401,0.0286109325740845
+57,0.00496738575,0.00573021825,0.028369895676536,0.00251091625,0.0028106234875,0.028710295955957,57,0.00496738575,0.00573021825,0.0214098862999713,0.00272461125,0.0028106234875,0.0221306207580266,57,0.00324782801404005,0.00368675129477796,0.0285533794630607
+58,0.0051872282,0.0060533702,0.0283202555464376,0.002604865,0.00294123235,0.0286470141376834,58,0.0051872282,0.0060533702,0.0215727854316309,0.002831375,0.00294123235,0.0231499261745434,58,0.00337954388560022,0.00387516090748194,0.0284958557236907
+59,0.0054156723,0.0063965853,0.0282706154163392,0.00270669375,0.0030838264125,0.0285837323194097,59,0.0054156723,0.0063965853,0.0217418841041789,0.00294728875,0.0030838264125,0.0241143673441584,59,0.0035193564051394,0.00407798322507473,0.0284385200158951
+60,0.005668803,0.006780333,0.0282209752862409,0.002828265,0.00325250475,0.0285204505011361,60,0.005668803,0.006780333,0.0217414189153566,0.00308538,0.00325250475,0.0248423807900678,60,0.0036803947185391,0.00431122999550347,0.028381441805664
+61,0.0061398006775,0.0073422087025,0.0281713351561425,0.00304470615625,0.0035008933609375,0.0284571686828625,61,0.0061398006775,0.0073422087025,0.0217042570074153,0.00332118325,0.0035008933609375,0.0252729053502641,61,0.00397165260629723,0.00465159609025833,0.0283181060013084
+62,0.00670031934,0.00800768274,0.0281216950260441,0.0033049864,0.00379848556,0.0283938868645889,62,0.00670031934,0.00800768274,0.0216001951712311,0.0036040768,0.00379848556,0.0253938868645888,62,0.00431999517849268,0.00505688116244946,0.0282543554897081
+63,0.00736717924875,0.00879587736125,0.0280720548959457,0.003621013546875,0.00415863606328125,0.0283928392106478,63,0.00736717924875,0.00879587736125,0.0215805150057854,0.003946845375,0.00415863606328125,0.0253928392106478,63,0.00473862324299239,0.00554205698564211,0.0282231936267786
+64,0.00814628439,0.00971257329,0.0280224147658473,0.0039996085,0.004588730275,0.0284673172746962,64,0.00814628439,0.00971257329,0.0214925277099799,0.004356652,0.004588730275,0.0254673172746961,64,0.0052338536140489,0.00611380582138897,0.0282314346099036
+65,0.009033463921875,0.010751267203125,0.0279727746357489,0.0044462234375,0.005094449140625,0.0286199646461112,65,0.009033463921875,0.010751267203125,0.0215314620076444,0.0048390875,0.005094449140625,0.0256199646461112,65,0.00580796579170561,0.00677386498901871,0.0282803711702592
+66,0.0100283244825,0.0119097480575,0.0279231345056505,0.004973349875,0.00568938573125,0.0287030749324412,66,0.0100283244825,0.0119097480575,0.0217762451363087,0.005407311,0.00568938573125,0.0257030749324412,66,0.00646951678920614,0.00753068925720835,0.02829319382301
+67,0.0111374825875,0.0131939147125,0.0278734943755521,0.005588481640625,0.00638121833984375,0.0287957877286058,67,0.0111374825875,0.0131939147125,0.0221680537670446,0.006068928125,0.00638121833984375,0.0257957877286058,67,0.00722540682498545,0.00839121071251408,0.028311927089805
+68,0.01237278,0.01461558,0.0278238542454538,0.0062955416,0.00717337064,0.0289316195779343,68,0.01237278,0.01461558,0.0225437645160046,0.0068275592,0.00717337064,0.0259316195779343,68,0.00808144783041687,0.00936091393938501,0.0283540285572954
+69,0.01374676681125,0.01618705929875,0.0277742141153554,0.00710649696875,0.0080782558578125,0.0292208067927681,69,0.01374676681125,0.01618705929875,0.0229447055011591,0.00769544175,0.0080782558578125,0.0262208067927681,69,0.00904862550904228,0.010451260598859,0.0284771847870733
+70,0.0152746565625,0.0179234409375,0.027724573985257,0.0080443203125,0.009120519921875,0.0295321869816882,70,0.0152746565625,0.0179234409375,0.0233925157415901,0.0086965625,0.009120519921875,0.0265321869816882,70,0.0101471273638587,0.0116831823272356,0.0286132757223195
+71,0.01697854718625,0.01984745592375,0.0276749338551586,0.009133781525,0.01032644157875,0.029886187550974,71,0.01697854718625,0.01984745592375,0.0238800880356428,0.0098566058,0.01032644157875,0.026886187550974,71,0.011399661615166,0.013080583405827,0.0287733454375256
+72,0.01888744047,0.02198933017,0.0276252937250602,0.01040655865,0.0117296278975,0.0301590180227194,72,0.01888744047,0.02198933017,0.0243167859897502,0.0112084188,0.0117296278975,0.0271590180227194,72,0.012837397226871,0.0146759453369361,0.0288943435205344
+73,0.02104125445125,0.02439124333875,0.0275756535949618,0.011897564225,0.01336673078375,0.0303746014639195,73,0.02104125445125,0.02439124333875,0.0245401508684612,0.0127879682,0.01336673078375,0.0273746014639195,73,0.0144959243838801,0.0165067072546289,0.0289890147193435
+74,0.023487196095,0.027102829545,0.0275401508684612,0.0136490179625,0.015281909669375,0.0304644378609148,74,0.023487196095,0.027102829545,0.0245260134648634,0.0146386493,0.015281909669375,0.0274644378609148,74,0.0164203776231416,0.0186198449276711,0.0290288673025955
+75,0.026281475390625,0.030182908984375,0.0275401508684612,0.015703741015625,0.0175191734960937,0.0304644378609148,75,0.026281475390625,0.030182908984375,0.0242499580201881,0.016804003125,0.0175191734960937,0.0274003020811503,75,0.0186578533849427,0.0210640354982487,0.0290409247063814
+76,0.02948660688,0.03369611568,0.0275401508684612,0.018106731,0.02012408865,0.0304644378609148,76,0.02948660688,0.03369611568,0.0238059438995932,0.019329372,0.02012408865,0.02720160544726,76,0.0212547087686309,0.0238867369335432,0.0290529904973735
+77,0.033172986964375,0.037714479420625,0.0275401508684612,0.0209103076125,0.023149411216875,0.0304644378609148,77,0.033172986964375,0.037714479420625,0.0232363931519181,0.0222673401,0.023149411216875,0.0268517539180067,77,0.0242669108998598,0.0271444880703432,0.0290644295551222
+78,0.0374232905325,0.0423221496075,0.0275260134648634,0.0241758620625,0.026656845684375,0.0304644378609148,78,0.0374232905325,0.0423221496075,0.0225447574514139,0.0256794885,0.026656845684375,0.0264335645171811,78,0.0277591689135839,0.0309023768436949,0.0290681827615949
+79,0.042336395210625,0.047619437004375,0.0272499580201881,0.02797922769375,0.0307227326165625,0.0304003020811503,79,0.042336395210625,0.047619437004375,0.0218228314583004,0.02964195795,0.0307227326165625,0.0258691472788896,79,0.0317981701993716,0.035227248937402,0.0289150992189492
+80,0.04802895075,0.05372408325,0.0268059438995932,0.03240492875,0.0354314268125,0.03020160544726,80,0.04802895075,0.05372408325,0.0209965234857894,0.03423917,0.0354314268125,0.0251230306492134,80,0.036477213195966,0.0402115735316574,0.0286105639972043
+81,0.054634909756875,0.060770213888125,0.0262363931519181,0.037550078728125,0.0408793426279688,0.0298517539180067,81,0.054634909756875,0.060770213888125,0.0200333458068205,0.039567814425,0.0408793426279688,0.0242587489485808,81,0.0419003270937182,0.0459580718805628,0.0281647044046223
+82,0.0623100139325,0.0689128070075,0.0255447574514139,0.043529553925,0.04718027903875,0.0294335645171811,82,0.0623100139325,0.0689128070075,0.0189356423739008,0.0457421146,0.04718027903875,0.0232526053312085,82,0.0481737623134331,0.0525703303065967,0.0276225320474917
+83,0.070771464610625,0.077820900404375,0.0248228314583004,0.0504791189625,0.054468393819375,0.0288691472788896,83,0.070771464610625,0.077820900404375,0.0177816627031598,0.0528968613,0.054468393819375,0.0221030562468555,83,0.0553365192024621,0.0600745920702558,0.026995462935334
+84,0.07975871904,0.08719542944,0.0239965234857894,0.058553812,0.0628960048,0.0281230306492134,84,0.07975871904,0.08719542944,0.0166078613393621,0.061185444,0.0628960048,0.0207964177245365,84,0.0634349236575664,0.0685067117342677,0.0262368859759128
+85,0.089558706328125,0.097339480546875,0.0230333458068205,0.067933125,0.07263871875,0.0272587489485808,85,0.089558706328125,0.097339480546875,0.0154735661540453,0.070785,0.07263871875,0.0193875923835104,85,0.0726603854576785,0.0780588345087576,0.0253604636587118
+86,0.1003146656,0.1083941216,0.0219356423739008,0.078826273,0.08390052295,0.0262526053312085,86,0.1003146656,0.1083941216,0.014422247766252,0.081901576,0.08390052295,0.0179621380814304,86,0.0832107451363272,0.0889253150670861,0.0243540090812718
+87,0.1122970214775,0.1206340375025,0.0207816627031598,0.09092222218125,0.0963304781146875,0.0251030562468555,87,0.1122970214775,0.1206340375025,0.0134018198657374,0.09419995305,0.0963304781146875,0.0165483479267028,87,0.0949554413817138,0.10094754162821,0.0232396923864135
+88,0.12577961838,0.13433149218,0.0196078613393621,0.10425843535,0.1099517172025,0.0237964177245365,88,0.12577961838,0.13433149218,0.0124640802840851,0.1077089092,0.1099517172025,0.0151651379470967,88,0.108025072656557,0.114246899723684,0.0220225241289702
+89,0.141175009194375,0.149900088950625,0.0184735661540453,0.11934966763125,0.125288225232187,0.0223875923835104,89,0.141175009194375,0.149900088950625,0.0114899548001808,0.12294879345,0.125288225232187,0.0138608000159788,89,0.122932356348781,0.129345996846514,0.0207602909198384
+90,0.1587398521875,0.1675797803125,0.017422247766252,0.136380101875,0.14250924653125,0.0209621380814304,90,0.1587398521875,0.1675797803125,0.0104426925985987,0.140094735,0.14250924653125,0.0126665948531866,90,0.139882071236889,0.146434997068739,0.0195163992679938
+91,0.17870285382125,0.18757627140875,0.0164018198657374,0.15544510149375,0.161688902886562,0.0195483479267028,91,0.17870285382125,0.18757627140875,0.00922911278939808,0.15922922355,0.161688902886562,0.0115957161828556,91,0.15896686413232,0.165582555195142,0.0182822707743916
+92,0.20099785044,0.20978357484,0.0154640802840851,0.1767113226,0.18297424179,0.0181651379470967,92,0.20099785044,0.20978357484,0.00789115385444778,0.1805070312,0.18297424179,0.0104717808978843,92,0.180333780274421,0.186916562924928,0.0170920403443092
+93,0.225437251738125,0.233972935056875,0.0144899548001808,0.200274594025,0.20643719845375,0.0168608000159788,93,0.225437251738125,0.233972935056875,0.00650226219953417,0.2040095058,0.20643719845375,0.00929732921225964,93,0.203896534028991,0.210315052379995,0.01592996348281
+94,0.2518006456875,0.2598877588125,0.0134426925985987,0.226047762925,0.23196129638875,0.0156665948531866,94,0.2518006456875,0.2598877588125,0.00532700326195544,0.2296317226,0.23196129638875,0.0081389988591786,94,0.229453963415341,0.235538941699703,0.0148065210566989
+95,0.279915704921875,0.287327418203125,0.0122291127893981,0.253763755859375,0.259249042285156,0.0145957161828556,95,0.279915704921875,0.287327418203125,0.00431234697274645,0.257088171875,0.259249042285156,0.00701413950674541,95,0.256571370197521,0.262106261734927,0.0136995009722492
+96,0.30968930028,0.31617744308,0.0108911538544478,0.2830714036,0.28792339294,0.0134717808978843,96,0.30968930028,0.31617744308,0.00329769068353747,0.2860120032,0.28792339294,0.00588928015431223,96,0.285087608279584,0.289844593762921,0.012516145836446
+97,0.34109038305875,0.34638977427125,0.00950226219953417,0.313970777325,0.31797030814875,0.0122973292122596,97,0.34109038305875,0.34638977427125,0.00228303439432849,0.3163947354,0.31797030814875,0.00476442080187905,97,0.315066612370432,0.318812728117225,0.0112886903699506
+98,0.3741030163125,0.3779335231875,0.00832700326195544,0.3465236987375,0.349438955635625,0.0111389988591786,98,0.3741030163125,0.3779335231875,0.0012683781051195,0.3482905211,0.349438955635625,0.00363956144944586,98,0.346954958372052,0.349480496703245,0.0101594858198191
+99,0.408722595391875,0.410790698373125,0.00731234697274645,0.380730712021875,0.382316836484531,0.0100141395067454,99,0.408722595391875,0.410790698373125,0.000253721815910519,0.381691999575,0.382316836484531,0.00251470209701268,99,0.38075917182014,0.381845006280031,0.00911551043401084
+100,0.4449421,0.4449421,0.00636494102293649,0.4165604,0.4165604,0.00895015575323658,100,0.4449421,0.4449421,0,0.4165604,0.4165604,0.0013898427445795,100,0.416273599257745,0.415678252029361,0.00813744137390618
+101,0.4710857,0.4710857,0.00554028335587086,0.4438524,0.4438524,0.00799921830060743,101,0.4710857,0.4710857,0,0.4438524,0.4438524,0.000264983392146312,101,0.443268747865436,0.442700234889335,0.00728012650189592
+102,0.4972566,0.4972566,0.00482247039724785,0.4711769,0.4711769,0.00714931618900973,102,0.4972566,0.4972566,0,0.4711769,0.4711769,0,102,0.470459380121139,0.469924090152091,0.00652378025211318
+103,0.5234342,0.5234342,0.00419765907960067,0.4985037,0.4985037,0.00638971460080735,103,0.5234342,0.5234342,0,0.4985037,0.4985037,0,103,0.497796786223711,0.497299884393115,0.00585486471486298
+104,0.5496121,0.5496121,0.00365379987788205,0.5258296,0.5258296,0.00571081927283256,104,0.5496121,0.5496121,0,0.5258296,0.5258296,0,104,0.525249640291421,0.524794978427987,0.00526152712798647
+105,0.57579,0.57579,0.00318040443362563,0.5531587,0.5531587,0.0051040553145887,105,0.57579,0.57579,0,0.5531587,0.5531587,0,105,0.552789226956176,0.552379264672319,0.00473347202019756
+106,0.6019685,0.6019685,0.00276834328630193,0.580489,0.580489,0.0045617589017941,106,0.6019685,0.6019685,0,0.580489,0.580489,0,106,0.580380084963348,0.580015859496462,0.00426185162699064
+107,0.628148,0.628148,0.00240966981110525,0.6078194,0.6078194,0.00407708047728604,107,0.628148,0.628148,0,0.6078194,0.6078194,0,107,0.607989025765684,0.607670240532094,0.00383916591620815
+108,0.6543293,0.6543293,0.00209746696780101,0.6351498,0.6351498,0.00364389823664935,108,0.6543293,0.6543293,0,0.6351498,0.6351498,0,108,0.635587888643284,0.635313066671234,0.00345912191135753
+109,0.6805127,0.6805127,0.00182571390517546,0.66248,0.66248,0.00325674080583636,109,0.6805127,0.6805127,0,0.66248,0.66248,0,109,0.663154274421845,0.662920962959203,0.00311648050830728
+110,0.706699,0.706699,0.00158916984854622,0.6898099,0.6898099,0.00291071813414649,110,0.706699,0.706699,0,0.6898099,0.6898099,0,110,0.690672713418424,0.690477716871353,0.00280689754738484
+111,0.7328886,0.7328886,0.00138327303109722,0.7171393,0.7171393,0.00260145972969852,111,0.7328886,0.7328886,0,0.7171393,0.7171393,0,111,0.718134454960167,0.717974079259294,0.00252676842675735
+112,0.7590821,0.7590821,0.0012040527199225,0.744468,0.744468,0.00232505945726949,112,0.7590821,0.7590821,0,0.744468,0.744468,0,112,0.745536950406181,0.745407234280803,0.00227308264173028
+113,0.78755935230123,0.78755935230123,0.00104805264019557,0.777844569583669,0.777844569583669,0.00207802620126078,113,0.78755935230123,0.78755935230123,0,0.77784456958367,0.77784456958367,0,113,0.778744486240084,0.778646445308806,0.00204284334235237
+114,0.810683036018379,0.810683036018379,0.000912264320694859,0.803081115214595,0.803081115214595,0.00185723977063258,114,0.810683036018379,0.810683036018379,0,0.803081115214595,0.803081115214595,0,114,0.803941971511128,0.803866618100268,0.00183446106051804
+115,0.832543241757532,0.832543241757532,0.000794069075249464,0.826926338010737,0.826926338010737,0.00165991148885735,115,0.832543241757532,0.832543241757532,0,0.826926338010736,0.826926338010736,0,115,0.82772259041352,0.827665624084159,0.00164591143076803
+116,0.85304029797845,0.85304029797845,0.000691187501213751,0.849247835123572,0.849247835123572,0.00148354897111758,116,0.85304029797845,0.85304029797845,0,0.849247835123572,0.849247835123572,0,116,0.849962600719579,0.849920229293719,0.00147556045350494
+117,0.872094482035874,0.872094482035874,0.000601635521045852,0.869938324615254,0.869938324615254,0.00132592464386105,117,0.872094482035874,0.872094482035874,0,0.869938324615254,0.869938324615254,0,117,0.870562808234812,0.87053179446914,0.00132189826506071
+118,0.889647994058764,0.889647994058764,0.000523686119249103,0.888918794792573,0.888918794792573,0.00118504760909487,118,0.889647994058764,0.889647994058764,0,0.888918794792573,0.888918794792573,0,118,0.889451012288058,0.889428671618821,0.00118351138322232
+119,0.905666314088986,0.905666314088986,0.000455836036770981,0.906140766780237,0.906140766780237,0.00105913849804622,119,0.905666314088986,0.905666314088986,0,0.906140766780237,0.906140766780237,0,119,0.906583940382601,0.906568104125189,0.00105906882192727
+120,0.920138850760075,0.920138850760075,0.000396776780558961,0.921587500836441,0.921587500836441,0.000946606996574941,120,0.920138850760075,0.920138850760075,0,0.921587500836441,0.921587500836441,0,120,0.921948426576312,0.921937384105112,0.00094731703653932
+121,1,1,0,1,1,0,121,1,1,0,1,1,0,121,1,1,0
diff --git a/data/Austria_Annuities_AVOe2005R_AVBasis.csv b/data/Austria_Annuities_AVOe2005R_AVBasis.csv
new file mode 100644
index 0000000000000000000000000000000000000000..67c7b33318715591390716e696a766b0843dfedf
--- /dev/null
+++ b/data/Austria_Annuities_AVOe2005R_AVBasis.csv
@@ -0,0 +1,124 @@
+"Rententafel AVÖ 2005-R mit Altersverschiebung, Basistafel",,,,,,
+,,,,,,
+age,qx1965,qx1965G,qy1965,qy1965G,qu1972,qu1972G
+0,0.0002296,0.0002296,0.0001496,0.0001496,0.0138962493415961,0.0138962493415961
+1,0.0002296,0.0002296,0.0001496,0.0001496,0.00104062518899977,0.00104062518899977
+2,0.0002296,0.0002296,0.0001496,0.0001496,0.000678019130240079,0.000678019130240079
+3,0.0002296,0.0002296,0.0001496,0.0001496,0.000433169386968135,0.000433169386968135
+4,0.0002296,0.0002296,0.0001496,0.0001496,0.000313558325991125,0.000313558325991125
+5,0.0002296,0.0002296,0.0001496,0.0001496,0.000256926922970251,0.000256926922970251
+6,0.0002296,0.0002296,0.0001496,0.0001496,0.000238694808372229,0.000238694808372229
+7,0.0002296,0.0002296,0.0001496,0.0001496,0.000228174960714844,0.000228174960714844
+8,0.0002296,0.0002296,0.0001496,0.0001496,0.00020499467055215,0.00020499467055215
+9,0.0002296,0.0002296,0.0001496,0.0001496,0.000189933941293667,0.000189933941293667
+10,0.0002296,0.0002296,0.0001496,0.0001496,0.000182530366847689,0.000182530366847689
+11,0.0002296,0.0002296,0.0001496,0.0001496,0.0001767028393314,0.0001767028393314
+12,0.0002296,0.0002296,0.0001496,0.0001496,0.000174474494269489,0.000174474494269489
+13,0.0002896,0.0002896,0.0001496,0.0001496,0.000197531454865601,0.000197531454865601
+14,0.0002896,0.0002896,0.0001496,0.0001496,0.000259331472880642,0.000259331472880642
+15,0.0005288,0.0005288,0.000227220067119612,0.000227220067119612,0.000346224433198155,0.000346224433198155
+16,0.000726462211582119,0.000726462211582119,0.000227220067119612,0.000227220067119612,0.000440080677885073,0.000440080677885073
+17,0.000726462211582119,0.000726462211582119,0.000227220067119612,0.000227220067119612,0.000533293594172721,0.000533293594172721
+18,0.000726462211582119,0.000726462211582119,0.000227220067119612,0.000227220067119612,0.000594370444158063,0.000594370444158063
+19,0.000726462211582119,0.000726462211582119,0.000227220067119612,0.000227220067119612,0.000594473036456321,0.000594473036456321
+20,0.000726462211582119,0.000726462211582119,0.000227220067119612,0.000227220067119612,0.000562499041100626,0.000562499041100626
+21,0.000726462211582119,0.000726462211582119,0.000227220067119612,0.000227220067119612,0.000533657540191344,0.000533657540191344
+22,0.000726462211582119,0.000726462211582119,0.000227220067119612,0.000227220067119612,0.000507775541977034,0.000507775541977034
+23,0.000726462211582119,0.000726462211582119,0.000227220067119612,0.000227220067119612,0.000479867065378208,0.000479867065378208
+24,0.000726462211582119,0.000726462211582119,0.000227220067119612,0.000227220067119612,0.000454952602524761,0.000454952602524761
+25,0.000726462211582119,0.000726462211582119,0.000227220067119612,0.000227220067119612,0.000440459004982059,0.000440459004982059
+26,0.000726462211582119,0.000726462211582119,0.000278059377262853,0.000278059377262853,0.000430589811640765,0.000430589811640765
+27,0.000726462211582119,0.000726462211582119,0.000278059377262853,0.000278059377262853,0.000418272860195765,0.000418272860195765
+28,0.000726462211582119,0.000726462211582119,0.000297951582867784,0.000297951582867784,0.000403049386266028,0.000403049386266028
+29,0.000726462211582119,0.000726462211582119,0.000297951582867784,0.000297951582867784,0.000388216524607466,0.000388216524607466
+30,0.000726462211582119,0.000726462211582119,0.000297951582867784,0.000297951582867784,0.00038004436241645,0.00038004436241645
+31,0.000726462211582119,0.000726462211582119,0.000297951582867784,0.000297951582867784,0.000387502550260524,0.000387502550260524
+32,0.000726462211582119,0.000726462211582119,0.000297951582867784,0.000297951582867784,0.000407985982573537,0.000407985982573537
+33,0.000740878964428134,0.000740878964428134,0.000297951582867784,0.000297951582867784,0.000435203379219798,0.000435203379219798
+34,0.000740878964428134,0.000740878964428134,0.000377447511205473,0.000377447511205473,0.000458864571502162,0.000458864571502162
+35,0.000818018515959648,0.000818018515959648,0.000377447511205473,0.000377447511205473,0.000476775102366544,0.000476775102366544
+36,0.00095784,0.00095784,0.000468,0.000468,0.000499527520599264,0.000499527520599264
+37,0.00102225970223768,0.00102225970223768,0.000507206367543319,0.000507206367543319,0.000537813078337628,0.000537813078337628
+38,0.00110874461992133,0.00110874461992133,0.00055853071743678,0.00055853071743678,0.000588445540687974,0.000588445540687974
+39,0.00120718451962765,0.00120718451962765,0.000615333647153009,0.000615333647153009,0.000645204622619886,0.000645204622619886
+40,0.00130974069087009,0.00130974069087009,0.000674821406358667,0.000674821406358667,0.000704599806787528,0.000704599806787528
+41,0.00138353036767532,0.0013923370536567,0.00072180158255467,0.000725582447987099,0.000749936679484008,0.000754247340855181
+42,0.00144910847420244,0.0014679036554502,0.000764866094605615,0.000773008217548191,0.000791124944178084,0.000800373292771344
+43,0.00151161353576045,0.00154158604473125,0.000805975664679154,0.000819056253335422,0.000830538141539275,0.000845353082850116
+44,0.00157911383288481,0.0016216775480569,0.000844812598296655,0.000863398475459182,0.000869975292858532,0.00089103716352604
+45,0.00165495835842235,0.00171182977967398,0.000885929578640313,0.000910705575331102,0.000912863819077805,0.000940997098660679
+46,0.00173997503674177,0.00181318576760047,0.000935830775331543,0.000967778101799758,0.000963139773159133,0.000999418813282755
+47,0.00183103845266799,0.00192278697928701,0.000992262654738484,0.00103247540443052,0.00101876843256035,0.00106437701032617
+48,0.00193089431861285,0.00204381211502296,0.00104796071577253,0.00109736457808752,0.00107628324180734,0.00113241953385292
+49,0.00204127130206383,0.00217847400347215,0.00110090796257434,0.00116035699255336,0.00113496307803639,0.00120290800837838
+50,0.00216005026390863,0.00232493959703143,0.00115451301413556,0.00122506658722163,0.00119624965764149,0.00127747755478992
+51,0.00228049907887325,0.00247632647830812,0.00120607077723863,0.00128867524745328,0.00125693641972557,0.00135282515752648
+52,0.00239354151686348,0.00262295444180247,0.00125225867126469,0.001347622985461,0.00131286769642225,0.00142451463885294
+53,0.00249359427060887,0.00275865335088618,0.00129011632630454,0.00139863787610545,0.00136094250065157,0.00148912493191744
+54,0.00257840552532643,0.0028807311313111,0.0013205480612334,0.00144256670209137,0.00140110011024031,0.00154645677261489
+55,0.00264879191207979,0.0029898380810171,0.00134611715235239,0.0014821024565186,0.00143499813015023,0.0015982048027726
+56,0.00270865635051005,0.00309015724494809,0.00136833874125261,0.00151885600279039,0.00146446162241199,0.00164632261811908
+57,0.00276118241741935,0.00318521223761925,0.00138592392446945,0.00155135016311357,0.00148952065472485,0.00169081988906622
+58,0.00280926670845556,0.00327834649279878,0.0014007795255518,0.00158166279472088,0.00151198608992169,0.00173372194197159
+59,0.00285818778501895,0.00337587670699569,0.00141841498831969,0.00161604747669223,0.00153636332288464,0.00178023000148389
+60,0.00291609991035352,0.00348788420650128,0.00144466657804108,0.00166136656474724,0.00156808914630873,0.00183686628206909
+61,0.00307915336030133,0.00368216946865806,0.00151628684651816,0.00174347154760915,0.00165228999334775,0.00193516060816679
+62,0.00327667468060528,0.00391601802138552,0.00160509439937958,0.00184476641068182,0.00175532425020813,0.00205473982449335
+63,0.00351395291122128,0.00419540475624426,0.00171258033429376,0.00196685216646226,0.00187904544310968,0.00219763766611435
+64,0.0037906048939014,0.00451942579989526,0.00183861752549008,0.00210943643693175,0.00202317188628665,0.00236332174496584
+65,0.00410162636716396,0.00488159153810067,0.00198225547723297,0.00227125331293895,0.00218580980444175,0.00254932295367629
+66,0.00444408860608692,0.00527784833209814,0.00215442315671951,0.00246460528114655,0.00237369413180185,0.00276304297224834
+67,0.00481830971037991,0.0057079655907622,0.00235158583313495,0.00268516273490688,0.00258432505560631,0.00300130035809657
+68,0.00522673050208468,0.00617417409762873,0.00256978162110855,0.00292810328377016,0.00281569541371655,0.00326148024468062
+69,0.00567180469964595,0.00667864962464942,0.00279995499483547,0.00318282733927902,0.00306190670264589,0.00353653544914273
+70,0.00615678036733089,0.00722443014201255,0.0030559264537566,0.00346475985770512,0.00333294404695999,0.00383747947481173
+71,0.00668726707165415,0.00781723176895179,0.00333938652849115,0.00377543296836505,0.00363087954022525,0.00416626600558403
+72,0.00727097019561865,0.00846508369101894,0.00367030420596278,0.00413693941047194,0.00397080517708305,0.00453949649548218
+73,0.0079189547350917,0.00917973557040909,0.00405487074327855,0.0045555850393662,0.00435904477076136,0.00496370386843304
+74,0.00863948592401878,0.00996945371461156,0.0045147987986846,0.0050549239224727,0.00481158258862112,0.00545608168782582
+75,0.00943821709931583,0.0108393019588634,0.00505845115060286,0.00564323387915982,0.00533452784675082,0.00602248723966488
+76,0.010339958473589,0.0118160912264467,0.00568080222452942,0.00631372761706943,0.00593047132686298,0.00666485765666044
+77,0.0113606570951775,0.0129159689081053,0.00639092734875833,0.00707527636585979,0.00660893454018612,0.00739262387058905
+78,0.0125256921540403,0.0141653555777092,0.00719944094162203,0.00793826444320572,0.00738295739418259,0.00821893956286023
+79,0.0139996400540746,0.0157466164590136,0.00814099169162767,0.00893925714151874,0.0083208722372127,0.00921818569555307
+80,0.015810577326663,0.0176853493416823,0.00926675463532252,0.0101322345493762,0.00946280670569457,0.0104315630039408
+81,0.0180159390003197,0.0200390642414683,0.0106268343031971,0.0115690303521432,0.0108562583690264,0.0119076087726407
+82,0.0207135628155973,0.0229085128803744,0.0122367670696674,0.0132630370132858,0.0125360278217582,0.0136801256882265
+83,0.0237798302239478,0.0261485022201018,0.0141988694965811,0.0153209808614969,0.0145384651756911,0.015783290625161
+84,0.0272516400855059,0.029792585548024,0.0166329288627125,0.0178663820143294,0.0169575058230568,0.0183133027703069
+85,0.0313576751138561,0.0340819997506135,0.0196204520589087,0.0209795221234843,0.0199090475291064,0.021388230140985
+86,0.036280161900754,0.039202206947675,0.0233372450846175,0.0248395235787911,0.0235628642290553,0.0251810643207058
+87,0.0421422909790088,0.0452709666161681,0.0278297398328679,0.0294851146352687,0.0279933554018932,0.0297598575566212
+88,0.0491214860277442,0.0524613017688653,0.0333077010865974,0.0351265479694249,0.0333977221686356,0.0353213020067151
+89,0.0573788187995344,0.0609250184647744,0.0400840718908766,0.0420785606442057,0.040033141608415,0.042121755102024
+90,0.0669960239201962,0.0707269083071602,0.0483052702847684,0.050476188073831,0.048029165408017,0.0502791432350641
+91,0.0783330818702409,0.0822226792185056,0.0581669439637506,0.0605033498218092,0.0576296713247168,0.0600280334212286
+92,0.0912744566151589,0.0952641123195612,0.0699099773524706,0.0723876937335784,0.068986968042788,0.0715052217812285
+93,0.10641674063696,0.110445975339244,0.0836117792030493,0.086184578430634,0.0823269771685574,0.0849185720490469
+94,0.124227125663682,0.128216943941124,0.0992195907132705,0.101815229627588,0.0977380782913994,0.100330032141775
+95,0.145858223587889,0.149720312473711,0.11655954757205,0.119079066176773,0.115378146529015,0.117867144137491
+96,0.171913311247107,0.175514979472595,0.136682110089391,0.139024911703006,0.136177611037142,0.138449877175851
+97,0.202688551606967,0.205837646341412,0.160088372133784,0.162127665039729,0.160557132566423,0.162466143483327
+98,0.235659055640459,0.238072010343911,0.186744530085899,0.188315586499944,0.187837892751746,0.18920519356918
+99,0.27095322962168,0.272324230854002,0.216829359926513,0.217732671220144,0.218210281136717,0.218832564880082
+100,0.309692439035814,0.309692439035814,0.250256726217892,0.250256726217892,0.251874843106316,0.251874843106316
+101,0.342308311515234,0.342308311515234,0.279901275494194,0.279901275494194,0.281428822230746,0.281428822230746
+102,0.375318982714355,0.375318982714355,0.310493137305417,0.310493137305417,0.311791454692654,0.311791454692654
+103,0.408552605136779,0.408552605136779,0.341867025680887,0.341867025680887,0.342816690671225,0.342816690671225
+104,0.441870280793703,0.441870280793703,0.373882063349965,0.373882063349965,0.374388414823456,0.374388414823456
+105,0.475160193522032,0.475160193522032,0.406412513731586,0.406412513731586,0.406409968689477,0.406409968689477
+106,0.508332217876499,0.508332217876499,0.439339468631641,0.439339468631641,0.438793789149058,0.438793789149058
+107,0.541315004954284,0.541315004954284,0.472556089386715,0.472556089386715,0.47146288737299,0.47146288737299
+108,0.574054286411982,0.574054286411982,0.505967898889983,0.505967898889983,0.504349154547295,0.504349154547295
+109,0.606509885009865,0.606509885009865,0.539491774149643,0.539491774149643,0.537391003414628,0.537391003414628
+110,0.638654447133795,0.638654447133795,0.573055652265397,0.573055652265397,0.570532426491668,0.570532426491668
+111,0.670470657225838,0.670470657225838,0.60659774718284,0.60659774718284,0.603722043695981,0.603722043695981
+112,0.701949954759074,0.701949954759074,0.640065891096664,0.640065891096664,0.636912856628816,0.636912856628816
+113,0.735218513331306,0.735218513331306,0.678694476499815,0.678694476499815,0.675165423471461,0.675165423471461
+114,0.763143707865196,0.763143707865196,0.71011524818806,0.71011524818806,0.706476824983187,0.706476824983187
+115,0.78949431017507,0.78949431017507,0.740060311886552,0.740060311886552,0.736400218077762,0.736400218077762
+116,0.814170284173847,0.814170284173847,0.768353516217932,0.768353516217932,0.764745831345773,0.764745831345773
+117,0.837095273646509,0.837095273646509,0.794849030188403,0.794849030188403,0.791353269231703,0.791353269231703
+118,0.858218033268204,0.858218033268204,0.819434710859731,0.819434710859731,0.816096057281384,0.816096057281384
+119,0.877513269363418,0.877513269363418,0.842034474700047,0.842034474700047,0.838884859441109,0.838884859441109
+120,0.894981800828624,0.894981800828624,0.862609501888704,0.862609501888704,0.859669211702402,0.859669211702402
diff --git a/data/Austria_Annuities_AVOe2005R_AVShifts.csv b/data/Austria_Annuities_AVOe2005R_AVShifts.csv
new file mode 100644
index 0000000000000000000000000000000000000000..1c177f5c84115492f50a278322da81b679896e8d
--- /dev/null
+++ b/data/Austria_Annuities_AVOe2005R_AVShifts.csv
@@ -0,0 +1,121 @@
+"Rententafel AVÖ 2005-R mit AV, Verschiebung",,,,,,
+,,,,,,
+YOB,shiftM,shiftMG,shiftF,shiftFG,shiftU,shiftUG
+1905,4,4,5,5,,
+1906,4,4,5,5,,
+1907,4,4,5,5,,
+1908,4,4,5,5,,
+1909,4,4,5,5,,
+1910,4,4,5,5,,
+1911,4,4,5,5,,
+1912,4,4,5,5,,
+1913,4,4,5,5,,
+1914,4,4,5,5,,
+1915,4,4,5,5,,
+1916,4,4,5,5,,
+1917,4,4,5,5,,
+1918,4,4,5,5,,
+1919,4,4,5,5,,
+1920,4,4,5,5,,
+1921,4,4,5,5,,
+1922,4,4,4,5,,
+1923,4,4,4,5,,
+1924,4,4,4,5,,
+1925,4,4,4,4,,
+1926,4,4,4,4,,
+1927,4,4,4,4,,
+1928,4,4,4,4,,
+1929,4,4,4,4,,
+1930,4,4,4,4,5,5
+1931,4,4,4,4,5,5
+1932,4,4,4,4,4,5
+1933,4,4,4,4,4,5
+1934,4,4,4,4,4,5
+1935,4,4,4,4,4,4
+1936,4,4,3,4,4,4
+1937,4,4,3,4,4,4
+1938,3,4,3,3,4,4
+1939,3,4,3,3,4,4
+1940,3,4,3,3,4,4
+1941,3,3,3,3,4,4
+1942,3,3,3,3,4,4
+1943,3,3,3,3,4,4
+1944,3,3,3,3,4,4
+1945,3,3,3,3,4,4
+1946,3,3,2,2,3,4
+1947,2,3,2,2,3,4
+1948,2,2,2,2,3,3
+1949,2,2,2,2,3,3
+1950,2,2,2,2,3,3
+1951,2,2,2,2,3,3
+1952,2,2,2,2,3,3
+1953,2,2,1,2,3,3
+1954,1,2,1,1,2,3
+1955,1,1,1,1,2,2
+1956,1,1,1,1,2,2
+1957,1,1,1,1,2,2
+1958,1,1,1,1,2,2
+1959,1,1,1,1,2,2
+1960,1,1,1,1,2,2
+1961,1,1,0,0,1,2
+1962,0,0,0,0,1,1
+1963,0,0,0,0,1,1
+1964,0,0,0,0,1,1
+1965,0,0,0,0,1,1
+1966,0,0,0,0,1,1
+1967,0,0,0,0,1,1
+1968,0,0,0,0,1,1
+1969,0,-1,0,0,0,0
+1970,-1,-1,-1,-1,0,0
+1971,-1,-1,-1,-1,0,0
+1972,-1,-1,-1,-1,0,0
+1973,-1,-1,-1,-1,0,0
+1974,-1,-1,-1,-1,0,0
+1975,-1,-1,-1,-1,0,0
+1976,-1,-1,-1,-1,0,-1
+1977,-1,-1,-1,-1,-1,-1
+1978,-1,-2,-1,-1,-1,-1
+1979,-2,-2,-1,-1,-1,-1
+1980,-2,-2,-1,-2,-1,-1
+1981,-2,-2,-2,-2,-1,-1
+1982,-2,-2,-2,-2,-1,-1
+1983,-2,-2,-2,-2,-1,-1
+1984,-2,-2,-2,-2,-1,-1
+1985,-2,-2,-2,-2,-2,-2
+1986,-2,-2,-2,-2,-2,-2
+1987,-2,-2,-2,-2,-2,-2
+1988,-2,-3,-2,-2,-2,-2
+1989,-2,-3,-2,-2,-2,-2
+1990,-3,-3,-2,-2,-2,-2
+1991,-3,-3,-2,-2,-2,-2
+1992,-3,-3,-2,-3,-2,-2
+1993,-3,-3,-2,-3,-2,-2
+1994,-3,-3,-3,-3,-2,-3
+1995,-3,-3,-3,-3,-3,-3
+1996,-3,-3,-3,-3,-3,-3
+1997,-3,-3,-3,-3,-3,-3
+1998,-3,-3,-3,-3,-3,-3
+1999,-3,-3,-3,-3,-3,-3
+2000,-3,-4,-3,-3,-3,-3
+2001,-3,-4,-3,-3,-3,-3
+2002,-3,-4,-3,-3,-3,-3
+2003,-4,-4,-3,-3,-3,-3
+2004,-4,-4,-3,-3,-3,-4
+2005,-4,-4,-3,-3,-3,-4
+2006,-4,-4,-3,-3,-4,-4
+2007,-4,-4,-3,-3,-4,-4
+2008,-4,-4,-3,-4,-4,-4
+2009,-4,-4,-3,-4,-4,-4
+2010,-4,-4,-3,-4,-4,-4
+2011,-4,-4,-4,-4,-4,-4
+2012,-4,-4,-4,-4,-4,-4
+2013,-4,-4,-4,-4,-4,-4
+2014,-4,-4,-4,-4,-4,-4
+2015,-4,-5,-4,-4,-4,-5
+2016,-4,-5,-4,-4,-4,-5
+2017,-4,-5,-4,-4,-4,-5
+2018,-4,-5,-4,-4,-5,-5
+2019,-4,-5,-4,-4,-5,-5
+2020,-4,-5,-4,-4,-5,-5
+2021,,,,,-5,-5
+2022,,,,,-5,-5
diff --git a/data/Austria_Annuities_EROMF.csv b/data/Austria_Annuities_EROMF.csv
new file mode 100644
index 0000000000000000000000000000000000000000..23eb4ecdbf02cc1cf58f25289fc877709fe90c02
--- /dev/null
+++ b/data/Austria_Annuities_EROMF.csv
@@ -0,0 +1,104 @@
+EROM/F 85 und G 1950,,,,
+,,,,
+Alter,EROM 85,EROF 85,EROM G1950,EROF G1950
+0,0.001555,0.001161,0.056385,0.049623
+1,0.000104,0.000076,0.003974,0.003965
+2,0.000066,0.000044,0.001922,0.002197
+3,0.000064,0.000044,0.001448,0.001571
+4,0.000061,0.000043,0.001102,0.001123
+5,0.000059,0.000046,0.000855,0.000811
+6,0.000062,0.000052,0.000683,0.000607
+7,0.000067,0.000052,0.000568,0.000472
+8,0.000069,0.000041,0.000489,0.000388
+9,0.000058,0.000035,0.000445,0.000346
+10,0.000051,0.000034,0.000417,0.000327
+11,0.000047,0.000036,0.000402,0.000318
+12,0.000054,0.00004,0.000414,0.000329
+13,0.000075,0.000049,0.000457,0.000357
+14,0.00012,0.000074,0.000533,0.00041
+15,0.000288,0.000126,0.0007,0.000488
+16,0.000707,0.000176,0.000959,0.000561
+17,0.001192,0.000178,0.001226,0.000599
+18,0.001506,0.000163,0.001445,0.000613
+19,0.001426,0.000144,0.001544,0.000614
+20,0.001201,0.000123,0.001546,0.0006
+21,0.001014,0.000109,0.001493,0.00058
+22,0.000905,0.000103,0.001429,0.000567
+23,0.000841,0.000101,0.00137,0.000559
+24,0.000804,0.000101,0.00132,0.000548
+25,0.000771,0.000099,0.001286,0.000538
+26,0.000751,0.000102,0.00127,0.000531
+27,0.000738,0.000107,0.00126,0.000529
+28,0.000727,0.000116,0.00125,0.000533
+29,0.00072,0.000126,0.001243,0.000537
+30,0.000717,0.00014,0.001242,0.000549
+31,0.000724,0.000167,0.001244,0.000581
+32,0.00074,0.000212,0.001254,0.000634
+33,0.000777,0.000271,0.001282,0.0007
+34,0.000837,0.000332,0.001333,0.000767
+35,0.000923,0.000388,0.001414,0.00083
+36,0.001035,0.000429,0.001522,0.000883
+37,0.001172,0.000455,0.001653,0.000923
+38,0.001328,0.000469,0.001802,0.000951
+39,0.001488,0.000484,0.00196,0.000978
+40,0.001664,0.000513,0.00214,0.001019
+41,0.001874,0.000562,0.002347,0.001079
+42,0.002125,0.000636,0.002586,0.001164
+43,0.002415,0.000731,0.002862,0.00127
+44,0.002722,0.000843,0.003163,0.001395
+45,0.00302,0.000955,0.00348,0.001522
+46,0.003322,0.001066,0.003817,0.00165
+47,0.00363,0.00117,0.004172,0.001773
+48,0.003954,0.001276,0.004546,0.001897
+49,0.004303,0.001389,0.004943,0.002027
+50,0.004675,0.001517,0.00536,0.002168
+51,0.005077,0.001662,0.005802,0.002321
+52,0.005513,0.001823,0.006271,0.002492
+53,0.005974,0.002017,0.006861,0.002682
+54,0.006453,0.002227,0.007266,0.002895
+55,0.006935,0.00245,0.007774,0.003122
+56,0.00751,0.002733,0.008357,0.003407
+57,0.008153,0.003025,0.008995,0.003696
+58,0.00883,0.003319,0.009664,0.003985
+59,0.009523,0.00363,0.010349,0.004293
+60,0.010214,0.003952,0.011035,0.004612
+61,0.010931,0.004296,0.01174,0.004952
+62,0.011766,0.004669,0.012548,0.005311
+63,0.01278,0.005045,0.013518,0.005664
+64,0.014024,0.005436,0.014703,0.00602
+65,0.015509,0.005885,0.016114,0.006423
+66,0.017316,0.006454,0.017827,0.00693
+67,0.0195,0.007056,0.019899,0.00755
+68,0.02226,0.008007,0.02253,0.008296
+69,0.024924,0.009034,0.025065,0.009194
+70,0.027873,0.010291,0.027873,0.010291
+71,0.030984,0.012087,0.030828,0.011889
+72,0.034618,0.014084,0.034296,0.013646
+73,0.039138,0.016299,0.038646,0.015574
+74,0.04403,0.01895,0.043369,0.017882
+75,0.049069,0.021999,0.048214,0.020522
+76,0.054402,0.025426,0.053334,0.023466
+77,0.060066,0.029369,0.058767,0.026845
+78,0.065698,0.033989,0.064104,0.030818
+79,0.070961,0.039334,0.068857,0.035439
+80,0.077578,0.045567,0.075003,0.04088
+81,0.08515,0.052855,0.082123,0.047332
+82,0.092985,0.061274,0.089452,0.05489
+83,0.100797,0.070806,0.096662,0.063557
+84,0.108483,0.081295,0.103614,0.073208
+85,0.116472,0.092534,0.110674,0.083629
+86,0.125489,0.103852,0.118831,0.094214
+87,0.135064,0.115687,0.127367,0.105352
+88,0.145196,0.128148,0.136349,0.117174
+89,0.155959,0.141245,0.14587,0.129704
+90,0.167458,0.154955,0.156053,0.142921
+91,0.179812,0.169251,0.167005,0.156701
+92,0.193049,0.183961,0.178783,0.171138
+93,0.207073,0.198844,0.19125,0.185625
+94,0.221648,0.213664,0.204103,0.199948
+95,0.236393,0.228073,0.216848,0.213628
+96,0.249382,0.243347,0.227565,0.227733
+97,0.261807,0.257983,0.237257,0.240739
+98,0.273532,0.271884,0.24572,0.252414
+99,0.284475,0.284874,0.252829,0.26264
+100,1,1,1,1
diff --git a/data/Austria_Annuities_EROMF_AV.csv b/data/Austria_Annuities_EROMF_AV.csv
new file mode 100644
index 0000000000000000000000000000000000000000..fc6ff73ea93910932067ba51b7ac3572d74eccc6
--- /dev/null
+++ b/data/Austria_Annuities_EROMF_AV.csv
@@ -0,0 +1,54 @@
+EROM/F G 1950 AV,,
+,,
+YOB,Shift M,Shift F
+1920,1,2
+1921,1,2
+1922,1,2
+1923,1,2
+1924,1,2
+1925,1,2
+1926,1,2
+1927,1,2
+1928,1,2
+1929,1,2
+1930,1,2
+1931,1,2
+1932,1,2
+1933,1,2
+1934,1,2
+1935,1,1
+1936,1,1
+1937,1,1
+1938,1,1
+1939,1,1
+1940,1,1
+1941,0,1
+1942,0,1
+1943,0,1
+1944,0,1
+1945,0,0
+1946,0,0
+1947,0,0
+1948,0,0
+1949,0,0
+1950,0,0
+1951,0,0
+1952,0,0
+1953,0,0
+1954,0,0
+1955,0,0
+1956,0,-1
+1957,0,-1
+1958,0,-1
+1959,0,-1
+1960,-1,-1
+1961,-1,-1
+1962,-1,-1
+1963,-1,-1
+1964,-1,-1
+1965,-1,-1
+1966,-1,-1
+1967,-1,-1
+1968,-1,-2
+1969,-1,-2
+1970,-1,-2
diff --git a/data/Austria_Annuities_RR67.csv b/data/Austria_Annuities_RR67.csv
new file mode 100644
index 0000000000000000000000000000000000000000..3aa214fa9db278d688998cc5f1aa20032e160474
--- /dev/null
+++ b/data/Austria_Annuities_RR67.csv
@@ -0,0 +1,103 @@
+Sterbetafel ÖV 1959/61 Männer - RR67,
+,
+Alter,qx
+0,0
+1,0
+2,0
+3,0
+4,0
+5,0
+6,0
+7,0
+8,0
+9,0
+10,0
+11,0.00018
+12,0.00018
+13,0.00018
+14,0.00018
+15,0.00018
+16,0.00018
+17,0.00018
+18,0.00018
+19,0.00018
+20,0.00018
+21,0.00018
+22,0.00018
+23,0.00018
+24,0.00018
+25,0.00018
+26,0.00054
+27,0.00135
+28,0.00072
+29,0.00135
+30,0.00135
+31,0.00036
+32,0.00108
+33,0.00018
+34,0.00109
+35,0.00109
+36,0.00118
+37,0.00009
+38,0.00118
+39,0.00109
+40,0.00118
+41,0.00118
+42,0.00128
+43,0.00137
+44,0.00146
+45,0.00174
+46,0.00183
+47,0.0022
+48,0.00239
+49,0.00277
+50,0.00315
+51,0.00371
+52,0.00438
+53,0.00515
+54,0.00602
+55,0.00928
+56,0.00812
+57,0.00925
+58,0.0106
+59,0.01464
+60,0.01366
+61,0.01547
+62,0.01746
+63,0.02216
+64,0.02159
+65,0.02403
+66,0.02955
+67,0.02907
+68,0.03504
+69,0.03496
+70,0.04171
+71,0.04167
+72,0.0457
+73,0.05357
+74,0.0546
+75,0.06377
+76,0.06568
+77,0.07588
+78,0.07909
+79,0.09091
+80,0.09519
+81,0.10893
+82,0.11837
+83,0.12513
+84,0.14148
+85,0.15083
+86,0.16914
+87,0.18315
+88,0.19531
+89,0.21359
+90,0.22593
+91,0.24561
+92,0.26216
+93,0.27507
+94,0.3004
+95,0.31638
+96,0.33058
+97,0.35802
+98,0.38462
+99,1
diff --git a/data/Austria_Census_Female.csv b/data/Austria_Census_Female.csv
new file mode 100644
index 0000000000000000000000000000000000000000..433d92bea113abd8325ec4d5dc32290b76896909
--- /dev/null
+++ b/data/Austria_Census_Female.csv
@@ -0,0 +1,117 @@
+Census-Mortality Tables Austrian Females,,,,,,,,,,,,,
+Source: Statistik Austria. Alexander Hanika,,,,,,,,,,,,,
+,,,,,,,,,,,,,
+x,1868/71,1879/82,1889/92,1899/1902,1909/12,1930/33,1949/51,1959/61,1970/72,1980/82,1990/92,2000/02,2010/12
+0,0.250079,0.228973,0.227292,0.193085,0.171577,0.09245,0.05838,0.03275,0.02221,0.011066,0.0067104,0.0037607,0.00315084679007483
+1,0.065939,0.068601,0.06288,0.048788,0.03834,0.01307,0.00494,0.0024,0.00152,0.000834,0.0005155,0.0003266,0.000192018169121108
+2,0.032547,0.035385,0.028086,0.021157,0.015533,0.00598,0.0029,0.00134,0.00094,0.000488,0.0004117,0.0002108,0.000153216363390695
+3,0.020914,0.025331,0.018255,0.013599,0.009669,0.0042,0.00217,0.00092,0.00063,0.000413,0.0003175,0.0001318,0.000119276498535962
+4,0.018679,0.021452,0.014977,0.009565,0.007471,0.00381,0.00161,0.00075,0.00049,0.000349,0.0002377,0.0000997,0.0000941594039056861
+5,0.010797,0.014053,0.009872,0.007163,0.005955,0.00343,0.00119,0.00062,0.00041,0.000302,0.0001803,0.0000858,0.0000799712218996731
+6,0.009808,0.012476,0.008759,0.006602,0.004822,0.00299,0.0009,0.00051,0.0004,0.000273,0.0001413,0.0000851,0.0000724099375899447
+7,0.007791,0.009985,0.006881,0.005388,0.004229,0.00265,0.00071,0.00042,0.00036,0.000239,0.0001183,0.00009,0.000068729035037648
+8,0.007104,0.008813,0.006224,0.004369,0.003515,0.00231,0.00061,0.00036,0.00029,0.000198,0.0001066,0.0000926,0.0000687922571228714
+9,0.00584,0.00584,0.00584,0.00584,0.00584,0.00584,0.00584,0.00584,0.00584,0.000178,0.0001012,0.0000934,0.0000703647570474122
+10,0.004904,0.006154,0.004488,0.00373,0.002913,0.00175,0.00056,0.0003,0.00026,0.000175,0.0000992,0.0000962,0.0000728690707671526
+11,0.004478,0.005547,0.00452,0.003405,0.002911,0.0016,0.00056,0.00029,0.00026,0.000179,0.0001005,0.0001015,0.0000784469743615419
+12,0.004294,0.005264,0.00455,0.003384,0.00299,0.00151,0.0006,0.0003,0.00032,0.000194,0.000107,0.0001097,0.000088109729718312
+13,0.004327,0.005217,0.004756,0.0035,0.003172,0.0015,0.00066,0.00035,0.00035,0.000225,0.0001205,0.0001293,0.000102893130564081
+14,0.004593,0.005381,0.005098,0.003743,0.003428,0.00165,0.00074,0.0004,0.00038,0.000287,0.0001495,0.0001669,0.000123370583919784
+15,0.005022,0.00567,0.005489,0.004067,0.003735,0.00194,0.00083,0.00046,0.00048,0.000387,0.000207,0.0002082,0.000147785364895035
+16,0.005521,0.006028,0.005874,0.004438,0.004075,0.00221,0.00093,0.00051,0.00058,0.000478,0.0002816,0.0002483,0.00017278537971716
+17,0.006025,0.006404,0.006215,0.004823,0.00444,0.00248,0.00104,0.00055,0.00061,0.000511,0.0003294,0.0002988,0.00019323207203506
+18,0.006507,0.006762,0.006504,0.005192,0.004812,0.00276,0.00114,0.00059,0.00061,0.000518,0.0003751,0.0003345,0.000209189893718415
+19,0.00695,0.007095,0.006765,0.005529,0.005176,0.00312,0.00124,0.00062,0.00061,0.000513,0.0004028,0.000338,0.000225729587416606
+20,0.007367,0.007398,0.007027,0.005837,0.005512,0.00326,0.00133,0.00065,0.00059,0.000498,0.0004047,0.0003234,0.000241013742318063
+21,0.007761,0.007675,0.007298,0.006118,0.005797,0.00336,0.0014,0.00068,0.0006,0.000485,0.0003893,0.0003082,0.000250390348885728
+22,0.008106,0.007932,0.007576,0.006374,0.006029,0.0034,0.00146,0.0007,0.0006,0.000484,0.0003696,0.0002973,0.000252026946125503
+23,0.008382,0.00818,0.007845,0.006621,0.006213,0.00354,0.00152,0.00071,0.0006,0.000491,0.0003553,0.0002831,0.000248050860207978
+24,0.008604,0.008422,0.008072,0.006862,0.006366,0.00363,0.00156,0.00071,0.0006,0.000498,0.0003446,0.0002698,0.000244034105207991
+25,0.008762,0.008664,0.008253,0.007095,0.006499,0.00362,0.00162,0.00073,0.0006,0.000505,0.0003383,0.0002695,0.000243913624074764
+26,0.008888,0.008909,0.008403,0.007323,0.006627,0.00356,0.00166,0.00076,0.00061,0.000518,0.0003501,0.0002799,0.000247876736285943
+27,0.009032,0.009142,0.008553,0.007545,0.006749,0.0036,0.0017,0.0008,0.00063,0.000536,0.0003747,0.0002906,0.000254497609083566
+28,0.009191,0.009354,0.008735,0.007756,0.006868,0.00374,0.00173,0.00085,0.00065,0.000562,0.0004077,0.0003004,0.000262337129229031
+29,0.009357,0.009538,0.008968,0.00796,0.006992,0.00393,0.00176,0.00092,0.00067,0.000589,0.0004413,0.0003092,0.000271590228578445
+30,0.009548,0.009703,0.009233,0.008169,0.007127,0.00396,0.0018,0.00098,0.00071,0.000624,0.0004719,0.0003225,0.000283175146631143
+31,0.009768,0.009875,0.009504,0.008378,0.007278,0.00398,0.00184,0.00106,0.00076,0.000684,0.0005098,0.0003531,0.00029830078004775
+32,0.010017,0.010076,0.009763,0.008578,0.007447,0.004,0.00188,0.00112,0.00083,0.000768,0.0005565,0.0003966,0.000316232515317261
+33,0.010342,0.010308,0.009992,0.008765,0.007632,0.00403,0.00192,0.00119,0.00091,0.000867,0.0006056,0.000451,0.000336746652698102
+34,0.01073,0.010553,0.010196,0.008932,0.007823,0.00413,0.00199,0.00127,0.001,0.000968,0.000655,0.0005,0.000363174110084129
+35,0.011131,0.010784,0.010386,0.009084,0.008019,0.00442,0.00209,0.00136,0.0011,0.001065,0.0007127,0.0005394,0.00039475431608024
+36,0.011508,0.010979,0.010572,0.009237,0.008217,0.00474,0.00223,0.00147,0.00121,0.001155,0.0007879,0.000585,0.000430384646355252
+37,0.011822,0.011133,0.010751,0.009399,0.008414,0.00484,0.0024,0.00159,0.00132,0.001235,0.0008761,0.0006533,0.000468281595420265
+38,0.012031,0.01127,0.010929,0.009567,0.008607,0.00485,0.00259,0.00174,0.00144,0.001306,0.0009748,0.0007412,0.000509520671248531
+39,0.012156,0.011407,0.011114,0.009737,0.008795,0.00487,0.00279,0.00189,0.00157,0.00138,0.0010854,0.0008412,0.000557354785106964
+40,0.012251,0.011551,0.011314,0.009904,0.008969,0.00514,0.00299,0.00206,0.00172,0.001472,0.0012084,0.0009502,0.000616969061717308
+41,0.012347,0.011705,0.011536,0.01007,0.009132,0.00538,0.00319,0.00223,0.00189,0.001589,0.0013513,0.0010633,0.000693863273653744
+42,0.012481,0.011869,0.011777,0.010251,0.009294,0.00554,0.00339,0.00241,0.00208,0.001736,0.0015136,0.0011789,0.000788184271090969
+43,0.012681,0.012055,0.012026,0.010466,0.009474,0.00598,0.0036,0.00258,0.00228,0.00191,0.0016826,0.0012999,0.000898503487345335
+44,0.012952,0.012297,0.012278,0.010731,0.009698,0.00646,0.00384,0.00276,0.0025,0.002109,0.0018489,0.0014259,0.001022288576879
+45,0.013291,0.012636,0.012547,0.011059,0.009995,0.00706,0.00414,0.00297,0.00275,0.002324,0.0020112,0.001565,0.00115724255592473
+46,0.01371,0.013086,0.012861,0.011455,0.01038,0.00749,0.00449,0.00323,0.00302,0.002552,0.0021721,0.0017304,0.00130173494817301
+47,0.014214,0.013649,0.013255,0.011932,0.010854,0.00795,0.00488,0.00353,0.00332,0.002786,0.0023381,0.0019207,0.0014559125201251
+48,0.014818,0.014316,0.013765,0.012503,0.011415,0.00812,0.0053,0.00386,0.00364,0.003032,0.0025167,0.0021238,0.00161882663211953
+49,0.015553,0.015053,0.014409,0.013181,0.012054,0.00871,0.00576,0.00423,0.00399,0.003297,0.0027108,0.0023362,0.00178993824416907
+50,0.016455,0.015833,0.015177,0.01397,0.012771,0.0094,0.00623,0.00462,0.00435,0.003581,0.0029238,0.0025657,0.00196937308928953
+51,0.017531,0.016658,0.016057,0.014863,0.013577,0.01016,0.0067,0.00505,0.00472,0.003883,0.0031576,0.0028073,0.00215927578904445
+52,0.018769,0.01755,0.017031,0.015843,0.01448,0.01062,0.00717,0.00553,0.00507,0.004207,0.0034169,0.0030534,0.00236201832168177
+53,0.020133,0.018549,0.018087,0.016904,0.015483,0.01115,0.00768,0.00595,0.0054,0.004565,0.0037033,0.0032958,0.00258257870864176
+54,0.021569,0.01972,0.019254,0.018049,0.016587,0.01218,0.00826,0.00644,0.00576,0.004967,0.0040175,0.0035351,0.00282674288099027
+55,0.023061,0.02113,0.020588,0.019305,0.017791,0.01315,0.00894,0.00701,0.0062,0.005415,0.0043607,0.0037768,0.00310218819367269
+56,0.024651,0.022804,0.022144,0.020706,0.019107,0.01449,0.00968,0.00765,0.00677,0.005942,0.0047324,0.0040245,0.00341206272528798
+57,0.02643,0.02473,0.023992,0.022282,0.020573,0.01583,0.01046,0.00835,0.00744,0.006489,0.0051322,0.0042739,0.00375470733104562
+58,0.028521,0.026891,0.026193,0.024074,0.022234,0.01695,0.01135,0.00909,0.00819,0.007076,0.0055619,0.0045302,0.00413233376028644
+59,0.031053,0.029255,0.028769,0.026107,0.024137,0.0183,0.01241,0.00992,0.00905,0.007738,0.0060314,0.0048119,0.0045463708993423
+60,0.034115,0.03181,0.031706,0.028398,0.026314,0.01991,0.01372,0.01089,0.01004,0.008496,0.0065642,0.0051423,0.00499340572840824
+61,0.037649,0.034566,0.034939,0.030992,0.028765,0.02207,0.01526,0.01204,0.01119,0.009355,0.0071846,0.005533,0.00546279919555108
+62,0.04154,0.037539,0.038355,0.033911,0.031457,0.02381,0.01696,0.01333,0.01246,0.010294,0.0079052,0.0059968,0.00594904929729518
+63,0.045655,0.040714,0.041839,0.037146,0.034376,0.02607,0.01887,0.01471,0.0138,0.011306,0.0087342,0.0065535,0.00645263954126601
+64,0.049881,0.044087,0.045325,0.040699,0.037516,0.02886,0.02106,0.01627,0.01533,0.012423,0.009681,0.007213,0.00697579779624276
+65,0.05411,0.04766,0.048856,0.044565,0.040916,0.03239,0.02357,0.01812,0.01712,0.013701,0.0107563,0.007982,0.00752055171955155
+66,0.058558,0.051505,0.052574,0.048687,0.044655,0.03592,0.02634,0.02036,0.01927,0.015184,0.0119709,0.008879,0.00809368770883296
+67,0.06352,0.055755,0.056699,0.053098,0.048829,0.03959,0.02935,0.02291,0.02172,0.016882,0.0133398,0.0099125,0.00871223695433519
+68,0.069206,0.060605,0.06148,0.057891,0.053501,0.04297,0.03265,0.02573,0.02442,0.018828,0.0148837,0.0110837,0.00940158464074007
+69,0.075862,0.066241,0.067115,0.063143,0.058686,0.047,0.03637,0.02889,0.02744,0.021093,0.0166275,0.012407,0.0101909301313094
+70,0.083546,0.0728,0.07372,0.068975,0.064359,0.05122,0.04058,0.03248,0.03086,0.023751,0.018601,0.0139145,0.0111139981673978
+71,0.091947,0.080287,0.081254,0.075521,0.070486,0.05682,0.04517,0.03659,0.03477,0.027074,0.0208415,0.0156392,0.0122097876096495
+72,0.100765,0.088489,0.089556,0.082761,0.077039,0.06421,0.05007,0.04109,0.03904,0.030682,0.0233941,0.0176233,0.0135237279748655
+73,0.109945,0.097137,0.098294,0.090586,0.084016,0.07104,0.05546,0.04595,0.04362,0.034651,0.026311,0.0199112,0.0151067724567435
+74,0.119383,0.105943,0.107193,0.098912,0.091502,0.07908,0.06153,0.05132,0.04869,0.039249,0.0296518,0.0225557,0.0170149901705156
+75,0.128923,0.11472,0.116036,0.107624,0.099605,0.08597,0.06845,0.05736,0.05443,0.044495,0.0334821,0.0256061,0.0193094958193007
+76,0.138906,0.123403,0.124896,0.11654,0.108313,0.09367,0.07627,0.06424,0.06103,0.050389,0.0378743,0.0291105,0.0220561458435687
+77,0.149681,0.132504,0.134146,0.125661,0.117677,0.10181,0.08488,0.07194,0.06843,0.057009,0.0429098,0.0331236,0.0253247965493915
+78,0.161507,0.142688,0.144497,0.135159,0.127755,0.11029,0.09419,0.08035,0.07652,0.06445,0.0486813,0.0377085,0.0291894241767978
+79,0.174899,0.154506,0.156656,0.14525,0.138521,0.12185,0.10412,0.08951,0.08537,0.072705,0.055294,0.0429438,0.033727621833522
+80,0.190122,0.168328,0.171023,0.15628,0.150015,0.13156,0.11459,0.09939,0.09506,0.081854,0.0628663,0.0489131,0.0390195056292805
+81,0.206748,0.183784,0.187472,0.168596,0.162227,0.14435,0.12552,0.11003,0.10568,0.091965,0.0715314,0.0557097,0.0451460161311372
+82,0.223945,0.19971,0.204935,0.182137,0.174999,0.15959,0.13696,0.1214,0.11852,0.103075,0.0814414,0.0634426,0.0521874839283418
+83,0.240956,0.214886,0.221688,0.196254,0.188162,0.17653,0.14901,0.13349,0.13159,0.115177,0.0927706,0.0722388,0.0602220671414176
+84,0.256561,0.228525,0.233556,0.210049,0.201685,0.18736,0.1615,0.14646,0.14489,0.128059,0.1057192,0.0822385,0.0693235884112821
+85,0.269637,0.239857,0.240417,0.222569,0.215554,0.20212,0.17456,0.16027,0.15842,0.141622,0.1195473,0.0936,0.0795591892530993
+86,0.278798,0.250129,0.246873,0.234271,0.22879,0.21861,0.18821,0.17528,0.17218,0.15584,0.1333896,0.106504,0.0909871698328793
+87,0.284376,0.262272,0.259156,0.244958,0.24165,0.23369,0.20247,0.19174,0.18617,0.170705,0.1474734,0.1204218,0.103654135689782
+88,0.286855,0.277479,0.285071,0.256439,0.255164,0.24581,0.21738,0.20865,0.2004,0.186321,0.1620554,0.1353127,0.117591969606498
+89,0.286844,0.298226,0.325255,0.27079,0.271466,0.25996,0.23296,0.22603,0.21486,0.202713,0.1773108,0.1517418,0.132815238244346
+90,0.28972,0.306885,0.291388,0.277883,0.283701,0.27942,0.24925,0.24388,0.22955,0.219895,0.1935492,0.1698118,0.149318696224486
+91,,,,,,0.30021,0.26627,0.26223,0.24447,0.23787,0.2110395,0.1895022,0.16707527949112
+92,,,,,,0.30811,0.28406,0.28108,0.25962,0.256563,0.2299318,0.2108727,0.186034692558165
+93,,,,,,0.3116,0.30266,0.30045,0.27501,0.275859,0.2501231,0.2338888,0.206122548851386
+94,,,,,,0.32117,0.32209,0.32035,0.29062,0.295637,0.2714322,0.2583034,0.227240276570904
+95,,,,,,0.35801,0.34241,0.34081,0.30647,0.315727,0.2935812,0.2836835,0.249265952492919
+96,,,,,,0.39828,0.36364,0.36182,0.32255,0.335996,0.3162299,0.3095368,0.272056114190465
+97,,,,,,0.415,0.38583,0.38341,0.33886,0.356369,0.3391737,0.3357864,0.295448461910108
+98,,,,,,0.434,0.40902,0.4056,0.3554,0.37678,0.3623051,0.3624251,0.319265280434416
+99,,,,,,0.455,0.43326,0.42839,0.37218,0.397213,0.3855587,0.3893823,0.343317560442081
+100,,,,,,0.479,0.4586,0.45182,0.38918,1,1,0.4165604,1
+101,,,,,,,,,,,,0.4438524,
+102,,,,,,,,,,,,0.4711769,
+103,,,,,,,,,,,,0.4985037,
+104,,,,,,,,,,,,0.5258296,
+105,,,,,,,,,,,,0.5531587,
+106,,,,,,,,,,,,0.580489,
+107,,,,,,,,,,,,0.6078194,
+108,,,,,,,,,,,,0.6351498,
+109,,,,,,,,,,,,0.66248,
+110,,,,,,,,,,,,0.6898099,
+111,,,,,,,,,,,,0.7171393,
+112,,,,,,,,,,,,0.744468,
diff --git a/data/Austria_Census_Male.csv b/data/Austria_Census_Male.csv
new file mode 100644
index 0000000000000000000000000000000000000000..b2fe46a9b716e12e5b6fe52e8b2ca25618bee22c
--- /dev/null
+++ b/data/Austria_Census_Male.csv
@@ -0,0 +1,117 @@
+Census-Mortality Tables Austrian Males,,,,,,,,,,,,,
+Source: Statistik Austria. Alexander Hanika,,,,,,,,,,,,,
+,,,,,,,,,,,,,
+x,1868/71,1879/82,1889/92,1899/1902,1909/12,1930/33,1949/51,1959/61,1970/72,1980/82,1990/92,2000/02,2010/12
+0,0.297731,0.274107,0.26678,0.230381,0.205894,0.1154,0.07518,0.04207,0.0293,0.015329,0.0084686,0.005343,0.00394905716260243
+1,0.068279,0.070981,0.066802,0.049499,0.038888,0.014,0.0056,0.0028,0.00171,0.001088,0.0005477,0.0003452,0.000268187201429239
+2,0.033583,0.037701,0.029168,0.020716,0.01563,0.00637,0.00283,0.00156,0.00108,0.000609,0.0004539,0.0002639,0.000213916794000993
+3,0.022415,0.026774,0.019087,0.013365,0.0099,0.00444,0.00222,0.00115,0.00079,0.000524,0.0003739,0.0001984,0.00016542160363432
+4,0.019419,0.022588,0.016738,0.009748,0.007152,0.00403,0.00175,0.00097,0.00071,0.000451,0.0003086,0.0001512,0.000124328897954087
+5,0.010429,0.014015,0.009422,0.007376,0.005718,0.00341,0.0014,0.00085,0.00064,0.000392,0.0002571,0.0001295,0.0000914455713648781
+6,0.010402,0.012792,0.008469,0.006029,0.004754,0.0032,0.00114,0.00074,0.00056,0.000357,0.0002165,0.0001226,0.0000731349607818407
+7,0.008666,0.010159,0.006638,0.004972,0.004033,0.00286,0.00096,0.00065,0.00055,0.000336,0.0001897,0.000117,0.0000690989483126532
+8,0.007312,0.008413,0.005661,0.004092,0.00332,0.00244,0.00084,0.00058,0.00057,0.000315,0.0001677,0.0001106,0.0000702372261515625
+9,0.00584,0.00584,0.004898,0.003798,0.0030085,0.00215,0.0008,0.00052,0.00055,0.000285,0.0001532,0.0001114,0.0000710887054554455
+10,0.00492,0.005606,0.004135,0.003504,0.002697,0.00186,0.00079,0.00049,0.00049,0.000266,0.0001495,0.0001138,0.0000734673510566204
+11,0.004319,0.004749,0.003561,0.002733,0.002464,0.00168,0.0008,0.00048,0.00045,0.000259,0.0001565,0.000113,0.0000831223839073615
+12,0.003997,0.004245,0.003352,0.002614,0.002371,0.00149,0.00084,0.00049,0.00048,0.000284,0.0001716,0.000115,0.000102597494251274
+13,0.003952,0.004064,0.003352,0.00265,0.002426,0.0015,0.00092,0.00054,0.00061,0.000344,0.0001979,0.0001428,0.000135730140667407
+14,0.004241,0.004252,0.003631,0.002869,0.002662,0.00168,0.00103,0.00066,0.00071,0.000452,0.000262,0.0002217,0.000191221096583637
+15,0.004819,0.00474,0.004162,0.003266,0.00308,0.00203,0.00119,0.00084,0.00087,0.000721,0.0003961,0.0003679,0.000269566331764646
+16,0.005617,0.005446,0.004876,0.003805,0.003634,0.00249,0.0014,0.00106,0.00131,0.001175,0.0006237,0.0005631,0.000367295022683151
+17,0.006552,0.006276,0.005653,0.004429,0.004241,0.00293,0.00165,0.00134,0.00164,0.001623,0.0009624,0.0007744,0.000480930550747629
+18,0.007548,0.00713,0.006376,0.00506,0.004804,0.00328,0.0019,0.00157,0.00197,0.001947,0.0013468,0.0009476,0.000598740586727786
+19,0.008503,0.007934,0.006987,0.005608,0.00525,0.00352,0.00212,0.0018,0.00215,0.00202,0.0015062,0.0010207,0.000698730569782052
+20,0.0093,0.008637,0.007466,0.006034,0.005552,0.00374,0.00228,0.002,0.00218,0.00195,0.0014673,0.0010268,0.000766359095548142
+21,0.009878,0.009188,0.007834,0.006334,0.005735,0.00396,0.00235,0.00212,0.00216,0.00184,0.0013739,0.0010239,0.000797397126659689
+22,0.010203,0.009539,0.008103,0.006531,0.00585,0.00408,0.00235,0.00216,0.00216,0.001749,0.0012821,0.0010166,0.000791636718318425
+23,0.010302,0.009691,0.008278,0.006666,0.005943,0.00411,0.00232,0.00213,0.00209,0.001681,0.0012317,0.0010061,0.000764732114573975
+24,0.010278,0.009688,0.008363,0.006777,0.006043,0.00404,0.00228,0.00207,0.00199,0.001632,0.0012004,0.0009997,0.000735982132439429
+25,0.010219,0.0096,0.008383,0.006874,0.00616,0.00426,0.00228,0.00201,0.0019,0.001602,0.0011736,0.0009973,0.000714827325059327
+26,0.010181,0.009535,0.008392,0.006969,0.006285,0.00428,0.00231,0.00199,0.00184,0.001595,0.001159,0.0009856,0.000699067504821345
+27,0.010184,0.00957,0.008443,0.00708,0.006412,0.00429,0.00235,0.00201,0.00183,0.001598,0.0011614,0.0009627,0.000685798464840803
+28,0.010208,0.009709,0.008563,0.007214,0.006558,0.00412,0.00239,0.00206,0.00183,0.001603,0.0011766,0.0009286,0.000677669766112501
+29,0.01022,0.009919,0.008717,0.00738,0.006733,0.00419,0.00244,0.00212,0.00185,0.001614,0.0012047,0.0008961,0.000677724847450109
+30,0.010247,0.010162,0.008872,0.007578,0.00695,0.00438,0.0025,0.00218,0.0019,0.001633,0.0012464,0.0008793,0.0006862086618187
+31,0.01034,0.010388,0.00901,0.007799,0.007224,0.00468,0.00255,0.00224,0.00198,0.001659,0.0013043,0.0008905,0.000703990514490076
+32,0.010524,0.010586,0.009143,0.008033,0.007542,0.00503,0.00261,0.00228,0.0021,0.001696,0.0013837,0.0009343,0.000732068852026491
+33,0.010837,0.010784,0.009325,0.008299,0.007887,0.00528,0.00267,0.00231,0.00225,0.001756,0.0014691,0.0009913,0.000771773683300514
+34,0.011248,0.01099,0.009599,0.008611,0.008246,0.00544,0.00276,0.00235,0.00244,0.001848,0.0015485,0.0010528,0.000819309851185313
+35,0.011697,0.011225,0.009974,0.008984,0.008614,0.00562,0.00289,0.00241,0.00264,0.00198,0.0016246,0.0011164,0.000869469996764657
+36,0.012138,0.011515,0.010425,0.00942,0.008988,0.00575,0.00305,0.00251,0.00285,0.002147,0.0017037,0.0011973,0.000923222143520246
+37,0.012557,0.011868,0.010931,0.009898,0.009388,0.00595,0.00324,0.00264,0.00307,0.002346,0.0017987,0.0013159,0.000985439587233173
+38,0.012941,0.012276,0.011459,0.010395,0.009822,0.0062,0.00345,0.0028,0.00331,0.002568,0.001941,0.0014696,0.00105914952355004
+39,0.013325,0.012743,0.011996,0.010898,0.010295,0.0066,0.0037,0.00298,0.00357,0.002808,0.0021488,0.0016474,0.00114551597726435
+40,0.013758,0.013242,0.01254,0.011408,0.010796,0.00703,0.00399,0.00319,0.00383,0.003077,0.0024129,0.00184,0.00124754317035493
+41,0.01425,0.013739,0.013078,0.011928,0.01131,0.00735,0.0043,0.00345,0.00411,0.003381,0.0027102,0.0020376,0.00136936903745284
+42,0.014817,0.014222,0.013589,0.012468,0.011827,0.00803,0.00463,0.00372,0.00436,0.003725,0.003018,0.0022378,0.00151248316189686
+43,0.015455,0.01469,0.014061,0.013032,0.012351,0.00852,0.005,0.00401,0.00461,0.004115,0.0033313,0.0024482,0.00167905910221854
+44,0.016141,0.015174,0.01451,0.013624,0.012908,0.00922,0.00544,0.00434,0.00487,0.004547,0.0036547,0.0026829,0.00187167596628981
+45,0.016843,0.015725,0.014974,0.014255,0.013536,0.00951,0.00599,0.00474,0.0052,0.005024,0.0039948,0.0029503,0.00209382210711817
+46,0.017554,0.016394,0.015508,0.014944,0.014265,0.01019,0.00664,0.00525,0.00563,0.00555,0.0043519,0.0032555,0.00234510795159409
+47,0.018266,0.017201,0.016165,0.015704,0.01511,0.01071,0.00739,0.00586,0.00617,0.006127,0.0047251,0.0035965,0.00262473516029972
+48,0.018996,0.018148,0.016971,0.016554,0.01607,0.01137,0.00822,0.00654,0.00679,0.006752,0.0051126,0.0039826,0.00293508705974484
+49,0.019797,0.019207,0.017919,0.017502,0.017117,0.01222,0.00911,0.00732,0.00749,0.007423,0.005521,0.0044224,0.00328111963485587
+50,0.020724,0.020333,0.018979,0.018544,0.018219,0.01299,0.01006,0.00819,0.00824,0.008138,0.0059701,0.004917,0.00366442612022798
+51,0.021802,0.021489,0.020115,0.019659,0.019353,0.0142,0.01107,0.00917,0.00904,0.008903,0.0064826,0.0054561,0.00408583967473797
+52,0.023041,0.022663,0.021307,0.020833,0.020511,0.01525,0.01213,0.01025,0.00983,0.009717,0.0070816,0.0060208,0.00454920888077894
+53,0.024431,0.02386,0.022555,0.02206,0.021695,0.01642,0.01326,0.01143,0.01062,0.010581,0.0077817,0.0065971,0.00505824787622153
+54,0.025925,0.025106,0.023892,0.023341,0.022932,0.01745,0.01446,0.01271,0.01149,0.01149,0.0085851,0.0071772,0.00561699179073659
+55,0.027513,0.026454,0.025374,0.024712,0.024254,0.01893,0.01575,0.01411,0.01252,0.012441,0.0094913,0.0077607,0.00623178333092728
+56,0.029231,0.027938,0.027031,0.026219,0.025705,0.02006,0.01709,0.01565,0.0138,0.013487,0.0104969,0.0083568,0.00690984477637814
+57,0.031123,0.02958,0.028884,0.027887,0.027339,0.0218,0.01846,0.01732,0.01529,0.014601,0.0115953,0.0089745,0.00765337111946349
+58,0.033259,0.031426,0.030955,0.02975,0.029202,0.02338,0.01993,0.01912,0.01695,0.015786,0.0127831,0.0096238,0.00846044144892736
+59,0.035737,0.033521,0.033237,0.031838,0.031336,0.0251,0.02156,0.02104,0.01881,0.017054,0.0140661,0.0103254,0.00932539228710239
+60,0.038607,0.035905,0.035719,0.034147,0.033744,0.02672,0.02339,0.02311,0.02089,0.018408,0.0154529,0.0111153,0.010239966255187
+61,0.04181,0.038604,0.038405,0.036681,0.036404,0.02882,0.0254,0.02533,0.02323,0.019861,0.0169422,0.0120316,0.0111943656279751
+62,0.045265,0.041612,0.041286,0.039452,0.039276,0.03142,0.02754,0.02766,0.0258,0.021465,0.0185334,0.0131064,0.0121773025598203
+63,0.048862,0.044851,0.044341,0.042434,0.042321,0.03446,0.02988,0.03011,0.02856,0.0233,0.0202352,0.0143678,0.0131839431733137
+64,0.052512,0.048292,0.047587,0.046518,0.04552,0.0378,0.03245,0.03273,0.03158,0.025421,0.0220656,0.0158211,0.0142135098158873
+65,0.056185,0.051949,0.051091,0.049052,0.048932,0.04077,0.03533,0.03556,0.03491,0.027869,0.0240385,0.0174507,0.015273997156539
+66,0.060111,0.055938,0.054954,0.052774,0.052641,0.04412,0.03843,0.03865,0.03858,0.030667,0.0261662,0.0192473,0.0163849918121921
+67,0.0646,0.060462,0.059299,0.056875,0.05673,0.04724,0.04171,0.04193,0.04261,0.033833,0.0284651,0.021214,0.0175707591972468
+68,0.069883,0.065723,0.064303,0.061518,0.061302,0.05074,0.0453,0.04535,0.04697,0.037564,0.0309598,0.0233625,0.0188648985219643
+69,0.076161,0.071819,0.070108,0.066836,0.066417,0.05492,0.0493,0.04905,0.05164,0.041399,0.0336572,0.0257042,0.0203052137487585
+70,0.083492,0.078746,0.076776,0.0729,0.072058,0.06033,0.05382,0.05315,0.05662,0.04568,0.0365059,0.0282537,0.0219358972855626
+71,0.091607,0.0864,0.084276,0.079756,0.078234,0.06646,0.05882,0.0578,0.06192,0.0503,0.0395594,0.0310362,0.0238056681756054
+72,0.100203,0.094551,0.092476,0.087348,0.084947,0.07258,0.0642,0.06291,0.06748,0.055472,0.0429954,0.0340867,0.0259660089592147
+73,0.10917,0.103053,0.101095,0.095522,0.092133,0.07929,0.07007,0.06838,0.07329,0.061496,0.0470208,0.0374562,0.0284712437219306
+74,0.118372,0.111852,0.110017,0.104191,0.099791,0.08576,0.07652,0.07435,0.07944,0.068047,0.0517327,0.0412038,0.0313776790588729
+75,0.127538,0.120988,0.11928,0.113349,0.107985,0.09556,0.08368,0.08095,0.08603,0.07504,0.0571156,0.0453985,0.0347440278715149
+76,0.136948,0.130587,0.129189,0.12297,0.116637,0.10317,0.09141,0.08831,0.09314,0.082511,0.0631044,0.0501132,0.0386318834325519
+77,0.146958,0.14104,0.140219,0.133012,0.125817,0.11447,0.09966,0.09635,0.10063,0.090463,0.0697074,0.0554263,0.0431056819332838
+78,0.157964,0.152882,0.152797,0.143529,0.135765,0.12378,0.1086,0.10499,0.10844,0.09874,0.0769878,0.0614277,0.0482320101503688
+79,0.170718,0.166417,0.166923,0.154566,0.146625,0.13511,0.11957,0.11433,0.11678,0.107795,0.0850452,0.0682233,0.0540783137118937
+80,0.185842,0.181762,0.182146,0.166173,0.15862,0.14773,0.13101,0.1245,0.12588,0.117993,0.0939633,0.0759351,0.0607107581412714
+81,0.20322,0.19861,0.197662,0.178472,0.171913,0.15816,0.14295,0.1356,0.13595,0.129084,0.1038265,0.0846979,0.0681933965185511
+82,0.222128,0.216114,0.212326,0.191656,0.186183,0.17323,0.15541,0.14784,0.14821,0.140612,0.1147278,0.0946637,0.0765870932792323
+83,0.241583,0.233184,0.225032,0.205404,0.20091,0.18787,0.1684,0.16113,0.16069,0.152392,0.1267711,0.1053137,0.0859486824013486
+84,0.259422,0.247671,0.233354,0.218803,0.215719,0.20434,0.18197,0.17518,0.17338,0.164379,0.1393243,0.1161986,0.0963301477270799
+85,0.274773,0.260158,0.237076,0.231323,0.230567,0.22252,0.19612,0.1897,0.18629,0.176794,0.1515216,0.1276845,0.107776854413708
+86,0.28679,0.272825,0.239416,0.244877,0.245717,0.23514,0.21088,0.20438,0.19942,0.189774,0.1638862,0.139904,0.120325690200178
+87,0.298775,0.289031,0.245755,0.260225,0.261278,0.25459,0.22629,0.21895,0.21276,0.203326,0.1767471,0.1531484,0.134003344736063
+88,0.312881,0.309983,0.267829,0.28007,0.27807,0.27166,0.24236,0.23416,0.22632,0.217492,0.1903175,0.1676838,0.148824497505413
+89,0.330972,0.337542,0.312164,0.306432,0.295664,0.29667,0.25914,0.25002,0.2401,0.23235,0.2050741,0.1839279,0.164790495304271
+90,0.332004,0.327006,0.295563,0.3068,0.312958,0.31273,0.27665,0.26655,0.25409,0.247977,0.2213,0.2020555,0.181888112760169
+91,,,,,,0.33292,0.29491,0.2838,0.2683,0.264435,0.2390753,0.2221826,0.200088269846977
+92,,,,,,0.33672,0.31397,0.30179,0.28273,0.281777,0.2583662,0.2440479,0.219345334689177
+93,,,,,,0.35505,0.33386,0.32055,0.29737,0.29994,0.2788847,0.2672621,0.239596707006356
+94,,,,,,0.3779,0.35461,0.34012,0.31223,0.318781,0.3002757,0.2914275,0.260762862843297
+95,,,,,,0.39,0.37626,0.36052,0.32731,0.338075,0.3222411,0.3162331,0.282747906996984
+96,,,,,,0.4125,0.39886,0.38181,0.3426,0.357614,0.3444248,0.3414812,0.305440646120197
+97,,,,,,0.435,0.42243,0.404,0.35811,0.377275,0.3665705,0.3670574,0.328716241821161
+98,,,,,,0.46,0.44703,0.42715,0.37383,0.39699,0.3886051,0.3928725,0.352438339954358
+99,,,,,,0.485,0.4727,0.45129,0.38978,0.416711,0.4105795,0.4188563,0.376461610299673
+100,,,,,,0.51,0.49948,0.47647,0.40593,1,1,0.4449421,1
+101,,,,,,,,,,,,0.4710857,
+102,,,,,,,,,,,,0.4972566,
+103,,,,,,,,,,,,0.5234342,
+104,,,,,,,,,,,,0.5496121,
+105,,,,,,,,,,,,0.57579,
+106,,,,,,,,,,,,0.6019685,
+107,,,,,,,,,,,,0.628148,
+108,,,,,,,,,,,,0.6543293,
+109,,,,,,,,,,,,0.6805127,
+110,,,,,,,,,,,,0.706699,
+111,,,,,,,,,,,,0.7328886,
+112,,,,,,,,,,,,0.7590821,
diff --git a/data/ValuationTables_Austria_Annuities.R b/data/ValuationTables_Austria_Annuities.R
new file mode 100644
index 0000000000000000000000000000000000000000..93c0c2c9a8f55b3e2ef01caddd13827a038cff47
--- /dev/null
+++ b/data/ValuationTables_Austria_Annuities.R
@@ -0,0 +1,199 @@
+stopifnot(require(methods), require(utils), require(ValuationTables)) # ValuationTable classes; new; Excel reader
+
+
+###############################################################################
+### RR67 Rententafel für Männer, 3%
+###############################################################################
+
+rr67.data = utils::read.csv("Tables/Austria_Annuities_RR67.csv", skip=2)
+
+rr67 = ValuationTables::valuationTable_period(
+ name = "ÖVM 59/61 RR67", ages = rr67.data$Alter, deathProbs = rr67.data$qx
+);
+rm(rr67.data);
+
+
+###############################################################################
+### EROM/EROF 85 and G 1985 (period and age-shifted generation)
+###############################################################################
+
+# eromf.data = openxlsx::read.xlsx("Tables/AVOe_R.xlsx", sheet = "EROM-F Basistafeln", startRow = 3)
+eromf.data = utils::read.csv("Tables/Austria_Annuities_EROMF.csv", skip=2)
+
+erom85.male = new("valuationTable_period",
+ name = "EROM 85, male", ages = eromf.data$Alter, deathProbs = eromf.data$EROM.85
+);
+erom85.female = new("valuationTable_period",
+ name = "EROF 85, female", ages = eromf.data$Alter, deathProbs = eromf.data$EROF.85
+);
+
+EROM.G1950.male = new("valuationTable_period",
+ name = "EROM G 1950 Basistafel, male",
+ ages = eromf.data$Alter,
+ deathProbs = eromf.data$EROM.G1950,
+ baseYear = 1950
+);
+EROF.G1950.female = new("valuationTable_period",
+ name = "EROF G 1950 Basistafel, female",
+ ages = eromf.data$Alter,
+ deathProbs = eromf.data$EROF.G1950,
+ baseYear = 1950
+);
+
+# eromf.data.av = openxlsx::read.xlsx("Tables/AVOe_R.xlsx", sheet = "EROM-F G AV", startRow = 3, rowNames = TRUE, colNames = TRUE)
+eromf.data.av = utils::read.csv("Tables/Austria_Annuities_EROMF_AV.csv", skip=2)
+
+EROM.G1950.male.av = valuationTable_ageShift(
+ name = "EROM G 1950 mit Altersverschiebung, male",
+ ages = eromf.data$Alter,
+ deathProbs = eromf.data$EROM.G1950,
+ ageShifts = eromf.data.av["Shift.M"],
+ baseYear = 1950
+);
+EROF.G1950.female.av = valuationTable_ageShift(
+ name = "EROF G 1950 mit Altersverschiebung, female",
+ ages = eromf.data$Alter,
+ deathProbs = eromf.data$EROF.G1950,
+ ageShifts = eromf.data.av["Shift.F"],
+ baseYear = 1950
+);
+
+rm(eromf.data, eromf.data.av)
+
+
+###############################################################################
+# AVÖ 1996R exact (Male, Female), 1st-order only
+###############################################################################
+
+# AVOe1996R.exakt.data = openxlsx::read.xlsx("Tables/AVOe_R.xlsx",
+ # sheet = "AVOe 1996R exakt", startRow = 3, cols = c(1:6, 8:12));
+AVOe1996R.exakt.data = utils::read.csv("Tables/Austria_Annuities_AVOe1996R.csv", skip=2)
+
+AVOe1996R.trend.switching = function(year) {
+ if (year <= 1971) {
+ 15/(1991-year)
+ } else if (1971 < year && year < 1981) {
+ 1+(year-1981)^2/(year-1991)/20
+ } else if (1981 <= year && year <= 2000) {
+ 1
+ } else if (2000 < year && year < 2010) {
+ 1-(year-2000)^2/(year-1991)/20
+ } else if (year >= 2010) {
+ 14/(year-1991)
+ }
+}
+
+AVÖ1996R.male = new("valuationTable_trendProjection",
+ name = "AVÖ 1996R male",
+ ages = AVOe1996R.exakt.data$age, baseYear = 1991,
+ deathProbs = AVOe1996R.exakt.data$qx1991 * AVOe1996R.exakt.data$factorM,
+ trend = AVOe1996R.exakt.data$trendM.long,
+ trend2 = AVOe1996R.exakt.data$trendM.short,
+ dampingFunction = AVOe1996R.trend.switching
+);
+AVÖ1996R.female = new("valuationTable_trendProjection",
+ name = "AVÖ 1996R female",
+ ages = AVOe1996R.exakt.data$age, baseYear = 1991,
+ deathProbs = AVOe1996R.exakt.data$qy1991 * AVOe1996R.exakt.data$factorF,
+ trend = AVOe1996R.exakt.data$trendF.long,
+ trend2 = AVOe1996R.exakt.data$trendF.short,
+ dampingFunction = AVOe1996R.trend.switching
+);
+AVÖ1996R.male.group = new("valuationTable_trendProjection",
+ name = "AVÖ 1996R male, group",
+ ages = AVOe1996R.exakt.data$age, baseYear = 1991,
+ deathProbs = AVOe1996R.exakt.data$qx1991 * AVOe1996R.exakt.data$factorMG,
+ trend = AVOe1996R.exakt.data$trendM.long,
+ trend2 = AVOe1996R.exakt.data$trendM.short,
+ dampingFunction = AVOe1996R.trend.switching
+);
+AVÖ1996R.female.group = new("valuationTable_trendProjection",
+ name = "AVÖ 1996R female, group",
+ ages = AVOe1996R.exakt.data$age, baseYear = 1991,
+ deathProbs = AVOe1996R.exakt.data$qy1991 * AVOe1996R.exakt.data$factorFG,
+ trend = AVOe1996R.exakt.data$trendF.long,
+ trend2 = AVOe1996R.exakt.data$trendF.short,
+ dampingFunction = AVOe1996R.trend.switching
+);
+
+rm(AVOe1996R.exakt.data)
+
+
+
+###############################################################################
+# AVÖ 2005R exact (Male, Female, unisex)
+# gender-specific tables also have 2nd-order tables, unisex only 1st-order table
+###############################################################################
+
+# AVOe2005R.exakt.data = openxlsx::read.xlsx("Tables/AVOe_R.xlsx", sheet = "AVOe 2005R", startRow = 3, cols = c(1:7, 9:14, 16:18));
+AVOe2005R.exakt.data = utils::read.csv("Tables/Austria_Annuities_AVOe2005R.csv", skip = 2);
+
+AVOe2005R.trend.damping = function(t) {
+ 100*atan(t/100)
+}
+AVOe2005R_gen = function(nm, probs, trend) {
+ with(
+ AVOe2005R.exakt.data,
+ new("valuationTable_trendProjection",
+ name = nm,
+ ages = age, baseYear = 2001,
+ deathProbs = AVOe2005R.exakt.data[[probs]], trend = AVOe2005R.exakt.data[[trend]],
+ dampingFunction = AVOe2005R.trend.damping
+ )
+ )
+}
+
+AVOe2005R.male = AVOe2005R_gen("AVÖ 2005R male (exact), loaded", "qx2001", "trendM");
+AVOe2005R.female = AVOe2005R_gen("AVÖ 2005R female (exact), loaded", "qy2001", "trendF");
+AVOe2005R.unisex = AVOe2005R_gen("AVÖ 2005R unisex (exact), loaded", "qu2001", "trendU");
+AVOe2005R.male.unloaded = AVOe2005R_gen("AVÖ 2005R male (exact), unloaded", "qx2001.2Ord", "trendM.2Ord");
+AVOe2005R.female.unloaded = AVOe2005R_gen("AVÖ 2005R female (exact), unloaded", "qy2001.2Ord", "trendF.2Ord");
+AVOe2005R.male.group = AVOe2005R_gen("AVÖ 2005R male group (exact), loaded", "qx2001G", "trendM");
+AVOe2005R.female.group = AVOe2005R_gen("AVÖ 2005R female group (exact), loaded", "qy2001G", "trendF");
+AVOe2005R.unisex.group = AVOe2005R_gen("AVÖ 2005R unisex group (exact), loaded", "qu2001G", "trendU");
+
+AVOe2005R.male.nodamping = undampenTrend(AVOe2005R.male);
+AVOe2005R.female.nodamping = undampenTrend(AVOe2005R.female);
+AVOe2005R.unisex.nodamping = undampenTrend(AVOe2005R.unisex);
+AVOe2005R.male.nodamping.unloaded = undampenTrend(AVOe2005R.male.unloaded);
+AVOe2005R.female.nodamping.unloaded = undampenTrend(AVOe2005R.female.unloaded);
+AVOe2005R.male.nodamping.group = undampenTrend(AVOe2005R.male.group);
+AVOe2005R.female.nodamping.group = undampenTrend(AVOe2005R.female.group);
+AVOe2005R.unisex.nodamping.group = undampenTrend(AVOe2005R.unisex.group);
+
+
+###############################################################################
+#AVÖ 2005R with age-shifting (Male, Female, unisex), 1st-order only
+###############################################################################
+
+AVOe2005R.av.base = openxlsx::read.xlsx("Tables/AVOe_R.xlsx", sheet = "AVOe 2005R AV Basistafel", startRow = 3, rowNames = FALSE);
+AVOe2005R.av.verschiebung = openxlsx::read.xlsx("Tables/AVOe_R.xlsx", sheet = "AVOe 2005R AV Verschiebung", startRow = 3, rowNames = TRUE);
+
+AVOe2005R_gen.av = function(nm, probs, shft) {
+ new("valuationTable_ageShift",
+ name = nm,
+ ages = AVOe2005R.av.base$age,
+ deathProbs = AVOe2005R.av.base[[probs]],
+ ageShifts = na.omit(AVOe2005R.av.verschiebung[shft])
+ )
+}
+
+AVOe2005R.male.av = AVOe2005R_gen.av("AVÖ 2005R male (age-shifted), loaded", "qx1965", "shiftM");
+AVOe2005R.female.av = AVOe2005R_gen.av("AVÖ 2005R female (age-shifted), loaded", "qy1965", "shiftF");
+AVOe2005R.unisex.av = AVOe2005R_gen.av("AVÖ 2005R unisex (age-shifted), loaded", "qu1972", "shiftU");
+AVOe2005R.male.group.av = AVOe2005R_gen.av("AVÖ 2005R male group (age-shifted), loaded", "qx1965G", "shiftMG");
+AVOe2005R.female.group.av = AVOe2005R_gen.av("AVÖ 2005R female group (age-shifted), loaded", "qy1965G", "shiftFG");
+AVOe2005R.unisex.group.av = AVOe2005R_gen.av("AVÖ 2005R unisex group (age-shifted), loaded", "qu1972G", "shiftUG");
+
+
+
+###############################################################################
+
+# options("scipen" = 3, "digits" = 10)
+# t = AVOe2005R.unisex;
+# deathProbabilities(t, YOB = 1981)
+
+# plotValuationTables(mort.AT.census.1869.male, mort.AT.census.1869.female, mort.AT.census.2011.male, mort.AT.census.2011.female, AVOe2005R.male, AVOe2005R.female, YOB = 1972,title = "Vergleich österreichische Sterbetafeln, YOB = 1972 (bei Generationentafeln)")
+#
+# plotValuationTables(mort.AT.census.2001.male, AVOe2005R.male, YOB = 1972, title = "Vergleich österreichische Sterbetafeln")
+# plotValuationTables(getCohortTable(AVOe2005R.male, YOB = 1972), getCohortTable(AVOe2005R.male, YOB = 2016), title = "Vergleich österreichische Sterbetafeln")
diff --git a/R/ValuationTables_Austria_Census.R b/data/ValuationTables_Austria_Census.R
similarity index 92%
rename from R/ValuationTables_Austria_Census.R
rename to data/ValuationTables_Austria_Census.R
index 7d6cf431767cdb6b8948fe185eae8b1b9ba622e0..5f9dd0508424e07c59b6db6f16edf56127033a0f 100644
--- a/R/ValuationTables_Austria_Census.R
+++ b/data/ValuationTables_Austria_Census.R
@@ -5,6 +5,8 @@
# setwd(dirname(PATH))
library("openxlsx")
+# library("ggplot2")
+library("ValuationTables")
@@ -20,7 +22,7 @@ a.vz.dataF = openxlsx::read.xlsx("Tables/A_Volkszaehlungen.xlsx", sheet="Austria
censtable = function(data, name, qslot, baseYear=1900) {
qx=data[names(data)==qslot];
ix=complete.cases(qx);
- valuationTable.period(name=name, ages=data$x[ix], deathProbs=qx[ix,], baseYear=baseYear)
+ valuationTable_period(name=name, ages=data$x[ix], deathProbs=qx[ix,], baseYear=baseYear)
}
mort.AT.census.1869.male = censtable(a.vz.dataM, name="ÖVSt 1868/71 M", baseYear=1869, qslot="1868/71");
@@ -51,7 +53,7 @@ mort.AT.census.1991.female = censtable(a.vz.dataF, name="ÖVSt 1990/92 F", bas
mort.AT.census.2001.female = censtable(a.vz.dataF, name="ÖVSt 2000/02 F", baseYear=2001, qslot="2000/02");
mort.AT.census.2011.female = censtable(a.vz.dataF, name="ÖVSt 2010/2012 F", baseYear=2011, qslot="2010/12");
-mort.AT.census.2001.unisex = valuationTable.mixed(table1=mort.AT.census.2001.male, table2=mort.AT.census.2001.female)
+mort.AT.census.2001.unisex = valuationTable_mixed(table1=mort.AT.census.2001.male, table2=mort.AT.census.2001.female)
mort.AT.census.ALL.male = makeQxDataFrame(
mort.AT.census.1869.male,
@@ -87,5 +89,5 @@ rm(a.vz.dataM, a.vz.dataF, censtable)
###############################################################################
-plotValuationTables(mort.AT.census.ALL.male, title="Vergleich österreichische Sterbetafeln, Männer", legend.position=c(1,0))
-plotValuationTables(mort.AT.census.ALL.female, title="Vergleich österreichische Sterbetafeln, Frauen", legend.position=c(1,0))
+# plotValuationTables(mort.AT.census.ALL.male, title="Vergleich österreichische Sterbetafeln, Männer", legend.position=c(1,0))
+# plotValuationTables(mort.AT.census.ALL.female, title="Vergleich österreichische Sterbetafeln, Frauen", legend.position=c(1,0))
diff --git a/R/ValuationTables_Germany_Annuities.R b/data/ValuationTables_Germany_Annuities.R
similarity index 68%
rename from R/ValuationTables_Germany_Annuities.R
rename to data/ValuationTables_Germany_Annuities.R
index d5f94d8edf4b5f732b6e10e6a2ad33b3a45ba031..8b55e007160508d589bf949e46c828da14dfbbab 100644
--- a/R/ValuationTables_Germany_Annuities.R
+++ b/data/ValuationTables_Germany_Annuities.R
@@ -1,11 +1,12 @@
-frame_files = lapply(sys.frames(), function(x) x$ofile)
-frame_files = Filter(Negate(is.null), frame_files)
-PATH <- dirname(frame_files[[length(frame_files)]])
-rm(frame_files)
-
-setwd(dirname(PATH))
+# frame_files = lapply(sys.frames(), function(x) x$ofile)
+# frame_files = Filter(Negate(is.null), frame_files)
+# PATH <- dirname(frame_files[[length(frame_files)]])
+# rm(frame_files)
+#
+# setwd(dirname(PATH))
library("gdata")
+library("ValuationTables")
###############################################################################
@@ -13,23 +14,23 @@ library("gdata")
###############################################################################
DAV1994R.exakt.data=read.xls(
- "Tafeln/DAV_R.xls",
- sheet="DAV 1994R", skip=2, #row.names=1,
+ "Tables/DAV_R.xls",
+ sheet="DAV 1994R", skip=2, #row.names=1,
col.names=c("age",
"qx2000", "qy2000", "trendM", "trendF", "qxAVbase1955", "qyAVbase1955",
"", "", "", "", "", "")
);
-DAV1994R.male=valuationTable.trendProjection(
+DAV1994R.male=valuationTable_trendProjection(
name="DAV 1994R male",
ages=DAV1994R.exakt.data$age, baseYear=2000,
- deathProbs=DAV1994R.exakt.data$qx2000,
+ deathProbs=DAV1994R.exakt.data$qx2000,
trend=DAV1994R.exakt.data$trendM
);
-DAV1994R.female=valuationTable.trendProjection(
+DAV1994R.female=valuationTable_trendProjection(
name="DAV 1994R female",
ages=DAV1994R.exakt.data$age, baseYear=2000,
- deathProbs=DAV1994R.exakt.data$qy2000,
+ deathProbs=DAV1994R.exakt.data$qy2000,
trend=DAV1994R.exakt.data$trendF
);
@@ -39,16 +40,16 @@ DAV1994R.female=valuationTable.trendProjection(
###############################################################################
DAV2004R.data.basistafeln=read.xls(
- "Tafeln/DAV_2004_R.xls",
- sheet="Basistafeln", skip=3, #row.names=1,
+ "Tables/DAV_2004_R.xls",
+ sheet="Basistafeln", skip=3, #row.names=1,
col.names=c("age",
- "qxSel2Ord", "qySel2Ord", "qxAgg2Ord", "qyAgg2Ord",
- "qxSelBestand", "qySelBestand", "qxAggBestand", "qyAggBestand",
+ "qxSel2Ord", "qySel2Ord", "qxAgg2Ord", "qyAgg2Ord",
+ "qxSelBestand", "qySelBestand", "qxAggBestand", "qyAggBestand",
"qxSel", "qySel", "qxAgg", "qyAgg")
);
DAV2004R.data.trend=read.xls(
- "Tafeln/DAV_2004_R.xls",
- sheet="Trends", skip=4, header=FALSE, #row.names=1,
+ "Tafeln/DAV_2004_R.xls",
+ sheet="Trends", skip=4, header=FALSE, #row.names=1,
col.names=c("age",
"trend2Ord.male.start", "trend2Ord.female.start",
"trend2Ord.male.end", "trend2Ord.female.end",
@@ -57,35 +58,35 @@ DAV2004R.data.trend=read.xls(
"trend1Ord.male", "trend1Ord.female")
);
DAV2004R.data.select=read.xls(
- "Tafeln/DAV_2004_R.xls",
- sheet="Selektionsfaktoren", skip=2, header=FALSE, #row.names=1,
+ "Tafeln/DAV_2004_R.xls",
+ sheet="Selektionsfaktoren", skip=2, header=FALSE, #row.names=1,
col.names=c("year", "SelectMale", "SelectFemale")
);
DAV2004R.data.av.grundtafeln=read.xls(
- "Tafeln/DAV_2004_R.xls",
- sheet="Grundtafeln", skip=3, #row.names=1,
+ "Tafeln/DAV_2004_R.xls",
+ sheet="Grundtafeln", skip=3, #row.names=1,
col.names=c("age",
"qxBestand", "qyBestand",
"qxB20", "qyB20",
"qx1Ord", "qy1Ord")
);
DAV2004R.data.av=read.xls(
- "Tafeln/DAV_2004_R.xls",
- sheet="Altersverschiebungen", skip=1, row.names=1,
+ "Tafeln/DAV_2004_R.xls",
+ sheet="Altersverschiebungen", skip=1, row.names=1,
col.names=c("YOB", "shiftMBestand", "shiftFBestand",
"shiftMB20", "shiftFB20",
"shiftM1Ord", "shiftF1Ord")
);
-DAV2004R.male=valuationTable.trendProjection(
+DAV2004R.male=valuationTable_trendProjection(
name="DAV 2004R male",
ages=DAV2004R.exakt.data$age, baseYear=2000,
- deathProbs=DAV2004R.exakt.data$qx2000,
+ deathProbs=DAV2004R.exakt.data$qx2000,
trend=DAV2004R.exakt.data$trendM
);
-DAV2004R.female=valuationTable.trendProjection(
+DAV2004R.female=valuationTable_trendProjection(
name="DAV 2004R female",
ages=DAV2004R.exakt.data$age, baseYear=2000,
- deathProbs=DAV2004R.exakt.data $qy2000,
+ deathProbs=DAV2004R.exakt.data $qy2000,
trend=DAV2004R.exakt.data$trendF
);
diff --git a/R/ValuationTables_Germany_LifeInsurance.R b/data/ValuationTables_Germany_LifeInsurance.R
similarity index 68%
rename from R/ValuationTables_Germany_LifeInsurance.R
rename to data/ValuationTables_Germany_LifeInsurance.R
index 56f5949d00288bcab5f90078c46c13d85e34072b..a95ef04bb24e2c3248c1a15e2ac4234da55445cd 100644
--- a/R/ValuationTables_Germany_LifeInsurance.R
+++ b/data/ValuationTables_Germany_LifeInsurance.R
@@ -1,34 +1,35 @@
-frame_files = lapply(sys.frames(), function(x) x$ofile)
-frame_files = Filter(Negate(is.null), frame_files)
-PATH <- dirname(frame_files[[length(frame_files)]])
-rm(frame_files)
+# frame_files = lapply(sys.frames(), function(x) x$ofile)
+# frame_files = Filter(Negate(is.null), frame_files)
+# PATH <- dirname(frame_files[[length(frame_files)]])
+# rm(frame_files)
-setwd(dirname(PATH))
+# setwd(dirname(PATH))
library("gdata")
+library("ValuationTables")
# DAV1994T (Male, Female), 1st-order and general mortality 1986/88
dav1994T.data=read.xls(
- "Tafeln/DAV_T.xls",
- sheet=1, skip=1, #row.names=1,
+ "Tables/DAV_T.xls",
+ sheet=1, skip=1, #row.names=1,
col.names=c("age",
- "", "",
+ "", "",
"qx2", "qxKI", "qx",
"", "", "",
"qy2", "qyKI", "qy"
));
-DAV1994T.male=valuationTable.period(
+DAV1994T.male=valuationTable_period(
name="DAV 1994T male, loaded",
ages=dav1994T.data$age, deathProbs=dav1994T.data$qx)
-DAV1994T.male.2Ord=valuationTable.period(
+DAV1994T.male.2Ord=valuationTable_period(
name="DAV 1994T male, unloaded",
ages=dav1994T.data$age, deathProbs=dav1994T.data$qx2)
-DAV1994T.female=valuationTable.period(
+DAV1994T.female=valuationTable_period(
name="DAV 1994T female, loaded",
ages=dav1994T.data$age, deathProbs=dav1994T.data$qy)
-DAV1994T.female.2Ord=valuationTable.period(
+DAV1994T.female.2Ord=valuationTable_period(
name="DAV 1994T female, unloaded",
ages=dav1994T.data$age, deathProbs=dav1994T.data$qy2)
@@ -39,8 +40,8 @@ rm(DAV1994T.data)
######################################################
DAV2008T.data=read.xls(
- "Tafeln/DAV_T.xls",
- sheet=2, skip=2, #row.names=1,
+ "Tables/DAV_T.xls",
+ sheet=2, skip=2, #row.names=1,
col.names=c("age", "", "", "",
"qx2", "qx2NR", "qx2R",
"qx1", "qx1NR", "qx1R",
@@ -50,44 +51,44 @@ DAV2008T.data=read.xls(
));
### DAV 2008T Aggregat (smoker+non-smoker combined)
-DAV2008T.male=valuationTable.period(
+DAV2008T.male=valuationTable_period(
name="DAV 2008T male, loaded",
ages=DAV2008T.data$age, deathProbs=DAV2008T.data$qx1)
-DAV2008T.male.2Ord=valuationTable.period(
+DAV2008T.male.2Ord=valuationTable_period(
name="DAV 2008T male, unloaded",
ages=DAV2008T.data$age, deathProbs=DAV2008T.data$qx2)
-DAV2008T.female=valuationTable.period(
+DAV2008T.female=valuationTable_period(
name="DAV 2008T female, loaded",
ages=DAV2008T.data$age, deathProbs=DAV2008T.data$qy1)
-DAV2008T.female.2Ord=valuationTable.period(
+DAV2008T.female.2Ord=valuationTable_period(
name="DAV 2008T female, unloaded",
ages=DAV2008T.data$age, deathProbs=DAV2008T.data$qy2)
### DAV 2008T Smoker
-DAV2008T.male.smoker=valuationTable.period(
+DAV2008T.male.smoker=valuationTable_period(
name="DAV 2008T male smoker, loaded",
ages=DAV2008T.data$age, deathProbs=DAV2008T.data$qx1R)
-DAV2008T.male.smoker.2Ord=valuationTable.period(
+DAV2008T.male.smoker.2Ord=valuationTable_period(
name="DAV 2008T male smoker, unloaded",
ages=DAV2008T.data$age, deathProbs=DAV2008T.data$qx2R)
-DAV2008T.female.smoker=valuationTable.period(
+DAV2008T.female.smoker=valuationTable_period(
name="DAV 2008T female smoker, loaded",
ages=DAV2008T.data$age, deathProbs=DAV2008T.data$qy1R)
-DAV2008T.female.smoker.2Ord=valuationTable.period(
+DAV2008T.female.smoker.2Ord=valuationTable_period(
name="DAV 2008T female smoker, unloaded",
ages=DAV2008T.data$age, deathProbs=DAV2008T.data$qy2R)
### DAV 2008T Non-Smoker
-DAV2008T.male.nonsmoker=valuationTable.period(
+DAV2008T.male.nonsmoker=valuationTable_period(
name="DAV 2008T male non-smoker, loaded",
ages=DAV2008T.data$age, deathProbs=DAV2008T.data$qx1NR)
-DAV2008T.male.nonsmoker.2Ord=valuationTable.period(
+DAV2008T.male.nonsmoker.2Ord=valuationTable_period(
name="DAV 2008T male non-smoker, unloaded",
ages=DAV2008T.data$age, deathProbs=DAV2008T.data$qx2NR)
-DAV2008T.female.nonsmoker=valuationTable.period(
+DAV2008T.female.nonsmoker=valuationTable_period(
name="DAV 2008T female non-smoker, loaded",
ages=DAV2008T.data$age, deathProbs=DAV2008T.data$qy1NR)
-DAV2008T.female.nonsmoker.2Ord=valuationTable.period(
+DAV2008T.female.nonsmoker.2Ord=valuationTable_period(
name="DAV 2008T female non-smoker, unloaded",
ages=DAV2008T.data$age, deathProbs=DAV2008T.data$qy2NR)
diff --git a/R/ValuationTables_USA_Annuities.R b/data/ValuationTables_USA_Annuities.R
similarity index 74%
rename from R/ValuationTables_USA_Annuities.R
rename to data/ValuationTables_USA_Annuities.R
index 6674c685383a414eaeef70146050f7ff05c59535..195cd15c57d90bf2d12ebbcfee35931d5508ba8a 100644
--- a/R/ValuationTables_USA_Annuities.R
+++ b/data/ValuationTables_USA_Annuities.R
@@ -1,10 +1,11 @@
-frame_files = lapply(sys.frames(), function(x) x$ofile)
-frame_files = Filter(Negate(is.null), frame_files)
-PATH <- dirname(frame_files[[length(frame_files)]])
-rm(frame_files)
-setwd(dirname(PATH))
+# frame_files = lapply(sys.frames(), function(x) x$ofile)
+# frame_files = Filter(Negate(is.null), frame_files)
+# PATH <- dirname(frame_files[[length(frame_files)]])
+# rm(frame_files)
+# setwd(dirname(PATH))
library("gdata")
+library("ValuationTables")
###############################################################################
@@ -12,25 +13,25 @@ library("gdata")
###############################################################################
USA1971IAM.data=read.xls(
- "Tafeln/USA_Annuities.xls",
- sheet="1971 IAM", skip=2, #row.names=1,
+ "Tables/USA_Annuities.xls",
+ sheet="1971 IAM", skip=2, #row.names=1,
col.names=c("age","qx", "qy", "B"));
-USA1971IAM.male=valuationTable.period (
+USA1971IAM.male=valuationTable_period (
name="USA 1971 IAM, male",
ages=USA1971IAM.data$age,
deathProbs=USA1971IAM.data$qx)
-USA1971IAM.female=valuationTable.period (
+USA1971IAM.female=valuationTable_period (
name="USA 1971 IAM, female",
ages=USA1971IAM.data$age,
deathProbs=USA1971IAM.data$qy)
-USA1971IAM.male.projected=valuationTable.improvementFactors (
+USA1971IAM.male.projected=valuationTable_improvementFactors (
name="USA 1971 IAM, male",
ages=USA1971IAM.data$age, baseYear=1971,
deathProbs=USA1971IAM.data$qx,
improvement=USA1971IAM.data$B)
-USA1971IAM.female.projected=valuationTable.improvementFactors (
+USA1971IAM.female.projected=valuationTable_improvementFactors (
name="USA 1971 IAM, female",
ages=USA1971IAM.data$age, baseYear=1971,
deathProbs=USA1971IAM.data$qy,
@@ -44,24 +45,24 @@ rm(USA1971IAM.data);
###############################################################################
USA1983a.data=read.xls(
- "Tafeln/USA_Annuities.xls",
+ "Tables/USA_Annuities.xls",
sheet="1983a - GAM", skip=2,
col.names=c("age","qx", "qy", "qxG", "qyG"));
-USA1983a.male=valuationTable.period (
+USA1983a.male=valuationTable_period (
name="USA 1983 Table a, male",
ages=USA1983a.data$age,
deathProbs=USA1983a.data$qx)
-USA1983a.female=valuationTable.period (
+USA1983a.female=valuationTable_period (
name="USA 1983 Table a, female",
ages=USA1983a.data$age,
deathProbs=USA1983a.data$qy)
-USA1983GAM.male=valuationTable.period (
+USA1983GAM.male=valuationTable_period (
name="USA 1983 GAM, male",
ages=USA1983a.data$age,
deathProbs=USA1983a.data$qxG)
-USA1983GAM.female=valuationTable.period (
+USA1983GAM.female=valuationTable_period (
name="USA 1983 GAM, female",
ages=USA1983a.data$age,
deathProbs=USA1983a.data$qyG)
@@ -74,25 +75,25 @@ rm(USA1983a.data);
###############################################################################
USA1994GAM.data=read.xls(
- "Tafeln/USA_Annuities.xls",
+ "Tables/USA_Annuities.xls",
sheet="1994 GAR", skip=2,
col.names=c("age","qx", "AAx", "qy", "AAy", "qxBasic", "qyBasic"));
-USA1994GAM.male.basic=valuationTable.period (
+USA1994GAM.male.basic=valuationTable_period (
name="USA 1994 GAM basic (unloaded), male",
ages=USA1994GAM.data$age,
deathProbs=USA1994GAM.data$qxBasic)
-USA1994GAM.female.basic=valuationTable.period (
+USA1994GAM.female.basic=valuationTable_period (
name="USA 1994 GAM basic (unloaded), female",
ages=USA1994GAM.data$age,
deathProbs=USA1994GAM.data$qyBasic)
-USA1994GAR.male=valuationTable.improvementFactors (
+USA1994GAR.male=valuationTable_improvementFactors (
name="USA 1994 GAM, male",
ages=USA1994GAM.data$age,
deathProbs=USA1994GAM.data$qx,
improvement=USA1994GAM.data$AAx)
-USA1994GAR.female=valuationTable.improvementFactors (
+USA1994GAR.female=valuationTable_improvementFactors (
name="USA 1994 GAM, female",
ages=USA1994GAM.data$age,
deathProbs=USA1994GAM.data$qy,
@@ -106,24 +107,24 @@ rm(USA1994GAM.data);
###############################################################################
USAAnnuity2000.data=read.xls(
- "Tafeln/USA_Annuities.xls",
- sheet="Annuity 2000", skip=2, #row.names=1,
+ "Tables/USA_Annuities.xls",
+ sheet="Annuity 2000", skip=2, #row.names=1,
col.names=c("age","qxBasic", "qyBasic", "qx", "qy"));
-USAAnnuity2000.basic.male=valuationTable.period (
+USAAnnuity2000.basic.male=valuationTable_period (
name="USA Annuity 2000 basic, male",
ages=USAAnnuity2000.data$age,
deathProbs=USAAnnuity2000.data$qxBasic)
-USAAnnuity2000.basic.female=valuationTable.period (
+USAAnnuity2000.basic.female=valuationTable_period (
name="USA Annuity 2000 basic, female",
ages=USAAnnuity2000.data$age,
deathProbs=USAAnnuity2000.data$qyBasic)
-USAAnnuity2000.male.projected=valuationTable.period (
+USAAnnuity2000.male.projected=valuationTable_period (
name="USA Annuity 2000, male",
ages=USAAnnuity2000.data$age,
deathProbs=USAAnnuity2000.data$qx)
-USAAnnuity2000.female.projected=valuationTable.period (
+USAAnnuity2000.female.projected=valuationTable_period (
name="USA Annuity 2000, female",
ages=USAAnnuity2000.data$age,
deathProbs=USAAnnuity2000.data$qy)
@@ -136,25 +137,25 @@ rm(USAAnnuity2000.data);
###############################################################################
USA2012IAM.data=read.xls(
- "Tafeln/USA_Annuities.xls",
+ "Tables/USA_Annuities.xls",
sheet="2012 IAR", skip=3,
col.names=c("age","qxBasic", "qyBasic", "qx", "qy", "G2x", "G2y", "", "", ""));
-USA2012IAM.male.basic=valuationTable.period (
+USA2012IAM.male.basic=valuationTable_period (
name="USA 2012 IAM basic (unloaded), male",
ages=USA2012IAM.data$age,
deathProbs=USA2012IAM.data$qxBasic)
-USA2012IAM.female.basic=valuationTable.period (
+USA2012IAM.female.basic=valuationTable_period (
name="USA 2012 IAM basic (unloaded), female",
ages=USA2012IAM.data$age, omega=max(USA2012IAM.data$age,rm.na=TRUE)+1,
deathProbs=USA2012IAM.data$qyBasic)
-USA2012IAM.male=valuationTable.improvementFactors (
+USA2012IAM.male=valuationTable_improvementFactors (
name="USA 2012 IAM, male",
ages=USA2012IAM.data$age, omega=max(USA2012IAM.data$age,rm.na=TRUE)+1,
deathProbs=USA2012IAM.data$qx,
improvement=USA2012IAM.data$G2x)
-USA2012IAM.female=valuationTable.improvementFactors (
+USA2012IAM.female=valuationTable_improvementFactors (
name="USA 2012 IAM, female",
ages=USA2012IAM.data$age, omega=max(USA2012IAM.data$age,rm.na=TRUE)+1,
deathProbs=USA2012IAM.data$qy,
diff --git a/src/Tables/Austria_Annuities.xlsx b/src/Tables/Austria_Annuities.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..304237519ddc73662f7ca8cac239436e6eb23826
Binary files /dev/null and b/src/Tables/Austria_Annuities.xlsx differ
diff --git a/R/Tables/A_Volkszaehlungen.xlsx b/src/Tables/Austria_Census.xlsx
similarity index 100%
rename from R/Tables/A_Volkszaehlungen.xlsx
rename to src/Tables/Austria_Census.xlsx
diff --git a/R/Tables/DAV_2004_R.xls b/src/Tables/DAV_2004_R.xls
similarity index 100%
rename from R/Tables/DAV_2004_R.xls
rename to src/Tables/DAV_2004_R.xls
diff --git a/R/Tables/DAV_R.xls b/src/Tables/DAV_R.xls
similarity index 100%
rename from R/Tables/DAV_R.xls
rename to src/Tables/DAV_R.xls
diff --git a/R/Tables/DAV_T.xls b/src/Tables/DAV_T.xls
similarity index 100%
rename from R/Tables/DAV_T.xls
rename to src/Tables/DAV_T.xls
diff --git a/R/Tables/USA_Annuities.xls b/src/Tables/USA_Annuities.xls
similarity index 100%
rename from R/Tables/USA_Annuities.xls
rename to src/Tables/USA_Annuities.xls