pfc-geometry 0.2.2__tar.gz → 0.2.4__tar.gz

{pfc_geometry-0.2.2 → pfc_geometry-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pfc_geometry
-Version: 0.2.2
+Version: 0.2.4
 Summary: A package for handling 3D geometry with a nice interface
 Home-page: https://github.com/PyFlightCoach/geometry
 Author: Thomas David
@@ -22,6 +22,9 @@ Magic methods are used extensively and the function of operators are logical for
 Many convenience methods and constructors are available. Documentation is limited but if you need something it has probably already been written so check the code first. 
 
 
-now available on pypi:
+Some examples are available here: https://pfcdocumentation.readthedocs.io/pyflightcoach/geometry.html
 
-pip install pfc-geometry
+now available on pypi:
+```bash
+    pip install pfc-geometry
+```

{pfc_geometry-0.2.2 → pfc_geometry-0.2.4}/README.md

@@ -9,6 +9,9 @@ Magic methods are used extensively and the function of operators are logical for
 Many convenience methods and constructors are available. Documentation is limited but if you need something it has probably already been written so check the code first. 
 
 
-now available on pypi:
+Some examples are available here: https://pfcdocumentation.readthedocs.io/pyflightcoach/geometry.html
 
-pip install pfc-geometry
+now available on pypi:
+```bash
+    pip install pfc-geometry
+```

{pfc_geometry-0.2.2 → pfc_geometry-0.2.4}/geometry/base.py

@@ -10,8 +10,7 @@ You should have received a copy of the GNU General Public License along with
 this program. If not, see <http://www.gnu.org/licenses/>.
 """
 
-from typing import Type, List, Self
-from typing_extensions import Self
+from typing import Self
 import numpy as np
 import numpy.typing as npt
 import pandas as pd
@@ -171,6 +170,10 @@ class Base:
     def __len__(self) -> int:
         return self.data.shape[0]
 
+    @property
+    def ends(self) -> Self:
+        return self.__class__(self.data[[0,-1], :])
+
     @dprep
     def __eq__(self, other):
         return np.all(self.data == other)
@@ -234,7 +237,7 @@ class Base:
                 np.tile(dt, (len(self.__class__.cols),1)).T)
 
     def to_pandas(self, prefix='', suffix='', columns=None, index=None):
-        if not columns is None:
+        if columns is not None:
             cols = columns
         else:
             cols = [prefix + col + suffix for col in self.__class__.cols]
@@ -318,10 +321,10 @@ class Base:
         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
+        N = len(self)*2
+        T = (ts[-1] - ts[0]) / len(self)
 
-        yf = fft(self.data, axis=0)
+        yf = fft(self.data, axis=0, n=N)
         xf = fftfreq(N, T)[:N//2]
 
         

{pfc_geometry-0.2.2 → pfc_geometry-0.2.4}/geometry/quaternion.py

@@ -10,18 +10,16 @@ You should have received a copy of the GNU General Public License along with
 this program. If not, see <http://www.gnu.org/licenses/>.
 """
 from __future__ import annotations
-from .point import Point, P0
+from .point import Point
 from .base import Base
 from geometry import PZ
-from typing import Union, Tuple
 import numpy as np
-import pandas as pd
 import numpy.typing as npt
+import pandas as pd
 from warnings import warn
 from numbers import Number
 
 
-
 class Quaternion(Base):
     cols=["w", "x", "y", "z"]
 
@@ -46,7 +44,7 @@ class Quaternion(Base):
     def inverse(self):
         return self.conjugate().norm()
 
-    def __mul__(self, other: Union[Number, Quaternion, np.ndarray]) -> Quaternion:
+    def __mul__(self, other: Number | Quaternion | npt.NDArray) -> Quaternion:
         if isinstance(other, Quaternion):
             a, b = Quaternion.length_check(self, Quaternion.type_check(other))
             w = a.w * b.w - a.axis.dot(b.axis)
@@ -181,7 +179,7 @@ class Quaternion(Base):
     def body_rotate(self, rate: Point) -> Quaternion:
         return (self * Quaternion.from_axis_angle(rate)).norm()
 
-    def diff(self, dt: Union[Number, np.ndarray]) -> Point:
+    def diff(self, dt: Number | npt.NDArray) -> Point:
         """differentiate in the world frame"""
         if not pd.api.types.is_list_like(dt):
             dt = np.full(len(self), dt)
@@ -194,7 +192,7 @@ class Quaternion(Base):
         ) / dt[:-1]
         return Point(np.vstack([ps.data, ps.data[-1,:]]))
 
