Repository navigation
Conversation
Adds fdc_tau (a cohort pension parameter, default 0), fdc_earn_cap, fdc_earn_cap_factor, and fdc_earn_floor_factor, and the functions that compute a household's funded defined contribution account over its life: contributions, balances earning r_p through the retirement period, a fair annuity-due priced on income-group mortality and the r_p path, end-of-period holdings, and the accrual derivatives. Not yet wired into the household problem or aggregates. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This was referenced Nov 15, 2026
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #1285 +/- ##
==========================================
+ Coverage 79.81% 79.94% +0.13%
==========================================
Files 24 24
Lines 6811 7122 +311
==========================================
+ Hits 5436 5694 +258
- Misses 1375 1428 +53
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
… accounts Remove fdc_earn_cap and fdc_earn_cap_factor. With pension_earn_cap true, FDC contributions are paid only on labor income up to dc_earn_cap_factor times avg_labor_inc_t1_model_units, the cap shared with the notional defined contribution system, under any pension_system. fdc_earn_floor_factor is now a cohort pension parameter entered and indexed like db_earn_cap_factor and dc_earn_cap_factor (a single value is value / e^(g_y t); regimes may change it by cohort), so the floor and the cap move together. fdc_earn_bands returns arrays by period and age, read down each cohort's diagonal. Specifications checks that the cap is at least the floor wherever fdc_tau is positive. Also resolves the leftover conflict markers in default_parameters.json from the upstream merge and moves the FDC changelog entries to an Unreleased section. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Households pay FDC contributions and receive annuity benefits through
the budget constraint (outside net_taxes and the government budget).
FOC_labor values the annuity a contribution buys via
fdc_labor_wedge. Fund assets F (aggregates.get_F, in next-period
detrended units like b_{s+1}) add to domestic savings in
get_K_splits; pre-retirement balances of the deceased are bequeathed;
immigrants arrive with their age's FDC holdings per survivor. SS
output adds F and FDC profiles. run_TPI raises NotImplementedError
while fdc_tau > 0.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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>
This branch has not been deployed
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