fix(ModelColocation): Upgraded the verbose mode for the ModelComponentsMeshColocation and added a filter to the colocated points to remove those with the same unique vertices from the list.

fix(ModelColocation): Upgraded the verbose mode for the ModelComponentsMeshColocation and added a filter to the colocated points to remove those with the same unique vertices from the list.

Author: MelchiorSchuh

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

@@ -235,8 +235,8 @@ def check_a1_vertices_topology():
     else:
         print( "model_A1 topology is invalid." )
     nb_model_issues = launch_topological_validity_checks( brep_inspector )
-    if nb_model_issues != 1254:
-        raise ValueError( "[Test] model model_A1 should have 1254 unique vertices with topological problems." )
+    if nb_model_issues != 1998:
+        raise ValueError( "[Test] model model_A1 should have 1998 unique vertices with topological problems." )
     nb_component_meshes_issues = launch_component_meshes_validity_checks( brep_inspector )
     if nb_component_meshes_issues != 0:
         raise ValueError( "[Test] model model_A1 should have 0 component meshes issues." )
@@ -251,8 +251,8 @@ def check_a1_valid_vertices_topology():
     else:
         print( "model_A1_valid topology is invalid." )
     nb_model_issues = launch_topological_validity_checks( brep_inspector )
-    if nb_model_issues != 1254:
-        raise ValueError( "[Test] model model_A1_valid should have 1254 unique vertices with topological problems." )
+    if nb_model_issues != 1998:
+        raise ValueError( "[Test] model model_A1_valid should have 1998 unique vertices with topological problems." )
     nb_component_meshes_issues = launch_component_meshes_validity_checks( brep_inspector )
     if nb_component_meshes_issues != 0:
         raise ValueError( "[Test] model model_A1_valid should have 0 component meshes issues." )
@@ -270,8 +270,8 @@ def check_mss_vertices_topology():
     if nb_model_issues != 17:
         raise ValueError( "[Test] model mss.og_strm should have 17 unique vertices with topological problems." )
     nb_component_meshes_issues = launch_component_meshes_validity_checks( brep_inspector )
-    if nb_component_meshes_issues != 148:
-        raise ValueError( "[Test] model mss should have 148 component meshes issues." )
+    if nb_component_meshes_issues != 0:
+        raise ValueError( "[Test] model mss should have no component meshes issues." )
 
 def check_model_D_vertices_topology():
     test_dir = os.path.dirname(__file__)
@@ -286,8 +286,8 @@ def check_model_D_vertices_topology():
     if nb_model_issues != 0:
         raise ValueError( "[Test] model model_D.og_brep should have 0 unique vertices with topological problems." )
     nb_component_meshes_issues = launch_component_meshes_validity_checks( brep_inspector )
-    if nb_component_meshes_issues != 2:
-        raise ValueError( "[Test] model_D should have 2 component meshes issues." )
+    if nb_component_meshes_issues != 0:
+        raise ValueError( "[Test] model_D should have no component meshes issues." )
 
 if __name__ == '__main__':
     check_a1_vertices_topology()

bindings/python/tests/test-py-edgedcurve-colocation.py

@@ -59,7 +59,7 @@ def check_colocation2D():
     colocation_inspector = inspector.EdgedCurveColocation2D ( curve )
     if not colocation_inspector.mesh_has_colocated_points():
         raise ValueError( "[Test] EdgedCurve doesn't have colocated points whereas it should have several." )
-    if not colocation_inspector.nb_colocated_points() == 3:
+    if not colocation_inspector.nb_colocated_points() == 5:
         raise ValueError( "[Test] EdgedCurve has wrong number of colocated points." )
     first_colocated_points_group = [ 0, 1, 6 ]
     if not colocation_inspector.colocated_points_groups()[0] == first_colocated_points_group:
@@ -101,7 +101,7 @@ def check_colocation3D():
     colocation_inspector = inspector.EdgedCurveColocation3D ( curve )
     if not colocation_inspector.mesh_has_colocated_points():
         raise ValueError( "[Test] (3D) EdgedCurve doesn't have colocated points whereas it should have several." )
