flightdata 0.2.12__tar.gz → 0.2.14__tar.gz

{flightdata-0.2.12/flightdata.egg-info → flightdata-0.2.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flightdata
-Version: 0.2.12
+Version: 0.2.14
 Summary: Module for handling UAV flight log data
 Author-email: Thomas David <thomasdavid0@gmail.com>
 License: GNU GPL v3

{flightdata-0.2.12 → flightdata-0.2.14}/flightdata/base/__init__.py

@@ -2,5 +2,8 @@ from .table import Table, Constructs, SVar
 from .collection import Collection
 from .numpy_encoder import NumpyEncoder
 
-
-
+def to_list(obj):
+    if hasattr(obj, 'tolist'):
+        return obj.tolist()
+    else:
+        return list(obj)

{flightdata-0.2.12 → flightdata-0.2.14}/flightdata/base/table.py

@@ -135,19 +135,24 @@ class Table:
             axis=0, 
             ignore_index=True
         ).set_index("t", drop=False))
-      
+    
+    def zero_index(self):
+        data = self.data.copy()
+        return self.__class__(data.set_index(data.index - data.index[0]))
+
     @classmethod
-    def stack(Cls, sections: list, overlap: int=1) -> Self:
+    def stack(Cls, sts: list, overlap: int=1) -> Self:
         """Stack a list of Tables on top of each other. 
-        The overlap is the number of rows to overlap between each section
+        The overlap is the number of rows to overlap between each st
         """
-        # first build list of index offsets, to be added to each dataframe
+        t0 = sts[0].data.index[0]
+        sts = [st.zero_index() for st in sts]
         if overlap > 0:
-            offsets = np.cumsum([0] + [sec.data.index[-overlap] for sec in sections[:-1]])
-            dfs = [section.data.iloc[:-overlap] for section in sections[:-1]] + [sections[-1].data]
+            offsets = np.cumsum([0] + [s0.data.index[-overlap] for s0 in sts[:-1]])
+            dfs = [st.data.iloc[:-overlap] for st in sts[:-1]] + [sts[-1].data]
         elif overlap == 0:
-            offsets = np.cumsum([0] + [sec.duration + sec.dt[-1] for sec in sections[:-1]])
-            dfs = [section.data for section in sections]
+            offsets = np.cumsum([0] + [sec.duration + sec.dt[-1] for sec in sts[:-1]])
+            dfs = [st.data for st in sts]
         else:
             raise AttributeError("Overlap must be >= 0")
 
@@ -155,7 +160,7 @@ class Table:
             df.index = np.array(df.index) - df.index[0] + offset
         combo = pd.concat(dfs)
         combo.index.name = "t"
-
+        combo.index = combo.index + t0
         combo["t"] = combo.index
 
         return Cls(combo)
@@ -379,7 +384,7 @@ class Table:
                         if max_bck + max_fwd + get_len(i) < min_len:
                             raise Exception(f'{row.iloc[0]},{row.iloc[1]} too short and cannot shorten adjacent labels further')
                         else:
-                            _extend = (min_len - get_len(i)) / 2
+                            _extend = int(np.ceil((min_len - get_len(i)) / 2))
                             ebck = min(max_bck, int(np.floor(_extend)))
                             efwd = min(max_fwd, int(np.floor(_extend))+1)
 

{flightdata-0.2.12 → flightdata-0.2.14}/flightdata/flight/flight.py

@@ -447,6 +447,27 @@ class Flight:
                 ))
             return dfs
 
+    @staticmethod
+    def parse_fcj_data(origin: Origin, df: pd.DataFrame):
+        df = Flight.build_cols(
+            time_actual = df['time']/1e6 + int(time()),
+            time_flight = df['time']/1e6,
+            attitude_roll = np.radians(df['r']),
+            attitude_pitch = np.radians(df['p']),
+            attitude_yaw = np.radians(df['yw']),
+            position_N = df['N'],
+            position_E = df['E'],
+            position_D = df['D'],
+            velocity_N = df['VN'],
+            velocity_E = df['VE'],
+            velocity_D = df['VD'],
+            wind_N = df['wN'] if 'wN' in df.columns else None,
+            wind_E = df['wE'] if 'wE' in df.columns else None,
+        )
+
+        return Flight(df.set_index('time_flight', drop=False), None, origin, 'position')
+    
+    
     @staticmethod
     def from_fc_json(fc_json: Union[str, dict, IO]) -> Self:
         
@@ -473,20 +494,24 @@ class Flight:
             wind_N = df['wN'] if 'wN' in df.columns else None,
             wind_E = df['wE'] if 'wE' in df.columns else None,
         )
