Repository navigation
Funded defined contribution pillar, part 3: transition path - #1285
Merged
Merged
Conversation
This was referenced Nov 15, 2026
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #1285 +/- ##
==========================================
+ Coverage 79.85% 80.10% +0.25%
==========================================
Files 24 24
Lines 7028 7208 +180
==========================================
+ Hits 5612 5774 +162
- Misses 1416 1434 +18
Flags with carried forward coverage won't be shown. Click here to find out more.
🚀 New features to boost your workflow:
|
jdebacker
marked this pull request as ready for review
November 15, 2026 08:07
Each cohort's FDC account is computed from the r_p and wage paths it foresees (pensions.fdc_tpi, household.get_fdc on partial lifetimes), with the annuity priced on that path. Households alive at t=0 start from the baseline steady state's FDC holdings (zero if the baseline had none), scaled for the period-0 population; retirees re-annuitize on the new path. Fund assets enter get_K_splits in every period, pre-retirement balances of the deceased are bequeathed, and immigrants arrive with their age's FDC claims. TPI output adds F and FDC profiles; SS output adds fdc_R. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…time path Brings in the r_fdc wedge and the FDC fund reserve from FDC_SS and extends them to the time path, following the steady state: - Accounts earn r_fdc = r_p - r_fdc_wedge in each period with the wedge each cohort faces (pensions.fdc_wedge_path), including balances carried into period 0, in both pensions.fdc_tpi and household.get_fdc. Bequeathed balances are credited r_fdc (pensions.fdc_bequeathable_tpi). - aggregates.get_fdc_spread and get_fdc_fund_reserves take method='TPI'. The reserve starts from the baseline steady-state reserve, follows its flow identity between zero and fdc_fund_reserve_max_GDPratio times GDP, and adds to domestic savings. Because it can approach its steady state more slowly than the time path converges, the payment in period T - 1 settles any remaining gap (new argument Z_T), and run_TPI logs a warning if the settlement exceeds 0.1 percent of GDP. - Net FDC fund revenue enters the budget through fiscal.get_TR and a new optional argument of fiscal.D_G_path. - The time-path output adds fdc_spread, fdc_fund_reserves, fdc_fund_revenue, and fdc_fund_transfer. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Applies the FDC_SS change (no steady-state reserve) and extends it to the time path: the reserve starts at zero, accumulates the spread and its own return r_p with no floor (a negative wedge runs a deficit) and with reserves above fdc_fund_reserve_max_GDPratio times GDP paid to the government, until the end of period tG1 - 1, when the whole balance is paid to the government (or the deficit covered by it). From tG1 on the reserve is zero and the spread goes to the government each period. This replaces the settlement in period T - 1, which could not close the resource constraint because a slow-moving reserve kept the whole economy away from its steady state at T. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Brings in the merged FDC_SS (PSLmodels#1284), Rick's fiscal.py docstring updates, and the uv.lock update. Resolves conflicts in ogcore/aggregates.py, tests/test_aggregates.py, and CHANGELOG.md by keeping the FDC_TPI versions, which contain the steady-state FDC fund reserve code from FDC_SS plus its time path. Updates the D_G_path docstring for the payout of the reserve at tG1. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
rickecon
approved these changes
Nov 21, 2026
Member
|
@jdebacker. This all looks very good. Merging now. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR is stacked on #1283 (FDC part 1) and #1284 (part 2), so their commits appear here too. Review only the last commit, "Solve the time path with the funded defined contribution pillar", until those merge.
This is part 3 of 4 for the funded defined contribution (FDC) pillar: the transition path. With
fdc_tau = 0(the default) results are unchanged.What changes
household.get_fdcnow handles a cohort's remaining lifetime ("TPI"and"TPI_scalar"). Each cohort's account is credited, and its annuity priced, on ther_pand wage paths the cohort foresees. The labor-FOC wedge (household.fdc_labor_wedge) works on partial lifetimes, with the cohort's own mortality read along its diagonal.pasn_preTPis. Households already retired at t=0 re-annuitize their remaining balances on the new path, so the annuity pool stays closed with no government residual.pensions.fdc_tpibuilds the(T, S, J)accounts cohort by cohort.aggregates.get_F(…, "TPI")gives the fund's assets, which enter bothget_K_splitscalls asB + F.BQ, and immigrants' FDC claims enterI_dandI.F,fdc_contrib,fdc_benefitsandfdc_holdings. The steady-state output addsfdc_R, the age at which balances are annuitized; it's used to build initial holdings.NotImplementedErrorguard inrun_TPIis gone.Checks (small model,
tests/testing_params.json)fdc_tau = 0.05fdc_tau = 0.05) from a no-FDC baselineRC_TPI(1.37e-4 at period 20) on upstream master too, identically. The new local test therefore runs that no-FDC baseline with the checks off and checks only the FDC runs.Tests
test_household.py,test_aggregates.py,test_pensions.py,test_parameters.py,test_tax.py.test_run_TPI_funded_defined_contribution.test_SS.pyandtest_TPI.py: everything passes excepttest_SS_fsolvecases, all of which also fail on upstream master.Decision to note
When
initial_wealth_ratiorescales initial private savings, initial FDC holdings are not rescaled.🤖 Generated with Claude Code