fix in 1x1 GQs

PPgp · Dec 22, 2023 · 6711085 · 6711085
1 parent ddace4c
commit 6711085
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,7 +1,9 @@
-10.0-1.900x (09/22/2023)
+10.0-1.900x (12/22/2023)
 ------
 pop.predict.subnat can handle 1x1 subnational projections. 
 
+Fix in 1x1 GQs.
+
 10.0-0/1 (08/09/2023)
 ------
 Making default datasets from wpp2022 work with pop.predict.

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: bayesPop
 Type: Package
 Title: Probabilistic Population Projection
-Version: 10.0-1.9006
-Date: 2023-11-03
+Version: 10.0-1.9007
+Date: 2023-12-22
 Author: Hana Sevcikova, Adrian Raftery, Thomas Buettner
 Maintainer: Hana Sevcikova <[email protected]>
 Depends: R (>= 3.5.0), bayesTFR (>= 7.1-0), bayesLife (>= 5.0-0), MortCast (>= 2.6-1)

diff --git a/R/predict.pop.R b/R/predict.pop.R
@@ -1803,7 +1803,7 @@ get.country.inputs <- function(country, inputs, nr.traj, country.name) {
 	for(par in c("GQm", "GQf")) {
 	    if(is.null(inpc[[par]])) next
 	    # match ages
-	    age.labels <- get.age.labels(ages.all(inputs$annual, observed = TRUE))
+	    age.labels <- get.age.labels(ages.all(inputs$annual, observed = TRUE), single.year = inputs$annual)
 	    if(!all(rownames(inpc[[par]]) %in% age.labels))
 	        stop("Mismatch in age labels for ", par, "\nAllowed labels: ", paste(age.labels, collapse = ", "))
 	    gq <- rep(0, length(age.labels))