flightdata 0.2.6__tar.gz → 0.2.8__tar.gz

{flightdata-0.2.6 → flightdata-0.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flightdata
-Version: 0.2.6
+Version: 0.2.8
 Summary: Module for handling UAV flight log data
 Home-page: https://github.com/PyFlightCoach/FlightData
 Author: Thomas David
@@ -10,8 +10,8 @@ License-File: LICENSE
 Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: simplejson
-Requires-Dist: pfc-geometry>=0.2.4
-Requires-Dist: ardupilot-log-reader>=0.2.1
+Requires-Dist: pfc-geometry>=0.2.5
+Requires-Dist: ardupilot-log-reader>=0.3.1
 
 ## FlightData
 This repo is contains a set of datastructures and tools for handling flight log data.
@@ -19,7 +19,6 @@ This repo is contains a set of datastructures and tools for handling flight log
 ### Flight 
 The Flight object represents the data logged by a flight controller. The class wraps a pandas dataframe which is indexed on a single time axis. Where data is logged at different rates for different sensors it is mapped to the closest time index. Attribute access provides individual columns or sets of columns in the groups defined in Fields. Item access subsets the data in the time axis. 
 
-
 ### Table
 The Table is the base type for most of the datastructures. It allows attribute access to individual columns. Attribute access is also available to return basic entities subclassed from the base type in the pfc-geometry package. For example in the state object table.x provides the x position, table.pos provides a Point representing the xyz position. columns that are not represented by geometric base types are considered to be labels for the data.
 

{flightdata-0.2.6 → flightdata-0.2.8}/README.md

@@ -4,7 +4,6 @@ This repo is contains a set of datastructures and tools for handling flight log
 ### Flight 
 The Flight object represents the data logged by a flight controller. The class wraps a pandas dataframe which is indexed on a single time axis. Where data is logged at different rates for different sensors it is mapped to the closest time index. Attribute access provides individual columns or sets of columns in the groups defined in Fields. Item access subsets the data in the time axis. 
 
-
 ### Table
 The Table is the base type for most of the datastructures. It allows attribute access to individual columns. Attribute access is also available to return basic entities subclassed from the base type in the pfc-geometry package. For example in the state object table.x provides the x position, table.pos provides a Point representing the xyz position. columns that are not represented by geometric base types are considered to be labels for the data.
 

flightdata-0.2.8/flightdata/base/labeling.py

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

{flightdata-0.2.6 → flightdata-0.2.8}/flightdata/base/table.py

@@ -9,13 +9,9 @@ from numbers import Number
 from time import time
 
 
-def make_time(tab):
-    return Time.from_t(tab.t)
-    
-    
 class Table:
     constructs = Constructs([
-        SVar("time", Time,        ["t", "dt"]               , make_time )
+        SVar("time", Time, ["t", "dt"], lambda tab: Time.from_t(tab.t))
     ])
 
     def __init__(self, data: pd.DataFrame, fill=True, min_len=1):
@@ -25,13 +21,11 @@ class Table:
         self.label_cols = [c for c in data.columns if c not in self.constructs.cols()]
     
         self.data = data
-
-        self.data.index = self.data.index - self.data.index[0]
+        #self.data.index = self.data.index - self.data.index[0]
         
         if fill:
             missing = self.constructs.missing(self.data.columns)
-            for svar in missing:
-                
+            for svar in missing:                
                 newdata = svar.builder(self).to_pandas(
                     columns=svar.keys, 
                     index=self.data.index
@@ -75,15 +69,18 @@ class Table:
         return self.data.index[-1] - self.data.index[0]
     
     def __getitem__(self, sli):
-        if isinstance(sli, Number):
+        if isinstance(sli, slice):
+            return self.__class__(self.data.loc[slice(sli.start + self.data.index[0], sli.stop + self.data.index[0], sli.step)])
+        elif isinstance(sli, Number):
             if sli<0:
                 return self.__class__(self.data.iloc[[int(sli)], :])
 
             return self.__class__(
-                self.data.iloc[self.data.index.get_indexer([sli], method="nearest"), :]
+                self.data.iloc[self.data.index.get_indexer([sli + self.data.index[0]], method="nearest"), :]
             )
+        else:
+            raise TypeError(f"Expected Number or slice, got {sli.__class__.__name__}")
         
-        return self.__class__(self.data.loc[sli])
 
     def slice_raw_t(self, sli):
         inds = self.data.reset_index(names="t2").set_index("t").loc[sli].t2.to_numpy()#set_index("t", drop=False).columns
@@ -176,13 +173,7 @@ class Table:
         return self.data.loc[:, self.label_cols]
 
     def remove_labels(self) -> Self:
-        return self.__class__(
-            self.data.drop(
-                self.label_keys, 
-                axis=1, 
-                errors="ignore"
-            )
-        )
+        return self.__class__(self.data.drop(self.label_keys, axis=1, errors="ignore"))
     
     def get_subset_df(self, **kwargs) -> pd.DataFrame:
         dfo = self.data
@@ -342,7 +333,6 @@ class Table:
         strdf = df.copy()
         strdf['indexer'] = strdf['indexer'].astype(int).astype(str)
         strdf  = strdf.stack().groupby(level=0).apply('_'.join)
-        strdf.loc[df.indexer==0] = df[0]
         return strdf.values
 
     @staticmethod

{flightdata-0.2.6 → flightdata-0.2.8}/flightdata/flight/flight.py

@@ -19,12 +19,10 @@ from geometry.testing import assert_almost_equal
 from pathlib import Path
 from time import time
 from json import load, dump
-from ardupilot_log_reader.reader import Ardupilot
 from flightdata.base.numpy_encoder import NumpyEncoder
-from flightdata.flight.fields import Fields
 from .ardupilot import flightmodes 
 from flightdata import Origin
-from scipy.signal import butter, filtfilt
+from numbers import Number
 
 
 class Flight:
@@ -34,30 +32,52 @@ class Flight:
         'ARSP', 'GPS', 'RCIN', 'RCOU', 'BARO', 'MODE', 
         'RPM', 'MAG', 'BAT', 'BAT2', 'VEL', 'ORGN', 'ESC', 'CURRENT']
     
-    def __init__(self, data: pd.DataFrame, parameters: list = None, origin: Origin = None, primary_pos_source='gps'):
+    def __init__(self, data: pd.DataFrame, parameters: pd.DataFrame = None, origin: Origin = None, primary_pos_source='gps'):
         self.data = data
         self.parameters = parameters
-        self.data.index = self.data.index - self.data.index[0]
-        self.data.index.name = 'time_index'
         self.origin = origin
         self.primary_pos_source = primary_pos_source
         
     def __getattr__(self, name):
+        if self.parameters is not None:
+            if name in self.parameters.parameter.unique():
+                df =  self.parameters.loc[self.parameters.parameter==name]
+                return df.loc[df.value != df.value.shift()]
         cols = getattr(fields, name)
         if cols is None:
             cols = [f for f in self.data.columns if f.startswith(name)]
             if len(cols) > 0:
                 return self.data[cols]
-        try:
-            if isinstance(cols, Field):
-                return self.data[cols.col]
-            else:
-                return self.data.loc[:, [f.col for f in cols if f.col in self.data.columns]]
-        except KeyError:
-            if isinstance(cols, Field):
-                cols = [cols]
-            return pd.DataFrame(data=np.empty((len(self), len(cols))),columns=[f.col for f in cols])
+        else:
+            try:
+                if isinstance(cols, Field):
+                    return self.data[cols.col]
+                else:
+                    return self.data.loc[:, [f.col for f in cols if f.col in self.data.columns]]
+            except KeyError:
+                if isinstance(cols, Field):
+                    cols = [cols]
+                return pd.DataFrame(data=np.empty((len(self), len(cols))),columns=[f.col for f in cols])
+        raise AttributeError(f"'Flight' object has no attribute '{name}'")
+    
+    def make_param_labels(self, pname: str, prefix:str=None, suffix:str=None, unknown=''):
+        '''Make a series with the parameter values at the correct times.'''
+        ser = pd.Series(np.nan, index=self.data.index, name=pname)
+        param = getattr(self, pname)
+        ser.iloc[ser.index.get_indexer(param.index, 'nearest')] = param.value
+        ser = ser.ffill()
         
+        if prefix or suffix:
+            sout = pd.Series(unknown, index=self.data.index, name=pname)
+            sout[~np.isnan(ser)] = (prefix or '') + ser[~np.isnan(ser)].astype(str) + (suffix or '')
+            return sout
+        else:
+            return ser
+
+    def make_param_df(self, pnames: list[str]):
+        '''Make a dataframe of parameter values'''
+        return pd.DataFrame([self.make_param_labels(p) for p in pnames]).T
+
     def contains(self, name: Union[str, list[str]]):
         cols = getattr(fields, name)
         if isinstance(cols, Field):
@@ -65,35 +85,55 @@ class Flight:
         else:
             return [f.column in self.data.columns for f in cols]
                 
-    def __getitem__(self, sli) -> Self:
-        if isinstance(sli, int) or isinstance(sli, float):
-            return self.data.iloc[self.data.index.get_loc(sli)]
+    def __getitem__(self, sli: Number | slice) -> Flight:
+        if isinstance(sli, Number):
+            if sli < 0:
+                return self.data.iloc[sli]
+            else:
+                gl = self.data.index.get_loc(sli + self.data.index[0])
+                return Flight(
+                    self.data.iloc[gl],
+                    self.parameters.loc[:gl],
+                )
+        elif isinstance(sli, slice):
+            return Flight(
+                self.data.loc[slice(
+                    None if sli.start is None else sli.start + self.data.index[0],
+                    None if sli.stop is None else sli.stop + self.data.index[0],
+                    sli.step
+                )], 
+                self.parameters.loc[:None if sli.stop is None else sli.stop + self.data.index[0]], 
+                self.origin, self.primary_pos_source
+            )
         else:
-            return Flight(self.data.loc[sli], self.parameters, self.origin, self.primary_pos_source)
+            raise TypeError(f'Expected a number or a slice, got a {sli.__class__.__name__}')
 
     def __len__(self):
         return len(self.data)
 
-    def slice_raw_t(self, sli):
+    def slice_raw_t(self, sli: Number | slice) -> Flight:
+        def opp(df: pd.DataFrame, indexer: Number | slice):
+            return df.reset_index(drop=True) \
+                .set_index('time_actual', drop=False) \
+                    .loc[indexer].set_index("time_flight", drop=False)
+            
         return Flight(
-            self.data.reset_index(drop=True)
-                .set_index('time_actual', drop=False)
-                    .loc[sli].set_index("time_flight", drop=False), 
-            self.parameters, self.origin, self.primary_pos_source
+            opp(self.data, sli),
+            opp(self.parameters, slice(None, sli if isinstance(sli, Number) else sli.stop, None)),
+            self.origin, self.primary_pos_source
         )
         
-    def slice_time_flight(self, sli):
+    def slice_time_flight(self, sli) -> Flight:
         return Flight(
-            self.data.reset_index(drop=True)
-                .set_index('time_flight', drop=False)
-                    .loc[sli], 
-            self.parameters, self.origin, self.primary_pos_source
+            self.data.loc[sli], 
+            self.parameters.loc[:sli if isinstance(sli, Number) else sli.stop], 
+            self.origin, self.primary_pos_source
         )
         
-    def copy(self, **kwargs):
+    def copy(self, **kwargs) -> Flight:
         return Flight(
             kwargs['data'] if 'data' in kwargs else self.data.copy() ,
-            kwargs['parameters'] if 'parameters' in kwargs else self.parameters.copy() if self.parameters else None,
+            kwargs['parameters'] if 'parameters' in kwargs else self.parameters.copy() if self.parameters is not None else None,
             kwargs['origin'] if 'origin' in kwargs else self.origin.copy(),
             kwargs['primary_pos_source'] if 'primary_pos_source' in kwargs else self.primary_pos_source
         )
@@ -101,16 +141,16 @@ class Flight:
     def to_dict(self):
         return {
             'data': self.data.to_dict('list'),
-            'parameters': self.parameters,
+            'parameters': self.parameters.to_dict('list'),
             'origin': self.origin.to_dict(),
             'primary_pos_source': self.primary_pos_source
         }
     
     @staticmethod
-    def from_dict(data: dict):
+    def from_dict(data: dict) -> Flight:
         return Flight(
             data=pd.DataFrame.from_dict(data['data']).set_index('time_flight', drop=False),
-            parameters=data['parameters'],
+            parameters=pd.DataFrame.from_dict(data['parameters']).set_index('time_flight', drop=False),
             origin=Origin.from_dict(data['origin']),
             primary_pos_source=data['primary_pos_source']
         )
@@ -125,7 +165,7 @@ class Flight:
         return Flight.from_dict(load(open(file, 'r')))
 
     @staticmethod
-    def build_cols(**kwargs):
+    def build_cols(**kwargs) -> pd.DataFrame:
         df = pd.DataFrame(columns=list(fields.data.keys()))
         for k, v in kwargs.items():
             df[k] = v
@@ -150,7 +190,7 @@ class Flight:
                     otf, 
                     fl.data.reset_index(), 
                     on='time_actual'
-                ).set_index('time_index', drop=False)
+                ).set_index('time_flight', drop=False)
             ))
 
         return flos
