switches demog/births adjustment to use demog_type column

[tomjemmett]

needs The-Strategy-Unit/nhp_data#261 to be merged and data to be generated first.

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 100.00%. Comparing base (71ce0d7) to head (3fb6bee).

Additional details and impacted files

@@            Coverage Diff            @@
##              main      #633   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files           20        20           
  Lines         1131      1129    -2     
  Branches        58        58           
=========================================
- Hits          1131      1129    -2     

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

[github-actions]

✅ A new build is available.

You can use the following to use pull the image into your local environment:

docker pull ghcr.io/the-strategy-unit/nhp_model:pr-633

[Copilot]

Pull request overview

This PR updates the activity resampling demographic and birth adjustment factors to key off a demog_type index level (instead of expanding factors across activity group values), aligning factor application with the new demog_type column coming from the data pipeline.

Changes:

• Update ActivityResampling.demographic_adjustment() and .birth_adjustment() to create factors with a demog_type outer index level.
• Update unit tests to reflect the new factor indexing (including correct MultiIndex shapes/names).

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.

File	Description
src/nhp/model/activity_resampling.py	Switches demographic/birth factor series construction to use a demog_type index level for merging into model data.
tests/unit/nhp/model/test_activity_resampling.py	Updates assertions/fixtures for the new factor indexing and expected merge keys.

[yiwen-h]

awaiting copilot comments to be addressed

[tomjemmett]

@yiwen-h I've noticed a few data issues, so working through those to ensure this code does actually work :-)

[tomjemmett]

@yiwen-h tested, model is running with the new column added after resolving issues with data

[tomjemmett]

should rebase after merging #634

[tomjemmett]

@yiwen-h updates tests after merging #634

[yiwen-h]

Thank you - looks from the test snapshots that it's having the expected impact