-        origin = Origin(
-            'fcj_origin',
-            GPS(
-                float(fc_json['parameters']['pilotLat']), 
-                float(fc_json['parameters']['pilotLng']), 
-                float(fc_json['parameters']['pilotAlt'])
-            ).offset(-Point(
-                fc_json['parameters']['moveNorth'],
-                fc_json['parameters']['moveEast'],
-                0,
-            )), 
-            0
-        )
-        
+
+        if 'parameters' in fc_json:
+            origin = Origin(
+                'fcj_origin',
+                GPS(
+                    float(fc_json['parameters']['pilotLat']), 
+                    float(fc_json['parameters']['pilotLng']), 
+                    float(fc_json['parameters']['pilotAlt'])
+                ).offset(-Point(
+                    fc_json['parameters']['moveNorth'],
+                    fc_json['parameters']['moveEast'],
+                    0,
+                )), 
+                0
+            )
+        else:
+            origin = Origin('dummy_origin', GPS(0,0,0), -np.pi/2)
+            
         return Flight(df.set_index('time_flight', drop=False), None, origin, 'position')#.remove_time_flutter()
 
     def remove_time_flutter(self):

{flightdata-0.2.12 → flightdata-0.2.14}/flightdata/state.py

@@ -15,7 +15,6 @@ class State(Table):
         SVar("vel", g.Point,       ["u", "v", "w"]           , lambda st: g.P0() if len(st)==1 else st.att.inverse().transform_point(st.pos.diff(st.dt))),
         SVar("rvel", g.Point,       ["p", "q", "r"]           , lambda st: g.P0() if len(st)==1 else st.att.body_diff(st.dt)),
         SVar("acc", g.Point,       ["du", "dv", "dw"]        , lambda st : g.P0() if len(st)==1 else st.att.inverse().transform_point(st.att.transform_point(st.vel).diff(st.dt) + g.PZ(9.81, len(st)))),
-        SVar("racc", g.Point,       ["dp", "dq", "dr"]        , lambda st: g.P0() if len(st)==1 else st.rvel.diff(st.dt)),
     ])
     _construct_freq = 30
 
@@ -131,7 +130,7 @@ class State(Table):
         from scipy.spatial.distance import euclidean
         def get_brv(brv):
             if mirror:
-                brv = brv.abs() * g.Point(1, 0, 1) + brv * g.Point(0, 1, 0 )
+                brv = g.Point(np.abs(brv.x), brv.y, np.abs(brv.z))#brv.abs() * g.Point(1, 0, 1) + brv * g.Point(0, 1, 0 )
             return brv * weights
 
         fl = get_brv(flown.rvel)
@@ -147,7 +146,7 @@ class State(Table):
 
         return distance, State.copy_labels(template, flown, path, 3)
 
-    def splitter_labels(self: State, mans: List[dict], better_names: List[str]=None) -> State:
+    def splitter_labels(self: State, mans: List[dict], better_names: List[str]=None, target_col='manoeuvre') -> State:
             """label the manoeuvres in a State based on the flight coach splitter information
 
             TODO this assumes the state only contains the dataset contained in the json
@@ -164,7 +163,7 @@ class State(Table):
             takeoff = self.data.iloc[0:int(mans[0]["stop"])+1]
 
             labels = [mans[0]["name"]]
-            labelled = [State(takeoff).label(manoeuvre=labels[0])]
+            labelled = [State(takeoff).label(**{target_col:labels[0]})]
             if better_names:
                 better_names.append('land')
 
@@ -179,7 +178,7 @@ class State(Table):
                 labelled.append(
                     State(
                         self.data.iloc[int(split_man["start"]):int(split_man["stop"])+1]
-                    ).label(manoeuvre=name)
+                    ).label(**{target_col:name})
                 )
                 labels.append(split_man["name"])
 
@@ -233,7 +232,6 @@ class State(Table):
             vel=q.transform_point(self.vel),
             rvel=q.transform_point(self.rvel),
             acc=q.transform_point(self.acc),
-            racc=q.transform_point(self.racc),
         ))
 
     def scale(self: State, factor: float) -> State:
@@ -244,7 +242,6 @@ class State(Table):
             vel=self.vel * factor,
             rvel=self.rvel,
             acc=self.acc * factor,
-            racc=self.racc,
         ))
 
     def mirror_zy(self: State) -> State:
@@ -456,7 +453,6 @@ class State(Table):
             vel=self.vel,
             rvel=self.rvel,
             acc=self.acc,
-            racc=self.racc,
         ))
 
     def move_back(self:State, transform:g.Transformation) -> State:

{flightdata-0.2.12 → flightdata-0.2.14/flightdata.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flightdata
-Version: 0.2.12
+Version: 0.2.14
 Summary: Module for handling UAV flight log data
 Author-email: Thomas David <thomasdavid0@gmail.com>
 License: GNU GPL v3

{flightdata-0.2.12 → flightdata-0.2.14}/test/base/test_table.py

@@ -74,6 +74,12 @@ def test_stack(tab_full):
     assert len(tfn) == 2 * len(tab_full) - 1
 
 
+    tfn = Table.stack([tfn.label(manoeuvre='m1'),tfn.label(manoeuvre='m2')])
+    assert tfn.data.index.is_monotonic_increasing
+    tfn2 = Table.stack(list(tfn.split_labels().values()))
+    assert tfn.duration == tfn2.duration
+
+
 def test_shift_multi(tab_full):
     tabs = Table.stack([tab_full.label(element='e0'), tab_full.label(element='e1')], overlap=1).split_labels()
     tb1, tb2 = Table.shift_multi(2, tabs['e0'], tabs['e1'])