Skip to content

[WIP] Increases independence of substitution effects #44

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.

Sign up for GitHub

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

Open
MattHJensen wants to merge 8 commits into
base: master
Choose a base branch
from
Open

[WIP] Increases independence of substitution effects #44

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
92f6895
Strengthen test_sub_effect_independence
martinholmer Feb 7, 2019
9abb4d0
Merge branch 'strengthen-test_sub_effect_independence' of https://git…
Feb 14, 2019
528f9f2
resolve test failures
Feb 14, 2019
4931dce
strengthen test sub_effect_independence
Feb 14, 2019
6e27264
resolve test failures
Feb 14, 2019
a707180
strenghten but do not break test_sub_effect_independence
Feb 14, 2019
aaf16a8
improve docs
Feb 20, 2019
760b2c4
merge conflicts
Feb 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
resolve test failures
  • Loading branch information
matthjensen authored and matthjensen committed Feb 14, 2019
commit 6e2726467c3424c0a1b7a2fb436363406b9077cf
3 changes: 2 additions & 1 deletion behresp/behavior.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,8 @@ def _mtr12(calc__1, calc__2, mtr_of='e00200p', tax_type='combined'):
# Note: c04800 is filing unit's taxable income and
# p23250 is filing units' long-term capital gains
taxinc_less_ltcg = (calc1.array('c04800') -
np.maximum(-3000, calc1.array('p23250')))
np.maximum(-3000/calc1.array('sep'),
calc1.array('p23250')))
sub = (pvalue['BE_sub'] * pch * taxinc_less_ltcg)
# calculate magnitude of income effect
if pvalue['BE_inc'] == 0.0:
Expand Down