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

Updates to vaccination #59

Merged
merged 29 commits into from
Jan 15, 2025
Merged

Updates to vaccination #59

merged 29 commits into from
Jan 15, 2025

Conversation

ruthmccabe
Copy link
Collaborator

Please can I ask that you both review this just to be safe? I am extra concerned about vaccination due to all of the problems we've had

As discussed in the meeting on 8/1, this PR attempts to correct the following issues:

  • renamed children_ind_raw to is_child
  • adult_ind_raw is now binned and is replaced with (1 - is_child)
  • renamed coverage_achieved_X with coverage_target_X to hopefully make more sense
  • simplified target_met_children_t to be a vector rather than a matrix as only giving 1 dose
  • create indicator give_doseX, X = {1_children,1_adults,2_adults}, based on 1) eligbility 2) prioritisation and 3) if target for the group has been met. This is a vector of 0s and 1s to indicate which groups vaccines can go to
  • eligibility vector is now updated to Y_denom, Y = {children_dose1,adults_dose1,adults_dose2} by multiplying the sum of the relevant compartments within groups by the irelevant indicator give_doseX
  • doses are given by (e.g. for compartment S): (doses * S[i,2]/sum(give_dose_X * Y_denom)) * give_dose_X - to me because the give_dose_X in the denom is within a sum, I don't think it will cancel with the numerator? Happy to discuss but some kind of restriction on the denominator is needed because otherwise the denominator will refer to all individuals in the model, not just those who can get the model, and then only a tiny fraction of the vaccines to be given out will be.

Copy link

codecov bot commented Jan 10, 2025

Codecov Report

Attention: Patch coverage is 99.37500% with 1 line in your changes missing coverage. Please review.

Project coverage is 88.38%. Comparing base (53a7305) to head (2e55d33).
Report is 30 commits behind head on main.

Files with missing lines Patch % Lines
src/model-targeted-vax.cpp 99.37% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main      #59      +/-   ##
==========================================
+ Coverage   88.28%   88.38%   +0.10%     
==========================================
  Files           8        8              
  Lines        1647     1653       +6     
==========================================
+ Hits         1454     1461       +7     
+ Misses        193      192       -1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ruthmccabe
Copy link
Collaborator Author

before you both review I'll merge Lilith's PR in to avoid any more hiccups

NEWS.md Outdated Show resolved Hide resolved
Copy link
Collaborator

@lwhittles lwhittles left a comment

Choose a reason for hiding this comment

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

Nice! Very minor suggestion about using one of the new objects you define rather than repeating the calc, but otherwise looks good to me, and next checking steps are probably best done graphically

inst/odin/model-targeted-vax.R Outdated Show resolved Hide resolved
inst/odin/model-targeted-vax.R Outdated Show resolved Hide resolved
inst/odin/model-targeted-vax.R Outdated Show resolved Hide resolved
Co-authored-by: edknock <47318334+edknock@users.noreply.github.com>
ruthmccabe and others added 5 commits January 15, 2025 10:03
Co-authored-by: Lilith Whittles <lwhittles@users.noreply.github.com>
Co-authored-by: Lilith Whittles <lwhittles@users.noreply.github.com>
Co-authored-by: Lilith Whittles <lwhittles@users.noreply.github.com>
@ruthmccabe ruthmccabe merged commit 130ec9a into main Jan 15, 2025
10 checks passed
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.

3 participants