linerate 2.1.2__tar.gz → 2.1.3__tar.gz

{linerate-2.1.2 → linerate-2.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: linerate
-Version: 2.1.2
+Version: 2.1.3
 Summary: Library for computing line ampacity ratings for overhead lines
 Author-email: Statnett Datascience <Datascience.Drift@Statnett.no>, Yngve Mardal Moe <yngve.m.moe@gmail.com>
 Requires-Python: >=3.9

{linerate-2.1.2 → linerate-2.1.3}/linerate/solver.py

@@ -61,7 +61,8 @@ def bisect(
     elif isinstance(invalid_mask, bool) and invalid_mask:
         return _invalid_value
 
-    while interval > tolerance:
+    nan_mask = np.isnan(f_left) | np.isnan(f_right)
+    while interval > tolerance and not np.all(nan_mask):
         xmid = 0.5 * (xmax + xmin)
         interval *= 0.5
         f_mid = f(xmid)
@@ -72,7 +73,10 @@ def bisect(
         f_left = np.where(mask, f_mid, f_left)
         f_right = np.where(mask, f_right, f_mid)
 
+        nan_mask = np.isnan(f_left) | np.isnan(f_right)
+
     out = np.where(invalid_mask, _invalid_value, 0.5 * (xmax + xmin))
+    out = np.where(nan_mask, np.nan, out)
     return out
 
 

{linerate-2.1.2 → linerate-2.1.3}/linerate.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: linerate
-Version: 2.1.2
+Version: 2.1.3
 Summary: Library for computing line ampacity ratings for overhead lines
 Author-email: Statnett Datascience <Datascience.Drift@Statnett.no>, Yngve Mardal Moe <yngve.m.moe@gmail.com>
 Requires-Python: >=3.9

{linerate-2.1.2 → linerate-2.1.3}/tests/test_solver.py

@@ -87,3 +87,35 @@ def test_bisect_raises_valueerror_when_infinite_in_array_input():
             xmax=np.array([10_000, 10_000]),
             tolerance=1e-8,
         )
+
+
+def test_bisect_returns_dtype_float_if_invalid_value_is_none():
+    def heat_balance(currents: np.array):
+        A = currents
+        T = 90
+        res = (A - 100 * T) * (currents + 100 * T)
+        return res
+
+    solution = solver.bisect(
+        heat_balance,
+        xmin=np.array([0, 0]),
+        xmax=np.array([10_000, 10_000]),
+        tolerance=1e-8,
+        invalid_value=None,
+    )
+
+    assert solution.dtype == np.float64
+
+
+def test_bisect_return_nan_if_heat_balance_returns_nan():
+    def heat_balance(currents: np.array):
+        return np.ones_like(currents) * np.nan
+
+    solution = solver.bisect(
+        heat_balance,
+        xmin=np.array([0, 0]),
+        xmax=np.array([10_000, 10_000]),
+        tolerance=1e-8,
+    )
+
+    np.testing.assert_array_equal(np.isnan(solution), np.full_like(solution, True, dtype=bool))