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 #1286 +/- ##
==========================================
+ 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>
Adds an FDC section to the pensions chapter of the theory docs (contributions, timing, annuity, labor FOC, aggregates, and the modeling choices), notes in the household budget constraint and capital market clearing sections, FDC output metadata in model_variables.json, an example carving funded accounts out of an NDC system for younger cohorts via pension_regimes, and a local TPI test introducing FDC for younger cohorts only. 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, #1284 and #1285 (FDC parts 1–3), so their commits appear here too. Review only the last commit, "Document the funded defined contribution pillar and add an example", until those merge.
This is part 4 of 4 for the funded defined contribution (FDC) pillar: docs, output metadata, and an example. Model code is unchanged.
Changes
government.md): a new "Funded defined contribution pillar" section covering contributions and the earnings band, accumulation and timing, the fair annuity and the annuity pool, initial holdings on the transition path, the labor-FOC accrual term, and the aggregates. The chapter intro and the cohort-parameter paragraph now mention the pillar, and the "Aggregate Pension Spending" section notes that FDC benefits are not government outlays.factorcalibration.K_dincludes the fund's holdings.dc_earn_cap_factor, applied whenpension_earn_capis true, so under NDC both pillars are credited on the same capped earnings. The floorfdc_earn_floor_factoris indexed like the shared cutoffs: a single value is fixed in real terms.initial_wealth_ratiodoes not rescale initial FDC holdings.households.mdnotes the FDC terms in the budget constraint, andmarket_clearing.mdnotes that the domestic capital constraint becomes K^d + D^d = B + F.model_variables.jsonaddsF,fdc_contrib,fdc_benefitsandfdc_holdings, so they can be used inoutput_tablesandoutput_plots.examples/run_ogcore_fdc_example.py: the baseline is an NDC system withtau_p = 0.16. The reform is a carve-out entered throughpension_regimes: cohorts aged 40 or younger in the start year gettau_p = 0.12plusfdc_tau = 0.04, and older cohorts keep the baseline. It prints the macro effects and the fund's assets. A commented-out option setspension_earn_capwithdc_earn_cap_factor = [1.5, 1.5], which caps the notional and funded accounts at the same wage-indexed level.test_run_TPI_fdc_introduced_for_younger_cohorts: FDC is introduced bypension_regimesfor cohorts aged 40 or younger only. Older cohorts never contribute, younger working cohorts contribute from t=0, the fund starts empty, and the path converges with the resource constraint withinRC_TPI.Checks
tests/test_constants.py,test_output_tables.pyandtest_output_plots.pypass.Finmacro_table, and checked its reform specification:fdc_tauandtau_pexpand by cohort as intended, and the final period sits in the reform regime. I did not run the full default-size example, which takes hours.FDCLifetimeandFDCPathboth have aholdingsfield, which made the Returns labelholdingsinfdc_holdingsan ambiguous cross-reference. Funded defined contribution pillar, part 3: transition path #1285 now relabels those Returns entries.🤖 Generated with Claude Code