Improve test coverage

Author: ArzhelaR

test_modules/test_quadrangular_mesh_analysis.py

@@ -4,7 +4,7 @@
 from mesh_model.mesh_struct.mesh import Mesh
 from mesh_model.mesh_struct.mesh_elements import Dart
 from mesh_model.mesh_analysis.quadmesh_analysis import QuadMeshOldAnalysis
-from environment.actions.triangular_actions import split_edge_ids
+from environment.actions.quadrangular_actions import split_edge_ids, flip_edge_cw_ids
 from view.mesh_plotter.mesh_plots import plot_mesh
 from mesh_model.reader import read_gmsh
 
@@ -31,30 +31,39 @@ def test_is_valid_action(self):
         filename = os.path.join(TESTFILE_FOLDER, 't1_quad.msh')
         cmap = read_gmsh(filename)
         qma = QuadMeshOldAnalysis(cmap)
+
         #Boundary dart
         self.assertEqual(qma.isValidAction(20, 0), (False, True))
 
-        # Flip test
+        # Flip Clockwise test
         self.assertEqual(qma.isValidAction(3, 0), (True, True))
         self.assertEqual(qma.isValidAction(27, 0), (False, True))
 
-        #Split test
-        self.assertEqual(qma.isValidAction(0, 1), (True, True))
+        # Flip Counterclockwise test
+        self.assertEqual(qma.isValidAction(3, 1), (True, True))
         self.assertEqual(qma.isValidAction(27, 1), (False, True))
 
-        #Collapse test
+        #Split test
         self.assertEqual(qma.isValidAction(0, 2), (True, True))
-        plot_mesh(cmap)
         self.assertEqual(qma.isValidAction(27, 2), (False, True))
 
-        #All action test
+        #Collapse test
+        self.assertEqual(qma.isValidAction(0, 3), (True, True))
+        plot_mesh(cmap)
         self.assertEqual(qma.isValidAction(27, 3), (False, True))
-        self.assertEqual(qma.isValidAction(9, 3), (True, True))
+
+        #Cleanup test action id = 4
+
+        #All action test
+        self.assertEqual(qma.isValidAction(27, 5), (False, True))
+        flip_edge_cw_ids(qma,13,37)
+        self.assertEqual(qma.isValidAction(66, 5), (False, False))
+        self.assertEqual(qma.isValidAction(9, 5), (True, True))
 
         #One action test
-        self.assertEqual(qma.isValidAction(0, 4), (True, True))
-        self.assertEqual(qma.isValidAction(9, 4), (True, True))
-        self.assertEqual(qma.isValidAction(27, 4), (False, True))
+        self.assertEqual(qma.isValidAction(0, 6), (True, True))
+        self.assertEqual(qma.isValidAction(9, 6), (True, True))
+        self.assertEqual(qma.isValidAction(27, 6), (False, True))
 
         #Invalid action
         with self.assertRaises(ValueError):

test_modules/test_triangular_mesh_analysis.py

@@ -1,7 +1,7 @@
 import unittest
 
 from mesh_model.mesh_struct.mesh import Mesh
-from mesh_model.mesh_struct.mesh_elements import Dart
+from mesh_model.mesh_struct.mesh_elements import Dart, Node
 from mesh_model.mesh_analysis.trimesh_analysis import TriMeshQualityAnalysis, TriMeshOldAnalysis
 from environment.actions.triangular_actions import split_edge_ids
 from view.mesh_plotter.mesh_plots import plot_mesh
@@ -155,6 +155,42 @@ def test_isTruncated(self):
             darts_list.append(d_info[0])
         self.assertFalse(m_analysis.isTruncated(darts_list))
 
+    def test_get_geometric_quality(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], [0, 1, 4], [0, 4, 1]]
+        cmap = Mesh(nodes, faces)
+        plot_mesh(cmap)
+        m_analysis = TriMeshQualityAnalysis(cmap)
+
+        # Half flat
+        d_to_test = Dart(cmap, 0)
+        self.assertEqual(m_analysis.get_dart_geometric_quality(d_to_test), 4)
+
+        # Full flat
+        d_to_test = Dart(cmap, 11)
+        self.assertEqual(m_analysis.get_dart_geometric_quality(d_to_test), 6)
+
+        nodes = [[0.0, 0.0], [1.0, 0.0], [1.0, 1.0], [0.0, 1.0]]
+        faces = [[0, 1, 2], [2, 1, 3]]
+        cmap = Mesh(nodes, faces)
+        plot_mesh(cmap)
+        m_analysis = TriMeshQualityAnalysis(cmap)
+
+        # Crossed
+        d_to_test = Dart(cmap, 1)
+        self.assertEqual(m_analysis.get_dart_geometric_quality(d_to_test), 3)
+
+    def test_find_star_vertex(self):
+        # Polygon with ker
+        nodes = [[0.0, 0.0], [1.0, 1.0], [1.0, -1.0], [0.0, -2.0], [-1.0, 0.0], [-0.5, 0.5], [-0.25, -0.25]]
+        faces = [[0, 2, 1], [0, 3, 2], [0, 4, 3], [0, 5, 4], [0, 1, 5]]
+        cmap = Mesh(nodes, faces)
+        plot_mesh(cmap)
+        m_analysis = TriMeshQualityAnalysis(cmap)
+        n_to_test = Node(cmap, 0)
+        self.assertTrue(m_analysis.find_star_vertex(n_to_test)[0])
+
+
 class TestMeshOldAnalysis(unittest.TestCase):
 
     def test_mesh_regular_score(self):