Skip to content

Remove reference to squeeze factors in test and mode 1 check#1689

Closed
marghe-molaro wants to merge 3 commits intomasterfrom
molaro/compute-load-instead-of-squeeze
Closed

Remove reference to squeeze factors in test and mode 1 check#1689
marghe-molaro wants to merge 3 commits intomasterfrom
molaro/compute-load-instead-of-squeeze

Conversation

@marghe-molaro
Copy link
Copy Markdown
Collaborator

@marghe-molaro marghe-molaro commented Sep 1, 2025

This PR is related to PR #1662 and addresses the following issues:

  • test_run_in_mode_1_with_almost_no_capacity has now been removed from test_healthsystem.py, as it is outdated

  • The reference to squeeze has been removed from test_rescaling_capabilities_based_on_squeeze_factors, which has been renamed to test_rescaling_capabilities_based_on_load_factors.

  • The reference to squeeze has also been removed from the check determining whether HSI in mode 1 can proceed. The check now verifies if any required officer has a non-zero capability, rather than checking if any squeeze factor is inf.

…sed_on_squeeze_factors and when checking if mode 1 appointments can go ahead
@marghe-molaro marghe-molaro requested a review from tamuri September 1, 2025 10:11
@marghe-molaro
Copy link
Copy Markdown
Collaborator Author

@tamuri test_epi.py was cancelled but is running fine locally. Everything else is passing.

@tbhallett
Copy link
Copy Markdown
Collaborator

Closing in favour of #1781

@tbhallett tbhallett closed this Jan 20, 2026
marghe-molaro added a commit that referenced this pull request Jan 29, 2026
* Remove squeeze factor from HS

* Ensure default logging for multiple treatment ids

* Replaced rescaling of capabilities based on squeeze so that it is based on load

* Ensure running footprint and load is clinic specific

* Add clinics running footprint and test

* For test to pass for now only log Capacity_By_FacID_and_Officer for GenericClinic

* Style fixes

* Fix test of squeeze logging

* More logging fixes in test

* Update comment in test because rescaling factor cannot be less than 1

* Consistent variable names

* Remove redundant function

log_current_capabilities_and_usage called log_clinic_current_capabilities_and_usage looping over the clinics.
I have now removed log_clinic_current_capabilities_and_usage, and moved the looping logic to where the capabilities are logged.

* Retrieve facility id and district from appointment type needs

* Additional comments in tests to explain rationale

I have updated comments in the test to explain the rationale for retaining an arbitrary clinic capabilities split in test set up.

* WIP: looping over clinics to log

* Debugging

* All but one tests pass

* WIP; debugging

* Fix test rescaling capabilities based on load factors

* Style fixes

* Style fixes

Signed-off-by: sangeetabhatia03 <sangeetabhatia03@gmail.com>

* Remove print statements

---------

Signed-off-by: sangeetabhatia03 <sangeetabhatia03@gmail.com>
Co-authored-by: sangeetabhatia03 <sangeetabhatia03@gmail.com>
Co-authored-by: Tim Hallett <39991060+tbhallett@users.noreply.github.com>
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.

2 participants