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>
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #1284 +/- ##
==========================================
- Coverage 79.81% 79.76% -0.05%
==========================================
Files 24 24
Lines 6811 6997 +186
==========================================
+ Hits 5436 5581 +145
- Misses 1375 1416 +41
Flags with carried forward coverage won't be shown. Click here to find out more.
🚀 New features to boost your workflow:
|
This was referenced Nov 15, 2026
jdebacker
marked this pull request as ready for review
November 15, 2026 05:57
… 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>
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), so its first commit is #1283's. Review only the second commit, "Solve the steady state with the funded defined contribution pillar", until #1283 merges.
This is part 2 of 4 for the funded defined contribution (FDC) pillar: the steady state. With
fdc_tau = 0(the default) every result is unchanged: the off path adds0.0to the existing terms, and the small-model steady state matches part 1 exactly.What changes when
fdc_tau > 0Household budget. Consumption is reduced by the contribution and increased by the annuity, through
household.fdc_net_flow. These flows stay out oftax.net_taxes, so they are neither government revenue nor outlays, and the tax outputs are unaffected.Labor FOC.
household.fdc_labor_wedgeadds two terms:Contributions are therefore not treated as a pure tax.
Capital market. Fund assets F (
aggregates.get_F) are aggregated likeget_B, in next-period detrended units like b_{s+1}. They add to domestic savings:get_K_splits(B + F, …).Bequests. Balances of members who die before retirement are bequeathed (added to
get_BQ). After retirement, the balances of those who die stay in the annuity pool.Immigrants arrive with the FDC holdings per survivor of their age, as they do with b. This is used in
get_Fand in the immigrant term ofget_I.New SS outputs:
F,fdc_contrib,fdc_benefits,fdc_holdings,agg_fdc_contrib,agg_fdc_benefits.Time path.
TPI.run_TPIraisesNotImplementedErrorwhile the pillar is on. Part 3 adds the time path.Checks (small model,
tests/testing_params.json)fdc_taufdc_tau = 0.10would be 0.4956 instead of 0.4970. The accrual offsets about half of the labor response.Simplifications to review
before_tax_incomeor in the incomefactorcalibration.K_dnow includes the fund's holdings.Status
tests/test_household.py,test_aggregates.py,test_pensions.py,test_parameters.py,test_tax.py(non-local).test_SS.pyandtest_TPI.py: everything passes except 5test_SS_fsolvecases. All 5 also fail on upstream master, which fails 6 of 7 of those cases in the same run.TPI.run_TPIraisesNotImplementedErrorwhile the pillar is on. Part 3 (Funded defined contribution pillar, part 3: transition path #1285) removes it.🤖 Generated with Claude Code