doppy 0.4.0__cp310-abi3-macosx_11_0_arm64.whl → 0.4.1__cp310-abi3-macosx_11_0_arm64.whl

doppy/raw/halo_sys_params.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import io
+import re
 from dataclasses import dataclass
 from datetime import datetime
 from io import BufferedIOBase
@@ -75,10 +76,40 @@ class HaloSysParams:
         return self[is_increasing]
 
 
+def _correct_concatenated_rows(rows: list[bytes]) -> list[bytes]:
+    concat_pattern = re.compile(rb".*(\t[-+0-9]*\.[-+0-9]*\.[-+0-9]*\t).*")
+
+    matches = [concat_pattern.fullmatch(row) for row in rows]
+
+    if not any(matches):
+        return rows
+    elif not all(matches):
+        raise ValueError("Cannot correct the concatenated rows")
+
+    zero_column_pattern = re.compile(rb".*\t0\t.*")
+    if not all(zero_column_pattern.fullmatch(row) for row in rows):
+        raise ValueError(r"Concatenated rows are expected to have \t0\t pattern")
+    rows = [row.replace(b"\t0\t", b"\t") for row in rows]
+
+    new_rows = []
+    pattern = re.compile(rb"(.*\t[-+]?[0-9]+\.[0-9]+)([-+][0-9]+\.[0-9]+\t.*)")
+    pattern_nan = re.compile(rb"(.*\t)[-+]?[0-9]+\.[0-9]+\.[0-9]+(\t.*)")
+    for row in rows:
+        m = pattern.fullmatch(row)
+        if m:
+            new_rows.append(m.group(1) + b"\t" + m.group(2))
+        elif m_nan := pattern_nan.fullmatch(row):
+            new_rows.append(m_nan.group(1) + b"nan\tnan" + m_nan.group(2))
+        else:
+            raise ValueError("Cannot separate concatenated floats")
+    return new_rows
+
+
 def _from_src(data: BufferedIOBase) -> HaloSysParams:
     data_bytes = data.read().strip().replace(b",", b".").replace(b"\x00", b"")
     a = data_bytes.strip().split(b"\r\n")
-    b = [r.split(b"\t") for r in a]
+    a = _correct_concatenated_rows(a)
+    b = [r.strip().split(b"\t") for r in a]
     arr = np.array(b)
     if arr.shape[1] != 7:
         raise ValueError("Unexpected data format")

{doppy-0.4.0.dist-info → doppy-0.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: doppy
-Version: 0.4.0
+Version: 0.4.1
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10

{doppy-0.4.0.dist-info → doppy-0.4.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
-doppy-0.4.0.dist-info/METADATA,sha256=bnTR2j3JN6ZfhwrYNbhIj0i6HdM-zpergm-CCBQa_5I,4276
-doppy-0.4.0.dist-info/WHEEL,sha256=9pH0c92OgjhIvXK7g4XTh8KK6q5vYgxz1YCJsDe0sC0,103
-doppy-0.4.0.dist-info/entry_points.txt,sha256=9b_Ca7vJoh6AwL3W8qAPh_UmJ_1Pa6hi-TDfCTDjvSk,43
-doppy-0.4.0.dist-info/licenses/LICENSE,sha256=V-0iroMNMI8ctnLgUau1kdFvwhkYhr9vi-5kWKxw2wc,1089
+doppy-0.4.1.dist-info/METADATA,sha256=2QKdwdON6AE9MwHzhqjhAqAEOdv0VSd--jmsleS9veI,4276
+doppy-0.4.1.dist-info/WHEEL,sha256=jgxTYcCP5fEsgDB4ai9yqIrFqOhaSksIcR8Z9RvlUtk,103
+doppy-0.4.1.dist-info/entry_points.txt,sha256=9b_Ca7vJoh6AwL3W8qAPh_UmJ_1Pa6hi-TDfCTDjvSk,43
+doppy-0.4.1.dist-info/licenses/LICENSE,sha256=V-0iroMNMI8ctnLgUau1kdFvwhkYhr9vi-5kWKxw2wc,1089
 doppy/options.py,sha256=73BDODO4OYHn2qOshhwz6u6G3J1kNd3uj6P0a3V4HBE,205
 doppy/__init__.py,sha256=Z9aEUlbPRWRUAoB8_-djkgrJuS4-6pjem4-mVSB6Z9I,191
 doppy/product/wind.py,sha256=hkSzAyi4tfPoGwUx8iE3l65oCDyzl_tRgtF2loxaEpY,16557
@@ -18,12 +18,12 @@ doppy/data/cache.py,sha256=cxCZ7HyEQt2EKAGEiMqx3wJ2-5Y3hEAEPQ_XB4gKlkk,1160
 doppy/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 doppy/data/api.py,sha256=QaVKj304OPcu8OF5xgtduQzDis8Srn-I6UgR9qb2u9E,1863
 doppy/data/exceptions.py,sha256=6CS6OHIWq8CqlxiceEvC1j0EfWUYoIfM7dW88apQVn4,89
-doppy/raw/halo_sys_params.py,sha256=DeOIIRtVdO7HnNY3FaI4u035ScI65jfDgUrEccLepEo,3937
+doppy/raw/halo_sys_params.py,sha256=jB7sRsu3nNpk8_2tUnz4dseVszmnPoNL8gLbrGPZVuQ,5130
 doppy/raw/__init__.py,sha256=4pj4xSK9rA0XEfM79NsRBRYId7GaJRDCyPABxbEm63g,260
 doppy/raw/wls70.py,sha256=TePgyhmlWaUQCw1vkWh7uD7KT5EFMaDhNeVYoF2rspc,7510
 doppy/raw/halo_bg.py,sha256=8t9j-SUF1yJht3vrT6KAYJQyxcg3W-0zr8h0jAEhWes,5815
 doppy/raw/halo_hpl.py,sha256=yzVPQEATnDVf1K3N-mGLXR4_RuT-E94OVXathT2bHes,18580
 doppy/raw/windcube.py,sha256=vgkoXVgcbI2Or4BsFCeq2STdjUP49h3mBQLoDXdBQHM,19074
 doppy/__main__.py,sha256=zrKQJVj0k0ypBQCGK65Czt9G9FZ_qx3ussw6Q9VJ14g,346
-doppy/rs.abi3.so,sha256=o1UmwiBlSeRyDR2KeIm83bBpGJyTk9DdywuVjJUnTos,2583328
-doppy-0.4.0.dist-info/RECORD,,
+doppy/rs.abi3.so,sha256=YPS3BcqHlphUOlLpu1U1KRS46BIEC7sa4WTlltmmLZg,2568576
+doppy-0.4.1.dist-info/RECORD,,

{doppy-0.4.0.dist-info → doppy-0.4.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: maturin (1.7.7)
+Generator: maturin (1.7.8)
 Root-Is-Purelib: false
 Tag: cp310-abi3-macosx_11_0_arm64