power-grid-model-io 1.2.87__tar.gz → 1.2.88__tar.gz

{power_grid_model_io-1.2.87 → power_grid_model_io-1.2.88}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: power-grid-model-io
-Version: 1.2.87
+Version: 1.2.88
 Summary: Power Grid Model Input/Output
 Author-email: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
 License: MPL-2.0
@@ -24,7 +24,7 @@ License-File: LICENSE
 Requires-Dist: numpy>=1.20
 Requires-Dist: openpyxl
 Requires-Dist: pandas
-Requires-Dist: power_grid_model>=1.6.46
+Requires-Dist: power_grid_model>=1.8
 Requires-Dist: pyyaml
 Requires-Dist: structlog
 Requires-Dist: tqdm

power_grid_model_io-1.2.88/PYPI_VERSION

@@ -0,0 +1 @@
+1.2.88

{power_grid_model_io-1.2.87 → power_grid_model_io-1.2.88}/pyproject.toml

@@ -31,7 +31,7 @@ dependencies = [
     "numpy>=1.20",
     "openpyxl",
     "pandas",
-    "power_grid_model>=1.6.46",
+    "power_grid_model>=1.8",
     "pyyaml",
     "structlog",
     "tqdm",

{power_grid_model_io-1.2.87 → power_grid_model_io-1.2.88}/src/power_grid_model_io/config/excel/vision_en.yaml

@@ -223,6 +223,28 @@ grid:
       extra:
         - ID
         - Name
+    transformer_tap_regulator:
+      id:
+        auto_id: 
+          name: transformer_tap_regulator
+          key: Number
+      regulated_object:
+        auto_id:
+          key:
+            Number: Number
+      status: 1
+      control_side: Measuring side
+      u_set: Uset
+      u_band: Uband
+      line_drop_compensation_r: Rc
+      line_drop_compensation_x: Xc
+      extra:
+        - ID
+        - Name
+      filters:
+        - power_grid_model_io.functions.filters.exclude_value:
+            col: Control
+            value: 0
   Special transformers:
     transformer:
       id:
@@ -296,6 +318,28 @@ grid:
       extra:
         - ID
         - Name
+    transformer_tap_regulator:
+      id:
+        auto_id: 
+          name: transformer_tap_regulator
+          key: Number
+      regulated_object:
+        auto_id:
+          key:
+            Number: Number
+      status: 1
+      control_side: Measuring side
+      u_set: Uset
+      u_band: Uband
+      line_drop_compensation_r: Rc
+      line_drop_compensation_x: Xc
+      extra:
+        - ID
+        - Name
+      filters:
+        - power_grid_model_io.functions.filters.exclude_value:
+            col: Control
+            value: FALSE
   Transformer loads:
     transformer:
       id:
@@ -805,7 +849,28 @@ grid:
       extra:
         - ID
         - Name
-
+    transformer_tap_regulator:
+      id:
+        auto_id: 
+          name: transformer_tap_regulator
+          key: Number
+      regulated_object:
+        auto_id:
+          key:
+            Number: Number
+      status: 1
+      control_side: Measuring side
+      u_set: Uset
+      u_band: Uband
+      line_drop_compensation_r: Rc
+      line_drop_compensation_x: Xc
+      extra:
+        - ID
+        - Name
+      filters:
+        - power_grid_model_io.functions.filters.exclude_value:
+            col: Control
+            value: 0
 units:
   A: null
   F:
@@ -874,3 +939,6 @@ substitutions:
   Synchronous generators.Q:
     absorb: -1
     supply: 1
+  Measuring side:
+    1: 0
+    2: 1

power_grid_model_io-1.2.87/tests/data/vision/vision_9_5_en.yaml → power_grid_model_io-1.2.88/src/power_grid_model_io/config/excel/vision_en_9_7.yaml

@@ -17,6 +17,7 @@ grid:
       extra:
         - ID
         - Name
+        - GUID
   Cables:
     line:
       id:
@@ -223,6 +224,28 @@ grid:
       extra:
         - ID
         - Name
+    transformer_tap_regulator:
+      id:
+        auto_id: 
+          name: transformer_tap_regulator
+          key: Number
+      regulated_object:
+        auto_id:
+          key:
+            Number: Number
+      status: State
+      control_side: Measure side
+      u_set: Uset
+      u_band: Uband
+      line_drop_compensation_r: Rc
+      line_drop_compensation_x: Xc
+      extra:
+        - ID
+        - Name
+      filters:
+        - power_grid_model_io.functions.filters.exclude_value:
+            col: Own control
+            value: FALSE
   Special transformers:
     transformer:
       id:
@@ -296,6 +319,28 @@ grid:
       extra:
         - ID
         - Name
+    transformer_tap_regulator:
+      id:
+        auto_id: 
+          name: transformer_tap_regulator
+          key: Number
+      regulated_object:
+        auto_id:
+          key:
+            Number: Number
+      status: At
+      control_side: Measure side
+      u_set: Uset
+      u_band: Uband
+      line_drop_compensation_r: Rc
+      line_drop_compensation_x: Xc
+      extra:
+        - ID
+        - Name
+      filters:
+        - power_grid_model_io.functions.filters.exclude_value:
+            col: Control
+            value: FALSE
   Transformer loads:
     transformer:
       id:
@@ -424,6 +469,11 @@ grid:
       extra:
         - ID
         - Name
+      filters:
+        - power_grid_model_io.functions.filters.exclude_all_columns_empty_or_zero:
+            cols: 
+            - Load.P
+            - Load.Q
     sym_gen:
       - id:
           auto_id:
@@ -444,6 +494,11 @@ grid:
         extra:
           - ID
           - Name
+        filters:
+          - power_grid_model_io.functions.filters.exclude_all_columns_empty_or_zero:
+              cols: 
+              - Generation.P
+              - Generation.Q
       - id:
           auto_id:
             name: pv_generation
@@ -466,6 +521,10 @@ grid:
         extra:
           - ID
           - Name
+        filters:
+          - power_grid_model_io.functions.filters.exclude_all_columns_empty_or_zero:
+              cols: 
+              - PV.Pnom
   Sources:
     source:
       id:
@@ -577,13 +636,11 @@ grid:
       extra:
         - ID
         - Name
-  Zigzag transformers:
+  Earthing transformers:
     shunt:
       id:
         auto_id:
-          key:
-            - Node.Number
-            - Subnumber
+          key: Number
       node:
         auto_id:
           table: Nodes
@@ -603,13 +660,11 @@ grid:
       extra:
         - ID
         - Name
-  Capacitors:
+  Shunt capacitors:
     shunt:
       id:
         auto_id:
-          key:
-            - Node.Number
-            - Subnumber
+          key: Number
       node:
         auto_id:
           table: Nodes
@@ -626,13 +681,11 @@ grid:
       extra:
         - ID
         - Name
-  Reactors:
+  Shunt reactors:
     shunt:
       id:
         auto_id:
-          key:
-            - Node.Number
-            - Subnumber
+          key: Number
       node:
         auto_id:
           table: Nodes
@@ -791,7 +844,28 @@ grid:
       extra:
         - ID
         - Name
-
+    transformer_tap_regulator:
+      id:
+        auto_id: 
+          name: transformer_tap_regulator
+          key: Number
+      regulated_object:
+        auto_id:
+          key:
+            Number: Number
+      status: 1
+      control_side: Measure side
+      u_set: Uset
+      u_band: Uband
+      line_drop_compensation_r: Rc
+      line_drop_compensation_x: Xc
+      extra:
+        - ID
+        - Name
+      filters:
+        - power_grid_model_io.functions.filters.exclude_value:
+            col: Control
+            value: 0
 units:
   A: null
   F:
@@ -860,3 +934,9 @@ substitutions:
   Synchronous generators.Q:
     absorb: -1
     supply: 1
+  Measure side:
+    1: 0
+    2: 1
+  At:
+    FALSE: 0
+    TRUE: 1

power_grid_model_io-1.2.87/tests/data/vision/vision_9_5_nl.yaml → power_grid_model_io-1.2.88/src/power_grid_model_io/config/excel/vision_nl.yaml

@@ -220,6 +220,28 @@ grid:
       extra:
         - ID
         - Naam
+    transformer_tap_regulator:
+      id:
+        auto_id: 
+          name: transformer_tap_regulator
+          key: Nummer
+      regulated_object:
+        auto_id:
+          key:
+            Nummer: Nummer
+      status: 1
+      control_side: Meetzijde
+      u_set: Uset
+      u_band: Uband
+      line_drop_compensation_r: Rc
+      line_drop_compensation_x: Xc
+      extra:
+        - ID
+        - Naam
+      filters:
+        - power_grid_model_io.functions.filters.exclude_value:
+            col: Regeling
+            value: 0
   Speciale transformatoren:
     transformer:
       id:
@@ -290,6 +312,28 @@ grid:
       extra:
         - ID
         - Naam
+    transformer_tap_regulator:
+      id:
+        auto_id: 
+          name: transformer_tap_regulator
+          key: Nummer
+      regulated_object:
+        auto_id:
+          key:
+            Nummer: Nummer
+      status: 1
+      control_side: Meetzijde
+      u_set: Uset
+      u_band: Uband
+      line_drop_compensation_r: Rc
+      line_drop_compensation_x: Xc
+      extra:
+        - ID
+        - Naam
+      filters:
+        - power_grid_model_io.functions.filters.exclude_value:
+            col: Regeling
+            value: FALSE
   Transformatorbelastingen:
     transformer:
       id:
@@ -415,6 +459,11 @@ grid:
       extra:
         - ID
         - Naam
+      filters:
+        - power_grid_model_io.functions.filters.exclude_all_columns_empty_or_zero:
+            cols: 
+            - Belasting.P
+            - Belasting.Q
     sym_gen:
       - id:
           auto_id:
@@ -435,6 +484,11 @@ grid:
         extra:
           - ID
           - Naam
+        filters:
+          - power_grid_model_io.functions.filters.exclude_all_columns_empty_or_zero:
+              cols: 
+              - Opwekking.P
+              - Opwekking.Q
       - id:
           auto_id:
             name: pv_generation
@@ -457,6 +511,10 @@ grid:
         extra:
           - ID
           - Naam
+        filters:
+          - power_grid_model_io.functions.filters.exclude_all_columns_empty_or_zero:
+              cols: 
+              - PV.Pnom
   Netvoedingen:
     source:
       id:
@@ -779,7 +837,28 @@ grid:
       extra:
         - ID
         - Naam
-
+    transformer_tap_regulator:
+      id:
+        auto_id: 
+          name: transformer_tap_regulator
+          key: Nummer
+      regulated_object:
+        auto_id:
+          key:
+            Nummer: Nummer
+      status: 1
+      control_side: Meetzijde
+      u_set: Uset
+      u_band: Uband
+      line_drop_compensation_r: Rc
+      line_drop_compensation_x: Xc
+      extra:
+        - ID
+        - Naam
+      filters:
+        - power_grid_model_io.functions.filters.exclude_value:
+            col: Regeling
+            value: 0
 units:
   A: null
   F:
@@ -843,4 +922,7 @@ substitutions:
     2: 1
   Synchrone generatoren.Q:
     terugleveren: -1
-    leveren: 1
+    leveren: 1
+  Meetzijde:
+    1: 0
+    2: 1

{power_grid_model_io-1.2.87 → power_grid_model_io-1.2.88}/src/power_grid_model_io/functions/filters.py

@@ -16,6 +16,8 @@ def exclude_empty(row: pd.Series, col: str) -> bool:
     """
     filter out empty
     """
+    if col not in row:        
+        raise ValueError(f"The column: '{col}' cannot be found for the filter")
     result = has_value(row[col])
     if isinstance(result, pd.Series):
         return result.item()
@@ -26,6 +28,8 @@ def exclude_value(row: pd.Series, col: str, value: Union[float, str]) -> bool:
     """
     filter out by match value
     """
+    if col not in row:
+        raise ValueError(f"The column: '{col}' cannot be found for the filter")
     result = row[col] != value
     if isinstance(result, pd.Series):
         return result.item()

{power_grid_model_io-1.2.87 → power_grid_model_io-1.2.88}/src/power_grid_model_io.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: power-grid-model-io
-Version: 1.2.87
+Version: 1.2.88
 Summary: Power Grid Model Input/Output
 Author-email: Contributors to the Power Grid Model project <powergridmodel@lfenergy.org>
 License: MPL-2.0
@@ -24,7 +24,7 @@ License-File: LICENSE
 Requires-Dist: numpy>=1.20
 Requires-Dist: openpyxl
 Requires-Dist: pandas
-Requires-Dist: power_grid_model>=1.6.46
+Requires-Dist: power_grid_model>=1.8
 Requires-Dist: pyyaml
 Requires-Dist: structlog
 Requires-Dist: tqdm

{power_grid_model_io-1.2.87 → power_grid_model_io-1.2.88}/src/power_grid_model_io.egg-info/requires.txt

@@ -1,7 +1,7 @@
 numpy>=1.20
 openpyxl
 pandas
-power_grid_model>=1.6.46
+power_grid_model>=1.8
 pyyaml
 structlog
 tqdm

{power_grid_model_io-1.2.87 → power_grid_model_io-1.2.88}/tests/data/vision/pgm_input_data_en.json

@@ -6,8 +6,8 @@
       {"id": 2, "id_reference": {"table": "Nodes", "key": {"Number": 3}}, "Name": "node3"},
       {"id": 3, "id_reference": {"table": "Nodes", "key": {"Number": 4}}, "Name": "node4"},
       {"id": 4, "id_reference": {"table": "Nodes", "key": {"Number": 5}}},
-      {"id": 13, "id_reference": {"table": "Transformer loads", "name": "internal_node", "key": {"Node.Number": 3, "Subnumber": 4}}, "Name": "transformer_load_2"},
-      {"id": 14, "id_reference": {"table": "Transformer loads", "name": "internal_node", "key": {"Node.Number": 3, "Subnumber": 2}}, "Name": "transformer_load_1"}
+      {"id": 15, "id_reference": {"table": "Transformer loads", "name": "internal_node", "key": {"Node.Number": 3, "Subnumber": 4}}, "Name": "transformer_load_2"},
+      {"id": 16, "id_reference": {"table": "Transformer loads", "name": "internal_node", "key": {"Node.Number": 3, "Subnumber": 2}}, "Name": "transformer_load_1"}
     ],
   "line":
     [
@@ -22,36 +22,42 @@
   "transformer":
     [
       {"id": 9, "from_node": 1, "to_node": 2, "id_reference": {"table": "Transformers", "key": {"Number": 1}}, "Name": "transformer1"},
-      {"id": 10, "from_node": 1, "to_node": 3, "id_reference": {"table": "Special transformers", "key": {"Number": 1}}, "Name": "special_trans1"},
-      {"id": 11, "from_node": 2, "to_node": 13, "id_reference": {"table": "Transformer loads", "name": "transformer", "key": {"Node.Number": 3, "Subnumber": 4}}, "Name": "transformer_load_2"},
-      {"id": 12, "from_node": 2, "to_node": 14, "id_reference": {"table": "Transformer loads", "name": "transformer", "key": {"Node.Number": 3, "Subnumber": 2}}, "Name": "transformer_load_1"}
+      {"id": 11, "from_node": 1, "to_node": 3, "id_reference": {"table": "Special transformers", "key": {"Number": 1}}, "Name": "special_trans1"},
+      {"id": 13, "from_node": 2, "to_node": 15, "id_reference": {"table": "Transformer loads", "name": "transformer", "key": {"Node.Number": 3, "Subnumber": 4}}, "Name": "transformer_load_2"},
+      {"id": 14, "from_node": 2, "to_node": 16, "id_reference": {"table": "Transformer loads", "name": "transformer", "key": {"Node.Number": 3, "Subnumber": 2}}, "Name": "transformer_load_1"}
+    ],
+  "transformer_tap_regulator":
+    [
+      {"id": 10, "regulated_object": 9, "id_reference": {"table": "Transformers", "name": "transformer_tap_regulator", "key": {"Number": 1}}, "Name": "transformer1"},
+      {"id": 12, "regulated_object": 11, "id_reference": {"table": "Special transformers", "name": "transformer_tap_regulator", "key": {"Number": 1}}, "Name": "special_trans1"},
+      {"id": 30, "regulated_object": 29, "id_reference": {"table": "Three winding transformers", "name": "transformer_tap_regulator", "key": {"Number": 1}}}
     ],
   "sym_load":
     [
-      {"id": 15, "node": 13, "id_reference": {"table": "Transformer loads", "name": "load", "key": {"Node.Number": 3, "Subnumber": 4}}, "Name": "transformer_load_2"},
-      {"id": 16, "node": 14, "id_reference": {"table": "Transformer loads", "name": "load", "key": {"Node.Number": 3, "Subnumber": 2}}, "Name": "transformer_load_1"},
-      {"id": 22, "node": 2, "id_reference": {"table": "Loads", "key": {"Node.Number": 3, "Subnumber": 6}}, "Name": "load1"}
+      {"id": 17, "node": 15, "id_reference": {"table": "Transformer loads", "name": "load", "key": {"Node.Number": 3, "Subnumber": 4}}, "Name": "transformer_load_2"},
+      {"id": 18, "node": 16, "id_reference": {"table": "Transformer loads", "name": "load", "key": {"Node.Number": 3, "Subnumber": 2}}, "Name": "transformer_load_1"},
+      {"id": 24, "node": 2, "id_reference": {"table": "Loads", "key": {"Node.Number": 3, "Subnumber": 6}}, "Name": "load1"}
     ],
   "sym_gen":
     [
-      {"id": 17, "node": 14, "id_reference": {"table": "Transformer loads", "name": "generation", "key": {"Node.Number": 3, "Subnumber": 2}}, "Name": "transformer_load_1"},
-      {"id": 18, "node": 14, "id_reference": {"table": "Transformer loads", "name": "pv_generation", "key": {"Node.Number": 3, "Subnumber": 2}}, "Name": "transformer_load_1"},
-      {"id": 20, "node": 3, "id_reference": {"table": "Synchronous generators", "key": {"Node.Number": 4, "Subnumber": 2}}, "Name": "syngen1"},
-      {"id": 21, "node": 2, "id_reference": {"table": "Wind turbines", "key": {"Node.Number": 3, "Subnumber": 3}}, "Name": "wind1"},
-      {"id": 26, "node": 2, "id_reference": {"table": "Pvs", "key": {"Node.Number": 3, "Subnumber": 1}}, "Name": "pv1"}
+      {"id": 19, "node": 16, "id_reference": {"table": "Transformer loads", "name": "generation", "key": {"Node.Number": 3, "Subnumber": 2}}, "Name": "transformer_load_1"},
+      {"id": 20, "node": 16, "id_reference": {"table": "Transformer loads", "name": "pv_generation", "key": {"Node.Number": 3, "Subnumber": 2}}, "Name": "transformer_load_1"},
+      {"id": 22, "node": 3, "id_reference": {"table": "Synchronous generators", "key": {"Node.Number": 4, "Subnumber": 2}}, "Name": "syngen1"},
+      {"id": 23, "node": 2, "id_reference": {"table": "Wind turbines", "key": {"Node.Number": 3, "Subnumber": 3}}, "Name": "wind1"},
+      {"id": 28, "node": 2, "id_reference": {"table": "Pvs", "key": {"Node.Number": 3, "Subnumber": 1}}, "Name": "pv1"}
     ],
   "source":
     [
-      {"id": 19, "node": 0, "id_reference": {"table": "Sources", "key": {"Node.Number": 1, "Subnumber": 1}}, "Name": "source1"}
+      {"id": 21, "node": 0, "id_reference": {"table": "Sources", "key": {"Node.Number": 1, "Subnumber": 1}}, "Name": "source1"}
     ],
   "shunt":
     [
-      {"id": 23, "node": 2, "id_reference": {"table": "Zigzag transformers", "key": {"Node.Number": 3, "Subnumber": 5}}, "Name": "zztrans1"},
-      {"id": 24, "node": 3, "id_reference": {"table": "Capacitors", "key": {"Node.Number": 4, "Subnumber": 9}}, "Name": "shunt1"},
-      {"id": 25, "node": 3, "id_reference": {"table": "Reactors", "key": {"Node.Number": 4, "Subnumber": 1}}}
+      {"id": 25, "node": 2, "id_reference": {"table": "Zigzag transformers", "key": {"Node.Number": 3, "Subnumber": 5}}, "Name": "zztrans1"},
+      {"id": 26, "node": 3, "id_reference": {"table": "Capacitors", "key": {"Node.Number": 4, "Subnumber": 9}}, "Name": "shunt1"},
+      {"id": 27, "node": 3, "id_reference": {"table": "Reactors", "key": {"Node.Number": 4, "Subnumber": 1}}}
     ],
   "three_winding_transformer":
     [
-      {"id": 27, "node_1": 1, "node_2": 2, "node_3": 4, "id_reference": {"table": "Three winding transformers", "key": {"Number": 1}}}
+      {"id": 29, "node_1": 1, "node_2": 2, "node_3": 4, "id_reference": {"table": "Three winding transformers", "key": {"Number": 1}}}
     ]
 }

