-
Notifications
You must be signed in to change notification settings - Fork 4
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
Wasting Module #543
base: master
Are you sure you want to change the base?
Wasting Module #543
Conversation
…running without errors. added wasting analysis file to get more understanding of the current outputs before applying some major changes. added wasting resource file
# Conflicts: # src/tlo/methods/hsi_generic_first_appts.py
called the function nutritional_oedema_present within the WastingNaturalRecoveryEvent to reset the values for the oedema status based on WHZ>=-2
Removed progression to severe following treatment failure for MAM, at initialise population. These individuals will be called at the next polling event (in 3 months) to determine their outcome - recovery, remain, or death.
…rameter values in wasting resource file
…lett/wasting_module # Conflicts: # src/tlo/methods/wasting.py
# Conflicts: # resources/healthsystem/priority_policies/ResourceFile_PriorityRanking_ALLPOLICIES.xlsx
…lett/wasting_module # Conflicts: # resources/ResourceFile_Wasting.xlsx # src/scripts/wasting_analyses/analysis_wasting.py # src/tlo/methods/hsi_generic_first_appts.py # src/tlo/methods/wasting.py # tests/test_wasting.py
…lett/wasting_module
Hi @thewati, I can see you did some priority changes (commit cea20e0), here is a print screen of some changes made beside adding the undernutrition among the treatments in RF_PriorityRanking_ALLPOLICIES.xlsx, RMNCH sheet within this PR. (Because it is the xlsx file, I can't see which changes you made in the commit.) Are these changes suggested by you? Are we still going to make these changes? I'm not sure who and why suggested that. Red is current version in master, green is what it is suggested to be changed to in this PR. |
@thewati, here is the version from the old master, which is the starting point of this branch: And here is the version from this branch: You can review all suggested changes by comparing these versions. |
# Conflicts: # resources/healthsystem/priority_policies/ResourceFile_PriorityRanking_ALLPOLICIES.xlsx # src/tlo/methods/hsi_generic_first_appts.py
# Conflicts: # resources/healthsystem/priority_policies/ResourceFile_PriorityRanking_ALLPOLICIES.xlsx
Hi @matt-graham, the Documentation check fails: I tried to define it the same way as it is in stunting, but it doesn't seem to be working. Shouldn't the |
…dule # Conflicts: # resources/ResourceFile_Wasting.csv # src/tlo/methods/wasting.py
Hi @EvaJanouskova , I had a look at both files and I remember that commit. In that commit, I believe we added 3 treatment IDs called |
Ah that's because you need to import |
@matt-graham, The following is in the code:
Do you mean smt else? |
…separates individual columns); wast: minor updates in comments
Sorry I missed that you already had the import in the code. It looks like the issue is actually that you are missing a from __future__ import annotations (see here for explanation of why required). |
Yes, this seems as what could cause the errors! Thank you @matt-graham!! Great explanation. It's a cool trick you use there. |
I agree to your point @thewati. In this PR we were aiming at adding treatment IDs from wasting module only. @EvaJanouskova if there are merge conflicts that require manual way of merging commits I can help. I guess we just need to copy original file from master and manually add the three treatment IDs @thewati has mentioned above. Thanks |
@marghe-molaro, Could you please confirm the updates in Priorities? There are 3 new lines added in all sheets:
The values are always same for all 3 lines.
The only exception is the
Are these fine with you? |
Hi @EvaJanouskova, For the LCOA_EHP and EHP_III you would need to double check with @sakshimohan. The Naive values look correct, but not the ones for the other sheets. For "Default" and "Test" and "Test Mode 1" you can go for (0, -1, -1, -1, -1). |
Thanks @marghe-molaro. @sakshimohan and @tbhallett, could you please confirm the above? Thank you! |
…_ in RMNCH, ClinicallyVulnerable, VerticalProgrammes, and CVD as suggested by Margherita
src/tlo/methods/wasting.py
Outdated
logger.debug(key='debug', data="consumables not available, so can't use it.") | ||
|
||
def did_not_run(self): | ||
logger.debug("HSI_Undernutrition_Feeding_Outpatient: did not run") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Determinism test is failing because this uses the old (and now removed) way of logging. log needs arguments key
and data
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's just delete this obsolete line then!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@tamuri, Why the test_determinism
is not failing on my computer?
Hi @EvaJanouskova . Is there a more detailed description of the three interventions which I could refer to, to assign them the right priority? |
@sakshimohan, See the description in the write-up, page 8. |
@tbhallett, We may need to include some equipment for the wasting module. Would it be fine to address this later, or do you need it for another project asap, in which case I should incorporate any equipment that comes to mind at this moment within this PR? |
Thanks Eva. It seems a good idea to me to add in the declarations now, if they are coming to mind. You can always add more later if it turns out you missed some. We are going to run the full model for the costing calculations with this module included soon, so I would say please include things if you can. |
Thanks @EvaJanouskova. For EHP, you can go for (2, -1, -1, -1, -1) for all three treatment_ID s.
|
… get MUAC distribution for each WHZ category
… in EHP_III, and LCOA_EHP as suggested by Sakshi
Fixes #542