-    def body_diff(self, dt: Union[Number, np.ndarray]) -> Point:
+    def body_diff(self, dt: Number | npt.NDArray) -> Point:
         """differentiate in the body frame"""
         if not pd.api.types.is_list_like(dt):
             dt = np.full(len(self), dt)

{pfc_geometry-0.2.2 → pfc_geometry-0.2.4}/geometry/time.py

@@ -13,7 +13,11 @@ class Time(Base):
         if isinstance(t, Number):
             return Time(t, 1/30)
         else:
-            dt = np.array([1/30]) if len(t) == 1 else np.gradient(t)
+            if len(t) == 1:
+                dt = np.array([1/30]) 
+            else:
+                arr = np.diff(t)
+                dt = np.concatenate([arr, [arr[-1]]])
             return Time(t, dt)
 
     def scale(self, duration) -> Self:

{pfc_geometry-0.2.2 → pfc_geometry-0.2.4}/geometry/transformation.py

@@ -9,10 +9,11 @@ FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 You should have received a copy of the GNU General Public License along with
 this program. If not, see <http://www.gnu.org/licenses/>.
 """
-from geometry import Base, Point, Quaternion, Point, P0, Q0, Coord
+from geometry import Base, Point, Quaternion, P0, Q0, Coord
 
 import numpy as np
-from typing import Union, Self
+from typing import Union
+from typing import Self
 
 
 class Transformation(Base):

{pfc_geometry-0.2.2 → pfc_geometry-0.2.4}/pfc_geometry.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
-Name: pfc-geometry
-Version: 0.2.2
+Name: pfc_geometry
+Version: 0.2.4
 Summary: A package for handling 3D geometry with a nice interface
 Home-page: https://github.com/PyFlightCoach/geometry
 Author: Thomas David
@@ -22,6 +22,9 @@ Magic methods are used extensively and the function of operators are logical for
 Many convenience methods and constructors are available. Documentation is limited but if you need something it has probably already been written so check the code first. 
 
 
-now available on pypi:
+Some examples are available here: https://pfcdocumentation.readthedocs.io/pyflightcoach/geometry.html
 
-pip install pfc-geometry
+now available on pypi:
+```bash
+    pip install pfc-geometry
+```

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

{pfc_geometry-0.2.2 → pfc_geometry-0.2.4}/tests/test_quaternion.py

@@ -6,8 +6,6 @@ from geometry import Euler, Euldeg
 from geometry.testing import assert_almost_equal
 import pandas as pd
 import numpy as np
-import quaternion
-from scipy.spatial.transform import Rotation as R
 
 
 
@@ -37,14 +35,6 @@ def test_mul():
         err_msg="failed to do Quaternions * Quaternions"
     )
 
-def test_from_euler():
-    parr = np.random.random((20, 3))
-
-    np.testing.assert_array_almost_equal(
-        Quaternion.from_euler(Point(parr)).xyzw,
-        R.from_euler('xyz', parr).as_quat()
-    )
-
 
 def test_from_euler_unwrap():    
     q = Q0(10).rotate(PZ()*np.radians(np.linspace(0,360, 10)))
@@ -54,17 +44,6 @@ def test_from_euler_unwrap():
     )
 
 
-def test_to_euler():
-    qarr = Quaternion(np.random.random((2, 4))).norm()
-    eulers = qarr.to_euler()
-    
-    checks = np.array([R.from_euler("xyz", eul.data[0]).as_quat() for eul in eulers])
-    
-    np.testing.assert_array_almost_equal(
-        checks,
-        qarr.xyzw
-    )
-
 
 def test_norm():
     qarr = Quaternion(np.random.random( (2,4)))