simbench 1.5.2__tar.gz → 1.5.3__tar.gz

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

@@ -1,8 +1,12 @@
 Change Log
 =============
 
-[1.5.2] - 2024-04-09
+[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
 - [CHANGED] added prune to MANIFEST.in to exclude doc and tutorials from wheel builds
 - [CHANGED] removed gitlab ci files from MANIFEST.in to keep them out of wheel builds

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simbench
-Version: 1.5.2
+Version: 1.5.3
 Summary: Electrical Power System Benchmark Models.
 Author-email: Steffen Meinecke <steffen.meinecke@uni-kassel.de>
 Maintainer-email: simbench Developers <simbench@uni-kassel.de>

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "simbench"
-version = "1.5.2"
+version = "1.5.3"
 authors = [
     { name = "Steffen Meinecke", email = "steffen.meinecke@uni-kassel.de" }
 ]

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

@@ -29,14 +29,52 @@ 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".
+
+    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.5.3}/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.5.3}/simbench.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simbench
-Version: 1.5.2
+Version: 1.5.3
 Summary: Electrical Power System Benchmark Models.
 Author-email: Steffen Meinecke <steffen.meinecke@uni-kassel.de>
 Maintainer-email: simbench Developers <simbench@uni-kassel.de>