Skip to content
Snippets Groups Projects
Commit 488258bf authored by Reinhold Kainhofer's avatar Reinhold Kainhofer
Browse files

Fix exports; Improve roxygen documentation (still not working properly)

parent 0c025862
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
NAMESPACE
+ 3
− 2
View file @ 488258bf
# Generated by roxygen2: do not edit by hand # Generated by roxygen2: do not edit by hand
export(getCohortTable) export(makeQxDataFrame)
export(plotValuationTables) export(plotValuationTables)
export(undampenTrend)
export(valuationTable) export(valuationTable)
export(valuationTable_ageShift) export(valuationTable_ageShift)
export(valuationTable_improvementFactors) export(valuationTable_improvementFactors)
...@@ -10,6 +9,7 @@ export(valuationTable_joined) ...@@ -10,6 +9,7 @@ export(valuationTable_joined)
export(valuationTable_mixed) export(valuationTable_mixed)
export(valuationTable_observed) export(valuationTable_observed)
export(valuationTable_period) export(valuationTable_period)
export(valuationTable_trendProjection)
exportClasses(valuationTable) exportClasses(valuationTable)
exportClasses(valuationTable_ageShift) exportClasses(valuationTable_ageShift)
exportClasses(valuationTable_improvementFactors) exportClasses(valuationTable_improvementFactors)
...@@ -17,6 +17,7 @@ exportClasses(valuationTable_joined) ...@@ -17,6 +17,7 @@ exportClasses(valuationTable_joined)
exportClasses(valuationTable_mixed) exportClasses(valuationTable_mixed)
exportClasses(valuationTable_observed) exportClasses(valuationTable_observed)
exportClasses(valuationTable_period) exportClasses(valuationTable_period)
exportClasses(valuationTable_trendProjection)
exportMethods(ageShift) exportMethods(ageShift)
exportMethods(ages) exportMethods(ages)
exportMethods(baseTable) exportMethods(baseTable)
......
R/ValuationTables.R
+ 80
− 171
View file @ 488258bf
This diff is collapsed.
R/plotValuationTables.R
+ 1
− 0
View file @ 488258bf
#' @export
makeQxDataFrame = function(..., YOB=1972, Period=NA) { makeQxDataFrame = function(..., YOB=1972, Period=NA) {
data=list(...); data=list(...);
names(data) = lapply(data, function(t) t@name); names(data) = lapply(data, function(t) t@name);
......
data/ValuationTables_Austria_Annuities.R
+ 2
− 1
View file @ 488258bf
...@@ -7,7 +7,7 @@ stopifnot(require(methods), require(utils), require(ValuationTables)) # Valuatio ...@@ -7,7 +7,7 @@ stopifnot(require(methods), require(utils), require(ValuationTables)) # Valuatio
rr67.data = utils::read.csv("Austria_Annuities_RR67.csv", skip=2) rr67.data = utils::read.csv("Austria_Annuities_RR67.csv", skip=2)
rr67 = ValuationTables::valuationTable_period( rr67 = valuationTable_period(
name = "ÖVM 59/61 RR67", ages = rr67.data$Alter, deathProbs = rr67.data$qx name = "ÖVM 59/61 RR67", ages = rr67.data$Alter, deathProbs = rr67.data$qx
); );
rm(rr67.data); rm(rr67.data);
...@@ -192,3 +192,4 @@ AVOe2005R.unisex.group.av = AVOe2005R_gen.av("AVÖ 2005R unisex group (age-shift ...@@ -192,3 +192,4 @@ AVOe2005R.unisex.group.av = AVOe2005R_gen.av("AVÖ 2005R unisex group (age-shift
# #
# plotValuationTables(mort.AT.census.2001.male, AVOe2005R.male, YOB = 1972, title = "Vergleich österreichische Sterbetafeln") # 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") # plotValuationTables(getCohortTable(AVOe2005R.male, YOB = 1972), getCohortTable(AVOe2005R.male, YOB = 2016), title = "Vergleich österreichische Sterbetafeln")
data/ValuationTables_Austria_Census.R
+ 34
− 43
View file @ 488258bf
# frame_files = lapply(sys.frames(), function(x) x$ofile) stopifnot(require(methods), require(utils), require(ValuationTables)) # ValuationTable classes; new; Excel reader
# frame_files = Filter(Negate(is.null), frame_files)
# PATH <- dirname(frame_files[[length(frame_files)]])
# rm(frame_files)
# setwd(dirname(PATH))
library("openxlsx")
# library("ggplot2")
library("ValuationTables")
require(ValuationTables)
############################################################################### ###############################################################################
### Volkszählungen Österreich ### Volkszählungen Österreich
############################################################################### ###############################################################################
a.vz.dataM = openxlsx::read.xlsx("Tables/A_Volkszaehlungen.xlsx", sheet="Austria_M", a.vz.dataM = utils::read.csv("Austria_Census_Male.csv", skip=3);
startRow = 3, colNames = TRUE) a.vz.dataF = utils::read.csv("Austria_Census_Female.csv", skip=3);
a.vz.dataF = openxlsx::read.xlsx("Tables/A_Volkszaehlungen.xlsx", sheet="Austria_F",
startRow = 3, colNames = TRUE)
censtable = function(data, name, qslot, baseYear=1900) { censtable = function(data, name, qslot, baseYear=1900) {
qx=data[names(data)==qslot]; qx=data[names(data)==qslot];
ix=complete.cases(qx); ix=complete.cases(qx);
valuationTable_period(name=name, ages=data$x[ix], deathProbs=qx[ix,], baseYear=baseYear) ValuationTables::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"); mort.AT.census.1869.male = censtable(a.vz.dataM, name="ÖVSt 1868/71 M", baseYear=1869, qslot="X1868.71");
mort.AT.census.1880.male = censtable(a.vz.dataM, name="ÖVSt 1879/82 M", baseYear=1880, qslot="1879/82"); mort.AT.census.1880.male = censtable(a.vz.dataM, name="ÖVSt 1879/82 M", baseYear=1880, qslot="X1879.82");
mort.AT.census.1890.male = censtable(a.vz.dataM, name="ÖVSt 1889/92 M", baseYear=1890, qslot="1889/92"); mort.AT.census.1890.male = censtable(a.vz.dataM, name="ÖVSt 1889/92 M", baseYear=1890, qslot="X1889.92");
mort.AT.census.1900.male = censtable(a.vz.dataM, name="ÖVSt 1899/1902 M", baseYear=1900, qslot="1899/1902"); mort.AT.census.1900.male = censtable(a.vz.dataM, name="ÖVSt 1899/1902 M", baseYear=1900, qslot="X1899.1902");
mort.AT.census.1910.male = censtable(a.vz.dataM, name="ÖVSt 1909/12 M", baseYear=1910, qslot="1909/12"); mort.AT.census.1910.male = censtable(a.vz.dataM, name="ÖVSt 1909/12 M", baseYear=1910, qslot="X1909.12");
mort.AT.census.1931.male = censtable(a.vz.dataM, name="ÖVSt 1930/33 M", baseYear=1931, qslot="1930/33"); mort.AT.census.1931.male = censtable(a.vz.dataM, name="ÖVSt 1930/33 M", baseYear=1931, qslot="X1930.33");
mort.AT.census.1951.male = censtable(a.vz.dataM, name="ÖVSt 1949/51 M", baseYear=1951, qslot="1949/51"); mort.AT.census.1951.male = censtable(a.vz.dataM, name="ÖVSt 1949/51 M", baseYear=1951, qslot="X1949.51");
mort.AT.census.1961.male = censtable(a.vz.dataM, name="ÖVSt 1959/61 M", baseYear=1961, qslot="1959/61"); mort.AT.census.1961.male = censtable(a.vz.dataM, name="ÖVSt 1959/61 M", baseYear=1961, qslot="X1959.61");
mort.AT.census.1971.male = censtable(a.vz.dataM, name="ÖVSt 1970/72 M", baseYear=1971, qslot="1970/72"); mort.AT.census.1971.male = censtable(a.vz.dataM, name="ÖVSt 1970/72 M", baseYear=1971, qslot="X1970.72");
mort.AT.census.1981.male = censtable(a.vz.dataM, name="ÖVSt 1980/82 M", baseYear=1981, qslot="1980/82"); mort.AT.census.1981.male = censtable(a.vz.dataM, name="ÖVSt 1980/82 M", baseYear=1981, qslot="X1980.82");
mort.AT.census.1991.male = censtable(a.vz.dataM, name="ÖVSt 1990/92 M", baseYear=1991, qslot="1990/92"); mort.AT.census.1991.male = censtable(a.vz.dataM, name="ÖVSt 1990/92 M", baseYear=1991, qslot="X1990.92");
mort.AT.census.2001.male = censtable(a.vz.dataM, name="ÖVSt 2000/02 M", baseYear=2001, qslot="2000/02"); mort.AT.census.2001.male = censtable(a.vz.dataM, name="ÖVSt 2000/02 M", baseYear=2001, qslot="X2000.02");
mort.AT.census.2011.male = censtable(a.vz.dataM, name="ÖVSt 2010/2012 M", baseYear=2011, qslot="2010/12"); mort.AT.census.2011.male = censtable(a.vz.dataM, name="ÖVSt 2010/2012 M", baseYear=2011, qslot="X2010.12");
mort.AT.census.1869.female = censtable(a.vz.dataF, name="ÖVSt 1868/71 F", baseYear=1869, qslot="1868/71"); mort.AT.census.1869.female = censtable(a.vz.dataF, name="ÖVSt 1868/71 F", baseYear=1869, qslot="X1868.71");
mort.AT.census.1880.female = censtable(a.vz.dataF, name="ÖVSt 1879/82 F", baseYear=1880, qslot="1879/82"); mort.AT.census.1880.female = censtable(a.vz.dataF, name="ÖVSt 1879/82 F", baseYear=1880, qslot="X1879.82");
mort.AT.census.1890.female = censtable(a.vz.dataF, name="ÖVSt 1889/92 F", baseYear=1890, qslot="1889/92"); mort.AT.census.1890.female = censtable(a.vz.dataF, name="ÖVSt 1889/92 F", baseYear=1890, qslot="X1889.92");
mort.AT.census.1900.female = censtable(a.vz.dataF, name="ÖVSt 1899/1902 F", baseYear=1900, qslot="1899/1902"); mort.AT.census.1900.female = censtable(a.vz.dataF, name="ÖVSt 1899/1902 F", baseYear=1900, qslot="X1899.1902");
mort.AT.census.1910.female = censtable(a.vz.dataF, name="ÖVSt 1909/12 F", baseYear=1910, qslot="1909/12"); mort.AT.census.1910.female = censtable(a.vz.dataF, name="ÖVSt 1909/12 F", baseYear=1910, qslot="X1909.12");
mort.AT.census.1931.female = censtable(a.vz.dataF, name="ÖVSt 1930/33 F", baseYear=1931, qslot="1930/33"); mort.AT.census.1931.female = censtable(a.vz.dataF, name="ÖVSt 1930/33 F", baseYear=1931, qslot="X1930.33");
mort.AT.census.1951.female = censtable(a.vz.dataF, name="ÖVSt 1949/51 F", baseYear=1951, qslot="1949/51"); mort.AT.census.1951.female = censtable(a.vz.dataF, name="ÖVSt 1949/51 F", baseYear=1951, qslot="X1949.51");
mort.AT.census.1961.female = censtable(a.vz.dataF, name="ÖVSt 1959/61 F", baseYear=1961, qslot="1959/61"); mort.AT.census.1961.female = censtable(a.vz.dataF, name="ÖVSt 1959/61 F", baseYear=1961, qslot="X1959.61");
mort.AT.census.1971.female = censtable(a.vz.dataF, name="ÖVSt 1970/72 F", baseYear=1971, qslot="1970/72"); mort.AT.census.1971.female = censtable(a.vz.dataF, name="ÖVSt 1970/72 F", baseYear=1971, qslot="X1970.72");
mort.AT.census.1981.female = censtable(a.vz.dataF, name="ÖVSt 1980/82 F", baseYear=1981, qslot="1980/82"); mort.AT.census.1981.female = censtable(a.vz.dataF, name="ÖVSt 1980/82 F", baseYear=1981, qslot="X1980.82");
mort.AT.census.1991.female = censtable(a.vz.dataF, name="ÖVSt 1990/92 F", baseYear=1991, qslot="1990/92"); mort.AT.census.1991.female = censtable(a.vz.dataF, name="ÖVSt 1990/92 F", baseYear=1991, qslot="X1990.92");
mort.AT.census.2001.female = censtable(a.vz.dataF, name="ÖVSt 2000/02 F", baseYear=2001, qslot="2000/02"); mort.AT.census.2001.female = censtable(a.vz.dataF, name="ÖVSt 2000/02 F", baseYear=2001, qslot="X2000.02");
mort.AT.census.2011.female = censtable(a.vz.dataF, name="ÖVSt 2010/2012 F", baseYear=2011, qslot="2010/12"); mort.AT.census.2011.female = censtable(a.vz.dataF, name="ÖVSt 2010/2012 F", baseYear=2011, qslot="X2010.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.ALL.male = ValuationTables::makeQxDataFrame(
mort.AT.census.1869.male, mort.AT.census.1869.male,
mort.AT.census.1880.male, mort.AT.census.1880.male,
mort.AT.census.1890.male, mort.AT.census.1890.male,
...@@ -70,7 +60,7 @@ mort.AT.census.ALL.male = makeQxDataFrame( ...@@ -70,7 +60,7 @@ mort.AT.census.ALL.male = makeQxDataFrame(
mort.AT.census.2001.male, mort.AT.census.2001.male,
mort.AT.census.2011.male); mort.AT.census.2011.male);
mort.AT.census.ALL.female = makeQxDataFrame( mort.AT.census.ALL.female = ValuationTables::makeQxDataFrame(
mort.AT.census.1869.female, mort.AT.census.1869.female,
mort.AT.census.1880.female, mort.AT.census.1880.female,
mort.AT.census.1890.female, mort.AT.census.1890.female,
...@@ -91,3 +81,4 @@ rm(a.vz.dataM, a.vz.dataF, censtable) ...@@ -91,3 +81,4 @@ 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.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.female, title="Vergleich österreichische Sterbetafeln, Frauen", legend.position=c(1,0))
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment