CHANGE the triangulation_earclip test are added as a separate file, testing only the algorithm

petrasvestartas · petrasvestartas · commit a33ff263c1f2 · 2024-01-11T15:04:26.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -55,9 +55,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Changed `compas.datastructures.Mesh` to take additional `**kwargs`, instead of only `name=None` specifically.
 * Moved registration of `ping` and `remote_shutdown` of the RPC server to `compas.rpc.Server.__init__()`.
 * Moved `FileWatcherService` to `compas.rpc.services.watcher` so it can be reused.
-* Changed `compas.geometry.earclip_polygon` algorithm because the current one does not work in several cases.
-* Changed the docstrings in `compas.geometry.earclip_polygon` are corrected. The orientation to the XY Frame has been removed since it is handled by the `polygon.to_vertices_and_faces` method. Additionally, the test_polygon.py file has been modified with a new test for the ear_clip called `test_polygon_to_vertices_and_faces`. The `object` has been added to all `Ear` classes.
-* Changed the docstrings in `compas.geometry.earclip_polygon` is merged back, meaning the polygon is transformed to XY frame.
+* Changed `compas.geometry.earclip_polygon` algorithm changed to a new one that better handles different cases.
 
 ### Removed
 
diff --git a/src/compas/geometry/triangulation_earclip.py b/src/compas/geometry/triangulation_earclip.py
@@ -202,6 +202,13 @@ def triangulate(self):
             If no more Ears were found for triangulation.
 
         """
+        
+        if self.length < 3:
+            raise ValueError("Polygon must have at least 3 vertices.")
+        elif self.length == 3:
+            self.triangles.append([0, 1, 2])
+            return self.triangles
+
         indexes = list(range(self.length))
         self.find_ears()
 
diff --git a/tests/compas/geometry/test_polygon.py b/tests/compas/geometry/test_polygon.py
@@ -87,89 +87,3 @@ def test_polygon__setitem__():
     assert polygon[4] == point
     assert isinstance(polygon[4], Point)
     assert polygon.lines[-2].end == point
-
-
-def test_polygon_to_vertices_and_faces():
-
-    points = [
-        [332.639635, -3824, 1435.771272],
-        [422.117559, -3301, 1563.558991],
-        [642.370911, -3534, 1878.113376],
-        [505.286143, -3908, 1682.336037],
-        [477.180897, -3578, 1642.197587],
-        [448.502075, -3634, 1601.239985],
-        [441.619158, -3998, 1591.41016],
-        [339.522553, -4195, 1445.601096],
-        [189.245526, -3981, 1230.983261],
-        [186.377644, -3672, 1226.887501],
-        [278.149874, -3619, 1357.951828],
-        [332.639635, -3414, 1435.771272],
-        [192.686985, -3362, 1235.898173],
-        [136.476494, -3688, 1155.621273],
-        [63.05871, -4035, 1050.769811],
-        [-51.083001, -3865, 887.758554],
-        [-2.329003, -3686, 957.386478],
-        [86.575344, -3695, 1084.355045],
-        [69.368051, -3436, 1059.780484],
-        [74.530239, -3315, 1067.152852],
-        [219.071501, -3154, 1273.579167],
-        [277.576297, -3227, 1357.132676],
-        [336.081094, -3052, 1440.686184],
-        [458.252875, -3120, 1615.16557],
-        [718.083001, -3144, 1986.241446],
-        [595.337643, -3295, 1810.942908],
-        [459.973604, -3252, 1617.623026],
-        [369.348527, -3265, 1488.197003],
-        [377.952174, -3452, 1500.484283],
-    ]
-
-    polygon = Polygon(points)
-    polygon.points.reverse()
-
-    vertices, faces = polygon.to_vertices_and_faces(True)
-
-    assert list(polygon) == vertices
-    assert faces == [
-        [2, 3, 4],
-        [5, 6, 7],
-        [7, 8, 9],
-        [12, 13, 14],
-        [14, 15, 16],
-        [17, 18, 19],
-        [19, 20, 21],
-        [21, 22, 23],
-        [23, 24, 25],
-        [27, 28, 0],
-        [1, 2, 4],
-        [7, 9, 10],
-        [14, 16, 17],
-        [23, 25, 26],
-        [0, 1, 4],
-        [12, 14, 17],
-        [21, 23, 26],
-        [0, 4, 5],
-        [12, 17, 19],
-        [21, 26, 27],
-        [0, 5, 7],
-        [11, 12, 19],
-        [19, 21, 27],
-        [0, 7, 10],
-        [11, 19, 27],
-        [0, 10, 11],
-        [11, 27, 0],
-    ]
-
-    # test polygon with self-coinciding vertices
-    self_intersecting_polygon = Polygon(
-        [
-            [-1, -1, 0],
-            [-1, 0, 0],
-            [-1, 1, 0],
-            [0, 0, 0],
-            [0, 0, 0],
-        ]
-    )
-
-    with pytest.raises(IndexError):
-        vertices,
-        faces = self_intersecting_polygon.to_vertices_and_faces(True)
diff --git a/tests/compas/geometry/test_triangulation_earclip.py b/tests/compas/geometry/test_triangulation_earclip.py
@@ -0,0 +1,114 @@
+import pytest
+import compas
+
+
+def test_earclip_polygon_triangle():
+
+    points = [
+        [0, 0, 0],
+        [1, 0, 0],
+        [1, 1, 0],
+    ]
+
+    polygon = compas.geometry.Polygon(points)
+    faces = compas.geometry.earclip_polygon(polygon)
+    assert faces == [[0, 1, 2]]
+
+
+def test_earclip_polygon_square():
+
+    points = [
+        [0, 0, 0],
+        [1, 0, 0],
+        [1, 1, 0],
+        [0, 1, 0],
+    ]
+
+    polygon = compas.geometry.Polygon(points)
+    faces = compas.geometry.earclip_polygon(polygon)
+    assert faces == [[3, 0, 1], [1, 2, 3]]
+
+
+def test_earclip_polygon_wrong_winding():
+
+    points = [
+        [332.639635, -3824, 1435.771272],
+        [422.117559, -3301, 1563.558991],
+        [642.370911, -3534, 1878.113376],
+        [505.286143, -3908, 1682.336037],
+        [477.180897, -3578, 1642.197587],
+        [448.502075, -3634, 1601.239985],
+        [441.619158, -3998, 1591.41016],
+        [339.522553, -4195, 1445.601096],
+        [189.245526, -3981, 1230.983261],
+        [186.377644, -3672, 1226.887501],
+        [278.149874, -3619, 1357.951828],
+        [332.639635, -3414, 1435.771272],
+        [192.686985, -3362, 1235.898173],
+        [136.476494, -3688, 1155.621273],
+        [63.05871, -4035, 1050.769811],
+        [-51.083001, -3865, 887.758554],
+        [-2.329003, -3686, 957.386478],
+        [86.575344, -3695, 1084.355045],
+        [69.368051, -3436, 1059.780484],
+        [74.530239, -3315, 1067.152852],
+        [219.071501, -3154, 1273.579167],
+        [277.576297, -3227, 1357.132676],
+        [336.081094, -3052, 1440.686184],
+        [458.252875, -3120, 1615.16557],
+        [718.083001, -3144, 1986.241446],
+        [595.337643, -3295, 1810.942908],
+        [459.973604, -3252, 1617.623026],
+        [369.348527, -3265, 1488.197003],
+        [377.952174, -3452, 1500.484283],
+    ]
+
+    polygon = compas.geometry.Polygon(points)
+    polygon.points.reverse()
+
+    faces = compas.geometry.earclip_polygon(polygon)
+
+    assert faces == [
+        [2, 3, 4],
+        [5, 6, 7],
+        [7, 8, 9],
+        [12, 13, 14],
+        [14, 15, 16],
+        [17, 18, 19],
+        [19, 20, 21],
+        [21, 22, 23],
+        [23, 24, 25],
+        [27, 28, 0],
+        [1, 2, 4],
+        [7, 9, 10],
+        [14, 16, 17],
+        [23, 25, 26],
+        [0, 1, 4],
+        [12, 14, 17],
+        [21, 23, 26],
+        [0, 4, 5],
+        [12, 17, 19],
+        [21, 26, 27],
+        [0, 5, 7],
+        [11, 12, 19],
+        [19, 21, 27],
+        [0, 7, 10],
+        [11, 19, 27],
+        [0, 10, 11],
+        [11, 27, 0],
+    ]
+
+
+def test_earclip_polygon_coincident_points():
+    self_intersecting_polygon = compas.geometry.Polygon(
+        [
+            [-1, -1, 0],
+            [-1, 0, 0],
+            [-1, 1, 0],
+            [0, 0, 0],
+            [0, 0, 0],
+        ]
+    )
+
+    with pytest.raises(IndexError):
+        compas.geometry.earclip_polygon(self_intersecting_polygon)
