Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update default calibration #107

Merged
merged 14 commits into from
Aug 29, 2024
Merged

Conversation

jdebacker
Copy link
Member

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
Copy link

codecov-commenter commented Apr 23, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

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

@@           Coverage Diff           @@
##           master     #107   +/-   ##
=======================================
  Coverage   45.22%   45.22%           
=======================================
  Files          18       18           
  Lines        1404     1404           
=======================================
  Hits          635      635           
  Misses        769      769           
Flag Coverage Δ
unittests 45.22% <100.00%> (ø)

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

Files with missing lines Coverage Δ
ogusa/__init__.py 100.00% <100.00%> (ø)
ogusa/macro_params.py 100.00% <ø> (ø)

@jdebacker jdebacker marked this pull request as ready for review August 21, 2024 15:14
examples/run_og_usa.py Outdated Show resolved Hide resolved
@rickecon
Copy link
Member

@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
Copy link
Member Author

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

@rickecon
Copy link
Member

@jdebacker. This looks great. Merging.

@rickecon rickecon merged commit a504ff6 into PSLmodels:master Aug 29, 2024
8 checks passed
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.

3 participants