Skip to content

Funded defined contribution pillar, part 3: transition path - #1285

Open
jdebacker wants to merge 5 commits into
PSLmodels:masterfrom
jdebacker:FDC_TPI
Open

jdebacker wants to merge 5 commits into
PSLmodels:masterfrom
jdebacker:FDC_TPI

Conversation

@jdebacker

@jdebacker jdebacker commented Nov 15, 2026 •

Copy link
Copy Markdown
Member

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 problem on the path. household.get_fdc now handles a cohort's remaining lifetime ("TPI" and "TPI_scalar"). Each cohort's account is credited, and its annuity priced, on the r_p and 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.
  • Initial conditions. Households alive at t=0 start from the FDC holdings of their age in the baseline steady state, which are zero if the baseline has no FDC pillar. Like private savings, these are scaled for the period-0 population, and they are stored on p as n_preTP is. 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.
  • Aggregates.
    • pensions.fdc_tpi builds the (T, S, J) accounts cohort by cohort.
    • aggregates.get_F(…, "TPI") gives the fund's assets, which enter both get_K_splits calls as B + F.
    • FDC balances of members who die before retirement are added to BQ, and immigrants' FDC claims enter I_d and I.
    • Consumption reflects the FDC net flow.
  • Outputs. The time-path output adds F, fdc_contrib, fdc_benefits and fdc_holdings. The steady-state output adds fdc_R, the age at which balances are annuitized; it's used to build initial holdings.
  • Guard removed. The NotImplementedError guard in run_TPI is gone.

Checks (small model, tests/testing_params.json)

Run F at t=0 F at end of path F in the steady state max RC error
Baseline, fdc_tau = 0.05 0.271 0.2446 0.2446 5.5e-5
Reform introducing FDC (fdc_tau = 0.05) from a no-FDC baseline 0 0.2445 0.2445 7.1e-5
  • Fund identity. It holds in every period of the path to about 1e-8: Σ ω·(start-of-period balances) = (1 + r_p) F − FDC bequests. A unit test checks this on synthetic paths.
  • Consistency. The time-path accounts equal each cohort's own lifetime accounts, both for cohorts born on the path and for cohorts alive at t=0.
  • Pre-existing failure, same on master. With FDC off, this small model's time path misses RC_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

  • Unit tests (pass): test_household.py, test_aggregates.py, test_pensions.py, test_parameters.py, test_tax.py.
  • New local test (passes): test_run_TPI_funded_defined_contribution.
  • Non-local test_SS.py and test_TPI.py: everything passes except test_SS_fsolve cases, all of which also fail on upstream master.

Decision to note

When initial_wealth_ratio rescales initial private savings, initial FDC holdings are not rescaled.

🤖 Generated with Claude Code

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-commenter

codecov-commenter commented Nov 15, 2026 •

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 83.69231% with 53 lines in your changes missing coverage. Please review.
✅ Project coverage is 79.94%. Comparing base (9b8a3b4) to head (fa97f96).

Files with missing lines Patch % Lines
ogcore/pensions.py 77.83% 41 Missing ⚠️
ogcore/TPI.py 78.57% 6 Missing ⚠️
ogcore/household.py 91.54% 6 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@            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     
Flag Coverage Δ
unittests 79.94% <83.69%> (+0.13%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
ogcore/SS.py 92.00% <100.00%> (+0.17%) ⬆️
ogcore/aggregates.py 100.00% <100.00%> (ø)
ogcore/parameters.py 90.75% <100.00%> (+0.10%) ⬆️
ogcore/TPI.py 81.94% <78.57%> (-0.20%) ⬇️
ogcore/household.py 90.90% <91.54%> (+0.12%) ⬆️
ogcore/pensions.py 74.22% <77.83%> (+1.01%) ⬆️
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@jdebacker
jdebacker marked this pull request as ready for review November 15, 2026 08:07
jdebacker and others added 4 commits November 16, 2026 17:12
… 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

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants