OG-USA icon indicating copy to clipboard operation
OG-USA copied to clipboard

Update default calibration

Open jdebacker opened this issue 10 months ago • 1 comments

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.

jdebacker avatar Apr 23 '24 17:04 jdebacker

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

@@           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% <ø> (ø)

codecov-commenter avatar Apr 23 '24 17:04 codecov-commenter

@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.

rickecon avatar Aug 28 '24 15:08 rickecon

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

jdebacker avatar Aug 28 '24 18:08 jdebacker

@jdebacker. This looks great. Merging.

rickecon avatar Aug 29 '24 17:08 rickecon