diff --git a/DESCRIPTION b/DESCRIPTION index 8be3f3f..9e6925a 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: bayesLife Type: Package Title: Bayesian Projection of Life Expectancy -Version: 5.2-0.9005 -Date: 2024-03-24 +Version: 5.2-0.9006 +Date: 2024-04-06 Author: Hana Sevcikova, Adrian Raftery, Jennifer Chunn Maintainer: Hana Sevcikova Description: Making probabilistic projections of life expectancy for all countries of the world, using a Bayesian hierarchical model . Subnational projections are also supported. diff --git a/R/wpp_data.R b/R/wpp_data.R index 0c35db1..0eaa808 100644 --- a/R/wpp_data.R +++ b/R/wpp_data.R @@ -53,7 +53,7 @@ get.wpp.e0.data <- function(sex = 'M', start.year = 1950, present.year = 2015, if (verbose) cat('Dimension of the e0 matrix:', dim(LEXmatrix.regions$obs_matrix), '\n') - if(!annual || wpp.year >= 2022) { + if((!annual || wpp.year >= 2022) && use.wpp.data) { LEXmatrixsuppl.regions <- bayesTFR:::.get.suppl.matrix.and.regions(un.object, LEXmatrix.regions, loc_data, start.year, present.year, annual = annual) if(!is.null(un.object$suppl.data.object) && verbose)