simbench 1.5.2__tar.gz → 1.6.0__tar.gz

{simbench-1.5.2 → simbench-1.6.0}/CHANGELOG.rst

@@ -1,6 +1,19 @@
 Change Log
 =============
 
+[1.6.0] - 2024-04-09
+----------------------
+- [CHANGED] support pandapower geojson, released with pandapower version 3.0.0
+- [ADDED] support pandapower parameters step_dependency_table and tap_dependency_table, released with pandapower version 3.0.0
+- [CHANGED] drop python 3.8 support
+- [FIXED] fix ValueError raise according to GitHub issue #56
+- [CHANGED] rename parameter csv2pp parameter `no_generic_coord` by `fill_bus_geo_by_generic_data`
+
+[1.5.3] - 2024-04-23
+----------------------
+- [FIXED] Bringing together develop and master with all changes of the release process
+- [ADDED] generalization and test for auxiliary function :code:`to_numeric_ignored_errors()`
+
 [1.5.2] - 2024-04-09
 ----------------------
 - [CHANGED] readded copyright notice to setup.py and updated date

{simbench-1.5.2 → simbench-1.6.0}/MANIFEST.in

@@ -4,5 +4,6 @@ global-include *.csv
 global-include *.json
 global-include *.txt
 
+prune .git*
 prune doc*
 prune tutorials*

