diff --git a/.Rbuildignore b/.Rbuildignore index 88eff7cf78be95a1af5d6a52251a402fb26875e4..68081ee48adc7c1145d2c96229b1b8e489d18ac2 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -10,3 +10,5 @@ PossibleTables.txt ^doc$ ^Meta$ ^inst/extdata/Austria_Population_Observation.csv$ +^revdep$ +^cran-comments\.md$ diff --git a/DESCRIPTION b/DESCRIPTION index 196e31f4b163ca760c701e61720e29ddbc710ee6..bf8af9353a2e479d7d8a483f0eabe1f71c508e97 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: MortalityTables Type: Package -Version: 2.0.4 -Date: 2023-10-18 +Version: 2.0.5 +Date: 2023-10-27 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] @@ -26,10 +26,11 @@ Suggests: reshape2, rmarkdown Description: Classes to implement and plot cohort life tables - for actuarial calculations. In particular, birth-year dependent mortality + for actuarial calculations. Birth-year dependent cohort mortality tables using a yearly trend to extrapolate from a base year are implemented, as well as period life table, cohort life tables using an age shift, and - merged life tables. + merged life tables. Additionally, several data sets from various countries + are included to provide widely-used tables out of the box. License: GPL (>= 2) RoxygenNote: 7.2.3 Collate: diff --git a/README.md b/README.md index 23a96353d9845235a21804229439ff2a4d4f461b..4441faae0c6bd18a4ee421b4ac3953dd9274f7e8 100644 --- a/README.md +++ b/README.md @@ -87,12 +87,23 @@ For further information on how to use the package, see the "Using the MortalityT ## Changelog -* Version 1.0 (30.3.2018): Initial Submission to CRAN +* Version 1.0 (30.3.2018): + * Initial Submission to CRAN * Version 2.0 (27.8.2020): - * Add various convenience functions to derive tables from data, implement dimensional information + * Add various convenience functions to derive tables from data + * implement dimensional information + * extend plotting capabilities (more flexible) + * Add more international tables / datasets * Version 2.0.1 (4.9.2020): * Fix performance issues with mortalityTables.list and mortalityTables.load * Version 2.0.2 (12.12.2020): * Add/fix some sample tables * gracefully handle missing suggested packages * First version of vignette about international tables +* Version 2.0.3 (24.8.2021): + * Fix vignette builds +* Version 2.0.4 (19.10.2023): + * Add new Austrian population mortality tables (2020/22) +* Version 2.0.5 (27.10.2023): + * Fix incorrect ages in Austrian population mortality + diff --git a/data-raw/Austria_Population_Observed_prepare.R b/data-raw/Austria_Population_Observed_prepare.R index a1f5fa119b249cebd64e63aa9673bce0447c1672..4156f324cacf8068f8ebcd795d014755b736413e 100644 --- a/data-raw/Austria_Population_Observed_prepare.R +++ b/data-raw/Austria_Population_Observed_prepare.R @@ -69,8 +69,8 @@ for (jahr in Jahre) { ## Nach Excel und CSV rausschreiben (pro Geschlecht): filename.StT.yearlyGradTable = file.path(dirname(filename.StT.yearlyGrad), paste0("Austria_JaehrlicheSterbetafeln_Geglättet_", str_sub(min(Jahre), 1, 4), "-", str_sub(max(Jahre), -4, -1), ".xlsx")) wb <- createWorkbook() -options(openxlsx.borderColour = "#4F80BD") -options(openxlsx.borderStyle = "thin") +# options(openxlsx.borderColour = "#4F80BD") +# options(openxlsx.borderStyle = "thin") modifyBaseFont(wb, fontSize = 10, fontName = "Arial Narrow") for (g in c("M", "F", "U")) { @@ -138,8 +138,8 @@ for (jahr in Jahre) { ## Nach Excel und CSV rausschreiben (pro Geschlecht): filename.StT.yearlyTable = file.path(dirname(filename.StT.yearly), paste0("Austria_JaehrlicheSterbetafeln_", min(Jahre), "-", max(Jahre), ".xlsx")) wb <- createWorkbook() -options(openxlsx.borderColour = "#4F80BD") -options(openxlsx.borderStyle = "thin") +# options(openxlsx.borderColour = "#4F80BD") +# options(openxlsx.borderStyle = "thin") modifyBaseFont(wb, fontSize = 10, fontName = "Arial Narrow") for (g in c("M", "F", "U")) { diff --git a/vignettes/using-the-mortalityTables-package.Rmd b/vignettes/using-the-mortalityTables-package.Rmd index 4b17a1d7d01dd2ea000a7e6f2330ebb9a45e45b6..325cae9dcbb6e1c2189c24877f56e0121424e581 100644 --- a/vignettes/using-the-mortalityTables-package.Rmd +++ b/vignettes/using-the-mortalityTables-package.Rmd @@ -28,7 +28,7 @@ if (!all(sapply(required, ```{r echo = FALSE} knitr::opts_chunk$set(collapse = TRUE, comment = "#>") -options(tidyverse.quiet = TRUE) +# options(tidyverse.quiet = TRUE) ``` The MortalityTables package provides the `mortalityTable` base class and