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

Macro #18

Open
wants to merge 50 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
842b1d4
download Eurostat data and isolate required fertility data
jpycroft Mar 14, 2021
98e6c7f
pop and mort changes
jpycroft Mar 14, 2021
5d52e2f
add TO DO sections
jpycroft Mar 14, 2021
a0382d4
rename file EurostatDemogrpahics
jpycroft Mar 14, 2021
bbd7afa
correct manipulation of fert data
jpycroft Mar 18, 2021
0e3da1b
correct manipulation of fert data
jpycroft Mar 18, 2021
7fe2159
keep age less than zero and sort values by age
jpycroft Mar 18, 2021
08c1451
updates to file
jpycroft Mar 19, 2021
32c53aa
minor change
jpycroft Mar 19, 2021
112b5fd
produce fert_rates including estimating tails
jpycroft Apr 11, 2021
d3c722e
add USA demographics.py as template for UK demographics.py
jpycroft Apr 11, 2021
3697926
add UK version of get_fert based on EurostatDemographics.py - not tested
jpycroft Apr 11, 2021
872109a
format demographics.py using black
jpycroft Apr 12, 2021
b569cd2
format demographics.py with black-79
jpycroft Apr 12, 2021
5be0efb
Updated directory name to og_uk_calibrate
rickecon Apr 20, 2021
63e08ca
Updated imports, added new get_mort, and deleted all other functions …
rickecon Apr 20, 2021
3a91f9d
Added OG-UKplots.mplstyle
rickecon Apr 20, 2021
146efd0
Added mort_rate_data.csv data file in data folder
rickecon Apr 20, 2021
c148bc1
Added mort_rates.png to figures directory
rickecon Apr 20, 2021
69c178f
Added new parameter_plots.py module
rickecon Apr 20, 2021
a041a58
Added tests folder with one placeholder test
rickecon Apr 20, 2021
fc1674c
Fixed code typo in get_mort() in demographics.py
rickecon Apr 20, 2021
bf5ce61
Removed txfunc.py for now
rickecon Apr 20, 2021
8c2a32d
Added back txfunc.py
rickecon Apr 20, 2021
2afd6b8
Reformatted EurostatDemographics.py using black
rickecon Apr 20, 2021
dd48f28
Updated tests for get_mort() in test_demographics.py
rickecon Apr 20, 2021
126a215
Added eurostat package to environment.yml
rickecon Apr 20, 2021
c55896b
Changed import statement for parameter_plots.py module in demographic…
rickecon Apr 20, 2021
a3273ad
updated test_demographics.py get_mort tests
rickecon Apr 20, 2021
f307f6c
updates to oguk_calibrate folder
jpycroft Apr 20, 2021
995c235
Merge pull request #1 from rickecon/jpycroft-demog
jpycroft Apr 20, 2021
a87d9bf
remove PracticeNotes file
jpycroft Apr 20, 2021
8713246
Merge remote-tracking branch 'origin/demog' into demog
jpycroft Apr 20, 2021
3f96364
remove oguk_calibrate folder which has been replaced by og_uk_calibra…
jpycroft Apr 20, 2021
909a25c
updates to og_uk_calibrate, docs, environment
jpycroft Apr 23, 2021
ae58471
add test_get_fert, can visualise output if graph switch to True
jpycroft Apr 23, 2021
1d5a8a5
small changes to get_fert, function now tested
jpycroft Apr 23, 2021
d1da2b3
switch to graph equals False as standard
jpycroft Apr 23, 2021
1c94630
minor change line 375: use loc to avoid setting value on a copy of a…
jpycroft Apr 23, 2021
452d251
add get_imm_resid and the test; consider replacing with Eurostat net …
jpycroft Apr 23, 2021
c46dfac
W-I-P: prelim adding in of immsolve, get_pop_objs
jpycroft Apr 23, 2021
cf7ba01
complete get_pop_objs returns pop_objs; still need to revise get_imm_…
jpycroft Apr 25, 2021
875eb9a
change get_imm_resid to calculate imm_rates, inc. new code for new bo…
jpycroft May 6, 2021
e04e25a
as before, with black format updated
jpycroft May 6, 2021
027ab60
updating from upstream
jpycroft May 18, 2021
1c84f2f
complete get_pop_objs and corresponding test
jpycroft May 18, 2021
880e5f6
Merge remote-tracking branch 'origin/demog' into demog
jpycroft May 18, 2021
87e5e2f
complete get_pop_objs, black formatting
jpycroft May 18, 2021
0298833
macro_params for the UK
jpycroft May 18, 2021
9b88331
macro_params for the UK
jpycroft May 18, 2021
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
switch to graph equals False as standard
  • Loading branch information
jpycroft committed Apr 23, 2021
commit d1da2b36db2f3c778dec7f42966897343109ee57
2 changes: 1 addition & 1 deletion og_uk_calibrate/tests/test_demographics.py
Original file line number Diff line number Diff line change
@@ -59,7 +59,7 @@ def test_get_fert():
Test of function to get fertility rates from data
'''
S = 100
fert_rates = demographics.get_fert(100, 2018, graph=True)
fert_rates = demographics.get_fert(100, 2018, graph=False)
assert (fert_rates.shape[0] == S)