Adjusted spacing formatting in recovery rates function and make ifels…

…e statement explicit for vivax in rendering.
mrc-ide · Jul 30, 2024 · 3d6909c · 3d6909c
1 parent cbce0b3
commit 3d6909c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/R/disease_progression.R b/R/disease_progression.R
@@ -14,11 +14,17 @@ create_recovery_rates_process <- function(
     recovery_rates <- variables$recovery_rates$get_values()
     if (parameters$parasite == "vivax"){
       # p.v subpatent recovery is immunity-dependent
-      recovery_rates[variables$state$get_index_of("U")$to_vector()] <-
-        1/anti_parasite_immunity(
-          parameters$dpcr_min, parameters$dpcr_max, parameters$apcr50, parameters$kpcr,
-          variables$iaa$get_values(index = variables$state$get_index_of("U")),
-          variables$iam$get_values(index = variables$state$get_index_of("U"))
+
+      U_index <- variables$state$get_index_of("U")
+
+      recovery_rates[U_index$to_vector()] <-
+        1 / anti_parasite_immunity(
+          min = parameters$dpcr_min,
+          max = parameters$dpcr_max,
+          a50 = parameters$apcr50,
+          k = parameters$kpcr,
+          iaa = variables$iaa$get_values(index = U_index),
+          iam =variables$iam$get_values(index = U_index)
         )
     }
     recovery_outcome$set_rates(recovery_rates)

diff --git a/R/render.R b/R/render.R
@@ -35,7 +35,7 @@ create_prevelance_renderer <- function(
         parameters
       )
       asymptomatic_detected <- bitset_at(asymptomatic, bernoulli_multi_p(prob))
-    } else {
+    } else if (parameters$parasite == "vivax") {
       asymptomatic_detected <- asymptomatic
     }