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

Births to WLHIV #39

Closed
wants to merge 33 commits into from
Closed

Births to WLHIV #39

wants to merge 33 commits into from

Conversation

mwalte10
Copy link
Collaborator

@mwalte10 mwalte10 commented Oct 2, 2023

Calculates the number of births to WLHIV, needed for MTCT. Please review the 15 year old entrants bit that has changed in the demographic model in particular to make sure that won't cause any issues.

Included births in test child file to make sure it is never negative.

@mwalte10 mwalte10 requested a review from r-ash October 2, 2023 16:00
@codecov
Copy link

codecov bot commented Oct 2, 2023

Codecov Report

Attention: 3 lines in your changes are missing coverage. Please review.

Files Coverage Δ
R/generate_cpp.R 100.00% <100.00%> (ø)
inst/include/frogger.hpp 100.00% <ø> (ø)
inst/include/hiv_demographic_projection.hpp 100.00% <100.00%> (ø)
inst/include/model_input.hpp 100.00% <100.00%> (ø)
inst/include/model_output.hpp 100.00% <100.00%> (ø)
inst/include/r_utils.hpp 100.00% <100.00%> (ø)
inst/include/state_saver.hpp 95.45% <100.00%> (+0.17%) ⬆️
inst/include/types.hpp 100.00% <100.00%> (ø)
inst/include/child_model_simulation.hpp 78.59% <92.85%> (-5.39%) ⬇️

... and 1 file with indirect coverage changes

📢 Thoughts on this report? Let us know!.

Copy link
Contributor

@r-ash r-ash left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks great, couple of small suggestions but they are fairly inconsequential. I'm approving so not blocked on me whilst I am away next week but would be worth a review from science side before merging this.

@@ -28,7 +28,7 @@ paed_cd4_prog,hc1_cd4_prog,real_type,ModelVariant::run_child_model,,FALSE,1,chil
adol_cd4_prog,hc2_cd4_prog,real_type,ModelVariant::run_child_model,,FALSE,1,children.hc2DS,,,
ctx_effect,ctx_effect,real_type,ModelVariant::run_child_model,,FALSE,1,1,,,
ctx_val,ctx_val,real_type,ModelVariant::run_child_model,,FALSE,1,proj_years,,,
paed_art_elig_age,hc_art_elig_age,real_type,ModelVariant::run_child_model,,FALSE,1,proj_years,,,
paed_art_elig_age,hc_art_elig_age,int,ModelVariant::run_child_model,,FALSE,1,proj_years,,,
paed_art_elig_cd4,hc_art_elig_cd4,real_type,ModelVariant::run_child_model,,TRUE,2,options.p_idx_hiv_first_adult,proj_years,,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Chatted about this but I think worth making this a int whilst you're here

inst/include/child_model_simulation.hpp Outdated Show resolved Hide resolved
inst/include/child_model_simulation.hpp Outdated Show resolved Hide resolved
inst/include/child_model_simulation.hpp Outdated Show resolved Hide resolved
inst/include/child_model_simulation.hpp Outdated Show resolved Hide resolved
inst/include/hiv_demographic_projection.hpp Outdated Show resolved Hide resolved
@@ -99,24 +121,40 @@ void run_hiv_and_art_stratified_ageing(int time_step,
}

// TODO: add HIV+ 15 year old entrants see https://github.com/mrc-ide/leapfrog/issues/8
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this TODO be removed now?

}
}
}
}
}
// ADD HIV+ entrants here
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you want to put this as a TODO?

With syntax // TODO: then gives a consistent thing we can search for later to review remaining work

@@ -1,6 +1,7 @@
test_that("child model can be run for all years", {
demp <- readRDS(test_path("testdata/demographic_projection_object_child.rds"))
parameters <- readRDS(test_path("testdata/projection_parameters_child.rds"))
parameters$laf = 1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is this variable? Do you want to set it in the stored parameters rds?

mwalte10 and others added 4 commits October 7, 2023 14:00
Co-authored-by: Rob <39248272+r-ash@users.noreply.github.com>
Co-authored-by: Rob <39248272+r-ash@users.noreply.github.com>
Co-authored-by: Rob <39248272+r-ash@users.noreply.github.com>
Co-authored-by: Rob <39248272+r-ash@users.noreply.github.com>
@mwalte10
Copy link
Collaborator Author

mwalte10 commented Oct 7, 2023

@jeffeaton I've added you to look through the methods per Rob's comment of approval from the technical side. I'm incorporating his suggestions but let me know if you have any others.

@r-ash r-ash closed this Apr 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants