Merge remote-tracking branch 'origin/structure_dict_extension' into structure_dict_extension

Author: lezneew

pandapower/build_branch.py

@@ -1547,7 +1547,7 @@ def _calculate_3w_tap_changers(t3, t2, sides):
             if var in t3:
                 tap_arrays[var][side][tap_mask] = t3[var].values[tap_mask]
             else:
-                tap_arrays[var][side][tap_mask] = np.array([float("nan")]*len(tap_mask))
+                tap_arrays[var][side][tap_mask] = np.full(sum(tap_mask), float('nan'), dtype=float)
 
         # t3 trafos with tap changer at terminals
         tap_arrays["tap_side"][side][tap_mask] = "hv" if side == "hv" else "lv"

pandapower/build_gen.py

@@ -7,7 +7,7 @@
 
 import logging
 import warnings
-from typing import Iterable
+from typing import Iterable, Any
 
 import pandas as pd
 from numpy import nan, isnan, arange, isin, any as np_any, all as np_all, float64, intersect1d, unique as uni, c_
@@ -232,39 +232,38 @@ def _try_astype(df, column, dtyp):
         pass
 
 
-def _set_value_if_not_nan(net, index, value, column, element_type, dtype=float64, default_val=nan):
+def _set_value_if_not_nan(
+        net: pandapowerNet,
+        index: int,
+        value: Any,
+        column: str,
+        element_type: str,
+        default_val=pd.NA
+):
     """Sets the given value to the dataframe net[element_type]. If the value is nan, default_val
     is assumed if this is not nan.
     If the value is not nan and the column does not exist already, the column is created and filled
     by default_val.
 
-    Parameters
-    ----------
-    net : pp.pandapowerNet
-        pp net
-    index : int
-        index of the element to get a value
-    value : Any
-        value to be set
-    column : str
-        name of column
-    element_type : str
-        element_type type, e.g. "gen"
-    dtype : Any, optional
-        e.g. float64, "Int64", bool_, ..., by default float64
-    default_val : Any, optional
-        default value to be set if the column exists and value is nan and if the column does not
-        exist and the value is not nan, by default nan
-
-    See Also
-    --------
-    _add_to_entries_if_not_nan
+    Parameters:
+        net: the pandapower net
+        index: index of the element to get a value
+        value: value to be set
+        column: name of column
+        element_type: element_type type, e.g. "gen"
+        default_val: default value to be set if the column exists and value is nan and if the column does not
+            exist and the value is not nan, by default nan
+
+    See Also:
+        _add_to_entries_if_not_nan
     """
     column_exists = column in net[element_type].columns
     dtype = get_structure_dict(required_only=False)[element_type][column]
+    if dtype == "float":
+        default_val = float("nan")
     if _not_nan(value):
         if not column_exists:
-            net[element_type].loc[:, column] = pd.Series(data=default_val, index=net[element_type].index)
+            net[element_type][column] = pd.Series(data=default_val, index=net[element_type].index)
         _try_astype(net[element_type], column, dtype)
         net[element_type].at[index, column] = value
     elif column_exists:
@@ -273,7 +272,16 @@ def _set_value_if_not_nan(net, index, value, column, element_type, dtype=float64
         _try_astype(net[element_type], column, dtype)
 
 
-def _add_to_entries_if_not_nan(net, element_type, entries, index, column, values, dtype=float64, default_val=nan):
+def _add_to_entries_if_not_nan(
+        net: pandapowerNet,
+        element_type,
+        entries,
+        index: int,
+        column,
+        values,
+        dtype=None,
+        default_val=pd.NA
+):
     """
 
     See Also
@@ -353,8 +361,8 @@ def _set_entries(net, table, index, preserve_dtypes=True, entries: dict | None =
                 if dtype == bool and net[table][col].isna().any(): # default value for bool entries # TODO: check if wanted behaviour
                     net[table][col] = net[table][col].astype(pd.BooleanDtype()).fillna(False)
                 net[table][col] = net[table][col].astype(dtype)
-            except KeyError:
-                pass
+            except KeyError as e:
+                logger.error(f"column {col} has no dtype in network structure")
 
     # and preserve dtypes
     if preserve_dtypes:

pandapower/create/_utils.py

@@ -133,7 +133,7 @@ def create_ext_grid(
     _set_value_if_not_nan(net, index, max_p_mw, "max_p_mw", "ext_grid")
     _set_value_if_not_nan(net, index, min_q_mvar, "min_q_mvar", "ext_grid")
     _set_value_if_not_nan(net, index, max_q_mvar, "max_q_mvar", "ext_grid")
-    _set_value_if_not_nan(net, index, controllable, "controllable", "ext_grid", dtype=bool_, default_val=False)
+    _set_value_if_not_nan(net, index, controllable, "controllable", "ext_grid", default_val=False)
     # others
     _set_value_if_not_nan(net, index, x0x_max, "x0x_max", "ext_grid")
     _set_value_if_not_nan(net, index, r0x0_max, "r0x0_max", "ext_grid")

pandapower/create/ext_grid_create.py

@@ -171,7 +171,7 @@ def create_line(
     if "type" in lineparam:
         entries["type"] = lineparam["type"]
 
-    # if net.line column already has alpha, add it from std_type
+    # only add alpha from std_type if any line already has an alpha # TODO inconsistent behavior: Document this CLEARLY!
     if "alpha" in net.line.columns and "alpha" in lineparam:
         entries["alpha"] = lineparam["alpha"]
 

pandapower/create/line_create.py

@@ -8,6 +8,7 @@
 import logging
 from typing import Iterable, Sequence
 
+import pandas as pd
 from numpy import nan, bool_
 import numpy.typing as npt
 
@@ -47,7 +48,7 @@ def create_load(
     min_p_mw: float = nan,
     max_q_mvar: float = nan,
     min_q_mvar: float = nan,
-    controllable: bool | float = nan,
+    controllable: bool = False,
     **kwargs,
 ) -> Int:
     """
@@ -141,6 +142,7 @@ def create_load(
         "sn_mva": sn_mva,
         "in_service": in_service,
         "type": type,
+        "controllable": controllable,
         **kwargs,
     }
     _set_entries(net, "load", index, True, entries=entries)
@@ -149,7 +151,6 @@ def create_load(
     _set_value_if_not_nan(net, index, max_p_mw, "max_p_mw", "load")
     _set_value_if_not_nan(net, index, min_q_mvar, "min_q_mvar", "load")
     _set_value_if_not_nan(net, index, max_q_mvar, "max_q_mvar", "load")
-    _set_value_if_not_nan(net, index, controllable, "controllable", "load", dtype=bool_, default_val=False)
 
     return index
 
@@ -173,7 +174,7 @@ def create_loads(
     min_p_mw: float | Iterable[float] = nan,
     max_q_mvar: float | Iterable[float] = nan,
     min_q_mvar: float | Iterable[float] = nan,
-    controllable: bool | Iterable[bool] | float = nan,
+    controllable: bool | Iterable[bool] = False,
     **kwargs,
 ) -> npt.NDArray[Int]:
     """
@@ -277,11 +278,10 @@ def create_loads(
     _add_to_entries_if_not_nan(net, "load", entries, index, "min_q_mvar", min_q_mvar)
     _add_to_entries_if_not_nan(net, "load", entries, index, "max_q_mvar", max_q_mvar)
     _add_to_entries_if_not_nan(
-        net, "load", entries, index, "controllable", controllable, dtype=bool_, default_val=False
+        net, "load", entries, index, "controllable", controllable, default_val=False
     )
-    defaults_to_fill = [("controllable", False)]
 
-    _set_multiple_entries(net, "load", index, defaults_to_fill=defaults_to_fill, entries=entries)
+    _set_multiple_entries(net, "load", index, entries=entries)
 
     return index
 

pandapower/create/load_create.py

@@ -190,7 +190,7 @@ def create_sgen(
     _set_value_if_not_nan(net, index, rx, "rx", "sgen")  # rx is always required
     _set_value_if_not_nan(net, index, kappa, "kappa", "sgen")
     _set_value_if_not_nan(
-        net, index, generator_type, "generator_type", "sgen", dtype="str", default_val="current_source"
+        net, index, generator_type, "generator_type", "sgen", default_val="current_source"
     )
     if pd.isna(generator_type) or generator_type == "current_source":
         _set_value_if_not_nan(net, index, k, "k", "sgen")

pandapower/create/sgen_create.py

@@ -107,7 +107,7 @@ def create_shunt(
     }
     _set_entries(net, "shunt", index, entries=entries)
 
-    _set_value_if_not_nan(net, index, id_characteristic_table, "id_characteristic_table", "shunt", dtype="Int64")
+    _set_value_if_not_nan(net, index, id_characteristic_table, "id_characteristic_table", "shunt")
 
     return index
 

pandapower/create/shunt_create.py

@@ -143,7 +143,7 @@ def create_storage(
     _set_value_if_not_nan(net, index, max_p_mw, "max_p_mw", "storage")
     _set_value_if_not_nan(net, index, min_q_mvar, "min_q_mvar", "storage")
     _set_value_if_not_nan(net, index, max_q_mvar, "max_q_mvar", "storage")
-    _set_value_if_not_nan(net, index, controllable, "controllable", "storage", dtype=bool_, default_val=False)
+    _set_value_if_not_nan(net, index, controllable, "controllable", "storage", default_val=False)
 
     return index
 

pandapower/create/storage_create.py

@@ -202,9 +202,9 @@ def create_transformer(
         )
 
     _set_value_if_not_nan(net, index, max_loading_percent, "max_loading_percent", "trafo")
-    _set_value_if_not_nan(net, index, id_characteristic_table, "id_characteristic_table", "trafo", dtype="Int64")
+    _set_value_if_not_nan(net, index, id_characteristic_table, "id_characteristic_table", "trafo")
     _set_value_if_not_nan(net, index, tap_dependency_table, "tap_dependency_table", "trafo")
-    _set_value_if_not_nan(net, index, tap_changer_type, "tap_changer_type", "trafo", dtype=object, default_val=None)
+    _set_value_if_not_nan(net, index, tap_changer_type, "tap_changer_type", "trafo", default_val=None)
     _set_value_if_not_nan(net, index, pt_percent, "pt_percent", "trafo")
     _set_value_if_not_nan(net, index, xn_ohm, "xn_ohm", "trafo")
 
@@ -523,20 +523,20 @@ def create_transformer_from_parameters(
     entries.update(kwargs)
     _set_entries(net, "trafo", index, entries=entries)
 
-    _set_value_if_not_nan(net, index, id_characteristic_table, "id_characteristic_table", "trafo", dtype="Int64")
-    _set_value_if_not_nan(net, index, tap_changer_type, "tap_changer_type", "trafo", dtype=object, default_val=None)
+    _set_value_if_not_nan(net, index, id_characteristic_table, "id_characteristic_table", "trafo")
+    _set_value_if_not_nan(net, index, tap_changer_type, "tap_changer_type", "trafo", default_val=None)
     _set_value_if_not_nan(net, index, tap_dependency_table, "tap_dependency_table", "trafo")
 
-    _set_value_if_not_nan(net, index, tap2_side, "tap2_side", "trafo", dtype=str)
-    _set_value_if_not_nan(net, index, tap2_neutral, "tap2_neutral", "trafo", dtype=float64)
-    _set_value_if_not_nan(net, index, tap2_min, "tap2_min", "trafo", dtype=float64)
-    _set_value_if_not_nan(net, index, tap2_max, "tap2_max", "trafo", dtype=float64)
-    _set_value_if_not_nan(net, index, tap2_step_percent, "tap2_step_percent", "trafo", dtype=float64)
-    _set_value_if_not_nan(net, index, tap2_step_degree, "tap2_step_degree", "trafo", dtype=float64)
+    _set_value_if_not_nan(net, index, tap2_side, "tap2_side", "trafo")
+    _set_value_if_not_nan(net, index, tap2_neutral, "tap2_neutral", "trafo")
+    _set_value_if_not_nan(net, index, tap2_min, "tap2_min", "trafo")
+    _set_value_if_not_nan(net, index, tap2_max, "tap2_max", "trafo")
+    _set_value_if_not_nan(net, index, tap2_step_percent, "tap2_step_percent", "trafo")
+    _set_value_if_not_nan(net, index, tap2_step_degree, "tap2_step_degree", "trafo")
     _set_value_if_not_nan(
-        net, index, tap2_pos if pd.notnull(tap2_pos) else tap2_neutral, "tap2_pos", "trafo", dtype=float64
+        net, index, tap2_pos if pd.notnull(tap2_pos) else tap2_neutral, "tap2_pos", "trafo"
     )
-    _set_value_if_not_nan(net, index, tap2_changer_type, "tap2_changer_type", "trafo", dtype=object)
+    _set_value_if_not_nan(net, index, tap2_changer_type, "tap2_changer_type", "trafo")
 
     if any(key in kwargs for key in ["tap_phase_shifter", "tap2_phase_shifter"]):
         convert_trafo_pst_logic(net)
@@ -560,10 +560,10 @@ def create_transformer_from_parameters(
         _set_value_if_not_nan(net, index, mag0_percent, "mag0_percent", "trafo")
         _set_value_if_not_nan(net, index, mag0_rx, "mag0_rx", "trafo")
         _set_value_if_not_nan(net, index, si0_hv_partial, "si0_hv_partial", "trafo")
-        _set_value_if_not_nan(net, index, vector_group, "vector_group", "trafo", dtype=str)
+        _set_value_if_not_nan(net, index, vector_group, "vector_group", "trafo")
     _set_value_if_not_nan(net, index, max_loading_percent, "max_loading_percent", "trafo")
     _set_value_if_not_nan(net, index, pt_percent, "pt_percent", "trafo")
-    # _set_value_if_not_nan(net, index, oltc, "oltc", "trafo", dtype=bool_, default_val=False)
+    # _set_value_if_not_nan(net, index, oltc, "oltc", "trafo", default_val=False)
     _set_value_if_not_nan(net, index, xn_ohm, "xn_ohm", "trafo")
 
     return index
@@ -957,9 +957,9 @@ def create_transformer3w(
     net["trafo3w"] = pd.concat([net["trafo3w"], dd], sort=True).reindex(net["trafo3w"].columns, axis=1)
 
     _set_value_if_not_nan(net, index, max_loading_percent, "max_loading_percent", "trafo3w")
-    _set_value_if_not_nan(net, index, id_characteristic_table, "id_characteristic_table", "trafo3w", dtype="Int64")
+    _set_value_if_not_nan(net, index, id_characteristic_table, "id_characteristic_table", "trafo3w")
     _set_value_if_not_nan(net, index, tap_dependency_table, "tap_dependency_table", "trafo3w")
-    _set_value_if_not_nan(net, index, tap_changer_type, "tap_changer_type", "trafo3w", dtype=str, default_val=None)
+    _set_value_if_not_nan(net, index, tap_changer_type, "tap_changer_type", "trafo3w", default_val=None)
 
     for key in [
         "tap_dependent_impedance",
@@ -1291,8 +1291,8 @@ def create_transformer3w_from_parameters(
     _set_entries(net, "trafo3w", index, entries=entries)
 
     _set_value_if_not_nan(net, index, max_loading_percent, "max_loading_percent", "trafo3w")
-    _set_value_if_not_nan(net, index, id_characteristic_table, "id_characteristic_table", "trafo3w", dtype="Int64")
-    _set_value_if_not_nan(net, index, tap_changer_type, "tap_changer_type", "trafo3w", dtype=str, default_val=None)
+    _set_value_if_not_nan(net, index, id_characteristic_table, "id_characteristic_table", "trafo3w")
+    _set_value_if_not_nan(net, index, tap_changer_type, "tap_changer_type", "trafo3w", default_val=None)
     _set_value_if_not_nan(
         net, index, tap_dependency_table, "tap_dependency_table", "trafo3w"
     )