Rebasing commit. Also adjusting some formatting.

Merge branch 'vivax_competing_hazards_main_hypnozoites' of github.com:mrc-ide/malariasimulation into vivax_competing_hazards_main_hypnozoites # Conflicts: # R/human_infection.R # R/processes.R
mrc-ide · Jul 30, 2024 · 9c143ac · 9c143ac
2 parents ab5e6f0 + 05af388
commit 9c143ac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/R/human_infection.R b/R/human_infection.R
@@ -386,7 +386,7 @@ calculate_lm_det_infections <- function(
     min = parameters$philm_min, max = parameters$philm_max, a50 = parameters$alm50,
     k = parameters$klm, iaa = iaa, iam = iam)
 
-  lm_det_infections <- bitset_at(infections, bernoulli_multi_p(philm))
+  bitset_at(infections, bernoulli_multi_p(philm))
 }
 
 #' @title Calculate clinical infections

diff --git a/R/processes.R b/R/processes.R
@@ -191,7 +191,7 @@ create_processes <- function(
   if(parameters$parasite == "falciparum"){
     imm_var_names <- c(imm_var_names, 'ib', 'iva', 'ivm', 'id')
   } else if (parameters$parasite == "vivax"){
-    imm_var_names <- c(imm_var_names, 'iaa', 'iam','hypnozoites')
+    imm_var_names <- c(imm_var_names, 'iaa', 'iam', 'hypnozoites')
 
     ## hypnozoite infection prevalence rendering
     processes <- c(