finished supplemental data fix

PPgp · Apr 7, 2024 · 78b55d2 · 78b55d2
1 parent 5265b93
commit 78b55d2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: bayesLife
 Type: Package
 Title: Bayesian Projection of Life Expectancy
-Version: 5.2-0.9006
+Version: 5.2-0.9007
 Date: 2024-04-06
 Author: Hana Sevcikova, Adrian Raftery, Jennifer Chunn 
 Maintainer: Hana Sevcikova <[email protected]>

diff --git a/R/wpp_data.R b/R/wpp_data.R
@@ -108,7 +108,7 @@ set.e0.wpp.extra <- function(meta, countries=NULL, my.e0.file=NULL, my.locations
 						  regions=extra.wpp$regions, 
 						  nr.countries.estimation=extra.wpp$nr_countries_estimation,
 						  is_processed = extra.wpp$is_processed)
-		if(!annual || meta$wpp.year >= 2022) {
+		if((!annual || meta$wpp.year >= 2022)) && use.wpp.data) {
 		    locations <- bayesTFR:::read.UNlocations(data$data, wpp.year=meta$wpp.year, 
 									my.locations.file=my.locations.file, package='bayesLife', verbose=verbose)
 		    suppl.wpp <- bayesTFR:::.get.suppl.matrix.and.regions(un.object, extra.wpp, locations$loc_data,