-    if not colocation_inspector.nb_colocated_points() == 3:
+    if not colocation_inspector.nb_colocated_points() == 5:
         raise ValueError( "[Test] (3D) EdgedCurve has wrong number of colocated points." )
     first_colocated_points_group = [ 0, 1, 6 ]
     if not colocation_inspector.colocated_points_groups()[0] == first_colocated_points_group:

bindings/python/tests/test-py-pointset-colocation.py

@@ -60,7 +60,7 @@ def check_colocation2D():
     colocation_inspector = inspector.PointSetColocation2D( pointset )
     if not colocation_inspector.mesh_has_colocated_points():
         raise ValueError( "[Test] PointSet doesn't have colocated points whereas it should have several." )
-    if not colocation_inspector.nb_colocated_points() == 3:
+    if not colocation_inspector.nb_colocated_points() == 5:
         raise ValueError( "[Test] PointSet has wrong number of colocated points." )
     first_colocated_points_group = [ 0, 1, 6 ]
     if not colocation_inspector.colocated_points_groups()[0] == first_colocated_points_group:
@@ -102,7 +102,7 @@ def check_colocation3D():
     colocation_inspector = inspector.PointSetColocation3D( pointset )
     if not colocation_inspector.mesh_has_colocated_points():
         raise ValueError( "[Test] (3D) PointSet doesn't have colocated points whereas it should have several." )
-    if not colocation_inspector.nb_colocated_points() == 3:
+    if not colocation_inspector.nb_colocated_points() == 5:
         raise ValueError( "[Test] (3D) PointSet has wrong number of colocated points." )
     first_colocated_points_group = [ 0, 1, 6 ]
     if not colocation_inspector.colocated_points_groups()[0] == first_colocated_points_group:

bindings/python/tests/test-py-solid-colocation.py

@@ -61,7 +61,7 @@ def check_colocation():
     colocation_inspector = inspector.SolidMeshColocation3D( solid )
     if not colocation_inspector.mesh_has_colocated_points():
         raise ValueError( "[Test] Solid doesn't have colocated points whereas it should have several." )
-    if not colocation_inspector.nb_colocated_points() == 3:
+    if not colocation_inspector.nb_colocated_points() == 5:
         raise ValueError( "[Test] Solid has wrong number of colocated points." )
     first_colocated_points_group = [ 0, 1, 6 ]
     if not colocation_inspector.colocated_points_groups()[0] == first_colocated_points_group:

bindings/python/tests/test-py-surface-colocation.py

@@ -59,7 +59,7 @@ def check_colocation2D():
     colocation_inspector = inspector.SurfaceMeshColocation2D( surface )
     if not colocation_inspector.mesh_has_colocated_points():
         raise ValueError( "[Test] Surface doesn't have colocated points whereas it should have several." )
-    if not colocation_inspector.nb_colocated_points() == 3:
+    if not colocation_inspector.nb_colocated_points() == 5:
         raise ValueError( "[Test] Surface has wrong number of colocated points." )
     first_colocated_points_group = [ 0, 1, 6 ]
     if not colocation_inspector.colocated_points_groups()[0] == first_colocated_points_group:
@@ -101,7 +101,7 @@ def check_colocation3D():
     colocation_inspector = inspector.SurfaceMeshColocation3D( surface )
     if not colocation_inspector.mesh_has_colocated_points():
         raise ValueError( "[Test] (3D) Surface doesn't have colocated points whereas it should have several." )
-    if not colocation_inspector.nb_colocated_points() == 3:
+    if not colocation_inspector.nb_colocated_points() == 5:
         raise ValueError( "[Test] (3D) Surface has wrong number of colocated points." )
     first_colocated_points_group = [ 0, 1, 6 ]
     if not colocation_inspector.colocated_points_groups()[0] == first_colocated_points_group:

include/geode/inspector/topology/brep_topology.h

