diff --git a/DESCRIPTION b/DESCRIPTION
index c4b78d2479ee0b506b3bcdbfb85497002ab0117f..d031587fb9a74d58ae86995950ae014ccc40cd10 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -44,4 +44,5 @@ Collate:
'plotValuationTables.R'
'setLoading.R'
'undampenTrend.R'
+ 'valuationTables.list.R'
'valuationTables.load.R'
diff --git a/NAMESPACE b/NAMESPACE
index 47dcd9a25bea71821d3413ff7f23e2b778885065..67c645de86f340c356490edb2a54c7e9a0e5c712 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -11,6 +11,7 @@ export(valuationTable.mixed)
export(valuationTable.observed)
export(valuationTable.period)
export(valuationTable.trendProjection)
+export(valuationTables.list)
export(valuationTables.load)
exportClasses(valuationTable)
exportClasses(valuationTable.ageShift)
diff --git a/R/valuationTables.list.R b/R/valuationTables.list.R
new file mode 100644
index 0000000000000000000000000000000000000000..a01175f2d986c522ad0c6955ae795dc825f6c781
--- /dev/null
+++ b/R/valuationTables.list.R
@@ -0,0 +1,13 @@
+#' List all available sets of life tables provided by the \link[ValuationTables]{ValuationTables-package} package
+#' An existing life table can then be loaded with \link{valuationTables.load}.
+#'
+#' @param pattern Restrict the results only to life table sets that match the pattern (default: "*" to show all sets)
+#'
+#' @export
+valuationTables.list = function(pattern="*") {
+ filepath = system.file("extdata", package="ValuationTables");
+ files = Sys.glob(file.path(filepath, paste("ValuationTables_", pattern, ".R", sep="")))
+ gsub('^ValuationTables_(.*).R$', '\\1', basename(files))
+}
+
+
diff --git a/R/valuationTables.load.R b/R/valuationTables.load.R
index a2ed13331ad1e4278f34db5e1395388b80a41bfc..17c4f63037fec66169ff17836336f3d44eacf8c5 100644
--- a/R/valuationTables.load.R
+++ b/R/valuationTables.load.R
@@ -3,13 +3,21 @@
#' @param dataset The set of life tables to be loaded. A list of all available data sets is provided by the
#'
#' @export
-valuationTables.load = function(dataset) {
- setname = gsub("[^-A-Za-z0-9_.]", "", dataset);
- filename = system.file("extdata", paste("ValuationTables_", setname, ".R", sep = ""), package="ValuationTables");
- if (filename != "") {
- sys.source(filename, envir = globalenv())
- #envir=topenv())
+valuationTables.load = function(dataset, wildcard=FALSE) {
+ if (wildcard) {
+ sets = valuationTables.list(dataset);
} else {
- warning(sprintf("Unable to locate dataset '%s' provided by the ValuationTables package!", setname));
+ sets = c(dataset);
+ }
+ for (set in sets) {
+ sname = gsub("[^-A-Za-z0-9_.]", "", set);
+ message("Loading valuation life table data set '", sname, "'");
+ filename = system.file("extdata", paste("ValuationTables_", sname, ".R", sep = ""), package="ValuationTables");
+ if (filename != "") {
+ sys.source(filename, envir = globalenv())
+ #envir=topenv())
+ } else {
+ warning(sprintf("Unable to locate dataset '%s' provided by the ValuationTables package!", sname));
+ }
}
}
diff --git a/data-raw/Germany_Endowments_DAV-T.xlsx b/data-raw/Germany_Endowments_DAV-T.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..cf2ac080d65766f75bbc70331135a8a547ced7e8
Binary files /dev/null and b/data-raw/Germany_Endowments_DAV-T.xlsx differ
diff --git a/data/ValuationTables_Germany_LifeInsurance.R b/data/ValuationTables_Germany_LifeInsurance.R
deleted file mode 100644
index a95ef04bb24e2c3248c1a15e2ac4234da55445cd..0000000000000000000000000000000000000000
--- a/data/ValuationTables_Germany_LifeInsurance.R
+++ /dev/null
@@ -1,95 +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))
-
-library("gdata")
-library("ValuationTables")
-
-
-# DAV1994T (Male, Female), 1st-order and general mortality 1986/88
-dav1994T.data=read.xls(
- "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(
- name="DAV 1994T male, loaded",
- ages=dav1994T.data$age, deathProbs=dav1994T.data$qx)
-DAV1994T.male.2Ord=valuationTable_period(
- name="DAV 1994T male, unloaded",
- ages=dav1994T.data$age, deathProbs=dav1994T.data$qx2)
-DAV1994T.female=valuationTable_period(
- name="DAV 1994T female, loaded",
- ages=dav1994T.data$age, deathProbs=dav1994T.data$qy)
-DAV1994T.female.2Ord=valuationTable_period(
- name="DAV 1994T female, unloaded",
- ages=dav1994T.data$age, deathProbs=dav1994T.data$qy2)
-
-rm(DAV1994T.data)
-
-######################################################
-## DAV 2008T Aggregat / Smoker / Non-Smoker
-######################################################
-
-DAV2008T.data=read.xls(
- "Tables/DAV_T.xls",
- sheet=2, skip=2, #row.names=1,
- col.names=c("age", "", "", "",
- "qx2", "qx2NR", "qx2R",
- "qx1", "qx1NR", "qx1R",
- "", "", "", "",
- "qy2", "qy2NR", "qy2R",
- "qy1", "qy1NR", "qy1R"
-));
-
-### DAV 2008T Aggregat (smoker+non-smoker combined)
-DAV2008T.male=valuationTable_period(
- name="DAV 2008T male, loaded",
- ages=DAV2008T.data$age, deathProbs=DAV2008T.data$qx1)
-DAV2008T.male.2Ord=valuationTable_period(
- name="DAV 2008T male, unloaded",
- ages=DAV2008T.data$age, deathProbs=DAV2008T.data$qx2)
-DAV2008T.female=valuationTable_period(
- name="DAV 2008T female, loaded",
- ages=DAV2008T.data$age, deathProbs=DAV2008T.data$qy1)
-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(
- name="DAV 2008T male smoker, loaded",
- ages=DAV2008T.data$age, deathProbs=DAV2008T.data$qx1R)
-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(
- name="DAV 2008T female smoker, loaded",
- ages=DAV2008T.data$age, deathProbs=DAV2008T.data$qy1R)
-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(
- name="DAV 2008T male non-smoker, loaded",
- ages=DAV2008T.data$age, deathProbs=DAV2008T.data$qx1NR)
-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(
- name="DAV 2008T female non-smoker, loaded",
- ages=DAV2008T.data$age, deathProbs=DAV2008T.data$qy1NR)
-DAV2008T.female.nonsmoker.2Ord=valuationTable_period(
- name="DAV 2008T female non-smoker, unloaded",
- ages=DAV2008T.data$age, deathProbs=DAV2008T.data$qy2NR)
-
-rm(DAV2008T.data);
diff --git a/inst/extdata/Germany_Endowments_DAV1994T.csv b/inst/extdata/Germany_Endowments_DAV1994T.csv
new file mode 100644
index 0000000000000000000000000000000000000000..423496215b1720c7c97feded6ca16304a5fa961c
--- /dev/null
+++ b/inst/extdata/Germany_Endowments_DAV1994T.csv
@@ -0,0 +1,103 @@
+DAV 1994T Männer,,,,,,DAV 1994T Frauen,,,,,
+Alter,t_x,L_x^M,q_x,q_x^a,qbar_x^a,Alter,t_y,L_y^M,q_y,q_y^a,qbar_y^a
+0,29,3119,"0,009253","0,009739","0,011687",0,19,2739,"0,007016","0,007503","0,009003"
+1,2,3156,"0,000705","0,00084","0,001008",1,2,2769,"0,000582","0,000722","0,000867"
+2,1,3103,"0,000493","0,000606","0,000728",2,1,2722,"0,000402","0,00052","0,000624"
+3,1,3092,"0,000355","0,000452","0,000542",3,1,2710,"0,000273","0,00037","0,000444"
+4,1,3153,"0,000306","0,000394","0,000473",4,1,2762,"0,000204","0,000287","0,000345"
+5,1,3185,"0,000291","0,000377","0,000452",5,1,2794,"0,000179","0,000256","0,000307"
+6,1,3162,"0,000276","0,000361","0,000433",6,1,2777,"0,000169","0,000244","0,000293"
+7,1,3075,"0,000258","0,00034","0,000408",7,0,2704,"0,000161","0,000235","0,000283"
+8,1,2999,"0,000236","0,000316","0,000379",8,0,2630,"0,000155","0,000229","0,000275"
+9,1,2999,"0,000217","0,000293","0,000352",9,0,2628,"0,00015","0,000223","0,000268"
+10,1,3015,"0,000205","0,000279","0,000334",10,0,2642,"0,000146","0,000217","0,000261"
+11,1,3041,"0,000202","0,000276","0,000331",11,0,2665,"0,000145","0,000217","0,00026"
+12,1,3097,"0,000209","0,000283","0,00034",12,0,2724,"0,000151","0,000222","0,000267"
+13,1,3215,"0,000233","0,000309","0,000371",13,0,2826,"0,000161","0,000234","0,000281"
+14,1,3471,"0,000293","0,000376","0,000451",14,1,3048,"0,000181","0,000256","0,000307"
+15,2,3832,"0,000402","0,000494","0,000593",15,1,3359,"0,000216","0,000294","0,000353"
+16,2,4210,"0,000556","0,00066","0,000792",16,1,3693,"0,000265","0,000346","0,000416"
+17,3,4582,"0,000751","0,000866","0,00104",17,1,4022,"0,000314","0,0004","0,00048"
+18,5,4957,"0,000956","0,001081","0,001298",18,2,4357,"0,00036","0,000448","0,000537"
+19,6,5250,"0,001069","0,001197","0,001437",19,2,4639,"0,000379","0,000467","0,00056"
+20,6,5424,"0,001102","0,00123","0,001476",20,2,4786,"0,00038","0,000466","0,00056"
+21,6,5552,"0,001091","0,001217","0,001476",21,2,4885,"0,000376","0,000461","0,00056"
+22,6,5641,"0,001065","0,001189","0,001476",22,2,4946,"0,000374","0,000457","0,00056"
+23,6,5651,"0,001038","0,00116","0,001476",23,2,4943,"0,000375","0,000459","0,00056"
+24,6,5576,"0,001016","0,001138","0,001476",24,2,4890,"0,00038","0,000465","0,00056"
+25,5,5444,"0,001003","0,001125","0,001476",25,2,4786,"0,000388","0,000475","0,00056"
+26,5,5306,"0,001001","0,001125","0,001476",26,2,4677,"0,000401","0,000491","0,00056"
+27,5,5173,"0,001013","0,001139","0,001476",27,2,4551,"0,000421","0,000514","0,000581"
+28,5,5023,"0,001038","0,001168","0,001476",28,2,4216,"0,000447","0,000546","0,000612"
+29,5,4894,"0,001076","0,00121","0,001476",29,2,4287,"0,000479","0,000581","0,000645"
+30,5,4735,"0,001122","0,00126","0,001476",30,2,4162,"0,000518","0,000626","0,000689"
+31,5,4610,"0,001172","0,001316","0,001476",31,2,4078,"0,000561","0,000674","0,000735"
+32,6,4471,"0,00123","0,001379","0,001489",32,3,3998,"0,000606","0,000725","0,000783"
+33,6,4378,"0,001295","0,00145","0,001551",33,3,3954,"0,000654","0,000779","0,000833"
+34,6,4347,"0,001373","0,001533","0,001641",34,3,3947,"0,000709","0,000838","0,000897"
+35,6,4358,"0,001467","0,001632","0,001747",35,3,3952,"0,000773","0,000908","0,000971"
+36,7,4414,"0,001576","0,001746","0,001869",36,3,3979,"0,000847","0,000988","0,001057"
+37,8,4455,"0,0017","0,001876","0,002007",37,4,3980,"0,000932","0,00108","0,001156"
+38,8,4396,"0,001841","0,002025","0,002167",38,4,3885,"0,001027","0,001184","0,001267"
+39,9,4171,"0,002003","0,0022","0,002354",39,4,3673,"0,00113","0,001299","0,00139"
+40,8,3951,"0,002189","0,002401","0,002569",40,4,3462,"0,001241","0,001424","0,001524"
+41,9,3579,"0,002405","0,002638","0,002823",41,4,3141,"0,001362","0,001563","0,001672"
+42,10,3890,"0,00265","0,002885","0,003087",42,5,3413,"0,001492","0,001693","0,001812"
+43,12,4160,"0,002928","0,003166","0,003387",43,6,3626,"0,001631","0,001836","0,001964"
+44,14,4442,"0,003239","0,003482","0,003726",44,7,3855,"0,00178","0,001987","0,002126"
+45,17,4866,"0,003588","0,003832","0,0041",45,8,4225,"0,001938","0,002145","0,002295"
+46,21,5085,"0,003975","0,004226","0,004522",46,10,4421,"0,002107","0,002318","0,00248"
+47,24,5417,"0,004401","0,004657","0,004983",47,10,4739,"0,002289","0,002501","0,002676"
+48,26,5227,"0,004873","0,005147","0,005508",48,12,4579,"0,002488","0,002712","0,002902"
+49,26,4989,"0,005401","0,005696","0,006094",49,12,4386,"0,002706","0,002945","0,003151"
+50,29,4794,"0,005993","0,006309","0,006751",50,13,4233,"0,002946","0,003201","0,003425"
+51,31,4608,"0,006655","0,006995","0,007485",51,13,4087,"0,003213","0,003484","0,003728"
+52,32,4372,"0,007391","0,007759","0,008302",52,13,3892,"0,003511","0,0038","0,004066"
+53,33,3903,"0,008202","0,008612","0,009215",53,14,3494,"0,00384","0,004159","0,00445"
+54,33,3647,"0,009082","0,009528","0,010195",54,14,3295,"0,0042","0,004544","0,004862"
+55,36,3591,"0,010029","0,010501","0,011236",55,15,3280,"0,004595","0,004956","0,005303"
+56,41,3683,"0,011044","0,011532","0,01234",56,17,3402,"0,005029","0,005399","0,005777"
+57,46,3737,"0,012127","0,012635","0,013519",57,19,3474,"0,005507","0,00589","0,006302"
+58,49,3691,"0,013283","0,013817","0,014784",58,21,3505,"0,006035","0,006434","0,006884"
+59,51,3508,"0,014521","0,015094","0,01615",59,23,3499,"0,00662","0,007038","0,00753"
+60,53,3282,"0,015854","0,016472","0,017625",60,26,3556,"0,007266","0,007701","0,00824"
+61,53,3040,"0,017296","0,017965","0,019223",61,29,3614,"0,00798","0,008432","0,009022"
+62,54,2819,"0,01886","0,019585","0,020956",62,32,3661,"0,008768","0,009238","0,009884"
+63,56,2664,"0,020561","0,021339","0,022833",63,35,3662,"0,009638","0,01013","0,010839"
+64,60,2637,"0,022416","0,023232","0,024858",64,40,3747,"0,010602","0,011112","0,011889"
+65,66,2659,"0,024455","0,025302","0,027073",65,46,3863,"0,011674","0,0122","0,013054"
+66,72,2518,"0,02671","0,027618","0,029552",66,51,3742,"0,01287","0,013431","0,014371"
+67,66,2240,"0,029228","0,030234","0,03235",67,49,3392,"0,014217","0,014836","0,015874"
+68,57,1596,"0,032057","0,033301","0,035632",68,43,2455,"0,015747","0,016511","0,017667"
+69,48,1342,"0,035238","0,036658","0,039224",69,37,2081,"0,017497","0,018371","0,019657"
+70,52,1328,"0,038812","0,040306","0,043127",70,41,2093,"0,019512","0,020431","0,021861"
+71,68,1481,"0,04282","0,044299","0,0474",71,55,2395,"0,021845","0,022752","0,024344"
+72,86,1807,"0,047297","0,048701","0,05211",72,73,2991,"0,024553","0,025412","0,027191"
+73,104,1896,"0,052277","0,053712","0,057472",73,90,3183,"0,027694","0,028576","0,030576"
+74,111,1886,"0,057783","0,05929","0,06344",74,103,3219,"0,031317","0,032247","0,034504"
+75,117,1768,"0,06383","0,065457","0,070039",75,111,3090,"0,035469","0,036477","0,03903"
+76,120,1641,"0,070429","0,072194","0,077248",76,121,2955,"0,040201","0,041294","0,044184"
+77,123,1519,"0,077593","0,079508","0,085073",77,131,2824,"0,045557","0,046742","0,050014"
+78,125,1400,"0,085336","0,087415","0,093534",78,141,2677,"0,051584","0,052873","0,056574"
+79,125,1270,"0,093674","0,095945","0,102662",79,148,2486,"0,058324","0,059739","0,063921"
+80,122,1134,"0,102621","0,105119","0,112477",80,154,2260,"0,065817","0,067384","0,072101"
+81,120,998,"0,112187","0,114948","0,122995",81,157,2018,"0,074094","0,075842","0,081151"
+82,114,866,"0,12238","0,125449","0,134231",82,155,1789,"0,083184","0,085137","0,091096"
+83,106,736,"0,133205","0,136647","0,146212",83,153,1575,"0,093114","0,095299","0,10197"
+84,95,613,"0,14467","0,148564","0,158964",84,151,1378,"0,103908","0,105353","0,113798"
+85,84,500,"0,156782","0,161226","0,172512",85,145,1178,"0,115582","0,118344","0,126628"
+86,74,397,"0,169544","0,174669","0,186896",86,135,987,"0,128145","0,131289","0,140479"
+87,61,305,"0,182952","0,188958","0,202185",87,124,806,"0,141599","0,145214","0,155379"
+88,50,227,"0,196995","0,204124","0,218413",88,111,648,"0,155939","0,160117","0,171325"
+89,38,167,"0,211661","0,220184","0,235597",89,97,514,"0,171147","0,175998","0,188318"
+90,31,122,"0,226931","0,237094","0,253691",90,84,399,"0,1872","0,192874","0,206375"
+91,24,87,"0,242777","0,255039","0,272891",91,68,300,"0,204065","0,210801","0,225558"
+92,18,62,"0,259168","0,273965","0,293142",92,54,221,"0,221699","0,229756","0,245839"
+93,14,43,"0,276066","0,294055","0,314638",93,43,158,"0,240046","0,249785","0,26727"
+94,10,29,"0,293425","0,315644","0,337739",94,32,109,"0,259042","0,271013","0,289983"
+95,7,20,"0,311199","0,338374","0,36206",95,24,73,"0,27861","0,293464","0,314007"
+96,5,13,"0,329335","0,363301","0,388732",96,16,45,"0,298664","0,317868","0,340119"
+97,3,8,"0,347778","0,391744","0,419166",97,11,29,"0,31911","0,343353","0,367388"
+98,2,5,"0,366467","0,422438","0,452008",98,7,18,"0,339848","0,371053","0,397027"
+99,2,3,"0,385341","0,454579","0,4864",99,5,11,"0,360773","0,400699","0,428748"
+100,1,2,"0,404335","0,492651","0,527137",100,3,7,"0,381775","0,432679","0,462967"
diff --git a/inst/extdata/Germany_Endowments_DAV2008T.csv b/inst/extdata/Germany_Endowments_DAV2008T.csv
new file mode 100644
index 0000000000000000000000000000000000000000..b6313e4e952aba5c86c62285f71e808606d5abeb
--- /dev/null
+++ b/inst/extdata/Germany_Endowments_DAV2008T.csv
@@ -0,0 +1,127 @@
+DAV 2008T R/NR Männer,,,,,,,,,,DAV 2008T R/NR Frauen,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,
+Alter,Raucheranteil,Raucher- übersterblichkeit,Nichtraucher- faktor,Sterblichkeit 2. Ordnung,,,Sterblichkeit 1. Ordnung,,,Alter,Raucheranteil,Raucher- übersterblichkeit,Nichtraucher- faktor,Sterblichkeit 2. Ordnung,,,Sterblichkeit 1. Ordnung,,
+,,,,Aggregat, Nichtraucher,Raucher,Aggregat (Zuschlag 34%),Nichtraucher (Zuschlag 45%),Raucher (Zuschlag 45%),,,,,Aggregat, Nichtraucher,Raucher,Aggregat (Zuschlag 34%),Nichtraucher (Zuschlag 45%),Raucher (Zuschlag 45%)
+0,0%,100%,1,"0,004562","0,004562","0,004562","0,006113","0,006113","0,006615",0,0%,100%,1,"0,003797","0,003797","0,003797","0,005088","0,005088","0,005506"
+1,0%,100%,1,"0,000316","0,000316","0,000316","0,000423","0,000423","0,000458",1,0%,100%,1,"0,000289","0,000289","0,000289","0,000387","0,000387","0,000419"
+2,0%,100%,1,"0,000256","0,000256","0,000256","0,000343","0,000343","0,000371",2,0%,100%,1,"0,000237","0,000237","0,000237","0,000318","0,000318","0,000344"
+3,0%,100%,1,"0,000205","0,000205","0,000205","0,000275","0,000275","0,000297",3,0%,100%,1,"0,00019","0,00019","0,00019","0,000255","0,000255","0,000276"
+4,0%,100%,1,"0,000164","0,000164","0,000164","0,00022","0,00022","0,000238",4,0%,100%,1,"0,000151","0,000151","0,000151","0,000202","0,000202","0,000219"
+5,0%,100%,1,"0,000136","0,000136","0,000136","0,000182","0,000182","0,000197",5,0%,100%,1,"0,000122","0,000122","0,000122","0,000163","0,000163","0,000177"
+6,0%,100%,1,"0,000116","0,000116","0,000116","0,000155","0,000155","0,000168",6,0%,100%,1,"0,0001","0,0001","0,0001","0,000134","0,000134","0,000145"
+7,0%,100%,1,"0,000104","0,000104","0,000104","0,000139","0,000139","0,000151",7,0%,100%,1,"0,000086","0,000086","0,000086","0,000115","0,000115","0,000125"
+8,0%,"101,7%",1,"0,000096","0,000096","0,000098","0,000129","0,000129","0,000142",8,0%,"100,3%",1,"0,000078","0,000078","0,000078","0,000105","0,000105","0,000113"
+9,0%,"103,4%",1,"0,000093","0,000093","0,000096","0,000125","0,000125","0,000139",9,0%,"101,5%",1,"0,000074","0,000074","0,000075","0,000099","0,000099","0,000109"
+10,0%,"105,1%",1,"0,000096","0,000096","0,000101","0,000129","0,000129","0,000146",10,0%,"103,3%",1,"0,000076","0,000076","0,000079","0,000102","0,000102","0,000115"
+11,0%,"106,6%",1,"0,000107","0,000107","0,000114","0,000143","0,000143","0,000165",11,0%,"105,8%",1,"0,000083","0,000083","0,000088","0,000111","0,000111","0,000128"
+12,0%,"108,1%",1,"0,000129","0,000129","0,000139","0,000173","0,000173","0,000202",12,0%,"108,8%",1,"0,000095","0,000095","0,000103","0,000127","0,000127","0,000149"
+13,0%,"109,5%",1,"0,000166","0,000166","0,000182","0,000222","0,000222","0,000264",13,0%,"112,3%",1,"0,000114","0,000114","0,000128","0,000153","0,000153","0,000186"
+14,0%,"110,7%",1,"0,000226","0,000226","0,00025","0,000303","0,000303","0,000363",14,0%,"116,2%",1,"0,00014","0,00014","0,000163","0,000188","0,000188","0,000236"
+15,"4,6%","111,7%","0,994647","0,000311","0,000309","0,000346","0,000417","0,000417","0,000502",15,"4,7%","120,3%","0,990549","0,00017","0,000168","0,000203","0,000228","0,000228","0,000294"
+16,"11,2%","112,4%","0,986302","0,000416","0,00041","0,000461","0,000557","0,000557","0,000668",16,"10,2%","124,2%","0,975911","0,000202","0,000197","0,000245","0,000271","0,000271","0,000355"
+17,"16,8%","112,9%","0,978788","0,000529","0,000518","0,000585","0,000709","0,000709","0,000848",17,"14,9%","127,9%","0,960088","0,000231","0,000222","0,000284","0,00031","0,00031","0,000412"
+18,"21,6%","112,9%","0,972891","0,000634","0,000617","0,000696","0,00085","0,00085","0,001009",18,"18,8%",131%,"0,94493","0,000242","0,000229","0,0003","0,000324","0,000324","0,000435"
+19,"25,5%","112,6%","0,96887","0,000711","0,000689","0,000776","0,000953","0,000953","0,001125",19,"21,9%","133,4%","0,93184","0,000246","0,000229","0,000306","0,00033","0,00033","0,000444"
+20,"28,6%","112,1%","0,966552","0,000755","0,00073","0,000818","0,001012","0,001012","0,001186",20,"24,2%",135%,"0,921914","0,000245","0,000226","0,000305","0,000328","0,000328","0,000442"
+21,"30,8%","111,4%","0,966079","0,000763","0,000737","0,000821","0,001022","0,001022","0,00119",21,"25,7%","135,9%","0,91553","0,00024","0,00022","0,000299","0,000322","0,000319","0,000434"
+22,"32,3%","110,9%","0,96599","0,000749","0,000724","0,000802","0,001004","0,001004","0,001163",22,"26,5%","136,5%","0,911806","0,000234","0,000213","0,000291","0,000314","0,000309","0,000422"
+23,33%,111%,"0,964972","0,000719","0,000694","0,00077","0,000963","0,000963","0,001117",23,"26,6%","137,2%","0,909958","0,000227","0,000207","0,000283","0,000304","0,0003","0,00041"
+24,"33,2%",112%,"0,961686","0,00068","0,000654","0,000732","0,000911","0,000911","0,001061",24,"26,2%","138,8%","0,907724","0,000222","0,000202","0,00028","0,000297","0,000293","0,000406"
+25,33%,"114,5%","0,954335","0,000639","0,00061","0,000698","0,000856","0,000856","0,001012",25,"25,5%","141,8%","0,903677","0,000219","0,000198","0,000281","0,000293","0,000287","0,000407"
+26,"32,6%","118,7%","0,942541","0,000603","0,000568","0,000675","0,000808","0,000808","0,000979",26,"24,7%",147%,"0,895985","0,000218","0,000195","0,000287","0,000292","0,000283","0,000416"
+27,"32,2%","124,9%","0,925773","0,000576","0,000533","0,000666","0,000772","0,000772","0,000966",27,"23,7%","154,4%","0,885796","0,000218","0,000193","0,000298","0,000292","0,00028","0,000432"
+28,"31,7%","132,9%","0,905557","0,000561","0,000508","0,000675","0,000752","0,000737","0,000979",28,"22,9%","164,2%","0,871826","0,000221","0,000193","0,000316","0,000296","0,00028","0,000458"
+29,"31,4%","142,5%","0,882262","0,000556","0,000491","0,000699","0,000745","0,000712","0,001014",29,"22,3%","175,7%","0,85557","0,000225","0,000193","0,000338","0,000302","0,00028","0,00049"
+30,"31,1%","152,9%","0,858724","0,000561","0,000482","0,000737","0,000752","0,000699","0,001069",30,"21,9%",188%,"0,83842","0,000232","0,000195","0,000366","0,000311","0,000283","0,000531"
+31,31%,"163,5%","0,835527","0,000573","0,000479","0,000783","0,000768","0,000695","0,001135",31,"21,7%","200,3%","0,821253","0,000244","0,0002","0,000401","0,000327","0,00029","0,000581"
+32,"30,9%","173,7%","0,814509","0,00059","0,000481","0,000835","0,000791","0,000697","0,001211",32,"21,7%","211,6%","0,805041","0,000262","0,000211","0,000446","0,000351","0,000306","0,000647"
+33,"30,8%","183,2%","0,796016","0,000612","0,000487","0,000892","0,00082","0,000706","0,001293",33,"21,9%","221,1%","0,790383","0,000288","0,000228","0,000503","0,000386","0,000331","0,000729"
+34,"30,8%","191,6%","0,779953","0,000638","0,000498","0,000953","0,000855","0,000722","0,001382",34,"22,2%","228,6%","0,777912","0,000323","0,000251","0,000574","0,000433","0,000364","0,000832"
+35,"30,8%","199,2%","0,765969","0,000668","0,000512","0,001019","0,000895","0,000742","0,001478",35,"22,6%",234%,"0,767554","0,000366","0,000281","0,000657","0,00049","0,000407","0,000953"
+36,"30,8%",206%,"0,753875","0,000705","0,000531","0,001095","0,000945","0,00077","0,001588",36,"23,1%","237,7%","0,758675","0,000414","0,000314","0,000747","0,000555","0,000455","0,001083"
+37,"30,8%","212,3%","0,743006","0,00075","0,000557","0,001183","0,001005","0,000808","0,001715",37,"23,7%",240%,"0,750863","0,000466","0,00035","0,00084","0,000624","0,000508","0,001218"
+38,"30,9%","218,3%","0,732307","0,000808","0,000592","0,001292","0,001083","0,000858","0,001873",38,"24,2%","241,2%","0,745321","0,000523","0,00039","0,00094","0,000701","0,000566","0,001363"
+39,31%,"224,2%","0,722011","0,000881","0,000636","0,001426","0,001181","0,000922","0,002068",39,"24,8%","241,7%","0,739965","0,000584","0,000432","0,001044","0,000783","0,000626","0,001514"
+40,"31,1%",230%,"0,712099","0,000971","0,000691","0,00159","0,001301","0,001002","0,002306",40,"25,3%","241,7%","0,736105","0,000651","0,000479","0,001158","0,000872","0,000695","0,001679"
+41,"31,3%","235,6%","0,702036","0,00108","0,000758","0,001786","0,001447","0,001099","0,00259",41,"25,7%","241,4%","0,733462","0,000725","0,000532","0,001284","0,000972","0,000771","0,001862"
+42,"31,5%","240,9%","0,6926","0,001211","0,000839","0,002021","0,001623","0,001217","0,00293",42,26%,"241,1%","0,731604","0,000809","0,000592","0,001427","0,001084","0,000858","0,002069"
+43,"31,7%","245,9%","0,683759","0,001368","0,000935","0,0023","0,001833","0,001356","0,003335",43,"26,2%","240,7%","0,730656","0,000905","0,000661","0,001592","0,001213","0,000958","0,002308"
+44,"31,7%","250,5%","0,677009","0,001554","0,001052","0,002635","0,002082","0,001525","0,003821",44,"26,3%","240,5%","0,730186","0,001014","0,00074","0,001781","0,001359","0,001073","0,002582"
+45,"31,7%","254,5%","0,671247","0,001764","0,001184","0,003013","0,002364","0,001717","0,004369",45,"26,2%","240,5%","0,730935","0,001137","0,000831","0,001999","0,001524","0,001205","0,002899"
+46,"31,4%","257,8%","0,668676","0,001992","0,001332","0,003434","0,002669","0,001931","0,004979",46,"25,9%","240,7%","0,732916","0,001273","0,000933","0,002246","0,001706","0,001353","0,003257"
+47,"30,9%","260,6%","0,668336","0,002226","0,001488","0,003877","0,002983","0,002158","0,005622",47,"25,4%","241,2%","0,736026","0,00142","0,001045","0,002521","0,001903","0,001515","0,003655"
+48,"30,1%","262,7%","0,671264","0,002464","0,001654","0,004345","0,003302","0,002398","0,0063",48,"24,7%",242%,"0,740335","0,001574","0,001165","0,00282","0,002109","0,001689","0,004089"
+49,"29,2%","264,3%","0,675787","0,002709","0,001831","0,004839","0,00363","0,002655","0,007017",49,"23,8%","243,2%","0,745814","0,001734","0,001293","0,003145","0,002324","0,001875","0,00456"
+50,"28,3%","265,4%","0,681161","0,002971","0,002024","0,005371","0,003981","0,002935","0,007788",50,"22,9%","244,8%","0,750981","0,0019","0,001427","0,003493","0,002546","0,002069","0,005065"
+51,"27,3%","266,2%","0,687888","0,003262","0,002244","0,005973","0,004371","0,003254","0,008661",51,"21,9%","246,8%","0,75672","0,002076","0,001571","0,003877","0,002782","0,002278","0,005622"
+52,"26,5%","266,7%","0,693599","0,003591","0,002491","0,006643","0,004812","0,003612","0,009632",52,"20,9%","249,1%","0,762417","0,002265","0,001727","0,004302","0,003035","0,002504","0,006238"
+53,"25,7%",267%,"0,699697","0,003961","0,002771","0,0074","0,005308","0,004018","0,01073",53,20%,"251,8%","0,767106","0,002467","0,001892","0,004765","0,003306","0,002743","0,006909"
+54,"25,1%","267,3%","0,704264","0,004371","0,003078","0,008228","0,005857","0,004463","0,011931",54,"19,1%","254,8%","0,771803","0,002681","0,002069","0,005272","0,003593","0,003","0,007644"
+55,"24,5%","267,6%","0,708908","0,004821","0,003418","0,009146","0,00646","0,004956","0,013262",55,"18,2%","258,1%","0,776553","0,002909","0,002259","0,00583","0,003898","0,003276","0,008454"
+56,"23,8%","267,9%","0,714489","0,005311","0,003795","0,010166","0,007117","0,005503","0,014741",56,"17,2%","261,6%","0,782502","0,003155","0,002469","0,006458","0,004228","0,00358","0,009364"
+57,"22,9%","268,2%","0,721929","0,005844","0,004219","0,011315","0,007831","0,006118","0,016407",57,"16,3%","265,2%","0,787851","0,003422","0,002696","0,00715","0,004585","0,003909","0,010368"
+58,"21,9%","268,6%","0,730335","0,006421","0,004689","0,012596","0,008604","0,006799","0,018264",58,"15,3%","268,8%","0,794746","0,003712","0,00295","0,00793","0,004974","0,004278","0,011499"
+59,"20,7%",269%,"0,740834","0,007055","0,005227","0,01406","0,009454","0,007579","0,020387",59,"14,2%","272,4%","0,803337","0,004031","0,003238","0,008821","0,005402","0,004695","0,01279"
+60,"19,4%","269,2%","0,752871","0,007764","0,005845","0,015736","0,010404","0,008475","0,022817",60,"13,1%","275,7%","0,812898","0,004391","0,003569","0,009841","0,005884","0,005175","0,014269"
+61,"18,1%","269,3%","0,765443","0,008585","0,006571","0,017697","0,011504","0,009528","0,025661",61,"12,1%","278,8%","0,822133","0,004813","0,003957","0,011032","0,006449","0,005738","0,015996"
+62,"16,9%","269,1%","0,777739","0,009566","0,00744","0,020021","0,012818","0,010788","0,02903",62,"11,1%","281,5%","0,832317","0,005318","0,004426","0,01246","0,007126","0,006418","0,018067"
+63,"15,9%","268,6%","0,788598","0,010768","0,008492","0,022809","0,014429","0,012313","0,033073",63,"10,2%","283,6%","0,842267","0,005922","0,004988","0,014146","0,007935","0,007233","0,020512"
+64,"15,1%","267,5%","0,798132","0,01225","0,009777","0,026154","0,016415","0,014177","0,037923",64,"9,5%","285,2%","0,850384","0,00664","0,005647","0,016104","0,008898","0,008188","0,023351"
+65,"14,3%",266%,"0,808159","0,014054","0,011358","0,030212","0,018832","0,016469","0,043807",65,"8,8%",286%,"0,859343","0,007481","0,006429","0,018386","0,010025","0,009322","0,02666"
+66,"13,7%","263,9%","0,816631","0,016197","0,013227","0,034906","0,021704","0,019179","0,050614",66,"8,2%","286,1%","0,867602","0,00845","0,007331","0,020975","0,011323","0,01063","0,030414"
+67,"13,2%","261,1%","0,824639","0,018669","0,015395","0,040197","0,025016","0,022323","0,058286",67,"7,6%","285,4%","0,876498","0,00955","0,008371","0,02389","0,012797","0,012138","0,034641"
+68,"12,6%","257,7%","0,834236","0,021446","0,017891","0,046105","0,028738","0,025942","0,066852",68,"7,1%","283,8%","0,884566","0,010791","0,009545","0,02709","0,01446","0,01384","0,039281"
+69,"12,1%","253,7%","0,843187","0,024494","0,020653","0,052397","0,032822","0,029947","0,075976",69,"6,6%","281,3%","0,89313","0,012188","0,010885","0,030621","0,016332","0,015783","0,0444"
+70,"11,6%","249,1%","0,852547","0,027775","0,023679","0,058986","0,037219","0,034335","0,08553",70,"6,1%",278%,"0,902055","0,013761","0,012413","0,034509","0,01844","0,017999","0,050038"
+71,11%,"243,9%","0,863342","0,031254","0,026983","0,065811","0,04188","0,039125","0,095426",71,"5,6%","273,8%","0,911305","0,015532","0,014154","0,038755","0,020813","0,020523","0,056195"
+72,"10,5%","238,2%","0,873279","0,034774","0,030367","0,072335","0,046597","0,044032","0,104886",72,"5,2%","268,8%","0,919307","0,017519","0,016105","0,043291","0,023475","0,023352","0,062772"
+73,10%,"232,1%","0,883314","0,038195","0,033738","0,078306","0,051181","0,04892","0,113544",73,"4,8%",263%,"0,927437","0,020175","0,018711","0,04921","0,027035","0,027035","0,071355"
+74,"9,5%","225,6%","0,8934","0,041873","0,037409","0,084395","0,05611","0,054243","0,122373",74,"4,5%","256,4%","0,934248","0,022696","0,021204","0,054366","0,030413","0,030413","0,078831"
+75,"9,1%","218,8%","0,902439","0,045878","0,041402","0,090588","0,061477","0,060033","0,131353",75,"4,2%","249,2%","0,941031","0,025587","0,024078","0,060003","0,034287","0,034287","0,087004"
+76,"8,7%","211,7%","0,911428","0,050323","0,045866","0,097098","0,067433","0,066506","0,140792",76,"3,9%","241,4%","0,947736","0,028917","0,027406","0,066157","0,038749","0,038749","0,095928"
+77,"8,4%","204,5%","0,919304","0,055343","0,050877","0,104044","0,07416","0,073772","0,150864",77,"3,6%","233,2%","0,954242","0,032789","0,031289","0,072965","0,043937","0,043937","0,105799"
+78,"8,1%","197,3%","0,926945","0,061049","0,056589","0,11165","0,081806","0,081806","0,161893",78,"3,5%","224,5%","0,958244","0,037308","0,03575","0,080259","0,049993","0,049993","0,116376"
+79,"7,9%",190%,"0,93362","0,067521","0,063039","0,119774","0,090478","0,090478","0,173672",79,"3,3%","215,5%","0,963284","0,042555","0,040993","0,088339","0,057024","0,057024","0,128092"
+80,"7,7%","182,8%","0,940065","0,074822","0,070338","0,128577","0,100261","0,100261","0,186437",80,"3,2%","206,3%","0,967103","0,048592","0,046993","0,096948","0,065113","0,065113","0,140575"
+81,"7,5%","175,8%","0,946208","0,08298","0,078516","0,138032","0,111193","0,111193","0,200146",81,"3,1%","197,1%","0,970779","0,055439","0,053819","0,106077","0,074288","0,074288","0,153812"
+82,"7,4%",169%,"0,95142","0,092002","0,087533","0,14793","0,123283","0,123283","0,214499",82,3%,"187,9%","0,974308","0,063127","0,061505","0,115568","0,08459","0,08459","0,167574"
+83,"7,3%","162,5%","0,956366","0,101864","0,097419","0,158306","0,136498","0,136498","0,229544",83,3%,"178,8%","0,976906","0,071713","0,070057","0,125262","0,096095","0,096095","0,18163"
+84,"7,2%","156,3%","0,961043","0,112602","0,108215","0,169141","0,150887","0,150887","0,245254",84,"2,9%","169,9%","0,980132","0,081364","0,079747","0,135491","0,109028","0,109028","0,196462"
+85,"7,2%","150,5%","0,964916","0,124254","0,119895","0,180441","0,1665","0,1665","0,261639",85,"2,9%","161,4%","0,982506","0,092247","0,090633","0,146282","0,123611","0,123611","0,212109"
+86,"7,2%",145%,"0,968617","0,136824","0,13253","0,192169","0,183344","0,183344","0,278645",86,"2,9%","153,2%","0,984806","0,104494","0,102906","0,157652","0,140022","0,140022","0,228595"
+87,"7,1%",140%,"0,972384","0,150241","0,146092","0,204529","0,201323","0,201323","0,296567",87,"2,9%","145,5%","0,986977","0,118102","0,116564","0,169601","0,158257","0,158257","0,245921"
+88,"7,1%","135,3%","0,97555","0,164391","0,160372","0,216983","0,220284","0,220284","0,314625",88,3%,"138,3%","0,988641","0,132974","0,131464","0,181814","0,178185","0,178185","0,26363"
+89,"7,1%","131,1%","0,978396","0,179159","0,175288","0,229803","0,240073","0,240073","0,333214",89,3%,"131,6%","0,990609","0,149007","0,147608","0,194252","0,199669","0,199669","0,281665"
+90,"7,1%","127,2%","0,981054","0,194445","0,190761","0,242648","0,260556","0,260556","0,35184",90,3%,"125,4%","0,992438","0,166048","0,164792","0,20665","0,222504","0,222504","0,299643"
+91,"7,1%","123,7%","0,983451","0,210151","0,206673","0,255655","0,281602","0,281602","0,3707",91,"3,1%","119,9%","0,993869","0,18392","0,182792","0,219168","0,246453","0,246453","0,317794"
+92,"7,1%","120,5%","0,985654","0,226178","0,222933","0,268635","0,303079","0,303079","0,389521",92,"3,1%","114,9%","0,995402","0,202384","0,201453","0,23147","0,271195","0,271195","0,335632"
+93,"7,1%","117,7%","0,987589","0,242442","0,239433","0,281813","0,324872","0,324872","0,408629",93,"3,1%","110,6%","0,996725","0,220585","0,219863","0,243168","0,295584","0,295584","0,352594"
+94,"7,1%","115,1%","0,989393","0,258871","0,256125","0,2948","0,346887","0,346887","0,42746",94,"3,2%","106,8%","0,997829","0,23833","0,237813","0,253984","0,319362","0,319362","0,368277"
+95,"7,1%","112,8%","0,990994","0,275411","0,272931","0,307866","0,369051","0,369051","0,446406",95,"3,2%","103,7%","0,998817","0,256299","0,255996","0,265468","0,343441","0,343441","0,384929"
+96,"7,1%","110,8%","0,99239","0,292019","0,289797","0,321095","0,391305","0,391305","0,465588",96,"3,2%",100%,1,"0,274491","0,274491","0,274491","0,367818","0,367818","0,398012"
+97,7%,"108,9%","0,993809","0,308909","0,306997","0,334319","0,413938","0,413938","0,484763",97,"3,3%",100%,1,"0,292905","0,292905","0,292905","0,392493","0,392493","0,424712"
+98,7%,"107,3%","0,994916","0,326353","0,324694","0,348396","0,437313","0,437313","0,505174",98,"3,3%",100%,1,"0,311537","0,311537","0,311537","0,41746","0,41746","0,451729"
+99,"6,9%","105,8%","0,996014","0,344105","0,342733","0,362612","0,461101","0,461101","0,525787",99,"3,3%",100%,1,"0,330385","0,330385","0,330385","0,442716","0,442716","0,479058"
+100,"6,8%","104,5%","0,996949","0,362167","0,361062","0,37731","0,485304","0,485304","0,5471",100,"3,3%",100%,1,"0,349446","0,349446","0,349446","0,468258","0,468258","0,506697"
+101,"6,7%","103,4%","0,997727","0,38054","0,379675","0,392584","0,509924","0,509924","0,569247",101,"3,2%",100%,1,"0,368713","0,368713","0,368713","0,494075","0,494075","0,534634"
+102,"6,6%","102,5%","0,998353","0,399222","0,398564","0,408529","0,534957","0,534957","0,592367",102,"3,2%",100%,1,"0,388182","0,388182","0,388182","0,520164","0,520164","0,562864"
+103,"6,4%","101,7%","0,998913","0,418214","0,417759","0,424861","0,560407","0,560407","0,616048",103,"3,2%",100%,1,"0,407846","0,407846","0,407846","0,546514","0,546514","0,591377"
+104,"6,2%","101,1%","0,999318","0,437511","0,437213","0,442022","0,586265","0,586265","0,640932",104,"3,1%",100%,1,"0,427697","0,427697","0,427697","0,573114","0,573114","0,620161"
+105,"6,1%","100,7%","0,999573","0,457111","0,456916","0,460114","0,612529","0,612529","0,667165",105,3%,100%,1,"0,447726","0,447726","0,447726","0,599953","0,599953","0,649203"
+106,"5,8%",100%,1,"0,477006","0,477006","0,477006","0,639188","0,639188","0,691659",106,"2,9%",100%,1,"0,467921","0,467921","0,467921","0,627014","0,627014","0,678485"
+107,"5,6%",100%,1,"0,497189","0,497189","0,497189","0,666233","0,666233","0,720924",107,"2,8%",100%,1,"0,488271","0,488271","0,488271","0,654283","0,654283","0,707993"
+108,"5,3%",100%,1,"0,51765","0,51765","0,51765","0,693651","0,693651","0,750593",108,"2,7%",100%,1,"0,508762","0,508762","0,508762","0,681741","0,681741","0,737705"
+109,5%,100%,1,"0,538377","0,538377","0,538377","0,721425","0,721425","0,780647",109,"2,6%",100%,1,"0,529376","0,529376","0,529376","0,709364","0,709364","0,767595"
+110,"4,7%",100%,1,"0,559353","0,559353","0,559353","0,749533","0,749533","0,811062",110,"2,4%",100%,1,"0,550097","0,550097","0,550097","0,73713","0,73713","0,797641"
+111,"4,4%",100%,1,"0,58056","0,58056","0,58056","0,77795","0,77795","0,841812",111,"2,3%",100%,1,"0,570904","0,570904","0,570904","0,765011","0,765011","0,827811"
+112,4%,100%,1,"0,601975","0,601975","0,601975","0,806647","0,806647","0,872864",112,"2,1%",100%,1,"0,591772","0,591772","0,591772","0,792974","0,792974","0,858069"
+113,"3,6%",100%,1,"0,623571","0,623571","0,623571","0,835585","0,835585","0,904178",113,"1,9%",100%,1,"0,612677","0,612677","0,612677","0,820987","0,820987","0,888382"
+114,"3,2%",100%,1,"0,645315","0,645315","0,645315","0,864722","0,864722","0,935707",114,"1,7%",100%,1,"0,633589","0,633589","0,633589","0,849009","0,849009","0,918704"
+115,"2,7%",100%,1,"0,66717","0,66717","0,66717","0,894008","0,894008","0,967397",115,"1,4%",100%,1,"0,654476","0,654476","0,654476","0,876998","0,876998","0,94899"
+116,"2,2%",100%,1,"0,689091","0,689091","0,689091","0,923382","0,923382","0,999182",116,"1,2%",100%,1,"0,675302","0,675302","0,675302","0,904905","0,904905","0,979188"
+117,"1,7%",100%,1,"0,711028","0,711028","0,711028","0,952778","0,952778",1,117,"0,9%",100%,1,"0,696026","0,696026","0,696026","0,932675","0,932675",1
+118,"1,2%",100%,1,"0,73292","0,73292","0,73292","0,982113","0,982113",1,118,"0,6%",100%,1,"0,716604","0,716604","0,716604","0,960249","0,960249",1
+119,"0,6%",100%,1,"0,754701","0,754701","0,754701",1,1,1,119,"0,3%",100%,1,"0,736988","0,736988","0,736988","0,987564","0,987564",1
+120,0%,100%,1,"0,776292","0,776292","0,776292",1,1,1,120,0%,100%,1,"0,757123","0,757123","0,757123",1,1,1
+121,0%,100%,1,1,1,1,1,1,1,121,0%,100%,1,1,1,1,1,1,1
diff --git a/inst/extdata/ValuationTables_Austria_Annuities.R b/inst/extdata/ValuationTables_Austria_Annuities.R
index 813565221b0b6d87464e273bba66a2521000d58b..62fb70a13365d53d53c36a5166017a97916b1334 100644
--- a/inst/extdata/ValuationTables_Austria_Annuities.R
+++ b/inst/extdata/ValuationTables_Austria_Annuities.R
@@ -1,200 +1,3 @@
stopifnot(require(methods), require(utils), require(ValuationTables)) # ValuationTable classes; new; Excel reader
-
-###############################################################################
-### RR67 Rententafel für Männer, 3%
-###############################################################################
-
-rr67.data = utils::read.csv(system.file("extdata", "Austria_Annuities_RR67.csv", package="ValuationTables"), skip=2)
-
-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 = utils::read.csv(system.file("extdata", "Austria_Annuities_EROMF.csv", package="ValuationTables"), 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 = utils::read.csv(system.file("extdata", "Austria_Annuities_EROMF_AV.csv", package="ValuationTables"), 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 = utils::read.csv(system.file("extdata", "Austria_Annuities_AVOe1996R.csv", package="ValuationTables"), 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 = utils::read.csv(system.file("extdata", "Austria_Annuities_AVOe2005R.csv", package="ValuationTables"), 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 = utils::read.csv(system.file("extdata", "Austria_Annuities_AVOe2005R_AVBasis.csv", package="ValuationTables"), skip=2);
-AVOe2005R.av.verschiebung = utils::read.csv(system.file("extdata", "Austria_Annuities_AVOe2005R_AVShifts.csv", package="ValuationTables"), skip=2);
-
-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")
-
-# makeQxDataFrame(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)
-# makeQxDataFrame()
+valuationTables.load("Austria_Annuities_*", wildcard=TRUE)
diff --git a/inst/extdata/ValuationTables_Austria_Annuities_AVOe1996R.R b/inst/extdata/ValuationTables_Austria_Annuities_AVOe1996R.R
new file mode 100644
index 0000000000000000000000000000000000000000..c8444babc5329ccd876b7c39b5d1a2bd64370a02
--- /dev/null
+++ b/inst/extdata/ValuationTables_Austria_Annuities_AVOe1996R.R
@@ -0,0 +1,65 @@
+stopifnot(require(methods), require(utils), require(ValuationTables)) # ValuationTable classes; new; Excel reader
+
+
+###############################################################################
+# AVÖ 1996R exact (Male, Female), 1st-order only
+###############################################################################
+
+AVOe1996R.exakt.data = utils::read.csv(
+ system.file("extdata",
+ "Austria_Annuities_AVOe1996R.csv",
+ package="ValuationTables"),
+ 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 = 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
+);
+
+rm(AVOe1996R.exakt.data)
+
diff --git a/inst/extdata/ValuationTables_Austria_Annuities_AVOe2005R.R b/inst/extdata/ValuationTables_Austria_Annuities_AVOe2005R.R
new file mode 100644
index 0000000000000000000000000000000000000000..ab75b014866dd5e84a5c3579a752a6aad4d03075
--- /dev/null
+++ b/inst/extdata/ValuationTables_Austria_Annuities_AVOe2005R.R
@@ -0,0 +1,112 @@
+stopifnot(require(methods), require(utils), require(ValuationTables)) # ValuationTable classes; new; Excel reader
+
+
+###############################################################################
+# AVÖ 2005R exact (Male, Female, unisex)
+# gender-specific tables also have 2nd-order tables, unisex only 1st-order table
+###############################################################################
+
+AVOe2005R.exakt.data = utils::read.csv(
+ system.file(
+ "extdata",
+ "Austria_Annuities_AVOe2005R.csv",
+ package="ValuationTables"),
+ skip = 2);
+
+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 = utils::read.csv(
+ system.file(
+ "extdata",
+ "Austria_Annuities_AVOe2005R_AVBasis.csv",
+ package="ValuationTables"),
+ skip=2);
+AVOe2005R.av.verschiebung = utils::read.csv(
+ system.file(
+ "extdata",
+ "Austria_Annuities_AVOe2005R_AVShifts.csv",
+ package="ValuationTables"),
+ skip=2);
+
+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")
+
+# makeQxDataFrame(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)
+# makeQxDataFrame()
diff --git a/inst/extdata/ValuationTables_Austria_Annuities_EROMF.R b/inst/extdata/ValuationTables_Austria_Annuities_EROMF.R
new file mode 100644
index 0000000000000000000000000000000000000000..22a43ed0625ef0acb7a753872b130d40d18aaafe
--- /dev/null
+++ b/inst/extdata/ValuationTables_Austria_Annuities_EROMF.R
@@ -0,0 +1,66 @@
+stopifnot(require(methods), require(utils), require(ValuationTables)) # ValuationTable classes; new; Excel reader
+
+###############################################################################
+### EROM/EROF 85 and G 1985 (period and age-shifted generation)
+###############################################################################
+
+
+eromf.data = utils::read.csv(
+ system.file(
+ "extdata",
+ "Austria_Annuities_EROMF.csv",
+ package="ValuationTables"),
+ skip=2)
+eromf.data.av = utils::read.csv(
+ system.file(
+ "extdata",
+ "Austria_Annuities_EROMF_AV.csv",
+ package="ValuationTables"),
+ skip=2)
+
+
+
+EROM85.male = valuationTable.period(
+ name = "EROM 85, male",
+ ages = eromf.data$Alter,
+ deathProbs = eromf.data$EROM.85
+);
+
+EROF85.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
+);
+
+
+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)
+
diff --git a/inst/extdata/ValuationTables_Austria_Annuities_RR67.R b/inst/extdata/ValuationTables_Austria_Annuities_RR67.R
new file mode 100644
index 0000000000000000000000000000000000000000..318e6f3536671a58cf00bae8b04fe245cdf9ed92
--- /dev/null
+++ b/inst/extdata/ValuationTables_Austria_Annuities_RR67.R
@@ -0,0 +1,16 @@
+stopifnot(require(methods), require(utils), require(ValuationTables)) # ValuationTable classes; new; Excel reader
+
+
+###############################################################################
+### RR67 Rententafel für Männer, 3%
+###############################################################################
+
+rr67.data = utils::read.csv(system.file("extdata", "Austria_Annuities_RR67.csv", package="ValuationTables"), skip=2)
+
+RR67 = valuationTable.period(
+ name = "ÖVM 59/61 RR67",
+ ages = rr67.data$Alter,
+ deathProbs = rr67.data$qx
+);
+rm(rr67.data)
+
diff --git a/inst/extdata/ValuationTables_Germany_Endowments.R b/inst/extdata/ValuationTables_Germany_Endowments.R
new file mode 100644
index 0000000000000000000000000000000000000000..7914d0ebfc379e10337af376fa3d03f66c1e2c72
--- /dev/null
+++ b/inst/extdata/ValuationTables_Germany_Endowments.R
@@ -0,0 +1,3 @@
+stopifnot(require(methods), require(utils), require(ValuationTables)) # ValuationTable classes; new; Excel reader
+
+valuationTables.load("Germany_Endowments_*", wildcard=TRUE)
diff --git a/inst/extdata/ValuationTables_Germany_Endowments_DAV1994T.R b/inst/extdata/ValuationTables_Germany_Endowments_DAV1994T.R
new file mode 100644
index 0000000000000000000000000000000000000000..a31c479e413481c3051bfc835f5b23dbc51376cf
--- /dev/null
+++ b/inst/extdata/ValuationTables_Germany_Endowments_DAV1994T.R
@@ -0,0 +1,43 @@
+stopifnot(require(methods), require(utils), require(ValuationTables)) # ValuationTable classes; new; Excel reader
+
+#' German Life Tables for (pure) endowments, loaded and unloaded
+#' - DAV1994T: General German risk life table, based on general mortality 1986/88
+#' Available objects:
+#' o DAV1994T.male (male, loaded)
+#' o DAV1994T.male.2Ord (male, unloaded)
+#' o DAV1994T.female (female, loaded)
+#' o DAV1994T.female.2Ord (female, unloaded)
+"Germany_Endowments"
+
+###############################################################################
+### DAV 1994T (male, female), 1st-order and general mortality 1986/88
+###############################################################################
+
+DAV1994T.data = utils::read.csv(
+ system.file("extdata", "Germany_Endowments_DAV1994T.csv",
+ package = "ValuationTables"),
+ skip = 1);
+
+# DAV1994T (Male, Female), 1st-order and general mortality 1986/88
+DAV1994T.male = valuationTable.period(
+ name = "DAV 1994T male, loaded",
+ ages = DAV1994T.data$Alter,
+ deathProbs = DAV1994T.data$qbar_x.a)
+
+DAV1994T.male.2Ord = valuationTable.period(
+ name = "DAV 1994T male, unloaded",
+ ages = DAV1994T.data$Alter,
+ deathProbs = DAV1994T.data$q_x)
+
+DAV1994T.female = valuationTable.period(
+ name = "DAV 1994T female, loaded",
+ ages = DAV1994T.data$Alter,
+ deathProbs = DAV1994T.data$qbar_y.a )
+
+DAV1994T.female.2Ord = valuationTable.period(
+ name = "DAV 1994T female, unloaded",
+ ages = DAV1994T.data$Alter,
+ deathProbs = DAV1994T.data$q_y)
+
+rm(DAV1994T.data)
+
diff --git a/inst/extdata/ValuationTables_Germany_Endowments_DAV2008T.R b/inst/extdata/ValuationTables_Germany_Endowments_DAV2008T.R
new file mode 100644
index 0000000000000000000000000000000000000000..d9d9c7196c177ae5cfa7e92707dd11a8a12644ae
--- /dev/null
+++ b/inst/extdata/ValuationTables_Germany_Endowments_DAV2008T.R
@@ -0,0 +1,102 @@
+stopifnot(require(methods), require(utils), require(ValuationTables)) # ValuationTable classes; new; Excel reader
+
+#' German Life Tables for (pure) endowments, loaded and unloaded
+#' - DAV2008T: General German risk life table published by the DAV 2008
+#' Available objects:
+#' o DAV2008T.male (aggregate male, loaded)
+#' o DAV2008T.male.2Ord (aggregate male, unloaded)
+#' o DAV2008T.female (aggregate female, loaded)
+#' o DAV2008T.female.2Ord (aggregate female, unloaded)
+#' o DAV2008T.male.smoker (male smoker, loaded)
+#' o DAV2008T.male.smoker.2Ord (male smoker, unloaded)
+#' o DAV2008T.female.smoker (female smoker, loaded)
+#' o DAV2008T.female.smoker.2Ord (female smoker, unloaded)
+#' o DAV2008T.male.nonsmoker (male non-smoker, loaded)
+#' o DAV2008T.male.nonsmoker.2Ord (male non-smoker, unloaded)
+#' o DAV2008T.female.nonsmoker (female non-smoker, loaded)
+#' o DAV2008T.female.nonsmoker.2Ord (female non-smoker, unloaded)
+"Germany_Endowments"
+
+######################################################
+## DAV 2008T Aggregat / Smoker / Non-Smoker
+######################################################
+
+DAV2008T.data = utils::read.csv(
+ system.file("extdata", "Germany_Endowments_DAV2008T.csv",
+ package = "ValuationTables"),
+ col.names = c(
+ "age", "", "", "",
+ "qx2", "qx2NR", "qx2R", # male 2nd order
+ "qx1", "qx1NR", "qx1R", # male 1st order
+ "", "", "", "",
+ "qy2", "qy2NR", "qy2R", # female 2nd order
+ "qy1", "qy1NR", "qy1R"), # female 1st order
+ skip = 1);
+
+
+### DAV 2008T Aggregat (smoker+non-smoker combined)
+DAV2008T.male = valuationTable.period(
+ name = "DAV 2008T male, loaded",
+ ages = DAV2008T.data$age,
+ deathProbs = DAV2008T.data$qx1)
+
+DAV2008T.male.2Ord = valuationTable.period(
+ name = "DAV 2008T male, unloaded",
+ ages = DAV2008T.data$age,
+ deathProbs = DAV2008T.data$qx2)
+
+DAV2008T.female = valuationTable.period(
+ name = "DAV 2008T female, loaded",
+ ages = DAV2008T.data$age,
+ deathProbs = DAV2008T.data$qy1)
+
+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(
+ name = "DAV 2008T male smoker, loaded",
+ ages = DAV2008T.data$age,
+ deathProbs = DAV2008T.data$qx1R)
+
+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(
+ name = "DAV 2008T female smoker, loaded",
+ ages = DAV2008T.data$age,
+ deathProbs = DAV2008T.data$qy1R)
+
+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(
+ name = "DAV 2008T male non-smoker, loaded",
+ ages = DAV2008T.data$age,
+ deathProbs = DAV2008T.data$qx1NR)
+
+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(
+ name = "DAV 2008T female non-smoker, loaded",
+ ages = DAV2008T.data$age,
+ deathProbs = DAV2008T.data$qy1NR)
+
+DAV2008T.female.nonsmoker.2Ord = valuationTable.period(
+ name = "DAV 2008T female non-smoker, unloaded",
+ ages = DAV2008T.data$age,
+ deathProbs = DAV2008T.data$qy2NR)
+
+rm(DAV2008T.data)
diff --git a/man/valuationTables.list.Rd b/man/valuationTables.list.Rd
new file mode 100644
index 0000000000000000000000000000000000000000..0e78c33c9b73fc3563a84db248711f99ea428849
--- /dev/null
+++ b/man/valuationTables.list.Rd
@@ -0,0 +1,14 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/valuationTables.list.R
+\name{valuationTables.list}
+\alias{valuationTables.list}
+\title{List all available sets of life tables provided by the \link[ValuationTables]{ValuationTables-package} package
+An existing life table can then be loaded with \link{valuationTables.load}.}
+\usage{
+valuationTables.list()
+}
+\description{
+List all available sets of life tables provided by the \link[ValuationTables]{ValuationTables-package} package
+An existing life table can then be loaded with \link{valuationTables.load}.
+}
+
diff --git a/src/Tables/DAV_T.xls b/src/Tables/DAV_T.xls
deleted file mode 100644
index 84d3e953b9c89632f1301ee2998609780ede3e2d..0000000000000000000000000000000000000000
Binary files a/src/Tables/DAV_T.xls and /dev/null differ