@@ -172,7 +212,7 @@ class Flight:
 
     @property
     def duration(self):
-        return self.data.tail(1).index.item()
+        return self.data.iloc[-1].name - self.data.iloc[0].name
 
     def flying_only(self, minalt=5, minv=10):
         vs = abs(Point(self.velocity))
@@ -194,29 +234,37 @@ class Flight:
             pd.testing.assert_frame_equal(self.data, other.data)
             assert_almost_equal(self.origin.pos, other.origin.pos)
             assert self.origin.heading == other.origin.heading
+            pd.testing.assert_frame_equal(self.parameters, other.parameters)
             return True
-        except Exception as ex:
+        except Exception:
             return False
         
     @staticmethod
     def from_log(log:Union[Ardupilot, str], extra_types: list[str] = None, **kwargs) -> Flight:
         """Constructor from an ardupilot bin file."""
-        
+        from ardupilot_log_reader.reader import Ardupilot
         extra_types = [] if extra_types is None else extra_types
         
         if isinstance(log, str) or isinstance(log, Path):
-            parser = Ardupilot(str(log), types=list(set(Flight.ardupilot_types + extra_types)))
+            parser = Ardupilot.parse(str(log), types=list(set(Flight.ardupilot_types + extra_types)))
         else:
             parser = log
