Repository navigation
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #1286 +/- ##
==========================================
- Coverage 80.10% 80.09% -0.02%
==========================================
Files 24 24
Lines 7208 7208
==========================================
- Hits 5774 5773 -1
- Misses 1434 1435 +1
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
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>
Brings in the FDC return wedge, the fdc_fund_* renaming, the zero reserve cap, and the FDC fund reserve paid to the government at tG1. Resolves conflicts in CHANGELOG.md (keeps both entries, with the documentation entry updated for the wedge and reserve) and in tests/test_TPI.py (keeps the FDC_TPI _fdc_tpi_run helper with its tag argument and both the younger-cohorts and return-wedge tests). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Adds the FDC return r_fdc = r_p - r_fdc_wedge to the FDC pillar section (accumulation, bequests, and annuity pricing use it) and a section on the fund's spread and reserve: its law of motion, the ceiling fdc_fund_reserve_max_GDPratio, the payout to the government at the end of tG1 - 1, and the steady state with no reserve. Adds net FDC fund revenue to the government budget constraint and its stationarized form, and the reserve to domestic savings in capital market clearing. Adds fdc_spread, fdc_fund_reserves, fdc_fund_revenue, and fdc_fund_transfer to model_variables.json, updates the fiscal docstrings that still described a reserve floor, and fixes two broken links to the FDC pillar section. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Brings in upstream/master (with the merged FDC_SS, PSLmodels#1284) through FDC_TPI. Resolves the conflict in the get_G_ss and get_TR docstrings in ogcore/fiscal.py by keeping the upstream wording, with the payout at the end of tG1 - 1 and without the note that the time path is not yet implemented. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The carve-out reform it ran is now a short snippet in the FDC section of the pensions chapter. The script is kept locally but no longer tracked. 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.
Parts 1–3 of the FDC work (#1283, #1284 and #1285) have merged, and this branch is synced with master, so the diff now shows only the part 4 changes. The example script the PR first added (
examples/run_ogcore_fdc_example.py) has since been removed: its reform is shown in the docs instead (see below).This is part 4 of 4 for the funded defined contribution (FDC) pillar: docs and output metadata. 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.r_fdc_wedge(the return r_fdc credited to the accounts and used to price the annuity) and the fund's spread and temporary FDC fund reserve: its law of motion, the ceilingfdc_fund_reserve_max_GDPratio, the payout to the government attG1, and the steady state with no reserve. Net FDC fund revenue is added to the government budget constraint and its stationarized form, and the reserve to domestic savings in the capital market clearing section.pension_regimes, a reform that moves 4 of 16 percentage points of NDC contributions into funded accounts for cohorts aged 40 or younger in the start year.model_variables.jsonaddsF,fdc_contrib,fdc_benefits,fdc_holdings,fdc_spread,fdc_fund_reserves,fdc_fund_revenueandfdc_fund_transfer, so they can be used inoutput_tablesandoutput_plots.ogcore/__init__.py,pyproject.tomlanduv.lock, and the CHANGELOG's Unreleased section, which holds all four FDC parts, becomes[0.25.0] - 2026-11-21.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.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