Skip to content

Commit

Permalink
aspatial_siri functions can now handle one population
Browse files Browse the repository at this point in the history
Previously, the aspatial_siri_functions broke if there was only one active population. Now they run just fine.
  • Loading branch information
japilo committed Apr 9, 2024
1 parent 3e0aa8e commit 12f5624
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 3 deletions.
20 changes: 18 additions & 2 deletions R/aspatial_siri_seasons.R
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,15 @@ siri_model_summer <- function(inputs) {
})

# Set up initial vectors
population_list <- array_branch(segment_abundance[, occupied_indices], 2)
if (active_pops > 1) {
population_list <- array_branch(segment_abundance[, occupied_indices], 2)
}
if (active_pops == 1) {
population_list <- list(segment_abundance[, occupied_indices])
}
if (active_pops == 0) {
return(segment_abundance)
}
carrying_capacity <- carrying_capacity[occupied_indices]

population_new <- pmap(list(initial_pop = population_list,
Expand Down Expand Up @@ -219,7 +227,15 @@ siri_model_winter <- function(inputs) {
})

# Set up initial vectors
population_list <- array_branch(segment_abundance[, occupied_indices], 2)
if (active_pops > 1) {
population_list <- array_branch(segment_abundance[, occupied_indices], 2)
}
if (active_pops == 1) {
population_list <- list(segment_abundance[, occupied_indices])
}
if (active_pops == 0) {
return(segment_abundance)
}
carrying_capacity <- carrying_capacity[occupied_indices]

population_new <- pmap(list(initial_pop = population_list,
Expand Down
2 changes: 1 addition & 1 deletion R/disease_simulator.R
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ disease_simulator <- function(inputs) {
}

## Season functions ##
if (process == "season_functions" && is.list(season_function_list)) {
if (occupied_populations && process == "season_functions" && is.list(season_function_list)) {
transformed <- season_function_list[[season]](r, tm,
carrying_capacity,
segment_abundance,
Expand Down

0 comments on commit 12f5624

Please sign in to comment.