Skip to content

Conversation

@jdebacker
Copy link
Member

This PR adds a new parameter, c_min that represents the minimum consumption amounts for each i consumption good. This parameter was already outlined in the theory, but hadn't bee included in the model code.

Resolves Issue #982.

@codecov-commenter
Copy link

codecov-commenter commented Jan 3, 2026

Codecov Report

❌ Patch coverage is 96.96970% with 1 line in your changes missing coverage. Please review.
✅ Project coverage is 73.19%. Comparing base (83227e3) to head (bd51688).

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

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1085      +/-   ##
==========================================
+ Coverage   72.92%   73.19%   +0.27%     
==========================================
  Files          21       21              
  Lines        5122     5137      +15     
==========================================
+ Hits         3735     3760      +25     
+ Misses       1387     1377      -10     
Flag Coverage Δ
unittests 73.19% <96.96%> (+0.27%) ⬆️

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

Files with missing lines Coverage Δ
ogcore/SS.py 81.01% <100.00%> (ø)
ogcore/TPI.py 33.63% <100.00%> (+0.15%) ⬆️
ogcore/household.py 92.71% <100.00%> (+4.72%) ⬆️
ogcore/txfunc.py 46.41% <0.00%> (ø)
🚀 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, but one, pass locally:

tests/test_SS.py .........................................               [100%]
tests/test_TPI.py ............................                           [100%]
tests/test_aggregates.py .........................................       [100%]
tests/test_basic.py ....                                                 [100%]
tests/test_demographics.py ................                              [100%]
tests/test_elliptical_u_est.py .......                                   [100%]
tests/test_execute.py .                                                  [100%]
tests/test_firm.py ..................................................... [ 76%]
................                                                         [100%]
tests/test_fiscal.py ......................                              [100%]
tests/test_household.py ................................................ [ 96%]
..                                                                       [100%]
tests/test_output_plots.py ............................................. [ 95%]
..                                                                       [100%]
tests/test_output_tables.py ..............                               [100%]
tests/test_parameter_plots.py ........................................   [100%]
tests/test_parameter_tables.py .......                                   [100%]
tests/test_parameters.py ..............                                  [100%]
tests/test_pensions.py .................................                 [100%]
tests/test_run_example.py ..                                             [100%]
tests/test_run_ogcore.py .                                               [100%]
tests/test_tax.py ...................................                    [100%]
tests/test_txfunc.py ............................F.                      [100%]  
tests/test_user_inputs.py .........                                      [100%]
tests/test_utils.py .................................................... [ 62%]
...............................                                          [100%]

The failing test is tests/test_txfunc.py::test_tax_func_estimate. The failure is related to dask:

E                       distributed.scheduler.KilledWorker: Attempted to run task 'tax_func_loop-981021c9-2caf-46b5-8809-bf3df83cd5db' on 4 different workers, but all those workers died while running it. The last worker that attempt to run the task was tcp://127.0.0.1:51937. Inspecting worker logs is often a good next step to diagnose what went wrong. For more information see https://distributed.dask.org/en/stable/killed.html.

@jdebacker jdebacker marked this pull request as ready for review January 5, 2026 02:46
@jdebacker jdebacker requested review from Copilot and rickecon and removed request for rickecon January 5, 2026 02:47
@jdebacker
Copy link
Member Author

@rickecon, despite the failing test, this PR is ready for your review. Perhaps you can try the failing test on your machine. I don't recall that failing before, but it's odd since nothing was changed related to the function tested.

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

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.

2 participants