flightdata 0.3.2__tar.gz → 0.3.4__tar.gz

{flightdata-0.3.2 → flightdata-0.3.4}/PKG-INFO

@@ -1,14 +1,14 @@
 Metadata-Version: 2.4
 Name: flightdata
-Version: 0.3.2
+Version: 0.3.4
 Summary: Python tools for handling flight data
 Author-email: Thomas David <thomasdavid0@gmail.com>
 License-File: LICENSE
 Requires-Python: >=3.12
 Requires-Dist: numpy>=2.1.3
 Requires-Dist: pandas>=2.2.3
-Requires-Dist: pfc-geometry>=0.2.17
-Requires-Dist: pfcschemas>=0.1.10
+Requires-Dist: pfc-geometry>=0.2.19
+Requires-Dist: pfcschemas>=0.1.12
 Requires-Dist: simplejson>=3.20.1
 Provides-Extra: dataflash
 Requires-Dist: ardupilot-log-reader; extra == 'dataflash'

{flightdata-0.3.2 → flightdata-0.3.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "flightdata"
-version = "0.3.2"
+version = "0.3.4"
 description = "Python tools for handling flight data"
 readme = "README.md"
 authors = [{ name = "Thomas David", email = "thomasdavid0@gmail.com" }]
@@ -8,8 +8,8 @@ requires-python = ">=3.12"
 dependencies = [
     "numpy>=2.1.3",
     "pandas>=2.2.3",
-    "pfc-geometry>=0.2.17",
-    "pfcschemas>=0.1.10",
+    "pfc-geometry>=0.2.19",
+    "pfcschemas>=0.1.12",
     "simplejson>=3.20.1",
 ]
 

{flightdata-0.3.2 → flightdata-0.3.4}/src/flightdata/base/collection.py

@@ -70,6 +70,11 @@ class Collection:
 
     def filter_items(self, fun: Callable[[str, T], bool]):
         return self.__class__({k: v for k, v in self.items() if fun(k, v)})
+    
+    def index(self, key: str) -> int:
+        if key in self.data:
+            return list(self.data.keys()).index(key)
+        raise KeyError(f"{key} not found in {self.__class__}")
 
     def to_list(self) -> list[T]:
         return list(self.values())
@@ -93,17 +98,18 @@ class Collection:
         if isinstance(v, self.VType):
             odata[getattr(v, self.uid)] = v
         elif isinstance(v, self.__class__):
-            odata = dict(**odata, **v.data)
+            odata = odata | v.data #dict(**odata, **v.data)
         elif isinstance(v, list):
-            odata = dict(**odata, **{getattr(d, self.uid): d for d in v})
+            odata = odata | {getattr(d, self.uid): d for d in v}
         if inplace:
             self.data = odata
             return v
         else:
             return self.__class__(odata) 
     
-    def concat(self, vs: list[Self]) -> Self:
-        coll = self.__class__([])
+    @classmethod
+    def concat(Cls, vs: list) -> Self:
+        coll = Cls([])
         for v in vs:
             coll.add(v)
         return coll
@@ -144,6 +150,27 @@ class Collection:
     def __len__(self) -> int:
         return len(self.data)
     
+    def remove(self, key_or_id: str | int) -> Self:
+        if isinstance(key_or_id, int):
+            key_or_id = list(self.data.keys())[key_or_id]
+        return self.__class__({k: v for k, v in self.data.items() if k != key_or_id})
+
+    def replace(self, key_or_id: str | int, v: T, inplace=False) -> Self:
+        if isinstance(key_or_id, int):
+            key_or_id = list(self.data.keys())[key_or_id]
+        if not hasattr(v, self.uid):
+            raise ValueError(f"Value {v} does not have a {self.uid} attribute")
+        if not inplace:
+            new_data = self.data.copy()
+            new_data[key_or_id] = v
+            return self.__class__(new_data)
+        else:
+            if key_or_id in self.data:
+                self.data[key_or_id] = v
+            else:
+                raise KeyError(f"{key_or_id} not found in {self.__class__}")
+            return self
+
     @property
     def uids(self) -> list[str]:
         return list(self.data.keys())

{flightdata-0.3.2 → flightdata-0.3.4}/src/flightdata/base/table/labelgroup.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+import enum
 import numpy as np
 import pandas as pd
 import numpy.typing as npt
@@ -73,6 +74,20 @@ class LabelGroup:
         if len(labels) == len(t):
             labels= labels[:-1]
         assert len(labels) == len(t) - 1
+        labels=labels.astype(object)
+        change_ids = np.where(labels[:-1] != labels[1:])[0] + 1
+        
+        newlabnames = [labels[0]]
+        for i, oldlabname in enumerate(labels[change_ids]):
+            newlabname = oldlabname
+            suffix=1
+            while newlabname in newlabnames:
+                newlabname = f"{oldlabname}_{suffix}"
+                suffix+=1
+            newlabnames.append(newlabname)
+            if not newlabname == oldlabname:
+                labels[change_ids[i]:change_ids[i+1] if i+1<len(change_ids) else None] = newlabname
+
         labnames = pd.unique(labels)
         data = {}
         for i, label_name in enumerate(labnames):
@@ -173,7 +188,7 @@ class LabelGroup:
             )
             
             #st: Self = flown.__class__(flown.data).label(**mans.to_dict(orient="list"))
