Skip to content

Allow model to work with J=1#1062

Merged
rickecon merged 17 commits intoPSLmodels:masterfrom
jdebacker:J1
Feb 2, 2026
Merged

Allow model to work with J=1#1062
rickecon merged 17 commits intoPSLmodels:masterfrom
jdebacker:J1

Conversation

@jdebacker
Copy link
Member

This PR updates OG-Core to work with a parameterization of J=1. This issue is noted in Issue #1057.

@codecov-commenter
Copy link

codecov-commenter commented Sep 30, 2025

Codecov Report

❌ Patch coverage is 66.66667% with 3 lines in your changes missing coverage. Please review.
✅ Project coverage is 73.20%. Comparing base (e0d0972) to head (30450ff).

Files with missing lines Patch % Lines
ogcore/txfunc.py 40.00% 3 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1062      +/-   ##
==========================================
- Coverage   73.23%   73.20%   -0.03%     
==========================================
  Files          21       21              
  Lines        5178     5180       +2     
==========================================
  Hits         3792     3792              
- Misses       1386     1388       +2     
Flag Coverage Δ
unittests 73.20% <66.66%> (-0.03%) ⬇️

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

Files with missing lines Coverage Δ
ogcore/SS.py 81.05% <ø> (ø)
ogcore/__init__.py 100.00% <100.00%> (ø)
ogcore/pensions.py 68.23% <100.00%> (-0.12%) ⬇️
ogcore/tax.py 99.33% <ø> (ø)
ogcore/txfunc.py 46.36% <40.00%> (-0.06%) ⬇️
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@jdebacker
Copy link
Member Author

All tests pass locally with the exception of the test_txfunc.py test that returns a dask error (same as on PR #1084):

tests/test_SS.py ..........................................                                                [  6%]
tests/test_TPI.py .............................                                                            [ 11%]
tests/test_aggregates.py .........................................                                         [ 18%]
tests/test_basic.py ....                                                                                   [ 19%]
tests/test_demographics.py ................                                                                [ 21%]
tests/test_elliptical_u_est.py .......                                                                     [ 23%]
tests/test_execute.py .                                                                                    [ 23%]
tests/test_firm.py .....................................................................                   [ 34%]
tests/test_fiscal.py .........................                                                             [ 38%]
tests/test_household.py ...................................................                                [ 47%]
tests/test_output_plots.py ...............................................                                 [ 55%]
tests/test_output_tables.py ..............                                                                 [ 57%]
tests/test_parameter_plots.py ........................................                                     [ 64%]
tests/test_parameter_tables.py .......                                                                     [ 65%]
tests/test_parameters.py ..............                                                                    [ 67%]
tests/test_pensions.py .................................                                                   [ 73%]
tests/test_run_example.py ..                                                                               [ 73%]
tests/test_run_ogcore.py .                                                                                 [ 73%]
tests/test_tax.py ...................................                                                      [ 79%]
tests/test_txfunc.py ............................F.                                                        [ 84%]
tests/test_user_inputs.py .........                                                                        [ 86%]
tests/test_utils.py ...................................................................................    [100%]

@rickecon This PR is ready for review.

@jdebacker jdebacker marked this pull request as ready for review January 26, 2026 01:01
@rickecon
Copy link
Member

rickecon commented Feb 2, 2026

@jdebacker. Thanks for this. It looks good to me. Merging now.

@rickecon rickecon merged commit dbe0b9f into PSLmodels:master Feb 2, 2026
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