From fd167b8553fd2fa24fe619b19b6335d23864571a Mon Sep 17 00:00:00 2001
From: pawellytaev <pawel.lytaev@uni-kassel.de>
Date: Wed, 4 Sep 2024 13:58:48 +0200
Subject: [PATCH 1/6] add test for out of service trafo with controller

---
 pandapower/test/control/test_continuous_tap_control.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pandapower/test/control/test_continuous_tap_control.py b/pandapower/test/control/test_continuous_tap_control.py
index b1e24057c..dd1f25388 100644
--- a/pandapower/test/control/test_continuous_tap_control.py
+++ b/pandapower/test/control/test_continuous_tap_control.py
@@ -288,6 +288,11 @@ def test_continuous_tap_control_side_hv_reversed_3w():
     assert np.allclose(net.res_trafo3w.vm_hv_pu.values, 1.02, atol=tol)
     assert not np.allclose(net.trafo3w.tap_pos.values, 0)
 
+def test_continuous_trafo_control_with_oos_trafo():
+    net = pp.networks.mv_oberrhein()
+    # switch transformer out of service
+    net.trafo.loc[114, 'in_service'] = False
+    ContinuousTapControl(net=net, element_index=114, vm_set_pu=1.0, tol=0.001)
 
 if __name__ == '__main__':
     pytest.main([__file__, "-xs"])

From f5baf7a828fe44cac040421cebb40d3b62eb8422 Mon Sep 17 00:00:00 2001
From: pawellytaev <pawel.lytaev@uni-kassel.de>
Date: Wed, 4 Sep 2024 18:28:50 +0200
Subject: [PATCH 2/6] enhance nothing_to_do to check for element in service
 status instead of in TrafoControl.__init__

---
 .../control/controller/trafo_control.py       | 59 +++++++++++--------
 1 file changed, 34 insertions(+), 25 deletions(-)

