From 38d4fa545158cfd6579e1d67fe9c99c97db999c0 Mon Sep 17 00:00:00 2001 From: Reinhold Kainhofer <reinhold@kainhofer.com> Date: Tue, 17 Aug 2021 17:27:15 +0200 Subject: [PATCH] Version 2.0.3: Fix vignette building on CRAN servers --- DESCRIPTION | 4 +- .../MortalityTables_Austria_PopulationMCMC.R | 2 +- ...nternational-mortality-tables-overview.Rmd | 60 +++++++++---------- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index f8731fb..e23bf7e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: MortalityTables Type: Package -Version: 2.0.2 -Date: 2020-12-12 +Version: 2.0.3 +Date: 2021-08-17 Title: A Framework for Various Types of Mortality / Life Tables Authors@R: c(person("Reinhold", "Kainhofer", role=c("aut", "cre"), email="reinhold@kainhofer.com")) Author: Reinhold Kainhofer [aut, cre] diff --git a/inst/extdata/MortalityTables_Austria_PopulationMCMC.R b/inst/extdata/MortalityTables_Austria_PopulationMCMC.R index 33b0197..60cbcf8 100644 --- a/inst/extdata/MortalityTables_Austria_PopulationMCMC.R +++ b/inst/extdata/MortalityTables_Austria_PopulationMCMC.R @@ -1,4 +1,4 @@ -stopifnot(require(methods), require(utils), require(MortalityTables), require(tidyverse), require(reshape2)) # MortalityTable classes; new; Excel reader +stopifnot(require(methods), require(utils), require(MortalityTables), require(tidyverse), require(reshape2), require(pracma)) # MortalityTable classes; new; Excel reader ############################################################################### diff --git a/vignettes/international-mortality-tables-overview.Rmd b/vignettes/international-mortality-tables-overview.Rmd index c428cec..9d99125 100644 --- a/vignettes/international-mortality-tables-overview.Rmd +++ b/vignettes/international-mortality-tables-overview.Rmd @@ -299,9 +299,9 @@ plotMortalityTables( * second-order table, describing the transition probabilities of the Austrian social security system ```{r EttlPager, results="hide"} -pensionTables.load("Austria_EttlPagler") -EttlPagler.male -EttlPagler.female +# pensionTables.load("Austria_EttlPagler") +# EttlPagler.male +# EttlPagler.female ``` * Source: Ettl W. und Pagler F.: "Rechnungsgrundlagen für die Pensionsversicherung", @@ -317,8 +317,8 @@ Verlag: Verband der wissenschaftlichen Gesellschaften Österreichs, Wien, 1989 * No documentation available ```{r AVOe1999P, results="hide"} -pensionTables.load("Austria_AVOe1999P") -AVOe1999P +# pensionTables.load("Austria_AVOe1999P") +# AVOe1999P ``` @@ -332,8 +332,8 @@ AVOe1999P * No documentation available ```{r AVOe2008P, results="hide"} -pensionTables.load("Austria_AVOe2008P") -AVOe2008P +# pensionTables.load("Austria_AVOe2008P") +# AVOe2008P ``` @@ -346,32 +346,32 @@ AVOe2008P * Publisher: Aktuarvereinigung Österreichs (AVÖ), Creator: R. Kainhofer, J. Hirz, A. Schubert ```{r AVOe2018P, results="hide"} -pensionTables.load("Austria_AVOe2018P") -AVOe2018P +# pensionTables.load("Austria_AVOe2018P") +# AVOe2018P ``` * Source: R. Kainhofer, J. Hirz, A. Schubert: AVÖ 2018-P - Rechnungsgrundlagen für die Pensionsversicherung, Dokumentation der Pensionstafel, Arbeitskreis Rechnungsgrundlagen, Aktuarvereinigung Österreichs (AVÖ), 30. August 2018. https://oefdv.avoe.at/rechnungsgrundlagen/ -### Comparisons -```{r AT.pensionTables.Comparison} -plotMortalityTables( - EttlPagler.male %>% pT.getSubTable("qx"), - AVOe1999P["m",,"IP", "P"] %>% pT.getSubTable("qx"), - AVOe2008P["m",,"IP", "P"] %>% pT.getSubTable("qx"), - AVOe2018P["m",,"IPRG"] %>% pT.getSubTable("qx"), - legend.position = c(0.01, 0.99), legend.justification = c(0,1), - title = "Comparison of Austrian Pension Tables" -) + labs(color = NULL) - -plotMortalityTables( - EttlPagler.male %>% pT.getSubTable("hx"), - AVOe1999P["m",,"IP", "P"] %>% pT.getSubTable("hx"), - AVOe2008P["m",,"IP", "P"] %>% pT.getSubTable("hx"), - AVOe2018P["m",,"IPRG"] %>% pT.getSubTable("hx"), - # legend.position = c(0.01, 0.99), legend.justification = c(0,1), - title = "Comparison of Austrian Pension Tables", - log = FALSE, legend.position = "bottom" -) + labs(color = NULL) -``` +<!-- ### Comparisons --> +<!-- ```{r AT.pensionTables.Comparison} --> +<!-- plotMortalityTables( --> +<!-- EttlPagler.male %>% pT.getSubTable("qx"), --> +<!-- AVOe1999P["m",,"IP", "P"] %>% pT.getSubTable("qx"), --> +<!-- AVOe2008P["m",,"IP", "P"] %>% pT.getSubTable("qx"), --> +<!-- AVOe2018P["m",,"IPRG"] %>% pT.getSubTable("qx"), --> +<!-- legend.position = c(0.01, 0.99), legend.justification = c(0,1), --> +<!-- title = "Comparison of Austrian Pension Tables" --> +<!-- ) + labs(color = NULL) --> + +<!-- plotMortalityTables( --> +<!-- EttlPagler.male %>% pT.getSubTable("hx"), --> +<!-- AVOe1999P["m",,"IP", "P"] %>% pT.getSubTable("hx"), --> +<!-- AVOe2008P["m",,"IP", "P"] %>% pT.getSubTable("hx"), --> +<!-- AVOe2018P["m",,"IPRG"] %>% pT.getSubTable("hx"), --> +<!-- # legend.position = c(0.01, 0.99), legend.justification = c(0,1), --> +<!-- title = "Comparison of Austrian Pension Tables", --> +<!-- log = FALSE, legend.position = "bottom" --> +<!-- ) + labs(color = NULL) --> +<!-- ``` --> ## Experience Tables -- GitLab