-            return LabelGroup.read_array(b, mans.a)
+            return LabelGroup.read_array(b, mans.a.values)
 #            return self.update(lambda v: v.transfer(a, b, path))
     @property
     def widths(self):
@@ -181,7 +196,7 @@ class LabelGroup:
 
     @property
     def boundaries(self) -> list[float]:
-        return [v.stop for v in self.values()]
+        return np.array([v.stop for v in self.values()])
 
     @property
     def boundary_dict(self) -> dict[str, float]:
@@ -220,13 +235,13 @@ class LabelGroup:
     def step_boundary(self, key: str | int, steps: int, t: npt.NDArray, min_len: int):
         """Step the stop time of a label, and the start of the next label by steps timesteps"""
         ilg = self.to_iloc(t)
-        iboundaries = [0] + ilg.boundaries
+        iboundaries = np.concatenate([np.array([0]), ilg.boundaries])
         lengths = [b1-b0 for b0, b1 in zip(iboundaries[:-1], iboundaries[1:])]
         index = list(self.keys()).index(key) if isinstance(key, str) else key
 #        new_iloc = np.where(t==self[index].stop)[0][0] + steps
         
         
-        if lengths[index] >= -steps + min_len -1  and lengths[index+1] >= steps + min_len - 1:
+        if lengths[index] + steps + 1 >=  min_len  and lengths[index+1] - steps + 1>= min_len :
             
             ilg[index].stop = ilg[index].stop + steps
             if index < len(ilg) - 1:
