Merge pull request #784 from compas-dev/circle_line_eq

add __eq__ for circle and line

Author: beverlylytle

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Added `divide_polyline`, `divide_polyline_by_length`, `Polyline.split_at_corners` and `Polyline.tangent_at_point_on_polyline`.
 * Added the magic method `__str__` to `compas.geoemetry.Transformation`.
 * Added `redraw` flag to the `compas_rhino` methods `delete_object`, `delete_objects` and `purge_objects`.
+* Added the `__eq__` method for `compas.geometry.Circle` and `compas.geometry.Line`.
 
 ### Changed
 

src/compas/geometry/primitives/circle.py

@@ -141,6 +141,14 @@ def __setitem__(self, key, value):
     def __iter__(self):
         return iter([self.plane, self.radius])
 
+    def __eq__(self, other):
+        try:
+            other_plane = other[0]
+            other_radius = other[1]
+        except:  # noqa: E722
+            return False
+        return self.plane == other_plane and self.radius == other_radius
+
     # ==========================================================================
     # constructors
     # ==========================================================================

src/compas/geometry/primitives/line.py

@@ -144,7 +144,12 @@ def __iter__(self):
         return iter([self.start, self.end])
 
     def __eq__(self, other):
-        raise NotImplementedError
+        try:
+            other_start = other[0]
+            other_end = other[1]
+        except:  # noqa: E722
+            return False
+        return self.start == other_start and self.end == other_end
 
     # ==========================================================================
     # constructors

tests/compas/geometry/test_circle.py

@@ -0,0 +1,42 @@
+from compas.geometry import Circle
+# These imports are used to check __repr__.
+from compas.geometry import Plane  # noqa: F401
+from compas.geometry import Point  # noqa: F401
+from compas.geometry import Vector  # noqa: F401
+
+
+def test_circle():
+    point = [0, 0, 0]
+    vector = [1, 0, 0]
+    plane = (point, vector)
+    c = Circle(plane, 1.0)
+    assert c.radius == 1.0
+    assert c.plane == plane
+
+
+def test_equality():
+    point = [0, 0, 0]
+    vector = [1, 0, 0]
+    plane = (point, vector)
+    c = Circle(plane, 1.0)
+    assert c == (plane, 1.0)
+    assert c == Circle(plane, 1.0)
+    assert c != 1.0
+    assert c != (plane, 2.0)
+
+
+def test___repr__():
+    point = [0, 0, 0]
+    vector = [1, 0, 0]
+    plane = (point, vector)
+    c = Circle(plane, 1.0)
+    assert c == eval(repr(c))
+
+
+def test___getitem__():
+    point = [0, 0, 0]
+    vector = [1, 0, 0]
+    plane = (point, vector)
+    c = Circle(plane, 1.0)
+    assert c[0] == plane
+    assert c[1] == 1.0

tests/compas/geometry/test_line.py

@@ -0,0 +1,36 @@
+from compas.geometry import Line
+# This import is use to test __repr__.
+from compas.geometry import Point  # noqa: F401
+
+
+def test_line():
+    p1 = [0, 0, 0]
+    p2 = [1, 0, 0]
+    line = Line(p1, p2)
+    assert line.start == p1
+    assert line.end == p2
+
+
+def test_equality():
+    p1 = [0, 0, 0]
+    p2 = [1, 0, 0]
+    line = Line(p1, p2)
+    assert (p1, p2) == line
+    assert line == Line(p1, p2)
+    assert line != (p2, p1)
+    assert line != 1
+
+
+def test___repr__():
+    p1 = [0, 0, 0]
+    p2 = [1, 0, 0]
+    line = Line(p1, p2)
+    assert line == eval(repr(line))
+
+
+def test___getitem__():
+    p1 = [0, 0, 0]
+    p2 = [1, 0, 0]
+    line = Line(p1, p2)
+    assert line[0] == p1
+    assert line[1] == p2