Skip to content

Commit 4a58c8e

Browse files
committed
fix: use _eg instead of _hh for Grundsicherung im Alter
1 parent 55a1d7a commit 4a58c8e

File tree

28 files changed

+59
-59
lines changed

28 files changed

+59
-59
lines changed

docs/gettsim_objects/variables_out.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ You can find their individual calculation in the documentation of all {ref}`func
4242
- Monthly parental leave benefit
4343
* - {func}`wohngeld_m_hh <_gettsim.functions.wohngeld_m_hh>`
4444
- Monthly housing benefit on household level
45-
* - {func}`grunds_im_alter_m_hh <_gettsim.functions.grunds_im_alter_m_hh>`
45+
* - {func}`grunds_im_alter_m_eg <_gettsim.functions.grunds_im_alter_m_eg>`
4646
- Monthly subsistence payment for retirees on household level
4747
```

src/_gettsim/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ def set_array_backend(backend: str):
131131
"kinderzuschl_m_bg",
132132
"wohngeld_m_hh",
133133
"unterhaltsvors_m_hh",
134-
"grunds_im_alter_m_hh",
134+
"grunds_im_alter_m_eg",
135135
"ges_rente_m",
136136
"erwerbsm_rente_m",
137137
]

src/_gettsim/transfers/grunds_im_alter.py

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
from _gettsim.shared import dates_active
33

44

