New test on valid actions

Author: ArzhelaR

mesh_model/mesh_analysis.py

@@ -326,7 +326,7 @@ def isSplitOk(d: Dart) -> (bool, bool):
     else:
         _, _, _, _, _, A, B, C, D = mesh.active_triangles(d)
 
-    if not test_degree(A) or not test_degree(B):
+    if not test_degree(C) or not test_degree(D):
         topo = False
         return topo, geo
 
@@ -487,7 +487,7 @@ def valid_triangle(vect_AB, vect_AC, vect_BC) -> bool:
 
     L_max = max(dist_AB, dist_AC, dist_BC)
 
-    if target_mesh_size/3*sqrt(2) < L_max < target_mesh_size*3*sqrt(2): #4.24
+    if target_mesh_size/2*sqrt(2) < L_max and L_max < target_mesh_size*3*sqrt(2): # 0.35<Lmax<4.24
         pass
     else:
         return False
@@ -497,8 +497,8 @@ def valid_triangle(vect_AB, vect_AC, vect_BC) -> bool:
     angle_C = degrees(angle_from_sides(dist_AB, dist_BC, dist_AC))  # Angle au point B
     angle_A = degrees(angle_from_sides(dist_BC, dist_AC, dist_AB))  # Angle au point C
 
-    # Vérification que tous les angles sont supérieurs à 2°
-    if angle_A <= 2 or angle_B <= 2 or angle_C <= 2:
+    # Vérification que tous les angles sont supérieurs à 5°
+    if angle_A <= 5 or angle_B <= 5 or angle_C <= 5:
         return False
     return True
 
@@ -520,7 +520,7 @@ def test_degree(n: Node) -> bool:
     :param n: a Node
     :return: True if the degree is lower than 10, False otherwise
     """
-    if degree(n) > 12:
+    if degree(n) > 10:
         return False
     else:
         return True

test_modules/test_mesh_analysis.py

@@ -3,7 +3,7 @@
 from mesh_model.mesh_struct.mesh import Mesh
 from mesh_model.mesh_struct.mesh_elements import Dart
 import mesh_model.mesh_analysis as Mesh_analysis
-from actions.triangular_actions import split_edge_ids
+from actions.triangular_actions import split_edge_ids, collapse_edge, collapse_edge_ids
 from plots.mesh_plotter import plot_mesh
 
 class TestMeshAnalysis(unittest.TestCase):
@@ -40,7 +40,7 @@ def test_split_score(self):
         split_edge_ids(cmap, 0, 2)
         split_edge_ids(cmap, 1, 2) # split impossible
         nodes_score, mesh_score, mesh_ideal_score, adjacency = Mesh_analysis.global_score(cmap)
-        self.assertEqual((5, 1), (mesh_score, mesh_ideal_score))
+        self.assertEqual((3, 1), (mesh_score, mesh_ideal_score))
 
     def test_find_template_opposite_node_not_found(self):
         nodes = [[0.0, 0.0], [1.0, 0.0], [1.0, 1.0], [0.0, 1.0], [2.0, 0.0]]
@@ -54,29 +54,44 @@ def test_find_template_opposite_node_not_found(self):
         self.assertEqual(node, 3)
 
     def test_is_valid_action(self):
-        nodes = [[0.0, 0.0], [1.0, 0.0], [1.0, 1.0], [0.0, 1.0], [2.0, 0.0]]
-        faces = [[0, 1, 2], [0, 2, 3], [1, 4, 2]]
+        nodes = [[0.0, 0.0], [1.0, 0.0], [0.5, 1], [-0.5, 1.0], [0.0, 2.0], [-1.0, 2.0], [-2.0, 1.0], [-1.0, 0.0],
+                 [-2.0, 0.0], [-2.0, -1.0], [-0.5, -1.0], [-1.0, -2.0], [0.0, -2.0], [1.0, -2.0],
+                 [0.5, -1.0], [2.0, -1.0], [2.0, 0.0], [2.0, 1.0], [1.0, 2.0]]
+        faces = [[0, 1, 2], [0, 2, 3], [3, 2, 4], [7, 0, 3], [7, 10, 0], [10, 14, 0], [0, 14, 1], [10, 12, 14],
+                 [3, 4, 5], [3, 5, 6], [3, 6, 7], [7, 6, 8], [7, 8, 9], [7, 9, 10], [10, 9, 11], [10, 11, 12],
+                 [14, 12, 13], [14, 13, 15], [1, 14, 15], [1, 15, 16], [1, 16, 17], [1, 17, 2], [2, 17, 18], [2, 18, 4]]
         cmap = Mesh(nodes, faces)
+        split_edge_ids(cmap, 0, 1)
+
+        #Boundary dart
+        self.assertEqual(Mesh_analysis.isValidAction(cmap, 25, 0), (False, True))
 
         # Flip test
+        self.assertEqual(Mesh_analysis.isValidAction(cmap, 3, 0), (True, True))
         self.assertEqual(Mesh_analysis.isValidAction(cmap, 0, 0), (False, True))
-        self.assertEqual(Mesh_analysis.isValidAction(cmap, 2, 0), (True, True))
 
         #Split test
-        self.assertEqual(Mesh_analysis.isValidAction(cmap, 0, 1), (False, True))
-        self.assertEqual(Mesh_analysis.isValidAction(cmap, 2, 1), (True, True))
+        self.assertEqual(Mesh_analysis.isValidAction(cmap, 0, 1), (True, True))
+        split_edge_ids(cmap, 1, 19)
+        split_edge_ids(cmap, 1, 20)
+        self.assertEqual(Mesh_analysis.isValidAction(cmap, 20, 1), (True, False))
+        split_edge_ids(cmap, 0, 19)
+        split_edge_ids(cmap, 0, 22)
+        split_edge_ids(cmap, 0, 23)
+        self.assertEqual(Mesh_analysis.isValidAction(cmap, 20, 1), (False, True))
 
         #Collapse test
-        self.assertEqual(Mesh_analysis.isValidAction(cmap, 0, 3), (False, True))
-        self.assertEqual(Mesh_analysis.isValidAction(cmap, 2, 3), (False, False))
+        self.assertEqual(Mesh_analysis.isValidAction(cmap, 20, 2), (True, True))
+        plot_mesh(cmap)
+        self.assertEqual(Mesh_analysis.isValidAction(cmap, 2, 2), (False, True))
 
         #All action test
-        self.assertEqual(Mesh_analysis.isValidAction(cmap, 0, 3), (False, True))
         self.assertEqual(Mesh_analysis.isValidAction(cmap, 2, 3), (False, False))
+        self.assertEqual(Mesh_analysis.isValidAction(cmap, 9, 3), (True, True))
 
         #One action test
-        self.assertEqual(Mesh_analysis.isValidAction(cmap, 0, 4), (False, True))
-        self.assertEqual(Mesh_analysis.isValidAction(cmap, 2, 4), (True, True))
+        self.assertEqual(Mesh_analysis.isValidAction(cmap, 0, 4), (True, True))
+        self.assertEqual(Mesh_analysis.isValidAction(cmap, 94, 4), (False, False))
 
     def test_isFlipOk(self):
         nodes = [[0.0, 0.0], [1.0, 0.0], [1.0, 1.0], [0.0, 1.0], [2.0, 0.0]]