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

Parameterize adjustments to baseline spending levels in reform policy #987

Merged
merged 29 commits into from
Oct 3, 2024
Merged
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
cf19eea
add new params for adjusting baseline spending
jdebacker Sep 12, 2024
fea7e07
update default vals
jdebacker Sep 12, 2024
9fc91ce
apply new params in fiscal.py
jdebacker Sep 12, 2024
1738e3f
extrapolate new params
jdebacker Sep 12, 2024
0506667
update SS and TPI algos to apply haircut to baseline spending
jdebacker Sep 12, 2024
be7d5ae
format
jdebacker Sep 12, 2024
45476d6
test updates to get_I_g
jdebacker Sep 12, 2024
36b1e7d
fix issues with baseline spend values
jdebacker Sep 13, 2024
ec982c4
clarify when using baseline values
jdebacker Sep 13, 2024
c1647de
correct args for inner loop
jdebacker Sep 14, 2024
95e495c
just return actual baseline values
jdebacker Sep 14, 2024
7b43966
update calls to basleine in tpi
jdebacker Sep 14, 2024
92529e3
format, p.
jdebacker Sep 15, 2024
af93b30
fix typo
jdebacker Sep 15, 2024
6e665fc
arg for extra ss solver tests
jdebacker Sep 16, 2024
2028762
assign value to TR_ss
jdebacker Sep 16, 2024
bc1acd8
initial I_g for all calles
jdebacker Sep 26, 2024
7a324c3
Merge remote-tracking branch 'upstream/master' into basespend_adj
jdebacker Sep 26, 2024
9c26e4a
Merge remote-tracking branch 'upstream/master' into basespend_adj
jdebacker Sep 27, 2024
92d09fc
describe baseline spending in the docs
jdebacker Sep 28, 2024
c6b582f
update parameters docs
jdebacker Sep 28, 2024
44902ac
format
jdebacker Sep 28, 2024
f429a85
update changelog for new release
jdebacker Sep 29, 2024
7e551de
bump target py versions
jdebacker Sep 29, 2024
394ecc6
update version number
jdebacker Sep 29, 2024
ce11f5f
bump date in changelog
jdebacker Oct 2, 2024
85b9e62
update results for extra run with Kg > 0
jdebacker Oct 2, 2024
0d72a5b
fix get I in non base spend
jdebacker Oct 2, 2024
4137152
Merge remote-tracking branch 'upstream/master' into basespend_adj
jdebacker Oct 2, 2024
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
apply new params in fiscal.py
jdebacker committed Sep 12, 2024
commit 9fc91ce78a40ed5dfed93d6ae9f500866a4bbcb3
4 changes: 2 additions & 2 deletions ogcore/fiscal.py
Original file line number Diff line number Diff line change
@@ -78,7 +78,7 @@ def D_G_path(r_gov, dg_fixed_values, p):
D[0] = D0_baseline

if p.baseline_spending:
G = Gbaseline[: p.T]
G = p.alpha_bs_G * Gbaseline[: p.T]
else:
G = p.alpha_G[: p.T] * Y[: p.T]

@@ -340,7 +340,7 @@ def get_TR(
total_tax_revenue - agg_pension_outlays - G - UBI_outlays - I_g
)
elif p.baseline_spending:
new_TR = TR
new_TR = p.alpha_bs_T * TR
else:
if method == "SS":
new_TR = p.alpha_T[-1] * Y