-
Notifications
You must be signed in to change notification settings - Fork 31
GEP 7 and updates to GEPs 1-5 necessitated by GEP 6 #855
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
Merged
Changes from 250 commits
Commits
Show all changes
353 commits
Select commit
Hold shift + click to select a range
f674987
UV.
MImmesberger d0b5e34
Unterhalt.
MImmesberger d3423e9
Merge branch 'rename-gettsim-params-fix-yaml-validation' of https://g…
MImmesberger f394912
Typos.
MImmesberger 677e8df
Add parameters for aRW calculation back in.
MImmesberger e4986e4
Fix reference.
MImmesberger dbb956a
Make unit and reference period required (#904)
hmgaudecker 449873f
Went through changes, fixed inconsistencies and typos.
hmgaudecker 9e1fec0
Merge branch 'rename-gettsim-params-fix-yaml-validation' of github.co…
hmgaudecker 9d8ae7a
Remaining files.
hmgaudecker a881e94
Remove 'scalar' as a possible key in the params files, use 'value' in…
hmgaudecker 91615e0
Abgeltungssteuer.
hmgaudecker 8877ff8
Rename GETTSIM params and fix yaml validation issues (#900)
hmgaudecker 5be2f4e
Merge branch 'collect-unify-parsing-of-params' into move-gettsim-para…
hmgaudecker a131227
Add a few safety checks and modifications to behavior.
hmgaudecker 355d4d0
Kinderfreibetrag.
hmgaudecker 76a06e6
Kindergeld.
hmgaudecker 930ba79
A bit of Einkommensteuer / Abzüge. Not working, but switching machine…
hmgaudecker 3715950
Make tests pass by adding a somewhat ad-hoc Evaluationsjahr.
hmgaudecker c7a077b
Moved on with Abzügen von Einkünften/Einnahmen.
hmgaudecker 7197b6e
Altersfreibetrag.
hmgaudecker 20eebcb
Alleinerziehendenfreibetrag.
hmgaudecker 76ee21b
Behindertenpauschbetrag.
hmgaudecker 4af3204
Finish converting eink_st_abzuege.yaml.
hmgaudecker 734720a
Simplify calculation of Lohnsteuer / Vorsorgeaufwendungen.
hmgaudecker 4a13dbd
Be explicit in name.
hmgaudecker 2dbdc72
Einkommensteuer parameters.
hmgaudecker a43fe85
Solidaritätszuschlag parameters.
hmgaudecker 491e58c
AV.
MImmesberger 23541af
PV.
MImmesberger bfb0a88
Add add_jahresanfang keyword to params-schema.
MImmesberger c836db2
Fix jahresanfang in AV.2
MImmesberger 52899ba
Fix wrong namespace for AV.
MImmesberger a369bd2
KV.
MImmesberger 989f876
Split KV params into multiple files.
MImmesberger 4084081
Rename PV params to beitragssatz.
MImmesberger 5ab7d04
Fix Soli implementation.
MImmesberger f622f48
RV beitrag params.
MImmesberger 0b9b259
Forogt to add type hints in commit.
MImmesberger 1eb63d6
Move ALG 1 + 2 params to namespace (#912)
MImmesberger fe046aa
Merge branch 'move-gettsim-params-files' into move-sozialversicherung…
MImmesberger 4904bac
Merge branch 'move-gettsim-params-files' into move-sozialversicherung…
MImmesberger 8f74316
Split up parameters if their type changes.
MImmesberger a8f05ae
Split up BBM params for RV.
MImmesberger 5918731
Stopover. Need to continue with Rente Altersgrenzen.
MImmesberger 99ba5af
Fix some small bugs.
MImmesberger 55afbd8
Some more small bugs
MImmesberger 48220d5
Some docstrings.
MImmesberger 13bdffa
Everything but Altersgrenzen should be done.
MImmesberger 32451f8
Improve some docstrings and get rid of duplicate policy functions.
MImmesberger 3904012
Don't duplicate params_functions with policy_functions.
MImmesberger 18061ed
Remove params function from top of files.
MImmesberger 1f362ee
Bug fixes and typos.
MImmesberger 05d3f81
Some review comments. Stopped because of ConflictingNamesError.
MImmesberger c320e49
Merge branch collect-unify-parsing-of-params.
hmgaudecker 47e8ac8
Merge branch 'move-gettsim-params-files' into gep-07
hmgaudecker c9d8330
Merge branch 'move-sozialversicherung-params' into gep-07
hmgaudecker 1e9cb45
Move on with updating GEP 3.
hmgaudecker b5888a9
Active periods for params (#916)
hmgaudecker 62bae60
More review comments.
MImmesberger f41601d
Merge branch 'move-sozialversicherung-params' of https://github.com/i…
MImmesberger 177e578
Some updates to GEP 2
hmgaudecker f0b793a
Unskip minijobgrenze tests and use parameter directly from yaml.
MImmesberger 675ea9b
Rente: parameter_beitragssatz -> beitragssatz.
MImmesberger 410c850
arbeitslosen: parameter_beitragssatz -> beitragssatz.
MImmesberger 3e3dbd6
Consistent file names.
hmgaudecker 114e5ff
Replace misleading function name.
hmgaudecker f0fd6dd
kranken: partly parameter_beitragssatz -> beitragssatz.
MImmesberger 80e7934
Regression test Grundrente married couples.
MImmesberger e8694fe
Remove references to gettsim from almost all parts of TTSIM (just par…
hmgaudecker a9c5676
Style.
MImmesberger 757b252
Merge branch 'move-sozialversicherung-params' of https://github.com/i…
MImmesberger b9d81f8
Merge branch 'move-sozialversicherung-params' into gep-07
hmgaudecker 5befc78
More examples for GEP 3.
hmgaudecker b8039b4
Simplify.
hmgaudecker 2625bf9
Remove midijobgrenze from minijob.yaml.
hmgaudecker ec8c4a7
Rest of review comments.
MImmesberger 0767a64
Regelaltersgrenze.
MImmesberger 7049c30
Rewrite Altersrente wg. AL yaml.
MImmesberger 29edc99
Move Vertrauensschutz out of regular Altersgrenzen dicts.
MImmesberger 4ad271e
Fix some typos, make params in .yaml file irrelevant for now.
MImmesberger f142427
Allow params as targets (#922)
hmgaudecker 11a83ad
Convert policy functions to params functions.
hmgaudecker c6b4f1e
Simplify.
hmgaudecker 6dde751
Simplify Pflegeversicherung.
hmgaudecker c73e052
Clarify parameter name.
hmgaudecker 72c77f4
Language, harmonise.
hmgaudecker ed66e19
Enforce active periods in Rente für Frauen / wegen Arbeitslosigkeit.
hmgaudecker 2c2fe7f
Fix typo in file name.
hmgaudecker f76935e
Merge branch 'move-sozialversicherung-params' into gep-07
hmgaudecker 5ab4fb5
Update GEPs 3 & 4.
hmgaudecker 4ce0b2c
Tiny updates to GEP 5
hmgaudecker 7136e00
Tiny updates to GEP 6 after the fact, mostly name changes.
hmgaudecker 1956bda
More drafting of GEP 7.
hmgaudecker e0db8be
Fix name/description.
hmgaudecker 8f3d109
Suggested change for oss interface; better docs of type hints (and sm…
hmgaudecker cf8a544
Restructure types (#923)
hmgaudecker 2e82570
Some more renamings that should have really gone into #923. Add 'type…
hmgaudecker e545a38
Renamings.
hmgaudecker 623d3cb
Add LookUpTableParam.
hmgaudecker a385995
Simplify.
hmgaudecker 68d794d
Use dags with annotations (#909)
hmgaudecker b1aa1af
Merge branch 'collect-unify-parsing-of-params' into move-gettsim-para…
hmgaudecker db4a80c
Merge branch 'move-gettsim-params-files' into move-sozialversicherung…
hmgaudecker a5bd0ad
Merge branch 'move-sozialversicherung-params' into gep-07
hmgaudecker b2b08bb
Move Altersgrenze besonders langjährig Versicherte.
hmgaudecker 161034c
Start with birth month-specific phase-in, switching machines.
hmgaudecker 9f99056
Further clarification to typing.
hmgaudecker c7d5cf5
Make ID creation functions jittable (#905)
mj023 7c1e855
Trivial change that did not make it into #905.
hmgaudecker 57ff343
Merge branch 'move-gettsim-params-files' into move-sozialversicherung…
hmgaudecker bc3f00f
Get tests from #905 back, which just changed outputs, not inputs.
hmgaudecker 66f8d74
Merge branch 'move-sozialversicherung-params' of github.com:iza-insti…
hmgaudecker 48599c4
Add 'type: birth_month_based_phase_in', not fully working yet.
hmgaudecker 25994d5
Fix mypy errors.
hmgaudecker 11120f2
Remove superfluous `updates_previous`.
hmgaudecker 9e02a73
altersgrenze_abschlagsfrei -> altersgrenze everywhere.
hmgaudecker 6b2cfe7
Small changes in EM Rente and Minijob based on review comments.
MImmesberger 74d71c9
Merge branch 'move-sozialversicherung-params' of https://github.com/i…
MImmesberger 19105e0
Forgot to change namespace in last commit.
MImmesberger 683ffe7
Convert Arbeitslosenversicherung.
hmgaudecker 78139f8
Add todos regarding Ost/West difference in EP.
MImmesberger 0f58adf
Finish Rente wg. AL.
MImmesberger 26596d0
Converted Pflege, but looks like I simplified too much.
hmgaudecker 00d2dc0
Rewrite Altersgrenze f. langj. Vers yaml file.
MImmesberger 197d241
Re-order, fix an omission of dividing by 2.
hmgaudecker 3cc68bc
Rente f langj Vers.
MImmesberger 0e6ceb0
Add DATEV test cases.
MImmesberger e83a923
Fix Pflegeversicherung 2023, but test failures for 2025.
hmgaudecker 1df50e8
Fix sign error.
hmgaudecker f762c25
Merge branch 'move-sozialversicherung-params' into fix-contribution-r…
hmgaudecker 7724399
Convert Rente.
hmgaudecker 3cc54e6
Merge branch 'fix-contribution-rates' into gep-07
hmgaudecker cb6a3e8
Get rid of vectorization_strategy='loop' in kinderzuschlag.
hmgaudecker 8be248c
Merge branch 'fix-contribution-rates' into gep-07
hmgaudecker 32ee7c8
Add running example, first complete draft of GEP 7.
hmgaudecker bdb79f1
Include GEP 7 in doc build.
hmgaudecker 1bdb0c0
Make some (hopefully) uncontroversial changes to GEPs.
MImmesberger 387622f
Fix some docstrings and remove duplicate parameters.
MImmesberger b0a249b
Move test file to 2024, update for 2025.
MImmesberger 94d77c5
Fix PV AG formula after October 2022. Unskip 2024 test.
MImmesberger bd8e202
Use beitragssatz[standard] instead of beitragssatz_arbeitgeber * 2.
MImmesberger 484361d
Apply suggestions from code review
hmgaudecker 423dd93
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 0845d94
Missed a suggestion in previous commit.
hmgaudecker 0abfbaf
Fix phase-in / phase-out to incorporate both in years / months.
hmgaudecker d4fc83a
Merge branch 'fix-contribution-rates' into gep-07
hmgaudecker 5725868
Improve a sentence in GEP 2.
hmgaudecker 85dfbb4
Add paragraphs based on review comments.
hmgaudecker fd5eb1a
Add json schema to GEP 3.
hmgaudecker f34d3a0
Unify contribution rates to Sozialversicherung, fixes #921 (#926)
hmgaudecker 29467a9
Merge branch 'move-sozialversicherung-params' into gep-07
hmgaudecker 74caeed
Move Sozialversicherung params to namespace (#914)
MImmesberger b9a2351
Merge branch 'move-gettsim-params-files' into gep-07
hmgaudecker ad769a3
Move GETTSIM params files, use new machinery (#908)
hmgaudecker 9cb283f
Transfer parameter_behindertenpauschbetrag to piecewise_constant.
MImmesberger a9aebd3
Apply phase in parameters for EM Rente (#940)
MImmesberger f5e12f8
Apply `ConsecutiveInt`-type to EstG Abzüge and Kindergeld (#939)
MImmesberger 39794db
Single tree in policy environment (#941)
hmgaudecker 2289d30
Add nested_data_to_dataframe function.
MImmesberger 84b833e
Main adjustments are made, backup commit before letting Cursor go wild.
hmgaudecker a6da9a8
Fix missing imports / renamings.
hmgaudecker cf12e47
Adjust test_compute_taxes_and_transfers.
hmgaudecker 257d07b
Port METTSIM and GETTSIM tests, except for oss. Fixes most of #883 (n…
hmgaudecker fe2b150
Port test_policy_environment.
hmgaudecker d3ab045
Port test_rounding.
hmgaudecker b5170fa
Merge branch 'collect-components-of-namespaces' into new-interface
hmgaudecker 7408977
Merge branch 'collect-components-of-namespaces' into new-interface
hmgaudecker 67eb995
Merge branch 'new-interface' into gep-07
hmgaudecker e8a7d96
Merge branch 'collect-components-of-namespaces' into gep-07
hmgaudecker 4e0f7d5
Revert some accidental changes made here, which I noted in #953.
hmgaudecker 8f0116a
Add a test whether GETTSIM functions can be jitted.
hmgaudecker 7409034
Correct date.
hmgaudecker 934bc34
Update dags branch after merge over there.
hmgaudecker 4b1039c
Add KV Beitragssatz for early 2005.
MImmesberger 6d2ea17
Fix missing Jahresanfang and Sonderbeitrag params for KV.
MImmesberger 0436e40
Remove dummy param, add AG _jahresanfang function for 2005.
MImmesberger 2ecb6e8
Skip NotImplementedError.
MImmesberger 2053d2f
Make funcs jittable
mj023 719ffc2
Change Input Types
mj023 bbc3ee7
Update environment, include Python 3.13 also in GHA, add jax to GHA.
hmgaudecker 841eec0
Remove unused 'geburtsdatum' and exclude jax-datetime for now.
hmgaudecker 8fe60a5
Merge branch 'collect-components-of-namespaces' into test-jittability
hmgaudecker 12fbcf2
Merge branch 'collect-components-of-namespaces' into gep-07
hmgaudecker d62f2d6
Go back to dags / main after lexsort branch has been merged.
hmgaudecker 54b788f
Fix copy/paste error.
hmgaudecker 34142f9
Get rid of xnp.squeeze in piecewise_polynomial, which caused issues w…
hmgaudecker ed3c9e7
Simplify code.
hmgaudecker 0ae9a98
Make sure we have the correct Kaleido version everywhere, but do not …
hmgaudecker 9058e41
Fix remaining tests by making sure subtraction operations on ints ret…
hmgaudecker dcd8539
Enable running Jax tests on Windows and MacOS.
hmgaudecker 51b5d20
Improve readability.
hmgaudecker 6a16792
Get rid of dtype truncation warnings, not an issue for lookup tables.
hmgaudecker 9178019
Get rid of outdated parameter.
hmgaudecker 22e42db
Revert "Fix remaining tests by making sure subtraction operations on …
mj023 fc3b135
Fix dtype of grouped count in jax
mj023 2e368dc
Add CUDA environment and run tests there.
hmgaudecker 4e053b7
Merge branch 'test-jittability' into gep-07
hmgaudecker 14c26c6
Use pixi for rtd build.
hmgaudecker b2e0aa7
Rename
hmgaudecker a416677
Restructure, generalise.
hmgaudecker 009aa71
Rename and spell out.
hmgaudecker 9753800
Backup, switching machines.
hmgaudecker 74b57ca
Adjust dates in GEPs 1-3, first step updatin GEP 7. Switching machines.
hmgaudecker 6ee8258
Add remaining components of interface. Checkpoint before using differ…
hmgaudecker 92d5cb1
Change strategy: Use a single file for main_ars and dataclasses for i…
hmgaudecker c134108
Get rid of _InterfaceDAGElement object.
hmgaudecker cb0a85a
Get rid of _InterfaceDAGElement object.
hmgaudecker f21c854
Merge branch 'collect-components-of-namespaces' into remaining-interf…
hmgaudecker f691a71
Updated main namespace.
hmgaudecker d857889
Updated GETTSIM interface.
hmgaudecker 057c6d0
Update example.
hmgaudecker d7193c0
Merge branch 'remaining-interface-components' into gep-07
hmgaudecker 72d5334
Update example and first bullet.
hmgaudecker e1b3f14
Attempt to fix rtd build
hmgaudecker 1395a13
Rename targets -> tt_targets
hmgaudecker 7a37dd3
Use main_target / main_targets instead of output + name / names.
hmgaudecker e2c39c2
Merge branch 'main_targets' into gep-07
hmgaudecker d3bb45e
Backup.
hmgaudecker 39558de
Forgot to expose MainTarget in gettsim namespace.
hmgaudecker e247c48
Merge branch 'main_targets' into gep-07
hmgaudecker 0122531
Backup
hmgaudecker f536f28
Draft almost ready for vote.
hmgaudecker b5ed61b
Merge branch 'collect-components-of-namespaces' into gep-07
hmgaudecker da336cc
Merge branch 'collect-components-of-namespaces' into gep-07
hmgaudecker a3201f4
Merge branch 'collect-components-of-namespaces' into gep-07
hmgaudecker a77866c
Merge branch 'collect-components-of-namespaces' into gep-07
hmgaudecker a559a99
Typos.
MImmesberger 808621c
Add html figure to gep 7.
MImmesberger b1663e4
Update notebook.
MImmesberger 42c3695
Update notebook.
MImmesberger 6ffeac9
Merge branch 'collect-components-of-namespaces' into gep-07
hmgaudecker f4734e1
Move and rename example used in GEP 7.
hmgaudecker 23c218d
Update the playground notebook.
hmgaudecker 57f39f3
Incorporate review suggestions.
hmgaudecker 074ea18
Do not make a copy of the policy environment in the example.
hmgaudecker ed11a86
Merge branch 'collect-components-of-namespaces' into gep-07
hmgaudecker cdcdb2c
Update GEP 7 with new model for policy/evaluation dates.
hmgaudecker 90a9487
Use markdown tables instead of html.
hmgaudecker 985b6fc
Merge branch 'collect-components-of-namespaces' into gep-07
hmgaudecker bc3de05
Modify examples so that they should work after #1026.
hmgaudecker 022bec9
Merge branch 'collect-components-of-namespaces' into gep-07
MImmesberger 3525917
Add new interface dag html.
MImmesberger 864d5d7
Improve performance of `processed_data` (#1037)
JuergenWiemers 3eada4c
Merge branch 'collect-components-of-namespaces' into gep-07
hmgaudecker 98e133e
Merge branch 'collect-components-of-namespaces' into gep-07
hmgaudecker adf3b56
Merge branch 'ocollect-components-of-namespaces' into gep-07
hmgaudecker 18c403c
Add dates and link to resolution.
hmgaudecker 4a93e5b
Add pixi task to build docs.
hmgaudecker 6d12d31
Move interface playground into sandbox directory.
hmgaudecker File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,5 +20,6 @@ maxdepth: 1 | |
| ../geps/gep-04 | ||
| ../geps/gep-05 | ||
| ../geps/gep-06 | ||
| ../geps/gep-07 | ||
| ../geps/gep-x | ||
| ``` | ||
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
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.