flightdata 0.2.2__tar.gz → 0.2.3__tar.gz

{flightdata-0.2.2 → flightdata-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flightdata
-Version: 0.2.2
+Version: 0.2.3
 Summary: Module for handling UAV flight log data
 Home-page: https://github.com/PyFlightCoach/FlightData
 Author: Thomas David

{flightdata-0.2.2 → flightdata-0.2.3}/flightdata/base/__init__.py

@@ -1,4 +1,4 @@
-from .table import Time, Table, Constructs, SVar
+from .table import Table, Constructs, SVar
 from .collection import Collection
 from .numpy_encoder import NumpyEncoder
 

{flightdata-0.2.2 → flightdata-0.2.3}/flightdata/base/collection.py

@@ -48,11 +48,11 @@ class Collection:
     def to_list(self) -> List[T]:
         return list(self.data.values())
     
-    def to_dicts(self) -> list[dict[str, Any]]:
-        return [v.to_dict() for v in self.data.values()]
+    def to_dicts(self, *args, **kwargs) -> list[dict[str, Any]]:
+        return [v.to_dict(*args, **kwargs) for v in self.data.values()]
 
-    def to_dict(self) -> dict[str, dict[str, Any]]:
-        return {k: v.to_dict() for k, v in self.data.items()}
+    def to_dict(self, *args, **kwargs) -> dict[str, dict[str, Any]]:
+        return {k: v.to_dict(*args, **kwargs) for k, v in self.data.items()}
 
     @classmethod
     def from_dicts(cls, vals: list[dict[str: Any]]) -> Self:

{flightdata-0.2.2 → flightdata-0.2.3}/flightdata/base/table.py

@@ -2,44 +2,13 @@ from __future__ import annotations
 import numpy as np
 import pandas as pd
 import numpy.typing as npt
-from geometry import Base,  Point, Quaternion, Transformation
+from geometry import Base, Time
 from typing import Union, Self, Tuple
 from .constructs import SVar, Constructs
 from numbers import Number
-
 from time import time
 
 
-class Time(Base):
-    cols=["t", "dt"]
-    
-    @staticmethod
-    def from_t(t: np.ndarray) -> Self:
-        if isinstance(t, Number):
-            return Time(t, 1/30)
-        else:
-            dt = np.array([1/30]) if len(t) == 1 else np.gradient(t)
-            return Time(t, dt)
-
-    def scale(self, duration) -> Self:
-        old_duration = self.t[-1] - self.t[0]
-        sfac = duration / old_duration
-        return Time(
-            self.t[0] + (self.t - self.t[0]) * sfac,
-            self.dt * sfac
-        )
-
-    def reset_zero(self):
-        return Time(self.t - self.t[0], self.dt)
-
-    @staticmethod
-    def now():
-        return Time.from_t(time())
-
-    def extend(self):
-        return Time.concatenate([self, Time(self.t[-1] + self.dt[-1], self.dt[-1])])
-
-
 def make_time(tab):
     return Time.from_t(tab.t)
     
@@ -94,6 +63,8 @@ class Table:
     
     @classmethod
     def from_dict(Cls, data):
+        if ['data'] in data:
+            data = data['data']
         return Cls(pd.DataFrame.from_dict(data).set_index("t", drop=False))
 
     def __len__(self):

{flightdata-0.2.2 → flightdata-0.2.3}/flightdata/environment/environment.py

@@ -1,6 +1,6 @@
 
-from flightdata import Flight, Constructs, SVar, Table, Origin, Time
-from geometry import Point, Base, P0
+from flightdata import Flight, Constructs, SVar, Table, Origin
+from geometry import Point, Base, P0, Time
 import numpy as np
 from .wind import WindModel, WindModelBuilder
 

{flightdata-0.2.2 → flightdata-0.2.3}/flightdata/flow.py

@@ -1,6 +1,6 @@
 
-from flightdata import Table, Time, SVar, Constructs, SVar, Flight, Origin
-from geometry import Point, Base, PX, Euler
+from flightdata import Table, SVar, Constructs, SVar, Flight, Origin
+from geometry import Point, Base, PX, Euler, Time
 import numpy as np
 
 

{flightdata-0.2.2 → flightdata-0.2.3}/flightdata/model/aerodynamic.py

@@ -1,5 +1,5 @@
 '''Take a flow and a controls, return the aerodynamic forces and moments'''
-from flightdata import Time, Coefficients
+from flightdata import Coefficients
 from . import Model
 import numpy as np
 import geometry as g

{flightdata-0.2.2 → flightdata-0.2.3}/flightdata/state.py

@@ -6,7 +6,7 @@ import numpy as np
 import pandas as pd
 from pandas.api.types import is_list_like
 import geometry as g
-from flightdata import Table, Constructs, SVar, Time, Origin, Flow, Environment
+from flightdata import Table, Constructs, SVar, Origin, Flow, Environment
 
 
 class State(Table):
@@ -33,7 +33,7 @@ class State(Table):
         if transform is None:
             transform = g.Transformation()
         if not "time" in kwargs: 
-            kwargs["time"] = Time.from_t(np.linspace(0, State._construct_freq*len(transform), len(transform)))
+            kwargs["time"] = g.Time.from_t(np.linspace(0, State._construct_freq*len(transform), len(transform)))
         return State.from_constructs(pos=transform.p, att=transform.q, **kwargs)
 
     def body_to_world(self, pin: g.Point, rotation_only=False) -> g.Point:
@@ -56,7 +56,7 @@ class State(Table):
         else:
             return self.back_transform.g.Point(pin)
 
-    def fill(self, time: Time) -> State:
+    def fill(self, time: g.Time) -> State:
         '''Project forward through time assuming small angles and uniform circular motion'''
         st = self[-1]
         vel = st.vel.tile(len(time))   
@@ -73,7 +73,7 @@ class State(Table):
         """Extrapolate the input state assuming uniform circular motion and small angles
         """
         npoints = np.max([int(np.ceil(duration / self.dt[0])), min_len])
-        time = Time.from_t(np.linspace(0,duration, npoints))
+        time = g.Time.from_t(np.linspace(0,duration, npoints))
         return self.fill(time)
 
     @staticmethod
@@ -101,7 +101,7 @@ class State(Table):
         elif origin is None:
             origin = flight.origin
 
-        time = Time.from_t(np.array(flight.data.time_flight))
+        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])

{flightdata-0.2.2 → flightdata-0.2.3}/flightdata.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flightdata
-Version: 0.2.2
+Version: 0.2.3
 Summary: Module for handling UAV flight log data
 Home-page: https://github.com/PyFlightCoach/FlightData
 Author: Thomas David

{flightdata-0.2.2 → flightdata-0.2.3}/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.2
+version = 0.2.3
 url = https://github.com/PyFlightCoach/FlightData
 
 [options]