not load supplemental data if use.wpp.data is FALSE

PPgp · Apr 7, 2024 · a5c31e6 · a5c31e6
1 parent 2c627c5
commit a5c31e6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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 <[email protected]>
 Description: Making probabilistic projections of life expectancy for all countries of the world, using a Bayesian hierarchical model <doi:10.1007/s13524-012-0193-x>. Subnational projections are also supported.

diff --git 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)