linerate 2.1.1__py3-none-any.whl → 2.1.3__py3-none-any.whl

linerate/solver.py

@@ -33,8 +33,9 @@ def bisect(
         run for :math:`\left\lceil\frac{x_\max - x_\min}{\Delta x}\right\rceil`
         iterations.
     invalid_value:
-        If provided, then this value is used whenever
-        :math:`\text{sign}(f(\mathbf{x}_\min)) = \text{sign}(f(\mathbf{x}_\max))`.
+        This value is used whenever
+        :math:`\text{sign}(f(\mathbf{x}_\min)) = \text{sign}(f(\mathbf{x}_\max))`. If not provided
+        np.nan is used.
 
     Returns
     -------
@@ -43,6 +44,8 @@ def bisect(
         there is a root :math:`x_i \in [\tilde{x}_i - 0.5 \Delta x, \tilde{x}_i + 0.5 \Delta x]`
         so :math:`f_i(x_i) = 0`.
     """
+    _invalid_value = np.nan if invalid_value is None else invalid_value
+
     if not np.all(np.isfinite(xmin)) or not np.all(np.isfinite(xmax)):
         raise ValueError("xmin and xmax must be finite.")
     interval = np.max(np.abs(xmax - xmin))
@@ -56,9 +59,10 @@ def bisect(
             "f(xmin) and f(xmax) have the same sign. Consider increasing the search interval."
         )
     elif isinstance(invalid_mask, bool) and invalid_mask:
-        return invalid_value  # type: ignore
+        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)
@@ -69,7 +73,10 @@ def bisect(
         f_left = np.where(mask, f_mid, f_left)
         f_right = np.where(mask, f_right, f_mid)
 
-    out = np.where(invalid_mask, invalid_value, 0.5 * (xmax + xmin))  # type: ignore
+        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.1.dist-info → linerate-2.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: linerate
-Version: 2.1.1
+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
@@ -15,7 +15,7 @@ Dynamic: license-file
 # Overview
 
 A package containing functionality to compute ampacity line ratings for overhead lines.
-Currently, the package only contains equations from CIGRE TB 601.
+The package contains equations from CIGRE TB 601, CIGRE TB 207 and IEEE738.
 
 ## Installation
 

{linerate-2.1.1.dist-info → linerate-2.1.3.dist-info}/RECORD

@@ -1,7 +1,7 @@
 linerate/__init__.py,sha256=456XlD7NFaT6nTM5k8qYpaf2Bg2ITYhh5wzL0CQRiDc,221
 linerate/model.py,sha256=SUj4NunXdCctezpGeS62OQNmFGf5IKO2plYQlsGJLow,651
 linerate/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-linerate/solver.py,sha256=LipfG8EYKCCYn9npyVMdbS1F_6uarC6Lcl5l-WqPdUM,6424
+linerate/solver.py,sha256=OaaTUBii7pTPTQMqpePNRhheSpLCOd0zjkspuaeUads,6665
 linerate/types.py,sha256=HEon3gQU0dX0ZtTxhs4kOhL3jTamXoC3oBtX5b2-Piw,7595
 linerate/units.py,sha256=nNU9SQ-eeUCtmbttKZ9IlNzomF8wwUPPwmixXjfvKhI,1476
 linerate/equations/__init__.py,sha256=cNvISWCp5TbXv4gZ8SWPf0pICRpwDzLSaOxYy5lftsU,464
@@ -30,8 +30,8 @@ linerate/models/cigre207.py,sha256=FqeSkVzcsf8YIPuyxN0o3svrEp73vIAb42ylnQU_pBQ,5
 linerate/models/cigre601.py,sha256=HuwAEsRtWdN5oG0AZqCISnww8ILFGdvk8IfrzLQ_nf0,7508
 linerate/models/ieee738.py,sha256=0o1rEjHhHUgCaK0PyBHBXvFCDs-c9HIF91uUP-VaLAg,4291
 linerate/models/thermal_model.py,sha256=SUeUrjxJaV4muoAiYNR-Ne-1vQspWCPsoJys6bP6pP8,10997
-linerate-2.1.1.dist-info/licenses/LICENSE,sha256=HDUtv1ujna13BmYSP7JtGGsG5kGPAaZY2C2qJrANAOo,1059
-linerate-2.1.1.dist-info/METADATA,sha256=o89E7Tp8kKzX5-LWFu0HnnS2_pdpoHI4RLldJSNpkNo,4275
-linerate-2.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-linerate-2.1.1.dist-info/top_level.txt,sha256=xHXGAzhQ04AqJCM-MG30tP_me8vBQ9PMlRWsbMLJdgE,9
-linerate-2.1.1.dist-info/RECORD,,
+linerate-2.1.3.dist-info/licenses/LICENSE,sha256=HDUtv1ujna13BmYSP7JtGGsG5kGPAaZY2C2qJrANAOo,1059
+linerate-2.1.3.dist-info/METADATA,sha256=EuetzmcfrIbkOFT7LHUXdlOZMHeqAg6plaR3ujXPlD8,4285
+linerate-2.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+linerate-2.1.3.dist-info/top_level.txt,sha256=xHXGAzhQ04AqJCM-MG30tP_me8vBQ9PMlRWsbMLJdgE,9
+linerate-2.1.3.dist-info/RECORD,,