pfc-geometry 0.2.19__tar.gz → 0.2.21__tar.gz

{pfc_geometry-0.2.19 → pfc_geometry-0.2.21}/PKG-INFO

@@ -1,10 +1,9 @@
 Metadata-Version: 2.4
 Name: pfc-geometry
-Version: 0.2.19
+Version: 0.2.21
 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.19 → pfc_geometry-0.2.21}/pyproject.toml

@@ -1,11 +1,10 @@
 [project]
 name = "pfc-geometry"
-version="0.2.19"
+version="0.2.21"
 description = "A library for working with 3D geometry."
 readme = "README.md"
 requires-python = ">=3.12"
 dependencies = [
-    "numpy-quaternion>=2024.0.7",
     "numpy>=2.1.3",
     "pandas>=2.2.3",
     "rowan>=1.3.2",

{pfc_geometry-0.2.19 → pfc_geometry-0.2.21}/src/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))

pfc_geometry-0.2.21/src/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))

{pfc_geometry-0.2.19 → pfc_geometry-0.2.21}/src/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

{pfc_geometry-0.2.19 → pfc_geometry-0.2.21}/src/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

{pfc_geometry-0.2.19 → pfc_geometry-0.2.21}/src/geometry/point.py

@@ -12,8 +12,6 @@ this program. If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import annotations
 from typing import Literal
-
-from sqlalchemy import literal
 from .base import Base
 import numpy as np
 import pandas as pd
@@ -274,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
@@ -286,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):

{pfc_geometry-0.2.19 → pfc_geometry-0.2.21}/src/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),
             )
         )
 

{pfc_geometry-0.2.19 → pfc_geometry-0.2.21}/src/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,

{pfc_geometry-0.2.19 → pfc_geometry-0.2.21}/tests/test_quaternion.py

@@ -6,8 +6,6 @@ from geometry.checks import assert_almost_equal
 import pandas as pd
 import numpy as np
 
-import quaternion
-
 def test_init():
     data = np.random.random((500,4))
     qs = Quaternion(data)