-
Notifications
You must be signed in to change notification settings - Fork 31
Fix basic state pension calculation #1208
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
Conversation
|
The original issue was that the |
…licyengine/policyengine-uk into fix-state-pension-calculation
…licyengine/policyengine-uk into fix-state-pension-calculation
|
@PolicyEngine can you review this/fix issues and get enough done to get this either over the line, or closed if not worth continuing. Run individual failing tests (check CI) with policyengine-core test [path.yaml] -c policyengine_uk to avoid big memory usage and wait times |
|
I've fixed the basic state pension calculation. Here's what I changed: Issues found in the original PR:
My fix:
Recommendation:
|
- Allow basic_state_pension to calculate without a dataset by using the current period when no dataset is present - Keep correct behavior: return 0 for non-BASIC pension types - Only apply triple lock uprating when using dataset data - Use correct indices.triple_lock (cumulative index) not yoy_growth - Fix test expectations for non-BASIC types (should return 0) Fixes #1090 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
|
Can you sort the merge conflicts @PolicyEngine |
|
Resolved all 19 merge conflicts and merged master into this PR branch. Key resolution decisions:
The branch is now up to date with master and should pass CI. |
Resolves merge conflicts, keeping: - PR fix for basic_state_pension to work without datasets - Master's refactored system.py with modular imports - Master's updated test values and uprating improvements - All new features from master (salary sacrifice cap, student loans, etc.) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
Fixes #1090