physpyx 3.2.0__tar.gz → 3.3.0__tar.gz

{physpyx-3.2.0 → physpyx-3.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: physpyx
-Version: 3.2.0
+Version: 3.3.0
 Summary: Provides a way to use python code in LaTeX
 Author: Jérôme Dufour
 Author-email: Jérôme Dufour <jerome.dufour@eduvaud.ch>

{physpyx-3.2.0 → physpyx-3.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "physpyx"
-version = "3.2.0"
+version = "3.3.0"
 description = "Provides a way to use python code in LaTeX"
 readme = "README.md"
 requires-python = ">=3.13"

{physpyx-3.2.0 → physpyx-3.3.0}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "physpyx"
-version = "3.2.0"
+version = "3.3.0"
 description = "Provides a way to use python code in LaTeX"
 readme = "README.md"
 requires-python = ">=3.13"

{physpyx-3.2.0 → physpyx-3.3.0}/src/physpyx/astronomy.py

@@ -79,7 +79,7 @@ class Orbit:
             raise ValueError(f"{every} is not a divisor {steps} steps")
 
         dt = self.T / steps
-        for i in range(steps + 1):
+        for i in range(steps):
             if i % every == 0:
                 yield self.x
             self.step(dt)
@@ -108,7 +108,7 @@ class Orbit:
         vec_t = self.v / vt
         vec_p = np.array([-vec_t[1], vec_t[0]])
 
-        # compute cetripetal acceleration
+        # compute centripetal acceleration
         a = self.get_acceleration()
         ac = a.dot(vec_p)
 

{physpyx-3.2.0 → physpyx-3.3.0}/src/physpyx/tikz.py

@@ -13,8 +13,13 @@ class Coordinate:
     def norm(self) -> float:
         return np.sqrt(self.x * self.x + self.y * self.y)
 
-    def orientation(self) -> float:
-        return np.atan2(self.y, self.x) * 180 / np.pi
+    def __str__(self) -> str:
+        return f"({self.x}, {self.y})"
+
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, Coordinate):
+            return False
+        return bool(np.isclose(self.x, other.x) and np.isclose(self.y, other.y))
 
     def __isub__(self, other: "Coordinate") -> Self:
         self.x -= other.x
@@ -29,6 +34,9 @@ class Coordinate:
         self.y += other.y
         return self
 
+    def __add__(self, other: "Coordinate") -> "Coordinate":
+        return Coordinate(self.x + other.x, self.y + other.y)
+
     def __mul__(self, number: float) -> "Coordinate":
         return Coordinate(self.x * number, self.y * number)
 
@@ -37,14 +45,20 @@ class Coordinate:
     def __truediv__(self, number: float) -> "Coordinate":
         return Coordinate(self.x / number, self.y / number)
 
-    def __add__(self, other: "Coordinate") -> "Coordinate":
-        return Coordinate(self.x + other.x, self.y + other.y)
-
     def dot(self, other: "Coordinate") -> float:
         return self.x * other.x + self.y * other.y
 
-    def __str__(self) -> str:
-        return f"({self.x}, {self.y})"
+    def orientation(self) -> float:
+        a = np.atan2(self.y, self.x) * 180 / np.pi
+        return a + 360 if a < 0 else a
+
+    def rotate(self, angle: float, deg: bool = True) -> "Coordinate":
+        if deg:
+            angle *= np.pi / 180
+        return Coordinate(
+            self.x * np.cos(angle) + self.y * -np.sin(angle),
+            self.x * np.sin(angle) + self.y * np.cos(angle),
+        )
 
 
 class Rectangle:
@@ -113,6 +127,13 @@ class Circle:
     def __str__(self) -> str:
         return f"{self.center} circle ({self.radius})"
 
+    def get_point_on_circle(self, angle: float) -> Coordinate:
+        angle *= np.pi / 180
+        return self.center + Coordinate(
+            self.radius * np.cos(angle),
+            self.radius * np.sin(angle),
+        )
+
     def tangent_points_to_circle(
         self, circ: "Circle", lr: LR, io: IO
     ) -> tuple[Coordinate, Coordinate]:
@@ -194,3 +215,29 @@ class Rope:
         angle_i, angle_o = self._compute_angles(P1.center, t1, orientation)
         self._path += f" arc ({angle_i}:{angle_o}:{P1.radius}) -- {t2}"
         self.current = t2
+
+
+class Angle:
+    def __init__(
+        self,
+        origin: Coordinate,
+        p1: Coordinate,
+        p2: Coordinate,
+        orient: Circle.ORIENT = Circle.ORIENT.COUNTER_CLOCKWISE,
+    ):
+        self.origin = origin
+        self.p1 = p1
+        self.p2 = p2
+        self.alpha1 = (self.p1 - self.origin).orientation()
+        self.alpha2 = (self.p2 - self.origin).orientation()
+        if orient == Circle.ORIENT.CLOCKWISE and self.alpha2 > self.alpha1:
+            self.alpha2 -= 360
+        elif orient == Circle.ORIENT.COUNTER_CLOCKWISE and self.alpha1 > self.alpha2:
+            self.alpha1 -= 360
+        self.alpha = self.alpha2 - self.alpha1
+
+    def angle(self) -> str:
+        return rf"{self.p1} -- {self.origin} -- {self.p2}"
+
+    def arc(self, radius: float) -> str:
+        return rf"([shift={{{self.origin}}}]{self.alpha1}:{radius}) arc ({self.alpha1}:{self.alpha2}:{radius})"