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.

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

Update 2024 defaults #24

Merged
merged 5 commits into from
Dec 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: naomi.options
Title: Contains model and calibration options and helper functions for Naomi
Version: 1.1.0
Version: 1.2.0
Authors@R:
person(given = "Robert",
family = "Ashton",
Expand Down
9 changes: 9 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
# naomi.options 1.2.0

* Update defaults for 2024 HIV estimates
- Extends calendar quarter model options drop downs from `December 2025` to `December 2027`
- Updates T2, T3, T4, and T5 defaults all 1-year ahead
- Updates default 'current' ANC input year to 2023
- Updates TZA defaults to 2022 PHIA survey


# naomi.options 1.1.0

* Rename `fallback_values` arg to `override_values` in `get_controls_json` as any `override_values` now take precedence over hardcoded values from the defaults csv.
Expand Down
34 changes: 33 additions & 1 deletion R/controls.R
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ get_model_controls <- function(include_art, include_anc) {
id = "CY2024Q4",
label = paste(t_("MONTH_DECEMBER"), "2024")
),
list(
list(
id = "CY2025Q1",
label = paste(t_("MONTH_MARCH"), "2025")
),
Expand All @@ -271,6 +271,38 @@ get_model_controls <- function(include_art, include_anc) {
list(
id = "CY2025Q4",
label = paste(t_("MONTH_DECEMBER"), "2025")
),
list(
id = "CY2026Q1",
label = paste(t_("MONTH_MARCH"), "2026")
),
list(
id = "CY2026Q2",
label = paste(t_("MONTH_JUNE"), "2026")
),
list(
id = "CY2026Q3",
label = paste(t_("MONTH_SEPTEMBER"), "2026")
),
list(
id = "CY2026Q4",
label = paste(t_("MONTH_DECEMBER"), "2026")
),
list(
id = "CY2027Q1",
label = paste(t_("MONTH_MARCH"), "2027")
),
list(
id = "CY2027Q2",
label = paste(t_("MONTH_JUNE"), "2027")
),
list(
id = "CY2027Q3",
label = paste(t_("MONTH_SEPTEMBER"), "2027")
),
list(
id = "CY2027Q4",
label = paste(t_("MONTH_DECEMBER"), "2027")
)
)

Expand Down
Loading
Loading