-
-        if parser.parms['AHRS_EKF_TYPE'] == 2:
+        
+        params = Flight.build_cols(
+            time_actual = parser.PARM.timestamp,
+            time_flight = parser.PARM.TimeUS / 1e6,
+            parameter = parser.PARM.Name,
+            value = parser.PARM.Value
+        ).set_index('time_flight', drop=False)
+       
+        if params.loc[params.parameter=='AHRS_EKF_TYPE'].iloc[0].value == 2:
             ekf1 = 'NKF1'
             ekf2 = 'NKF2'
         else:
             ekf1 = 'XKF1'
             ekf2 = 'XKF2'
 
-        ekf1 = parser.dfs[ekf1] if ekf1 in parser.dfs else  None
+        ekf1 = parser.dfs[ekf1] if ekf1 in parser.dfs else None
         ekf2 = parser.dfs[ekf2] if ekf2 in parser.dfs else None
 
         dfs = []
@@ -262,13 +310,13 @@ class Flight:
             }, 'C')
         if 'RATE' in parser.dfs:
             dfs.append(Flight.build_cols(
-                time_actual = parser.rate.timestamp,
-                axisrate_roll = parser.rate.R,
-                axisrate_pitch = parser.rate.P,
-                axisrate_yaw = parser.rate.Y,
-                desrate_roll = parser.rate.RDes,
-                desrate_pitch = parser.rate.PDes,
-                desrate_yaw = parser.rate.YDes,
+                time_actual = parser.RATE.timestamp,
+                axisrate_roll = parser.RATE.R,
+                axisrate_pitch = parser.RATE.P,
+                axisrate_yaw = parser.RATE.Y,
+                desrate_roll = parser.RATE.RDes,
+                desrate_pitch = parser.RATE.PDes,
+                desrate_yaw = parser.RATE.YDes,
             ))
         
         if 'IMU' in parser.dfs:
