Move GETTSIM params files, use new machinery

.pre-commit-config.yaml

@@ -96,7 +96,7 @@ repos:
           - types-PyYAML
           - types-pytz
           - numpy >= 2
-          - dags >= 0.3
+          # - dags >= 0.3
           - optree >= 0.15
   - repo: https://github.com/python-jsonschema/check-jsonschema
     rev: 0.33.0

CHANGES.md

@@ -17,7 +17,7 @@ releases are available on [Anaconda.org](https://anaconda.org/conda-forge/gettsi
 - {gh}`885`, {gh}`886`: Cleanups ({ghuser}`MImmesberger`).
 - {gh}`867` Vectorize `piecewise_polynomial` ({ghuser}`mj023`).
 - {gh}`880` Validate parameter files using json schema ({ghuser}`hmgaudecker`).
-- {gh}`876` Add DataFrame to NestedDataDict conversion ({ghuser}`MImmesberger`).
+- {gh}`876` Add DataFrame to NestedData conversion ({ghuser}`MImmesberger`).
 - {gh}`873` Implement aggregation decorators ({ghuser}`hmgaudecker`, `MImmesberger`).
 - {gh}`859` Add RoundingSpec dataclass ({ghuser}`hmgaudecker`, `MImmesberger`).
 - {gh}`854` Add PolicyInput class and update hierarchy of TTSIM objects

docs/geps/gep-01.md

@@ -42,7 +42,7 @@ a nutshell and without explanations, these conventions are:
      Internal variables should be used sparingly.
 
 1. If names need to be concatenated for making clear what a column name refers to (e.g.,
-   `arbeitslosengeld_2__freibetrag_vermögen_bg` vs.
+   `arbeitslosengeld_2__vermögensfreibetrag_bg` vs.
    `grundsicherung__im_alter__vermögensfreibetrag_eg`), the group (i.e., the tax or
    transfer) that a variable refers to appears first.
 
@@ -113,7 +113,7 @@ changed, even if it leads to long variable names (e.g., `kinderfreib`,
 less error-prone.
 
 If names need to be concatenated for making clear what a column name refers to (e.g.,
-`arbeitslosengeld_2__freibetrag_vermögen_bg` vs.
+`arbeitslosengeld_2__vermögensfreibetrag_bg` vs.
 `grundsicherung__im_alter__vermögensfreibetrag_eg`), the group (i.e., the tax or
 transfer) that a variable refers to appears first.
 

docs/gettsim_objects/params.md

@@ -22,93 +22,3 @@ found in the table below. GETTSIM reads the function arguments and selects the
 corresponding part of the {code}`params` file. For GETTSIM to read and process the
 arguments of functions correctly the {code}`compartment_name + _params` variables have
 to be last inputs in the function signature.
-
-(sozialv_beitr_params)=
-
-## `sozialv_beitr_params`
-
-Social insurance contributions
-
-(eink_st_params)=
-
-## `eink_st_params`
-
-Income tax
-
-(eink_st_abzuege_params)=
-
-## `eink_st_abzuege_params`
-
-Income tax deductions
-
-(soli_st_params)=
-
-## `soli_st_params`
-
-Solidarity surcharge
-
-(arbeitsl_geld_2_params)=
-
-## `arbeitsl_geld_2_params`
-
-Basic social insurance
-
-(arbeitsl_geld_params)=
-
-## `arbeitsl_geld_params`
-
-Unemployment benefits
-
-(unterhalt_params)=
-
-## `unterhalt_params`
-
-Alimony payments
-
-(unterhaltsvors_params)=
-
-## `unterhaltsvors_params`
-
-Advance on alimony payments
-
-(abgelt_st_params)=
-
-## `abgelt_st_params`
-
-Capital income tax
-
-(wohngeld_params)=
-
-## `wohngeld_params`
-
-Housing benefits
-
-(kinderzuschl_params)=
-
-## `kinderzuschl_params`
-
-Child allowance
-
-(kindergeld_params)=
-
-## `kindergeld_params`
-
-Child benefits
-
-(elterngeld_params)=
-
-## `elterngeld_params`
-
-Parental leave benefits
-
-(ges_rente_params)=
-
-## `ges_rente_params`
-
-Pensions
-
-(grunds_im_alter_params)=
-
-## `grunds_im_alter_params`
-
-Old-age basic income support

outdated_docs/tutorials/debugging.ipynb

@@ -104,7 +104,7 @@
    "source": [
     "## Debug Mode with an Exception\n",
     "\n",
-    "What happens when an exception is raised while producing the target? We artificially produce an error with a modified user function. For exemplary purposes we modify GETTSIM's function `sozialversicherung__minijob_grenze` which is called when computing the pension contributions. Instead of its usual functionality of returning the income threshold for marginal employment, we overwrite it to raise an error when called (note that we could do so with any other function as well)."
+    "What happens when an exception is raised while producing the target? We artificially produce an error with a modified user function. For exemplary purposes we modify GETTSIM's function `sozialversicherung__minijobgrenze` which is called when computing the pension contributions. Instead of its usual functionality of returning the income threshold for marginal employment, we overwrite it to raise an error when called (note that we could do so with any other function as well)."
    ]
   },
   {
@@ -113,7 +113,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "def sozialversicherung__minijob_grenze():\n",
+    "def sozialversicherung__minijobgrenze():\n",
     "    raise ValueError"
    ]
   },
@@ -129,7 +129,7 @@
    "source": [
     "df = compute_taxes_and_transfers(\n",
     "    data=data,\n",
-    "    environment=environment.upsert_functions(sozialversicherung__minijob_grenze),\n",
+    "    environment=environment.upsert_functions(sozialversicherung__minijobgrenze),\n",
     "    targets=\"sozialversicherung__rente__beitrag__betrag_versicherter_m\",\n",
     "    debug=True,\n",
     ")"

outdated_docs/tutorials/parameters.ipynb

@@ -271,7 +271,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "environment_new = environment.replace_all_parameters(policy_params_new)\n",
+    "environment_new = environment.replace_params_tree(policy_params_new)\n",
     "kindergeld_new = compute_taxes_and_transfers(\n",
     "    data=data,\n",
     "    environment=environment_new,\n",