diff --git a/data-raw/US/CSO/1941 CSO/USA_1941_CSO.xlsx b/data-raw/US/CSO/1941 CSO/USA_1941_CSO.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..2d71e1b99e70bc103add69f78d3495fc7c3e68a6 Binary files /dev/null and b/data-raw/US/CSO/1941 CSO/USA_1941_CSO.xlsx differ diff --git a/data-raw/US/create_MortalityTables_US_CSO.R b/data-raw/US/create_MortalityTables_US_CSO.R index 92329151edeadcfa21865b6e1c271a6770e7b771..4fc3610d8b36816a7c5f6896459c5500df796905 100644 --- a/data-raw/US/create_MortalityTables_US_CSO.R +++ b/data-raw/US/create_MortalityTables_US_CSO.R @@ -51,6 +51,56 @@ createUSSelectTable = function( +#############################################################################h# +# USA 1941 CSO Tables #### +#############################################################################h# + +CSO1941.file = here::here("data-raw", "US", "CSO", "1941 CSO", "USA_1941_CSO.xlsx") +CSO1941.file.out = here::here("data", "CSO1941.RData") +CSO1941.data = read_excel(CSO1941.file, sheet = "1941 CSO", skip = 4) + +CSO1941 = array( + data = c(mortalityTable.NA), + dim = c(2), + dimnames = list( + ageType = c("ANB", "ALB") + ) +) + +CSO1941[["ANB"]] = mortalityTable.period( + name = "1941 CSO ANB", ages = CSO1941.data$Age, deathProbs = CSO1941.data$`CSO ANB`, baseYear = 1941, + data = list( + dim = list(table = "1941 CSO", sex = "u", collar = "Composite", country = "USA", ageType = "ANB", data = "official", year = 1941) + ) +) +CSO1941[["ALB"]] = mortalityTable.period( + name = "1941 CSO ALB", ages = CSO1941.data$Age, deathProbs = CSO1941.data$`CSO ALB`, baseYear = 1941, + data = list( + dim = list(table = "1941 CSO", sex = "u", collar = "Composite", country = "USA", ageType = "ALB", data = "official", year = 1941) + ) +) +CSO1941.basic = mortalityTable.period( + name = "1941 CSO Basic ANB", ages = CSO1941.data$Age, deathProbs = CSO1941.data$`CSO Basic ANB`, baseYear = 1941, + data = list( + dim = list(table = "1941 CSO Basic", sex = "u", collar = "Composite", country = "USA", ageType = "ANB", data = "official", year = 1941) + ) +) + +save(CSO1941, CSO1941.basic, file = CSO1941.file.out) + + + + +# plotMortalityTables(CSO1941, CSO1941.basic, title = "1941 CSO tables") + + + + + + + + + #############################################################################h# # USA 1958 CSO Tables #### #############################################################################h# @@ -89,7 +139,6 @@ createCSO1958 = function( mortalityTable.period( name = name, ages = qx$age, deathProbs = qx$qx, baseYear = baseYear, - selectInitialAge = TRUE, data = list( dim = list(table = table, sex = sex, collar = collar, country = "USA", ageType = ageType, data = "official", year = baseYear, ...) ) @@ -439,7 +488,7 @@ for (preferred in c("Super Preferred", "Preferred", "Residual")) { # plotMortalityTables(CSO2001.Preferred[,,"ANB",], legend.position = "bottom") + facet_grid(sex ~ collar) + aes(color = Preferred) -save(CSO2001.Preferred, file = CSO2001Pref.file.out) +save(CSO2001.Preferred, file = here::here("data", "CSO2001.Preferred.RData")) @@ -449,6 +498,7 @@ save(CSO2001.Preferred, file = CSO2001Pref.file.out) # USA 2017 CSO Tables #### #############################################################################h# +CSO2017file.out = here::here("data", "CSO2017.RData") CSO2017Pref.file.out = here::here("data", "CSO2017.Preferred.RData") CSO2017 = array( diff --git a/data/CSO1941.RData b/data/CSO1941.RData new file mode 100644 index 0000000000000000000000000000000000000000..6a806970573a1eca86971496db69d1e9e2ecac45 Binary files /dev/null and b/data/CSO1941.RData differ diff --git a/data/CSO1958.RData b/data/CSO1958.RData index 7d6da86f35c9121fb6e26ee44a7f03df1257fb0e..3dc2f1de4591aaa7fbd97e30770bbc2a97af2fd8 100644 Binary files a/data/CSO1958.RData and b/data/CSO1958.RData differ diff --git a/data/CSO1980.RData b/data/CSO1980.RData index 0e850666d3bc67aa43c530d0285d17b2d4e0f5bd..277251f8f2df4ba25094276b46efb41cd7778290 100644 Binary files a/data/CSO1980.RData and b/data/CSO1980.RData differ