Documentation updates

docs/book/_config.yml

@@ -1,8 +1,8 @@
 ####################################################
 # Book settings
 title                    : OG-ZAF
-author                   : Marcelo LaFleur and Richard W. Evans
-copyright                : '2022'
+author                   : Marcelo LaFleur, Richard W. Evans, and Jason DeBacker
+copyright                : '2024'
 logo                     : '..//OG-ZAF_logo.png'
 
 ####################################################
@@ -52,6 +52,7 @@ sphinx:
   config                    :   # key-value pairs to directly over-ride the Sphinx configuration
     bibtex_reference_style: author_year
     mathjax_path          : https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js
+    autodoc_preserve_defaults:  True
 
 ####################################################
 # LaTeX information

docs/book/_toc.yml

@@ -9,14 +9,15 @@ parts:
   - file: content/api/public_api
 - caption: Calibration
   chapters:
-  - file: content/calibration/exogenous_parameters
+  - file: content/calibration/households
+  - file: content/calibration/firms
   - file: content/calibration/macro
   - file: content/calibration/demographics
   - file: content/calibration/earnings
-  - file: content/calibration/tax_functions
-  - file: content/calibration/bequests
+  - file: content/calibration/taxes
   - file: content/calibration/UBI
   - file: content/calibration/matching_lwi
+  - file: content/calibration/exogenous_parameters
 - caption: References
   chapters:
   - file: content/OGZAF_references

docs/book/citations.bib

