From fb24281c5b7a1ab966e05e2b96e15929d9806598 Mon Sep 17 00:00:00 2001 From: rjs11 Date: Tue, 10 Dec 2024 16:54:19 +0000 Subject: [PATCH 1/4] PMC age subsetting has a mistake in it. timesteps and time_index in should only be used in choosing the correct coverage, not to calculate the implementation ages. The code should follow that seen in the epi_pev age subsetting. --- R/pmc.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/pmc.R b/R/pmc.R index 6397c681..96682092 100644 --- a/R/pmc.R +++ b/R/pmc.R @@ -41,7 +41,7 @@ create_pmc_process <- function( return() } in_age <- variables$birth$get_index_of( - timesteps[time_index] - parameters$pmc_ages + timestep - parameters$pmc_ages )$to_vector() target <- in_age[sample_intervention(in_age, 'pmc', coverage, correlations)] From 8369c98627f1981bdd5c403fb129831d0ddfa599 Mon Sep 17 00:00:00 2001 From: rjs11 Date: Fri, 13 Dec 2024 13:53:48 +0000 Subject: [PATCH 2/4] Bump version for hotfix/pmc --- DESCRIPTION | 2 +- NEWS.md | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index b7aaa69a..f5b3a00f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: malariasimulation Title: An individual based model for malaria -Version: 2.0.0 +Version: 2.1.0 Authors@R: c( person( given = "Giovanni", diff --git a/NEWS.md b/NEWS.md index 5d267c03..29b3b768 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +# malariasimulation 2.1.0 + +* Fix PMC bug where timesteps to generate targetted individuals were not increasing + # malariasimulation 2.0.0 Release v2.0.0. This will mark our shift to [semver 2.0.0](https://semver.org/spec/v2.0.0.html) for versioning, i.e: From a538c1f17e888eec1c1fbfeab82061780ca12844 Mon Sep 17 00:00:00 2001 From: Giovanni Date: Fri, 20 Dec 2024 11:17:27 +0000 Subject: [PATCH 3/4] Bump version in DESCRIPTION --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index f5b3a00f..9bd8618c 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: malariasimulation Title: An individual based model for malaria -Version: 2.1.0 +Version: 2.0.1 Authors@R: c( person( given = "Giovanni", From 64e4e089c8662fcb561696516750d01e0f26da3f Mon Sep 17 00:00:00 2001 From: Giovanni Date: Fri, 20 Dec 2024 11:17:43 +0000 Subject: [PATCH 4/4] Bump version in NEWS.md --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 29b3b768..f71cdd04 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# malariasimulation 2.1.0 +# malariasimulation 2.0.1 * Fix PMC bug where timesteps to generate targetted individuals were not increasing