@@ -383,7 +431,7 @@ class Flight:
         
         origin = Origin('ekf_origin', GPS(parser.ORGN.iloc[:,-3:]), 0)
         
-        return Flight(dfout.set_index('time_flight', drop=False), parser.parms, origin, ppsorce)
+        return Flight(dfout.set_index('time_flight', drop=False), params, origin, ppsorce)
 
     @staticmethod
     def parse_instances(indf: pd.DataFrame, colmap:dict[str, str], instancecol='Instance'):
@@ -451,6 +499,7 @@ class Flight:
         )
 
     def filter(self, b, a):
+        from scipy.signal import filtfilt
         dont_filter = [c for c in fields.get_cols(['time', 'flightmode', 'rcin', 'rcout']) if c in self.data.columns]
         unwrap_cols = [c for c in fields.get_cols(['attitude']) if c in self.data.columns]
 
@@ -468,6 +517,7 @@ class Flight:
         )
     
     def butter_filter(self, cutoff, order=5):
+        from scipy.signal import butter
         ts = self.time_flight.to_numpy()
         N = len(self)
         T = (ts[-1] - ts[0]) / N

flightdata-0.2.8/flightdata/flight/parameters.py

@@ -0,0 +1,12 @@
+import numpy as np
+import pandas as pd
+from dataclasses import dataclass
+
+
+@dataclass
+class Parameters:
+    parms: dict[str, pd.DataFrame]
+
+    def __getattr(self, name: str) -> np.Any:
+        return self.parms[name]
+    

