Add Erwerbsminderungsrente #577

nafetsk · 2023-04-28T13:21:31Z

Implementation of pension for reduced earning capacity (Erwerbsminderungsrente) as addition to the pension system already existing in gettsim.

The special feature of the pension for reduced earning capacity are the additional earning points. Average earning points per year are calculated for every individual and attributed for the time between retirement and an allocation age limit (Zurechnungszeitsgrenze). There are also special rules for (Zugangsfaktor) and (Rentenfaktor) both relevant for the calculation of the total pension claim.

Three new input variables are introduced.

voll_erwerbsgemind: Unable to provide more than 3 hours of market labor per day.
teilw_erwerbsgemind: Able to provide at least 3 but no more than 6 hours of market labor per day.
XXX

Work in Progress

amageh

Nice work, I left some comments that we can discuss later :-).

src/_gettsim/parameters/erwerbsm_rente.yaml

src/_gettsim/transfers/erwerbsm_rente.py

src/_gettsim/parameters/erwerbsm_rente.yaml

src/_gettsim/transfers/erwerbsm_rente.py

Added check for Grundrentenzuschlag Added erwerbsm_rente_m to default targets Zugangsfaktor for Erwerbsminderungsrente is now calculated on a monthly basis Adjusted test for new calculation method

hmgaudecker · 2023-05-11T14:24:06Z

This will be a very large PR.

It would be helpful to move things that affect other dimensions than Erwerbsminderungsrente to separate PRs.

E.g. if we need to differentiate the stock of points earned by geographic region, we should do so in two stock variables, not one stock, one share. Doing so will affect all pension payments (I suppose) and issues related to that can be discussed without reference to Erwerbsminderungsrente.

nafetsk · 2023-05-17T11:21:53Z

This will be a very large PR.

It would be helpful to move things that affect other dimensions than Erwerbsminderungsrente to separate PRs.

E.g. if we need to differentiate the stock of points earned by geographic region, we should do so in two stock variables, not one stock, one share. Doing so will affect all pension payments (I suppose) and issues related to that can be discussed without reference to Erwerbsminderungsrente.

Sorry for the late response. You are right, the differentiation between EPs should be discussed on another PR. I removed the last commit

…echnungszeitsgrenze between 2001 and 2003

…bsminderunsgrente

…nloader

codecov · 2023-06-19T09:09:29Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (8c330ab) 91.25% compared to head (2494efe) 91.39%.

❗ Current head 2494efe differs from pull request most recent head aa4a24b. Consider uploading reports for the commit aa4a24b to get more accurate results

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #577      +/-   ##
==========================================
+ Coverage   91.25%   91.39%   +0.14%     
==========================================
  Files          49       50       +1     
  Lines        3315     3369      +54     
==========================================
+ Hits         3025     3079      +54     
  Misses        290      290

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

…OEP-RV data in order to fuel final test and hopefully close PR soon

…economics/gettsim into em_rente

hmgaudecker

We are getting close!

docs/gettsim_objects/input_variables.md

src/_gettsim/config.py

src/_gettsim/parameters/erwerbsm_rente.yaml

hmgaudecker · 2023-11-28T08:26:52Z

src/_gettsim/transfers/erwerbsm_rente.py

