pandapower 3.0.0.dev2__tar.gz → 3.1.2__tar.gz

{pandapower-3.0.0.dev2 → pandapower-3.1.2}/AUTHORS

@@ -1,4 +1,4 @@
-Copyright (c) 2016-2024 by University of Kassel and Fraunhofer Institute for Energy Economics
+Copyright (c) 2016-2025 by University of Kassel and Fraunhofer Institute for Energy Economics
 and Energy System Technology (IEE), Kassel. All rights reserved.
 
 pandapower is maintained and developed by a community on `GitHub <https://github.com/e2nIEE/pandapower>`_. Lists of maintainers and contributors can be found here:
@@ -31,6 +31,12 @@ Previous list of Contributors:
     - Zhenqi Wang
     - Alexander Prostejovsky
     - Maryam Majidi
-    - Martin Braun 
-    - Johann-Christian Töbermann 
+    - Martin Braun
+    - Johann-Christian Töbermann
     - Stefan Gehler
+    - Mike Vogt
+    - Pawel Lytaev
+    - Dominik Hilbrich
+    - Mario Richter
+    - David Heck
+    - Hjalmar Körtge

{pandapower-3.0.0.dev2 → pandapower-3.1.2}/LICENSE

@@ -1,8 +1,8 @@
-Copyright (c) 2016-2024 by University of Kassel and Fraunhofer Institute for Energy Economics
+Copyright (c) 2016-2025 by University of Kassel and Fraunhofer Institute for Energy Economics
 and Energy System Technology (IEE) Kassel and individual contributors (see AUTHORS file for details).
 All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification, are permitted 
+Redistribution and use in source and binary forms, with or without modification, are permitted
 provided that the following conditions are met:
 
 1. Redistributions of source code must retain the above copyright notice, this list of conditions
@@ -12,14 +12,14 @@ and the following disclaimer.
 conditions and the following disclaimer in the documentation and/or other materials provided
 with the distribution.
 
-3. Neither the name of the copyright holder nor the names of its contributors may be used to 
+3. Neither the name of the copyright holder nor the names of its contributors may be used to
 endorse or promote products derived from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR 
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND 
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
 CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
 WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
 WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

{pandapower-3.0.0.dev2 → pandapower-3.1.2}/PKG-INFO

@@ -1,35 +1,9 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: pandapower
-Version: 3.0.0.dev2
+Version: 3.1.2
 Summary: An easy to use open source tool for power system modeling, analysis and optimization with a high degree of automation.
-Author-email: Leon Thurner <leon.thurner@retoflow.de>, Alexander Scheidler <alexander.scheidler@iee.fraunhofer.de>
+Author-email: Leon Thurner <leon.thurner@retoflow.de>, Alexander Scheidler <alexander.scheidler@iee.fraunhofer.de>, Mike Vogt <mike.vogt@iee.fraunhofer.de>
 Maintainer-email: pandapower Developers <info@pandapower.org>
-License: Copyright (c) 2016-2024 by University of Kassel and Fraunhofer Institute for Energy Economics
-        and Energy System Technology (IEE) Kassel and individual contributors (see AUTHORS file for details).
-        All rights reserved.
-        
-        Redistribution and use in source and binary forms, with or without modification, are permitted 
-        provided that the following conditions are met:
-        
-        1. Redistributions of source code must retain the above copyright notice, this list of conditions
-        and the following disclaimer.
-        
-        2. Redistributions in binary form must reproduce the above copyright notice, this list of
-        conditions and the following disclaimer in the documentation and/or other materials provided
-        with the distribution.
-        
-        3. Neither the name of the copyright holder nor the names of its contributors may be used to 
-        endorse or promote products derived from this software without specific prior written permission.
-        
-        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR 
-        IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND 
-        FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR 
-        CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-        DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-        DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-        WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
-        WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-        
 Project-URL: Homepage, https://www.pandapower.org
 Project-URL: Documentation, https://pandapower.readthedocs.io
 Project-URL: Source, https://www.github.com/e2nIEE/pandapower
@@ -56,11 +30,9 @@ Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS
-License-File: CHANGELOG.rst
-License-File: CITATION.bib
 Requires-Dist: pandas>=1.0
 Requires-Dist: networkx>=2.5
