Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

I2382: update future coverage projection constrain #26

Merged
merged 2 commits into from Nov 13, 2018
Merged

I2382: update future coverage projection constrain #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dee10e4
update capping role for coverage projection
xiangli313 Nov 13, 2018
6c2f714
increase version, and add to NEWS
xiangli313 Nov 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion DESCRIPTION
View file
Open in desktop
@@ -1,6 +1,6 @@
Package: jenner
Title: Internal Montagu Helpers
Version: 0.0.21
Version: 0.0.22
Description: Helpers for Montagu.
License: MIT + file LICENSE
Author: Rich FitzJohn
Expand Down
3 changes: 3 additions & 0 deletions NEWS.md
View file
Open in desktop
@@ -1,3 +1,6 @@
### jenner 0.0.22
* VIMC-2382. Updating future projection constrain.

### jenner 0.0.21
* Required by VIMC-2255. Constrain Rubella routine total_fvps to be RCV1+RCV2 for 201710gavi/PHE model only; scenarios in later touchstones should have RCV1 and RCV2 evaluated seperately.

Expand Down
2 changes: 1 addition & 1 deletion R/create_touchstone.R
View file
Open in desktop
Expand Up @@ -242,7 +242,7 @@ project_coverage1 <- function(dat, year_from, year_proj_from, year_to, meta) {
if (meta[[1]]$activity_type == "routine") {
year <- year_proj_from:year_to
tmp <- proj_cov(tmp, year)
rule_3 <- tmp$coverage[tmp$year == year_proj_from - 1]
rule_3 <- max(tmp$coverage[tmp$year < year_proj_from], na.rm = TRUE)
tmp <- cap_cov(tmp, rule, rule_3)
}

Expand Down