simbench 1.4.0__zip → 1.5.1__zip

{simbench-1.4.0 → simbench-1.5.1}/simbench/networks/extract_simbench_grids_from_csv.py

@@ -232,7 +232,7 @@ def _extract_csv_table_by_subnet(csv_table, tablename, relevant_subnets, bus_bus
 
         # --- determine indices to drop and examine dropping
         drop_idx = (set(csv_table.index) - hv_elms - lv_elms) | hv_lv_elms | lv_hv_elms
-        csv_table.drop(drop_idx, inplace=True)
+        csv_table = csv_table.drop(drop_idx)
         no_extraction = False
     else:
         no_extraction = "Profile" not in tablename and "Type" not in tablename and \
@@ -315,7 +315,7 @@ def generate_no_sw_variant(net):
             already_considered |= to_fuse[bus1]
 
     # drop all closed switches (which now also includes all bus-bus switches (see above))
-    net.switch.drop(net.switch.index[net.switch.closed], inplace=True)
+    net.switch = net.switch.drop(net.switch.index[net.switch.closed])
 
     # fuse buses which are connected via bus-bus switches
     for b1, b2 in to_fuse.items():
@@ -325,33 +325,40 @@ def generate_no_sw_variant(net):
     aux_buses = net.bus.index[net.bus.type == "auxiliary"]
     buses_at_sw = pd.concat([net.switch.bus, net.switch.element.loc[net.switch.et == "b"]])
     aux_buses_to_change_type = aux_buses[~aux_buses.isin(buses_at_sw)]
-    net.bus.type.loc[aux_buses_to_change_type] = "b"
+    net.bus.loc[aux_buses_to_change_type, "type"] = "b"
 
 
-def get_simbench_net(sb_code_info, input_path=None):
-    """
-    Returns the simbench net, requested by a given SimBench code information. Please have a look
+def get_simbench_net(sb_code_info:str, input_path:str=None):
+    """Returns the simbench net, requested by a given SimBench code information. Please have a look
     into jupyter notebook tutorials to learn more about simbench grids and the meaning of SimBench
     codes.
 
-    INPUT:
-        **sb_code_info** (str or list) - simbench code which defines which simbench grid is
-        requested, e.g. '1-MVLV-urban-all-0-sw' requests a grid with the urban MV grid and all
-        connected LV grids, both of SimBench version 1, scenario zero and with full switch
+    Parameters
+    ----------
+    sb_code_info : str or list
+        simbench code information which defines which simbench grid is requested.
+        For example, e.g. :code:`'1-MVLV-urban-all-0-sw'` requests a grid with the urban MV grid and
+        all connected LV grids, both of SimBench version 1, scenario zero and with full switch
         representation.
-
-    OPTIONAL:
-        **input_path** (path) - option to change the path to all simbench grid csv files. However,
-        a change should not be necessary.
-
-    OUTPUT:
-        net (pandapowerNet)
-
-    EXAMPLE:
-
-        import simbench as sb
-
-        net = sb.get_simbench_net('1-MVLV-urban-all-0-sw')
+        As an alternative :code:`[1, "MV", "LV", "urban", "all", 0, "sw"]` can be passed.
+    input_path : str, optional
+        option to change the path to all simbench grid csv files. However, a change should not be
+        necessary and is only for cases of applying the function to data from alternative location,
+        by default None
+
+    Returns
+    -------
+    pandapowerNet
+        requsted simbench grid
+
+    Examples
+    --------
+    >>> import simbench as sb
+    >>> net = sb.get_simbench_net('1-MVLV-urban-all-0-sw')
+
+    >>> import pandapower as pp
+    >>> pp.toolbox.nets_equal(net, sb.get_simbench_net([1, "MV", "LV", "urban", "all", 0, "sw"]))
+    True
     """
     # --- get relevant subnets
     sb_code, sb_code_parameters = get_simbench_code_and_parameters(sb_code_info)

{simbench-1.4.0 → simbench-1.5.1}/simbench/networks/profiles.py

@@ -139,7 +139,7 @@ def filter_unapplied_profiles(csv_data):
         applied_profiles.append("time")
         unapplied_profiles = csv_data[prof_tab].columns.difference(applied_profiles)
         logger.debug("These %ss are dropped: " % prof_tab + str(unapplied_profiles))
-        csv_data[prof_tab].drop(unapplied_profiles, axis=1, inplace=True)
+        csv_data[prof_tab] = csv_data[prof_tab].drop(unapplied_profiles, axis=1)
 
 
 def filter_unapplied_profiles_pp(net, named_profiles: bool):
@@ -148,7 +148,7 @@ def filter_unapplied_profiles_pp(net, named_profiles: bool):
         if named_profiles:
             for key in net["profiles"].keys():
                 unused = get_unused_profiles(net, key)
-                net.profiles[key].drop(columns=unused, inplace=True)
+                net.profiles[key] = net.profiles[key].drop(columns=unused)
         else:
             for key in net.profiles.keys():
                 if isinstance(key, tuple):
@@ -158,8 +158,8 @@ def filter_unapplied_profiles_pp(net, named_profiles: bool):
                 else:
                     raise NotImplementedError("The keys of net.profiles are expected as " +
                                               "tuple(element, column) or as str, e.g. 'gen.vm_pu'.")
-                net.profiles[key].drop(columns=net.profiles[key].columns[~net.profiles[
-                    key].columns.isin(net[elm].index)], inplace=True)
+                net.profiles[key] = net.profiles[key].drop(columns=net.profiles[key].columns[
+                    ~net.profiles[key].columns.isin(net[elm].index)])
 
 
 def get_absolute_profiles_from_relative_profiles(
@@ -215,52 +215,46 @@ def get_absolute_profiles_from_relative_profiles(
 
     # --- set index
     index = relative_profiles["time"] if time_as_index else relative_profiles.index
-    if "time" in relative_profiles:
-        del relative_profiles["time"]
 
     # --- do profile_suffix assumptions if profile_suffix is None
     if profile_suffix is None:
+        profile_suffix = ""
         if element == "load":
             if multiplying_column == "p_mw":
                 profile_suffix = "_pload"
             elif multiplying_column == "q_mvar":
                 profile_suffix = "_qload"
-        profile_suffix = "" if profile_suffix is None else profile_suffix
 
-    # --- get relative profiles with respect to each element index
+    # --- get relative profiles
+    relative_profiles_vals = np.ones((len(index), len(net[element])))
     if profile_column in net[element].columns:
         applied_profiles = net[element][profile_column] + profile_suffix
-    else:  # missing profile column
+
+        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))
+        isna = applied_profiles.isnull()
+        is_not_na_pos = np.arange(len(isna), dtype=int)[~isna.values]
+        relative_profiles_vals[:, is_not_na_pos] = \
+            relative_profiles[list(applied_profiles[~isna])].values
+
+    else:  # warning and assumptions in case of missing profile column
         logger.warning("In %s table, profile column '%s' is missing. Scalings of 1 are assumed." % (
             element, profile_column))
-        missing_col_handling = "missing_col_handling"
-        applied_profiles = pd.Series([missing_col_handling]*net[element].shape[0],
-                                     index=net[element].index, dtype=object)
-        relative_profiles[missing_col_handling] = 1
-
-    # nan profile handling
-    if applied_profiles.isnull().any():
-        logger.debug("There are nan profiles. Scalings of 1 are assumed.")
-        nan_profile_handling = "nan_profile_scaling"
-        assert nan_profile_handling not in relative_profiles.columns
-        applied_profiles.loc[applied_profiles.isnull()] = nan_profile_handling
-        relative_profiles[nan_profile_handling] = 1
-
-    relative_output_profiles = relative_profiles.values[:, idx_in_2nd_array(
-        applied_profiles.values, np.array(relative_profiles.columns))]
 
     # --- get factor to multiply with (consider additional feature of 'multiplying_column')
     if isinstance(multiplying_column, str):
         if multiplying_column in net[element].columns:
             factor = net[element][multiplying_column].values.reshape(1, -1)
         else:
-            raise ValueError("'multiplying_column' %s is not net[%s].columns." % (
+            raise ValueError("'multiplying_column' %s is not in net[%s].columns." % (
                 multiplying_column, element))
     else:
         factor = multiplying_column
 
     # --- multiply relative profiles with factor and return results
-    output_profiles = pd.DataFrame(relative_output_profiles*factor, index=index,
+    output_profiles = pd.DataFrame(relative_profiles_vals*factor, index=index,
                                    columns=net[element].index)
     return output_profiles
 
@@ -319,9 +313,9 @@ def get_absolute_values(net, profiles_instead_of_study_cases, **kwargs):
                 Idx_pv = net.sgen.index[net.sgen.type.str.contains("PV").fillna(False)]
                 Idx_sgen = net.sgen.index.difference(Idx_wind.union(Idx_pv))
                 net.sgen["loadcase_type"] = ""
-                net.sgen['loadcase_type'].loc[Idx_wind] = loadcase_type[0]
-                net.sgen['loadcase_type'].loc[Idx_pv] = loadcase_type[1]
-                net.sgen['loadcase_type'].loc[Idx_sgen] = loadcase_type[2]
+                net.sgen.loc[Idx_wind, 'loadcase_type'] = loadcase_type[0]
+                net.sgen.loc[Idx_pv, 'loadcase_type'] = loadcase_type[1]
+                net.sgen.loc[Idx_sgen, 'loadcase_type'] = loadcase_type[2]
             else:
                 net[elm_col[0]]["loadcase_type"] = loadcase_type
 

{simbench-1.4.0 → simbench-1.5.1}/simbench/networks/simbench_code.py

@@ -21,23 +21,24 @@ def collect_all_simbench_codes(version=1, hv_level=None, lv_level=None, hv_type=
                                **kwargs):
     """
     Returns a list of all possible SimBench Codes, considering given fixed sb_code_parameters.
-    **kwargs are ignored.
+    kwargs are ignored.
 
-    EXAMPLE:
-        all_codes = collect_all_simbench_codes()
+    Examples
+    --------
+    >>> all_codes = collect_all_simbench_codes()
 
-        single_zone_codes = collect_all_simbench_codes(lv_level="", all_data=False)
+    >>> single_zone_codes = collect_all_simbench_codes(lv_level="", all_data=False)
 
-        all_data_codes = collect_all_simbench_codes(hv_level="")
+    >>> all_data_codes = collect_all_simbench_codes(hv_level="")
 
-        mv_grids_without_switch_and_lv = collect_all_simbench_codes(
-        hv_level="MV", lv_level="", breaker_rep=False)
+    >>> mv_grids_without_switch_and_lv = collect_all_simbench_codes(
+    ...     hv_level="MV", lv_level="", breaker_rep=False)
 
-        urban_hv_grid_scenario1_codes = collect_all_simbench_codes(
-        hv_level="HV", hv_type="urban", scenario=1)
+    >>> urban_hv_grid_scenario1_codes = collect_all_simbench_codes(
+    ...     hv_level="HV", hv_type="urban", scenario=1)
 
-        rural_and_urban_mv_grid_scenario1_codes = sb.collect_all_simbench_codes(
-        hv_level="MV", lv_level="", hv_type=["rural", "urban"], scenario=1, all_data=False)
+    >>> rural_and_urban_mv_grid_scenario1_codes = sb.collect_all_simbench_codes(
+    ...     hv_level="MV", lv_level="", hv_type=["rural", "urban"], scenario=1, all_data=False)
     """
     pos_hv_level = ["EHV", "HV", "MV", "LV"]
     pos_lv_level = ["HV", "MV", "LV", ""]

{simbench-1.4.0 → simbench-1.5.1/simbench}/simbench.egg-info/PKG-INFO

@@ -1,38 +1,83 @@
 Metadata-Version: 2.1
 Name: simbench
-Version: 1.4.0
-Summary: Electrical Power System Benchmark Models
-Home-page: http://www.simbench.de/en
-Author: Steffen Meinecke
-Author-email: steffen.meinecke@uni-kassel.de
-License: odbl
+Version: 1.5.1
+Summary: Electrical Power System Benchmark Models.
+Author-email: Steffen Meinecke <steffen.meinecke@uni-kassel.de>
+Maintainer-email: simbench Developers <simbench@uni-kassel.de>
+License: Copyright (c) 2019-2021 by University of Kassel, TU Dortmund, RWTH Aachen University and Fraunhofer Institute for Energy Economics and Energy System Technology (IEE) Kassel and individual contributors (see AUTHORS file for details).
+        All rights reserved.
+        
+        
+        The database called SimBench is made available under the Open Database
+        License: http://opendatacommons.org/licenses/odbl/1.0/.
+        Any rights in individual contents of the database are licensed under
+        the Database Contents License: http://opendatacommons.org/licenses/dbcl/1.0/
+        
+        
+        The code of this repository "simbench" is published under the following 3-clause BSD license:
+        
+        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.simbench.net
+Project-URL: Documentation, https://simbench.readthedocs.io
+Project-URL: Source, https://www.github.com/e2nIEE/simbench
+Project-URL: Repository, https://www.github.com/e2nIEE/simbench.git
+Project-URL: Issues, https://www.github.com/e2nIEE/simbench/issues
+Project-URL: Download, https://pypi.org/project/simbench/#files
+Project-URL: Changelog, https://github.com/e2nIEE/simbench/blob/develop/CHANGELOG.rst
+Keywords: benchmark grid,power system,network,grid planning,grid operation,grid generation methodology,comparability,reproducibility,electricity,energy,engineering,simulation,simbench,time series,future scenarios
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Education
 Classifier: Intended Audience :: Science/Research
+Classifier: License :: OSI Approved :: BSD License
 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.1
 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
 Description-Content-Type: text/x-rst
 Provides-Extra: docs
 Provides-Extra: plotting
+Provides-Extra: test
+Provides-Extra: performance
+Provides-Extra: fileio
 Provides-Extra: tutorials
 Provides-Extra: all
 License-File: LICENSE
+License-File: AUTHORS
 
 
 .. image:: https://simbench.de/wp-content/uploads/2019/01/logo.png
    :target: https://www.simbench.net
    :alt: SimBench logo
 
-|
-
 .. image:: https://badge.fury.io/py/simbench.svg
    :target: https://pypi.python.org/pypi/simbench
    :alt: PyPI

{simbench-1.4.0 → simbench-1.5.1/simbench}/simbench.egg-info/SOURCES.txt

@@ -3,17 +3,12 @@ CHANGELOG.rst
 LICENSE
 MANIFEST.in
 README.rst
+pyproject.toml
 requirements.txt
-setup.cfg
 setup.py
 .github/workflows/github_test_action.yml
-.github/workflows/release.yml
-simbench/__init__.py
-simbench.egg-info/PKG-INFO
-simbench.egg-info/SOURCES.txt
-simbench.egg-info/dependency_links.txt
-simbench.egg-info/requires.txt
-simbench.egg-info/top_level.txt
+.github/workflows/test_release.yml
+.github/workflows/upload_release.yml
 simbench/converter/__init__.py
 simbench/converter/auxiliary.py
 simbench/converter/csv_data_manipulation.py
@@ -84,6 +79,11 @@ simbench/networks/1-complete_data-mixed-all-2-sw/Substation.csv
 simbench/networks/1-complete_data-mixed-all-2-sw/Switch.csv
 simbench/networks/1-complete_data-mixed-all-2-sw/Transformer.csv
 simbench/networks/1-complete_data-mixed-all-2-sw/TransformerType.csv
+simbench/simbench.egg-info/PKG-INFO
+simbench/simbench.egg-info/SOURCES.txt
+simbench/simbench.egg-info/dependency_links.txt
+simbench/simbench.egg-info/requires.txt
+simbench/simbench.egg-info/top_level.txt
 simbench/test/__init__.py
 simbench/test/run_tests.py
 simbench/test/converter/__init__.py

simbench-1.5.1/simbench/simbench.egg-info/requires.txt

@@ -0,0 +1,43 @@
+pandapower>=2.12.1
+
+[all]
+plotly>=3.1.1
+matplotlib
+igraph
+geopandas
+geojson
+pytest~=8.1
+pytest-xdist
+nbmake
+ortools
+numba>=0.25
+lightsim2grid>=0.8.1
+
+[docs]
+numpydoc
+sphinx
+sphinx_rtd_theme
+sphinx-pyproject
+
+[fileio]
+geopandas
+
+[performance]
+ortools
+numba>=0.25
+lightsim2grid>=0.8.1
+
+[plotting]
+plotly>=3.1.1
+matplotlib
+igraph
+geopandas
+geojson
+
+[test]
+pytest~=8.1
+pytest-xdist
+nbmake
+
+[tutorials]
+matplotlib

simbench-1.5.1/simbench/simbench.egg-info/top_level.txt

@@ -0,0 +1,3 @@
+converter
+networks
+test

{simbench-1.4.0 → simbench-1.5.1}/simbench/test/converter/test_auxiliary.py

@@ -62,23 +62,25 @@ def test_column_indices():
 
 def test_get_unique_duplicated_dict():
     # --- with numeric data
-    A = pd.DataFrame([[8.0, 2, 1, 2.0, 3],
-                      [4.0, 3, 2, 5.0, 2],
-                      [6.0, 4, 2, 3.0, 4],
-                      [8.0, 3, 1, 2.0, 3],
+    A = pd.DataFrame([[8.0,    2, 1, 2.0,    3],
+                      [4.0,    3, 2, 5.0,    2],
+                      [6.0,    4, 2, 3.0,    4],
+                      [8.0,    3, 1, 2.0,    3],
                       [np.nan, 7, 5, np.nan, 2],
-                      [6.0, 4, 2, 3.0, 4],
-                      [8.0, 3, 1, 2.0, 3],
+                      [6.0,    4, 2, 3.0,    4],
+                      [8.0,    3, 1, 2.0,    3],
                       [np.nan, 7, 5, np.nan, 2],
-                      [8.0, 2, 1, 2.0, 3],
-                      [8.0, 2, 1, 2.0, 3]])
+                      [8.0,    2, 1, 2.0,    3],
+                      [8.0,    2, 1, 2.0,    3]])
     dict_ = sb.get_unique_duplicated_dict(A)
     assert dict_ == {0: [8, 9], 1: [], 2: [5], 3: [6], 4: [7]}
     dict_ = sb.get_unique_duplicated_dict(A, subset=[0, 2, 3, 4])
     assert dict_ == {0: [3, 6, 8, 9], 1: [], 2: [5], 4: [7]}
 
     # with strings
+    A[2] = A[2].astype(object)
     A.loc[[2, 5], 2] = "fd"
+    A[4] = A[4].astype(object)
     A.loc[9, 4] = "kl"
     dict_ = sb.get_unique_duplicated_dict(A)
     assert dict_ == {0: [8], 1: [], 2: [5], 3: [6], 4: [7], 9: []}
@@ -211,7 +213,7 @@ def test_merge_dataframes():
     assert pp.dataframes_equal(return6, res6)
 
     # beware idx order, df1 with precedence, no extra index
-    return7 = sb.merge_dataframes([df1, df2], keep="first", sort=False)
+    return7 = sb.merge_dataframes([df1, df2], keep="first", sort_index=False, sort_column=False)
     try:
         res7 = deepcopy(res5).reindex(unsorted_index, columns=unsorted_columns)
     except TypeError:  # legacy for pandas <0.21
@@ -220,7 +222,7 @@ def test_merge_dataframes():
     assert pp.dataframes_equal(return7, res7)
 
     # beware idx order, df1 with precedence, no extra index
-    return8 = sb.merge_dataframes([df1, df2], keep="last", sort=False)
+    return8 = sb.merge_dataframes([df1, df2], keep="last", sort_index=False, sort_column=False)
     try:
         res8 = deepcopy(res6).reindex(unsorted_index, columns=unsorted_columns)
     except TypeError:  # legacy for pandas <0.21

{simbench-1.4.0 → simbench-1.5.1}/simbench/test/converter/test_csv_pp_converter.py

@@ -14,7 +14,8 @@ from pandapower.networks import example_simple
 from simbench import sb_dir
 from simbench.converter import csv2pp, csv_data2pp, pp2csv, pp2csv_data, \
     convert_parallel_branches, read_csv_data, ensure_full_column_data_existence, \
-    avoid_duplicates_in_column, merge_busbar_coordinates
+    avoid_duplicates_in_column, merge_busbar_coordinates, to_numeric_ignored_errors, \
+    repl_nans_in_obj_cols_to_empty_str
 
 try:
     import pandaplan.core.pplog as logging
@@ -141,7 +142,7 @@ def test_convert_parallel_branches():
     assert net.switch.shape[0] == 11
 
     net1 = deepcopy(net)
-    net1.switch.closed.loc[4] = False
+    net1.switch.loc[4, "closed"] = False
     convert_parallel_branches(net, multiple_entries=False)
     convert_parallel_branches(net1, multiple_entries=False)
     # test sum up of parallels
@@ -238,14 +239,14 @@ def test_example_simple():
     # compare std_types as dataframes
     for netx in [net, net_from_csv_data]:
         for key, vals in netx["std_types"].items():
-            netx[f"std_types|{key}"] = pd.DataFrame(vals).T.apply(pd.to_numeric, errors='ignore')
+            netx[f"std_types|{key}"] = to_numeric_ignored_errors(pd.DataFrame(vals).T)
 
     for key in net.keys():
         if isinstance(net[key], pd.DataFrame):
             # drop unequal columns
             dummy_columns = net[key].columns
             extra_columns = net_from_csv_data[key].columns.difference(dummy_columns)
-            net_from_csv_data[key].drop(columns=extra_columns, inplace=True)
+            net_from_csv_data[key] = net_from_csv_data[key].drop(columns=extra_columns)
             # adjust dtypes
             if net[key].shape[0]:
                 try:
@@ -256,10 +257,13 @@ def test_example_simple():
             # drop result table rows
             if pp_is_27lower and "res_" in key:
                 if not key == "res_bus":
-                    net[key].drop(net[key].index, inplace=True)
+                    net[key] = net[key].iloc[0:0]
                 else:
                     net[key].loc[:, ["p_mw", "q_mvar"]] = np.nan
 
+    repl_nans_in_obj_cols_to_empty_str(net)
+    repl_nans_in_obj_cols_to_empty_str(net_from_csv_data)
+
     # --- for pp2.7.1 and newer
     if not pp_is_27lower:
         name_selection = [key for key in net.keys() if key.startswith("std_types|")]

{simbench-1.4.0 → simbench-1.5.1}/simbench/test/converter/test_pp_net_manipulation.py

@@ -8,7 +8,8 @@ from packaging import version
 import pandas as pd
 import pandapower as pp
 from pandapower.auxiliary import _preserve_dtypes
-from simbench.converter import replace_branch_switches, create_branch_switches
+from simbench.converter import replace_branch_switches, create_branch_switches, \
+    repl_nans_in_obj_cols_to_empty_str
 
 try:
     import pandaplan.core.pplog as logging
@@ -81,6 +82,9 @@ def test_branch_switch_changes():
     for elm in ["line", "trafo"]:
         _preserve_dtypes(net2[elm], net_orig[elm].dtypes)
 
+    repl_nans_in_obj_cols_to_empty_str(net_orig)
+    repl_nans_in_obj_cols_to_empty_str(net2)
+
     if version.parse(pp.__version__) <= version.parse("2.7.0"):
         assert pp.nets_equal(net_orig, net2, tol=1e-7)
     else:

{simbench-1.4.0 → simbench-1.5.1}/simbench/test/converter/test_voltLvl.py

@@ -100,8 +100,8 @@ if __name__ == "__main__":
     if 0:
         pytest.main(["test_voltLvl.py", "-xs"])
     else:
-#        test_convert_voltlvl_names()
-#        test_voltlvl_idx()
-#        test_get_voltlvl()
+        # test_convert_voltlvl_names()
+        # test_voltlvl_idx()
+        # test_get_voltlvl()
         test_all_voltlvl_idx()
         pass

{simbench-1.4.0 → simbench-1.5.1}/simbench/test/networks/test_extract_grids_from_csv.py

@@ -53,7 +53,7 @@ def test_get_bus_bus_switch_indices_from_csv():
         bool_ = True
     assert bool_
 
-    switch_table.drop(switch_table.index[-1], inplace=True)
+    switch_table = switch_table.drop(switch_table.index[-1])
     try:
         sb.get_bus_bus_switch_indices_from_csv(switch_table, node_table)
         bool_ = False
@@ -61,7 +61,7 @@ def test_get_bus_bus_switch_indices_from_csv():
         bool_ = True
     assert bool_
 
-    switch_table.drop(switch_table.index[-1], inplace=True)
+    switch_table = switch_table.drop(switch_table.index[-1])
     assert sb.get_bus_bus_switch_indices_from_csv(switch_table, node_table) == [0, 5]
 
 
@@ -443,7 +443,7 @@ def _test_net_validity(net, sb_code_params, shortened, input_path=None):
         try:
             pp.runpp(net)
             converged = net.converged
-        except:
+        except pp.LoadflowNotConverged:
             sb_code = sb.get_simbench_code_from_parameters(sb_code_params)
             logger.error("Loadflow not converged with %s" % sb_code)
             converged = False

{simbench-1.4.0 → simbench-1.5.1}/simbench/test/networks/test_profiles.py

@@ -47,7 +47,7 @@ def _testnet_with_profiles():
                                      ["lPV",  0.1, 0.122543, 0.85, 0.95, 1,  1.015]],
                                     columns=["Study Case", "pload", "qload", "Wind_p", "PV_p",
                                              "RES_p", "Slack_vm"])
-    net["loadcases"].set_index("Study Case", inplace=True)
+    net["loadcases"] = net["loadcases"].set_index("Study Case")
     return net, deepcopy(in_net_profiles)
 
 
@@ -122,7 +122,7 @@ if __name__ == '__main__':
     if 0:
         pytest.main(["test_profiles.py", "-xs"])
     else:
-#        test_dismantle_dict_values()
-#        test_missing_profiles()
-#        test_get_absolute_profiles_from_relative_profiles()
+        test_dismantle_dict_values()
+        test_missing_profiles()
+        test_get_absolute_profiles_from_relative_profiles()
         pass

{simbench-1.4.0 → simbench-1.5.1}/simbench/test/networks/test_simbench_code.py

@@ -69,6 +69,6 @@ if __name__ == '__main__':
     if 0:
         pytest.main(["test_simbench_code.py", "-xs"])
     else:
-#        test_simbench_code_occurance()
-#        test_simbench_code_conversion()
+        test_simbench_code_occurance()
+        test_simbench_code_conversion()
         pass

{simbench-1.4.0 → simbench-1.5.1}/simbench/test/networks/test_simbench_loadcases.py

@@ -24,5 +24,5 @@ if __name__ == "__main__":
     if 0:
         pytest.main(["test_simbench_loadcases.py", "-xs"])
     else:
-#        test_filter_loadcases()
+        test_filter_loadcases()
         pass

simbench-1.4.0/.github/workflows/github_test_action.yml

@@ -1,53 +0,0 @@
-# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-name: simbench
-
-on:
-  push:
-    branches: '*'
-    paths-ignore:
-      - 'CHANGELOG.rst'
-  pull_request:
-    branches: '*'
-    paths-ignore:
-      - 'CHANGELOG.rst'
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11']
-
-    steps:
-    - uses: actions/checkout@v2
-    #- uses: julia-actions/setup-julia@v1.5
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        python -m pip install pytest
-        pip install -r requirements.txt
-        pip install .["all"]
-    - name: List of installed packages
-      run: |
-        pip list
-    - name: Test with pytest
-      if: ${{ matrix.python-version != '3.8' }}
-      run: |
-        pytest
-    - name: Test with pytest and Codecov
-      if: ${{ matrix.python-version == '3.8' }}
-      run: |
-        pip install pytest-cov
-        pytest --cov=./ --cov-report=xml
-    - name: Upload coverage to Codecov
-      if: ${{ matrix.python-version == '3.8' }}
-      uses: codecov/codecov-action@v1
-      with:
-        verbose: true