@@ -275,7 +290,10 @@ class LabelGroup:
         """
 
         if len(names) > 1:
-            return self.insert(names[:-1], loc)
+            new = self.copy()
+            for i, name in enumerate(names):
+                new = new.insert(loc+i, [name])
+            return new
 
         new_labels = {}
         for i, (k, v) in enumerate(self.items()):
@@ -297,7 +315,7 @@ class LabelGroup:
         inserts = []
         new_labs = {}
         while ii < len(keys):
-            if labs[il] == keys[ii]:
+            if il<len(labs) and labs[il] == keys[ii]:
                 if len(inserts):
                     new_labs[il] = inserts                
                 inserts = []
@@ -306,6 +324,9 @@ class LabelGroup:
             else:
                 inserts.append(keys[ii])
                 ii += 1
+        else:
+            if len(inserts):
+                new_labs[il] = inserts
         for loc in list(new_labs.keys())[::-1]:
             self=self.insert(loc, new_labs[loc])
         return self
@@ -324,24 +345,24 @@ class LabelGroup:
         elif index == len(self) - 1:
             side = "start"
         else:
-            next_space_fwd = np.argwhere(np.array(widths[index+1:]) > min_len)
-            next_space_fwd = next_space_fwd[0][0] if len(next_space_fwd) and len(next_space_fwd[0]) else None
-            next_space_bck = np.argwhere(np.array(widths[:index][::-1]) > min_len)
-            next_space_bck = next_space_bck[0][0] if len(next_space_bck) and len(next_space_bck[0]) else None
+            next_space_stop = np.argwhere(np.array(widths[index+1:]) > min_len)
+            next_space_stop = next_space_stop[0][0] if len(next_space_stop) and len(next_space_stop[0]) else None
+            next_space_start = np.argwhere(np.array(widths[:index][::-1]) > min_len)
+            next_space_start = next_space_start[0][0] if len(next_space_start) and len(next_space_start[0]) else None
             
-            if next_space_fwd is None and next_space_bck is None:
+            if next_space_stop is None and next_space_start is None:
                 raise ValueError(f"Cannot expand label {name}")
-            elif next_space_fwd is None:
+            elif next_space_stop is None:
                 side = "start"
-            elif next_space_bck is None:
+            elif next_space_start is None:
                 side= "stop"
-            elif next_space_fwd > next_space_bck:
-                side = "stop"
-            elif next_space_bck < next_space_fwd:
+            elif next_space_stop > 0 and next_space_start == 0:
                 side = "start"
+            elif next_space_start > 0 and next_space_stop == 0:
+                side = "stop"
             else:
-                #either next_space_fwd == next_space_bck
-                side = "stop" if widths[:index][::-1][next_space_bck] < widths[index+1:][next_space_fwd] else "start"
+                #either next_space_stop == next_space_start
+                side = "stop" if widths[:index][::-1][next_space_start] < widths[index+1:][next_space_stop] else "start"
        
         if side=="start":
             boundaries[index-1] -= 1

{flightdata-0.3.2 → flightdata-0.3.4}/src/flightdata/flight/flight.py

@@ -11,20 +11,25 @@ this program. If not, see <http://www.gnu.org/licenses/>.
 """
 
 from __future__ import annotations
+
+from datetime import datetime
+from json import dump, load
+from numbers import Number
 from typing import Self, Union
+
+from pathlib import Path
 import numpy as np
 import pandas as pd
-from .fields import fields, Field
-from geometry import GPS, Point, P0
+from geometry import GPS, P0, Point
 from geometry.checks import assert_almost_equal
-from json import load, dump
+from schemas import fcj
+from scipy.signal import butter, filtfilt
+
+from flightdata import Origin
 from flightdata.base.numpy_encoder import NumpyEncoder
+
 from .ardupilot import flightmodes
-from flightdata import Origin
-from schemas import fcj
-from numbers import Number
-from scipy.signal import filtfilt, butter
-from datetime import datetime
+from .fields import Field, fields
 
 
 def filter(data, cutoff=25, order=5, fs=25):
@@ -311,13 +316,13 @@ class Flight:
             return False
 
     def boot_time(self):
-        timestamp = self.time_actual.iloc[0]
+        timestamp = self.time_actual.iloc[0] 
         return datetime.fromtimestamp(timestamp) if not np.isnan(timestamp) else None
 
     @staticmethod
     def from_log(
-        log: str,
-        extra_types: list[str] = None,
+        log: str | Path,
+        extra_types: list[str] | None = None,
         ppsource: str = "pos",
         imu_instance=0,
         **kwargs,

{flightdata-0.3.2 → flightdata-0.3.4}/src/flightdata/flight/parameters.py

@@ -7,6 +7,6 @@ from dataclasses import dataclass
 class Parameters:
     parms: dict[str, pd.DataFrame]
 
-    def __getattr(self, name: str) -> np.Any:
+    def __getattr(self, name: str):
         return self.parms[name]
     

{flightdata-0.3.2 → flightdata-0.3.4}/src/flightdata/state/state.py

@@ -167,10 +167,10 @@ class State(Table):
 
         return plotsec(self, **(dict(nmodels=10, ribb=True) | kwargs))
 
-    def plotlabels(self, label: str):
+    def plotlabels(self, label: str, **kwargs):
         from plotting import plot_regions
 
-        return plot_regions(self, label)
+        return plot_regions(self, label, **kwargs)
 
     def extrapolate(self, duration: float, min_len=3) -> State:
         """Extrapolate the input state assuming uniform circular motion and small angles"""
@@ -586,6 +586,7 @@ class State(Table):
         )
 
     def move(self: State, transform: g.Transformation) -> State:
+        """Move the state by a transformation"""
         return State.from_constructs(
             time=self.time,
             pos=transform.point(self.pos),

{flightdata-0.3.2 → flightdata-0.3.4}/test/base/test_labels.py

@@ -45,6 +45,12 @@ def test_labelgroup_read_array(tab_full, label_array):
     assert lg.a2.stop == tab_full.data.index[-1]
 
 
+def test_labelgroup_read_array_repeats(tab_full):
+    label_array = np.array(["a0", "a0", "a1", "a1", "a0", "a0"])
+    lg = LabelGroup.read_array(tab_full.t, label_array)
+    assert len(lg) == 3
+
+
 def test_label_array(tab_lab):
     assert len(tab_lab.labels) == 1
     assert isinstance(tab_lab.labels.a, LabelGroup)
@@ -181,26 +187,47 @@ def test_from_boundaries():
     lg = LabelGroup.from_boundaries(0, dict(a=2, b=5))
     assert lg.a.start == 0
     assert lg.a.stop == 2
-    assert lg.b.start==2
+    assert lg.b.start == 2
     assert lg.b.stop == 5
     assert lg.is_tesselated(np.arange(5))
 
+
 def test_expand_one():
     lg = LabelGroup.from_boundaries(0, dict(a=2, b=2, c=6))
-    lg = lg.expand_one('b', 1)
-    np.testing.assert_array_equal(lg.boundaries, [2,3,6])
+    lg = lg.expand_one("b", 1)
+    np.testing.assert_array_equal(lg.boundaries, [2, 3, 6])
+
 
 def test_expand():
     lg = LabelGroup.from_boundaries(0, dict(a=2, b=2, c=6))
     lg = lg.expand(2)
     np.testing.assert_array_equal(lg.boundaries, [2, 4, 6])
 
+
 def test_expand_difficult():
     lg = LabelGroup.from_boundaries(0, dict(a=0, b=1, c=7))
-    
+
     np.testing.assert_array_equal(lg.expand(1).boundaries, [1, 2, 7])
     np.testing.assert_array_equal(lg.expand(2).boundaries, [2, 4, 7])
 
+
 def test_expand_infinite_loop():
     lg = LabelGroup.from_boundaries(0, dict(a=1, b=5, c=6, d=8))
-    np.testing.assert_array_equal(lg.expand(2).boundaries, [2, 4, 6, 8])
+    np.testing.assert_array_equal(lg.expand(2).boundaries, [2, 4, 6, 8])
+
+
+def test_labelgroup_insert_list(tab_lab: Table):
+    np.testing.assert_array_equal(
+        list(tab_lab.labels.a.insert_list(["a0", "a1", "new", "a2"]).keys()),
+        ["a0", "a1", "new", "a2"],
+    )
+
+    np.testing.assert_array_equal(
+        list(tab_lab.labels.a.insert_list(["a0", "a1", "a2", "new"]).keys()),
+        ["a0", "a1", "a2", "new"],
+    )
+
+    np.testing.assert_array_equal(
+        list(tab_lab.labels.a.insert_list(["a0", "a1", "a2", "new", "new2"]).keys()),
+        ["a0", "a1", "a2", "new", "new2"],
+    )

flightdata-0.3.2/src/flightdata/base/labeling.py

@@ -1,9 +0,0 @@
-
-
-
-def get_appended_id(source: str, seperator='_'):
-    try:
-        sloc = source.rfind(seperator)
-        return source[:sloc], source[sloc+1:]
-    except Exception:
-        return source, None