{flightdata-0.2.6 → flightdata-0.2.8}/flightdata/state.py

@@ -103,16 +103,16 @@ class State(Table):
         time = g.Time.from_t(np.array(flight.data.time_flight))
 
         if all(flight.contains('gps')) and flight.primary_pos_source == 'gps':
-            pos = origin.rotation.transform_point(g.GPS(flight.gps) - origin.pos[0])
+            pos = origin.rotation.transform_point(g.GPS(flight.gps.ffill().bfill()) - origin.pos[0])
         else: 
             pos = origin.rotation.transform_point(
-                flight.origin.pos.offset(g.Point(flight.position)) - origin.pos[0]
+                flight.origin.pos.offset(g.Point(flight.position.ffill().bfill())) - origin.pos[0]
             )
         
-        att = origin.rotation * g.Euler(flight.attitude) 
-        vel =  att.inverse().transform_point(origin.rotation.transform_point(g.Point(flight.velocity))) if all(flight.contains('velocity')) else None
-        rvel = g.Point(flight.axisrate) if all(flight.contains('axisrate')) else None
-        acc = g.Point(flight.acceleration) if all(flight.contains('acceleration')) else None
+        att = origin.rotation * g.Euler(flight.attitude.ffill().bfill()) 
+        vel =  att.inverse().transform_point(origin.rotation.transform_point(g.Point(flight.velocity.ffill().bfill()))) if all(flight.contains('velocity')) else None
+        rvel = g.Point(flight.axisrate.ffill().bfill()) if all(flight.contains('axisrate')) else None
+        acc = g.Point(flight.acceleration.ffill().bfill()) if all(flight.contains('acceleration')) else None
         
         return State.from_constructs(time, pos, att, vel, rvel, acc)
 
