New test on valid actions

Author: ArzhelaR

mesh_model/mesh_analysis.py

@@ -446,7 +446,6 @@ def valid_faces_changes(faces: list[Face], n_id: int, new_x: float, new_y: float
     """
     Check the orientation of triangles adjacent to node n = Node(mesh, n_id) if the latter is moved to coordinates new_x, new_y.
     Also checks that no triangle will become flat
-    :param mesh: a mesh
     :param faces: adjacents faces to node of id n_id
     :param n_id: node id
     :param new_x: new x coordinate
@@ -488,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): #1.5
+    if target_mesh_size/3*sqrt(2) < L_max < target_mesh_size*3*sqrt(2): #4.24
         pass
     else:
         return False
@@ -498,7 +497,7 @@ 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 à 5°
+    # Vérification que tous les angles sont supérieurs à 2°
     if angle_A <= 2 or angle_B <= 2 or angle_C <= 2:
         return False
     return True

test_modules/test_mesh_analysis.py

@@ -70,6 +70,14 @@ def test_is_valid_action(self):
         self.assertEqual(Mesh_analysis.isValidAction(cmap, 0, 3), (False, True))
         self.assertEqual(Mesh_analysis.isValidAction(cmap, 2, 3), (False, False))
 
+        #All action test
+        self.assertEqual(Mesh_analysis.isValidAction(cmap, 0, 3), (False, True))
+        self.assertEqual(Mesh_analysis.isValidAction(cmap, 2, 3), (False, False))
+
+        #One action test
+        self.assertEqual(Mesh_analysis.isValidAction(cmap, 0, 4), (False, True))
+        self.assertEqual(Mesh_analysis.isValidAction(cmap, 2, 4), (True, True))
+
     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]]
         faces = [[0, 1, 2], [0, 2, 3], [1, 4, 2]]
@@ -100,6 +108,23 @@ def test_isCollapseOk(self):
         dart_to_test = Dart(cmap, 2)
         self.assertFalse(Mesh_analysis.isCollapseOk(dart_to_test)[0])
 
+    def test_valid_triangle(self):
+        # test Lmax invalid
+        vect_AB = (5.0, 0.0)
+        vect_AC = (2.5, 5.0)
+        vect_BC = (-2.5, 5.0)
+        self.assertFalse(Mesh_analysis.valid_triangle(vect_AB, vect_AC, vect_BC))
+        # test invalid angles
+        vect_AB = (3.0, 0.0)
+        vect_AC = (1.5, 0.05)
+        vect_BC = (-1.5, 0.05)
+        self.assertFalse(Mesh_analysis.valid_triangle(vect_AB, vect_AC, vect_BC))
+        # test valid triangle
+        vect_AB = (3.0, 0.0)
+        vect_AC = (1.5, 3.0)
+        vect_BC = (-1.5, 3.0)
+        self.assertTrue(Mesh_analysis.valid_triangle(vect_AB, vect_AC, vect_BC))
+
 
 if __name__ == '__main__':
     unittest.main()