@@ -56,6 +56,8 @@ namespace geode
 
         bool brep_meshed_components_are_linked_to_a_unique_vertex() const;
 
+        bool brep_unique_vertices_are_linked_to_a_component_vertex() const;
+
         index_t nb_corners_not_linked_to_a_unique_vertex() const;
 
         index_t nb_lines_meshed_but_not_linked_to_a_unique_vertex() const;
@@ -64,6 +66,11 @@ namespace geode
 
         index_t nb_blocks_meshed_but_not_linked_to_a_unique_vertex() const;
 
+        index_t nb_unique_vertices_not_linked_to_a_component_vertex() const;
+
+        std::vector< index_t >
+            unique_vertices_not_linked_to_a_component_vertex() const;
+
         std::vector< index_t >
             invalid_components_topology_unique_vertices() const;
 

include/geode/inspector/topology/section_topology.h

@@ -56,12 +56,19 @@ namespace geode
 
         bool section_meshed_components_are_linked_to_a_unique_vertex() const;
 
+        bool section_unique_vertices_are_linked_to_a_component_vertex() const;
+
         index_t nb_corners_not_linked_to_a_unique_vertex() const;
 
         index_t nb_lines_meshed_but_not_linked_to_a_unique_vertex() const;
 
         index_t nb_surfaces_meshed_but_not_linked_to_a_unique_vertex() const;
 
+        index_t nb_unique_vertices_not_linked_to_a_component_vertex() const;
+
+        std::vector< index_t >
+            unique_vertices_not_linked_to_a_component_vertex() const;
+
         std::vector< index_t >
             invalid_components_topology_unique_vertices() const;
 

src/bin/geode-inspector-brep.cpp

@@ -63,7 +63,7 @@ void inspect_brep( const geode::BRep& brep )
 {
     const auto verbose = absl::GetFlag( FLAGS_verbose );
     const geode::BRepInspector brep_inspector{ brep, verbose };
-    absl::InlinedVector< async::task< void >, 27 > tasks;
+    absl::InlinedVector< async::task< void >, 28 > tasks;
     if( absl::GetFlag( FLAGS_component_linking ) )
     {
         tasks.emplace_back( async::spawn( [&brep_inspector] {
@@ -93,6 +93,13 @@ void inspect_brep( const geode::BRep& brep )
             geode::Logger::info(
                 nb_blocks, " blocks meshed but not linked to a unique vertex" );
         } ) );
+        tasks.emplace_back( async::spawn( [&brep_inspector] {
+            const auto nb_unlinked_uv =
+                brep_inspector
+                    .nb_unique_vertices_not_linked_to_a_component_vertex();
+            geode::Logger::info( nb_unlinked_uv,
+                " unique vertices not linked to a component mesh vertex" );
+        } ) );
     }
     if( absl::GetFlag( FLAGS_unique_vertices_colocation ) )
     {

src/bin/geode-inspector-edgedcurve.cpp

@@ -58,7 +58,11 @@ void inspect_edgedcurve( const geode::EdgedCurve< dimension >& edgedcurve )
     if( absl::GetFlag( FLAGS_colocation ) )
     {
         tasks.emplace_back( async::spawn( [&inspector] {
-            const auto nb = inspector.nb_colocated_points();
+            geode::index_t nb{ 0 };
+            for( const auto& pt_group : inspector.colocated_points_groups() )
+            {
+                nb += pt_group.size();
+            }
             geode::Logger::info( nb, " colocated points" );
         } ) );
     }

src/bin/geode-inspector-pointset.cpp

@@ -51,7 +51,11 @@ void inspect_pointset( const geode::PointSet< dimension >& pointset )
 {
     const auto verbose = absl::GetFlag( FLAGS_verbose );
     const geode::PointSetInspector< dimension > inspector{ pointset, verbose };
-    const auto nb = inspector.nb_colocated_points();
+    geode::index_t nb{ 0 };
+    for( const auto& pt_group : inspector.colocated_points_groups() )
+    {
+        nb += pt_group.size();
+    }
     geode::Logger::info( nb, " colocated points" );
 }