{power_grid_model_io-1.2.87 → power_grid_model_io-1.2.88}/tests/data/vision/pgm_input_data_nl.json

@@ -6,8 +6,8 @@
       {"id": 2, "id_reference": {"table": "Knooppunten", "key": {"Nummer": 3}}, "Naam": "node3"},
       {"id": 3, "id_reference": {"table": "Knooppunten", "key": {"Nummer": 4}}, "Naam": "node4"},
       {"id": 4, "id_reference": {"table": "Knooppunten", "key": {"Nummer": 5}}},
-      {"id": 13, "id_reference": {"table": "Transformatorbelastingen", "name": "internal_node", "key": {"Knooppunt.Nummer": 3, "Subnummer": 4}}, "Naam": "transformer_load_2"},
-      {"id": 14, "id_reference": {"table": "Transformatorbelastingen", "name": "internal_node", "key": {"Knooppunt.Nummer": 3, "Subnummer": 2}}, "Naam": "transformer_load_1"}
+      {"id": 15, "id_reference": {"table": "Transformatorbelastingen", "name": "internal_node", "key": {"Knooppunt.Nummer": 3, "Subnummer": 4}}, "Naam": "transformer_load_2"},
+      {"id": 16, "id_reference": {"table": "Transformatorbelastingen", "name": "internal_node", "key": {"Knooppunt.Nummer": 3, "Subnummer": 2}}, "Naam": "transformer_load_1"}
     ],
   "line":
     [
@@ -22,36 +22,42 @@
   "transformer":
     [
       {"id": 9, "from_node": 1, "to_node": 2, "id_reference": {"table": "Transformatoren", "key": {"Nummer": 1}}, "Naam": "transformer1"},
-      {"id": 10, "from_node": 1, "to_node": 3, "id_reference": {"table": "Speciale transformatoren", "key": {"Nummer": 1}}, "Naam": "special_trans1"},
-      {"id": 11, "from_node": 2, "to_node": 13, "id_reference": {"table": "Transformatorbelastingen", "name": "transformer", "key": {"Knooppunt.Nummer": 3, "Subnummer": 4}}, "Naam": "transformer_load_2"},
-      {"id": 12, "from_node": 2, "to_node": 14, "id_reference": {"table": "Transformatorbelastingen", "name": "transformer", "key": {"Knooppunt.Nummer": 3, "Subnummer": 2}}, "Naam": "transformer_load_1"}
+      {"id": 11, "from_node": 1, "to_node": 3, "id_reference": {"table": "Speciale transformatoren", "key": {"Nummer": 1}}, "Naam": "special_trans1"},
+      {"id": 13, "from_node": 2, "to_node": 15, "id_reference": {"table": "Transformatorbelastingen", "name": "transformer", "key": {"Knooppunt.Nummer": 3, "Subnummer": 4}}, "Naam": "transformer_load_2"},
+      {"id": 14, "from_node": 2, "to_node": 16, "id_reference": {"table": "Transformatorbelastingen", "name": "transformer", "key": {"Knooppunt.Nummer": 3, "Subnummer": 2}}, "Naam": "transformer_load_1"}
+    ],
+  "transformer_tap_regulator":
+    [
+      {"id": 10, "regulated_object": 9, "id_reference": {"table": "Transformatoren", "name": "transformer_tap_regulator", "key": {"Nummer": 1}}, "Naam": "transformer1"},
+      {"id": 12, "regulated_object": 11, "id_reference": {"table": "Speciale transformatoren", "name": "transformer_tap_regulator", "key": {"Nummer": 1}}, "Naam": "special_trans1"},
+      {"id": 30, "regulated_object": 29, "id_reference": {"table": "Driewikkelingstransformatoren", "name": "transformer_tap_regulator", "key": {"Nummer": 1}}}
     ],
   "sym_load":
     [
-      {"id": 15, "node": 13, "id_reference": {"table": "Transformatorbelastingen", "name": "load", "key": {"Knooppunt.Nummer": 3, "Subnummer": 4}}, "Naam": "transformer_load_2"},
-      {"id": 16, "node": 14, "id_reference": {"table": "Transformatorbelastingen", "name": "load", "key": {"Knooppunt.Nummer": 3, "Subnummer": 2}}, "Naam": "transformer_load_1"},
-      {"id": 22, "node": 2, "id_reference": {"table": "Belastingen", "key": {"Knooppunt.Nummer": 3, "Subnummer": 6}}, "Naam": "load1"}
+      {"id": 17, "node": 15, "id_reference": {"table": "Transformatorbelastingen", "name": "load", "key": {"Knooppunt.Nummer": 3, "Subnummer": 4}}, "Naam": "transformer_load_2"},
+      {"id": 18, "node": 16, "id_reference": {"table": "Transformatorbelastingen", "name": "load", "key": {"Knooppunt.Nummer": 3, "Subnummer": 2}}, "Naam": "transformer_load_1"},
+      {"id": 24, "node": 2, "id_reference": {"table": "Belastingen", "key": {"Knooppunt.Nummer": 3, "Subnummer": 6}}, "Naam": "load1"}
     ],
   "sym_gen":
     [
-      {"id": 17, "node": 14, "id_reference": {"table": "Transformatorbelastingen", "name": "generation", "key": {"Knooppunt.Nummer": 3, "Subnummer": 2}}, "Naam": "transformer_load_1"},
-      {"id": 18, "node": 14, "id_reference": {"table": "Transformatorbelastingen", "name": "pv_generation", "key": {"Knooppunt.Nummer": 3, "Subnummer": 2}}, "Naam": "transformer_load_1"},
-      {"id": 20, "node": 3, "id_reference": {"table": "Synchrone generatoren", "key": {"Knooppunt.Nummer": 4, "Subnummer": 2}}, "Naam": "syngen1"},
-      {"id": 21, "node": 2, "id_reference": {"table": "Windturbines", "key": {"Knooppunt.Nummer": 3, "Subnummer": 3}}, "Naam": "wind1"},
-      {"id": 26, "node": 2, "id_reference": {"table": "Pv's", "key": {"Knooppunt.Nummer": 3, "Subnummer": 1}}, "Naam": "pv1"}
+      {"id": 19, "node": 16, "id_reference": {"table": "Transformatorbelastingen", "name": "generation", "key": {"Knooppunt.Nummer": 3, "Subnummer": 2}}, "Naam": "transformer_load_1"},
+      {"id": 20, "node": 16, "id_reference": {"table": "Transformatorbelastingen", "name": "pv_generation", "key": {"Knooppunt.Nummer": 3, "Subnummer": 2}}, "Naam": "transformer_load_1"},
+      {"id": 22, "node": 3, "id_reference": {"table": "Synchrone generatoren", "key": {"Knooppunt.Nummer": 4, "Subnummer": 2}}, "Naam": "syngen1"},
+      {"id": 23, "node": 2, "id_reference": {"table": "Windturbines", "key": {"Knooppunt.Nummer": 3, "Subnummer": 3}}, "Naam": "wind1"},
+      {"id": 28, "node": 2, "id_reference": {"table": "Pv's", "key": {"Knooppunt.Nummer": 3, "Subnummer": 1}}, "Naam": "pv1"}
     ],
   "source":
     [
-      {"id": 19, "node": 0, "id_reference": {"table": "Netvoedingen", "key": {"Knooppunt.Nummer": 1, "Subnummer": 1}}, "Naam": "source1"}
+      {"id": 21, "node": 0, "id_reference": {"table": "Netvoedingen", "key": {"Knooppunt.Nummer": 1, "Subnummer": 1}}, "Naam": "source1"}
     ],
   "shunt":
     [
-      {"id": 23, "node": 2, "id_reference": {"table": "Nulpuntstransformatoren", "key": {"Knooppunt.Nummer": 3, "Subnummer": 5}}, "Naam": "zztrans1"},
-      {"id": 24, "node": 3, "id_reference": {"table": "Condensatoren", "key": {"Knooppunt.Nummer": 4, "Subnummer": 9}}, "Naam": "shunt1"},
-      {"id": 25, "node": 3, "id_reference": {"table": "Spoelen", "key": {"Knooppunt.Nummer": 4, "Subnummer": 1}}}
+      {"id": 25, "node": 2, "id_reference": {"table": "Nulpuntstransformatoren", "key": {"Knooppunt.Nummer": 3, "Subnummer": 5}}, "Naam": "zztrans1"},
+      {"id": 26, "node": 3, "id_reference": {"table": "Condensatoren", "key": {"Knooppunt.Nummer": 4, "Subnummer": 9}}, "Naam": "shunt1"},
+      {"id": 27, "node": 3, "id_reference": {"table": "Spoelen", "key": {"Knooppunt.Nummer": 4, "Subnummer": 1}}}
     ],
   "three_winding_transformer":
     [
-      {"id": 27, "node_1": 1, "node_2": 2, "node_3": 4, "id_reference": {"table": "Driewikkelingstransformatoren", "key": {"Nummer": 1}}}
+      {"id": 29, "node_1": 1, "node_2": 2, "node_3": 4, "id_reference": {"table": "Driewikkelingstransformatoren", "key": {"Nummer": 1}}}
     ]
 }