-Requires-Dist: scipy<1.14
+Requires-Dist: scipy
 Requires-Dist: numpy
 Requires-Dist: packaging
 Requires-Dist: tqdm
@@ -120,6 +92,7 @@ Requires-Dist: cryptography; extra == "all"
 Requires-Dist: psycopg2; extra == "all"
 Requires-Dist: matpowercaseframes; extra == "all"
 Requires-Dist: power-grid-model-io; extra == "all"
+Dynamic: license-file
 
 
 .. image:: https://www.pandapower.org/images/pp.svg

{pandapower-3.0.0.dev2 → pandapower-3.1.2}/pandapower/_version.py

@@ -1,4 +1,4 @@
 import importlib.metadata
 
 __version__ = importlib.metadata.version("pandapower")
-__format_version__ = "3.0.0.dev0"
+__format_version__ = "3.0.0"

{pandapower-3.0.0.dev2 → pandapower-3.1.2}/pandapower/auxiliary.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2016-2024 by University of Kassel and Fraunhofer Institute for Energy Economics
+# Copyright (c) 2016-2025 by University of Kassel and Fraunhofer Institute for Energy Economics
 # and Energy System Technology (IEE), Kassel. All rights reserved.
 
 
@@ -27,43 +27,41 @@
 # (https://github.com/bcj/AttrDict/blob/master/LICENSE.txt)
 
 import copy
-from collections.abc import MutableMapping
+import numbers
 import warnings
-from importlib.metadata import version as version_str
+from collections.abc import MutableMapping
 from importlib.metadata import PackageNotFoundError
-from typing_extensions import deprecated
+from importlib.metadata import version as version_str
 
-from geojson import loads, GeoJSON
 import numpy as np
 import pandas as pd
 from pandas.api.types import is_numeric_dtype, is_string_dtype, is_object_dtype
 # from pandas.api.types import is_integer_dtype, is_float_dtype
 import scipy as sp
-import numbers
+from geojson import loads, GeoJSON
 from packaging.version import Version
+from typing_extensions import deprecated
 
 from pandapower.pypower.idx_brch import F_BUS, T_BUS, BR_STATUS
 from pandapower.pypower.idx_brch_dc import DC_BR_STATUS, DC_F_BUS, DC_T_BUS
 from pandapower.pypower.idx_bus import BUS_I, BUS_TYPE, NONE, PD, QD, VM, VA, REF, PQ, VMIN, VMAX, PV
+from pandapower.pypower.idx_bus_dc import DC_VMAX, DC_VMIN, DC_BUS_I, DC_BUS_TYPE, DC_NONE, DC_REF, DC_B2B, DC_P
 from pandapower.pypower.idx_gen import PMIN, PMAX, QMIN, QMAX
 from pandapower.pypower.idx_ssc import SSC_STATUS, SSC_BUS, SSC_INTERNAL_BUS
 from pandapower.pypower.idx_tcsc import TCSC_STATUS, TCSC_F_BUS, TCSC_T_BUS
-from pandapower.pypower.idx_vsc import VSC_STATUS, VSC_BUS, VSC_INTERNAL_BUS, VSC_BUS_DC, VSC_MODE_AC, VSC_MODE_AC_SL, \
-    VSC_INTERNAL_BUS_DC
-from .pypower.idx_bus_dc import DC_VMAX, DC_VMIN, DC_BUS_I, DC_BUS_TYPE, DC_NONE, DC_REF, DC_B2B, DC_P
+from pandapower.pypower.idx_vsc import VSC_STATUS, VSC_BUS, VSC_INTERNAL_BUS, VSC_BUS_DC, VSC_INTERNAL_BUS_DC
 
 try:
     from lightsim2grid.newtonpf import newtonpf_new as newtonpf_ls
+
     lightsim2grid_available = True
 except ImportError:
     lightsim2grid_available = False
-try:
-    import pandaplan.core.pplog as logging
-except ImportError:
-    import logging
+import logging
 try:
     from geopandas import GeoSeries
     from shapely import from_geojson
+
     geopandas_available = True
 except ImportError:
     geopandas_available = False
@@ -87,10 +85,9 @@ def log_to_level(msg, passed_logger, level):
 
 
 def version_check(package_name, level="UserWarning", ignore_not_installed=False):
-
     minimum_version = {'plotly': "3.1.1",
                        'numba': "0.25",
-                      }
+                       }
     if ignore_not_installed and package_name not in minimum_version.keys():
         return
 
