Skip to content

Commit

Permalink
Merge pull request #61 from InstituteforDiseaseModeling/charles/new-r…
Browse files Browse the repository at this point in the history
…ates-config

Don't load a population rates sheet during initialization.
  • Loading branch information
MeWu-IDM authored Aug 1, 2022
2 parents d9fedf1 + 83114ee commit ab8ad0d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
3 changes: 1 addition & 2 deletions ehep/R/ehep_population_config.R
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,7 @@ InitializePopulation <- function(){

GPE$initialPopulation <- loadInitialPopulation()

GPE$populationChangeParameters <-
loadPopulationChangeParameters()
GPE$populationChangeParameters <- NULL

return(invisible(NULL))
}
Expand Down
6 changes: 5 additions & 1 deletion ehep/tests/testthat/test-ehep_population_config.R
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,11 @@ test_that("Population configuration: InitializePopulation()", {

testthat::expect_true(e$globalConfigLoaded)
testthat::expect_true(!is.null(e$initialPopulation))
testthat::expect_true(!is.null(e$populationChangeParameters))

# 7/30/2022 Population change parameters are now loaded when an experiment
# suite is started with the SaveBaseSettings() function, based on the
# particular scenario being run.
testthat::expect_true(is.null(e$populationChangeParameters))

testthat::expect_true(.validInitPopulation(e$initialPopulation))
})
Expand Down

0 comments on commit ab8ad0d

Please sign in to comment.