doppy 0.4.0__tar.gz → 0.4.2__tar.gz

{doppy-0.4.0 → doppy-0.4.2}/Cargo.lock

@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "aho-corasick"
@@ -106,7 +106,7 @@ checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
 
 [[package]]
 name = "doppy_rs"
-version = "0.4.0"
+version = "0.4.2"
 dependencies = [
  "doprs",
  "numpy",
@@ -115,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "doprs"
-version = "0.4.0"
+version = "0.4.2"
 dependencies = [
  "chrono",
  "rayon",

{doppy-0.4.0 → doppy-0.4.2}/Cargo.toml

@@ -4,6 +4,6 @@ resolver = "2"
 
 [workspace.package]
 edition = "2021"
-version = "0.4.0"
+version = "0.4.2"
 authors = ["Niko Leskinen <niko.leskinen@fmi.fi>"]
 license-file = "LICENSE"

{doppy-0.4.0 → doppy-0.4.2}/PKG-INFO

@@ -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 → doppy-0.4.2}/src/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")