pfc-geometry 0.2.20__py3-none-any.whl → 0.2.22__py3-none-any.whl

geometry/__init__.py

@@ -18,7 +18,8 @@ from .gps import GPS
 from .coordinate_frame import Coord
 from .transformation import Transformation
 from .mass import Mass
-
+from .air import Air
+from .angles import wrap_to_pi
 
 def Euler(*args, **kwargs) -> Quaternion:
     return Quaternion.from_euler(Point(*args, **kwargs))

geometry/air.py

@@ -0,0 +1,20 @@
+from geometry.base import Base
+
+R = 287.058
+GAMMA = 1.4
+
+
+def get_rho(pressure, temperature):
+    return pressure / (R * temperature)
+
+
+class Air(Base):
+    cols = ["P", "T", "rho"]
+
+    @staticmethod
+    def iso_sea_level(length: int):
+        return Air(101325, 288.15, get_rho(101325, 288.15)).tile(length)
+
+    @staticmethod
+    def from_pt(pressure, temperature):
+        return Air(pressure, temperature, get_rho(pressure, temperature))

geometry/angles.py

@@ -16,4 +16,9 @@ def difference(a, b):
     bd=np.abs(d3) < np.abs(d1)
     d1[bd] = d3[bd]
 
-    return d1
+    return d1
+
+
+def wrap_to_pi(angles: npt.NDArray) -> npt.NDArray:
+    """Wrap angles to the range [-pi, pi]."""
+    return (angles + np.pi) % (2 * np.pi) - np.pi

geometry/base.py

@@ -265,9 +265,11 @@ class Base:
         if not pd.api.types.is_list_like(dt):
             dt = np.full(len(self), dt)
         self, dt = Base.length_check(self, dt)
-        diff_method = np.gradient if method == "gradient" else np.diff
+        if method=="gradient":
+            data = np.gradient(self.data, axis=0) if len(self) >1 else np.zeros(self.data.shape)
+        else:
+            data = np.diff(self.data, axis=0)
 
-        data = diff_method(self.data, axis=0)
         dt = dt if method == "gradient" else dt[:-1]
         return self.__class__(data / np.tile(dt, (len(self.__class__.cols), 1)).T)
 

geometry/coordinate_frame.py

@@ -88,7 +88,7 @@ class Coord(Base):
     def axes(self):
         return Point.concatenate([self.x_axis, self.y_axis, self.z_axis])
 
-    def plot(self, fig=None, scale=1, label: str = None):
+    def plot(self, fig=None, scale=1, width=2, label: str = None):
         import plotly.graph_objects as go
         if fig is None:
             fig = go.Figure(layout=dict(scene=dict(aspectmode="data")))
@@ -105,6 +105,7 @@ class Coord(Base):
                 mode="markers",
                 name="Origin",
                 marker=dict(size=5, color="black"),
+                showlegend=False
             )
         )
         colors = ["red", "green", "blue"]
@@ -116,7 +117,8 @@ class Coord(Base):
                     z=[self.origin.z[0], (self.origin.z + axis.z * scale)[0]],
                     mode="lines",
                     name=f"{label or 'Axis'} {Point.cols[i]}",
-                    line=dict(width=2, color=colors.pop(0))
+                    line=dict(width=width, color=colors.pop(0)),
+                    showlegend=False
                 )
             )
         return fig

geometry/point.py

@@ -272,7 +272,7 @@ def angle_between(a: Point, b: Point) -> np.ndarray:
 
 @ppmeth
 def scalar_projection(a: Point, b: Point) -> Point:
-    return a.cos_angle_between(b) * abs(a)
+    return cos_angle_between(a, b) * abs(a)
 
 
 @ppmeth
@@ -284,21 +284,28 @@ def vector_projection(a: Point, b: Point) -> Point:
 def vector_rejection(a: Point, b: Point) -> Point:
     return a - ((Point.dot(a, b)) / Point.dot(b, b)) * b
 
+@ppmeth
+def min_angle_between(p1: Point, p2: Point):
+    angle = angle_between(p1, p2) % np.pi
+    return np.minimum(angle, np.pi - angle)
 
 @ppmeth
 def is_parallel(a: Point, b: Point, tolerance=1e-6):
     return abs(a.cos_angle_between(b) - 1) < tolerance
 
