Fix issues with NA values in population

JGCRI · Jul 19, 2024 · 14947a3 · 14947a3
1 parent ffef70d
commit 14947a3
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -37,7 +37,7 @@ vignettes/*.pdf
 
 # R Environment Variables
 .Renviron
-output
+output*
 inst/doc
 docs/
 tests/testthat/output/

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -47,4 +47,4 @@ Remotes:
 Config/testthat/edition: 3
 Encoding: UTF-8
 LazyData: true
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1
diff --git a/R/hdcd.R b/R/hdcd.R
@@ -204,7 +204,8 @@ hdcd <- function(ncdf = NULL,
 
             population_j_weighted <- population_j_grid %>%
               dplyr::group_by(region, ID, subRegion, year) %>%
-              dplyr::mutate(subRegion_total_value = sum(value, na.rm = T)) %>%
+              dplyr::mutate(subRegion_total_value = sum(value, na.rm = T),
+                            value = ifelse(is.na(value), 0, value)) %>%
               dplyr::ungroup() %>%
               dplyr::mutate(pop_weight = value / subRegion_total_value)
 

diff --git a/man/helios.Rd b/man/helios.Rd