diff --git a/pandapower/control/controller/trafo_control.py b/pandapower/control/controller/trafo_control.py
index 267238786..d3cb3ae44 100644
--- a/pandapower/control/controller/trafo_control.py
+++ b/pandapower/control/controller/trafo_control.py
@@ -46,7 +46,7 @@ def __init__(self, net, element_index, side, tol, in_service, element, level=0,
 
         self._set_side(side)
         self._set_read_write_flag(net)
-        self._set_valid_controlled_index_and_bus(net)
+        # self._set_valid_controlled_index_and_bus(net)
         self._set_tap_parameters(net)
         self._set_tap_side_coeff(net)
 
@@ -54,6 +54,8 @@ def __init__(self, net, element_index, side, tol, in_service, element, level=0,
 
         self.set_recycle(net)
 
+        self.trafobus = read_from_net(net, self.element, self.element_index, self.side + '_bus', self._read_write_flag)
+
     def _set_read_write_flag(self, net):
         # if someone changes indices of the controller from single index to array and vice versa
         self._read_write_flag, _ = _detect_read_write_flag(net, self.element, self.element_index, "tap_pos")
@@ -67,25 +69,36 @@ def initialize_control(self, net):
         # update trafo tap parameters
         # we assume side does not change after the controller is created
         self._set_read_write_flag(net)
-        self._set_valid_controlled_index_and_bus(net)
+        # self._set_valid_controlled_index_and_bus(net)
         if self.nothing_to_do(net):
             return
         self._set_tap_parameters(net)
         self._set_tap_side_coeff(net)
 
     def nothing_to_do(self, net):
-        # if the controller shouldn't do anything, return True
-        if self.controlled_element_index is None or (
-                self._read_write_flag != 'single_index' and len(self.controlled_element_index) == 0):
-            return True
-        return False
+        element_in_service = read_from_net(net, self.element, self.element_index, 'in_service', self._read_write_flag)
+        ext_grid_bus = np.isin(self.trafobus, net.ext_grid.loc[net.ext_grid.in_service, 'bus'].values)
+        element_index_in_net = np.isin(self.element_index, net[self.element].index.values)
+        self.controlled = np.logical_and(np.logical_and(element_in_service, element_index_in_net), np.logical_not(ext_grid_bus))
+        if isinstance(self.element_index, np.int64) or isinstance(self.element_index, int):
+            # if the controller shouldn't do anything, return True
+            if not element_in_service or ext_grid_bus or not element_index_in_net or (
+                    self._read_write_flag != 'single_index' and len(self.element_index) == 0):
+                return True
+            return False
+        else:
+            # if the controller shouldn't do anything, return True
+            if np.all(~element_in_service[self.controlled]) or np.all(ext_grid_bus[self.controlled]) or np.all(~element_index_in_net[self.controlled]) or (
+                    self._read_write_flag != 'single_index' and len(self.element_index) == 0):
+                return True
+            return False
 
     def _set_tap_side_coeff(self, net):
-        tap_side = read_from_net(net, self.element, self.controlled_element_index, 'tap_side', self._read_write_flag)
+        tap_side = read_from_net(net, self.element, self.element_index, 'tap_side', self._read_write_flag)
         if (len(np.setdiff1d(tap_side, ['hv', 'lv'])) > 0 and self.element == "trafo") or \
             (len(np.setdiff1d(tap_side, ['hv', 'lv', 'mv'])) > 0 and self.element == "trafo3w"):
             raise ValueError("Trafo tap side (in net.%s) has to be either hv or lv, "
-                             "but received: %s for trafo %s" % (self.element, tap_side, self.controlled_element_index))
+                             "but received: %s for trafo %s" % (self.element, tap_side, self.element_index))
 
         if self._read_write_flag == "single_index":
             self.tap_side_coeff = 1 if tap_side == 'hv' else -1
@@ -113,29 +126,25 @@ def _set_side(self, side):
         self.side = side
 
     def _set_valid_controlled_index_and_bus(self, net):
-        self.trafobus = read_from_net(net, self.element, self.element_index, self.side + '_bus', self._read_write_flag)
         element_in_service = read_from_net(net, self.element, self.element_index, 'in_service', self._read_write_flag)
         ext_grid_bus = np.isin(self.trafobus, net.ext_grid.loc[net.ext_grid.in_service, 'bus'].values)
         element_index_in_net = np.isin(self.element_index, net[self.element].index.values)
-        controlled = np.logical_and(np.logical_and(element_in_service, element_index_in_net), np.logical_not(ext_grid_bus))
-        if self._read_write_flag == 'single_index':
-            self.controlled_element_index = self.element_index if controlled else None
-            self.controlled_bus = self.trafobus if controlled else None
-        else:
-            self.controlled_element_index = self.element_index[controlled]
-            self.controlled_bus = self.trafobus[controlled]
+        self.controlled = np.logical_and(np.logical_and(element_in_service, element_index_in_net), np.logical_not(ext_grid_bus))
+        if self._read_write_flag != 'single_index':
+            self.element_index = self.element_index[self.controlled]
+            self.trafobus = self.trafobus[self.controlled]
 
-        if np.all(~controlled):
+        if np.all(~self.controlled):
             logger.warning("All controlled buses are not valid: controller has no effect")
 
     def _set_tap_parameters(self, net):
-        self.tap_min = read_from_net(net, self.element, self.controlled_element_index, "tap_min", self._read_write_flag)
-        self.tap_max = read_from_net(net, self.element, self.controlled_element_index, "tap_max", self._read_write_flag)
-        self.tap_neutral = read_from_net(net, self.element, self.controlled_element_index, "tap_neutral", self._read_write_flag)
-        self.tap_step_percent = read_from_net(net, self.element, self.controlled_element_index, "tap_step_percent", self._read_write_flag)
-        self.tap_step_degree = read_from_net(net, self.element, self.controlled_element_index, "tap_step_degree", self._read_write_flag)
+        self.tap_min = read_from_net(net, self.element, self.element_index, "tap_min", self._read_write_flag)
+        self.tap_max = read_from_net(net, self.element, self.element_index, "tap_max", self._read_write_flag)
+        self.tap_neutral = read_from_net(net, self.element, self.element_index, "tap_neutral", self._read_write_flag)
+        self.tap_step_percent = read_from_net(net, self.element, self.element_index, "tap_step_percent", self._read_write_flag)
+        self.tap_step_degree = read_from_net(net, self.element, self.element_index, "tap_step_degree", self._read_write_flag)
 
-        self.tap_pos = read_from_net(net, self.element, self.controlled_element_index, "tap_pos", self._read_write_flag)
+        self.tap_pos = read_from_net(net, self.element, self.element_index, "tap_pos", self._read_write_flag)
         if self._read_write_flag == "single_index":
             self.tap_sign = 1 if np.isnan(self.tap_step_degree) else np.sign(np.cos(np.deg2rad(self.tap_step_degree)))
             if (self.tap_sign == 0) | (np.isnan(self.tap_sign)):
@@ -163,7 +172,7 @@ def set_recycle(self, net):
         net.controller.at[self.index, 'recycle'] = recycle
 
     # def timestep(self, net):
-    #     self.tap_pos = net[self.element].at[self.controlled_element_index, "tap_pos"]
+    #     self.tap_pos = net[self.element].at[self.element_index, "tap_pos"]
 
     def __repr__(self):
         s = '%s of %s %s' % (self.__class__.__name__, self.element, self.element_index)

From c339ff5ffb1f9e87b82317c77a914388e1d14cf8 Mon Sep 17 00:00:00 2001
From: pawellytaev <pawel.lytaev@uni-kassel.de>
Date: Wed, 4 Sep 2024 18:30:02 +0200
Subject: [PATCH 3/6] change convert_format and tap controllers for new
 parameter names, controlled_bus -> trafobus, controlled_element_index ->
 element_index

---
 .../controller/trafo/ContinuousTapControl.py  | 20 +++++++++----------
 .../controller/trafo/DiscreteTapControl.py    | 10 +++++-----
 pandapower/convert_format.py                  |  2 ++
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/pandapower/control/controller/trafo/ContinuousTapControl.py b/pandapower/control/controller/trafo/ContinuousTapControl.py
index 612b94b14..20e07d68b 100644
--- a/pandapower/control/controller/trafo/ContinuousTapControl.py
+++ b/pandapower/control/controller/trafo/ContinuousTapControl.py
@@ -50,18 +50,18 @@ def __init__(self, net, element_index, vm_set_pu, tol=1e-3, side="lv", element="
         self.vm_set_pu = vm_set_pu
 
     def _set_t_nom(self, net):
-        vn_hv_kv = read_from_net(net, self.element, self.controlled_element_index, 'vn_hv_kv', self._read_write_flag)
-        hv_bus = read_from_net(net, self.element, self.controlled_element_index, 'hv_bus', self._read_write_flag)
+        vn_hv_kv = read_from_net(net, self.element, self.element_index, 'vn_hv_kv', self._read_write_flag)
+        hv_bus = read_from_net(net, self.element, self.element_index, 'hv_bus', self._read_write_flag)
         vn_hv_bus_kv = read_from_net(net, "bus", hv_bus, 'vn_kv', self._read_write_flag)
 
         if self.element == "trafo3w" and self.side == "mv":
-            vn_mv_kv = read_from_net(net, self.element, self.controlled_element_index, 'vn_mv_kv', self._read_write_flag)
-            mv_bus = read_from_net(net, self.element, self.controlled_element_index, 'mv_bus', self._read_write_flag)
+            vn_mv_kv = read_from_net(net, self.element, self.element_index, 'vn_mv_kv', self._read_write_flag)
+            mv_bus = read_from_net(net, self.element, self.element_index, 'mv_bus', self._read_write_flag)
             vn_mv_bus_kv = read_from_net(net, "bus", mv_bus, 'vn_kv', self._read_write_flag)
             self.t_nom = vn_mv_kv / vn_hv_kv * vn_hv_bus_kv / vn_mv_bus_kv
         else:
-            vn_lv_kv = read_from_net(net, self.element, self.controlled_element_index, 'vn_lv_kv', self._read_write_flag)
-            lv_bus = read_from_net(net, self.element, self.controlled_element_index, 'lv_bus', self._read_write_flag)
+            vn_lv_kv = read_from_net(net, self.element, self.element_index, 'vn_lv_kv', self._read_write_flag)
+            lv_bus = read_from_net(net, self.element, self.element_index, 'lv_bus', self._read_write_flag)
             vn_lv_bus_kv = read_from_net(net, "bus", lv_bus, 'vn_kv', self._read_write_flag)
             self.t_nom = vn_lv_kv / vn_hv_kv * vn_hv_bus_kv / vn_lv_bus_kv
 
@@ -77,7 +77,7 @@ def control_step(self, net):
         if self.nothing_to_do(net):
             return
 
-        delta_vm_pu = read_from_net(net, "res_bus", self.controlled_bus, 'vm_pu', self._read_write_flag) - self.vm_set_pu
+        delta_vm_pu = read_from_net(net, "res_bus", self.trafobus, 'vm_pu', self._read_write_flag) - self.vm_set_pu
         tc = delta_vm_pu / self.tap_step_percent * 100 / self.t_nom
         self.tap_pos = self.tap_pos + tc * self.tap_side_coeff * self.tap_sign
         if self.check_tap_bounds:
@@ -87,7 +87,7 @@ def control_step(self, net):
         # necessary in case the dtype of the column is int
         if net[self.element].tap_pos.dtype != "float":
             net[self.element].tap_pos = net[self.element].tap_pos.astype(float)
-        write_to_net(net, self.element, self.controlled_element_index, "tap_pos", self.tap_pos, self._read_write_flag)
+        write_to_net(net, self.element, self.element_index, "tap_pos", self.tap_pos, self._read_write_flag)
 
     def is_converged(self, net):
         """
@@ -97,10 +97,10 @@ def is_converged(self, net):
         if self.nothing_to_do(net):
             return True
 
-        vm_pu = read_from_net(net, "res_bus", self.controlled_bus, "vm_pu", self._read_write_flag)
+        vm_pu = read_from_net(net, "res_bus", self.trafobus, "vm_pu", self._read_write_flag)
         # this is possible in case the trafo is set out of service by the connectivity check
         is_nan =  np.isnan(vm_pu)
-        self.tap_pos = read_from_net(net, self.element, self.controlled_element_index, "tap_pos", self._read_write_flag)
+        self.tap_pos = read_from_net(net, self.element, self.element_index, "tap_pos", self._read_write_flag)
         difference = 1 - self.vm_set_pu / vm_pu
 
         if self.check_tap_bounds:
diff --git a/pandapower/control/controller/trafo/DiscreteTapControl.py b/pandapower/control/controller/trafo/DiscreteTapControl.py
index d2647d778..aaa1d80db 100644
--- a/pandapower/control/controller/trafo/DiscreteTapControl.py
+++ b/pandapower/control/controller/trafo/DiscreteTapControl.py
@@ -108,9 +108,9 @@ def control_step(self, net):
         if self.nothing_to_do(net):
             return
 
-        vm_pu = read_from_net(net, "res_bus", self.controlled_bus, "vm_pu", self._read_write_flag)
+        vm_pu = read_from_net(net, "res_bus", self.trafobus, "vm_pu", self._read_write_flag)
         self.tap_pos = read_from_net(
-            net, self.element, self.controlled_element_index, "tap_pos", self._read_write_flag)
+            net, self.element, self.element_index, "tap_pos", self._read_write_flag)
 
         increment = np.where(
             self.tap_side_coeff * self.tap_sign == 1,
@@ -126,7 +126,7 @@ def control_step(self, net):
             self._hunting_taps = self._hunting_taps[1:, :]
 
         # WRITE TO NET
-        write_to_net(net, self.element, self.controlled_element_index, 'tap_pos',
+        write_to_net(net, self.element, self.element_index, 'tap_pos',
                      self.tap_pos, self._read_write_flag)
 
     def is_converged(self, net):
@@ -136,11 +136,11 @@ def is_converged(self, net):
         if self.nothing_to_do(net):
             return True
 
-        vm_pu = read_from_net(net, "res_bus", self.controlled_bus, "vm_pu", self._read_write_flag)
+        vm_pu = read_from_net(net, "res_bus", self.trafobus, "vm_pu", self._read_write_flag)
         # this is possible in case the trafo is set out of service by the connectivity check
         is_nan = np.isnan(vm_pu)
         self.tap_pos = read_from_net(
-            net, self.element, self.controlled_element_index, "tap_pos", self._read_write_flag)
+            net, self.element, self.element_index, "tap_pos", self._read_write_flag)
 
         reached_limit = np.where(self.tap_side_coeff * self.tap_sign == 1,
                                  (vm_pu < self.vm_lower_pu) & (self.tap_pos == self.tap_min) |
diff --git a/pandapower/convert_format.py b/pandapower/convert_format.py
index e30dfef70..94e2f0962 100644
--- a/pandapower/convert_format.py
+++ b/pandapower/convert_format.py
@@ -154,6 +154,8 @@ def _convert_trafo_controller_parameter_names(net):
             elif "trafotype" in controller.__dict__.keys():
                 controller.__dict__["element"] = controller.__dict__.pop("trafotype")
 
+            if "controlled_bus" in controller.__dict__.keys():
+                controller.__dict__["trafobus"] = controller.__dict__.pop("controlled_bus")
 
 def _convert_bus_pq_meas_to_load_reference(net, elements_to_deserialize):
     if _check_elements_to_deserialize('measurement', elements_to_deserialize):

From 83d07e6542bbe8967f48f178f3d324eb2add4eec Mon Sep 17 00:00:00 2001
From: pawellytaev <pawel.lytaev@uni-kassel.de>
Date: Wed, 4 Sep 2024 18:30:32 +0200
Subject: [PATCH 4/6] adjust tests for new trafo control parameter names

---
 .../test/control/test_discrete_tap_control.py |  5 +++++
 .../test/control/test_vm_set_tap_control.py   | 20 +++++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/pandapower/test/control/test_discrete_tap_control.py b/pandapower/test/control/test_discrete_tap_control.py
index 5a12eaab2..3d8f34769 100644
--- a/pandapower/test/control/test_discrete_tap_control.py
+++ b/pandapower/test/control/test_discrete_tap_control.py
@@ -390,6 +390,11 @@ def test_continuous_tap_control_side_mv():
     assert all(_vm_in_desired_area(net, 1.01, 1.03, "mv", trafo_table="trafo3w"))
     assert not np.allclose(net.trafo3w.tap_pos.values, 0)
 
+def test_discrete_trafo_control_with_oos_trafo():
+    net = pp.networks.mv_oberrhein()
+    # switch transformer out of service
+    net.trafo.loc[114, 'in_service'] = False
+    DiscreteTapControl(net=net, element_index=114, vm_lower_pu=1.01, vm_upper_pu=1.03)
 
 if __name__ == '__main__':
     pytest.main([__file__, "-xs"])
diff --git a/pandapower/test/control/test_vm_set_tap_control.py b/pandapower/test/control/test_vm_set_tap_control.py
index 61e87d42c..033a3dfd9 100644
--- a/pandapower/test/control/test_vm_set_tap_control.py
+++ b/pandapower/test/control/test_vm_set_tap_control.py
@@ -28,21 +28,21 @@ def test_continuous_p():
     pp.runpp(net, run_control=True)
 
     # we expect the tap to converge at upper voltage limit
-    assert abs(net.res_bus.vm_pu.at[c.controlled_bus] - 1.05) < eps
+    assert abs(net.res_bus.vm_pu.at[c.trafobus] - 1.05) < eps
 
     # power sums up to 15kW
     net.sgen.at[gid, "p_mw"] = 5
     pp.runpp(net, run_control=True)
 
     # we expect the tap to converge at 1.0 pu
-    assert abs(net.res_bus.vm_pu.at[c.controlled_bus] - 1.) < eps
+    assert abs(net.res_bus.vm_pu.at[c.trafobus] - 1.) < eps
 
     # generation now cancels load
     net.sgen.at[gid, "p_mw"] = 10
     pp.runpp(net, run_control=True)
 
     # we expect the tap to converge at lower voltage limit
-    assert abs(net.res_bus.vm_pu.at[c.controlled_bus] - 0.95) < eps
+    assert abs(net.res_bus.vm_pu.at[c.trafobus] - 0.95) < eps
 
     # testing limits
     # power flowing back
@@ -50,7 +50,7 @@ def test_continuous_p():
     pp.runpp(net, run_control=True)
 
     # we expect the tap to converge at lower voltage limit and not drop even lower
-    assert abs(net.res_bus.vm_pu.at[c.controlled_bus] - 0.95) < eps
+    assert abs(net.res_bus.vm_pu.at[c.trafobus] - 0.95) < eps
 
     # excessive load
     net.sgen.at[gid, "p_mw"] = 0
@@ -58,7 +58,7 @@ def test_continuous_p():
     pp.runpp(net, run_control=True)
 
     # we expect the tap to converge at upper voltage limit and not to go beyond
-    assert abs(net.res_bus.vm_pu.at[c.controlled_bus] - 1.05) < eps
+    assert abs(net.res_bus.vm_pu.at[c.trafobus] - 1.05) < eps
 
 
 def test_continuous_i():
@@ -81,21 +81,21 @@ def test_continuous_i():
     pp.runpp(net, run_control=True)
 
     # we expect the tap to converge at upper voltage limit
-    assert abs(net.res_bus.vm_pu.at[c.controlled_bus] - 1.05) < eps
+    assert abs(net.res_bus.vm_pu.at[c.trafobus] - 1.05) < eps
 
     # power sums up to 15kW
     net.sgen.at[gid, "p_mw"] = 5
     pp.runpp(net, run_control=True)
 
     # we expect the tap to converge at 1.0 pu
-    assert abs(net.res_bus.vm_pu.at[c.controlled_bus] - 1.) < eps
+    assert abs(net.res_bus.vm_pu.at[c.trafobus] - 1.) < eps
 
     # generation now cancels load
     net.sgen.at[gid, "p_mw"] = 10
     pp.runpp(net, run_control=True)
 
     # we expect the tap to converge at lower voltage limit
-    assert abs(net.res_bus.vm_pu.at[c.controlled_bus] - 0.95) < eps
+    assert abs(net.res_bus.vm_pu.at[c.trafobus] - 0.95) < eps
 
     # testing limits
     # power flowing back
@@ -103,7 +103,7 @@ def test_continuous_i():
     pp.runpp(net, run_control=True)
 
     # we expect the tap to converge at lower voltage limit and not drop even lower
-    assert abs(net.res_bus.vm_pu.at[c.controlled_bus] - 0.95) < eps
+    assert abs(net.res_bus.vm_pu.at[c.trafobus] - 0.95) < eps
 
     # excessive load
     net.sgen.at[gid, "p_mw"] = 0
@@ -111,7 +111,7 @@ def test_continuous_i():
     pp.runpp(net, run_control=True)
 
     # we expect the tap to converge at upper voltage limit and not to go beyond
-    assert abs(net.res_bus.vm_pu.at[c.controlled_bus] - 1.05) < eps
+    assert abs(net.res_bus.vm_pu.at[c.trafobus] - 1.05) < eps
 
 if __name__ == '__main__':
     pytest.main([__file__, "-xs"])
\ No newline at end of file

From 5e67f17c52e05febd94ea971e4bfb25292a7548c Mon Sep 17 00:00:00 2001
From: pawellytaev <pawel.lytaev@uni-kassel.de>
Date: Wed, 4 Sep 2024 18:59:37 +0200
Subject: [PATCH 5/6] changelog for trafo ctrl changes

---
 CHANGELOG.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index c06c4aba3..4417777df 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -79,7 +79,8 @@ Change Log
 - [ADDED] Add VSC element, dc buses, dc lines, and hybrid AC/DC power flow calculation
 - [CHANGED] accelerate _integrate_power_elements_connected_with_switch_buses() in get_equivalent()
 - [CHANGED] accelerate distributed slack power flow calculation by using sparse-aware operations in _subnetworks()
-- [ADDED] Discrete shunt controller for local voltage regulation with shunt steps
+- [ADDED] Discrete shunt controller for local voltage regulation with shunt
+- [CHANGED] Trafo Controllers can now be added to elements that are out of service, changed self.nothing_to_do()
 
 [2.14.7] - 2024-06-14
 -------------------------------

From f7b36532749209987b9749f3a716858aa794bec5 Mon Sep 17 00:00:00 2001
From: pawellytaev <pawel.lytaev@uni-kassel.de>
Date: Wed, 4 Sep 2024 21:30:10 +0200
Subject: [PATCH 6/6] update results in minimal_example.ipynb

---
 tutorials/minimal_example.ipynb | 560 +++++++++++++++++++-------------
 1 file changed, 342 insertions(+), 218 deletions(-)

diff --git a/tutorials/minimal_example.ipynb b/tutorials/minimal_example.ipynb
index 2a33f4eb8..9d9e3f1c1 100644
--- a/tutorials/minimal_example.ipynb
+++ b/tutorials/minimal_example.ipynb
@@ -18,9 +18,12 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
-   "metadata": {},
-   "outputs": [],
+   "metadata": {
+    "ExecuteTime": {
+     "end_time": "2024-09-04T19:28:40.415709Z",
+     "start_time": "2024-09-04T19:28:31.792136Z"
+    }
+   },
    "source": [
     "import pandapower as pp\n",
     "\n",
@@ -39,7 +42,9 @@
     "#create branch elements\n",
     "trafo = pp.create_transformer(net, hv_bus=bus1, lv_bus=bus2, std_type=\"0.4 MVA 20/0.4 kV\", name=\"Trafo\")\n",
     "line = pp.create_line(net, from_bus=bus2, to_bus=bus3, length_km=0.1, std_type=\"NAYY 4x50 SE\", name=\"Line\")"
-   ]
+   ],
+   "outputs": [],
+   "execution_count": 1
   },
   {
    "cell_type": "markdown",
@@ -52,11 +57,24 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
-   "metadata": {},
+   "metadata": {
+    "ExecuteTime": {
+     "end_time": "2024-09-04T19:28:40.446233Z",
+     "start_time": "2024-09-04T19:28:40.419268Z"
+    }
+   },
+   "source": [
+    "net.bus"
+   ],
    "outputs": [
     {
      "data": {
+      "text/plain": [
+       "    name  vn_kv type  zone  in_service   geo\n",
+       "0  Bus 1   20.0    b  None        True  None\n",
+       "1  Bus 2    0.4    b  None        True  None\n",
+       "2  Bus 3    0.4    b  None        True  None"
+      ],
       "text/html": [
        "<div>\n",
        "<style scoped>\n",
@@ -81,6 +99,7 @@
        "      <th>type</th>\n",
        "      <th>zone</th>\n",
        "      <th>in_service</th>\n",
+       "      <th>geo</th>\n",
        "    </tr>\n",
        "  </thead>\n",
        "  <tbody>\n",
@@ -91,6 +110,7 @@
        "      <td>b</td>\n",
        "      <td>None</td>\n",
        "      <td>True</td>\n",
+       "      <td>None</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>1</th>\n",
@@ -99,6 +119,7 @@
        "      <td>b</td>\n",
        "      <td>None</td>\n",
        "      <td>True</td>\n",
+       "      <td>None</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>2</th>\n",
@@ -107,16 +128,11 @@
        "      <td>b</td>\n",
        "      <td>None</td>\n",
        "      <td>True</td>\n",
+       "      <td>None</td>\n",
        "    </tr>\n",
        "  </tbody>\n",
        "</table>\n",
        "</div>"
-      ],
-      "text/plain": [
-       "    name  vn_kv type  zone  in_service\n",
-       "0  Bus 1   20.0    b  None        True\n",
-       "1  Bus 2    0.4    b  None        True\n",
-       "2  Bus 3    0.4    b  None        True"
       ]
      },
      "execution_count": 2,
@@ -124,17 +140,32 @@
      "output_type": "execute_result"
     }
    ],
-   "source": [
-    "net.bus"
-   ]
+   "execution_count": 2
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
-   "metadata": {},
+   "metadata": {
+    "ExecuteTime": {
+     "end_time": "2024-09-04T19:28:40.492915Z",
+     "start_time": "2024-09-04T19:28:40.449226Z"
+    }
+   },
+   "source": [
+    "net.line"
+   ],
    "outputs": [
     {
      "data": {
+      "text/plain": [
+       "   name      std_type  from_bus  to_bus  length_km  r_ohm_per_km  \\\n",
+       "0  Line  NAYY 4x50 SE         1       2        0.1         0.642   \n",
+       "\n",
+       "   x_ohm_per_km  c_nf_per_km  g_us_per_km  max_i_ka   df  parallel type  \\\n",
+       "0         0.083        210.0          0.0     0.142  1.0         1   cs   \n",
+       "\n",
+       "   in_service  geo  \n",
+       "0        True  NaN  "
+      ],
       "text/html": [
        "<div>\n",
        "<style scoped>\n",
@@ -168,6 +199,7 @@
        "      <th>parallel</th>\n",
        "      <th>type</th>\n",
        "      <th>in_service</th>\n",
+       "      <th>geo</th>\n",
        "    </tr>\n",
        "  </thead>\n",
        "  <tbody>\n",
@@ -187,20 +219,11 @@
        "      <td>1</td>\n",
        "      <td>cs</td>\n",
        "      <td>True</td>\n",
+       "      <td>NaN</td>\n",
        "    </tr>\n",
        "  </tbody>\n",
        "</table>\n",
        "</div>"
-      ],
-      "text/plain": [
-       "   name      std_type  from_bus  to_bus  length_km  r_ohm_per_km  \\\n",
-       "0  Line  NAYY 4x50 SE         1       2        0.1         0.642   \n",
-       "\n",
-       "   x_ohm_per_km  c_nf_per_km  g_us_per_km  max_i_ka   df  parallel type  \\\n",
-       "0         0.083        210.0          0.0     0.142  1.0         1   cs   \n",
-       "\n",
-       "   in_service  \n",
-       "0        True  "
       ]
      },
      "execution_count": 3,
@@ -208,17 +231,35 @@
      "output_type": "execute_result"
     }
    ],
-   "source": [
-    "net.line"
-   ]
+   "execution_count": 3
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
-   "metadata": {},
+   "metadata": {
+    "ExecuteTime": {
+     "end_time": "2024-09-04T19:28:51.908978Z",
+     "start_time": "2024-09-04T19:28:51.866288Z"
+    }
+   },
+   "source": [
+    "net.trafo"
+   ],
    "outputs": [
     {
      "data": {
+      "text/plain": [
+       "    name           std_type  hv_bus  lv_bus  sn_mva  vn_hv_kv  vn_lv_kv  \\\n",
+       "0  Trafo  0.4 MVA 20/0.4 kV       0       1     0.4      20.0       0.4   \n",
+       "\n",
+       "   vk_percent  vkr_percent  pfe_kw  i0_percent  shift_degree tap_side  \\\n",
+       "0         6.0        1.425    1.35      0.3375         150.0       hv   \n",
+       "\n",
+       "   tap_neutral  tap_min  tap_max  tap_step_percent  tap_step_degree  tap_pos  \\\n",
+       "0            0       -2        2               2.5              0.0        0   \n",
+       "\n",
+       "   tap_phase_shifter  parallel   df  in_service  \n",
+       "0              False         1  1.0        True  "
+      ],
       "text/html": [
        "<div>\n",
        "<style scoped>\n",
@@ -248,7 +289,9 @@
        "      <th>vk_percent</th>\n",
        "      <th>vkr_percent</th>\n",
        "      <th>pfe_kw</th>\n",
-       "      <th>...</th>\n",
+       "      <th>i0_percent</th>\n",
+       "      <th>shift_degree</th>\n",
+       "      <th>tap_side</th>\n",
        "      <th>tap_neutral</th>\n",
        "      <th>tap_min</th>\n",
        "      <th>tap_max</th>\n",
@@ -274,7 +317,9 @@
        "      <td>6.0</td>\n",
        "      <td>1.425</td>\n",
        "      <td>1.35</td>\n",
-       "      <td>...</td>\n",
+       "      <td>0.3375</td>\n",
+       "      <td>150.0</td>\n",
+       "      <td>hv</td>\n",
        "      <td>0</td>\n",
        "      <td>-2</td>\n",
        "      <td>2</td>\n",
@@ -288,23 +333,7 @@
        "    </tr>\n",
        "  </tbody>\n",
        "</table>\n",
-       "<p>1 rows × 23 columns</p>\n",
        "</div>"
-      ],
-      "text/plain": [
-       "    name           std_type  hv_bus  lv_bus  sn_mva  vn_hv_kv  vn_lv_kv  \\\n",
-       "0  Trafo  0.4 MVA 20/0.4 kV       0       1     0.4      20.0       0.4   \n",
-       "\n",
-       "   vk_percent  vkr_percent  pfe_kw  ...  tap_neutral  tap_min tap_max  \\\n",
-       "0         6.0        1.425    1.35  ...            0       -2       2   \n",
-       "\n",
-       "   tap_step_percent  tap_step_degree  tap_pos  tap_phase_shifter  parallel  \\\n",
-       "0               2.5              0.0        0              False         1   \n",
-       "\n",
-       "    df  in_service  \n",
-       "0  1.0        True  \n",
-       "\n",
-       "[1 rows x 23 columns]"
       ]
      },
      "execution_count": 4,
@@ -312,17 +341,29 @@
      "output_type": "execute_result"
     }
    ],
-   "source": [
-    "net.trafo"
-   ]
+   "execution_count": 4
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
-   "metadata": {},
+   "metadata": {
+    "ExecuteTime": {
+     "end_time": "2024-09-04T19:28:53.701774Z",
+     "start_time": "2024-09-04T19:28:53.676920Z"
+    }
+   },
+   "source": [
+    "net.load"
+   ],
    "outputs": [
     {
      "data": {
+      "text/plain": [
+       "   name  bus  p_mw  q_mvar  const_z_percent  const_i_percent  sn_mva  scaling  \\\n",
+       "0  Load    2   0.1    0.05              0.0              0.0     NaN      1.0   \n",
+       "\n",
+       "   in_service type  \n",
+       "0        True  wye  "
+      ],
       "text/html": [
        "<div>\n",
        "<style scoped>\n",
@@ -371,13 +412,6 @@
        "  </tbody>\n",
        "</table>\n",
        "</div>"
-      ],
-      "text/plain": [
-       "   name  bus  p_mw  q_mvar  const_z_percent  const_i_percent  sn_mva  scaling  \\\n",
-       "0  Load    2   0.1    0.05              0.0              0.0     NaN      1.0   \n",
-       "\n",
-       "   in_service type  \n",
-       "0        True  wye  "
       ]
      },
      "execution_count": 5,
@@ -385,9 +419,7 @@
      "output_type": "execute_result"
     }
    ],
-   "source": [
-    "net.load"
-   ]
+   "execution_count": 5
   },
   {
    "cell_type": "markdown",
@@ -407,12 +439,17 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
-   "metadata": {},
-   "outputs": [],
+   "metadata": {
+    "ExecuteTime": {
+     "end_time": "2024-09-04T19:29:01.725672Z",
+     "start_time": "2024-09-04T19:28:56.826996Z"
+    }
+   },
    "source": [
     "pp.runpp(net)"
-   ]
+   ],
+   "outputs": [],
+   "execution_count": 6
   },
   {
    "cell_type": "markdown",
@@ -423,11 +460,24 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
-   "metadata": {},
+   "metadata": {
+    "ExecuteTime": {
+     "end_time": "2024-09-04T19:29:03.459428Z",
+     "start_time": "2024-09-04T19:29:03.432610Z"
+    }
+   },
+   "source": [
+    "net.res_bus"
+   ],
    "outputs": [
     {
      "data": {
+      "text/plain": [
+       "      vm_pu   va_degree      p_mw    q_mvar\n",
+       "0  1.020000    0.000000 -0.107265 -0.052675\n",
+       "1  1.008843 -150.760126  0.000000  0.000000\n",
+       "2  0.964431 -149.884141  0.100000  0.050000"
+      ],
       "text/html": [
        "<div>\n",
        "<style scoped>\n",
@@ -464,26 +514,20 @@
        "    <tr>\n",
        "      <th>1</th>\n",
        "      <td>1.008843</td>\n",
-       "      <td>-0.760126</td>\n",
+       "      <td>-150.760126</td>\n",
        "      <td>0.000000</td>\n",
        "      <td>0.000000</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>2</th>\n",
        "      <td>0.964431</td>\n",
-       "      <td>0.115859</td>\n",
+       "      <td>-149.884141</td>\n",
        "      <td>0.100000</td>\n",
        "      <td>0.050000</td>\n",
        "    </tr>\n",
        "  </tbody>\n",
        "</table>\n",
        "</div>"
-      ],
-      "text/plain": [
-       "      vm_pu  va_degree      p_mw    q_mvar\n",
-       "0  1.020000   0.000000 -0.107265 -0.052675\n",
-       "1  1.008843  -0.760126  0.000000  0.000000\n",
-       "2  0.964431   0.115859  0.100000  0.050000"
       ]
      },
      "execution_count": 7,
@@ -491,17 +535,32 @@
      "output_type": "execute_result"
     }
    ],
-   "source": [
-    "net.res_bus"
-   ]
+   "execution_count": 7
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
-   "metadata": {},
+   "metadata": {
+    "ExecuteTime": {
+     "end_time": "2024-09-04T19:29:07.149798Z",
+     "start_time": "2024-09-04T19:29:07.092204Z"
+    }
+   },
+   "source": [
+    "net.res_line"
+   ],
    "outputs": [
     {
      "data": {
+      "text/plain": [
+       "   p_from_mw  q_from_mvar  p_to_mw  q_to_mvar     pl_mw   ql_mvar  i_from_ka  \\\n",
+       "0   0.105392     0.050696     -0.1      -0.05  0.005392  0.000696   0.167325   \n",
+       "\n",
+       "    i_to_ka      i_ka  vm_from_pu  va_from_degree  vm_to_pu  va_to_degree  \\\n",
+       "0  0.167326  0.167326    1.008843     -150.760126  0.964431   -149.884141   \n",
+       "\n",
+       "   loading_percent  \n",
+       "0       117.835208  "
+      ],
       "text/html": [
        "<div>\n",
        "<style scoped>\n",
@@ -550,24 +609,14 @@
        "      <td>0.167326</td>\n",
        "      <td>0.167326</td>\n",
        "      <td>1.008843</td>\n",
-       "      <td>-0.760126</td>\n",
+       "      <td>-150.760126</td>\n",
        "      <td>0.964431</td>\n",
-       "      <td>0.115859</td>\n",
+       "      <td>-149.884141</td>\n",
        "      <td>117.835208</td>\n",
        "    </tr>\n",
        "  </tbody>\n",
        "</table>\n",
        "</div>"
-      ],
-      "text/plain": [
-       "   p_from_mw  q_from_mvar  p_to_mw  q_to_mvar     pl_mw   ql_mvar  i_from_ka  \\\n",
-       "0   0.105392     0.050696     -0.1      -0.05  0.005392  0.000696   0.167325   \n",
-       "\n",
-       "    i_to_ka      i_ka  vm_from_pu  va_from_degree  vm_to_pu  va_to_degree  \\\n",
-       "0  0.167326  0.167326    1.008843       -0.760126  0.964431      0.115859   \n",
-       "\n",
-       "   loading_percent  \n",
-       "0       117.835208  "
       ]
      },
      "execution_count": 8,
@@ -575,17 +624,29 @@
      "output_type": "execute_result"
     }
    ],
-   "source": [
-    "net.res_line"
-   ]
+   "execution_count": 8
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
-   "metadata": {},
+   "metadata": {
+    "ExecuteTime": {
+     "end_time": "2024-09-04T19:29:09.299185Z",
+     "start_time": "2024-09-04T19:29:09.242598Z"
+    }
+   },
+   "source": [
+    "net.res_trafo"
+   ],
    "outputs": [
     {
      "data": {
+      "text/plain": [
+       "    p_hv_mw  q_hv_mvar   p_lv_mw  q_lv_mvar     pl_mw   ql_mvar   i_hv_ka  \\\n",
+       "0  0.107265   0.052675 -0.105392  -0.050696  0.001873  0.001979  0.003382   \n",
+       "\n",
+       "    i_lv_ka  vm_hv_pu  va_hv_degree  vm_lv_pu  va_lv_degree  loading_percent  \n",
+       "0  0.167325      1.02           0.0  1.008843   -150.760126        29.289513  "
+      ],
       "text/html": [
        "<div>\n",
        "<style scoped>\n",
@@ -634,19 +695,12 @@
        "      <td>1.02</td>\n",
        "      <td>0.0</td>\n",
        "      <td>1.008843</td>\n",
-       "      <td>-0.760126</td>\n",
+       "      <td>-150.760126</td>\n",
        "      <td>29.289513</td>\n",
        "    </tr>\n",
        "  </tbody>\n",
        "</table>\n",
        "</div>"
-      ],
-      "text/plain": [
-       "    p_hv_mw  q_hv_mvar   p_lv_mw  q_lv_mvar     pl_mw   ql_mvar   i_hv_ka  \\\n",
-       "0  0.107265   0.052675 -0.105392  -0.050696  0.001873  0.001979  0.003382   \n",
-       "\n",
-       "    i_lv_ka  vm_hv_pu  va_hv_degree  vm_lv_pu  va_lv_degree  loading_percent  \n",
-       "0  0.167325      1.02           0.0  1.008843     -0.760126        29.289513  "
       ]
      },
      "execution_count": 9,
@@ -654,9 +708,7 @@
      "output_type": "execute_result"
     }
    ],
-   "source": [
-    "net.res_trafo"
-   ]
+   "execution_count": 9
   },
   {
    "cell_type": "markdown",
@@ -669,13 +721,18 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 10,
-   "metadata": {},
-   "outputs": [],
+   "metadata": {
+    "ExecuteTime": {
+     "end_time": "2024-09-04T19:29:11.032167Z",
+     "start_time": "2024-09-04T19:29:10.956571Z"
+    }
+   },
    "source": [
     "net.trafo.tap_pos.at[trafo] = -1\n",
     "pp.runpp(net)"
-   ]
+   ],
+   "outputs": [],
+   "execution_count": 10
   },
   {
    "cell_type": "markdown",
@@ -686,11 +743,24 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
-   "metadata": {},
+   "metadata": {
+    "ExecuteTime": {
+     "end_time": "2024-09-04T19:29:12.093900Z",
+     "start_time": "2024-09-04T19:29:12.066305Z"
+    }
+   },
+   "source": [
+    "net.res_bus"
+   ],
    "outputs": [
     {
      "data": {
+      "text/plain": [
+       "      vm_pu   va_degree      p_mw    q_mvar\n",
+       "0  1.020000    0.000000 -0.107015 -0.052529\n",
+       "1  1.035301 -150.720245  0.000000  0.000000\n",
+       "2  0.992135 -149.890487  0.100000  0.050000"
+      ],
       "text/html": [
        "<div>\n",
        "<style scoped>\n",
@@ -727,26 +797,20 @@
        "    <tr>\n",
        "      <th>1</th>\n",
        "      <td>1.035301</td>\n",
-       "      <td>-0.720245</td>\n",
+       "      <td>-150.720245</td>\n",
        "      <td>0.000000</td>\n",
        "      <td>0.000000</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>2</th>\n",
        "      <td>0.992135</td>\n",
-       "      <td>0.109513</td>\n",
+       "      <td>-149.890487</td>\n",
        "      <td>0.100000</td>\n",
        "      <td>0.050000</td>\n",
        "    </tr>\n",
        "  </tbody>\n",
        "</table>\n",
        "</div>"
-      ],
-      "text/plain": [
-       "      vm_pu  va_degree      p_mw    q_mvar\n",
-       "0  1.020000   0.000000 -0.107015 -0.052529\n",
-       "1  1.035301  -0.720245  0.000000  0.000000\n",
-       "2  0.992135   0.109513  0.100000  0.050000"
       ]
      },
      "execution_count": 11,
@@ -754,9 +818,7 @@
      "output_type": "execute_result"
     }
    ],
-   "source": [
-    "net.res_bus"
-   ]
+   "execution_count": 11
   },
   {
    "cell_type": "markdown",
@@ -769,8 +831,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 12,
-   "metadata": {},
+   "metadata": {
+    "ExecuteTime": {
+     "end_time": "2024-09-04T19:29:13.043671Z",
+     "start_time": "2024-09-04T19:29:13.016014Z"
+    }
+   },
+   "source": [
+    "pp.create_switch(net, bus=bus3, element=line, et=\"l\", closed=False)"
+   ],
    "outputs": [
     {
      "data": {
@@ -783,9 +852,7 @@
      "output_type": "execute_result"
     }
    ],
-   "source": [
-    "pp.create_switch(net, bus=bus3, element=line, et=\"l\", closed=False)"
-   ]
+   "execution_count": 12
   },
   {
    "cell_type": "markdown",
@@ -805,11 +872,25 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 13,
-   "metadata": {},
+   "metadata": {
+    "ExecuteTime": {
+     "end_time": "2024-09-04T19:29:14.840562Z",
+     "start_time": "2024-09-04T19:29:14.677091Z"
+    }
+   },
+   "source": [
+    "pp.runpp(net)\n",
+    "net.res_bus"
+   ],
    "outputs": [
     {
      "data": {
+      "text/plain": [
+       "      vm_pu   va_degree      p_mw    q_mvar\n",
+       "0  1.020000    0.000000 -0.001477  0.000001\n",
+       "1  1.046129 -150.005637  0.000000  0.000000\n",
+       "2       NaN         NaN  0.000000  0.000000"
+      ],
       "text/html": [
        "<div>\n",
        "<style scoped>\n",
@@ -846,7 +927,7 @@
        "    <tr>\n",
        "      <th>1</th>\n",
        "      <td>1.046129</td>\n",
-       "      <td>-0.005637</td>\n",
+       "      <td>-150.005637</td>\n",
        "      <td>0.000000</td>\n",
        "      <td>0.000000</td>\n",
        "    </tr>\n",
@@ -860,12 +941,6 @@
        "  </tbody>\n",
        "</table>\n",
        "</div>"
-      ],
-      "text/plain": [
-       "      vm_pu  va_degree      p_mw    q_mvar\n",
-       "0  1.020000   0.000000 -0.001477  0.000001\n",
-       "1  1.046129  -0.005637  0.000000  0.000000\n",
-       "2       NaN        NaN  0.000000  0.000000"
       ]
      },
      "execution_count": 13,
@@ -873,10 +948,7 @@
      "output_type": "execute_result"
     }
    ],
-   "source": [
-    "pp.runpp(net)\n",
-    "net.res_bus"
-   ]
+   "execution_count": 13
   },
   {
    "cell_type": "markdown",
@@ -887,11 +959,22 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 14,
-   "metadata": {},
+   "metadata": {
+    "ExecuteTime": {
+     "end_time": "2024-09-04T19:29:16.605286Z",
+     "start_time": "2024-09-04T19:29:16.564278Z"
+    }
+   },
+   "source": [
+    "net.res_load"
+   ],
    "outputs": [
     {
      "data": {
+      "text/plain": [
+       "   p_mw  q_mvar\n",
+       "0   0.0     0.0"
+      ],
       "text/html": [
        "<div>\n",
        "<style scoped>\n",
@@ -924,10 +1007,6 @@
        "  </tbody>\n",
        "</table>\n",
        "</div>"
-      ],
-      "text/plain": [
-       "   p_mw  q_mvar\n",
-       "0   0.0     0.0"
       ]
      },
      "execution_count": 14,
@@ -935,9 +1014,7 @@
      "output_type": "execute_result"
     }
    ],
-   "source": [
-    "net.res_load"
-   ]
+   "execution_count": 14
   },
   {
    "cell_type": "markdown",
@@ -948,11 +1025,28 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 15,
-   "metadata": {},
+   "metadata": {
+    "ExecuteTime": {
+     "end_time": "2024-09-04T19:29:18.039082Z",
+     "start_time": "2024-09-04T19:29:17.995525Z"
+    }
+   },
+   "source": [
+    "net.res_line"
+   ],
    "outputs": [
     {
      "data": {
+      "text/plain": [
+       "      p_from_mw  q_from_mvar       p_to_mw     q_to_mvar         pl_mw  \\\n",
+       "0  1.221502e-13    -0.000001 -1.161238e-16  2.011781e-16  1.220341e-13   \n",
+       "\n",
+       "    ql_mvar  i_from_ka       i_to_ka      i_ka  vm_from_pu  va_from_degree  \\\n",
+       "0 -0.000001   0.000002  3.204938e-16  0.000002    1.046129     -150.005637   \n",
+       "\n",
+       "   vm_to_pu  va_to_degree  loading_percent  \n",
+       "0  1.046129   -150.005649         0.001122  "
+      ],
       "text/html": [
        "<div>\n",
        "<style scoped>\n",
@@ -991,34 +1085,24 @@
        "  <tbody>\n",
        "    <tr>\n",
        "      <th>0</th>\n",
-       "      <td>1.230380e-13</td>\n",
+       "      <td>1.221502e-13</td>\n",
        "      <td>-0.000001</td>\n",
-       "      <td>-4.645745e-16</td>\n",
-       "      <td>4.580705e-20</td>\n",
-       "      <td>1.225734e-13</td>\n",
+       "      <td>-1.161238e-16</td>\n",
+       "      <td>2.011781e-16</td>\n",
+       "      <td>1.220341e-13</td>\n",
        "      <td>-0.000001</td>\n",
        "      <td>0.000002</td>\n",
-       "      <td>6.409876e-16</td>\n",
+       "      <td>3.204938e-16</td>\n",
        "      <td>0.000002</td>\n",
        "      <td>1.046129</td>\n",
-       "      <td>-0.005637</td>\n",
+       "      <td>-150.005637</td>\n",
        "      <td>1.046129</td>\n",
-       "      <td>-0.005649</td>\n",
+       "      <td>-150.005649</td>\n",
        "      <td>0.001122</td>\n",
        "    </tr>\n",
        "  </tbody>\n",
        "</table>\n",
        "</div>"
-      ],
-      "text/plain": [
-       "      p_from_mw  q_from_mvar       p_to_mw     q_to_mvar         pl_mw  \\\n",
-       "0  1.230380e-13    -0.000001 -4.645745e-16  4.580705e-20  1.225734e-13   \n",
-       "\n",
-       "    ql_mvar  i_from_ka       i_to_ka      i_ka  vm_from_pu  va_from_degree  \\\n",
-       "0 -0.000001   0.000002  6.409876e-16  0.000002    1.046129       -0.005637   \n",
-       "\n",
-       "   vm_to_pu  va_to_degree  loading_percent  \n",
-       "0  1.046129     -0.005649         0.001122  "
       ]
      },
      "execution_count": 15,
@@ -1026,9 +1110,7 @@
      "output_type": "execute_result"
     }
    ],
-   "source": [
-    "net.res_line"
-   ]
+   "execution_count": 15
   },
   {
    "cell_type": "markdown",
@@ -1041,8 +1123,16 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 16,
-   "metadata": {},
+   "metadata": {
+    "ExecuteTime": {
+     "end_time": "2024-09-04T19:29:19.227144Z",
+     "start_time": "2024-09-04T19:29:19.211648Z"
+    }
+   },
+   "source": [
+    "import pandapower.topology as top\n",
+    "top.unsupplied_buses(net)"
+   ],
    "outputs": [
     {
      "data": {
@@ -1055,10 +1145,7 @@
      "output_type": "execute_result"
     }
    ],
-   "source": [
-    "import pandapower.topology as top\n",
-    "top.unsupplied_buses(net)"
-   ]
+   "execution_count": 16
   },
   {
    "cell_type": "markdown",
@@ -1069,8 +1156,16 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 17,
-   "metadata": {},
+   "metadata": {
+    "ExecuteTime": {
+     "end_time": "2024-09-04T19:29:20.034146Z",
+     "start_time": "2024-09-04T19:29:20.009836Z"
+    }
+   },
+   "source": [
+    "net.switch.closed.at[0] = True\n",
+    "top.unsupplied_buses(net)"
+   ],
    "outputs": [
     {
      "data": {
@@ -1083,10 +1178,7 @@
      "output_type": "execute_result"
     }
    ],
-   "source": [
-    "net.switch.closed.at[0] = True\n",
-    "top.unsupplied_buses(net)"
-   ]
+   "execution_count": 17
   },
   {
    "cell_type": "markdown",
@@ -1099,12 +1191,17 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 18,
-   "metadata": {},
-   "outputs": [],
+   "metadata": {
+    "ExecuteTime": {
+     "end_time": "2024-09-04T19:29:20.412141Z",
+     "start_time": "2024-09-04T19:29:20.398629Z"
+    }
+   },
    "source": [
     "mg = top.create_nxgraph(net, include_trafos=False)"
-   ]
+   ],
+   "outputs": [],
+   "execution_count": 18
   },
   {
    "cell_type": "markdown",
@@ -1115,8 +1212,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 19,
-   "metadata": {},
+   "metadata": {
+    "ExecuteTime": {
+     "end_time": "2024-09-04T19:29:20.830948Z",
+     "start_time": "2024-09-04T19:29:20.805064Z"
+    }
+   },
+   "source": [
+    "list(top.connected_component(mg, 2))"
+   ],
    "outputs": [
     {
      "data": {
@@ -1129,9 +1233,7 @@
      "output_type": "execute_result"
     }
    ],
-   "source": [
-    "list(top.connected_component(mg, 2))"
-   ]
+   "execution_count": 19
   },
   {
    "cell_type": "markdown",
@@ -1151,13 +1253,18 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 20,
-   "metadata": {},
-   "outputs": [],
+   "metadata": {
+    "ExecuteTime": {
+     "end_time": "2024-09-04T19:29:21.468607Z",
+     "start_time": "2024-09-04T19:29:21.451768Z"
+    }
+   },
    "source": [
     "net.ext_grid[\"s_sc_max_mva\"] = 100\n",
     "net.ext_grid[\"rx_max\"] = 0.1"
-   ]
+   ],
+   "outputs": [],
+   "execution_count": 20
   },
   {
    "cell_type": "markdown",
@@ -1168,13 +1275,18 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 21,
-   "metadata": {},
-   "outputs": [],
+   "metadata": {
+    "ExecuteTime": {
+     "end_time": "2024-09-04T19:29:21.997319Z",
+     "start_time": "2024-09-04T19:29:21.923516Z"
+    }
+   },
    "source": [
     "import pandapower.shortcircuit as sc\n",
     "sc.calc_sc(net, case=\"max\", ip=True, r_fault_ohm=2.)"
-   ]
+   ],
+   "outputs": [],
+   "execution_count": 21
   },
   {
    "cell_type": "markdown",
@@ -1185,11 +1297,24 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 22,
-   "metadata": {},
+   "metadata": {
+    "ExecuteTime": {
+     "end_time": "2024-09-04T19:29:22.747392Z",
+     "start_time": "2024-09-04T19:29:22.709167Z"
+    }
+   },
+   "source": [
+    "net.res_bus_sc"
+   ],
    "outputs": [
     {
      "data": {
+      "text/plain": [
+       "    ikss_ka    skss_mw     ip_ka    rk_ohm    xk_ohm\n",
+       "0  2.534707  87.804824  4.317318  2.437816  4.378164\n",
+       "1  0.126631   0.087733  0.182666  2.005930  0.025290\n",
+       "2  0.122698   0.085008  0.176991  2.070130  0.033590"
+      ],
       "text/html": [
        "<div>\n",
        "<style scoped>\n",
@@ -1244,12 +1369,6 @@
        "  </tbody>\n",
        "</table>\n",
        "</div>"
-      ],
-      "text/plain": [
-       "    ikss_ka    skss_mw     ip_ka    rk_ohm    xk_ohm\n",
-       "0  2.534707  87.804824  4.317318  2.437816  4.378164\n",
-       "1  0.126631   0.087733  0.182666  2.005930  0.025290\n",
-       "2  0.122698   0.085008  0.176991  2.070130  0.033590"
       ]
      },
      "execution_count": 22,
@@ -1257,9 +1376,7 @@
      "output_type": "execute_result"
     }
    ],
-   "source": [
-    "net.res_bus_sc"
-   ]
+   "execution_count": 22
   },
   {
    "cell_type": "markdown",
@@ -1268,6 +1385,13 @@
     "This concludes a short walkthrough of some pandapower features. More in-depth tutorials can be found in the pandapower documentation:\n",
     "https://www.pandapower.org/start/#interactive-tutorials-"
    ]
+  },
+  {
+   "metadata": {},
+   "cell_type": "code",
+   "outputs": [],
+   "execution_count": null,
+   "source": ""
   }
  ],
  "metadata": {