Repository navigation
Conversation
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>
Adds pension_system 'Hybrid DB-FDC': a defined benefit on labor income up to db_earn_cap_factor times avg_labor_inc_t1_model_units, and funded defined contribution (FDC) contributions on labor income between that cutoff and dc_earn_cap_factor times avg_labor_inc_t1_model_units. The two hybrid systems share pensions.hybrid_earn_cutoffs. Adds pension_FOC_linkage (default false), which sets whether the labor first order condition includes the value of the benefit an extra unit of labor earns. It currently affects only the FDC accrual term; the contribution cost always enters. FDC tests set it to true, which reproduces earlier results. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #1288 +/- ##
==========================================
+ Coverage 80.10% 80.16% +0.05%
==========================================
Files 24 24
Lines 7208 7223 +15
==========================================
+ Hits 5774 5790 +16
+ Misses 1434 1433 -1
Flags with carried forward coverage won't be shown. Click here to find out more.
🚀 New features to boost your workflow:
|
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 #1285 and #1286 (FDC parts 3–4), so their commits appear here too. Review only the last commit, "Add the hybrid DB-FDC pension system and pension_FOC_linkage", until those merge.
This is part 5 of the funded defined contribution (FDC) work. It adds a hybrid defined benefit and funded defined contribution system, with the same structure as the Hybrid DB-NDC system and an FDC account in place of the notional account. It also adds
pension_FOC_linkage, a switch for whether households value the pension benefit their labor earns.Hybrid DB-FDC (
pension_system = "Hybrid DB-FDC")db_earn_cap_factor×avg_labor_inc_t1_model_unitsearns a defined benefit (pensions.DB_FDC_hybrid_amount). This is the system's only public pension, and it is scaled byreplacement_rate_adjust.dc_earn_cap_factor×avg_labor_inc_t1_model_unitspaysfdc_tauinto an FDC account. Under this system,pensions.fdc_earn_bandsreturns these cutoffs and ignoresfdc_earn_floor_factorandpension_earn_cap.pensions.hybrid_earn_cutoffs.Specificationschecks that the cutoffs are ordered for every cohort under both systems. It warns iffdc_tauis zero under the new system, because the system then reduces to a capped DB.tau_payrollapplies to all labor income and finances the defined benefit. FDC benefits are paid by the fund, not the government.pension_FOC_linkage(bool, defaultfalse)household.fdc_labor_wedgedrops the accrual term, which is the value of the annuity bought by a marginal contribution. The contribution cost always stays in the FOC, so FDC contributions act on labor supply like a tax on earnings in the FDC band. Benefits are still computed from actual contributions.pension_FOC_linkage = truereproduces them, and the existing FDC tests now do that.Solver note
Under Hybrid DB-FDC, contributions start at the DB cutoff. That puts a discrete change in the marginal return to labor at the cutoff, whatever the value of
pension_FOC_linkage. The defaulthybrhousehold root finder does not converge in the steady-state test, butFOC_root_method = "lm"does. The test useslm, and the docs tell users to do the same when the FDC band starts above zero. A standalone FDC pillar with contributions on all earnings solves withhybr.Docs
government.md) has a new section on the hybrid DB-FDC system.pension_FOC_linkageand the solver note.parameters.mdandapi/pensions.rstare updated.Tests
fdc_tauis zero are tested. The new system is also added to the existing tests of every pension system.test_SS_hybrid_db_fdcchecks that the steady state solves. It also checks that the steady state matches Defined Benefits withpension_earn_capand the FDC floor at the DB cap (Y, K, L, r, w, F and pension outlays match within rtol 1e-8).test_fdc_labor_wedge_linkagechecks that setting the switch to false removes only the accrual term.test_utils.py::test_not_connected_true, which depends on the network; it is a local timeout and fails the same way without these changes. The docs build passes.🤖 Generated with Claude Code