@@ -1,207 +0,0 @@
-@TECHREPORT{DeBackerEtAl:2017b,
-  AUTHOR = {Jason DeBacker and Richard W. Evans and Evan Magnusson and Kerk L. Phillips and Shanthi Ramnath and Isaac Swift},
-  TITLE = {The Distributional Effects of Redistributional Tax Policy},
-  INSTITUTION = {Open Source Macroeconomics Laboratory},
-  YEAR = {2017b},
-  type = {mimeo},
-  month = {January},
-}
-
-@Article{DEP:2019,
-  author={Jason DeBacker and Richard W. Evans and Kerk L. Phillips},
-  title={{Integrating Microsimulation Models of Tax Policy into a DGE Macroeconomic Model}},
-  journal={Public Finance Review},
-  year=2019,
-  volume={47},
-  number={2},
-  pages={207-275},
-  month={March},
-  keywords={microsimulation; effective tax rates; marginal tax rates; dynamic general equilibrium; dynamic scori},
-  doi={},
-  abstract={This article proposes a method for integrating individual effective tax rates and marginal tax rates computed from a microsimulation (partial equilibrium) model of tax policy with a dynamic general equilibrium model of tax policy that can provide macroeconomic analysis or dynamic scores of tax reforms. Our approach captures the rich heterogeneity, realistic demographics, and tax-code detail of the microsimulation model and allows this detail to inform a general equilibrium model with a relatively high degree of heterogeneity. In addition, we propose a functional form in which tax rates depend jointly on the levels of both capital income and labor income.},
-  url={https://ideas.repec.org/a/sae/pubfin/v47y2019i2p207-275.html}
-}
-
-@TECHREPORT{Pomerleau2020b,
-  AUTHOR = {Kyle Pomerleau},
-  TITLE = {An analysis of Joe Biden’s tax proposals, October 2020 update},
-  INSTITUTION = {American Enterprise Institute},
-  YEAR = {2020},
-  type = {AEI Report},
-  month = {October},
-  url = {https://www.aei.org/research-products/report/an-analysis-of-joe-bidens-tax-proposals-october-2020-update/}
-}
-
-@TECHREPORT{DEP2020,
-  AUTHOR = {Jason DeBacker and Richard Evans and Kyle Pomerleau},
-  TITLE = {An analysis of Joe Biden’s tax proposals},
-  INSTITUTION = {American Enterprise Institute},
-  YEAR = {2020},
-  type = {AEI Report},
-  month = {June},
-  url = {https://www.aei.org/research-products/report/an-analysis-of-joe-bidens-tax-proposals/}
-}
-
-@Article{DeBackerFrailey:2019,
-  author={Jason DeBacker and Anderson Frailey},
-  title={Revenue and Macroeconomic Effects of a 70% Marginal Tax Rate},
-  journal={Quantitative Notes},
-  year=2019,
-  volume={},
-  number={2019-1},
-  pages={},
-  month={March},
-  keywords={},
-  doi={},
-  abstract={Recently, there has been considerable dis- cussion of a significant increase in the top marginal income tax rate. A salient top marginal tax rate is 70%. This note simulates the effects of a 70% top rate on different groups of filers and shows the im- pacts on revenue and macroeconomic aggregates. We find that an increase in the top marginal tax rate to 70% raises between $5 billion and $250 billion per year over the first 10 years, depending on the size of the top bracket to which this rate is applied. However, our macroeconomic simulations show that a 70% top rate lowers GDP by between 1.7% and 0.1% in the near term, although there may be posi- tive effects on GDP in the longer term.},
-  url={https://www.openrg.com/reports/70pctMTR_QN.pdf}
-}
-
-@Article{Evans:2018,
-  author={Richard W. Evans},
-  title={Dynamic Analysis of EITC Expansion},
-  journal={Quantitative Notes},
-  year=2018,
-  volume={},
-  number={2018-2},
-  pages={},
-  month={May},
-  keywords={},
-  doi={},
-  abstract={This Quantitative Note uses the OG-USA open source dynamic general equilibrium overlap- ping generations model to perform a dynamic analy- sis of the Brown-Khanna Grow American Incomes Now (GAIN) Act, which proposes to increase the generosity and scope of the earned income tax credit (EITC) in the United States. I show a simulation of the macroeconomic effects as well as distributional analysis resulting from the GAIN Act. I also sim- ulate the effects of a revenue neutral GAIN Act in which an increase in the marginal income tax rates in the top two personal income brackets exactly off- sets the reduction in total federal tax revenue from the EITC expansion. In the case of the GAIN Act alone, the economy experiences short-run gains, but the increased government debt quickly crowds out in- vestment and causes the economy to start shrinking significantly. In the revenue neutral case, the cost is primarily in terms of large labor supply frictions and a reallocation of the household labor-leisure and consumption-savings decisions.},
-  url={https://www.openrg.com/reports/QN_EITC_v1.1.pdf}
-}
-
-@Article{DeBackerEvans:2018,
-  author={Jason DeBacker and Richard W. Evans},
-  title={Dynamic Analysis of Tax Cuts and Jobs Act},
-  journal={Quantitative Notes},
-  year=2018,
-  volume={},
-  number={2018-1},
-  pages={},
-  month={February},
-  keywords={},
-  doi={},
-  abstract={This Quantitative Note uses the OG-USA open source dynamic general equilibrium overlap- ping generations model to simulate the effect of the Tax Cuts and Jobs Act. We simulate this reform under the assumptions of a closed economy and small open economy. In both cases, the TCJA reform causes significant growth in GDP and employment between 1% and 2% per year in the first 8 years. However, the increasing debt-to-GDP ratio quickly crowds out investment and causes a drag on the economy. Wage growth can range from nearly nonexistent to a mod- est 0.6%, depending critically on the assumption of how much capital will flow into the country.},
-  url={https://www.openrg.com/reports/QN_ogusa_TCJA.pdf}
-}
-
-@Article{Evans:2017,
-  author={Richard W. Evans},
-  title={Dynamic Analysis of Corporate Income Tax Rate Cut},
-  journal={Quantitative Notes},
-  year=2017,
-  volume={},
-  number={2017-4},
-  pages={},
-  month={November},
-  keywords={},
-  doi={},
-  abstract={This Quantitative Note uses the OG-USA open source dynamic general equilibrium overlap- ping generations model to simulate the effect of cut- ting the U.S. corporate income tax rate from 35% to 20%. I simulate this rate cut under the assump- tions of a closed economy and small open economy, respectively. In both cases, the corporate rate cut causes government revenues to decrease and the debt-to-GDP ratio to increase. In the small open economy scenario, GDP and wages increase by around 3.0%, and 2.5%, respectively. However, in the closed economy setting in which the increased debt service must be satisfied by domestic savings (crowding out), the GDP and wage gains are much smaller and short lived.},
-  url={https://www.openrg.com/reports/QN_CorpCut.pdf}
-}
-
-@TECHREPORT{DEP:2015,
-  AUTHOR = {Jason DeBacker and Richard W. Evans and Kerk L. Phillips},
-  TITLE = {Macroeconomic effects of a 10% cut in statutory marginal income tax rates on ordinary income},
-  INSTITUTION = {American Enterprise Institute},
-  YEAR = {2015},
-  type = {AEI Economic Policy Working Paper Series},
-  month = {December},
-}
-
-@Article{Ferenstein:2018,
-  author={Gregory Ferenstein},
-  title={Can The U.S. Afford A Massive Wage Subsidy? A Macroeconomic Simulation},
-  journal={Forbes},
-  year=2018,
-  volume={},
-  number={},
-  pages={},
-  month={September},
-  keywords={},
-  doi={},
-  abstract={},
-  url={https://www.forbes.com/sites/gregoryferenstein/2018/09/30/can-the-us-afford-a-massive-wage-subsidy-a-macroeconomic-simulation/#614ea9032502}
-}
-
-@TECHREPORT{MichelFurth:2017b,
-  AUTHOR = {Adam Michel and Salim Furth},
-  TITLE = {For Pro-Growth Tax Reform, Expensing Should Be the Focus},
-  INSTITUTION = {The Heritage Foundation},
-  YEAR = {2017},
-  type = {Taxes Report},
-  month = {August},
-  url = {https://www.heritage.org/taxes/report/pro-growth-tax-reform-expensing-should-be-the-focus}
-}
-
-@TECHREPORT{MichelFurth:2017a,
-  AUTHOR = {Norbert Michel and Salim Furth},
-  TITLE = {The Macroeconomic Impact of Dodd Frank—and of Its Repeal},
-  INSTITUTION = {The Heritage Foundation},
-  YEAR = {2017},
-  type = {Taxes Report},
-  month = {April},
-  url = {https://www.heritage.org/markets-and-finance/report/the-macroeconomic-impact-dodd-frank-and-its-repeal}
-}
-
-@TECHREPORT{Hassett:2015,
-  AUTHOR = {Kevin A. Hassett},
-  TITLE = {On the Dynamic Scoring of Fiscal Policy},
-  INSTITUTION = {},
-  YEAR = {2015},
-  type = {Congressional Testimony},
-  month = {July},
-  url = {https://www.aei.org/wp-content/uploads/2015/07/Hassett_DynamicScoring_final-00000002.pdf}
-}
-
-@TECHREPORT{Hassett:2016,
-  AUTHOR = {Kevin A. Hassett},
-  TITLE = {Statement before the House Ways and Means Committee: Reaching America’s Potential: Delivering Growth and Opportunity for All Americans},
-  INSTITUTION = {},
-  YEAR = {2016},
-  type = {Congressional Testimony},
-  month = {February},
-  url = {https://www.aei.org/wp-content/uploads/2016/02/KHtestimony.pdf}
-}
-
-@TECHREPORT{DEP:2021a,
-  AUTHOR = {Jason DeBacker and Richard W. Evans and Benjamin R. Page},
-  TITLE = {A Detailed Macroeconomic Analysis of President Biden's 2020 Campaign Tax Proposals},
-  INSTITUTION = {Tax Policy Center},
-  YEAR = {2021},
-  type = {Working Paper},
-  month = {July},
-  url = {https://www.taxpolicycenter.org/publications/detailed-macroeconomic-analysis-president-bidens-2020-campaign-tax-proposals}
-}
-
-@TECHREPORT{DEP:2021b,
-  AUTHOR = {Jason DeBacker and Richard W. Evans and Benjamin R. Page},
-  TITLE = {A Sensitivity Analysis of a Detailed Macroeconomic Analysis of President Biden's 2020 Campaign Tax Proposals},
-  INSTITUTION = {Tax Policy Center},
-  YEAR = {2021},
-  type = {Working Paper},
-  month = {July},
-  url = {https://www.taxpolicycenter.org/publications/sensitivity-analysis-detailed-macroeconomic-analysis-president-bidens-2020-campaign-tax}
-}
-
-@TECHREPORT{DEP:2021c,
-  AUTHOR = {Benjamin R. Page and Jeffrey Rohaly and Thornton Matheson and Gordon B. Mermin and Jason DeBacker and Richard W. Evans},
-  TITLE = {Macroeconomic Analysis of Former Vice President Biden's Tax Proposals},
-  INSTITUTION = {Tax Policy Center},
-  YEAR = {2021},
-  type = {Brief},
-  month = {July},
-  url = {https://www.taxpolicycenter.org/publications/macroeconomic-analysis-former-vice-president-bidens-tax-proposals}
-}
-
-@TECHREPORT{Page:2021,
-  AUTHOR = {Benjamin R. Page},
-  TITLE = {TPC Experiments with Another Model to Estimate the Economic Effects of Tax Law Changes},
-  INSTITUTION = {Tax Policy Center},
-  YEAR = {2021},
-  type = {TaxVox: Campaigns, Proposals, and Reforms},
-  month = {July},
-  url = {https://www.taxpolicycenter.org/taxvox/tpc-experiments-another-model-estimate-economic-effects-tax-law-changes}
-}

docs/book/content/api/calibrate.rst

@@ -11,4 +11,4 @@ ogzaf.calibrate
 .. currentmodule:: ogzaf.calibrate
 
 .. autoclass:: Calibration
-  :members: get_tax_function_parameters, read_tax_func_estimate, get_dict
+  :members: get_dict

docs/book/content/api/income.rst

@@ -0,0 +1,13 @@
+.. _income:
+
+Life-cycle productivity profiles
+====================================
+
+**income.py modules**
+
+ogzaf.income
+------------------------------------------
+
+.. automodule:: ogzaf.income
+  :members: arctan_func, arctan_deriv_func, arc_error,
+    arctan_fit, get_e_interp, get_e_orig

docs/book/content/api/input_output.rst

@@ -0,0 +1,12 @@
+.. _input_output:
+
+Output-Consumption Bridge
+====================================
+
+**input_output.py modules**
+
+ogzaf.input_output
+------------------------------------------
+
+.. automodule:: ogzaf.input_output
+  :members: get_alpha_c, get_io_matrix

docs/book/content/api/public_api.rst

@@ -12,5 +12,7 @@ There is also a link to the source code for each documented member.
    :maxdepth: 1
 
    calibrate
-   demographics
+   income
+   input_output
    macro_params
+   utils

docs/book/content/api/utils.rst

@@ -0,0 +1,17 @@
+.. _utils:
+
+Calibration Utilities
+====================================
+
+**utils.py modules**
+
+ogzaf.utils
+------------------------------------------
+
+.. currentmodule:: ogzaf.utils
+
+.. autoclass:: CustomHttpAdapter
+  :members: init_poolmanager
+
+.. automodule:: ogzaf.utils
+  :members: get_legacy_session