-
Notifications
You must be signed in to change notification settings - Fork 31
Move GETTSIM params files, use new machinery #908
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
Merged
hmgaudecker
merged 133 commits into
collect-unify-parsing-of-params
from
move-gettsim-params-files
May 28, 2025
Merged
Move GETTSIM params files, use new machinery #908
hmgaudecker
merged 133 commits into
collect-unify-parsing-of-params
from
move-gettsim-params-files
May 28, 2025
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…nsider parameters outside their active period.
|
@MImmesberger, asking for a review so you please have a check, not in order to merge yet. From now on, let us please make smallish PRs against this one when converting parameter files. This said, I won't be able to do much the next couple of days due to the CRC conference! |
|
Yes, I will try to go over the remaining ones as much as possible. |
### What problem do you want to solve? Moves params of ALG1 and ALG2 to their namespace. Closes #826, #910 --------- Co-authored-by: Hans-Martin von Gaudecker <[email protected]>
This was referenced May 19, 2025
Merged
### What problem do you want to solve? Make the ID creation functions in Gettsim and Mettsim jittable. ### Todo - [x] Make Gettsim ID's jittable - [x] Make METTSIM ID's jittable. - [x] Change tests to the new ID values --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Hans-Martin von Gaudecker <[email protected]>
Move Sozialversicherung params to their namespace --------- Co-authored-by: Hans-Martin von Gaudecker <[email protected]>
Move Lohnsteuer parameters to their namespace. Also add the parameters from the BMF Programmablaufplan for 2024 and 2025.
Move the Wohngeld parameters to use the new machinery etc. Fixes #711 --------- Co-authored-by: Marvin Immesberger <[email protected]>
Merged
Move Erziehungsgeld and Elterngeld parameters to new parameter infrastructure.
Fix a couple of things we missed in previous PRs: - Move the Arbeitgeberpauschale for Lohnsteuer over to the Lohnsteuer namespace - Improve description of (`wohngeld`, `max_anzahl_personen`)
Co-authored-by: Hans-Martin von Gaudecker <[email protected]>
Remove the `params` attribute of `PolicyEnvironment` and everything related to it.
MImmesberger
approved these changes
May 27, 2025
hmgaudecker
added a commit
that referenced
this pull request
Jul 24, 2025
This PR collects the different components of changing GETTSIM's internal DAG from a flat namespace to a nested one. It also updates the entire interface, the core components that have nothing to do with the specifics of the German taxes and transfers system have been extracted to https://github.com/ttsim-dev/ttsim. This is a very large change spanning more than 100 individual PRs. For a near-complete list, see the changelog, here are some excerpts: - [x] Infrastructure #780 - [x] Use qualified names for rounding keys #824 - [x] Renaming #805 - [x] Fixing the check regarding overlapping periods of policy functions #830 - [x] Getting rid of TYPES_INPUT_VARIABLES and other cruft #833 - [x] Use relative paths wherever possible #957 - [x] First pass restructuring directories to separate ttsim and gettsim (#850) - [x] #908 - [x] #853 - [x] #918, #883 - [x] #920 - [x] Required interface changes (parts of #781) - [x] Convert test files from qualified name dicts to nested structure dicts #884 - [x] Make ttsim a separate package. --------- Co-authored-by: Lars Reimann <[email protected]> Co-authored-by: Marvin Immesberger <[email protected]> Co-authored-by: Tim Mensinger <[email protected]> Co-authored-by: Felix Schmitz <[email protected]> Co-authored-by: Max Jahn <[email protected]> Co-authored-by: JuergenWiemers <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Another to-do from #897.
Move the parameters from
src/_gettsim/parametersinto the correct location of the tree.Break up if necessary so that each parameter ends up at the correct location
Use new machinery. When touching the functions, remove the parts of the docstrings referencing other functions.
Once done, remove the old machinery.
abgelt_st (this PR)
arbeitsl_geld (Move ALG 1 + 2 params to namespace #912)
arbeitsl_geld_2 (Move ALG 1 + 2 params to namespace #912)
arbeitslosenversicherung (Move Sozialversicherung params to namespace #914)
eink_st (this PR)
eink_st_abzuege (this PR)
elterngeld (Move Erziehungsgeld + Elterngeld #933)
erwerbsm_rente (Move Sozialversicherung params to namespace #914)
erziehungsgeld (Move Erziehungsgeld + Elterngeld #933)
geringfügige_einkommen (Move Sozialversicherung params to namespace #914)
ges_krankenv (Move Sozialversicherung params to namespace #914)
ges_pflegev (Move Sozialversicherung params to namespace #914)
ges_rente (Move Sozialversicherung params to namespace #914)
ges_rentenv (Move Sozialversicherung params to namespace #914)
grunds_im_alter (Move Unterhalt, Unterhaltsvorschuss and Grundsicherung im Alter #936)
kindergeld (this PR)
kinderzuschl (Move Kinderzuschlag parameters #927)
lohnst (Move Lohnsteuer params #931)
soli_st (this PR)
unterhalt (Move Unterhalt, Unterhaltsvorschuss and Grundsicherung im Alter #936)
unterhaltsvors (Move Unterhalt, Unterhaltsvorschuss and Grundsicherung im Alter #936)
wohngeld (Move Wohngeld params #932)
Also:
Move parameter classes toEdit HMG: I don't think we want to do that. Would just bring back the whole namespace issue. As long as we don't have to import to other modules, we are fine.param_types.py