+@ppmeth
+def is_anti_parallel(a: Point, b: Point, tolerance=1e-6):
+    return abs(a.cos_angle_between(-b) - 1) < tolerance
+
 
 @ppmeth
-def is_perpendicular(a: Point, b: Point, tolerance=1e-6):
-    return abs(a.dot(b)) < tolerance
+def is_either_parallel(a: Point, b: Point, tolerance=1e-6):
+    return min_angle_between(a, b) < tolerance
 
 
 @ppmeth
-def min_angle_between(p1: Point, p2: Point):
-    angle = angle_between(p1, p2) % np.pi
-    return np.minimum(angle, np.pi - angle)
+def is_perpendicular(a: Point, b: Point, tolerance=1e-6):
+    return abs(a.dot(b)) < tolerance
 
 
 def vector_norm(point: Point):

geometry/time.py

@@ -25,12 +25,12 @@ class Time(Base):
             return Time(t, dt)
 
     @staticmethod
-    def uniform(duration: float, npoints: int | None, minpoints: int = 1) -> Time:
+    def uniform(duration: float, npoints: int | None, minpoints: int = 1, freq=25) -> Time:
         return Time.from_t(
             np.linspace(
                 0,
                 duration,
-                npoints if npoints else max(int(np.ceil(duration * 25)), minpoints),
+                npoints if npoints else max(int(np.ceil(duration * freq)), minpoints),
             )
         )
 

geometry/transformation.py

@@ -9,6 +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 Base, Point, Quaternion, P0, Q0, Coord
 
 import numpy as np
@@ -54,7 +55,7 @@ class Transformation(Base):
         raise AttributeError(name)
 
     @staticmethod