{simbench-1.5.2 → simbench-1.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: simbench
-Version: 1.5.2
+Version: 1.6.0
 Summary: Electrical Power System Benchmark Models.
 Author-email: Steffen Meinecke <steffen.meinecke@uni-kassel.de>
 Maintainer-email: simbench Developers <simbench@uni-kassel.de>
@@ -56,16 +56,15 @@ Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS
-Requires-Dist: pandapower>=2.12.1
+Requires-Dist: pandapower>=3.0.0
 Provides-Extra: docs
 Requires-Dist: numpydoc; extra == "docs"
 Requires-Dist: sphinx; extra == "docs"
@@ -103,6 +102,7 @@ Requires-Dist: numba>=0.25; extra == "all"
 Requires-Dist: lightsim2grid>=0.8.1; extra == "all"
 Requires-Dist: geopandas; extra == "all"
 Requires-Dist: matplotlib; extra == "all"
+Dynamic: license-file
 
 
 .. image:: https://simbench.de/wp-content/uploads/2019/01/logo.png

{simbench-1.5.2 → simbench-1.6.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "simbench"
-version = "1.5.2"
+version = "1.6.0"
 authors = [
     { name = "Steffen Meinecke", email = "steffen.meinecke@uni-kassel.de" }
 ]
@@ -14,7 +14,7 @@ maintainers = [
 description = "Electrical Power System Benchmark Models."
 readme = "README.rst"
 license = { file = "LICENSE" }
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Environment :: Console",
@@ -27,14 +27,13 @@ classifiers = [
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
     # Add the specific Python versions supported here, e.g.:
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12"
 ]
 dependencies = [
-    "pandapower>=2.12.1"
+    "pandapower>=3.0.0"
     ]
 keywords = [
     "benchmark grid", "power system", "network", "grid planning", "grid operation", "grid generation methodology", "comparability", "reproducibility", "electricity", "energy", "engineering", "simulation", "simbench", "time series", "future scenarios"
@@ -72,4 +71,4 @@ find = {}
 addopts = ["--strict-markers"]
 markers = [
   "slow: marks tests as slow (deselect with '-m \"not slow\"'), e.g. in run_fast_tests"
-]
+]

{simbench-1.5.2 → simbench-1.6.0}/simbench/converter/auxiliary.py

@@ -29,14 +29,55 @@ def ensure_iterability(var, len_=None):
     return var
 
 
-def to_numeric_ignored_errors(data):
+def to_numeric_ignored_errors(data, **kwargs):
+    """Wrapper function for pandas.to_numeric(). Needed to emulate previous behavior with deprecated
+    errors="ignore".
+
+    The issue covered by this function is discussed at https://github.com/pandas-dev/pandas/issues/54467.
+    `df2 = df1.apply(pd.to_numeric, errors='coerce')` and `df2=df2.fillna(df1)` is an alternative way.
+
+    Parameters
+    ----------
+    data : Series|DataFrame
+        data to convert its dtypes
+
+    Returns
+    -------
+    Series|DataFrame
+        converted data
+
+    Examples
+    --------
+    >>> df = pd.DataFrame([[1, 2, 2.0], [1.2, 3, 4.0], ["a", "b", "D"]]).iloc[:2]
+    >>> df.dtypes  # input with nonnumeric dtypes, although data values are numerics
+    0    object
+    1    object
+    2    object
+    dtype: object
+    >>> to_numeric_ignored_errors(df).dtypes # stops when numeric dtype is found
+    0    float64
+    1      int64
+    2    float64
+    dtype: object
+    >>> to_numeric_ignored_errors(df, downcast="float").dtypes # (down)casts to float dtype
+    0    float32
+    1    float32
+    2    float32
+    dtype: object
+    >>> to_numeric_ignored_errors(df, downcast="integer").dtypes # (down)casts to integer dtype if possible
+    0    float64
+    1       int8
+    2       int8
+    dtype: object
+    """
     if isinstance(data, pd.Series):
         try:
-            return pd.to_numeric(data)
+            return pd.to_numeric(data, **kwargs)
         except (ValueError, TypeError):
             return data
     elif isinstance(data, pd.DataFrame):
-        return pd.concat([to_numeric_ignored_errors(data[col]) for col in data.columns], axis=1)
+        return pd.concat([to_numeric_ignored_errors(data[col], **kwargs) for col in data.columns],
+                         axis=1)
     else:
         raise TypeError(f"{type(data)=} is not a pandas.Series or a pandas.DataFrame.")
 

{simbench-1.5.2 → simbench-1.6.0}/simbench/converter/csv_data_manipulation.py

@@ -154,10 +154,12 @@ def _add_phys_type_and_vm_va_setpoints_to_element_tables(csv_data):
 def _extend_coordinates_to_node_shape(csv_data):
     """ Extends the Coordinates table to the shape of Nodes to enable copying simply to bus_geodata.
     """
-    bus_geodata = pd.DataFrame([], index=csv_data["Node"].index, columns=["x", "y"])
+    geo = pd.Series(None, index=csv_data["Node"].index, name="geo", dtype=object)
     with_coord = ~csv_data["Node"]["coordID"].isnull()
     idx_in_coordID = idx_in_2nd_array(csv_data["Node"]["coordID"].loc[with_coord].values,
                                       csv_data["Coordinates"]["id"].values)
-    bus_geodata.loc[with_coord, ["x", "y"]] = csv_data["Coordinates"].loc[idx_in_coordID,
-                                                                          ["x", "y"]].values
-    csv_data["Coordinates"] = bus_geodata
+    geo.loc[with_coord] = [f'{{"type":"Point", "coordinates":[{x}, {y}]}}' for x, y in zip(
+        csv_data["Coordinates"].loc[idx_in_coordID, "x"].values,
+        csv_data["Coordinates"].loc[idx_in_coordID, "y"].values,
+    )]
+    csv_data["Node"]["geo"] = geo

{simbench-1.5.2 → simbench-1.6.0}/simbench/converter/csv_pp_converter.py

@@ -3,7 +3,10 @@
 # contributors (see AUTHORS file for details). All rights reserved.
 
 # This is the csv_pp_converter for the simbench project.
-# pandapower 2.0.1 <-> simbench format (reasled status from 25.04.2019)
+
+# OPTIONAL IMPROVEMENTS for compatibility with future pandapower changes: constructing the
+# dataframes net[element_table] by using the create_buses(), create_lines(), ... functions
+# which where fast enough or not available at the time SimBench was developed.
 
 import os
 import pandas as pd
@@ -28,7 +31,7 @@ from simbench.converter.read_and_write import _init_csv_tables
 from simbench.converter.pp_net_manipulation import _extend_pandapower_net_columns, \
     _add_dspf_calc_type_and_phys_type_columns, _add_vm_va_setpoints_to_buses, \
     _prepare_res_bus_table, replace_branch_switches, create_branch_switches, _add_coordID, \
-    _set_vm_setpoint_to_trafos
+    _set_vm_setpoint_to_trafos, _set_dependency_table_parameters
 from simbench.converter.csv_data_manipulation import *
 from simbench.converter.csv_data_manipulation import _extend_coordinates_to_node_shape, \
     _sort_switch_nodes_and_prepare_element_and_et, \
@@ -42,7 +45,7 @@ logger = logging.getLogger(__name__)
 __author__ = 'smeinecke'
 
 
-def csv2pp(path, sep=';', add_folder_name=None, nrows=None, no_generic_coord=False):
+def csv2pp(path, sep=';', add_folder_name=None, nrows=None, fill_bus_geo_by_generic_data=True):
     """
     Conversion function from simbench csv format to pandapower.
 
@@ -58,8 +61,9 @@ def csv2pp(path, sep=';', add_folder_name=None, nrows=None, no_generic_coord=Fal
         **nrows** (int, None) - number of rows to be read for profiles. If None, all rows will be
         read.
 
-        **no_generic_coord** (bool, False) - if True, no generic coordinates are created in case of
-        missing geodata.
+        **fill_bus_geo_by_generic_data** (bool, False) - if False, no generic coordinates are
+        created in case of missing geo data. If True, generic coordinates are create when at least
+        one bus misses geo data.
 
     OUTPUT:
         **net** (pandapowerNet) - the created pandapower net from csv files data
@@ -79,17 +83,12 @@ def csv2pp(path, sep=';', add_folder_name=None, nrows=None, no_generic_coord=Fal
     csv_data = read_csv_data(path, sep, nrows=nrows)
 
     # run net creation
-    net = csv_data2pp(csv_data)
-
-    # ensure geodata
-    if not no_generic_coord and any(pd.isnull(net.bus_geodata.x) | pd.isnull(net.bus_geodata.y)):
-        del net.bus_geodata
-        create_generic_coordinates(net)
+    net = csv_data2pp(csv_data, fill_bus_geo_by_generic_data=fill_bus_geo_by_generic_data)
 
     return net
 
 
-def csv_data2pp(csv_data):
+def csv_data2pp(csv_data, fill_bus_geo_by_generic_data=False):
     """ Internal functionality of csv2pp, but with a given dict of csv_data as input instead of
         csv files. """
     # --- initializations
@@ -127,9 +126,21 @@ def csv_data2pp(csv_data):
     create_branch_switches(net)
     net.bus.loc[net.bus.type == "multi_auxiliary", "type"] = "auxiliary"
     _set_vm_setpoint_to_trafos(net, csv_data)
+    _set_dependency_table_parameters(net)
     _csv_types_to_pp2(net)
     ensure_bus_index_columns_as_int(net)
 
+    # --- ensure geodata
+    if not fill_bus_geo_by_generic_data:
+        if n_missing_geo_data := sum(pd.isnull(net.bus.geo) | (net.bus.geo == "")):
+            if n_missing_geo_data != len(net.bus):
+                logger.info(f"Due to {fill_bus_geo_by_generic_data=}, new generic geo data are "
+                            f"created and overwrite existing bus geo data ("
+                            f"{len(net.bus)-n_missing_geo_data} buses had geo data, "
+                            f"{n_missing_geo_data} buses missed geo data).")
+            net.bus["geo"] = None
+            create_generic_coordinates(net)
+
     return net
 
 
@@ -222,23 +233,23 @@ def pp2csv_data(net1, export_pp_std_types=False, drop_inactive_elements=True,
     csv_data = _init_csv_tables(['elements', 'profiles', 'types', 'res_elements'])
     aux_nodes_are_reserved = reserved_aux_node_names is not None
 
+    if ("step_dependency_table" in net1.trafo.columns and net1.trafo.step_dependency_table.any()) \
+        or \
+        ("step_dependency_table" in net1.shunt.columns and net1.shunt.step_dependency_table.any()):
+        logger.warning("'step_dependency_table' is not supported in SimBench's csv data format.")
+
     # --- net data preparation for converting
     _extend_pandapower_net_columns(net)
     if drop_inactive_elements:
         # attention: trafo3ws are not considered in current version of drop_inactive_elements()
         pp.drop_inactive_elements(net, respect_switches=False)
-    check_results = pp.deviation_from_std_type(net)
-    if check_results:
+    dev_from_std = pp.deviation_from_std_type(net)
+    if dev_from_std:
         logger.warning("There are deviations from standard types in elements: " +
-                       str(["%s" % elm for elm in check_results.keys()]) + ". Only the standard " +
+                       str(["%s" % elm for elm in dev_from_std.keys()]) + ". Only the standard " +
                        "type values are converted to csv.")
     convert_parallel_branches(net)
-    if net.bus.shape[0] and not net.bus_geodata.shape[0] or (
-            net.bus_geodata.shape[0] != net.bus.shape[0]):
-        logger.info("Since there are no or incomplete bus_geodata, generic geodata are assumed.")
-        net.bus_geodata = net.bus_geodata.iloc[0:0]
-        create_generic_coordinates(net)
-    merge_busbar_coordinates(net)
+    merge_busbar_coordinates(net, True)
     move_slack_gens_to_ext_grid(net)
 
     scaling_is_not_1 = []
@@ -319,7 +330,8 @@ def _log_nan_col(csv_data, tablename, col):
 
 
 def _is_pp_type(data):
-    return "name" in data.keys()  # used instead of isinstance(data, pp.auxiliary.pandapowerNet)
+    return isinstance(data, pp.auxiliary.pandapowerNet)
+    # return bool("name" in data.keys())
 
 
 def convert_node_type(data):
@@ -679,7 +691,7 @@ def _rename_and_split_input_tables(data):
     split_ppelm_into_type_and_elm = ["dcline"] if _is_pp_type(data) else []
     input_elm_col = "pp" if _is_pp_type(data) else "csv"
     output_elm_col = "csv" if _is_pp_type(data) else "pp"
-    corr_df = _csv_table_pp_dataframe_correspondings(pd.DataFrame)
+    corr_df = _csv_table_pp_dataframe_correspondings(pd.DataFrame, not _is_pp_type(data))
     corr_df["comb_str"] = corr_df["csv"] + "*" + corr_df["pp"]
 
     # all elements, which need to be converted to multiple output element tables, (dupl) need to be
@@ -726,7 +738,7 @@ def _get_split_gen_val(element):
 
 def _rename_and_multiply_columns(data):
     """ Renames the columns of all dataframes as needed in output data. """
-    to_rename_and_multiply_tuples = _get_parameters_to_rename_and_multiply()
+    to_rename_and_multiply_tuples = _get_parameters_to_rename_and_multiply(True)
     for corr_str, tuples in to_rename_and_multiply_tuples.items():
         # --- remove "type" from data if "std_type" exists too
         if "std_type" in data[corr_str].columns and "type" in data[corr_str].columns and \
@@ -756,7 +768,7 @@ def _rename_and_multiply_columns(data):
             data[corr_str].loc[:, col] *= factors
 
 
-def _get_parameters_to_rename_and_multiply():
+def _get_parameters_to_rename_and_multiply(drop_bus_geodata):
     """ Returns a dict of tuples and a dict of dataframes where csv column names are assigned to
     pandapower columns names which differ. """
     # --- create dummy_net to get pp columns
@@ -770,8 +782,8 @@ def _get_parameters_to_rename_and_multiply():
         dummy_net[elm]["va_degree"] = np.nan
 
     # --- get corresponding tables and dataframes
-    corr_strings = _csv_table_pp_dataframe_correspondings(str)
-    csv_tablenames_, pp_dfnames = _csv_table_pp_dataframe_correspondings(list)
+    corr_strings = _csv_table_pp_dataframe_correspondings(str, drop_bus_geodata)
+    csv_tablenames_, pp_dfnames = _csv_table_pp_dataframe_correspondings(list, drop_bus_geodata)
 
     # --- initialize tuples_dict
     tuples_dict = dict.fromkeys(corr_strings, [("id", "name", None)])
@@ -803,7 +815,7 @@ def _replace_name_index(data):
         indices. This function replaces the assignment of the input data. """
     node_names = {"node", "nodeA", "nodeB", "nodeHV", "nodeMV", "nodeLV"}
     bus_names = {"bus", "from_bus", "to_bus", "hv_bus", "mv_bus", "lv_bus"}
-    corr_strings = _csv_table_pp_dataframe_correspondings(str)
+    corr_strings = _csv_table_pp_dataframe_correspondings(str, True)
     corr_strings.remove("Measurement*measurement")  # already done in convert_measurement()
 
     if _is_pp_type(data):
@@ -843,8 +855,9 @@ def _copy_data(input_data, output_data):
     """ Copies the data from output_data[corr_strings] into input_data[element_table]. This function
         handles that some corr_strings are not in output_data.keys() and copies all columns which
         exists in both, output_data[corr_strings] and input_data[element_table]. """
-    corr_strings = _csv_table_pp_dataframe_correspondings(str)
-    output_names = _csv_table_pp_dataframe_correspondings(list)[int(_is_pp_type(output_data))]
+    out_is_pp = _is_pp_type(output_data)
+    corr_strings = _csv_table_pp_dataframe_correspondings(str, out_is_pp)
+    output_names = _csv_table_pp_dataframe_correspondings(list, out_is_pp)[int(out_is_pp)]
 
     for corr_str, output_name in zip(corr_strings, output_names):
         if corr_str in input_data.keys() and input_data[corr_str].shape[0]:
@@ -869,7 +882,7 @@ def _copy_data(input_data, output_data):
                 output_data[output_name] = pd.concat([output_data[output_name], input_data[
                     corr_str][cols_to_copy]], ignore_index=True).reindex_axis(output_data[
                         output_name].columns, axis=1)
-            if "std_types" in corr_str and _is_pp_type(output_data):
+            if "std_types" in corr_str and out_is_pp:
                 output_data[output_name].index = input_data[corr_str]["std_type"]
             _inscribe_fix_values(output_data, output_name)
 

{simbench-1.5.2 → simbench-1.6.0}/simbench/converter/format_information.py

@@ -52,7 +52,7 @@ def csv_tablenames(which):
     return csv_tablenames
 
 
-def _csv_table_pp_dataframe_correspondings(type_):
+def _csv_table_pp_dataframe_correspondings(type_, drop_bus_geodata):
     csv_tablenames_ = csv_tablenames(['elements', 'types', 'res_elements'])
     # corresponding pandapower dataframe names
     pp_dfnames = ['ext_grid', 'line', 'load', 'shunt', 'bus', 'measurement', 'gen', 'sgen',
@@ -63,6 +63,9 @@ def _csv_table_pp_dataframe_correspondings(type_):
     csv_tablenames_ += ['ExternalNet', 'ExternalNet', 'PowerPlant', 'PowerPlant', 'RES', 'RES',
                         'ExternalNet', 'ExternalNet', 'Line']
     pp_dfnames += ['gen', 'sgen', 'ext_grid', 'sgen', 'ext_grid', 'gen', 'ward', 'xward', 'dcline']
+    if drop_bus_geodata:
+        csv_tablenames_.remove("Coordinates")
+        pp_dfnames.remove("bus_geodata")
     assert len(csv_tablenames_) == len(pp_dfnames)
     if type_ is list:
         return csv_tablenames_, pp_dfnames

{simbench-1.5.2 → simbench-1.6.0}/simbench/converter/pp_net_manipulation.py

@@ -2,6 +2,7 @@
 # Institute for Energy Economics and Energy System Technology (IEE) Kassel and individual
 # contributors (see AUTHORS file for details). All rights reserved.
 
+from io import StringIO
 import numpy as np
 import pandas as pd
 import pandapower as pp
@@ -181,8 +182,20 @@ def convert_parallel_branches(net, multiple_entries=True, elm_to_convert=["line"
                     net["switch"] = net["switch"].drop(switch_dupl)
 
 
-def merge_busbar_coordinates(net):
+def convert_geojson_to_bus_geodata_xy(net):
+    def notnone(val):
+        return isinstance(val, str) and bool(len(val))
+    net.bus_geodata = pd.DataFrame(np.nan, index=net.bus.index, columns=["x", "y"])
+    idxs = net.bus.index[net.bus.geo.apply(notnone)]
+    if len(idxs):
+        net.bus_geodata.loc[idxs, ["x", "y"]] = np.r_[[pd.read_json(StringIO(net.bus.geo.at[
+            i])).coordinates.values for i in idxs]]
+
+
+def merge_busbar_coordinates(net, on_bus_geodata):
     """ merges x and y coordinates of busbar node connected via bus-bus switches """
+    if on_bus_geodata:
+        convert_geojson_to_bus_geodata_xy(net)
     bb_nodes_set = set(net.bus.index[net.bus.type == "b"])
     bb_nodes = sorted(bb_nodes_set)
     all_connected_buses = set()
@@ -191,8 +204,11 @@ def merge_busbar_coordinates(net):
             continue
         connected_nodes = pp.get_connected_buses(net, bb_node, consider=("t", "s"))
         if len(connected_nodes):
-            net.bus_geodata.loc[list(connected_nodes), "x"] = net.bus_geodata.x.at[bb_node]
-            net.bus_geodata.loc[list(connected_nodes), "y"] = net.bus_geodata.y.at[bb_node]
+            if on_bus_geodata:
+                net.bus_geodata.loc[list(connected_nodes), "x"] = net.bus_geodata.x.at[bb_node]
+                net.bus_geodata.loc[list(connected_nodes), "y"] = net.bus_geodata.y.at[bb_node]
+            else:
+                net.bus.loc[list(connected_nodes), "geo"] = net.bus.at[bb_node, "geo"]
             all_connected_buses |= connected_nodes
 
 
@@ -392,6 +408,13 @@ def _set_vm_setpoint_to_trafos(net, csv_data):
                     idx_node].values
 
 
+def _set_dependency_table_parameters(net):
+    for et in ["trafo", "trafo3w", "shunt"]:
+        param = "step_dependency_table" if et == "shunt" else "tap_dependency_table"
+        if param in net[et].columns:
+            net[et][param] = False
+            net[et][param] = net[et][param].astype(bool)
+
 def _prepare_res_bus_table(net):
     """ Adds columns to be converted to csv_data. """
     if net.res_bus.shape[0]:
@@ -423,11 +446,12 @@ def replace_branch_switches(net, reserved_aux_node_names=None):
     else:
         # if replace_branch_switches() is called out of pp2csv_data(), this else statement is given
         subnets = net.bus.zone[idx_bus].values
-    geodata = net.bus_geodata.loc[idx_bus, ["x", "y"]].values if net["bus_geodata"].shape[0] else \
-        np.empty((len(idx_bus), 2))
     aux_buses = pp.create_buses(
         net, n_branch_switches, net.bus.vn_kv[idx_bus].values, name=names.values, type="auxiliary",
-        geodata=geodata, zone=subnets)
+        zone=subnets)
+    if "bus_geodata" in net.keys() and net["bus_geodata"].shape[0]:
+        net.bus_geodata = pd.concat([net.bus_geodata, pd.DataFrame(net.bus_geodata.loc[
+            idx_bus, ["x", "y"]].values, index=aux_buses, columns=["x", "y"])])
     for col in ["min_vm_pu", "max_vm_pu", "substation", "voltLvl"]:
         if col in net.bus.columns:
             net.bus.loc[aux_buses, col] = net.bus[col][idx_bus].values
@@ -509,9 +533,6 @@ def create_branch_switches(net):
     net.bus = net.bus.drop(aux_bus_df["aux_buses"])
     idx_in_res_bus = aux_bus_df["aux_buses"][aux_bus_df["aux_buses"].isin(net.res_bus.index)]
     net.res_bus = net.res_bus.drop(idx_in_res_bus)
-    idx_in_bus_geodata = aux_bus_df["aux_buses"][aux_bus_df["aux_buses"].isin(
-        net.bus_geodata.index)]
-    net.bus_geodata = net.bus_geodata.drop(idx_in_bus_geodata)
 
 
 def _add_coordID(net, highest_existing_coordinate_number):

{simbench-1.5.2 → simbench-1.6.0}/simbench/networks/profiles.py

@@ -233,7 +233,7 @@ def get_absolute_profiles_from_relative_profiles(
         missing = list(applied_profiles[~applied_profiles.isin(relative_profiles.columns)])
         if len(missing):
             raise ValueError("These profiles are set to be applied but are missing in the profiles "
-                             "data: " + str(missings))
+                             "data: " + str(missing))
         isna = applied_profiles.isnull()
         is_not_na_pos = np.arange(len(isna), dtype=int)[~isna.values]
         relative_profiles_vals[:, is_not_na_pos] = \

{simbench-1.5.2 → simbench-1.6.0}/simbench/test/converter/test_auxiliary.py

@@ -32,6 +32,21 @@ def test_ensure_iterability():
     assert bool_
 
 
+def test_to_numeric_ignored_errors():
+    df = pd.DataFrame([[1, 2, 2.0], [1.2, 3, 4.0], ["a", "b", "D"]]).iloc[:2]
+    out1 = sb.to_numeric_ignored_errors(df)
+    out2 = sb.to_numeric_ignored_errors(df, downcast="float")
+    out3 = sb.to_numeric_ignored_errors(df, downcast="integer")
+
+    assert set(out1.select_dtypes("float").columns) == {0, 2}
+    assert set(out1.select_dtypes("integer").columns) == {1}
+
+    assert set(out2.select_dtypes("float").columns) == {0, 1, 2}
+
+    assert set(out3.select_dtypes("float").columns) == {0}
+    assert set(out3.select_dtypes("integer").columns) == {1, 2}
+
+
 def test_idx_in_2nd_array():
     arr1 = np.array([1, 6, 4.6, 3.4, 6, 1, "Hallo", "hallo", "Hallo"])
     arr2 = np.array([8, 4, 1, 2, 5, 5.6, 4.6, "Hallo", "hallo", 6, 3.4])

{simbench-1.5.2 → simbench-1.6.0}/simbench/test/converter/test_csv_pp_converter.py

@@ -155,7 +155,7 @@ def test_convert_parallel_branches():
 
 
 def test_test_network():
-    net = csv2pp(test_network_path, no_generic_coord=True)
+    net = csv2pp(test_network_path, fill_bus_geo_by_generic_data=False)
 
     # test min/max ratio
     for elm in pp.pp_elements(bus=False, branch_elements=False, other_elements=False):
@@ -219,9 +219,9 @@ def test_example_simple():
         avoid_duplicates_in_column(net, i, 'name')
 
     # --- create geodata
-    net.bus_geodata["x"] = [0, 1, 2, 3, 4, 5, 5, 3.63]
-    net.bus_geodata["y"] = [0]*5+[-5, 5, 2.33]
-    merge_busbar_coordinates(net)
+    net.bus["geo"] = list(map(lambda xy: f'{{"type":"Point", "coordinates":[{xy[0]}, {xy[1]}]}}',
+                              zip([0., 1., 2., 3., 4., 5., 5., 3.63], [0.]*5+[-5., 5., 2.33])))
+    merge_busbar_coordinates(net, False)
 
     # --- convert
     csv_data = pp2csv_data(net, export_pp_std_types=True, drop_inactive_elements=True)
@@ -256,7 +256,7 @@ def test_example_simple():
                     logger.error("dtype adjustment of %s failed." % key)
             # drop result table rows
             if pp_is_27lower and "res_" in key:
-                if not key == "res_bus":
+                if key != "res_bus":
                     net[key] = net[key].iloc[0:0]
                 else:
                     net[key].loc[:, ["p_mw", "q_mvar"]] = np.nan

simbench-1.6.0/simbench/test/converter/test_network_output_folder/LineType.csv

@@ -0,0 +1,3 @@
+id;r;x;b;iMax;type
+HV OHL 1;0.05;0.4;2.9999999999999996;500.0;ohl
+MV OHL 1;0.25;0.2;0.9999999999999999;500.0;ohl

{simbench-1.5.2 → simbench-1.6.0}/simbench/test/converter/test_network_output_folder/TransformerType.csv

@@ -1,2 +1,2 @@
 id;sR;vmHV;vmLV;va0;vmImp;pCu;pFe;iNoLoad;tapable;tapside;dVm;dVa;tapNeutr;tapMin;tapMax
-T1;25;110;20;150;12;70;30;0;1;HV;0;0;0;-5;5
+T1;25.0;110.0;20.0;150.0;12.0;70.00000000000001;30.0;0.0;1;HV;0.0;0;0;-5;5

{simbench-1.5.2 → simbench-1.6.0}/simbench/test/converter/test_pp_net_manipulation.py

@@ -51,10 +51,8 @@ def _net_to_test():
     pp.create_switch(net, lv_buses[2], l0, "l")
     pp.create_switch(net, lv_buses[3], l1, "l")
 
-#    create_generic_coordinates(net)
-    net.bus_geodata["x"] = [1, 2, 1, 3, 0, 1, 2]
-    net.bus_geodata["y"] = [0, 1, -1, 0, 0, 1, 0]
-    net.bus_geodata.index = list(range(6))+[8]
+    net.bus["geo"] = list(map(lambda xy: f'{{"type":"Point", "coordinates":[{xy[0]}, {xy[1]}]}}',
+                              zip([1., 2., 1., 3., 0., 1., 2], [0., 1., -1., 0., 0., 1., 0])))
 
     return net
 
@@ -65,8 +63,6 @@ def test_branch_switch_changes():
 
     net1 = deepcopy(net_orig)
     replace_branch_switches(net1)
-    net1.bus_geodata = net1.bus_geodata.astype({coord: net_orig.bus_geodata.dtypes[
-        coord] for coord in ["x", "y"]})
 
     assert net_orig.switch.shape == net1.switch.shape
     assert (net_orig.switch.bus == net1.switch.bus).all()

{simbench-1.5.2 → simbench-1.6.0}/simbench/test/networks/test_extract_grids_from_csv.py

@@ -393,14 +393,7 @@ def _test_net_validity(net, sb_code_params, shortened, input_path=None):
         assert net.measurement.shape[0] > 1
 
     # bus_geodata
-    assert net.bus.shape[0] == net.bus_geodata.shape[0]
-    # check_that_all_buses_connected_by_switches_have_same_geodata
-    # for bus_group in bus_groups_connected_by_switches(net):
-    #     first_bus = list(bus_group)[0]
-    #     assert np.all(np.isclose(net.bus_geodata.x.loc[bus_group].astype(float),
-    #                              net.bus_geodata.x.loc[first_bus].astype(float))) \
-    #         and np.all(np.isclose(net.bus_geodata.y.loc[bus_group].astype(float),
-    #                               net.bus_geodata.y.loc[first_bus].astype(float)))
+    assert not net.bus.geo.isnull().any()
 
     # --- test data content
     # substation

{simbench-1.5.2 → simbench-1.6.0}/simbench.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: simbench
-Version: 1.5.2
+Version: 1.6.0
 Summary: Electrical Power System Benchmark Models.
 Author-email: Steffen Meinecke <steffen.meinecke@uni-kassel.de>
 Maintainer-email: simbench Developers <simbench@uni-kassel.de>
@@ -56,16 +56,15 @@ Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS
-Requires-Dist: pandapower>=2.12.1
+Requires-Dist: pandapower>=3.0.0
 Provides-Extra: docs
 Requires-Dist: numpydoc; extra == "docs"
 Requires-Dist: sphinx; extra == "docs"
@@ -103,6 +102,7 @@ Requires-Dist: numba>=0.25; extra == "all"
 Requires-Dist: lightsim2grid>=0.8.1; extra == "all"
 Requires-Dist: geopandas; extra == "all"
 Requires-Dist: matplotlib; extra == "all"
+Dynamic: license-file
 
 
 .. image:: https://simbench.de/wp-content/uploads/2019/01/logo.png

{simbench-1.5.2 → simbench-1.6.0}/simbench.egg-info/SOURCES.txt

@@ -4,7 +4,6 @@ LICENSE
 MANIFEST.in
 README.rst
 pyproject.toml
-requirements.txt
 setup.py
 simbench/__init__.py
 simbench.egg-info/PKG-INFO

{simbench-1.5.2 → simbench-1.6.0}/simbench.egg-info/requires.txt

@@ -1,4 +1,4 @@
-pandapower>=2.12.1
+pandapower>=3.0.0
 
 [all]
 plotly>=3.1.1

simbench-1.5.2/requirements.txt

@@ -1,2 +0,0 @@
-# pip only:
-pandapower>=2.12.1

simbench-1.5.2/simbench/test/converter/test_network_output_folder/LineType.csv

@@ -1,3 +0,0 @@
-id;r;x;b;iMax;type
-HV OHL 1;0.05;0.4;3;500;ohl
-MV OHL 1;0.25;0.2;1;500;ohl