@@ -123,7 +123,7 @@ class State(Table):
         radius=5, mirror=True,
         weights = g.Point(1,1.2,0.5),
         tp_weights = g.Point(0.6,0.6,0.6),
-    ) -> Tuple(float, Self):
+    ) -> Tuple[float, Self]:
         """Perform a temporal alignment between two sections. return the flown section with labels 
         copied from the template along the warped path. 
         """
@@ -147,8 +147,6 @@ 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:
             """label the manoeuvres in a State based on the flight coach splitter information
 

{flightdata-0.2.6 → flightdata-0.2.8}/flightdata.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flightdata
-Version: 0.2.6
+Version: 0.2.8
 Summary: Module for handling UAV flight log data
 Home-page: https://github.com/PyFlightCoach/FlightData
 Author: Thomas David
@@ -10,8 +10,8 @@ License-File: LICENSE
 Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: simplejson
-Requires-Dist: pfc-geometry>=0.2.4
-Requires-Dist: ardupilot-log-reader>=0.2.1
+Requires-Dist: pfc-geometry>=0.2.5
+Requires-Dist: ardupilot-log-reader>=0.3.1
 
 ## FlightData
 This repo is contains a set of datastructures and tools for handling flight log data.
@@ -19,7 +19,6 @@ This repo is contains a set of datastructures and tools for handling flight log
 ### Flight 
 The Flight object represents the data logged by a flight controller. The class wraps a pandas dataframe which is indexed on a single time axis. Where data is logged at different rates for different sensors it is mapped to the closest time index. Attribute access provides individual columns or sets of columns in the groups defined in Fields. Item access subsets the data in the time axis. 
 
-
 ### Table
 The Table is the base type for most of the datastructures. It allows attribute access to individual columns. Attribute access is also available to return basic entities subclassed from the base type in the pfc-geometry package. For example in the state object table.x provides the x position, table.pos provides a Point representing the xyz position. columns that are not represented by geometric base types are considered to be labels for the data.
 

{flightdata-0.2.6 → flightdata-0.2.8}/flightdata.egg-info/SOURCES.txt

@@ -15,6 +15,7 @@ flightdata.egg-info/top_level.txt
 flightdata/base/__init__.py
 flightdata/base/collection.py
 flightdata/base/constructs.py
+flightdata/base/labeling.py
 flightdata/base/numpy_encoder.py
 flightdata/base/table.py
 flightdata/environment/__init__.py
@@ -24,6 +25,7 @@ flightdata/flight/__init__.py
 flightdata/flight/ardupilot.py
 flightdata/flight/fields.py
 flightdata/flight/flight.py
+flightdata/flight/parameters.py
 flightdata/model/__init__.py
 flightdata/model/aerodynamic.py
 flightdata/model/thrust.py

flightdata-0.2.8/flightdata.egg-info/requires.txt

@@ -0,0 +1,5 @@
+numpy
+pandas
+simplejson
+pfc-geometry>=0.2.5
+ardupilot-log-reader>=0.3.1

{flightdata-0.2.6 → flightdata-0.2.8}/scripts/flightline.py

@@ -1,14 +1,16 @@
 from flightdata import Flight, Origin
 from geometry import GPS
 from pathlib import Path
-import numpy as np
 import argparse
 
 
 def box_from_log(log: Flight, channel: int):
     c6on = Flight(log.data.loc[log.data[f'rcin_c{channel}']>=1500])
-    groups = np.cumsum(c6on.time_flight.diff() >=1)
-    return Origin.from_points("new", GPS(c6on.gps[groups==0])[-1], GPS(c6on.gps[groups==1])[-1])
+    groups = (c6on.time_flight.diff() > 1).cumsum()
+    pilot = Flight(c6on.data.loc[groups==0])
+    centre = Flight(c6on.data.loc[groups==1])
+
+    return Origin.from_points("new", GPS(pilot.gps)[-1], GPS(centre.gps)[-1])
 
 def box_from_logs(pilot: Flight, centre: Flight):
     return Origin.from_points("new", GPS(*pilot.gps.iloc[-1]), GPS(*centre.gps.iloc[-1]))

{flightdata-0.2.6 → flightdata-0.2.8}/setup.cfg

@@ -5,7 +5,7 @@ author_email = thomasdavid0@gmail.com
 description = Module for handling UAV flight log data
 long_description = file: README.md
 long_description_content_type = text/markdown
-version = 0.2.6
+version = 0.2.8
 url = https://github.com/PyFlightCoach/FlightData
 
 [options]
@@ -19,8 +19,8 @@ install_requires =
 	numpy
 	pandas
 	simplejson
-	pfc-geometry >=0.2.4
-	ardupilot-log-reader >=0.2.1
+	pfc-geometry >=0.2.5
+	ardupilot-log-reader >=0.3.1
 
 [egg_info]
 tag_build = 

{flightdata-0.2.6 → flightdata-0.2.8}/test/test_flight.py

@@ -9,19 +9,18 @@ from ardupilot_log_reader import Ardupilot
 
 @fixture(scope='session')
 def parser():
-    return Ardupilot('test/test_inputs/00000137.BIN',
-                     types=Flight.ardupilot_types)
+    return Ardupilot.parse('test/data/p23.BIN',types=Flight.ardupilot_types)
 
 @fixture(scope='session')
-def fl():
-    return Flight.from_log('test/test_inputs/00000137.BIN')
+def fl(parser):
+    return Flight.from_log(parser)
 
 @fixture(scope='session')
 def fcj():
-    return Flight.from_fc_json('test/test_inputs/00000137.json')
+    return Flight.from_fc_json('test/data/p23_fc.json')
 
 def test_duration(fl):
-    assert fl.duration == approx(685, rel=1e-3)
+    assert fl.duration == approx(687, rel=1e-3)
 
 def test_slice(fl):
     short_flight = fl[100:200]
@@ -31,8 +30,7 @@ def test_to_from_dict(fl):
     data = fl.to_dict()
     fl2 = Flight.from_dict(data)
     assert fl == fl2
-    assert fl2.parameters == approx(fl.parameters)
-
+    
 def test_from_fc_json(fcj):
     assert isinstance(fcj, Flight)
     assert fcj.duration > 200
@@ -101,3 +99,19 @@ def test_butter_filter(fl: Flight):
 def test_remove_time_flutter(fl: Flight):
     flf = fl.remove_time_flutter()
     assert np.gradient(np.gradient(flf.data.index)) == approx(0)
+
+
+def test_get_parameter_attr(fl: Flight):
+    assert fl.AHRS_EKF_TYPE.iloc[0].value == 3
+
+def test_make_param_labels(fl: Flight):
+    col = fl.make_param_labels('AHRS_EKF_TYPE')
+
+    assert len(col) == len(fl)  
+    assert np.all(col.loc[~np.isnan(col)] == 3)
+
+
+    col = fl.make_param_labels('AHRS_EKF_TYPE', 'Test')
+
+    assert np.all(col.loc[col!=''] == 'Test3.0')
+

{flightdata-0.2.6 → flightdata-0.2.8}/test/test_origin.py

@@ -1,7 +1,7 @@
 import unittest
 from flightdata import Origin
 from geometry import GPS
-from pytest import approx
+from pytest import approx, mark
 from .conftest import flight
 
 
@@ -11,7 +11,7 @@ def test_to_dict(flight):
     assert di["name"] ==  "origin"
     assert di["pos"]['lat'] == origin.pos.lat[0]
 
-
+@mark.skip('writes to file rather than returns string now')
 def test_to_f3azone(origin):
     zone_string = origin.to_f3a_zone()
     lines = zone_string.split("\n")

flightdata-0.2.6/flightdata.egg-info/requires.txt

@@ -1,5 +0,0 @@
-numpy
-pandas
-simplejson
-pfc-geometry>=0.2.4
-ardupilot-log-reader>=0.2.1