-    def build(p:Point, q:Quaternion):
+    def build(p:Point, q:Quaternion) -> Transformation:
         if len(p) == len(q):
             return Transformation(np.concatenate([
                 p.data,

geometry/utils.py

@@ -86,6 +86,8 @@ def get_value(arr: npt.NDArray, index: Number):
 
 def apply_index_slice(index: npt.NDArray, value: slice | Number | npt.ArrayLike | None):
     if isinstance(value, slice):
+        if value.start is not None and value.stop is not None and value.start >= value.stop:
+            return np.array([], dtype=index.dtype)
         middle = pd.Index(index)[
             int(np.ceil(value.start)) if value.start is not None else None : int(
                 np.ceil(value.stop)
@@ -93,9 +95,9 @@ def apply_index_slice(index: npt.NDArray, value: slice | Number | npt.ArrayLike
             if value.stop is not None
             else None
         ]
-        if value.start is not None and middle[0] != value.start and value.start > index[0]:
+        if value.start is not None and (len(middle) == 0 or middle[0] != value.start) and value.start > index[0]:
             middle = np.concatenate([[get_value(index, value.start)], middle])
-        if value.stop is not None and middle[-1] != value.stop and value.stop < index[-1]:
+        if value.stop is not None and (len(middle) == 0 or middle[-1] != value.stop) and value.stop < index[-1]:
             middle = np.concatenate([middle, [get_value(index, value.stop)]])
         return middle
     else:

{pfc_geometry-0.2.20.dist-info → pfc_geometry-0.2.22.dist-info}/METADATA

@@ -1,10 +1,9 @@
 Metadata-Version: 2.4
 Name: pfc-geometry
-Version: 0.2.20
+Version: 0.2.22
 Summary: A library for working with 3D geometry.
 License-File: LICENSE
 Requires-Python: >=3.12
-Requires-Dist: numpy-quaternion>=2024.0.7
 Requires-Dist: numpy>=2.1.3
 Requires-Dist: pandas>=2.2.3
 Requires-Dist: rowan>=1.3.2

pfc_geometry-0.2.22.dist-info/RECORD

@@ -0,0 +1,18 @@
+geometry/__init__.py,sha256=YT9pVH7zbfi26MLehrcCjcBf39aiCeq8aMuTtB3hC8Y,1133
+geometry/air.py,sha256=cmOoUiVYmCWccDAy_7u-bfOvkKnRW5gWUxcD8X-ukvM,443
+geometry/angles.py,sha256=OxuYcjFGexuOputr_eo9xHXnGCc44H3o3S5GQPp1geY,630
+geometry/base.py,sha256=uHnQpOhv3Y9bXzpIttOODKRVUxFIlRbxmg4EbMRQa_s,15037
+geometry/checks.py,sha256=o8yMBAdU5Vy0EspBYaof4fPGgRSFZhRDhzBjRPsLd0M,375
+geometry/coordinate_frame.py,sha256=FeQn7TBAnbik4Rv0ErDUCaY-W480trVYspH46uS1NXw,4442
+geometry/gps.py,sha256=EsokABt40ZoltpAQfKrRc4kA-Lc2ScP_ltJNF7pvAWc,3654
+geometry/mass.py,sha256=BUWBSITwpdRfpJR5-oJTd16BI7FLZt8rhxdzr0cx1HY,1675
+geometry/point.py,sha256=zsF7LVvwdVPsH-17RTPDiE-FqDpo1BiaDn6DosOLuwo,8716
+geometry/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+geometry/quaternion.py,sha256=dZwpViiVPwHUhRk7DhOwNab3pLhIWXyHk3DVh9mukSk,12143
+geometry/time.py,sha256=VQEklZtZkwMthMsrH5QT83V8e3n78S06fWjyEqLHYbk,2706
+geometry/transformation.py,sha256=-FQ_55l3_MykSQQuEIJ3MqWS5MHKR0HNWWCKpEEgRT0,5592
+geometry/utils.py,sha256=62MO2G6SzP63P_xRMb-wzGu9digyk-tSIBjpOypMRXE,3631
+pfc_geometry-0.2.22.dist-info/METADATA,sha256=Jii_pLAE9vY-2-dbkOhZo8G3jmf7b3m58yAT1UQ4b_E,1587
+pfc_geometry-0.2.22.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+pfc_geometry-0.2.22.dist-info/licenses/LICENSE,sha256=z72U6pv-bQgJ_Svr4uCXnMjemsp38aSerhHEdEAOMJ4,7632
+pfc_geometry-0.2.22.dist-info/RECORD,,

{pfc_geometry-0.2.20.dist-info → pfc_geometry-0.2.22.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any

pfc_geometry-0.2.20.dist-info/RECORD

@@ -1,17 +0,0 @@
-geometry/__init__.py,sha256=Qipz0oxyBg-C_-sFLVI8LKW9Yq8_keR-CbyuseAvTGg,1082
-geometry/angles.py,sha256=Gw4PXr2kQMvvKECsugmi5kNiqOnK8T3PZSo3IKUpxPY,480
-geometry/base.py,sha256=6bM4J7VGhstel6qu-C4xU39vU4dZ71S9FZMY9Y7xDZY,14966
-geometry/checks.py,sha256=o8yMBAdU5Vy0EspBYaof4fPGgRSFZhRDhzBjRPsLd0M,375
-geometry/coordinate_frame.py,sha256=6KzRu0sSPzmHj5vLIuX5Efi0OWdEF6gQtKPf63wsaRk,4358
-geometry/gps.py,sha256=EsokABt40ZoltpAQfKrRc4kA-Lc2ScP_ltJNF7pvAWc,3654
-geometry/mass.py,sha256=BUWBSITwpdRfpJR5-oJTd16BI7FLZt8rhxdzr0cx1HY,1675
-geometry/point.py,sha256=wjAau7PiTpoIHMMvDDexXq8PisE5RdAQqT7Ze3NTm6A,8477
-geometry/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geometry/quaternion.py,sha256=dZwpViiVPwHUhRk7DhOwNab3pLhIWXyHk3DVh9mukSk,12143
-geometry/time.py,sha256=VTfMHLxhcws8YESYvxxP8W_vSePvl4lwKRXHxFWhJeA,2695
-geometry/transformation.py,sha256=wnxoDN9-IeapVlrS_Da4hXyxtPCyoa_UcCsB8QVgxuo,5539
-geometry/utils.py,sha256=q7-aaxDzRDwl78-3XzdpcJuh5iL7I8lN5agk2WNWjSY,3443
-pfc_geometry-0.2.20.dist-info/METADATA,sha256=XXAr-l0CNGbvC2GTXtUj0os-mDRYN_3OK7LwAft9LoU,1629
-pfc_geometry-0.2.20.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pfc_geometry-0.2.20.dist-info/licenses/LICENSE,sha256=z72U6pv-bQgJ_Svr4uCXnMjemsp38aSerhHEdEAOMJ4,7632
-pfc_geometry-0.2.20.dist-info/RECORD,,