add use.wpp.data to meta if missing

PPgp · Dec 5, 2024 · 2c63066 · 2c63066
1 parent 745d604
commit 2c63066
Show file tree

Hide file tree

Showing 3 changed files with 4 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.3-0
-Date: 2024-11-01
+Version: 5.3-0.9001
+Date: 2024-12-04
 Authors@R: c(person(given = "Hana",
                     family = "Sevcikova",
                     role = c("cre", "aut"),

diff --git a/R/get_outputs.R b/R/get_outputs.R
@@ -12,6 +12,7 @@ get.e0.mcmc <- function(sim.dir = file.path(getwd(), 'bayesLife.output'),
 	load(file = mcmc.file.path)
 	bayesLife.mcmc.meta$output.dir <- normalizePath(sim.dir)
 	if(is.null(bayesLife.mcmc.meta$annual.simulation)) bayesLife.mcmc.meta$annual.simulation <- FALSE
+	if(is.null(bayesLife.mcmc.meta$use.wpp.data)) bayesLife.mcmc.meta$use.wpp.data <- TRUE
 	if(is.null(bayesLife.mcmc.meta$mcmc.options)) {
 	    bayesLife.mcmc.meta <- .convert.meta.from.legacy.form(bayesLife.mcmc.meta)
 	}

diff --git a/man/convert.trajectories.Rd b/man/convert.trajectories.Rd
@@ -19,7 +19,7 @@ convert.e0.trajectories(dir = file.path(getwd(), "bayesLife.output"),
 }
 \details{
 The function creates two files per sex. One is called \dQuote{ascii_trajectories.csv}, it is a comma-separated table with the following columns: 
-\itemize{\item{\dQuote{LocID}: }{country code} 
+\describe{\item{\dQuote{LocID}: }{country code} 
 		\item{\dQuote{Period}: }{prediction interval, e.g. 2015-2020} 
 		\item{\dQuote{Year}: }{middle year of the prediction interval}
 		\item{\dQuote{Trajectory}: }{identifier of the trajectory}