Code

Add additional pension systems#946

Code

Merged

rickecon merged 52 commits intoPSLmodels:masterPSLmodels/OG-Core:masterfrom jdebacker:pensionsjdebacker/OG-Core:pensionsCopy head branch name to clipboardJul 28, 2024

Commits

Commits on Jun 28, 2024

• move pensions to new module

  jdebacker

  committed
  1dce953

  Copy full SHA for 1dce953

• update testing for new pension module

  jdebacker

  committed
  090c953

  Copy full SHA for 090c953

• update module used

  jdebacker

  committed
  18d8523

  Copy full SHA for 18d8523

Commits on Jun 29, 2024

• add parameter for type of pension system

  jdebacker

  committed
  7568cb0

  Copy full SHA for 7568cb0

• add numba to env

  jdebacker

  committed
  8c041e4

  Copy full SHA for 8c041e4

• add parameters for other pension systems

  jdebacker

  committed
  adaffce

  Copy full SHA for adaffce

• copy over initial functions for other pension systems

  jdebacker

  committed
  d73d85a

  Copy full SHA for d73d85a

Commits on Jul 1, 2024

• update refs to param obj

  jdebacker

  committed
  bd862ea

  Copy full SHA for bd862ea

• fix typo

  jdebacker

  committed
  0cf250b

  Copy full SHA for 0cf250b

Commits on Jul 2, 2024

• add test

  jdebacker

  committed
  40496e5

  Copy full SHA for 40496e5

Commits on Jul 3, 2024

• test passing

  jdebacker

  committed
  9bdd3c4

  Copy full SHA for 9bdd3c4

• fix param references

  jdebacker

  committed
  a5f3b5b

  Copy full SHA for a5f3b5b

• more tests

  jdebacker

  committed
  4615306

  Copy full SHA for 4615306

Commits on Jul 4, 2024

• more tests

  jdebacker

  committed
  7916656

  Copy full SHA for 7916656

• more tests

  jdebacker

  committed
  28d4afd

  Copy full SHA for 28d4afd

Commits on Jul 6, 2024

• more tests

  jdebacker

  committed
  ee8916e

  Copy full SHA for ee8916e

• more tetss

  jdebacker

  committed
  40af2ed

  Copy full SHA for 40af2ed

Commits on Jul 8, 2024

• add another test

  jdebacker

  committed
  eda9ef2

  Copy full SHA for eda9ef2

Commits on Jul 9, 2024

• more tests

  jdebacker

  committed
  33e5206

  Copy full SHA for 33e5206

• all old tests passing

  jdebacker

  committed
  d031c2b

  Copy full SHA for d031c2b

Commits on Jul 10, 2024

• test main benefit func

  jdebacker

  committed
  11ea38e

  Copy full SHA for 11ea38e

• start test case for SS

  jdebacker

  committed
  8fa4fe2

  Copy full SHA for 8fa4fe2

Commits on Jul 13, 2024

• start to update docs

  jdebacker

  committed
  54bcb91

  Copy full SHA for 54bcb91

Commits on Jul 14, 2024

• update docs

  jdebacker

  committed
  7278eb6

  Copy full SHA for 7278eb6

Commits on Jul 16, 2024

• add other taxes to revenue eq'n

  jdebacker

  committed
  8824ef2

  Copy full SHA for 8824ef2

• do same for statinoarized eq'n

  jdebacker

  committed
  cca3b7e

  Copy full SHA for cca3b7e

• break out pensions in GBC

  jdebacker

  committed
  39bf423

  Copy full SHA for 39bf423

• describe SS system in detail

  jdebacker

  committed
  e58df57

  Copy full SHA for e58df57

• update docs

  jdebacker

  committed
  1b4f042

  Copy full SHA for 1b4f042

Commits on Jul 17, 2024

• consolidate parameters for average earnings

  jdebacker

  committed
  262b214

  Copy full SHA for 262b214

• update db replacement rate parameter

  jdebacker

  committed
  699d4b5

  Copy full SHA for 699d4b5

• tests with new parameter definitions

  jdebacker

  committed
  52e7480

  Copy full SHA for 52e7480

Commits on Jul 20, 2024

• start with doc strings

  jdebacker

  committed
  955b97e

  Copy full SHA for 955b97e

Commits on Jul 21, 2024

• complete doc strings

  jdebacker

  committed
  f6d7b82

  Copy full SHA for f6d7b82

Commits on Jul 26, 2024

• Merge remote-tracking branch 'upstream/master' into pensions

  jdebacker

  committed
  e8610f2

  Copy full SHA for e8610f2

• add indR as parameter

  jdebacker

  committed
  4fe13f8

  Copy full SHA for 4fe13f8

• fix book formatting

  jdebacker

  committed
  2614498

  Copy full SHA for 2614498

• model period equiv for years of contributions parameter

  jdebacker

  committed
  7574da9

  Copy full SHA for 7574da9

Commits on Jul 27, 2024

• have year contribution turn into model periods

  jdebacker

  committed
  48d7090

  Copy full SHA for 48d7090

• rename param

  jdebacker

  committed
  fec6570

  Copy full SHA for fec6570

• remove typo

  jdebacker

  committed
  276a786

  Copy full SHA for 276a786

• add math to docstrings

  jdebacker

  committed
  bb3abe9

  Copy full SHA for bb3abe9

• space

  jdebacker

  committed
  4636024

  Copy full SHA for 4636024

• api docs or new pension module and funcs

  jdebacker

  committed
  56d0c2e

  Copy full SHA for 56d0c2e

• format

  jdebacker

  committed
  0b1cfae

  Copy full SHA for 0b1cfae

• format

  jdebacker

  committed
  c62aadd

  Copy full SHA for c62aadd

• use pension not tax module for pension funcs

  jdebacker

  committed
  e49d547

  Copy full SHA for e49d547

• update parameter names in constant

  jdebacker

  committed
  bba5268

  Copy full SHA for bba5268

• fix df name

  jdebacker

  committed
  9be34de

  Copy full SHA for 9be34de

Commits on Jul 28, 2024

• Updated version and added numba to setup.py

  rickecon

  committed
  cf3f544

  Copy full SHA for cf3f544

• Added numba to requirements.txt

  rickecon

  committed
  f44266f

  Copy full SHA for f44266f

• Merge pull request #34 from rickecon/jdebacker-pensions

  Show description for f3b21f2
  jdebacker

  authored
  f3b21f2

  Copy full SHA for f3b21f2