@@ -110,6 +107,7 @@ def version_check(package_name, level="UserWarning", ignore_not_installed=False)
 
 try:
     from numba import jit
+
     try:
         version_check("numba")
         NUMBA_INSTALLED = True
@@ -119,6 +117,7 @@ try:
         NUMBA_INSTALLED = False
 except ImportError:
     from .pf.no_numba import jit
+
     NUMBA_INSTALLED = False
 
 
@@ -318,7 +317,7 @@ class pandapowerNet(ADict):
         for key in self:
             if isinstance(self[key], list):
                 self[key] = pd.DataFrame(np.zeros(0, dtype=self[key]), index=pd.Index([],
-                                         dtype=np.int64))
+                                                                                      dtype=np.int64))
 
     @deprecated("Use copy.deepcopy(net) instead of net.deepcopy()")
     def deepcopy(self):
@@ -349,7 +348,7 @@ class pandapowerNet(ADict):
         if len(res):
             res = [" and the following results tables:"] + res
         lines = ["This pandapower network includes the following parameter tables:"] + \
-            par + res + res_cost
+                par + res + res_cost
         return "\n".join(lines)
 
 
@@ -359,6 +358,7 @@ class GeoAccessor:
     pandas Series accessor for the geo column. It facilitates the use of geojson strings.
     NaN entrys are dropped using the accessor!
     """
+
     def __init__(self, pandas_obj):
         self._validate(pandas_obj)
         self._obj = pandas_obj
@@ -426,6 +426,7 @@ class GeoAccessor:
             if callable(geoms_item):
                 def wrapper(*args, **kwargs):
                     return geoms_item(*args, **kwargs)
+
                 return wrapper
             else:
                 return geoms_item
@@ -436,7 +437,6 @@ def plural_s(number):
     return "" if number == 1 else "s"
 
 
-
 def ets_to_element_types(ets=None):
     ser = pd.Series(["bus", "line", "trafo", "trafo3w", "impedance"],
                     index=["b", "l", "t", "t3", "i"])
@@ -772,7 +772,7 @@ def _write_to_object_attribute(net, element, index, variable, values):
 def _set_isolated_nodes_out_of_service(ppc, bus_not_reachable, dc=False):
     isolated_nodes = np.where(bus_not_reachable)[0]
     if len(isolated_nodes) > 0:
-        logger.debug("There are isolated buses in the network! (%i nodes in the PPC)"%len(isolated_nodes))
+        logger.debug("There are isolated buses in the network! (%i nodes in the PPC)" % len(isolated_nodes))
         # set buses in ppc out of service
         if dc:
             ppc['bus_dc'][isolated_nodes, DC_BUS_TYPE] = DC_NONE
@@ -1059,7 +1059,8 @@ def _select_is_elements_numba(net, isolated_nodes=None, isolated_nodes_dc=None,
         net._ppc["bus"][vsc_aux_isolated, BUS_TYPE] = NONE
         # if there are no in service VSC that define the DC slack node, we must change the DC slack to type P
         bus_dc_slack = net._ppc["bus_dc"][:, DC_BUS_TYPE] == DC_REF
-        bus_dc_with_vsc = np.r_[net._ppc["vsc"][is_elements["vsc"], VSC_BUS_DC], net._ppc["vsc"][is_elements["vsc"], VSC_INTERNAL_BUS_DC]]
+        bus_dc_with_vsc = np.r_[
+            net._ppc["vsc"][is_elements["vsc"], VSC_BUS_DC], net._ppc["vsc"][is_elements["vsc"], VSC_INTERNAL_BUS_DC]]
         bus_dc_to_change = bus_dc_slack & (~np.isin(net._ppc["bus_dc"][:, DC_BUS_I], bus_dc_with_vsc))
         net._ppc["bus_dc"][bus_dc_to_change, DC_BUS_TYPE] = DC_P
 
@@ -1245,11 +1246,12 @@ def _set_isolated_buses_out_of_service(net, ppc):
     # first check if buses are connected to branches
     # I don't know why this dance with [X, :][:, [Y, Z]] (instead of [X, [Y, Z]]) is necessary:
     disco = np.setxor1d(ppc["bus"][:, BUS_I].astype(np.int64),
-                        ppc["branch"][ppc["branch"][:, BR_STATUS] == 1, :][:, [F_BUS,T_BUS]].real.astype(np.int64).flatten())
+                        ppc["branch"][ppc["branch"][:, BR_STATUS] == 1, :][:, [F_BUS, T_BUS]].real.astype(
+                            np.int64).flatten())
 
     # but also check if they may be the only connection to an ext_grid
     net._isolated_buses = np.setdiff1d(disco, ppc['bus'][ppc['bus'][:, BUS_TYPE] == REF,
-                                                         BUS_I].real.astype(np.int64))
+    BUS_I].real.astype(np.int64))
     ppc["bus"][net._isolated_buses, BUS_TYPE] = NONE
 
     # check DC buses - not connected to DC lines and not connected to VSC DC side
@@ -1260,7 +1262,7 @@ def _set_isolated_buses_out_of_service(net, ppc):
 
     # but also check if they may be the only connection to an ext_grid
     net._isolated_buses_dc = np.setdiff1d(disco_dc, ppc['bus_dc'][ppc['bus_dc'][:, DC_BUS_TYPE] == REF,
-                                                         DC_BUS_I].real.astype(np.int64))
+    DC_BUS_I].real.astype(np.int64))
     ppc["bus_dc"][net._isolated_buses_dc, DC_BUS_TYPE] = DC_NONE
 
 
@@ -1283,9 +1285,8 @@ def _check_if_numba_is_installed(level="warning"):
     return NUMBA_INSTALLED
 
 
-
 def _check_lightsim2grid_compatibility(net, lightsim2grid, voltage_depend_loads, algorithm, distributed_slack, tdpf):
-    """
+    r"""
     Implement some checks to decide whether the package lightsim2grid can be used. These checks are
     documentated in :code:`doc\powerflow\ac.rst` The package implements a backend for power flow
     calculation in C++ and provides a speed-up. If lightsim2grid
@@ -1839,7 +1840,6 @@ def _init_rundcopp_options(net, check_connectivity, switch_rx_ratio, delta, traf
 
 def _init_runse_options(net, v_start, delta_start, calculate_voltage_angles,
                         **kwargs):
-
     check_connectivity = kwargs.get("check_connectivity", True)
     trafo_model = kwargs.get("trafo_model", "t")
     trafo3w_losses = kwargs.get("trafo3w_losses", "hv")
@@ -1852,7 +1852,7 @@ def _init_runse_options(net, v_start, delta_start, calculate_voltage_angles,
                      init_va_degree=delta_start, enforce_q_lims=False, recycle=None,
                      voltage_depend_loads=False, trafo3w_losses=trafo3w_losses)
     _add_pf_options(net, tolerance_mva="1e-8", trafo_loading="power",
-                    numba=False, ac=True, algorithm="nr", max_iteration="auto",
+                    numba=True, ac=True, algorithm="nr", max_iteration="auto",
                     only_v_results=False)
 
 

{pandapower-3.0.0.dev2 → pandapower-3.1.2}/pandapower/build_branch.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2016-2024 by University of Kassel and Fraunhofer Institute for Energy Economics
+# Copyright (c) 2016-2025 by University of Kassel and Fraunhofer Institute for Energy Economics
 # and Energy System Technology (IEE), Kassel. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
 
@@ -614,13 +614,14 @@ def _calc_tap_from_dataframe(net, trafo_df):
             if f'tap{t}_dependency_table' in trafo_df:
                 tap_dependency_table = get_trafo_values(trafo_df, "tap_dependency_table")
                 tap_dependency_table = np.array(
-                    [False if isinstance(x, float) and np.isnan(x) else x for x in tap_dependency_table])
+                    [False if isinstance(x, float) and np.isnan(x) or x is None else x for x in
+                     tap_dependency_table])
             else:
                 tap_table = np.array([False])
                 tap_dependency_table = np.array([False])
             # tap_changer_type = pd.Series(tap_changer_type)
-            tap_table = np.logical_and(tap_dependency_table, np.logical_not(tap_changer_type == "None"))
-            tap_no_table = np.logical_and(~tap_dependency_table, np.logical_not(tap_changer_type == "None"))
+            tap_table = np.logical_and(tap_dependency_table, tap_changer_type is not None)
+            tap_no_table = np.logical_and(~tap_dependency_table, tap_changer_type is not None)
             if any(tap_table):
                 id_characteristic_table = get_trafo_values(trafo_df, "id_characteristic_table")
                 if np.any(tap_dependency_table & pd.isna(id_characteristic_table)):
@@ -650,6 +651,17 @@ def _calc_tap_from_dataframe(net, trafo_df):
                         ratio = [voltage_mapping.get(id_val, 1) for id_val in cleaned_id_characteristic]
                         shift = [-shift_mapping.get(id_val, 1) for id_val in cleaned_id_characteristic]
 
+                    if isinstance(trafo_df, dict):
+                        # Invert ratio and shift if tap_at_star_point is true
+                        relevant_tap_at_star_point = mask & trafo_df["tap_at_star_point"]
+                        count_index = 0
+                        for i in range(len(mask)):
+                            if relevant_tap_at_star_point[i]:
+                                ratio[count_index] = 1/ratio[count_index]  # Invertieren des Wertes
+                                shift[count_index] = -shift[count_index]
+                            if mask[i]:  # Increase index if mask[i] is True
+                                count_index += 1
+
                     vn[mask] = vn[mask] * ratio
                     trafo_shift[mask] += shift
             if any(tap_no_table):
@@ -1386,7 +1398,8 @@ def _trafo_df_from_trafo3w(net, sequence=1):
     trafo2["vn_lv_kv"] = {side: t3["vn_%s_kv" % side].values for side in sides}
     trafo2["shift_degree"] = {"hv": np.zeros(nr_trafos), "mv": t3.shift_mv_degree.values,
                               "lv": t3.shift_lv_degree.values}
-    for param in ["tap_changer_type", "tap_dependency_table", "id_characteristic_table", "tap_phase_shifter"]:
+    for param in ["tap_changer_type", "tap_dependency_table", "id_characteristic_table",
+                  "tap_phase_shifter", "tap_at_star_point"]:
         if param in t3:
             trafo2[param] = {side: t3[param] for side in sides}
     trafo2["parallel"] = {side: np.ones(nr_trafos) for side in sides}
@@ -1506,7 +1519,7 @@ def _calculate_3w_tap_changers(t3, t2, sides):
         tap_arrays["tap_side"][side][tap_mask] = "hv" if side == "hv" else "lv"
 
         # t3 trafos with tap changer at star points
-        if any_at_star_point & np.any(mask_star_point := (tap_mask & at_star_point)): 
+        if any_at_star_point & np.any(mask_star_point := (tap_mask & at_star_point)):
             t = (tap_arrays["tap_step_percent"][side][mask_star_point] *
                  np.exp(1j * np.deg2rad(tap_arrays["tap_step_degree"][side][mask_star_point])))
             tap_pos = tap_arrays["tap_pos"][side][mask_star_point]

{pandapower-3.0.0.dev2 → pandapower-3.1.2}/pandapower/build_bus.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import warnings
-# Copyright (c) 2016-2024 by University of Kassel and Fraunhofer Institute for Energy Economics
+# Copyright (c) 2016-2025 by University of Kassel and Fraunhofer Institute for Energy Economics
 # and Energy System Technology (IEE), Kassel. All rights reserved.
 
 
@@ -216,7 +216,7 @@ def create_bus_lookup_numpy(net, bus_index, closed_bb_switch_mask):
                 if nr_pv_bus > 0:
                     # one pv bus. Get bus from pv_buses_in_set
                     ref_bus = pv_buses_in_set.pop()
-                else: 
+                else:
                     if nr_active_bus > 0:
                         # no pv bus but another active bus. Get bus from active_buses_in_set
                         ref_bus = active_buses_in_set.pop()
@@ -224,11 +224,10 @@ def create_bus_lookup_numpy(net, bus_index, closed_bb_switch_mask):
                         # neither pv buses nor active buses. Use any bus in dj
                         ref_bus = dj.pop()
                 map_to = bus_lookup[ref_bus]
-                for bus in dj:
-                    # update lookup
-                    bus_lookup[bus] = map_to
-                    if bus != ref_bus:
-                        merged_bus[bus] = 1
+                dj = list(dj)
+                bus_lookup[dj] = map_to
+                merged_bus[dj] = 1
+                merged_bus[ref_bus] = 0
         else:
             # no PV buses in set
             for dj in disjoint_sets:
@@ -241,11 +240,10 @@ def create_bus_lookup_numpy(net, bus_index, closed_bb_switch_mask):
                     # neither pv buses nor active busese. Use any bus in dj
                     ref_bus = dj.pop()
                 map_to = bus_lookup[ref_bus]
-                for bus in dj:
-                    # update bus lookup
-                    bus_lookup[bus] = map_to
-                    if bus != ref_bus:
-                        merged_bus[bus] = 1
+                dj = list(dj)
+                bus_lookup[dj] = map_to
+                merged_bus[dj] = 1
+                merged_bus[ref_bus] = 0
     return bus_lookup, merged_bus
 
 
@@ -694,6 +692,9 @@ def _calc_shunts_and_add_on_ppc(net, ppc):
     s = net["shunt"]
     if len(s) > 0:
         vl = _is_elements["shunt"]
+        # fill missing vn_kv values in shunt table with rated voltage of connected bus
+        idx_s_vnkv_isnan = s.loc[np.isnan(s.vn_kv)].index
+        s.loc[idx_s_vnkv_isnan, "vn_kv"] = net.bus.loc[s.bus[idx_s_vnkv_isnan].values, "vn_kv"].values
         v_ratio = (ppc["bus"][bus_lookup[s["bus"].values], BASE_KV] / s["vn_kv"].values) ** 2 * base_multiplier
 
         if "step_dependency_table" in s:

{pandapower-3.0.0.dev2 → pandapower-3.1.2}/pandapower/build_gen.py

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2016-2024 by University of Kassel and Fraunhofer Institute for Energy Economics
+# Copyright (c) 2016-2025 by University of Kassel and Fraunhofer Institute for Energy Economics
 # and Energy System Technology (IEE), Kassel. All rights reserved.
 
 
 import numpy as np
+import pandas as pd
 
 from pandapower.pf.ppci_variables import bustypes
 from pandapower.pypower.bustypes import bustypes_dc
@@ -17,10 +18,7 @@ from pandapower.pypower.idx_ssc import SSC_BUS, SSC_SET_VM_PU, SSC_CONTROLLABLE
 from pandapower.pypower.idx_vsc import VSC_MODE_AC, VSC_BUS, VSC_VALUE_AC, VSC_CONTROLLABLE, VSC_MODE_AC_V, \
     VSC_MODE_AC_SL
 
-try:
-    import pandaplan.core.pplog as logging
-except ImportError:
-    import logging
+import logging
 
 logger = logging.getLogger(__name__)
 
@@ -28,7 +26,7 @@ logger = logging.getLogger(__name__)
 def _build_gen_ppc(net, ppc):
     '''
     Takes the empty ppc network and fills it with the gen values. The gen
-    datatype will be float afterwards.
+    datatype will be floated afterwards.
 
     **INPUT**:
         **net** -The pandapower format network
@@ -188,7 +186,7 @@ def _enforce_controllable_vm_pu_p_mw(net, ppc, gen_is, f, t):
     controllable = net["gen"]["controllable"].values[gen_is]
     not_controllable = ~controllable.astype(bool)
 
-    # if there are some non controllable gens -> set vm_pu and p_mw fixed
+    # if there are some non-controllable gens -> set vm_pu and p_mw fixed
     if np.any(not_controllable):
         bus = net["gen"]["bus"].values[not_controllable]
         vm_pu = net["gen"]["vm_pu"].values[not_controllable]
@@ -286,6 +284,11 @@ def add_q_constraints(net, element, is_element, ppc, f, t, delta, inverted=False
         else:
             ppc["gen"][f:t, QMAX] = tab["max_q_mvar"].values[is_element] + delta
 
+    # Add qmin and qmax limit from q_capability_curve_characteristic
+    if "q_capability_curve_characteristic" in net.keys() and net._options["enforce_q_lims"]:
+        _calculate_qmin_qmax_from_q_capability_curve_characteristics(net, element, is_element, ppc, f, t, delta,
+                                                                     inverted)
+
 
 def add_p_constraints(net, element, is_element, ppc, f, t, delta, inverted=False):
     tab = net[element]
@@ -400,7 +403,8 @@ def _gen_xward_mask(net, ppc):
 
 
 def _get_xward_pq_buses(net, ppc):
-    # find the PQ and PV buses of the xwards; in build_branch.py the F_BUS is set to the PQ bus and T_BUS is set to the auxiliary PV bus
+    # find the PQ and PV buses of the xwards; in build_branch.py the F_BUS is set to the PQ bus and T_BUS is set to
+    # the auxiliary PV bus
     ft = net["_pd2ppc_lookups"].get('branch', dict()).get("xward", [])
     if len(ft) > 0:
         f, t = ft
@@ -414,14 +418,14 @@ def _get_xward_pq_buses(net, ppc):
 
 
 def _normalise_slack_weights(ppc, gen_mask, xward_mask, xward_pq_buses):
-    """Unitise the slack contribution factors in each island to sum to 1."""
+    """Unitise the slack contribution factors on each island to sum to 1."""
     subnets = _subnetworks(ppc)
     gen_buses = ppc['gen'][gen_mask, GEN_BUS].astype(np.int64)
 
     # it is possible that xward and gen are at the same bus (but not reasonable)
     if len(np.intersect1d(gen_buses, xward_pq_buses)):
-        raise NotImplementedError("Found some of the xward PQ buses with slack weight > 0 that coincide with PV or SL buses."
-                                  "This configuration is not supported.")
+        raise NotImplementedError("Found some of the xward PQ buses with slack weight > 0 that coincide with PV or "
+                                  "SL buses. This configuration is not supported.")
 
     gen_buses = np.r_[gen_buses, xward_pq_buses]
     slack_weights_gen = np.r_[ppc['gen'][gen_mask, SL_FAC], ppc['gen'][xward_mask, SL_FAC]].astype(np.float64)
@@ -447,11 +451,50 @@ def _normalise_slack_weights(ppc, gen_mask, xward_mask, xward_pq_buses):
         else:
             # ppc['gen'][subnet_gen_mask, SL_FAC] /= sum_slack_weights
             slack_weights_gen /= sum_slack_weights
-            buses, slack_weights_bus, _ = _sum_by_group(gen_buses[subnet_gen_mask], slack_weights_gen[subnet_gen_mask], 
+            buses, slack_weights_bus, _ = _sum_by_group(gen_buses[subnet_gen_mask], slack_weights_gen[subnet_gen_mask],
                                                         slack_weights_gen[subnet_gen_mask])
             ppc['bus'][buses, SL_FAC_BUS] = slack_weights_bus
 
     # raise NotImplementedError if there are several separate zones for distributed slack:
     if not np.isclose(sum(ppc['bus'][:, SL_FAC_BUS]), 1):
-        raise NotImplementedError("Distributed slack calculation is not implemented for several separate zones at once, "
+        raise NotImplementedError("Distributed slack calculation is not implemented for several separate zones at once,"
                                   "please calculate the zones separately.")
+
+
+def _calculate_qmin_qmax_from_q_capability_curve_characteristics(net, element, is_element, ppc, f, t, delta, inverted):
+    if element not in ["gen", "sgen"]:
+        logger.warning(f"The given element type is not valid for q_min and q_max reactive power capability calculation "
+                       f"of the {element}. Please give gen or sgen as an argument of the function")
+        return
+
+    if len(net[element]) == 0:
+        logger.warning(f"No. of {element} elements is zero.")
+        return
+
+    # Filter rows with True 'reactive_capability_curve'
+    element_data = net[element].loc[net[element]['reactive_capability_curve'].fillna(False)]
+
+    if len(element_data) > 0:
+        # Extract the relevant data
+        q_table_ids = element_data['id_q_capability_curve_characteristic']
+        p_mw_values = element_data['p_mw']
+
+        # Retrieve the q_max and q_min characteristic functions as vectorized callables
+        q_max_funcs = net.q_capability_curve_characteristic.loc[q_table_ids, 'q_max_characteristic']
+        q_min_funcs = net.q_capability_curve_characteristic.loc[q_table_ids, 'q_min_characteristic']
+
+        # Vectorized function application using NumPy
+        calc_q_max = np.vectorize(lambda func, p: func(p))(q_max_funcs, p_mw_values)
+        calc_q_min = np.vectorize(lambda func, p: func(p))(q_min_funcs, p_mw_values)
+
+        if np.any(pd.isna(calc_q_min)) or np.any(pd.isna(calc_q_max)):
+            logger.warning(f"The reactive_capability_curve of {element} is True, but the relevant "
+                           f"characteristic value is None. So default Q limit value has been used in the load flow.")
+
+        curve_q = net[element][["min_q_mvar", "max_q_mvar"]]
+        curve_q.loc[element_data.index] = np.column_stack((calc_q_min, calc_q_max))
+        sign = (1 - 2 * inverted)
+        ppc["gen"][f:t, [QMIN, QMAX]] = sign * curve_q.values[is_element] - (sign * delta)
+    else:
+        logger.warning(f"One of {element}(s) id characteristic or curve style of {element} is incorrect "
+                       f"or not available even if the q_capability_curve_table is available.")

{pandapower-3.0.0.dev2 → pandapower-3.1.2}/pandapower/contingency/contingency.py

@@ -9,16 +9,9 @@ import pandas as pd
 import warnings
 from packaging.version import Version
 
-import pandapower as pp
-
-try:
-    import pandaplan.core.pplog as logging
-except ImportError:
-    import logging
+import logging
 
 logger = logging.getLogger(__name__)
-
-
 try:
     import lightsim2grid
     v = Version(lightsim2grid.__version__)
@@ -41,9 +34,11 @@ try:
 except ImportError:
     KLU_solver_available = False
 
+from pandapower.run import runpp
+
 
 def run_contingency(net, nminus1_cases, pf_options=None, pf_options_nminus1=None, write_to_net=True,
-                    contingency_evaluation_function=pp.runpp, **kwargs):
+                    contingency_evaluation_function=runpp, **kwargs):
     """
     Obtain either loading (N-0) or max. loading (N-0 and all N-1 cases), and min/max bus voltage magnitude.
     The variable "temperature_degree_celsius" can be used in addition to "loading_percent" to obtain max. temperature.