5-
def grunds_im_alter_m_hh( # noqa: PLR0913
5+
def grunds_im_alter_m_eg( # noqa: PLR0913
66
arbeitsl_geld_2_regelbedarf_m_bg: float,
7-
_grunds_im_alter_mehrbedarf_schwerbeh_g_m_hh: float,
8-
kindergeld_m_hh: float,
9-
kind_unterh_erhalt_m_hh: float,
10-
unterhaltsvors_m_hh: float,
7+
_grunds_im_alter_mehrbedarf_schwerbeh_g_m_eg: float,
8+
kindergeld_m_eg: float,
9+
kind_unterh_erhalt_m_eg: float,
10+
unterhaltsvors_m_eg: float,
1111
grunds_im_alter_eink_m_eg: float,
12-
erwachsene_alle_rentner_hh: bool,
13-
vermögen_bedürft_hh: float,
12+
erwachsene_alle_rentner_eg: bool,
13+
vermögen_bedürft_eg: float,
1414
grunds_im_alter_vermög_freib_fg: float,
1515
) -> float:
1616
"""Calculate Grundsicherung im Alter on household level.
@@ -26,21 +26,21 @@ def grunds_im_alter_m_hh( # noqa: PLR0913
2626
----------
2727
arbeitsl_geld_2_regelbedarf_m_bg
2828
See :func:`arbeitsl_geld_2_regelbedarf_m_bg`.
29-
_grunds_im_alter_mehrbedarf_schwerbeh_g_m_hh
30-
See :func:`_grunds_im_alter_mehrbedarf_schwerbeh_g_m_hh`.
31-
kindergeld_m_hh
32-
See :func:`kindergeld_m_hh`.
33-
kind_unterh_erhalt_m_hh
29+
_grunds_im_alter_mehrbedarf_schwerbeh_g_m_eg
30+
See :func:`_grunds_im_alter_mehrbedarf_schwerbeh_g_m_eg`.
31+
kindergeld_m_eg
32+
See :func:`kindergeld_m_eg`.
33+
kind_unterh_erhalt_m_eg
3434
See basic input variable
35-
:ref:`kind_unterh_erhalt_m_hh <kind_unterh_erhalt_m_hh>`.
36-
unterhaltsvors_m_hh
37-
See :func:`unterhaltsvors_m_hh`.
35+
:ref:`kind_unterh_erhalt_m_eg <kind_unterh_erhalt_m_eg>`.
36+
unterhaltsvors_m_eg
37+
See :func:`unterhaltsvors_m_eg`.
3838
grunds_im_alter_eink_m_eg
3939
See :func:`grunds_im_alter_eink_m_eg`.
40-
erwachsene_alle_rentner_hh
41-
See :func:`erwachsene_alle_rentner_hh`.
42-
vermögen_bedürft_hh
43-
See basic input variable :ref:`vermögen_bedürft_hh`.
40+
erwachsene_alle_rentner_eg
41+
See :func:`erwachsene_alle_rentner_eg`.
42+
vermögen_bedürft_eg
43+
See basic input variable :ref:`vermögen_bedürft_eg`.
4444
grunds_im_alter_vermög_freib_fg
4545
See :func:`grunds_im_alter_vermög_freib_fg`.
4646
Returns
@@ -50,19 +50,19 @@ def grunds_im_alter_m_hh( # noqa: PLR0913
5050

5151
# Wealth check
5252
# Only pay Grundsicherung im Alter if all adults are retired (see docstring)
53-
if (vermögen_bedürft_hh >= grunds_im_alter_vermög_freib_fg) or (
54-
not erwachsene_alle_rentner_hh
53+
if (vermögen_bedürft_eg >= grunds_im_alter_vermög_freib_fg) or (
54+
not erwachsene_alle_rentner_eg
5555
):
5656
out = 0.0
5757
else:
5858
# Subtract income
5959
out = (
6060
arbeitsl_geld_2_regelbedarf_m_bg
61-
+ _grunds_im_alter_mehrbedarf_schwerbeh_g_m_hh
61+
+ _grunds_im_alter_mehrbedarf_schwerbeh_g_m_eg
6262
- grunds_im_alter_eink_m_eg
63-
- kind_unterh_erhalt_m_hh
64-
- unterhaltsvors_m_hh
65-
- kindergeld_m_hh
63+
- kind_unterh_erhalt_m_eg
64+
- unterhaltsvors_m_eg
65+
- kindergeld_m_eg
6666
)
6767

6868
return max(out, 0.0)
@@ -250,7 +250,7 @@ def grunds_im_alter_priv_rente_m(
250250

251251
def _grunds_im_alter_mehrbedarf_schwerbeh_g_m(
252252
schwerbeh_g: bool,
253-
anz_erwachsene_hh: int,
253+
anz_erwachsene_eg: int,
254254
grunds_im_alter_params: dict,
255255
arbeitsl_geld_2_params: dict,
256256
) -> float:
@@ -260,8 +260,8 @@ def _grunds_im_alter_mehrbedarf_schwerbeh_g_m(
260260
----------
261261
schwerbeh_g
262262
See basic input variable :ref:`behinderungsgrad <schwerbeh_g>`.
263-
anz_erwachsene_hh
264-
See :func:`anz_erwachsene_hh`.
263+
anz_erwachsene_eg
264+
See :func:`anz_erwachsene_eg`.
265265
ges_rente_params
266266
See params documentation :ref:`ges_rente_params <ges_rente_params>`.
267267
arbeitsl_geld_2_params
@@ -278,9 +278,9 @@ def _grunds_im_alter_mehrbedarf_schwerbeh_g_m(
278278
grunds_im_alter_params["mehrbedarf_schwerbeh_g"]
279279
)
280280

281-
if (schwerbeh_g) and (anz_erwachsene_hh == 1):
281+
if (schwerbeh_g) and (anz_erwachsene_eg == 1):
282282
out = mehrbedarf_single
283-
elif (schwerbeh_g) and (anz_erwachsene_hh > 1):
283+
elif (schwerbeh_g) and (anz_erwachsene_eg > 1):
284284
out = mehrbedarf_in_couple
285285
else:
286286
out = 0.0

src/_gettsim_tests/test_data/grunds_im_alter/2017-07-01/hh_id_13.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
info:
33
note: >-
44
Added capital income of 10 euros for household (expected difference in
5-
grunds_im_alter_m_hh ((10*12)-26)/12)=7.83333333)
5+
grunds_im_alter_m_eg ((10*12)-26)/12)=7.83333333)
66
source: >-
77
Adjusted test case based on
88
https://www.bpb.de/politik/innenpolitik/rentenpolitik/289395/leistungshoehe-und-fallbeispiele
@@ -109,6 +109,6 @@ inputs:
109109
- 1950
110110
assumed: {}
111111
outputs:
112-
grunds_im_alter_m_hh:
112+
grunds_im_alter_m_eg:
113113
- 314.1666667
114114
- 314.1666667

src/_gettsim_tests/test_data/grunds_im_alter/2017-07-01/hh_id_16.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,5 @@ inputs:
7272
- 1967
7373
assumed: {}
7474
outputs:
75-
grunds_im_alter_m_hh:
75+
grunds_im_alter_m_eg:
7676
- 356.03

src/_gettsim_tests/test_data/grunds_im_alter/2017-07-01/hh_id_17.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,5 @@ inputs:
7272
- 1935
7373
assumed: {}
7474
outputs:
75-
grunds_im_alter_m_hh:
75+
grunds_im_alter_m_eg:
7676
- 236.03

src/_gettsim_tests/test_data/grunds_im_alter/2017-07-01/hh_id_6.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,6 @@ inputs:
105105
- 1950
106106
assumed: {}
107107
outputs:
108-
grunds_im_alter_m_hh:
108+
grunds_im_alter_m_eg:
109109
- 322.0
110110
- 322.0

src/_gettsim_tests/test_data/grunds_im_alter/2018-07-01/hh_id_12.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,5 +76,5 @@ inputs:
7676
- 1950
7777
assumed: {}
7878
outputs:
79-
grunds_im_alter_m_hh:
79+
grunds_im_alter_m_eg:
8080
- 202.0

src/_gettsim_tests/test_data/grunds_im_alter/2018-07-01/hh_id_20.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,5 @@ inputs:
7272
- 1950
7373
assumed: {}
7474
outputs:
75-
grunds_im_alter_m_hh:
75+
grunds_im_alter_m_eg:
7676
- 0.0

src/_gettsim_tests/test_data/grunds_im_alter/2018-07-01/hh_id_22.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,5 @@ inputs:
7272
- 1950
7373
assumed: {}
7474
outputs:
75-
grunds_im_alter_m_hh:
75+
grunds_im_alter_m_eg:
7676
- 202.0

0 commit comments

Comments
 (0)