+    return out
+
+
+def langj_versicherte_wartezeit(  # noqa: PLR0913


Suggested change

def langj_versicherte_wartezeit( # noqa: PLR0913

def _erwerbsm_rente_langj_versicherte_wartezeit( # noqa: PLR0913

For now we'll need to be explicit about this.

src/_gettsim/transfers/rente.py

src/_gettsim_tests/test_data/erwerbsm_rente/2001/hh_id_1.yaml

hmgaudecker · 2023-11-28T08:35:06Z

src/_gettsim_tests/test_data/erwerbsm_rente/2001/hh_id_1.yaml

This should become five test cases.

Please give them names that check what is being tested. E.g. voll_erwerbsgemindert_birthyear_1940.

(The hh_id-stuff is only there for legacy reasons, i.e. the bulk conversion of csv-files)

ah okay good to know. I was always wondering about that "naming convention".
Is there already some kind of script/tool for splitting those yaml files up?

We had one for csv -> yaml, but I am not sure whether it is helpful here. @lars-reimann would know.

Otherwise, I'd just read them into a DataFrame and write out again row-by-row.

The conversion script is available here. It was not designed with reusability in mind, but rather to run it once on the old CSV test data.

Thanks a lot. I finally used that script here. Maybe we can add it to the gettsim-code-for-picking repo so people can reuse it.

docs/gettsim_objects/input_variables.md

nafetsk · 2023-12-01T15:30:00Z

I think all suggestions are implemented now @hmgaudecker . The only problem left is that the function name 'erwerbsm_rente_langj_versicherte_wartezeit' is too long but i dont know how to shorten it without losing precision.

hmgaudecker · 2023-12-01T15:32:45Z

I think all suggestions are implemented now @hmgaudecker . The only problem left is that the function name 'erwerbsm_rente_langj_versicherte_wartezeit' is too long but i dont know how to shorten it without losing precision.

Even too long if you add an underscore upfront?

nafetsk · 2023-12-01T15:49:35Z

I think all suggestions are implemented now @hmgaudecker . The only problem left is that the function name 'erwerbsm_rente_langj_versicherte_wartezeit' is too long but i dont know how to shorten it without losing precision.

Even too long if you add an underscore upfront?

I was not aware of that feature. Now it works👍

hmgaudecker

Just a few quick comments, gotta stop now. Rest looks good at a glance, too, though!

docs/gettsim_objects/input_variables.md

src/_gettsim/transfers/erwerbsm_rente.py

hmgaudecker

Wonderful, thanks a lot! Just a couple of small changes left, nothing substantial.

src/_gettsim/transfers/erwerbsm_rente.py

...gettsim_tests/test_data/erwerbsm_rente/2001/teilw_erwerbsgemindert_birthyear_1980_claim.yaml

updates: - [github.com/lyz-code/yamlfix: 1.15.0 → 1.16.0](lyz-code/yamlfix@1.15.0...1.16.0) - [github.com/astral-sh/ruff-pre-commit: v0.1.5 → v0.1.6](astral-sh/ruff-pre-commit@v0.1.5...v0.1.6) - [github.com/nbQA-dev/nbQA: 1.7.0 → 1.7.1](nbQA-dev/nbQA@1.7.0...1.7.1) - [github.com/pre-commit/mirrors-mypy: v1.7.0 → v1.7.1](pre-commit/mirrors-mypy@v1.7.0...v1.7.1)

…o em_rente

Stefan Klotz added 5 commits March 29, 2023 15:36

"Test"

f157bef

"Back to normal"

520deff

Erwerbsminderungsrente

6b8af52

Basic Implementation of Erwerbsminderungsrente.

f80eddd

Work in Progress

restore rente.py after accidentally editing it

6e368ff

ChristianZimpelmann requested review from hmgaudecker and removed request for hmgaudecker April 28, 2023 13:48

Stefan Klotz added 2 commits April 28, 2023 16:21

fixing typo

5bfa2fe

placeholder for test, data still needed

4ff178e

amageh reviewed May 2, 2023

View reviewed changes

Stefan Klotz added 4 commits May 4, 2023 11:27

added comments and sources to the erwerbsm_rente.yaml file

38152e2

minor style fixes

1dc30e9

Changed name of input variable to “m_gesamtbew”

8784c09

Added check for Grundrentenzuschlag Added erwerbsm_rente_m to default targets Zugangsfaktor for Erwerbsminderungsrente is now calculated on a monthly basis Adjusted test for new calculation method

Merge branch 'main' into em_rente

079e433

nafetsk force-pushed the em_rente branch from 4d723b3 to 079e433 Compare May 17, 2023 09:42

Stefan Klotz added 5 commits May 17, 2023 16:21

Added a new function considering the special parameters regime of Zur…

da59ebb

…echnungszeitsgrenze between 2001 and 2003

new input variable erwerbsm_rentner checking for elegibility og Erwer…

1853fb5

…bsminderunsgrente

Merge branch 'main' into em_rente

2a594be

marked unfinished pytest to fail, added erwerbsm_rente to doc functio…

38eb16d

…nloader

fixed bug

6f2df68

Stefan_Klotz added 2 commits June 19, 2023 14:32

started converting csv test-data to yaml. Not finished, waiting for S…

1459548

…OEP-RV data in order to fuel final test and hopefully close PR soon

preparations for final test

b09f4b1

hmgaudecker mentioned this pull request Jul 18, 2023

Pensions: Things to check, enhancements #607

Open

2 tasks

Stefan Klotz added 2 commits July 31, 2023 10:31

merged main branch in em_rente branch

c6b5eea

fixing bug concerning zurechnungszeit

acde018

nafetsk mentioned this pull request Aug 1, 2023

BUG: piecewise_polynomial ignores intercepts except for the first one #629

Closed

amageh linked an issue Aug 1, 2023 that may be closed by this pull request

BUG: piecewise_polynomial ignores intercepts except for the first one #629

Closed

hmgaudecker and others added 8 commits November 17, 2023 11:03

Merge branch 'main' into em_rente

1ca08f9

renaming parameters and inputvariable

a25aa4b

Merge branch 'em_rente' of https://github.com/iza-institute-of-labor-…

34def28

…economics/gettsim into em_rente

resolce merge conflict

be87806

added langj_versicherte_wartezeit function and modified test cases

f557074

Merge branch 'main' into em_rente

8f21b16

adapted erwerbsminderungsrente to entgeltpunkte west east

95beda9

Merge branch 'main' into em_rente

d2b2285

hmgaudecker reviewed Nov 28, 2023

View reviewed changes

Stefan Klotz and others added 7 commits November 28, 2023 11:32

implemented suggestions from review

73fd18e

made voll_erwerbsgemindert and teilw_erwerbsgemindert mutually exclusiv

b43059e

added dates active decorator to functions of module

3aed098

small fixes for Wartezeit function and additional test case

25760ff

Merge branch 'main' into em_rente

669ad62

splitting up yaml files

9c8d3a2

finish splitting up yaml files

ff909c9

changed names for naming convention

1d4eb5b

hmgaudecker changed the title ~~erwerbsm_rente~~ Add Erwerbsminderungsrente Dec 2, 2023

hmgaudecker reviewed Dec 2, 2023

View reviewed changes

move general pension functions to ges_renten module

1182757

hmgaudecker approved these changes Dec 3, 2023

View reviewed changes

src/_gettsim/transfers/erwerbsm_rente.py Outdated Show resolved Hide resolved

...gettsim_tests/test_data/erwerbsm_rente/2001/teilw_erwerbsgemindert_birthyear_1980_claim.yaml Outdated Show resolved Hide resolved

Stefan Klotz and others added 4 commits December 4, 2023 15:01

delete provided keyword

2494efe

Merge remote-tracking branch 'origin/pre-commit-ci-update-config' int…

307d0f5

…o em_rente

Fix nbqa/ruff version to mach main ruff.

aa4a24b

hmgaudecker merged commit 933371f into main Dec 6, 2023
5 checks passed

hmgaudecker deleted the em_rente branch December 6, 2023 09:04

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Erwerbsminderungsrente #577

Add Erwerbsminderungsrente #577

nafetsk commented Apr 28, 2023 •

edited by hmgaudecker

Loading

amageh left a comment

hmgaudecker commented May 11, 2023 •

edited

Loading

nafetsk commented May 17, 2023 •

edited by hmgaudecker

Loading

codecov bot commented Jun 19, 2023 •

edited

Loading

hmgaudecker left a comment

hmgaudecker Nov 28, 2023

hmgaudecker Nov 28, 2023

nafetsk Nov 28, 2023

hmgaudecker Nov 28, 2023

lars-reimann Nov 28, 2023 •

edited

Loading

nafetsk Dec 1, 2023

nafetsk commented Dec 1, 2023

hmgaudecker commented Dec 1, 2023 •

edited

Loading

nafetsk commented Dec 1, 2023

hmgaudecker left a comment

hmgaudecker left a comment

	def langj_versicherte_wartezeit( # noqa: PLR0913
	def _erwerbsm_rente_langj_versicherte_wartezeit( # noqa: PLR0913

Add Erwerbsminderungsrente #577

Add Erwerbsminderungsrente #577

Conversation

nafetsk commented Apr 28, 2023 • edited by hmgaudecker Loading

amageh left a comment

Choose a reason for hiding this comment

hmgaudecker commented May 11, 2023 • edited Loading

nafetsk commented May 17, 2023 • edited by hmgaudecker Loading

codecov bot commented Jun 19, 2023 • edited Loading

Codecov Report

hmgaudecker left a comment

Choose a reason for hiding this comment

hmgaudecker Nov 28, 2023

Choose a reason for hiding this comment

hmgaudecker Nov 28, 2023

Choose a reason for hiding this comment

nafetsk Nov 28, 2023

Choose a reason for hiding this comment

hmgaudecker Nov 28, 2023

Choose a reason for hiding this comment

lars-reimann Nov 28, 2023 • edited Loading

Choose a reason for hiding this comment

nafetsk Dec 1, 2023

Choose a reason for hiding this comment

nafetsk commented Dec 1, 2023

hmgaudecker commented Dec 1, 2023 • edited Loading

nafetsk commented Dec 1, 2023

hmgaudecker left a comment

Choose a reason for hiding this comment

hmgaudecker left a comment

Choose a reason for hiding this comment

nafetsk commented Apr 28, 2023 •

edited by hmgaudecker

Loading

hmgaudecker commented May 11, 2023 •

edited

Loading

nafetsk commented May 17, 2023 •

edited by hmgaudecker

Loading

codecov bot commented Jun 19, 2023 •

edited

Loading

lars-reimann Nov 28, 2023 •

edited

Loading

hmgaudecker commented Dec 1, 2023 •

edited

Loading