Add circle_points to Circle and round() to Points

networks/geometry/Circle.py

@@ -1,17 +1,25 @@
-from typing import Type
 from networks.geometry.Point2D import Point2D
+from math import cos, sin, pi
+from typing import List
 
 
 class Circle:
     def __init__(self, center: Point2D, inner: int, outer: int):
         self.center = center
+
         self.inner = inner
         self.outer = outer
         self.coordinates = []
 
+        self.radius = None  # Used with circle_points()
+        self.spaced_coordinates = []
+
         self.circle(self.center, self.inner, self.outer)
 
-    def circle(self, center: Point2D, inner: int, outer: int):
+    def __repr__(self):
+        return f"Circle(center: {self.center}, inner: {self.inner}, outer: {self.outer})"
+
+    def circle(self, center: Point2D, inner: int, outer: int) -> List[Point2D]:
         """Compute discrete value of a 2d-circle with thickness. 
 
         https://stackoverflow.com/questions/27755514/circle-with-thickness-drawing-algorithm
@@ -21,6 +29,9 @@ class Circle:
             inner (int): The minimum radius at which the disc is filled (included).
             outer (int): The maximum radius where disc filling stops (included).
 
+        Returns:
+            list(Point2D): List of 2d-coordinates composing the surface. Note that some coordinates are redondant and are not ordered.
+
         >>> Circle(Point2D(0, 0), 5, 10)
         """
         xo = outer
@@ -55,6 +66,33 @@ class Circle:
                 else:
                     xi -= 1
                     erri += 2 * (y - xi + 1)
+        return self.coordinates
+
+    def circle_points(self, number: int, radius: int) -> List[Point2D]:
+        """Get evenly spaced coordinates of the circle.
+
+        https://stackoverflow.com/questions/8487893/generate-all-the-points-on-the-circumference-of-a-circle
+
+        Args:
+            number (int): Number of coordinates to be returned. 
+            radius (int, optional): Radius of the circle. Defaults to self.inner.
+
+        Returns:
+            list(Point2D): List of evenly spaced 2d-coordinates forming the circle.
+        """
+        print(self.center.x)
+        self.spaced_coordinates = [
+            Point2D(cos(2 * pi / number * i) * radius,
+                    sin(2 * pi / number * i) * radius)
+            for i in range(0, number + 1)
+        ]
+
+        for i in range(len(self.spaced_coordinates)):
+            self.spaced_coordinates[i] = Point2D(
+                self.spaced_coordinates[i].x + self.center.x,
+                self.spaced_coordinates[i].y + self.center.y
+            ).round()
+        return self.spaced_coordinates
 
     def _x_line(self, x1, x2, y):
         while x1 <= x2:
@@ -65,6 +103,3 @@ class Circle:
         while y1 <= y2:
             self.coordinates.append(Point2D(x, y1))
             y1 += 1
-
-    def __repr__(self):
-        return f"Circle(center: {self.center}, inner: {self.inner}, outer: {self.outer})"