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

Apply Spectrum ART adjustments #462

Merged
merged 21 commits into from
Dec 11, 2024
Merged

Apply Spectrum ART adjustments #462

merged 21 commits into from
Dec 11, 2024

Conversation

rtesra
Copy link
Collaborator

@rtesra rtesra commented Dec 10, 2024

  • Update read_dp_art_dec31() with new .DP file flags to ensure ART adjustment factor and ART patient reallocation counts are applied to number on ART extracted from Spectrum.
  • Ensure adjusted Spectrum number on ART is used in Spectrum-Naomi comparison table.
  • Add ART adjustment factor and ART patient reallocation counts to Spectrum-Naomi comparison table.

@rtesra rtesra requested review from jeffeaton and r-ash December 10, 2024 20:36
Copy link
Collaborator

@jeffeaton jeffeaton left a comment

Choose a reason for hiding this comment

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

Hi — thanks for this.

Overall comment here: it looks like the function is returning additional columns with the scalar and absolute adjustment factors. Is that required to return both of those, or would it be sufficient to simply return two columns with the raw and adjusted ART totals?

It also looks to me like there is a discrepancy where in the art_dec31 column might be returning raw numbers for adults and adjusted numbers for children. I might be parsing it wrong though.

R/inputs-spectrum.R Outdated Show resolved Hide resolved
R/inputs-spectrum.R Outdated Show resolved Hide resolved
R/inputs-spectrum.R Outdated Show resolved Hide resolved
R/input-comparison.R Outdated Show resolved Hide resolved
R/input-comparison.R Outdated Show resolved Hide resolved
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.

Some test failures on this, this test

 ── Error ('test-input-comparison.R:74:3'): Comparisoon wrapper function works with missing programme data

There might some metadata we need to add here too, let's chat this morning.

Comment on lines +33 to +34
# TO DO: Ensure ART adjustments in Spectrum are applied
# Make a test "pjnz" file
Copy link
Contributor

Choose a reason for hiding this comment

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

This test has been written now right? In test--spectrum.R?

@rtesra rtesra force-pushed the Apply-spectrum-ART-adjustments branch from 8664535 to e1de628 Compare December 11, 2024 11:39
@r-ash r-ash self-requested a review December 11, 2024 21:32
@r-ash r-ash merged commit 63d20ad into master Dec 11, 2024
8 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