Normalise value of cal_interpolate()

joeroe · Oct 17, 2024 · 234fcb1 · 234fcb1
1 parent c05996d
commit 234fcb1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/R/cal.R b/R/cal.R
@@ -177,8 +177,14 @@ cal_age_common <- function(x, resolution = 1) {
 
 #' Interpolate a cal vector over the given range
 #'
+#' Result is normalised
+#'
 #' @noRd
 #' @keywords internal
 cal_interpolate <- function(x, range = cal_age_common(x)) {
-  new_cal(furrr::future_map(vec_data(x), \(x) approx_df(x, range, ties = "ordered")))
+  new_cal(furrr::future_map(vec_data(x), function(x) {
+    x <- approx_df(x, range, ties = "ordered")
+    x$pdens <- x$pdens / sum(x$pdens, na.rm = TRUE)
+    x
+  }))
 }
diff --git a/R/cal_aggregate.R b/R/cal_aggregate.R
@@ -32,7 +32,7 @@ cal_sum <- function(x, range = cal_age_common(x), normalise = FALSE, ...) {
   x <- cal_interpolate(x, range)
 
   pdens_sum <- furrr::future_pmap_dbl(cal_pdens(x), \(...) sum(..., na.rm = TRUE))
-  if (isTRUE(normalise)) pdens_sum <- pdens_sum / sum(pdens_sum)
+  if (isTRUE(normalise)) pdens_sum <- pdens_sum / sum(pdens_sum, na.rm = TRUE)
 
   new_cal(list(data.frame(age = cal_age(x)[[1]], pdens = pdens_sum)))
 }
diff --git a/tests/testthat/test-cal.R b/tests/testthat/test-cal.R
@@ -16,3 +16,7 @@ test_that("cal_age_common() returns a yr vector", {
   # TODO: somehow test the expected length?
   expect_vector(cal_age_common(y), y_yr_ptype)
 })
+
+test_that("cal_interpolate() is normalised", {
+  expect_equal(sum(cal_pdens(cal_interpolate(x))[[1]]), 1)
+})