-
Notifications
You must be signed in to change notification settings - Fork 7
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
PR to record the prevalence of disease/condition, still births, neonatal death, maternal mortality #1455
Open
RachelMurray-Watson
wants to merge
688
commits into
master
Choose a base branch
from
rmw/log_prevalence_all_disease
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
PR to record the prevalence of disease/condition, still births, neonatal death, maternal mortality #1455
Changes from 142 commits
Commits
Show all changes
688 commits
Select commit
Hold shift + click to select a range
e7bae22
added function to calculate monthly prevalence of diarrhoea across al…
RachelMurray-Watson 12fa604
added function to calculate monthly prevalence of different ncds. Cal…
RachelMurray-Watson 08f2523
added function to calculate monthly prevalence of different ncds. Cal…
RachelMurray-Watson 02fe58e
Fixed to allow for dataframes to pass through
RachelMurray-Watson 808c4d7
Fixed from None to False
RachelMurray-Watson 96d5096
Fixed from 0 to '0'
RachelMurray-Watson 454d0d3
Fixed calculation of depression in last month
RachelMurray-Watson 08e41a4
Removed checks
RachelMurray-Watson 927a649
Added debugging
RachelMurray-Watson 00d7b4a
Removed print checks
RachelMurray-Watson 2b5c2a3
NOT WORKING but tried to simplify the collection process as was being…
RachelMurray-Watson 03453e1
Now logging properly
RachelMurray-Watson 84aa7e8
Included code for if HIV module isn't loaded
RachelMurray-Watson 1cc0bee
Added/removed check
RachelMurray-Watson cae5d81
Added function to record number of antenatal stillbirthds
RachelMurray-Watson 20541a2
renamed newborn to neonatal
RachelMurray-Watson 694b132
Accessed all possible data from logs, but it's not matching
RachelMurray-Watson 508eadf
not needed
RachelMurray-Watson afd8d22
removed prints
RachelMurray-Watson f934258
changed date to see if things match up more
RachelMurray-Watson 23a4ff0
removed "isn't false"
RachelMurray-Watson d5cd963
removed "is true"
RachelMurray-Watson 7a5da3e
replaced == false with not
RachelMurray-Watson 531bd4d
Now matching up more. Have to use the second key from the function I …
RachelMurray-Watson 8859633
Edited so no dividing by zero
RachelMurray-Watson 0ba13e7
changed to does not equal to avoid assertion error
RachelMurray-Watson 394ff19
removed unused imports
RachelMurray-Watson be2ca7b
removed == False
RachelMurray-Watson 0f34786
Intrapartum stillbirth not working
RachelMurray-Watson dfa727b
added export
RachelMurray-Watson f146dd2
added export
RachelMurray-Watson d909b7a
Better readability
RachelMurray-Watson c3034b1
removed pandas
RachelMurray-Watson a68acca
isort
RachelMurray-Watson 2196466
changed definition of COPDS
RachelMurray-Watson 3e82dda
changed definition of COPDS
RachelMurray-Watson 5a29382
removed calculations of maternal and newborn mortality pending help
RachelMurray-Watson 9977883
changed years to see if things log differentlu
RachelMurray-Watson 7e5965b
stopped logging stillbirths until fixed
RachelMurray-Watson 2d434fd
CHecked what was registered
RachelMurray-Watson f390935
Skip Mockitis
RachelMurray-Watson 65d0324
Skip Mockitis, ChronicSyndrome, DiseaseThatCausedA
RachelMurray-Watson 5ab81db
Removed unused
RachelMurray-Watson ab7573b
Added check of "must have died in the last month"
RachelMurray-Watson 9be65fe
Added check of "must have died in the last month"
RachelMurray-Watson 3c48b0c
Removed denominators
RachelMurray-Watson 1970f0d
Removed brackets and unneeded bracket
RachelMurray-Watson 31be8d0
Changed back to a rate
RachelMurray-Watson 08b4fe0
Added in dataframes to track stillbirths
RachelMurray-Watson a68ac79
Renamed columns
RachelMurray-Watson bf667f5
skip some columns
RachelMurray-Watson c76d021
skip some columns
RachelMurray-Watson a2e5dcb
Aded skip over dates that go beyond when the prevalence is logged by …
RachelMurray-Watson cc5bc76
Fixed up tests for all diseases WITH log stored
RachelMurray-Watson 87a2688
Include keeping track of population to go from prevalence to cases
RachelMurray-Watson c2fb256
Returned to running simulation
RachelMurray-Watson 93f6c05
removed unnecessary prints
RachelMurray-Watson 8987bf1
added record of live birthds
RachelMurray-Watson 3efbe21
added record of live birthds
RachelMurray-Watson f407f23
added record of live births
RachelMurray-Watson 2de2e8e
redid name of column
RachelMurray-Watson 184df81
Added in test of neonatal deaths, maternal deaths, stillbirths
RachelMurray-Watson caf9934
remove unused variable
RachelMurray-Watson dbaf020
isort
RachelMurray-Watson 68c81a7
isort
RachelMurray-Watson fd939f7
TB recording isn't working...
RachelMurray-Watson ddca18c
changed to allow for simplified births logging
RachelMurray-Watson 5ff10eb
removed loading
RachelMurray-Watson f1d4abd
removed unused imports
RachelMurray-Watson c1a2da7
isort
RachelMurray-Watson 8f0bb0b
removed incorrect assignation
RachelMurray-Watson 42ab8f8
Changed calculation of prevalence on simple whether or not person was…
RachelMurray-Watson d4f04e8
Changed calculation of prevalence to be the number of people who are …
RachelMurray-Watson 037eb0d
Get_Current_Prevalence have test variable that is true/false and chan…
RachelMurray-Watson 41a63d6
Made test a parameter that is default set to False and can be modifie…
RachelMurray-Watson 3d7e20a
Ensured indenting was correct. Removed tolerance buffer for days and …
RachelMurray-Watson 74b1ce3
Attempted to make the prevalence logging daily, for the purpose of th…
RachelMurray-Watson ad715fe
Tidied and used function to calculate prevalences.
RachelMurray-Watson 7a06731
Tried to make the log daily by introducing more conditions.
RachelMurray-Watson 58dbf48
Monthly call from functions
RachelMurray-Watson 9d98c28
removed unused variable for checks
RachelMurray-Watson 4a415af
removed unused variable for checks
RachelMurray-Watson 4c939ff
removed unused variable for checks
RachelMurray-Watson f010139
isort
RachelMurray-Watson 13095fc
new write to log function just for prevalence calculations
RachelMurray-Watson 5e3b922
new write to log function just for prevalence calculations. Now logs …
RachelMurray-Watson 4f4fa7d
new write to log function just for prevalence calculations. Now logs …
RachelMurray-Watson 6800c4a
Shorter run as test
RachelMurray-Watson 7e5c508
Allow mockitis to be read in the GetPrevalence Class.
RachelMurray-Watson d26f9c0
Set p(infection) of Mockitis to 1 and checked logging
RachelMurray-Watson 04a650c
In demography, fixed labels for direct/indirect/hiv/non hiv deaths
RachelMurray-Watson 21a7db6
Changed malaria prevalence calculator to clinical and severe malaria …
RachelMurray-Watson 933c55d
Changed schisto prevalence calculation to check for Low-infection or …
RachelMurray-Watson 803f828
Changed TB prevalence logging to only include active cases. "I think …
RachelMurray-Watson f18c119
Now using (df['rt_inj_severity'] != 'none') again to record RTI injuries
RachelMurray-Watson a7a19a5
Updated description of logger to show what is being saved where
RachelMurray-Watson 10acb45
Added report_prevalence to the skeleton module so that it's formally …
RachelMurray-Watson 018492f
Added option between daily, monthly, and yearly logging
RachelMurray-Watson 600c582
Tidied test to have mockitis test (to check logging structures etc) a…
RachelMurray-Watson 22c7cfc
update for actual runs
RachelMurray-Watson 75fa450
isort
RachelMurray-Watson 34aa5f9
Added stacked plots over time
RachelMurray-Watson da77fd9
Updated to create files for longterm_trends_all_diseases-2024-09-04T0…
RachelMurray-Watson f55053c
Changed dates for longterm_trends_all_diseases-2024-09-04T082106Z
RachelMurray-Watson 6b01d10
Added spacing of years so can toggle finer resolution
RachelMurray-Watson ee3ae2f
Improved docstring
RachelMurray-Watson 88078ef
New file calculating the prevalence of different conditions
RachelMurray-Watson 204c4b8
isort
RachelMurray-Watson 517d4f2
Condensed graph so Panel A is stacked bar charts of raw prevalence ov…
RachelMurray-Watson c0f2b25
Changed colours
RachelMurray-Watson d595693
Changed labels on plots
RachelMurray-Watson ddd6b1b
Included placeholder code for reordering; not yet working
RachelMurray-Watson 5e9ee88
Included placeholder code for reordering; not yet working
RachelMurray-Watson e4516a2
Added in WPP life expectancy to graph
RachelMurray-Watson 41b4f15
Changed colours
RachelMurray-Watson bf20864
Removed print statements
RachelMurray-Watson cf67140
Added a gif of the population pyramids
RachelMurray-Watson 1ffa79e
Tidied graphs
RachelMurray-Watson ea9ece5
Tidied graphs
RachelMurray-Watson 5dba495
Changed to a bar chart and ensured that colours matched
RachelMurray-Watson 5c0d05d
Removed print check
RachelMurray-Watson 99096fd
Removed colour generation
RachelMurray-Watson 73ef618
Removed axis
RachelMurray-Watson c4d29d9
Now print all files
RachelMurray-Watson ed92007
Added gif for line graph
RachelMurray-Watson c9197f5
Added checks for dummy runs in life expectancy calculations. Checks f…
RachelMurray-Watson 0538eb8
Changed timing
RachelMurray-Watson db92d01
Have total minutes per treatment_id
RachelMurray-Watson f0201cd
Have graphs of minutes per treatment id
RachelMurray-Watson 21b1de7
Have graphs of minutes per treatment id
RachelMurray-Watson 22b726e
Tidied up graphs
RachelMurray-Watson 4b6837b
Changed to test new logs
RachelMurray-Watson 7a40f7e
test
RachelMurray-Watson 650c975
test
RachelMurray-Watson 2a39627
return to actual params
RachelMurray-Watson 2701a52
return to actual params
RachelMurray-Watson 27ff926
trying
RachelMurray-Watson 80d0693
Loaded dataframes to access
RachelMurray-Watson 4a0f0a6
Added loops over each event and cadre. Adding time to the cadre and t…
RachelMurray-Watson be471d1
Changed it back to be the first part of treatment id (as those are th…
RachelMurray-Watson bf2e3ac
Changed it back to be the first part of treatment id (as those are th…
RachelMurray-Watson b02fd60
Fixed legends and titles
RachelMurray-Watson 56484a4
Changed ASFR axis
RachelMurray-Watson ca21d86
Changed dates
RachelMurray-Watson 85c8d76
Left-censured the x axis for the deaths and life expectancy graph
RachelMurray-Watson 3965622
New dates
RachelMurray-Watson 211025f
Edited for neatness
RachelMurray-Watson cc2681e
Modified for latest run input_file = '/Users/rem76/PycharmProjects/TL…
RachelMurray-Watson 685c777
Changed so graphs are from 2020 on
RachelMurray-Watson a3c3350
Remove the demography summary logger
RachelMurray-Watson 849ed03
edited for latest run
RachelMurray-Watson 5aba8a4
edited for latest run
RachelMurray-Watson 7eac186
Merge remote-tracking branch 'origin/rmw/long_term_projections' into …
RachelMurray-Watson 0901eb3
Removed print statements
RachelMurray-Watson 3564f22
Merge branch 'refs/heads/rmw/log_prevalence_all_disease' into rmw/lon…
RachelMurray-Watson 9afedd5
Accidentally deleted scenario directory
RachelMurray-Watson b02b395
changed date raneg
RachelMurray-Watson a9b490f
changed date raneg
RachelMurray-Watson 43c9180
resized figures
RachelMurray-Watson 0023c25
Changed prevalence calculation for RTI to ensure accident happened in…
RachelMurray-Watson 9aa4520
Changed prevalence calculation for RTI to ensure accident happened in…
RachelMurray-Watson ff99474
Aesthetic edits
RachelMurray-Watson 93189f3
Updated modules so that all INIT_DEPENDENCIES and OPTIONAL_INIT_DEPEN…
RachelMurray-Watson d98089d
Updated modules so that all INIT_DEPENDENCIES and OPTIONAL_INIT_DEPEN…
RachelMurray-Watson 1030b35
Updated modules so that all INIT_DEPENDENCIES and OPTIONAL_INIT_DEPEN…
RachelMurray-Watson fcf1581
Updated modules so that all INIT_DEPENDENCIES and OPTIONAL_INIT_DEPEN…
RachelMurray-Watson 10f438d
Updated modules so that all INIT_DEPENDENCIES and OPTIONAL_INIT_DEPEN…
RachelMurray-Watson 5ab1312
Updated modules so that all INIT_DEPENDENCIES and OPTIONAL_INIT_DEPEN…
RachelMurray-Watson a2aef46
Updated modules so that all INIT_DEPENDENCIES and OPTIONAL_INIT_DEPEN…
RachelMurray-Watson 0aabec2
Merge branch 'refs/heads/rmw/update_dependencies' into rmw/long_term_…
RachelMurray-Watson f66b281
Updated modules so that all INIT_DEPENDENCIES and OPTIONAL_INIT_DEPEN…
RachelMurray-Watson d588117
Moved all new dependencies to OPTIONAL_INIT_DEPENDENCIES
RachelMurray-Watson 7305cc5
Merge branch 'refs/heads/rmw/update_dependencies' into rmw/long_term_…
RachelMurray-Watson 0fc8682
Type
RachelMurray-Watson d4d186f
Merge branch 'refs/heads/rmw/update_dependencies' into rmw/long_term_…
RachelMurray-Watson 3938a9f
Typo
RachelMurray-Watson a42bd61
Merge branch 'refs/heads/rmw/update_dependencies' into rmw/long_term_…
RachelMurray-Watson 028c830
Removed unnecessary subgraphs
RachelMurray-Watson 1e0b36f
Updated circular dependencies
RachelMurray-Watson 82b63c0
Updated circular dependencies
RachelMurray-Watson 282f05a
Merge branch 'refs/heads/rmw/update_dependencies' into rmw/long_term_…
RachelMurray-Watson 4847476
Tried to add subgraph
RachelMurray-Watson b161b6c
Pregnancy modules are now diamonds
RachelMurray-Watson 22cfd7d
Changed to additional dependencies
RachelMurray-Watson 2a7d8c8
Added subgraphs
RachelMurray-Watson 4cbc4be
graph of the property dependencies between modules
RachelMurray-Watson 2da1b06
Have graph of properties as they relate to modules
RachelMurray-Watson 5bceeee
Removed bad graph
RachelMurray-Watson 6f86741
Added subgraphs
RachelMurray-Watson 9adb1a4
Graph of properties from disease modules that contribute to other dis…
RachelMurray-Watson 308b522
Delete src/scripts/longterm_projections/property_dependency_graph.py
RachelMurray-Watson ab3b3b6
isort
RachelMurray-Watson dc92321
Merge remote-tracking branch 'origin/rmw/update_dependencies' into rm…
RachelMurray-Watson 0911247
isort
RachelMurray-Watson 23cd2d1
Merge branch 'master' into rmw/update_dependencies
RachelMurray-Watson dc67a0e
Changed names of functions to avoid overlap
RachelMurray-Watson 27bd108
Merge remote-tracking branch 'origin/rmw/update_dependencies' into rm…
RachelMurray-Watson 4f8cb2d
Updated docstring
RachelMurray-Watson 7f4d38f
Initial attempt at creating module-level property graphs
RachelMurray-Watson fc49e88
Fixed typo
RachelMurray-Watson 31a61a0
Graphs for each individual module
RachelMurray-Watson 3b94583
Aesthetics - still needs colour
RachelMurray-Watson b17e193
reduced duplication
RachelMurray-Watson 987152f
Removed all additional dependencies
RachelMurray-Watson 8c4f656
Merge branch 'refs/heads/master' into rmw/graph_dependencies
RachelMurray-Watson f7bb53d
typo
RachelMurray-Watson 5363892
Moved to get_properties folder
RachelMurray-Watson 79697c2
Tidied
RachelMurray-Watson bf1de4f
Increased max date
RachelMurray-Watson 422607f
Tidied and changed to 2059
RachelMurray-Watson 1e9f383
Increased max year for pop line
RachelMurray-Watson afe0618
Increased axis for deaths over time
RachelMurray-Watson a4e5666
Improved plotting
RachelMurray-Watson 723fff4
changed normalization to 2020
RachelMurray-Watson 30cbeaf
changed normalization to 2020 and improved plotting
RachelMurray-Watson f64d484
aesthetics
RachelMurray-Watson a383132
plotting
RachelMurray-Watson a50acf9
Merge branch 'refs/heads/rmw/graph_dependencies' into rmw/long_term_p…
RachelMurray-Watson a84b2b4
Typo - left out fraction_of_last_age_survived in calculating probabi…
RachelMurray-Watson 2807b23
add lifestyle logging
RachelMurray-Watson 194131b
shorter run + demography.detail to see if there is an issue in assump…
RachelMurray-Watson 00e9fe8
Merge branch 'refs/heads/master' into rmw/long_term_projections
RachelMurray-Watson a496369
updated so that it looks at the entire code of whatever disease of in…
RachelMurray-Watson a17c1a2
actual logging for demography detail
RachelMurray-Watson f38debb
changed to latest short run
RachelMurray-Watson a19f8c8
Investigation into differences in LE for 2010 - 2020. Could be becaus…
RachelMurray-Watson 03d18e6
removed unneccessary LE graph
RachelMurray-Watson 9d086d3
More plots to investiagte proprtion of life groups lived
RachelMurray-Watson bfbadc4
Sample LE estimates with one year age groups and 0.5 year at beginnin…
RachelMurray-Watson c0fc49c
Can't get half-year age groups to work
RachelMurray-Watson 4fedd88
Updated date
RachelMurray-Watson 2314e40
Scripts to try and investigate why RTI DALYs etc goes up, but there i…
RachelMurray-Watson b2c3de4
revert to original
RachelMurray-Watson 17c2296
New notebook for investigating the differences in LE between our meth…
RachelMurray-Watson 0e23fc5
New notebook for investigating the differences in LE between our meth…
RachelMurray-Watson 00809db
New notebook for investigating the differences in LE between our meth…
RachelMurray-Watson c100567
Merge branch 'refs/heads/master' into rmw/long_term_projections
RachelMurray-Watson 85d8c7f
To investigate RTI
RachelMurray-Watson 71d365b
Formattin
RachelMurray-Watson 60ccfb1
Add in scenarios for baseline (business as usual), renamed perfect wo…
RachelMurray-Watson 28f0503
Added in two lifestyle scenarios: cancer and CMD. Hard to paramaterise
RachelMurray-Watson cf3f81c
Fixed number_of_draws
RachelMurray-Watson 3bec301
50% increase/decrease in probabilities instead of doubling?
RachelMurray-Watson 1fb6089
Set up to run
RachelMurray-Watson 29051d3
Added MDA_event to try and ensure that MDA events are scheduled
RachelMurray-Watson 48b06e7
Added MDA_event to try and ensure that MDA events are scheduled
RachelMurray-Watson a0223c9
Merge branch 'refs/heads/master' into rmw/long_term_projections
RachelMurray-Watson be55fd1
Merge branch 'refs/heads/master' into rmw/log_prevalence_all_disease
RachelMurray-Watson fe1448e
Merge remote-tracking branch 'origin/rmw/log_prevalence_all_disease' …
RachelMurray-Watson d12bfe8
Somehow prevalence logging for HIV was removed
RachelMurray-Watson File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
Oops, something went wrong.
Oops, something went wrong.
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.
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.
These are non-HIV deaths?
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.
Sorry! Yes well spotted, have changed that now