pfc-geometry 0.2.10__tar.gz → 0.2.11__tar.gz

{pfc_geometry-0.2.10/pfc_geometry.egg-info → pfc_geometry-0.2.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pfc-geometry
-Version: 0.2.10
+Version: 0.2.11
 Summary: A package for handling 3D geometry with a nice interface
 Author-email: Thomas David <thomasdavid0@gmail.com>
 License: GNU GPL v3

{pfc_geometry-0.2.10 → pfc_geometry-0.2.11}/geometry/base.py

@@ -353,3 +353,9 @@ class Base:
                 self.data,
             )).ffill().bfill().to_numpy()
         )
+
+    def ffill(self):
+        return self.__class__(pd.DataFrame(self.data).ffill().to_numpy())
+
+    def bfill(self):
+        return self.__class__(pd.DataFrame(self.data).bfill().to_numpy())

{pfc_geometry-0.2.10 → pfc_geometry-0.2.11}/geometry/coordinate_frame.py

@@ -9,7 +9,7 @@ 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 __future__ import annotations
 from geometry import Point, Quaternion, PX, PY, PZ, P0
 from typing import List
 import numpy as np
@@ -33,7 +33,7 @@ class Coord(Base):
         self.z_axis=Point(self.data[:,9:12])
     
     @staticmethod
-    def from_axes(o:Point, x:Point, y:Point, z:Point):
+    def from_axes(o:Point, x:Point, y:Point, z:Point) -> Coord:
         assert len(o) == len(x) == len(y) == len(z)
         return Coord(np.concatenate([
             o.data,
@@ -43,25 +43,25 @@ class Coord(Base):
         ],axis=1))
 
     @staticmethod
-    def zero(count=1):
+    def zero(count=1) -> Coord:
         return Coord.from_nothing(count)
 
     @staticmethod
-    def from_nothing(count=1):
+    def from_nothing(count=1) -> Coord:
         return Coord.from_axes(P0(count), PX(1,count), PY(1,count), PZ(1,count))
 
     @staticmethod
-    def from_xy(origin: Point, x_axis: Point, y_axis: Point):
+    def from_xy(origin: Point, x_axis: Point, y_axis: Point) -> Coord:
         z_axis = x_axis.cross(y_axis)
         return Coord.from_axes(origin, x_axis, z_axis.cross(x_axis), z_axis)
 
     @staticmethod
-    def from_yz(origin: Point, y_axis: Point, z_axis: Point):
+    def from_yz(origin: Point, y_axis: Point, z_axis: Point) -> Coord:
         x_axis = y_axis.cross(z_axis)
         return Coord.from_axes(origin, x_axis, y_axis, x_axis.cross(y_axis))
 
     @staticmethod
-    def from_zx(origin: Point, z_axis: Point, x_axis: Point):
+    def from_zx(origin: Point, z_axis: Point, x_axis: Point) -> Coord:
         y_axis = z_axis.cross(x_axis)
         return Coord.from_axes(origin, y_axis.cross(z_axis), y_axis, z_axis)
 
@@ -71,7 +71,7 @@ class Coord(Base):
     def inverse_rotation_matrix(self):
         return Quaternion.from_rotation_matrix(self.rotation_matrix()).inverse().to_rotation_matrix()
 
-    def rotate(self, rotation=Quaternion):
+    def rotate(self, rotation=Quaternion) -> Coord:
         return Coord.from_axes(
             self.origin,
             rotation.transform_point(self.x_axis),
@@ -82,7 +82,7 @@ class Coord(Base):
     def __eq__(self, other):
         return self.data == other.data
 
-    def translate(self, point):
+    def translate(self, point) -> Coord:
         return Coord.from_axes(self.origin + point, self.x_axis, self.y_axis, self.z_axis)
 
     def axes(self):

{pfc_geometry-0.2.10 → pfc_geometry-0.2.11}/geometry/point.py

@@ -14,6 +14,8 @@ from .base import Base
 import numpy as np
 import pandas as pd
 from warnings import warn
+from numbers import Number
+import numpy.typing as npt
 
 
 class Point(Base):
@@ -62,16 +64,16 @@ class Point(Base):
         return abs(Point.angles(self, p2))
     
     @staticmethod
-    def X(value=1, count=1):
-        return Point(np.tile([value,0,0], (count, 1)))
+    def X(value: Number | npt.NDArray=1, count=1):
+        return np.tile(value, count) * Point(1,0,0)
 
     @staticmethod
     def Y(value=1, count=1):
-        return Point(np.tile([0,value,0], (count, 1)))
+        return np.tile(value, count) * Point(0,1,0)
 
     @staticmethod
     def Z(value=1, count=1):
-        return Point(np.tile([0,0,value], (count, 1)))
+        return np.tile(value, count) * Point(0,0,1)
 
     def rotate(self, rmat=np.ndarray):
         if len(rmat.shape) == 3:
@@ -108,6 +110,9 @@ class Point(Base):
     def zeros(count=1):
         return Point(np.zeros((count,3)))
 
+    def bearing(self):
+        return np.arctan2(self.y, self.x)
+
 def Points(*args, **kwargs):
     warn("Points is deprecated, you can now just use Point", DeprecationWarning)
     return Point(*args, **kwargs)
@@ -136,7 +141,7 @@ def ppmeth(func):
 
 
 @ppmeth
-def cross(a, b) -> Point:
+def cross(a: Point, b: Point) -> Point:
     return Point(np.cross(a.data, b.data))
  
 

{pfc_geometry-0.2.10 → pfc_geometry-0.2.11}/geometry/quaternion.py

@@ -253,7 +253,10 @@ class Quaternion(Base):
         # does the rotation reverse the Z axis?
         return np.sign(self.transform_point(PZ()).z) > 0
 
-    
+    def bearing(self, p: Point=None):
+        if p is None:
+            p = Point.X()
+        return self.transform_point(p).bearing()
     
         
 

{pfc_geometry-0.2.10 → pfc_geometry-0.2.11/pfc_geometry.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pfc-geometry
-Version: 0.2.10
+Version: 0.2.11
 Summary: A package for handling 3D geometry with a nice interface
 Author-email: Thomas David <thomasdavid0@gmail.com>
 License: GNU GPL v3