Merged
Conversation
5 tasks
tamuri
requested changes
Jul 22, 2024
…alysis rti_deaths, re-worked test_rti
…tate cancer, fixed test equipment and dxmanager
…e path from simulation.py.
…t.py and breast_cancer.py method updated for resource file path from simulation.py
…t.py and breast_cancer.py method updated for resource file path from simulation.py
…t.py isort the import to fix incorrectly sorted error
…vert to path in simulation
# Conflicts: # src/tlo/methods/alri.py # src/tlo/methods/depression.py # src/tlo/methods/diarrhoea.py # src/tlo/methods/epilepsy.py # src/tlo/methods/rti.py
…ontraception'].resourcefilepath)
…ontraception'].resourcefilepath)
…rent activ resource file in the HIV resource folder
mnjowe
reviewed
Jan 15, 2025
…s(self, resourcefilepath: Optional[Path] = None):
parameter_dataframe = read_csv_files(resourcefilepath /
…sourcefilepath is None:
resourcefilepath = get_root_path() / 'resources' from utils.py.
…sourcefilepath is None:
resourcefilepath = get_root_path() / 'resources' from utils.py.
…sourcefilepath is None:
resourcefilepath = get_root_path() / 'resources' from utils.py.
…cefilepath is None:
resourcefilepath = get_root_path() / 'resources' from utils.py.
…cefilepath is None:
resourcefilepath = get_root_path() / 'resources' from utils.py.
…to jkumwenda/resource_file_path # Conflicts: # src/tlo/methods/scenario_switcher.py
# Conflicts: # src/tlo/analysis/utils.py # src/tlo/methods/bladder_cancer.py # src/tlo/methods/breast_cancer.py # src/tlo/methods/enhanced_lifestyle.py # src/tlo/methods/oesophagealcancer.py # src/tlo/methods/other_adult_cancers.py # src/tlo/methods/prostate_cancer.py # src/tlo/methods/stunting.py
Collaborator
Author
|
@tbhallett please review and merge in master if all is good. I have addressed all comments from @mnjowe |
tbhallett
reviewed
Jan 21, 2025
| log_config: Optional[dict] = None, | ||
| show_progress_bar: bool = False, | ||
| resourcefilepath: Optional[Path] = None, | ||
| resourcefilepath: Optional[str | Path] = None, |
Collaborator
There was a problem hiding this comment.
agreed about query of whether we think string is ok here -- and I wasn't sure if the whole argument should be Optional.
I see below that a string would be OK as line 112 wraps this in Path().
I also see that the comment on line 93 explains that not giving a parameter is ok.
I don't know why that would be mean, but there might be a reason.
Suggested change
| resourcefilepath: Optional[str | Path] = None, | |
| resourcefilepath: Path, |
Collaborator
|
Great work, @jkumwenda --- so glad this is working now. My comments will mostly be for @tamuri, I think. I am not sure myself what the right thing to do would be, so have commented where I would instinctively have done something different. |
tamuri
approved these changes
Jun 4, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Created resource file path function and calling it from different modules.