melchior's comment

Author: BenPinet

bindings/python/src/inspector/topology/brep_topology.hpp

@@ -60,10 +60,18 @@ namespace geode
             .def_readwrite( "lines_not_linked_to_a_unique_vertex",
                 &BRepLinesTopologyInspectionResult::
                     lines_not_linked_to_a_unique_vertex )
+            .def_readwrite( "unique_vertices_linked_to_line_with_wrong_"
+                            "relationship_to_surface",
+                &BRepLinesTopologyInspectionResult::
+                    unique_vertices_linked_to_line_with_wrong_relationship_to_surface )
             .def_readwrite(
                 "unique_vertices_linked_to_a_line_with_invalid_embeddings",
                 &BRepLinesTopologyInspectionResult::
                     unique_vertices_linked_to_a_line_with_invalid_embeddings )
+            .def_readwrite(
+                "unique_vertices_linked_to_a_single_and_invalid_line",
+                &BRepLinesTopologyInspectionResult::
+                    unique_vertices_linked_to_a_single_and_invalid_line )
             .def_readwrite( "unique_vertices_linked_to_several_lines_but_not_"
                             "linked_to_a_corner",
                 &BRepLinesTopologyInspectionResult::
@@ -111,14 +119,6 @@ namespace geode
             .def_readwrite( "unique_vertices_with_incorrect_block_cmvs_count",
                 &BRepBlocksTopologyInspectionResult::
                     unique_vertices_with_incorrect_block_cmvs_count )
-            .def_readwrite(
-                "unique_vertices_linked_to_not_internal_nor_boundary_line",
-                &BRepBlocksTopologyInspectionResult::
-                    unique_vertices_linked_to_not_internal_nor_boundary_line )
-            .def_readwrite(
-                "unique_vertices_linked_to_a_single_and_invalid_line",
-                &BRepBlocksTopologyInspectionResult::
-                    unique_vertices_linked_to_a_single_and_invalid_line )
             .def_readwrite( "unique_vertices_linked_to_surface_with_wrong_"
                             "relationship_to_blocks",
                 &BRepBlocksTopologyInspectionResult::

bindings/python/src/inspector/topology/section_topology.hpp

@@ -64,10 +64,10 @@ namespace geode
             .def_readwrite( "lines_not_linked_to_a_unique_vertex",
                 &SectionLinesTopologyInspectionResult::
                     lines_not_linked_to_a_unique_vertex )
-            .def_readwrite(
-                "unique_vertices_linked_to_not_internal_nor_boundary_line",
+            .def_readwrite( "unique_vertices_linked_to_line_with_wrong_"
+                            "relationship_to_surface",
                 &SectionLinesTopologyInspectionResult::
-                    unique_vertices_linked_to_not_internal_nor_boundary_line )
+                    unique_vertices_linked_to_line_with_wrong_relationship_to_surface )
             .def_readwrite(
                 "unique_vertices_linked_to_a_line_with_invalid_embeddings",
                 &SectionLinesTopologyInspectionResult::

bindings/python/tests/test-py-brep.py

@@ -55,6 +55,10 @@ def lines_topological_validity(result, verbose):
     nb_issues += (
         result.unique_vertices_linked_to_a_line_with_invalid_embeddings.nb_issues()
     )
+    nb_issues += result.unique_vertices_linked_to_a_single_and_invalid_line.nb_issues()
+    nb_issues += (
+        result.unique_vertices_linked_to_line_with_wrong_relationship_to_surface.nb_issues()
+    )
     nb_issues += (
         result.unique_vertices_linked_to_several_lines_but_not_linked_to_a_corner.nb_issues()
     )
@@ -90,10 +94,6 @@ def blocks_topological_validity(result, verbose):
         result.unique_vertices_part_of_two_blocks_and_no_boundary_surface.nb_issues()
     )
     nb_issues += result.unique_vertices_with_incorrect_block_cmvs_count.nb_issues()
-    nb_issues += result.unique_vertices_linked_to_a_single_and_invalid_line.nb_issues()
-    nb_issues += (
-        result.unique_vertices_linked_to_not_internal_nor_boundary_line.nb_issues()
-    )
     nb_issues += (
         result.unique_vertices_linked_to_a_single_and_invalid_surface.nb_issues()
     )

bindings/python/tests/test-py-section.py

@@ -22,133 +22,158 @@
 import os
 import sys
 import platform
+
 if sys.version_info >= (3, 8, 0) and platform.system() == "Windows":
-    for path in [x.strip() for x in os.environ['PATH'].split('') if x]:
+    for path in [x.strip() for x in os.environ["PATH"].split("") if x]:
         os.add_dll_directory(path)
 
 import opengeode
 import opengeode_inspector_py_inspector as inspector
 
 
-def corners_topological_validity( result, verbose ): 
+def corners_topological_validity(result, verbose):
     nb_issues = 0
-    for corner_issue in result.corners_not_linked_to_a_unique_vertex.issues_map() :
+    for corner_issue in result.corners_not_linked_to_a_unique_vertex.issues_map():
         nb_issues += corner_issue[1].nb_issues()
     nb_issues += result.corners_not_meshed.nb_issues()
     nb_issues += result.unique_vertices_linked_to_not_boundary_line_corner.nb_issues()
     nb_issues += result.unique_vertices_linked_to_multiple_corners.nb_issues()
     nb_issues += result.unique_vertices_linked_to_multiple_internals_corner.nb_issues()
-    nb_issues += result.unique_vertices_linked_to_not_internal_nor_boundary_corner.nb_issues()
-    print( "Section Corners Topology check: ", nb_issues, " issues." )
-    if verbose :
-        print( result.string(), "\n" )
+    nb_issues += (
+        result.unique_vertices_linked_to_not_internal_nor_boundary_corner.nb_issues()
+    )
+    print("Section Corners Topology check: ", nb_issues, " issues.")
+    if verbose:
+        print(result.string(), "\n")
     return nb_issues
 
-def lines_topological_validity( result, verbose ):
+
+def lines_topological_validity(result, verbose):
     nb_issues = 0
-    for issue in result.lines_not_linked_to_a_unique_vertex.issues_map() :
+    for issue in result.lines_not_linked_to_a_unique_vertex.issues_map():
         nb_issues += issue[1].nb_issues()
     nb_issues += result.lines_not_meshed.nb_issues()
-    nb_issues += result.unique_vertices_linked_to_a_line_with_invalid_embeddings.nb_issues()
+    nb_issues += (
+        result.unique_vertices_linked_to_a_line_with_invalid_embeddings.nb_issues()
+    )
     nb_issues += result.unique_vertices_linked_to_a_single_and_invalid_line.nb_issues()
-    nb_issues += result.unique_vertices_linked_to_not_internal_nor_boundary_line.nb_issues()
-    nb_issues += result.unique_vertices_linked_to_several_lines_but_not_linked_to_a_corner.nb_issues()
-    print( "Section Lines Topology check: ", nb_issues, " issues." )
-    if verbose : print( result.string(), "\n" )
+    nb_issues += (
+        result.unique_vertices_linked_to_line_with_wrong_relationship_to_surface.nb_issues()
+    )
+    nb_issues += (
+        result.unique_vertices_linked_to_several_lines_but_not_linked_to_a_corner.nb_issues()
+    )
+    print("Section Lines Topology check: ", nb_issues, " issues.")
+    if verbose:
+        print(result.string(), "\n")
     return nb_issues
 
-def surfaces_topological_validity( result, verbose ):
+
+def surfaces_topological_validity(result, verbose):
     nb_issues = 0
-    for issue in result.surfaces_not_linked_to_a_unique_vertex.issues_map() :
+    for issue in result.surfaces_not_linked_to_a_unique_vertex.issues_map():
         nb_issues += issue[1].nb_issues()
     nb_issues += result.surfaces_not_meshed.nb_issues()
-    nb_issues += result.unique_vertices_linked_to_a_line_but_is_not_on_a_surface_border.nb_issues()
-    nb_issues += result.unique_vertices_linked_to_a_surface_with_invalid_embbedings.nb_issues()
-    print( "Section Surfaces Topology check: ", nb_issues, " issues." )
-    if verbose :
-        print( result.string(), "\n" )
+    nb_issues += (
+        result.unique_vertices_linked_to_a_line_but_is_not_on_a_surface_border.nb_issues()
+    )
+    nb_issues += (
+        result.unique_vertices_linked_to_a_surface_with_invalid_embbedings.nb_issues()
+    )
+    print("Section Surfaces Topology check: ", nb_issues, " issues.")
+    if verbose:
+        print(result.string(), "\n")
     return nb_issues
 
-def launch_topological_validity_checks( result, verbose ) :
-    nb_issues = corners_topological_validity( result.corners, verbose )
-    nb_issues += lines_topological_validity( result.lines, verbose )
-    nb_issues += surfaces_topological_validity( result.surfaces, verbose )
+
+def launch_topological_validity_checks(result, verbose):
+    nb_issues = corners_topological_validity(result.corners, verbose)
+    nb_issues += lines_topological_validity(result.lines, verbose)
+    nb_issues += surfaces_topological_validity(result.surfaces, verbose)
     return nb_issues
 
-def meshes_adjacencies_validity( result, verbose ):
+
+def meshes_adjacencies_validity(result, verbose):
     nb_issues = 0
-    for issue in result.surfaces_edges_with_wrong_adjacencies.issues_map() :
+    for issue in result.surfaces_edges_with_wrong_adjacencies.issues_map():
         nb_issues += issue[1].nb_issues()
-    print( "Section meshes adjacencies check: ", nb_issues, " issues." )
-    if verbose :
-        print( result.string(), "\n" )
+    print("Section meshes adjacencies check: ", nb_issues, " issues.")
+    if verbose:
+        print(result.string(), "\n")
     return nb_issues
 
-def meshes_degenerations_validity( result, verbose ):
+
+def meshes_degenerations_validity(result, verbose):
     nb_issues = 0
-    for degenerated_elements in result.degenerated_edges.issues_map() :
+    for degenerated_elements in result.degenerated_edges.issues_map():
         nb_issues += degenerated_elements[1].nb_issues()
-    for degenerated_elements in result.degenerated_polygons.issues_map() :
+    for degenerated_elements in result.degenerated_polygons.issues_map():
         nb_issues += degenerated_elements[1].nb_issues()
-    print("Section meshes degenerated elements check: ", nb_issues, " issues." )
-    if verbose :
-        print( result.string(), "\n" )
+    print("Section meshes degenerated elements check: ", nb_issues, " issues.")
+    if verbose:
+        print(result.string(), "\n")
     return nb_issues
 
-def meshes_intersections_validity( result, verbose ) :
+
+def meshes_intersections_validity(result, verbose):
     nb_issues = 0
     nb_issues += result.elements_intersections.nb_issues()
 
-    print( "Section meshes element intersections check: ", nb_issues, " issues." )
-    if verbose :
-        print( result.string(), "\n" )
+    print("Section meshes element intersections check: ", nb_issues, " issues.")
+    if verbose:
+        print(result.string(), "\n")
     return nb_issues
 
-def meshes_manifolds_validity( result, verbose ):
+
+def meshes_manifolds_validity(result, verbose):
     nb_issues = 0
-    for issue in result.meshes_non_manifold_vertices.issues_map() :
+    for issue in result.meshes_non_manifold_vertices.issues_map():
         nb_issues += issue[1].nb_issues()
-    for issue in result.meshes_non_manifold_edges.issues_map() :
+    for issue in result.meshes_non_manifold_edges.issues_map():
         nb_issues += issue[1].nb_issues()
-    print( "Section meshes non manifolds check: ", nb_issues, " issues." )
-    if verbose :
-        print( result.string(), "\n" )
+    print("Section meshes non manifolds check: ", nb_issues, " issues.")
+    if verbose:
+        print(result.string(), "\n")
     return nb_issues
 
-def meshes_colocations_validity( result, verbose ): 
+
+def meshes_colocations_validity(result, verbose):
     nb_issues = 0
-    for issue in result.colocated_points_groups.issues_map() :
+    for issue in result.colocated_points_groups.issues_map():
         nb_issues += issue[1].nb_issues()
-    print( "Section meshes Colocations check: ", nb_issues, " issues." )
-    if verbose :
-        print( result.string(), "\n" )
+    print("Section meshes Colocations check: ", nb_issues, " issues.")
+    if verbose:
+        print(result.string(), "\n")
     return nb_issues
 
-def meshes_unique_vertices_validity( result, verbose ):
+
+def meshes_unique_vertices_validity(result, verbose):
     nb_issues = 0
-    for issue in result.colocated_unique_vertices_groups.issues() :
+    for issue in result.colocated_unique_vertices_groups.issues():
         nb_issues += len(issue)
     nb_issues += result.unique_vertices_linked_to_different_points.nb_issues()
-    print("Section unique vertices check: ", nb_issues, " issues." )
-    if verbose :
-        print( result.string(), "\n" )
+    print("Section unique vertices check: ", nb_issues, " issues.")
+    if verbose:
+        print(result.string(), "\n")
     return nb_issues
 
-def launch_component_meshes_validity_checks(result, verbose ):
-    nb_issues = meshes_adjacencies_validity( result.meshes_adjacencies, verbose )
-    nb_issues = meshes_degenerations_validity( result.meshes_degenerations, verbose )
-    nb_issues += meshes_intersections_validity( result.meshes_intersections, verbose )
-    nb_issues += meshes_manifolds_validity( result.meshes_non_manifolds, verbose )
-    nb_issues += meshes_colocations_validity( result.meshes_colocation, verbose )
+
+def launch_component_meshes_validity_checks(result, verbose):
+    nb_issues = meshes_adjacencies_validity(result.meshes_adjacencies, verbose)
+    nb_issues = meshes_degenerations_validity(result.meshes_degenerations, verbose)
+    nb_issues += meshes_intersections_validity(result.meshes_intersections, verbose)
+    nb_issues += meshes_manifolds_validity(result.meshes_non_manifolds, verbose)
+    nb_issues += meshes_colocations_validity(result.meshes_colocation, verbose)
     nb_issues += meshes_unique_vertices_validity(
-        result.unique_vertices_colocation, verbose )
+        result.unique_vertices_colocation, verbose
+    )
     return nb_issues
 
+
 def check_section(verbose):
     test_dir = os.path.dirname(__file__)
     data_dir = os.path.abspath(os.path.join(test_dir, "../../../tests/data"))
-    model_section = opengeode.load_section(
-        data_dir + "/vertical_lines.og_sctn")
+    model_section = opengeode.load_section(data_dir + "/vertical_lines.og_sctn")
     result = inspector.inspect_section(model_section)
     section_inspector = inspector.SectionInspector(model_section)
     if section_inspector.section_topology_is_valid():
@@ -158,14 +183,16 @@ def check_section(verbose):
     nb_issues = launch_topological_validity_checks(result.topology, verbose)
     if nb_issues != 0:
         raise ValueError(
-            "[Test] There should be no topological issues with vertical_lines.og_sctn")
+            "[Test] There should be no topological issues with vertical_lines.og_sctn"
+        )
     nb_issues = launch_component_meshes_validity_checks(result.meshes, verbose)
     if nb_issues != 0:
         raise ValueError(
-            "[Test] There should be no mesh issues with vertical_lines.og_sctn")
+            "[Test] There should be no mesh issues with vertical_lines.og_sctn"
+        )
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     inspector.InspectorInspectorLibrary.initialize()
     verbose = False
     check_section(verbose)