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.

Sign up for GitHub

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

BedDays rework and slight performance gains #1392

Draft
wants to merge 53 commits into
base: master
Choose a base branch
from
Draft

BedDays rework and slight performance gains #1392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
893e720
More experiments
willGraham01 May 7, 2024
0e84e0e
Basic skeleton is assembled, start touching other modules and filling…
willGraham01 May 8, 2024
759e86c
Make minimal changes for basic run (as per test suite for beddays mod…
willGraham01 May 10, 2024
2e6b202
Make a nice BedDaysFootprint class
willGraham01 May 10, 2024
00e0d6f
More updates
willGraham01 May 13, 2024
033a8d2
Replace old functionality with new, delete placeholder files. Retain …
willGraham01 May 14, 2024
e151262
All class features except logging are ready
willGraham01 May 14, 2024
3579137
Begin on updating test framework
willGraham01 May 16, 2024
41f5e77
Fix find_occupancies and add test for it
willGraham01 May 16, 2024
a39014a
Start updating the tests
willGraham01 May 20, 2024
673b64d
Beddays logging is consistent with the past
willGraham01 May 24, 2024
320aceb
Fix bug where Demography doesn't instantiate the pop to model ratio b…
willGraham01 May 24, 2024
47abbb0
Docstrings tidy up
willGraham01 May 24, 2024
0192a7b
Fix sum across rows not cols for bed type capacities, prevent call to…
willGraham01 May 24, 2024
f48b176
ADDS debugger, revert this commit when debugging complete
willGraham01 May 24, 2024
0f12778
Restore _run_after_post_hook
willGraham01 May 24, 2024
71fde93
Reconcile the scheduling at least
willGraham01 May 24, 2024
ca38a96
Merge branch 'master' into wgraham/beddays-rework
willGraham01 Jun 3, 2024
ef26fe9
Fix faulty logic for setting occupancy end dates
willGraham01 Jun 3, 2024
f3720c7
Delete the old bed_days files
willGraham01 Jun 3, 2024
0942699
Pull tests from independent testing branch
willGraham01 Jun 5, 2024
f98ffca
Reinstate the debugger
willGraham01 Jun 5, 2024
98cfcc8
MOAR debugging
willGraham01 Jun 5, 2024
085aad0
Debug statements
willGraham01 Jun 5, 2024
f54496e
Retain the hs_is_inpatient dataframe column for the time being, as it…
willGraham01 Jun 6, 2024
735b7cb
Refactor slow method into function, write TODO for speedup
willGraham01 Jun 6, 2024
7eb6d64
Merge branch 'master' into wgraham/beddays-rework
willGraham01 Jun 6, 2024
73c6c1a
Revert erroneous change to kwargs in set capabilities monitor
willGraham01 Jun 6, 2024
2ed3e68
Remove test case that no longer correpsonds to an error
willGraham01 Jun 6, 2024
7a8541e
Identify #1399, write compatibility function for now
willGraham01 Jun 6, 2024
6ac1eff
Remove temporary debugger class
willGraham01 Jun 7, 2024
9cc3bb7
Revert "Remove temporary debugger class"
willGraham01 Jun 7, 2024
cbfc62f
More logging changes
willGraham01 Jun 7, 2024
edcced1
Reconcile setting of inpatients column, attempt 1
willGraham01 Jun 7, 2024
e9cde3d
Pass now-optional flag to test
willGraham01 Jun 7, 2024
9e4b62f
Allow for new-inpatient updates during the day, if necessary, as per …
willGraham01 Jun 10, 2024
b002570
Update with main branch
willGraham01 Jun 10, 2024
b692788
Fix combine footprint method to take max, not sum bed days remaining
willGraham01 Jun 11, 2024
da2f758
Merge in changes from beddays-rework
willGraham01 Jun 11, 2024
9a6b834
Update docstrings
willGraham01 Jun 11, 2024
115b5e5
Remove old test for non-bed-space field
willGraham01 Jun 12, 2024
afeaad6
Merge branch 'wgraham/beddays-rework' into wgraham/debug-beddays-rework
willGraham01 Jun 12, 2024
123843c
Conflict resolver 2
willGraham01 Jun 12, 2024
62b73a7
Remove the debugger class again
willGraham01 Jun 12, 2024
30275aa
Fix ALRI tests by checking for instance of list when finding occupanc…
willGraham01 Jun 12, 2024
302924b
Check for NoneType before casting
willGraham01 Jun 12, 2024
801da8b
Patch negative day assignment
willGraham01 Jun 13, 2024
1af4570
Purge vscode folder
willGraham01 Jul 29, 2024
6b5e8f0
Merge branch 'master' into wgraham/beddays-rework
willGraham01 Jul 29, 2024
c1a0687
In line with https://github.com/UCL/TLOmodel/issues/1399, remove faul…
willGraham01 Jul 29, 2024
1124589
Patch demography change that now uses updated API
willGraham01 Jul 29, 2024
831a2dd
Revert mass linting changes to healthsystem.py
willGraham01 Jul 29, 2024
f0f2888
Write tests for remaining attributes
willGraham01 Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Loading