Code

Macro#18

Code

Open

jpycroft wants to merge 50 commits intoPSLmodels:mainPSLmodels/OG-UK:mainfrom jpycroft:macrojpycroft/OG-UK:macroCopy head branch name to clipboard

+2,775

Commits

Commits on Mar 14, 2021

• download Eurostat data and isolate required fertility data

  jpycroft

  committed
  842b1d4

  Copy full SHA for 842b1d4

• pop and mort changes

  jpycroft

  committed
  98e6c7f

  Copy full SHA for 98e6c7f

• add TO DO sections

  jpycroft

  committed
  5d52e2f

  Copy full SHA for 5d52e2f

• rename file EurostatDemogrpahics

  jpycroft

  committed
  a0382d4

  Copy full SHA for a0382d4

Commits on Mar 18, 2021

• correct manipulation of fert data

  jpycroft

  committed
  bbd7afa

  Copy full SHA for bbd7afa

• correct manipulation of fert data

  jpycroft

  committed
  0e3da1b

  Copy full SHA for 0e3da1b

• keep age less than zero and sort values by age

  jpycroft

  committed
  7fe2159

  Copy full SHA for 7fe2159

Commits on Mar 19, 2021

• updates to file

  jpycroft

  committed
  08c1451

  Copy full SHA for 08c1451

• minor change

  jpycroft

  committed
  32c53aa

  Copy full SHA for 32c53aa

Commits on Apr 11, 2021

• produce fert_rates including estimating tails

  jpycroft

  committed
  112b5fd

  Copy full SHA for 112b5fd

• add USA demographics.py as template for UK demographics.py

  jpycroft

  committed
  d3c722e

  Copy full SHA for d3c722e

• add UK version of get_fert based on EurostatDemographics.py - not tested

  jpycroft

  committed
  3697926

  Copy full SHA for 3697926

Commits on Apr 12, 2021

• format demographics.py using black

  jpycroft

  committed
  872109a

  Copy full SHA for 872109a

• format demographics.py with black-79

  jpycroft

  committed
  b569cd2

  Copy full SHA for b569cd2

Commits on Apr 20, 2021

• Updated directory name to og_uk_calibrate

  rickecon

  committed
  5be0efb

  Copy full SHA for 5be0efb

• Updated imports, added new get_mort, and deleted all other functions except get_fert

  rickecon

  committed
  63e08ca

  Copy full SHA for 63e08ca

• Added OG-UKplots.mplstyle

  rickecon

  committed
  3a91f9d

  Copy full SHA for 3a91f9d

• Added mort_rate_data.csv data file in data folder

  rickecon

  committed
  146efd0

  Copy full SHA for 146efd0

• Added mort_rates.png to figures directory

  rickecon

  committed
  c148bc1

  Copy full SHA for c148bc1

• Added new parameter_plots.py module

  rickecon

  committed
  69c178f

  Copy full SHA for 69c178f

• Added tests folder with one placeholder test

  rickecon

  committed
  a041a58

  Copy full SHA for a041a58

• Fixed code typo in get_mort() in demographics.py

  rickecon

  committed
  fc1674c

  Copy full SHA for fc1674c

• Removed txfunc.py for now

  rickecon

  committed
  bf5ce61

  Copy full SHA for bf5ce61

• Added back txfunc.py

  rickecon

  committed
  8c2a32d

  Copy full SHA for 8c2a32d

• Reformatted EurostatDemographics.py using black

  rickecon

  committed
  2afd6b8

  Copy full SHA for 2afd6b8

• Updated tests for get_mort() in test_demographics.py

  rickecon

  committed
  dd48f28

  Copy full SHA for dd48f28

• Added eurostat package to environment.yml

  rickecon

  committed
  126a215

  Copy full SHA for 126a215

• Changed import statement for parameter_plots.py module in demographics.py

  rickecon

  committed
  c55896b

  Copy full SHA for c55896b

• updated test_demographics.py get_mort tests

  rickecon

  committed
  a3273ad

  Copy full SHA for a3273ad

• updates to oguk_calibrate folder

  jpycroft

  committed
  f307f6c

  Copy full SHA for f307f6c

• Merge pull request #1 from rickecon/jpycroft-demog

  Show description for 995c235
  jpycroft

  authored
  995c235

  Copy full SHA for 995c235

• remove PracticeNotes file

  jpycroft

  committed
  a87d9bf

  Copy full SHA for a87d9bf

• Merge remote-tracking branch 'origin/demog' into demog

  jpycroft

  committed
  8713246

  Copy full SHA for 8713246

• remove oguk_calibrate folder which has been replaced by og_uk_calibrate folder

  jpycroft

  committed
  3f96364

  Copy full SHA for 3f96364

Commits on Apr 23, 2021

• updates to og_uk_calibrate, docs, environment

  jpycroft

  committed
  909a25c

  Copy full SHA for 909a25c

• add test_get_fert, can visualise output if graph switch to True

  jpycroft

  committed
  ae58471

  Copy full SHA for ae58471

• small changes to get_fert, function now tested

  jpycroft

  committed
  1d5a8a5

  Copy full SHA for 1d5a8a5

• switch to graph equals False as standard

  jpycroft

  committed
  d1da2b3

  Copy full SHA for d1da2b3

• minor change line 375: use loc to avoid setting value on a copy of a slice from a DataFrame

  jpycroft

  committed
  1c94630

  Copy full SHA for 1c94630

• add get_imm_resid and the test; consider replacing with Eurostat net imm data in future

  jpycroft

  committed
  452d251

  Copy full SHA for 452d251

• W-I-P: prelim adding in of immsolve, get_pop_objs

  jpycroft

  committed
  c46dfac

  Copy full SHA for c46dfac

Commits on Apr 25, 2021

• complete get_pop_objs returns pop_objs; still need to revise get_imm_resid and tidy

  jpycroft

  committed
  cf7ba01

  Copy full SHA for cf7ba01

Commits on May 6, 2021

• change get_imm_resid to calculate imm_rates, inc. new code for new borns, over 90s, smoothing

  jpycroft

  committed
  875eb9a

  Copy full SHA for 875eb9a

• as before, with black format updated

  jpycroft

  committed
  e04e25a

  Copy full SHA for e04e25a

Commits on May 18, 2021

• updating from upstream

  jpycroft

  committed
  027ab60

  Copy full SHA for 027ab60

• complete get_pop_objs and corresponding test

  jpycroft

  committed
  1c84f2f

  Copy full SHA for 1c84f2f

• Merge remote-tracking branch 'origin/demog' into demog

  jpycroft

  committed
  880e5f6

  Copy full SHA for 880e5f6

• complete get_pop_objs, black formatting

  jpycroft

  committed
  87e5e2f

  Copy full SHA for 87e5e2f

• macro_params for the UK

  jpycroft

  committed
  0298833

  Copy full SHA for 0298833

• macro_params for the UK

  jpycroft

  committed
  9b88331

  Copy full SHA for 9b88331