doppy 0.4.0__cp310-abi3-win_amd64.whl → 0.4.2__cp310-abi3-win_amd64.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
@@ -19,8 +20,8 @@ class HaloSysParams:
     internal_relative_humidity: npt.NDArray[np.float64]  # dim: (time, )
     supply_voltage: npt.NDArray[np.float64]  # dim: (time, )
     acquisition_card_temperature: npt.NDArray[np.float64]  # dim: (time, )
-    pitch: npt.NDArray[np.float64]  # dim: (time, )
-    roll: npt.NDArray[np.float64]  # dim: (time, )
+    platform_pitch_angle: npt.NDArray[np.float64]  # dim: (time, ), unit: degrees
+    platform_roll_angle: npt.NDArray[np.float64]  # dim: (time, ), unit: degrees
 
     @classmethod
     def from_src(cls, data: str | Path | bytes | BufferedIOBase) -> HaloSysParams:
@@ -46,8 +47,8 @@ class HaloSysParams:
             np.concatenate(tuple(r.internal_relative_humidity for r in raws)),
             np.concatenate(tuple(r.supply_voltage for r in raws)),
             np.concatenate(tuple(r.acquisition_card_temperature for r in raws)),
-            np.concatenate(tuple(r.pitch for r in raws)),
-            np.concatenate(tuple(r.roll for r in raws)),
+            np.concatenate(tuple(r.platform_pitch_angle for r in raws)),
+            np.concatenate(tuple(r.platform_roll_angle for r in raws)),
         )
 
     def __getitem__(
@@ -61,8 +62,8 @@ class HaloSysParams:
                 self.internal_relative_humidity[index],
                 self.supply_voltage[index],
                 self.acquisition_card_temperature[index],
-                self.pitch[index],
-                self.roll[index],
+                self.platform_pitch_angle[index],
+                self.platform_roll_angle[index],
             )
         raise TypeError
 
@@ -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.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: doppy
-Version: 0.4.0
+Version: 0.4.2
 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.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
-doppy-0.4.0.dist-info/METADATA,sha256=YmWpU_2D2vkb1syNvT0rTWbwWIl_szfcfsJlDNquySI,4375
-doppy-0.4.0.dist-info/WHEEL,sha256=KwWTkx8j-9qpJhNDsJHbSlL5MdLAbyW_pNjgwYvZm70,95
-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=RIAxFjJLTw0wQ3_SM73JoTeppoD99DJJ72cjvVuRrW4,1110
+doppy-0.4.2.dist-info/METADATA,sha256=qv6QzHEp1Dqs3UJE4QwRbEEEolyMI95HLWZ9wsliDzE,4375
+doppy-0.4.2.dist-info/WHEEL,sha256=ff_aotEPDeP8au5CC0c1B8Qp-UHc3TEJkBgH6hZZ_jU,95
+doppy-0.4.2.dist-info/entry_points.txt,sha256=9b_Ca7vJoh6AwL3W8qAPh_UmJ_1Pa6hi-TDfCTDjvSk,43
+doppy-0.4.2.dist-info/licenses/LICENSE,sha256=RIAxFjJLTw0wQ3_SM73JoTeppoD99DJJ72cjvVuRrW4,1110
 doppy/bench.py,sha256=fLN2iS5mmoYH4qZjD80Vl1h9lp3C-KDfhj9fteWRPtM,260
 doppy/data/api.py,sha256=c3zbZI3IV7HnzhyFzJpUPOFT20eYFuQlJ5K_1ZEe1Pg,1921
 doppy/data/cache.py,sha256=ERFzH-KjLLXV8fCePsewTepKZXmLwtXxeazmHiFdA80,1203
@@ -18,12 +18,12 @@ doppy/product/__init__.py,sha256=xoBEXuhid-bvoof5Ogzpt1dKIhJgNMRyrAinCqUOUUI,241
 doppy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 doppy/raw/halo_bg.py,sha256=TrqJDUXa1atW2w4UDN9PPx2Mzrc7D9Q2Ndph0yB65p0,5988
 doppy/raw/halo_hpl.py,sha256=l9i_TTJ4BY5eE3qAEAiLKK-mXd-a2BseEyDUMvMEanI,19105
-doppy/raw/halo_sys_params.py,sha256=nT9r4F-H0Rf5njee5rYzzLTCm7vm3N_pdJqrW6RtyK4,4041
+doppy/raw/halo_sys_params.py,sha256=9aZpAgaLFniADjYv7EO8wKtmBD6McJP2v7YUz94hrTM,5385
 doppy/raw/windcube.py,sha256=LB7Do9Bn4ygBy8tMBM9Rc1ZZKU_6WX88UHELKiTPJfQ,19550
 doppy/raw/wls70.py,sha256=J3ABVj_YrjSgmyRt6DGNoZUZIEZEzEoKaY5yiN9hE94,7717
 doppy/raw/__init__.py,sha256=ycT-_mCiI19b2TH33L74-Eq_MYUTPe3B8NhwNodSx1E,267
 doppy/utils.py,sha256=2PwDiO8GyMjsHC-EYcTGyN2mEfPaCi3hhEn2twETOl0,814
 doppy/__init__.py,sha256=Af7_8p3oN1nTqS9fo0mVKVuiKf5CAEK69uQa32CSFBA,197
 doppy/__main__.py,sha256=38hIWWfanILuBBGorQiAaleSC4qYJoIxuzVBkxf7Dng,371
-doppy/rs.pyd,sha256=mapeuiOknSrHqwJqRyKXtd46vkG_NtsnVredpQXN8fo,2135552
-doppy-0.4.0.dist-info/RECORD,,
+doppy/rs.pyd,sha256=UAYl78Q6CnDyh7wWZlBeOeMuIr662OkyxmkLGA00l8c,2130944
+doppy-0.4.2.dist-info/RECORD,,

{doppy-0.4.0.dist-info → doppy-0.4.2.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-win_amd64