PSLmodels / OG-USA

Overlapping-generations macroeconomic model for evaluating fiscal policy in the United States
https://pslmodels.github.io/OG-USA/
Creative Commons Zero v1.0 Universal
19 stars 34 forks source link

Update default calibration #107

Closed jdebacker closed 1 month ago

jdebacker commented 5 months ago

This PR updates the default calibration for the OG-USA model. Changes include:

  1. A fix to macro_params.py, which corrects double counting of social security payments when determining the $\alpha_G$ parameter. As a result, $\alpha_G$ is significantly larger.
  2. Changes default start year to 2025
  3. Updates AIME breakpoints for 2024 values
  4. Rounds numbers to 2-4 digits, depending on the parameter.
codecov-commenter commented 5 months ago

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

Project coverage is 45.22%. Comparing base (42a4ff8) to head (a973a1f). Report is 15 commits behind head on master.

Additional details and impacted files [![Impacted file tree graph](https://app.codecov.io/gh/PSLmodels/OG-USA/pull/107/graphs/tree.svg?width=650&height=150&src=pr&token=XOLXIKEL86&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=PSLmodels)](https://app.codecov.io/gh/PSLmodels/OG-USA/pull/107?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=PSLmodels) ```diff @@ Coverage Diff @@ ## master #107 +/- ## ======================================= Coverage 45.22% 45.22% ======================================= Files 18 18 Lines 1404 1404 ======================================= Hits 635 635 Misses 769 769 ``` | [Flag](https://app.codecov.io/gh/PSLmodels/OG-USA/pull/107/flags?src=pr&el=flags&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=PSLmodels) | Coverage Δ | | |---|---|---| | [unittests](https://app.codecov.io/gh/PSLmodels/OG-USA/pull/107/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=PSLmodels) | `45.22% <100.00%> (ø)` | | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=PSLmodels#carryforward-flags-in-the-pull-request-comment) to find out more. | [Files with missing lines](https://app.codecov.io/gh/PSLmodels/OG-USA/pull/107?dropdown=coverage&src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=PSLmodels) | Coverage Δ | | |---|---|---| | [ogusa/\_\_init\_\_.py](https://app.codecov.io/gh/PSLmodels/OG-USA/pull/107?src=pr&el=tree&filepath=ogusa%2F__init__.py&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=PSLmodels#diff-b2d1c2EvX19pbml0X18ucHk=) | `100.00% <100.00%> (ø)` | | | [ogusa/macro\_params.py](https://app.codecov.io/gh/PSLmodels/OG-USA/pull/107?src=pr&el=tree&filepath=ogusa%2Fmacro_params.py&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=PSLmodels#diff-b2d1c2EvbWFjcm9fcGFyYW1zLnB5) | `100.00% <ø> (ø)` | |
rickecon commented 1 month ago

@jdebacker. I just have the one question about updating values in the ogusa_default_parameters.json instead of updating them in the sample run script. The current status of this PR is good to go, but I think I would prefer moving those changes to the ogusa_default_parameters.json file. Let me know what you think, and I'll merge this.

jdebacker commented 1 month ago

@rickecon Thanks for the review. I just made the suggested changes.

rickecon commented 1 month ago

@jdebacker. This looks great. Merging.