pfc-geometry 0.2.0__tar.gz → 0.2.1__tar.gz

{pfc_geometry-0.2.0 → pfc_geometry-0.2.1}/PKG-INFO

@@ -1,12 +1,15 @@
 Metadata-Version: 2.1
 Name: pfc_geometry
-Version: 0.2.0
+Version: 0.2.1
 Summary: A package for handling 3D geometry with a nice interface
 Home-page: https://github.com/PyFlightCoach/geometry
 Author: Thomas David
 Author-email: thomasdavid0@gmail.com
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: setuptools
+Requires-Dist: numpy
+Requires-Dist: pandas
 
 # geometry #
 

{pfc_geometry-0.2.0 → pfc_geometry-0.2.1}/geometry/base.py

@@ -72,7 +72,8 @@ class Base:
                 self.data = self.__class__._clean_data(np.array(args).T)
             elif all(isinstance(arg, list) for arg in args):
                 self.data = self.__class__._clean_data(np.array(args).T)
-
+            elif all(isinstance(arg, pd.Series) for arg in args):
+                self.data = self.__class__._clean_data(np.array(pd.concat(args, axis=1)))
             else:
                 raise TypeError
         else:
@@ -219,7 +220,7 @@ class Base:
         assert len(dt) == len(self)
         return self.__class__(
             np.gradient(self.data,axis=0) \
-                 / \
+                / \
                 np.tile(dt, (len(self.__class__.cols),1)).T)
 
     def to_pandas(self, prefix='', suffix='', columns=None, index=None):
@@ -284,4 +285,37 @@ class Base:
     
 
     def unwrap(self, discont=np.pi):
-        return self.__class__(np.unwrap(self.data, discont=discont, axis=0))
+        return self.__class__(np.unwrap(self.data, discont=discont, axis=0))
+    
+    def filter(self, order, cutoff, ts: np.ndarray=None):
+        from scipy.signal import butter, freqz, filtfilt
+        if ts is None:
+            ts = np.array(range(len(self)))
+        N = len(self)
+        T = (ts[-1] - ts[0]) / N
+
+        fs = 1/T
+        b, a = butter(
+            order,
+            cutoff,
+            fs=fs,
+            btype='low', analog=False
+        )
+
+        return self.__class__(filtfilt(b, a, self.data, axis=0))
+    
+    def fft(self, ts: np.ndarray=None):
+        from scipy.fft import fft, fftfreq
+        if ts is None:
+            ts = np.array(range(len(self)))
+        N = len(self)
+        T = (ts[-1] - ts[0]) / N
+
+        yf = fft(self.data, axis=0)
+        xf = fftfreq(N, T)[:N//2]
+
+        
+        y=2.0/N * np.abs(yf[0:N//2, :])
+
+        return pd.DataFrame(np.column_stack([xf, y]), columns=['freq'] + self.cols).set_index('freq')
+

{pfc_geometry-0.2.0 → pfc_geometry-0.2.1}/geometry/mass.py

@@ -50,5 +50,14 @@ class Mass(Base):
             ])) 
         ) + self
 
+    def momentum(self, v: Point):
+        return self.m * v
+    
+    def angular_momentum(self, rvel: Point):
+        return Point(
+            self.xx * rvel.x + self.xy * rvel.y + self.xz * rvel.z,
+            self.yx * rvel.x + self.yy * rvel.y + self.yz * rvel.z,
+            self.zx * rvel.x + self.zy * rvel.y + self.zz * rvel.z,
+        )
+
 
-    

{pfc_geometry-0.2.0 → pfc_geometry-0.2.1}/geometry/quaternion.py

@@ -96,7 +96,8 @@ class Quaternion(Base):
         roll = np.arctan2(sinr_cosp, cosr_cosp)
 
         sinp = 2 * (self.w * self.y - self.z * self.x)
-        pitch = np.arcsin(sinp)
+        with np.errstate(invalid='ignore'):
+            pitch = np.arcsin(sinp)
                 
         siny_cosp = 2 * (self.w * self.z + self.x * self.y)
         cosy_cosp = 1 - 2 * (self.y * self.y + self.z * self.z)

{pfc_geometry-0.2.0 → pfc_geometry-0.2.1}/geometry/transformation.py

@@ -21,8 +21,16 @@ class Transformation(Base):
     def __init__(self, *args, **kwargs):
         if len(args) == len(kwargs) == 0:
             args = np.concatenate([P0().data,Q0().data],axis=1)
+        elif len(args) == 1:
+            if isinstance(args[0], Point):
+                args = np.concatenate([args[0].data,Q0().data],axis=1)
+            elif isinstance(args[0], Quaternion):
+                args = np.concatenate([P0().data,args[0].data],axis=1)
         if len(args) == 2:
-            args = np.concatenate([args[0].data, args[1].data], axis=1)
+            _q = args[0] if isinstance(args[0], Quaternion) else args[1]
+            _p = args[0] if isinstance(args[0], Point) else args[1]
+            assert isinstance(_q, Quaternion) and isinstance(_p, Point)
+            args = np.concatenate([_p.data, _q.data], axis=1)
         super().__init__(*args, **kwargs)
         self.p = Point(self.data[:,:3])
         self.q = Quaternion(self.data[:,3:])

{pfc_geometry-0.2.0 → pfc_geometry-0.2.1}/pfc_geometry.egg-info/PKG-INFO

@@ -1,12 +1,15 @@
 Metadata-Version: 2.1
 Name: pfc-geometry
-Version: 0.2.0
+Version: 0.2.1
 Summary: A package for handling 3D geometry with a nice interface
 Home-page: https://github.com/PyFlightCoach/geometry
 Author: Thomas David
 Author-email: thomasdavid0@gmail.com
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: setuptools
+Requires-Dist: numpy
+Requires-Dist: pandas
 
 # geometry #
 

{pfc_geometry-0.2.0 → pfc_geometry-0.2.1}/setup.cfg

@@ -5,7 +5,7 @@ author_email = thomasdavid0@gmail.com
 description = A package for handling 3D geometry with a nice interface
 long_description = file: README.md
 long_description_content_type = text/markdown
-version = 0.2.0
+version = 0.2.1
 url = https://github.com/PyFlightCoach/geometry
 
 [options]

{pfc_geometry-0.2.0 → pfc_geometry-0.2.1}/tests/test_base.py

@@ -208,4 +208,10 @@ def test_repr__():
     p = ABC(1,2,3)
     rpr = p.__repr__()
     assert rpr == "ABC(a_=1.0 b_=2.0 c_=3.0, len=1)"
-    
+    
+
+def test_three_pandas_series():
+    df = pd.DataFrame(np.random.random((10,3)), columns=list("abc"))
+    abc = ABC(df.a, df.b, df.c)
+
+    pd.testing.assert_frame_equal(abc.to_pandas(), df)