@@ -141,7 +136,7 @@ def run_contingency(net, nminus1_cases, pf_options=None, pf_options_nminus1=None
     return contingency_results
 
 
-def run_contingency_ls2g(net, nminus1_cases, contingency_evaluation_function=pp.runpp, **kwargs):
+def run_contingency_ls2g(net, nminus1_cases, contingency_evaluation_function=runpp, **kwargs):
     """
     Execute contingency analysis using the lightsim2grid library. This works much faster than using
     pandapower.

{pandapower-3.0.0.dev2 → pandapower-3.1.2}/pandapower/control/__init__.py

@@ -1,23 +1,25 @@
-from pandapower.auxiliary import ControllerNotConverged
-
 import pandapower.control.basic_controller
 import pandapower.control.controller
-
+from pandapower.control.controller.DERController.der_control import DERController
+from pandapower.control.controller.characteristic_control import CharacteristicControl
 # --- Controller ---
 from pandapower.control.controller.const_control import ConstControl
 from pandapower.control.controller.pq_control import PQController
-from pandapower.control.controller.characteristic_control import CharacteristicControl
+from pandapower.control.controller.shunt_control import DiscreteShuntController
+from pandapower.control.controller.station_control import BinarySearchControl, DroopControl
 from pandapower.control.controller.trafo.ContinuousTapControl import ContinuousTapControl
 from pandapower.control.controller.trafo.DiscreteTapControl import DiscreteTapControl
-from pandapower.control.controller.trafo.VmSetTapControl import VmSetTapControl
 from pandapower.control.controller.trafo.TapDependentImpedance import TapDependentImpedance
+from pandapower.control.controller.trafo.VmSetTapControl import VmSetTapControl
 from pandapower.control.controller.trafo_control import TrafoController
-from pandapower.control.controller.station_control import BinarySearchControl, DroopControl
-from pandapower.control.controller.DERController.der_control import DERController
-from pandapower.control.controller.shunt_control import DiscreteShuntController
-
 # --- Other ---
 from pandapower.control.run_control import *
+from pandapower.control.util.auxiliary import (
+    get_controller_index,
+    plot_characteristic,
+    _create_trafo_characteristics,
+    create_trafo_characteristic_object,
+    create_q_capability_curve_characteristics_object
+)
 from pandapower.control.util.characteristic import Characteristic, SplineCharacteristic
-from pandapower.control.util.auxiliary import (plot_characteristic, _create_trafo_characteristics,
-                                               create_trafo_characteristic_object)
+from pandapower.control.util.diagnostic import control_diagnostic, trafo_characteristic_table_diagnostic