From 86544a23d4880365075b3b043d2103b1e6cdf226 Mon Sep 17 00:00:00 2001
From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Sun, 20 Sep 2020 02:16:32 +0200
Subject: [PATCH] Fix Austrian census tables (just naming and adding a "table"
dimensional info)
---
inst/extdata/MortalityTables_Austria_Census.R | 64 +++++++++----------
1 file changed, 32 insertions(+), 32 deletions(-)
diff --git a/inst/extdata/MortalityTables_Austria_Census.R b/inst/extdata/MortalityTables_Austria_Census.R
index 9f3fac3..2fbc4ae 100644
--- a/inst/extdata/MortalityTables_Austria_Census.R
+++ b/inst/extdata/MortalityTables_Austria_Census.R
@@ -15,7 +15,7 @@ censtable = function(data, name, qslot, baseYear = 1900, sex = "m") {
ix = complete.cases(qx);
mortalityTable.period(name = name, ages = data$x[ix], deathProbs = qx[ix,], baseYear = baseYear,
data = list(
- dim = list(sex = sex, collar = "Gesamtbevölkerung", type = "Volkssterbetafel Österreich", data = "official", year = baseYear)
+ dim = list(sex = sex, collar = "Gesamtbevölkerung", type = "Volkssterbetafel Österreich", data = "official", year = baseYear, table = substr(name, 1, nchar(name) - 2))
)
)
}
@@ -32,7 +32,7 @@ mort.AT.census.1971.male = censtable(a.vz.dataM, name = "ÖVSt 1970/72 M", bas
mort.AT.census.1981.male = censtable(a.vz.dataM, name = "ÖVSt 1980/82 M", baseYear = 1981, qslot = "X1980.82", sex = "m")
mort.AT.census.1991.male = censtable(a.vz.dataM, name = "ÖVSt 1990/92 M", baseYear = 1991, qslot = "X1990.92", sex = "m")
mort.AT.census.2001.male = censtable(a.vz.dataM, name = "ÖVSt 2000/02 M", baseYear = 2001, qslot = "X2000.02", sex = "m")
-mort.AT.census.2011.male = censtable(a.vz.dataM, name = "ÖVSt 2010/2012 M", baseYear = 2011, qslot = "X2010.12", sex = "m")
+mort.AT.census.2011.male = censtable(a.vz.dataM, name = "ÖVSt 2010/12 M", baseYear = 2011, qslot = "X2010.12", sex = "m")
mort.AT.census.1869.female = censtable(a.vz.dataF, name = "ÖVSt 1868/71 F", baseYear = 1869, qslot = "X1868.71", sex = "w")
mort.AT.census.1880.female = censtable(a.vz.dataF, name = "ÖVSt 1879/82 F", baseYear = 1880, qslot = "X1879.82", sex = "w")
@@ -46,12 +46,12 @@ mort.AT.census.1971.female = censtable(a.vz.dataF, name = "ÖVSt 1970/72 F", b
mort.AT.census.1981.female = censtable(a.vz.dataF, name = "ÖVSt 1980/82 F", baseYear = 1981, qslot = "X1980.82", sex = "w")
mort.AT.census.1991.female = censtable(a.vz.dataF, name = "ÖVSt 1990/92 F", baseYear = 1991, qslot = "X1990.92", sex = "w")
mort.AT.census.2001.female = censtable(a.vz.dataF, name = "ÖVSt 2000/02 F", baseYear = 2001, qslot = "X2000.02", sex = "w")
-mort.AT.census.2011.female = censtable(a.vz.dataF, name = "ÖVSt 2010/2012 F", baseYear = 2011, qslot = "X2010.12", sex = "w")
+mort.AT.census.2011.female = censtable(a.vz.dataF, name = "ÖVSt 2010/12 F", baseYear = 2011, qslot = "X2010.12", sex = "w")
mort.AT.census.2001.unisex = mortalityTable.mixed(table1 = mort.AT.census.2001.male, table2 = mort.AT.census.2001.female,
- data = list(
- dim = list(sex = "u", collar = "Gesamtbevölkerung", type = "Volkssterbetafel Österreich", data = "official", year = 2001)
- )
+ data = list(
+ dim = list(sex = "u", collar = "Gesamtbevölkerung", type = "Volkssterbetafel Österreich", data = "official", year = 2001)
+ )
)
mort.AT.census.2011.unisex = censtable(a.vz.dataU, name = "ÖVSt 2010/2012 U", baseYear = 2011, qslot = "X2010.12", sex = "u")
@@ -106,34 +106,34 @@ mort.AT.census[["u", "2011"]] = mort.AT.census.2011.unisex
mort.AT.census.ALL.male = MortalityTables::makeQxDataFrame(
- mort.AT.census.1869.male,
- mort.AT.census.1880.male,
- mort.AT.census.1890.male,
- mort.AT.census.1900.male,
- mort.AT.census.1910.male,
- mort.AT.census.1931.male,
- mort.AT.census.1951.male,
- mort.AT.census.1961.male,
- mort.AT.census.1971.male,
- mort.AT.census.1981.male,
- mort.AT.census.1991.male,
- mort.AT.census.2001.male,
- mort.AT.census.2011.male);
+ mort.AT.census.1869.male,
+ mort.AT.census.1880.male,
+ mort.AT.census.1890.male,
+ mort.AT.census.1900.male,
+ mort.AT.census.1910.male,
+ mort.AT.census.1931.male,
+ mort.AT.census.1951.male,
+ mort.AT.census.1961.male,
+ mort.AT.census.1971.male,
+ mort.AT.census.1981.male,
+ mort.AT.census.1991.male,
+ mort.AT.census.2001.male,
+ mort.AT.census.2011.male);
mort.AT.census.ALL.female = MortalityTables::makeQxDataFrame(
- mort.AT.census.1869.female,
- mort.AT.census.1880.female,
- mort.AT.census.1890.female,
- mort.AT.census.1900.female,
- mort.AT.census.1910.female,
- mort.AT.census.1931.female,
- mort.AT.census.1951.female,
- mort.AT.census.1961.female,
- mort.AT.census.1971.female,
- mort.AT.census.1981.female,
- mort.AT.census.1991.female,
- mort.AT.census.2001.female,
- mort.AT.census.2011.female);
+ mort.AT.census.1869.female,
+ mort.AT.census.1880.female,
+ mort.AT.census.1890.female,
+ mort.AT.census.1900.female,
+ mort.AT.census.1910.female,
+ mort.AT.census.1931.female,
+ mort.AT.census.1951.female,
+ mort.AT.census.1961.female,
+ mort.AT.census.1971.female,
+ mort.AT.census.1981.female,
+ mort.AT.census.1991.female,
+ mort.AT.census.2001.female,
+ mort.AT.census.2011.female);
rm(a.vz.dataM, a.vz.dataF, censtable)
--
GitLab