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

Create a demographics module in OG-Core #896

Merged
merged 46 commits into from
Feb 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
31ff6dd
add initail demographics file
jdebacker Jan 15, 2024
0412626
add initial demog tests
jdebacker Jan 15, 2024
3f7b294
add utility to read UN data
jdebacker Jan 15, 2024
9185615
proper import
jdebacker Jan 15, 2024
aa0ee60
start of making objs flexible
jdebacker Jan 15, 2024
077833a
get mort and fert rates from multiple years
jdebacker Jan 21, 2024
3349fd6
update param plots for new fert and mort rate objects
jdebacker Jan 21, 2024
5db0900
data year consistent
jdebacker Jan 22, 2024
0995dca
add imm rates
jdebacker Jan 23, 2024
7364364
reduce args passed to plot funcs
jdebacker Jan 23, 2024
7df27e0
fix year index
jdebacker Jan 23, 2024
463774a
imm rates derived
jdebacker Jan 23, 2024
fc30f99
working on transiton path
jdebacker Jan 24, 2024
ff44dbb
Merge remote-tracking branch 'upstream/master' into demog
jdebacker Jan 25, 2024
e163b0c
remove diagnostic print commands
jdebacker Jan 25, 2024
e181b31
get pop objs refactors
jdebacker Jan 25, 2024
8e82dad
get pop objs runs through
jdebacker Jan 26, 2024
7e049b4
update pop path plot
jdebacker Jan 26, 2024
abc267f
black format
jdebacker Jan 26, 2024
8a5f858
update tests for shape of output
jdebacker Jan 29, 2024
4220292
remove transform of data out
jdebacker Jan 29, 2024
8b0be9b
more test of path of objectS
jdebacker Jan 29, 2024
d167794
remove print commands
jdebacker Jan 29, 2024
1be8831
add test for custom paths
jdebacker Jan 29, 2024
976217c
black format
jdebacker Jan 29, 2024
327fa3b
replace output_dir w path
jdebacker Jan 30, 2024
e099063
replace output_dir w path
jdebacker Jan 30, 2024
46fc09a
make tests consistent with new demog plots
jdebacker Jan 30, 2024
650134a
format
jdebacker Jan 30, 2024
32f68aa
format with latest black version
jdebacker Jan 30, 2024
de3568b
change imm tol
jdebacker Jan 30, 2024
6bedc91
do not keep ages 100+
jdebacker Jan 31, 2024
e331ca4
specify age range 0 to 99
jdebacker Jan 31, 2024
1d2e868
remove print statements
jdebacker Jan 31, 2024
6095e79
format
jdebacker Jan 31, 2024
1a9a001
change plots of pop paths args
jdebacker Feb 1, 2024
d000f0e
allow for custom pop_dst
jdebacker Feb 1, 2024
5299b26
update tests for changes to demog
jdebacker Feb 1, 2024
36d7358
fixes to finding pop
jdebacker Feb 1, 2024
d92adb6
new tests added
jdebacker Feb 1, 2024
87a2665
format
jdebacker Feb 1, 2024
c0e42e7
reorder
jdebacker Feb 3, 2024
0557683
correct pop dist dims
jdebacker Feb 3, 2024
6062c16
format
jdebacker Feb 3, 2024
0c8a44c
reorg arguments
jdebacker Feb 3, 2024
974eac0
update plot test for new arg order
jdebacker Feb 3, 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
1 change: 1 addition & 0 deletions docs/book/content/theory/images/SS_images.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
documentation
------------------------------------------------------------------------
"""

# Import libraries, packages, and modules
import pickle
import os
Expand Down
3 changes: 0 additions & 3 deletions ogcore/SS.py
Original file line number Diff line number Diff line change
Expand Up @@ -481,9 +481,6 @@ def inner_loop(outer_loop_vars, p, client):
debt_service,
p,
)
print("Agg tax = ", total_tax_revenue)
print("Agg pension outlays = ", agg_pension_outlays)
print("Agg UBI outlays = ", UBI_outlays)
new_TR = fiscal.get_TR(
Y,
TR,
Expand Down
1 change: 1 addition & 0 deletions ogcore/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Specify what is available to import from the ogcore package.
"""

from ogcore.SS import *
from ogcore.TPI import *
from ogcore.aggregates import *
Expand Down
Loading
Loading