From 1c8fc4326dd48336203878b99d687715bef50f2e Mon Sep 17 00:00:00 2001 From: Francois Bonneau Date: Tue, 28 Oct 2025 14:22:32 +0100 Subject: [PATCH 01/14] fix(ErrorMessage): add component name in log message --- include/geode/inspector/information.hpp | 4 +-- .../adjacency/brep_meshes_adjacency.cpp | 7 +++-- .../adjacency/section_meshes_adjacency.cpp | 2 +- .../component_meshes_colocation.cpp | 30 +++++++++---------- .../degeneration/brep_meshes_degeneration.cpp | 10 ++++--- .../degeneration/edgedcurve_degeneration.cpp | 2 +- .../section_meshes_degeneration.cpp | 2 +- .../degeneration/solid_degeneration.cpp | 1 - .../degeneration/surface_degeneration.cpp | 6 ++-- .../internal/component_meshes_adjacency.cpp | 6 ++-- .../component_meshes_degeneration.cpp | 10 ++++--- .../internal/component_meshes_manifold.cpp | 6 ++-- .../intersections/model_intersections.cpp | 25 ++++++++++------ .../manifold/section_meshes_manifold.cpp | 2 +- .../manifold/solid_edge_manifold.cpp | 7 ++--- .../manifold/solid_facet_manifold.cpp | 2 +- .../manifold/surface_edge_manifold.cpp | 6 ++-- .../brep_meshes_negative_elements.cpp | 7 +++-- .../section_meshes_negative_elements.cpp | 7 +++-- .../solid_negative_elements.cpp | 1 - .../surface_negative_elements.cpp | 6 ++-- 21 files changed, 81 insertions(+), 68 deletions(-) diff --git a/include/geode/inspector/information.hpp b/include/geode/inspector/information.hpp index 22e3cd26..160feaa8 100644 --- a/include/geode/inspector/information.hpp +++ b/include/geode/inspector/information.hpp @@ -72,7 +72,7 @@ namespace geode { if( issues_.empty() ) { - return absl::StrCat( description_, " -> No Issues :) \n" ); + return absl::StrCat( "No issues with ", description_, "\n" ); } auto message = absl::StrCat( description_ ); for( const auto& issue : messages_ ) @@ -137,7 +137,7 @@ namespace geode { if( issues_map_.empty() ) { - return absl::StrCat( description_, " -> No Issues :) \n" ); + return absl::StrCat( "No issues with ", description_, "\n" ); } auto message = absl::StrCat( description_ ); for( const auto& issues : issues_map_ ) diff --git a/src/geode/inspector/criterion/adjacency/brep_meshes_adjacency.cpp b/src/geode/inspector/criterion/adjacency/brep_meshes_adjacency.cpp index a15797d2..53a4c346 100644 --- a/src/geode/inspector/criterion/adjacency/brep_meshes_adjacency.cpp +++ b/src/geode/inspector/criterion/adjacency/brep_meshes_adjacency.cpp @@ -62,7 +62,7 @@ namespace geode { return message; } - return "No adjacency issues in model component meshes \n"; + return "No adjacency issues in model \n"; } std::string BRepMeshesAdjacencyInspectionResult::inspection_type() const @@ -89,8 +89,9 @@ namespace geode auto wrong_adjacencies = inspector.polyhedron_facets_with_wrong_adjacency(); wrong_adjacencies.set_description( - absl::StrCat( "Block with uuid ", block.id().string(), - " polyhedron facets adjacencies issues" ) ); + absl::StrCat( "Block ", block.name(), + " polyhedron facets adjacencies issues - uuid ", + block.id().string() ) ); const auto& mesh = block.mesh(); for( const auto polyhedron_id : Range{ mesh.nb_polyhedra() } ) { diff --git a/src/geode/inspector/criterion/adjacency/section_meshes_adjacency.cpp b/src/geode/inspector/criterion/adjacency/section_meshes_adjacency.cpp index 7d69be5b..d227df47 100644 --- a/src/geode/inspector/criterion/adjacency/section_meshes_adjacency.cpp +++ b/src/geode/inspector/criterion/adjacency/section_meshes_adjacency.cpp @@ -53,7 +53,7 @@ namespace geode { return surfaces_edges_with_wrong_adjacencies.string(); } - return "No adjacency issues in model component meshes \n"; + return "No adjacency issues in model \n"; } std::string SectionMeshesAdjacencyInspectionResult::inspection_type() const diff --git a/src/geode/inspector/criterion/colocation/component_meshes_colocation.cpp b/src/geode/inspector/criterion/colocation/component_meshes_colocation.cpp index afb92f52..893c79dd 100644 --- a/src/geode/inspector/criterion/colocation/component_meshes_colocation.cpp +++ b/src/geode/inspector/criterion/colocation/component_meshes_colocation.cpp @@ -112,8 +112,8 @@ namespace if( !colocated_pts.empty() ) { geode::InspectionIssues< std::vector< geode::index_t > > - line_issues{ absl::StrCat( "Line with uuid ", - line.id().string(), " colocated vertices" ) }; + line_issues{ absl::StrCat( "Line ", line.name(), + " colocated vertices - uuid ", line.id().string() ) }; const auto& line_mesh = line.mesh(); for( const auto& colocated_points_group : colocated_pts ) { @@ -124,12 +124,12 @@ namespace &point_group_string, " ", point_index ); } line_issues.add_issue( colocated_points_group, - absl::StrCat( "Line with uuid ", line.id().string(), + absl::StrCat( "Line ", line.name(), " has vertices with indices", point_group_string, " which are colocated at position [", line_mesh.point( colocated_points_group[0] ) .string(), - "]." ) ); + "] - uuid ", line.id().string() ) ); } components_colocated_points.add_issues_to_map( line.id(), std::move( line_issues ) ); @@ -147,8 +147,9 @@ namespace if( !colocated_pts.empty() ) { geode::InspectionIssues< std::vector< geode::index_t > > - surface_issues{ absl::StrCat( "Surface with uuid ", - surface.id().string(), " colocated vertices" ) }; + surface_issues{ absl::StrCat( "Surface ", surface.name(), + " colocated vertices - uuid ", + surface.id().string() ) }; const auto& surface_mesh = surface.mesh(); for( const auto& colocated_points_group : colocated_pts ) { @@ -159,13 +160,12 @@ namespace &point_group_string, " ", point_index ); } surface_issues.add_issue( colocated_points_group, - absl::StrCat( "Surface with uuid ", - surface.id().string(), " has vertices with indices", - point_group_string, + absl::StrCat( "Surface ", surface.name(), + " has vertices with indices", point_group_string, " which are colocated at position [", surface_mesh.point( colocated_points_group[0] ) .string(), - "]." ) ); + "] - uuid ", surface.id().string() ) ); } components_colocated_points.add_issues_to_map( surface.id(), std::move( surface_issues ) ); @@ -198,8 +198,8 @@ namespace if( !colocated_pts.empty() ) { geode::InspectionIssues< std::vector< geode::index_t > > - block_issues{ absl::StrCat( "Block with uuid ", - block.id().string(), " colocated vertices" ) }; + block_issues{ absl::StrCat( "Block ", block.name(), + " colocated vertices - uuid ", block.id().string() ) }; const auto& block_mesh = block.mesh(); for( const auto& colocated_points_group : colocated_pts ) { @@ -210,12 +210,12 @@ namespace &point_group_string, " ", point_index ); } block_issues.add_issue( colocated_points_group, - absl::StrCat( "Block with uuid ", block.id().string(), + absl::StrCat( "Block ", block.name(), " has vertices with indices", point_group_string, " which are colocated at position [", block_mesh.point( colocated_points_group[0] ) .string(), - "]." ) ); + "] - uuid ", block.id().string() ) ); } components_colocated_points.add_issues_to_map( block.id(), std::move( block_issues ) ); @@ -238,7 +238,7 @@ namespace geode { return colocated_points_groups.string(); } - return "No issues of colocation in model component meshes \n"; + return "No issues of colocation in model \n"; } std::string MeshesColocationInspectionResult::inspection_type() const diff --git a/src/geode/inspector/criterion/degeneration/brep_meshes_degeneration.cpp b/src/geode/inspector/criterion/degeneration/brep_meshes_degeneration.cpp index 3e51f74b..ceee0bbe 100644 --- a/src/geode/inspector/criterion/degeneration/brep_meshes_degeneration.cpp +++ b/src/geode/inspector/criterion/degeneration/brep_meshes_degeneration.cpp @@ -59,7 +59,7 @@ namespace geode } if( message.empty() ) { - return "No degeneration issues in model component meshes \n"; + return "No degeneration issues in model \n"; } return message; } @@ -101,14 +101,16 @@ namespace geode } const geode::SolidMeshDegeneration3D inspector{ mesh }; auto small_edges = inspector.small_edges( threshold ); - small_edges.set_description( absl::StrCat( - "Block ", block.id().string(), " small edges" ) ); + small_edges.set_description( + absl::StrCat( "Block ", block.name(), + " small edges - uuid ", block.id().string() ) ); small_edges_map.add_issues_to_map( block.id(), std::move( small_edges ) ); auto small_polyhedra = inspector.small_height_polyhedra( threshold ); small_polyhedra.set_description( absl::StrCat( "Block ", - block.id().string(), " small height polyhedra" ) ); + block.name(), " small height polyhedra - uuid ", + block.id().string() ) ); small_polyhedra_map.add_issues_to_map( block.id(), std::move( small_polyhedra ) ); } diff --git a/src/geode/inspector/criterion/degeneration/edgedcurve_degeneration.cpp b/src/geode/inspector/criterion/degeneration/edgedcurve_degeneration.cpp index 821d5527..8f935712 100644 --- a/src/geode/inspector/criterion/degeneration/edgedcurve_degeneration.cpp +++ b/src/geode/inspector/criterion/degeneration/edgedcurve_degeneration.cpp @@ -54,7 +54,7 @@ namespace geode InspectionIssues< index_t > small_edges( double threshold ) const { InspectionIssues< index_t > degenerated_edges_index{ - "Degenerated Edges of EdgeCurve " + mesh_.id().string() + "." + "Degenerated Edges." }; for( const auto edge_id : Range{ mesh_.nb_edges() } ) { diff --git a/src/geode/inspector/criterion/degeneration/section_meshes_degeneration.cpp b/src/geode/inspector/criterion/degeneration/section_meshes_degeneration.cpp index e729d92b..28c93fd6 100644 --- a/src/geode/inspector/criterion/degeneration/section_meshes_degeneration.cpp +++ b/src/geode/inspector/criterion/degeneration/section_meshes_degeneration.cpp @@ -52,7 +52,7 @@ namespace geode { return message; } - return "No degeneration issues in model component meshes \n"; + return "No degeneration issues in model \n"; } std::string diff --git a/src/geode/inspector/criterion/degeneration/solid_degeneration.cpp b/src/geode/inspector/criterion/degeneration/solid_degeneration.cpp index 0450d520..dcf6a9e1 100644 --- a/src/geode/inspector/criterion/degeneration/solid_degeneration.cpp +++ b/src/geode/inspector/criterion/degeneration/solid_degeneration.cpp @@ -78,7 +78,6 @@ namespace geode { wrong_polyhedra.add_issue( polyhedron_id, absl::StrCat( "Polyhedron ", polyhedron_id, - " of Solid ", this->mesh().id().string(), " is degenerated." ) ); } } diff --git a/src/geode/inspector/criterion/degeneration/surface_degeneration.cpp b/src/geode/inspector/criterion/degeneration/surface_degeneration.cpp index 3b4dae67..9d42c421 100644 --- a/src/geode/inspector/criterion/degeneration/surface_degeneration.cpp +++ b/src/geode/inspector/criterion/degeneration/surface_degeneration.cpp @@ -74,9 +74,9 @@ namespace geode if( this->mesh().polygon_minimum_height( polygon_id ) <= threshold ) { - wrong_polygons.add_issue( polygon_id, - absl::StrCat( "Polygon ", polygon_id, " of Surface ", - this->mesh().id().string(), " is degenerated." ) ); + wrong_polygons.add_issue( + polygon_id, absl::StrCat( "Polygon ", polygon_id, + " is degenerated." ) ); } } return wrong_polygons; diff --git a/src/geode/inspector/criterion/internal/component_meshes_adjacency.cpp b/src/geode/inspector/criterion/internal/component_meshes_adjacency.cpp index 458cb693..8093ed90 100644 --- a/src/geode/inspector/criterion/internal/component_meshes_adjacency.cpp +++ b/src/geode/inspector/criterion/internal/component_meshes_adjacency.cpp @@ -79,9 +79,9 @@ namespace geode surface.mesh() }; auto issues = inspector.polygon_edges_with_wrong_adjacency(); - issues.set_description( - absl::StrCat( "Surface ", surface.id().string(), - " polygon edges adjacency issues." ) ); + issues.set_description( absl::StrCat( "Surface ", + surface.name(), " polygon edges adjacency issues - uuid ", + surface.id().string() ) ); const auto& mesh = surface.mesh(); for( const auto polygon_id : Range{ mesh.nb_polygons() } ) { diff --git a/src/geode/inspector/criterion/internal/component_meshes_degeneration.cpp b/src/geode/inspector/criterion/internal/component_meshes_degeneration.cpp index 22e7bc9a..ff4ef0ce 100644 --- a/src/geode/inspector/criterion/internal/component_meshes_degeneration.cpp +++ b/src/geode/inspector/criterion/internal/component_meshes_degeneration.cpp @@ -72,8 +72,8 @@ namespace geode line.mesh() }; auto issues = inspector.small_edges( threshold ); - issues.set_description( absl::StrCat( - "Line ", line.id().string(), " small edges" ) ); + issues.set_description( absl::StrCat( "Line ", line.name(), + " small edges - uuid ", line.id().string() ) ); return std::make_pair( line.id(), std::move( issues ) ); } ) ); } @@ -103,7 +103,8 @@ namespace geode inspector{ surface.mesh() }; auto issues = inspector.small_edges( threshold ); issues.set_description( absl::StrCat( "Surface ", - surface.id().string(), " small edges" ) ); + surface.name(), " small edges - uuid ", + surface.id().string() ) ); return std::make_pair( surface.id(), std::move( issues ) ); } ) ); @@ -141,7 +142,8 @@ namespace geode inspector{ surface.mesh() }; auto issues = inspector.small_height_polygons( threshold ); issues.set_description( absl::StrCat( "Surface ", - surface.id().string(), " small polygons" ) ); + surface.name(), " small polygons - uuid ", + surface.id().string() ) ); return std::make_pair( surface.id(), std::move( issues ) ); } ) ); } diff --git a/src/geode/inspector/criterion/internal/component_meshes_manifold.cpp b/src/geode/inspector/criterion/internal/component_meshes_manifold.cpp index 7d011fa6..51fb1ed6 100644 --- a/src/geode/inspector/criterion/internal/component_meshes_manifold.cpp +++ b/src/geode/inspector/criterion/internal/component_meshes_manifold.cpp @@ -58,7 +58,8 @@ namespace geode }; auto issues = inspector.non_manifold_vertices(); issues.set_description( absl::StrCat( "Surface ", - surface.id().string(), " non manifold vertices" ) ); + surface.name(), " non manifold vertices - uuid ", + surface.id().string() ) ); surfaces_non_manifold_vertices.add_issues_to_map( surface.id(), std::move( issues ) ); } @@ -78,7 +79,8 @@ namespace geode }; auto issues = inspector.non_manifold_edges(); issues.set_description( absl::StrCat( "Surface ", - surface.id().string(), " non manifold edges" ) ); + surface.name(), " non manifold edges - uuid ", + surface.id().string() ) ); surfaces_non_manifold_edges.add_issues_to_map( surface.id(), std::move( issues ) ); } diff --git a/src/geode/inspector/criterion/intersections/model_intersections.cpp b/src/geode/inspector/criterion/intersections/model_intersections.cpp index d8743f73..93621575 100644 --- a/src/geode/inspector/criterion/intersections/model_intersections.cpp +++ b/src/geode/inspector/criterion/intersections/model_intersections.cpp @@ -516,13 +516,17 @@ namespace geode AllModelSurfacesIntersection< Model > >(); for( const auto& polygon_pair : intersections ) { + const auto& surface1 = + model_.surface( polygon_pair.first.component_id.id() ); + const auto& surface2 = + model_.surface( polygon_pair.second.component_id.id() ); intersection_issues.add_issue( polygon_pair, - absl::StrCat( "Polygons ", polygon_pair.first.element_id, - " of surface ", + absl::StrCat( surface1.name(), " and ", surface2.name(), + " intersect each other on polygons ", + polygon_pair.first.element_id, " and ", + polygon_pair.second.element_id, " - uuids ", polygon_pair.first.component_id.id().string(), " and ", - polygon_pair.second.element_id, " of surface ", - polygon_pair.second.component_id.id().string(), - " intersect each other." ) ); + polygon_pair.second.component_id.id().string() ) ); } } @@ -534,11 +538,14 @@ namespace geode AllModelSurfacesAutoIntersection< Model > >(); for( const auto& polygon_pair : intersections ) { + const auto& surface = + model_.surface( polygon_pair.first.component_id.id() ); intersection_issues.add_issue( polygon_pair, - absl::StrCat( "Polygons ", polygon_pair.first.element_id, - "and ", polygon_pair.second.element_id, " of surface ", - polygon_pair.first.component_id.id().string(), - " intersect each other." ) ); + absl::StrCat( "Surface ", surface.name(), + "have self intersection on polygons ", + polygon_pair.first.element_id, "and ", + polygon_pair.second.element_id, " - uuid ", + polygon_pair.first.component_id.id().string() ) ); } } diff --git a/src/geode/inspector/criterion/manifold/section_meshes_manifold.cpp b/src/geode/inspector/criterion/manifold/section_meshes_manifold.cpp index 0a460aab..985e212e 100644 --- a/src/geode/inspector/criterion/manifold/section_meshes_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/section_meshes_manifold.cpp @@ -53,7 +53,7 @@ namespace geode { return message; } - return "No manifold issues in model component meshes \n"; + return "No manifold issues in model \n"; } std::string SectionMeshesManifoldInspectionResult::inspection_type() const diff --git a/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp b/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp index 8d1ed6ea..0cf2d936 100644 --- a/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp @@ -68,8 +68,8 @@ namespace { const Edge polyhedron_edge{ polyhedron_edge_vertices }; if( !polyhedra_around_edges - .try_emplace( polyhedron_edge, 1, polyhedron_id ) - .second ) + .try_emplace( polyhedron_edge, 1, polyhedron_id ) + .second ) { polyhedra_around_edges[polyhedron_edge].push_back( polyhedron_id ); @@ -159,8 +159,7 @@ namespace geode "between vertices with index ", polyhedron_edge_vertices[0], " and index ", polyhedron_edge_vertices[1], - "; There are probably issues with solid " - "adjacencies." ) ); + "; Check issues with solid adjacencies." ) ); } } } diff --git a/src/geode/inspector/criterion/manifold/solid_facet_manifold.cpp b/src/geode/inspector/criterion/manifold/solid_facet_manifold.cpp index 466347ff..2c8e5e65 100644 --- a/src/geode/inspector/criterion/manifold/solid_facet_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/solid_facet_manifold.cpp @@ -51,7 +51,7 @@ namespace const Facet facet{ mesh.polyhedron_facet_vertices( { polyhedron_id, facet_id } ) }; if( !nb_polyhedra_adjacent_to_facets.try_emplace( facet, 1 ) - .second ) + .second ) { nb_polyhedra_adjacent_to_facets[facet] += 1; } diff --git a/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp b/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp index 376c1ff9..64f7a853 100644 --- a/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp @@ -51,9 +51,9 @@ namespace { polygon_id, polygon_edge_id } ) }; if( !polygons_around_edges - .try_emplace( polygon_edge_vertex_cycle, - std::make_pair( 1, false ) ) - .second ) + .try_emplace( polygon_edge_vertex_cycle, + std::make_pair( 1, false ) ) + .second ) { polygons_around_edges[polygon_edge_vertex_cycle].first += 1; } diff --git a/src/geode/inspector/criterion/negative_elements/brep_meshes_negative_elements.cpp b/src/geode/inspector/criterion/negative_elements/brep_meshes_negative_elements.cpp index c9292c66..f216acba 100644 --- a/src/geode/inspector/criterion/negative_elements/brep_meshes_negative_elements.cpp +++ b/src/geode/inspector/criterion/negative_elements/brep_meshes_negative_elements.cpp @@ -44,7 +44,7 @@ namespace geode { return negative_polyhedra.string(); } - return "No negative elements issues in model component meshes \n"; + return "No negative polyhedra issues in model \n"; } std::string @@ -68,8 +68,9 @@ namespace geode block.mesh() }; auto negative_elements = inspector.negative_polyhedra(); - negative_elements.set_description( absl::StrCat( - "Block ", block.id().string(), " negative polyhedra" ) ); + negative_elements.set_description( + absl::StrCat( "Block ", block.name(), + " negative polyhedra - uuid ", block.id().string() ) ); result.negative_polyhedra.add_issues_to_map( block.id(), std::move( negative_elements ) ); } diff --git a/src/geode/inspector/criterion/negative_elements/section_meshes_negative_elements.cpp b/src/geode/inspector/criterion/negative_elements/section_meshes_negative_elements.cpp index d0e72d95..9dc79637 100644 --- a/src/geode/inspector/criterion/negative_elements/section_meshes_negative_elements.cpp +++ b/src/geode/inspector/criterion/negative_elements/section_meshes_negative_elements.cpp @@ -46,7 +46,7 @@ namespace geode { return negative_polygons.string(); } - return "No negative elements issues in model component meshes \n"; + return "No negative polygons issues in model \n"; } std::string @@ -70,8 +70,9 @@ namespace geode surface.mesh() }; auto negative_elements = inspector.negative_polygons(); - negative_elements.set_description( absl::StrCat( - "Surface ", surface.id().string(), " negative polygons" ) ); + negative_elements.set_description( + absl::StrCat( "Surface ", surface.name(), + " negative polygons - uuid ", surface.id().string() ) ); result.negative_polygons.add_issues_to_map( surface.id(), std::move( negative_elements ) ); } diff --git a/src/geode/inspector/criterion/negative_elements/solid_negative_elements.cpp b/src/geode/inspector/criterion/negative_elements/solid_negative_elements.cpp index 38f01742..b15da02d 100644 --- a/src/geode/inspector/criterion/negative_elements/solid_negative_elements.cpp +++ b/src/geode/inspector/criterion/negative_elements/solid_negative_elements.cpp @@ -64,7 +64,6 @@ namespace geode { wrong_polyhedra.add_issue( polyhedron_id, absl::StrCat( "Polyhedron ", polyhedron_id, - " of Solid ", mesh_.id().string(), " has a negative volume." ) ); } } diff --git a/src/geode/inspector/criterion/negative_elements/surface_negative_elements.cpp b/src/geode/inspector/criterion/negative_elements/surface_negative_elements.cpp index 186c1462..3ef3bcfb 100644 --- a/src/geode/inspector/criterion/negative_elements/surface_negative_elements.cpp +++ b/src/geode/inspector/criterion/negative_elements/surface_negative_elements.cpp @@ -61,9 +61,9 @@ namespace geode { if( polygon_has_negative_area( polygon_id ) ) { - wrong_polygons.add_issue( polygon_id, - absl::StrCat( "Polygon ", polygon_id, " of Surface ", - mesh_.id().string(), " has a negative area." ) ); + wrong_polygons.add_issue( + polygon_id, absl::StrCat( "Polygon ", polygon_id, + " has a negative area." ) ); } } return wrong_polygons; From a20dff8e7eff4a60f5a749921e7045c768c36e30 Mon Sep 17 00:00:00 2001 From: francoisbonneau <24669995+francoisbonneau@users.noreply.github.com> Date: Tue, 28 Oct 2025 13:24:17 +0000 Subject: [PATCH 02/14] Apply prepare changes --- .../inspector/criterion/manifold/solid_edge_manifold.cpp | 4 ++-- .../inspector/criterion/manifold/solid_facet_manifold.cpp | 2 +- .../inspector/criterion/manifold/surface_edge_manifold.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp b/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp index 0cf2d936..a67caf7a 100644 --- a/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp @@ -68,8 +68,8 @@ namespace { const Edge polyhedron_edge{ polyhedron_edge_vertices }; if( !polyhedra_around_edges - .try_emplace( polyhedron_edge, 1, polyhedron_id ) - .second ) + .try_emplace( polyhedron_edge, 1, polyhedron_id ) + .second ) { polyhedra_around_edges[polyhedron_edge].push_back( polyhedron_id ); diff --git a/src/geode/inspector/criterion/manifold/solid_facet_manifold.cpp b/src/geode/inspector/criterion/manifold/solid_facet_manifold.cpp index 2c8e5e65..466347ff 100644 --- a/src/geode/inspector/criterion/manifold/solid_facet_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/solid_facet_manifold.cpp @@ -51,7 +51,7 @@ namespace const Facet facet{ mesh.polyhedron_facet_vertices( { polyhedron_id, facet_id } ) }; if( !nb_polyhedra_adjacent_to_facets.try_emplace( facet, 1 ) - .second ) + .second ) { nb_polyhedra_adjacent_to_facets[facet] += 1; } diff --git a/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp b/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp index 64f7a853..376c1ff9 100644 --- a/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp @@ -51,9 +51,9 @@ namespace { polygon_id, polygon_edge_id } ) }; if( !polygons_around_edges - .try_emplace( polygon_edge_vertex_cycle, - std::make_pair( 1, false ) ) - .second ) + .try_emplace( polygon_edge_vertex_cycle, + std::make_pair( 1, false ) ) + .second ) { polygons_around_edges[polygon_edge_vertex_cycle].first += 1; } From c329582a5c8386645004dda6a3a4e1d4282cb1db Mon Sep 17 00:00:00 2001 From: Francois Bonneau Date: Tue, 28 Oct 2025 16:45:34 +0100 Subject: [PATCH 03/14] fix(IssueDescription): Improve description of issues --- .../colocation/unique_vertices_colocation.hpp | 7 ++--- .../geode/inspector/edgedcurve_inspector.hpp | 4 +-- include/geode/inspector/information.hpp | 10 ++++--- .../topology/brep_blocks_topology.hpp | 28 +++++++++---------- .../topology/brep_corners_topology.hpp | 12 ++++---- .../topology/brep_lines_topology.hpp | 20 ++++++------- .../topology/brep_surfaces_topology.hpp | 14 ++++------ .../inspector/topology/brep_topology.hpp | 8 +++--- .../topology/section_corners_topology.hpp | 14 +++++----- .../topology/section_lines_topology.hpp | 16 +++++------ .../topology/section_surfaces_topology.hpp | 9 +++--- .../inspector/topology/section_topology.hpp | 6 ++-- 12 files changed, 69 insertions(+), 79 deletions(-) diff --git a/include/geode/inspector/criterion/colocation/unique_vertices_colocation.hpp b/include/geode/inspector/criterion/colocation/unique_vertices_colocation.hpp index 1cb9d9b3..3f2b29b9 100644 --- a/include/geode/inspector/criterion/colocation/unique_vertices_colocation.hpp +++ b/include/geode/inspector/criterion/colocation/unique_vertices_colocation.hpp @@ -39,12 +39,9 @@ namespace geode struct opengeode_inspector_inspector_api UniqueVerticesInspectionResult { InspectionIssues< std::vector< index_t > > - colocated_unique_vertices_groups{ - "Model unique vertices which are colocated" - }; + colocated_unique_vertices_groups{ "colocated unique vertices." }; InspectionIssues< index_t > unique_vertices_linked_to_different_points{ - "Model unique vertices linked to component mesh vertices at " - "different positions" + "unique vertices linked to mesh vertices at differing positions." }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/edgedcurve_inspector.hpp b/include/geode/inspector/edgedcurve_inspector.hpp index 9bb0f6e0..03ef00ec 100644 --- a/include/geode/inspector/edgedcurve_inspector.hpp +++ b/include/geode/inspector/edgedcurve_inspector.hpp @@ -33,10 +33,10 @@ namespace geode struct opengeode_inspector_inspector_api EdgedCurveInspectionResult { InspectionIssues< std::vector< index_t > > colocated_points_groups{ - "Colocation of vertices not tested" + "Vertices colocalization not tested" }; InspectionIssues< index_t > degenerated_edges{ - "Degeneration of edges not tested" + "Edges degeneration not tested" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/information.hpp b/include/geode/inspector/information.hpp index 160feaa8..2de20ec3 100644 --- a/include/geode/inspector/information.hpp +++ b/include/geode/inspector/information.hpp @@ -74,10 +74,11 @@ namespace geode { return absl::StrCat( "No issues with ", description_, "\n" ); } - auto message = absl::StrCat( description_ ); + auto message = + absl::StrCat( issues_.size(), " issues with ", description_ ); for( const auto& issue : messages_ ) { - absl::StrAppend( &message, "\n -> ", issue ); + absl::StrAppend( &message, ":\n\t", issue ); } absl::StrAppend( &message, "\n" ); return message; @@ -139,10 +140,11 @@ namespace geode { return absl::StrCat( "No issues with ", description_, "\n" ); } - auto message = absl::StrCat( description_ ); + auto message = absl::StrCat( + issues_map_.size(), " issues with ", description_ ); for( const auto& issues : issues_map_ ) { - absl::StrAppend( &message, "\n -> ", issues.second.string() ); + absl::StrAppend( &message, ":\n\t", issues.second.string() ); } absl::StrAppend( &message, "\n" ); return message; diff --git a/include/geode/inspector/topology/brep_blocks_topology.hpp b/include/geode/inspector/topology/brep_blocks_topology.hpp index b8a7a1bc..02cb0b20 100644 --- a/include/geode/inspector/topology/brep_blocks_topology.hpp +++ b/include/geode/inspector/topology/brep_blocks_topology.hpp @@ -46,44 +46,42 @@ namespace geode struct opengeode_inspector_inspector_api BRepBlocksTopologyInspectionResult { InspectionIssues< uuid > some_blocks_not_meshed{ - "uuids of Blocks without mesh." + "blocks without mesh (UUIDs listed)." }; InspectionIssues< uuid > wrong_block_boundary_surface{ - "uuids of surfaces boundary to a block when they should not." + "surfaces incorrectly bounding blocks (UUIDs listed)." }; InspectionIssuesMap< index_t > blocks_not_linked_to_a_unique_vertex{ - "Blocks with mesh vertices not linked to a unique vertex" + "blocks containing mesh vertices not linked to unique vertices." }; InspectionIssues< index_t > unique_vertices_part_of_two_blocks_and_no_boundary_surface{ - "Indices of unique vertices part of two Blocks and no boundary " - "Surface (or Block incident Line)" + "unique vertices shared by two blocks without a boundary " + "surface or incident block line." }; InspectionIssues< index_t > unique_vertices_with_incorrect_block_cmvs_count{ - "Indices of unique vertices part of a Block but with incorrect " - "ComponentMeshVertices count" + "unique vertices in a block with incorrect " + "ComponentMeshVertices count." }; InspectionIssues< index_t > unique_vertices_linked_to_surface_with_wrong_relationship_to_blocks{ - "Indices of unique vertices linked to Surface without boundary " - "nor internal status." + "unique vertices linked to surfaces with neither boundary nor " + "internal status." }; InspectionIssues< index_t > unique_vertices_linked_to_a_single_and_invalid_surface{ - "Indices of unique vertices linked to only one Surface and " - "this single surface is invalid." + "unique vertices linked to a single surface that is invalid." }; InspectionIssues< uuid > blocks_with_not_closed_boundary_surfaces{ - "uuids of blocks with not closed boundary surfaces." + "blocks with non-closed boundary surfaces." }; InspectionIssues< index_t > model_boundaries_dont_form_a_closed_surface{ - " Model boundaries don't form a closed surface." + "model boundaries don't form a closed surface (UUIDs listed)." }; InspectionIssues< index_t > unique_vertex_linked_to_multiple_invalid_surfaces{ - "Indices of unique vertices linked to several Surfaces in an " - "invalid way." + "unique vertices linked to multiple surfaces in an invalid way." }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/topology/brep_corners_topology.hpp b/include/geode/inspector/topology/brep_corners_topology.hpp index 9580480c..690f9922 100644 --- a/include/geode/inspector/topology/brep_corners_topology.hpp +++ b/include/geode/inspector/topology/brep_corners_topology.hpp @@ -43,23 +43,23 @@ namespace geode struct opengeode_inspector_inspector_api BRepCornersTopologyInspectionResult { InspectionIssues< uuid > corners_not_meshed{ - "uuids of Corners without mesh." + "corners without mesh (UUIDs listed)." }; InspectionIssuesMap< index_t > corners_not_linked_to_a_unique_vertex{ - "Corners with mesh vertices not linked to a unique vertex" + "corners containing mesh vertices not linked to unique vertices." }; InspectionIssues< index_t > unique_vertices_linked_to_multiple_corners{ - "Indices of unique vertices that are part of several Corners." + "unique vertices shared by several corners." }; InspectionIssues< index_t > unique_vertices_linked_to_not_internal_nor_boundary_corner{ - "Indices of unique vertices linked to a Corner without " + "unique vertices linked to a corner with neither " "boundary nor internal status." }; InspectionIssues< index_t > unique_vertices_liked_to_not_boundary_line_corner{ - "Indices of unique vertices linked to a Corner on a line but " - "without boundary status." + "unique vertices linked to a line corner without boundary " + "status." }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/topology/brep_lines_topology.hpp b/include/geode/inspector/topology/brep_lines_topology.hpp index 0aead114..99078535 100644 --- a/include/geode/inspector/topology/brep_lines_topology.hpp +++ b/include/geode/inspector/topology/brep_lines_topology.hpp @@ -43,34 +43,32 @@ namespace geode struct opengeode_inspector_inspector_api BRepLinesTopologyInspectionResult { InspectionIssues< uuid > lines_not_meshed{ - "uuids of Lines without mesh." + "lines without mesh (UUIDs listed)." }; InspectionIssues< index_t > unique_vertices_linked_to_line_with_wrong_relationship_to_surface{ - "Indices of unique vertices linked to a Line with wrong " - "relationship with a surface" + "unique vertices linked to a line with an incorrect " + "relationship to a surface." }; InspectionIssuesMap< index_t > lines_not_linked_to_a_unique_vertex{ - "Lines with mesh vertices not linked to a unique vertex" + "lines with mesh vertices not linked to a unique vertex" }; InspectionIssues< index_t > unique_vertices_linked_to_a_line_with_invalid_embeddings{ - "Indices of unique vertices linked to a Line with invalid " - "internal topology." + "unique vertices linked to a line with invalid internal " + "topology." }; InspectionIssues< index_t > unique_vertices_linked_to_a_single_and_invalid_line{ - "Indices of unique vertices linked to only one Line and this " - "single Line is invalid." + "unique vertices linked to a single invalid line." }; InspectionIssues< index_t > unique_vertices_linked_to_several_lines_but_not_linked_to_a_corner{ - "Indices of unique vertices linked to several Lines but not " - "linked to a Corner." + "unique vertices linked to multiple lines but not to a corner." }; InspectionIssuesMap< index_t > line_edges_with_wrong_component_edges_around{ - "Indices of line edges with wrong component edges around" + "line edges with incorrect surrounding component edges." }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/topology/brep_surfaces_topology.hpp b/include/geode/inspector/topology/brep_surfaces_topology.hpp index 01a4b410..c1389953 100644 --- a/include/geode/inspector/topology/brep_surfaces_topology.hpp +++ b/include/geode/inspector/topology/brep_surfaces_topology.hpp @@ -42,29 +42,27 @@ namespace geode opengeode_inspector_inspector_api BRepSurfacesTopologyInspectionResult { InspectionIssues< uuid > surfaces_not_meshed{ - "uuids of surface without mesh." + "surface without mesh (UUIDs listed)." }; InspectionIssuesMap< index_t > surfaces_not_linked_to_a_unique_vertex{ - "Surfaces with mesh vertices not linked to a unique vertex" + "surfaces containing mesh vertices not linked to unique vertices" }; InspectionIssues< index_t > unique_vertices_linked_to_a_surface_with_invalid_embbedings{ - "Indices of unique vertices linked to a Surface with invalid " + "unique vertices linked to a surface with invalid " "internal topology." }; InspectionIssues< index_t > unique_vertices_linked_to_several_and_invalid_surfaces{ - "Indices of unique vertices linked to several Surfaces in an " - "invalid way." + "unique vertices improperly linked to several surfaces." }; InspectionIssues< index_t > unique_vertices_linked_to_a_line_but_is_not_on_a_surface_border{ - "Indices of unique vertices linked to a Line but not linked to " - "a Surface border." + "unique vertices linked to a line but not to a surface border." }; InspectionIssuesMap< index_t > surface_polygons_with_wrong_component_facets_around{ - "Indices of surface polygons with wrong component facets around" + "Surface polygons with invalid surrounding facets." }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/topology/brep_topology.hpp b/include/geode/inspector/topology/brep_topology.hpp index f4db3e4b..75b74188 100644 --- a/include/geode/inspector/topology/brep_topology.hpp +++ b/include/geode/inspector/topology/brep_topology.hpp @@ -46,15 +46,15 @@ namespace geode BRepSurfacesTopologyInspectionResult surfaces; BRepBlocksTopologyInspectionResult blocks; InspectionIssues< index_t > unique_vertices_not_linked_to_any_component{ - "Unique vertices not linked to any component" + "unique vertices with no component links." }; InspectionIssues< index_t > unique_vertices_linked_to_inexistant_cmv{ - "Unique vertices linked to inexistant ComponentMeshVertex" + "unique vertices linked to inexistant ComponentMeshVertex" }; InspectionIssues< index_t > unique_vertices_nonbijectively_linked_to_cmv{ - "Unique vertices with links to ComponentMeshVertex that are " - "not bijective" + "unique vertices with non-bijective links to " + "ComponentMeshVertex." }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/topology/section_corners_topology.hpp b/include/geode/inspector/topology/section_corners_topology.hpp index 89a63669..86a89fdc 100644 --- a/include/geode/inspector/topology/section_corners_topology.hpp +++ b/include/geode/inspector/topology/section_corners_topology.hpp @@ -43,28 +43,28 @@ namespace geode opengeode_inspector_inspector_api SectionCornersTopologyInspectionResult { InspectionIssues< uuid > corners_not_meshed{ - "uuids of Corners without mesh." + "corners without mesh (UUIDs listed)." }; InspectionIssuesMap< index_t > corners_not_linked_to_a_unique_vertex{ - "Corners with mesh vertices not linked to a unique vertex" + "corners containing mesh vertices not linked to unique vertices." }; InspectionIssues< index_t > unique_vertices_linked_to_multiple_corners{ - "Indices of unique vertices that are part of several Corners." + "unique vertices shared by several corners." }; InspectionIssues< index_t > unique_vertices_linked_to_multiple_internals_corner{ - "Indices of unique vertices linked to a Corner with several " + "unique vertices linked to a corner with several " "embeddings" }; InspectionIssues< index_t > unique_vertices_linked_to_not_internal_nor_boundary_corner{ - "Indices of unique vertices linked to a Corner without " + "unique vertices linked to a corner with neither " "boundary nor internal status." }; InspectionIssues< index_t > unique_vertices_linked_to_not_boundary_line_corner{ - "Indices of unique vertices linked to a Corner on a line but " - "without boundary status.)" + "unique vertices linked to a line corner without boundary " + "status." }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/topology/section_lines_topology.hpp b/include/geode/inspector/topology/section_lines_topology.hpp index 275929d6..ee6835bc 100644 --- a/include/geode/inspector/topology/section_lines_topology.hpp +++ b/include/geode/inspector/topology/section_lines_topology.hpp @@ -41,30 +41,28 @@ namespace geode opengeode_inspector_inspector_api SectionLinesTopologyInspectionResult { InspectionIssues< uuid > lines_not_meshed{ - "uuids of Lines without mesh." + "lines without mesh (UUIDs listed)." }; InspectionIssuesMap< index_t > lines_not_linked_to_a_unique_vertex{ - "Lines with mesh vertices not linked to a unique vertex" + "lines with mesh vertices not linked to a unique vertex" }; InspectionIssues< index_t > unique_vertices_linked_to_line_with_wrong_relationship_to_surface{ - "Indices of unique vertices linked to a Line with wrong " - "relationship with a surface" + "unique vertices linked to a line incorrectly linked to a " + "surface" }; InspectionIssues< index_t > unique_vertices_linked_to_a_line_with_invalid_embeddings{ - "Indices of unique vertices linked to a Line with invalid " + "unique vertices linked to a line with invalid " "internal topology." }; InspectionIssues< index_t > unique_vertices_linked_to_a_single_and_invalid_line{ - "Indices of unique vertices linked to only one Line and this " - "single Line is invalid." + "unique vertices linked to a single invalid line." }; InspectionIssues< index_t > unique_vertices_linked_to_several_lines_but_not_linked_to_a_corner{ - "Indices of unique vertices linked to several Lines but not " - "linked to a corner." + "unique vertices linked to multiple lines but not to a corner." }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/topology/section_surfaces_topology.hpp b/include/geode/inspector/topology/section_surfaces_topology.hpp index 8d0bebdc..3224915a 100644 --- a/include/geode/inspector/topology/section_surfaces_topology.hpp +++ b/include/geode/inspector/topology/section_surfaces_topology.hpp @@ -42,20 +42,19 @@ namespace geode opengeode_inspector_inspector_api SectionSurfacesTopologyInspectionResult { InspectionIssues< uuid > surfaces_not_meshed{ - "uuids of Surfaces without mesh." + "surface without mesh (UUIDs listed)." }; InspectionIssuesMap< index_t > surfaces_not_linked_to_a_unique_vertex{ - "Surfaces with mesh vertices not linked to a unique vertex" + "surfaces containing mesh vertices not linked to unique vertices" }; InspectionIssues< index_t > unique_vertices_linked_to_a_surface_with_invalid_embbedings{ - "Indices of unique vertices linked to a Surface with invalid " + "unique vertices linked to a surface with invalid " "internal topology." }; InspectionIssues< index_t > unique_vertices_linked_to_a_line_but_is_not_on_a_surface_border{ - "Indices of unique vertices linked to a Line but not linked to " - "a Surface border." + "unique vertices linked to a line but not to a surface border." }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/topology/section_topology.hpp b/include/geode/inspector/topology/section_topology.hpp index e6256eaa..fbedd2aa 100644 --- a/include/geode/inspector/topology/section_topology.hpp +++ b/include/geode/inspector/topology/section_topology.hpp @@ -44,15 +44,15 @@ namespace geode SectionLinesTopologyInspectionResult lines; SectionSurfacesTopologyInspectionResult surfaces; InspectionIssues< index_t > unique_vertices_not_linked_to_any_component{ - "Unique vertices not linked to any component" + "unique vertices with no component links." }; InspectionIssues< index_t > unique_vertices_linked_to_inexistant_cmv{ "Unique vertices linked to inexistant ComponentMeshVertex" }; InspectionIssues< index_t > unique_vertices_nonbijectively_linked_to_cmv{ - "Unique vertices with links to ComponentMeshVertex that are " - "not bijective" + "unique vertices with non-bijective links to " + "ComponentMeshVertex." }; [[nodiscard]] index_t nb_issues() const; From fec0ac46592bdcc81697b92b9c2f8a97358f6847 Mon Sep 17 00:00:00 2001 From: Francois Bonneau Date: Tue, 28 Oct 2025 17:09:55 +0100 Subject: [PATCH 04/14] more refactoring --- .../adjacency/brep_meshes_adjacency.hpp | 4 ++-- .../adjacency/section_meshes_adjacency.hpp | 2 +- .../component_meshes_colocation.hpp | 2 +- .../colocation/unique_vertices_colocation.hpp | 4 ++-- .../degeneration/brep_meshes_degeneration.hpp | 6 +++--- .../section_meshes_degeneration.hpp | 4 ++-- .../intersections/model_intersections.hpp | 2 +- .../manifold/brep_meshes_manifold.hpp | 14 +++++-------- .../manifold/section_meshes_manifold.hpp | 6 ++---- .../brep_meshes_negative_elements.hpp | 2 +- .../section_meshes_negative_elements.hpp | 2 +- .../geode/inspector/edgedcurve_inspector.hpp | 4 ++-- include/geode/inspector/information.hpp | 4 ++-- .../geode/inspector/pointset_inspector.hpp | 2 +- include/geode/inspector/solid_inspector.hpp | 2 +- include/geode/inspector/surface_inspector.hpp | 4 ++-- .../topology/brep_blocks_topology.hpp | 20 +++++++++---------- .../topology/brep_corners_topology.hpp | 10 +++++----- .../topology/brep_lines_topology.hpp | 12 +++++------ .../topology/brep_surfaces_topology.hpp | 10 +++++----- .../inspector/topology/brep_topology.hpp | 4 ++-- .../topology/section_corners_topology.hpp | 10 +++++----- .../topology/section_lines_topology.hpp | 8 ++++---- .../topology/section_surfaces_topology.hpp | 6 +++--- .../inspector/topology/section_topology.hpp | 6 +++--- 25 files changed, 72 insertions(+), 78 deletions(-) diff --git a/include/geode/inspector/criterion/adjacency/brep_meshes_adjacency.hpp b/include/geode/inspector/criterion/adjacency/brep_meshes_adjacency.hpp index 990b8b36..096937cb 100644 --- a/include/geode/inspector/criterion/adjacency/brep_meshes_adjacency.hpp +++ b/include/geode/inspector/criterion/adjacency/brep_meshes_adjacency.hpp @@ -45,11 +45,11 @@ namespace geode { InspectionIssuesMap< PolygonEdge > surfaces_edges_with_wrong_adjacencies{ - "BRep Surface mesh with polygon edges adjacencies issues" + "surface polygon edges adjacencies issues" }; InspectionIssuesMap< PolyhedronFacet > blocks_facets_with_wrong_adjacencies{ - "BRep Block mesh with polyhedron facets adjacencies issues" + "block polyhedron facets adjacencies issues" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/criterion/adjacency/section_meshes_adjacency.hpp b/include/geode/inspector/criterion/adjacency/section_meshes_adjacency.hpp index 74b57f4b..8823bbb7 100644 --- a/include/geode/inspector/criterion/adjacency/section_meshes_adjacency.hpp +++ b/include/geode/inspector/criterion/adjacency/section_meshes_adjacency.hpp @@ -45,7 +45,7 @@ namespace geode { InspectionIssuesMap< PolygonEdge > surfaces_edges_with_wrong_adjacencies{ - "Section Surface mesh polygon edges adjacencies issues" + "surface polygon edges adjacencies issues" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/criterion/colocation/component_meshes_colocation.hpp b/include/geode/inspector/criterion/colocation/component_meshes_colocation.hpp index 04b943c2..84d92ea3 100644 --- a/include/geode/inspector/criterion/colocation/component_meshes_colocation.hpp +++ b/include/geode/inspector/criterion/colocation/component_meshes_colocation.hpp @@ -41,7 +41,7 @@ namespace geode struct opengeode_inspector_inspector_api MeshesColocationInspectionResult { InspectionIssuesMap< std::vector< index_t > > colocated_points_groups{ - "Model component meshes with colocated points" + "meshes with colocated points" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/criterion/colocation/unique_vertices_colocation.hpp b/include/geode/inspector/criterion/colocation/unique_vertices_colocation.hpp index 3f2b29b9..2448325b 100644 --- a/include/geode/inspector/criterion/colocation/unique_vertices_colocation.hpp +++ b/include/geode/inspector/criterion/colocation/unique_vertices_colocation.hpp @@ -39,9 +39,9 @@ namespace geode struct opengeode_inspector_inspector_api UniqueVerticesInspectionResult { InspectionIssues< std::vector< index_t > > - colocated_unique_vertices_groups{ "colocated unique vertices." }; + colocated_unique_vertices_groups{ "colocated unique vertices" }; InspectionIssues< index_t > unique_vertices_linked_to_different_points{ - "unique vertices linked to mesh vertices at differing positions." + "unique vertices linked to several positions" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/criterion/degeneration/brep_meshes_degeneration.hpp b/include/geode/inspector/criterion/degeneration/brep_meshes_degeneration.hpp index 20cc1cb8..19cbaf0c 100644 --- a/include/geode/inspector/criterion/degeneration/brep_meshes_degeneration.hpp +++ b/include/geode/inspector/criterion/degeneration/brep_meshes_degeneration.hpp @@ -42,13 +42,13 @@ namespace geode opengeode_inspector_inspector_api BRepMeshesDegenerationInspectionResult { InspectionIssuesMap< index_t > degenerated_edges{ - "BRep component meshes with degenerated edges" + "meshes with degenerated edges" }; InspectionIssuesMap< index_t > degenerated_polygons{ - "BRep component meshes with degenerated polygons" + "meshes with degenerated polygons" }; InspectionIssuesMap< index_t > degenerated_polyhedra{ - "BRep component meshes with degenerated polyhedra" + "meshes with degenerated polyhedra" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/criterion/degeneration/section_meshes_degeneration.hpp b/include/geode/inspector/criterion/degeneration/section_meshes_degeneration.hpp index ee5bc044..90f96fca 100644 --- a/include/geode/inspector/criterion/degeneration/section_meshes_degeneration.hpp +++ b/include/geode/inspector/criterion/degeneration/section_meshes_degeneration.hpp @@ -42,10 +42,10 @@ namespace geode opengeode_inspector_inspector_api SectionMeshesDegenerationInspectionResult { InspectionIssuesMap< index_t > degenerated_edges{ - "Section component meshes with degenerated edges" + "meshes with degenerated edges" }; InspectionIssuesMap< index_t > degenerated_polygons{ - "Section component meshes with degenerated polygons" + "meshes with degenerated polygons" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/criterion/intersections/model_intersections.hpp b/include/geode/inspector/criterion/intersections/model_intersections.hpp index d8880b2b..451064ae 100644 --- a/include/geode/inspector/criterion/intersections/model_intersections.hpp +++ b/include/geode/inspector/criterion/intersections/model_intersections.hpp @@ -43,7 +43,7 @@ namespace geode { InspectionIssues< std::pair< ComponentMeshElement, ComponentMeshElement > > - elements_intersections{ "Surface intersections." }; + elements_intersections{ "surface intersections" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/criterion/manifold/brep_meshes_manifold.hpp b/include/geode/inspector/criterion/manifold/brep_meshes_manifold.hpp index 9b734950..d7669f04 100644 --- a/include/geode/inspector/criterion/manifold/brep_meshes_manifold.hpp +++ b/include/geode/inspector/criterion/manifold/brep_meshes_manifold.hpp @@ -58,22 +58,18 @@ namespace geode struct opengeode_inspector_inspector_api BRepMeshesManifoldInspectionResult { InspectionIssuesMap< index_t > meshes_non_manifold_vertices{ - "BRep component meshes with non manifold vertices" + "meshes with non manifold vertices" }; InspectionIssuesMap< std::array< index_t, 2 > > - meshes_non_manifold_edges{ - "BRep component meshes with non manifold edges" - }; + meshes_non_manifold_edges{ "meshes with non manifold edges" }; InspectionIssuesMap< PolyhedronFacetVertices > - meshes_non_manifold_facets{ - "BRep component meshes with non manifold facets" - }; + meshes_non_manifold_facets{ "meshes with non manifold facets" }; InspectionIssues< BRepNonManifoldEdge > brep_non_manifold_edges{ - "BRep non manifold edges" + "non manifold edges" }; InspectionIssues< BRepNonManifoldFacet > brep_non_manifold_facets{ - "BRep non manifold facets" + "non manifold facets" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/criterion/manifold/section_meshes_manifold.hpp b/include/geode/inspector/criterion/manifold/section_meshes_manifold.hpp index a66cfb56..a2029d68 100644 --- a/include/geode/inspector/criterion/manifold/section_meshes_manifold.hpp +++ b/include/geode/inspector/criterion/manifold/section_meshes_manifold.hpp @@ -39,12 +39,10 @@ namespace geode opengeode_inspector_inspector_api SectionMeshesManifoldInspectionResult { InspectionIssuesMap< index_t > meshes_non_manifold_vertices{ - "Section component meshes with non manifold vertices" + "meshes with non manifold vertices" }; InspectionIssuesMap< std::array< index_t, 2 > > - meshes_non_manifold_edges{ - "Section component meshes with non manifold edges" - }; + meshes_non_manifold_edges{ "meshes with non manifold edges" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/criterion/negative_elements/brep_meshes_negative_elements.hpp b/include/geode/inspector/criterion/negative_elements/brep_meshes_negative_elements.hpp index dd21b025..96cae98e 100644 --- a/include/geode/inspector/criterion/negative_elements/brep_meshes_negative_elements.hpp +++ b/include/geode/inspector/criterion/negative_elements/brep_meshes_negative_elements.hpp @@ -42,7 +42,7 @@ namespace geode opengeode_inspector_inspector_api BRepMeshesNegativeElementsInspectionResult { InspectionIssuesMap< index_t > negative_polyhedra{ - "BRep block meshes with negative polyhedra" + "block with negative polyhedra" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/criterion/negative_elements/section_meshes_negative_elements.hpp b/include/geode/inspector/criterion/negative_elements/section_meshes_negative_elements.hpp index a69aa1e9..1d05b590 100644 --- a/include/geode/inspector/criterion/negative_elements/section_meshes_negative_elements.hpp +++ b/include/geode/inspector/criterion/negative_elements/section_meshes_negative_elements.hpp @@ -42,7 +42,7 @@ namespace geode opengeode_inspector_inspector_api SectionMeshesNegativeElementsInspectionResult { InspectionIssuesMap< index_t > negative_polygons{ - "Section surface meshes with negative polygons" + "surface with negative polygons" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/edgedcurve_inspector.hpp b/include/geode/inspector/edgedcurve_inspector.hpp index 03ef00ec..83758a61 100644 --- a/include/geode/inspector/edgedcurve_inspector.hpp +++ b/include/geode/inspector/edgedcurve_inspector.hpp @@ -33,10 +33,10 @@ namespace geode struct opengeode_inspector_inspector_api EdgedCurveInspectionResult { InspectionIssues< std::vector< index_t > > colocated_points_groups{ - "Vertices colocalization not tested" + "Colocalization of vertices not tested" }; InspectionIssues< index_t > degenerated_edges{ - "Edges degeneration not tested" + "Degeneration of edges not tested" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/information.hpp b/include/geode/inspector/information.hpp index 2de20ec3..f1e25861 100644 --- a/include/geode/inspector/information.hpp +++ b/include/geode/inspector/information.hpp @@ -78,7 +78,7 @@ namespace geode absl::StrCat( issues_.size(), " issues with ", description_ ); for( const auto& issue : messages_ ) { - absl::StrAppend( &message, ":\n\t", issue ); + absl::StrAppend( &message, "\n\t", issue ); } absl::StrAppend( &message, "\n" ); return message; @@ -144,7 +144,7 @@ namespace geode issues_map_.size(), " issues with ", description_ ); for( const auto& issues : issues_map_ ) { - absl::StrAppend( &message, ":\n\t", issues.second.string() ); + absl::StrAppend( &message, "\n\t", issues.second.string() ); } absl::StrAppend( &message, "\n" ); return message; diff --git a/include/geode/inspector/pointset_inspector.hpp b/include/geode/inspector/pointset_inspector.hpp index a3558420..6960b563 100644 --- a/include/geode/inspector/pointset_inspector.hpp +++ b/include/geode/inspector/pointset_inspector.hpp @@ -32,7 +32,7 @@ namespace geode struct opengeode_inspector_inspector_api PointSetInspectionResult { InspectionIssues< std::vector< index_t > > colocated_points_groups{ - "Colocation of vertices not tested" + "Colocalization of vertices not tested" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/solid_inspector.hpp b/include/geode/inspector/solid_inspector.hpp index c0f2ee1a..2ec583e3 100644 --- a/include/geode/inspector/solid_inspector.hpp +++ b/include/geode/inspector/solid_inspector.hpp @@ -42,7 +42,7 @@ namespace geode "Adjacencies of facets not tested" }; InspectionIssues< std::vector< index_t > > colocated_points_groups{ - "Colocation of vertices not tested" + "Colocalization of vertices not tested" }; InspectionIssues< index_t > degenerated_edges{ "Degeneration of edges not tested" diff --git a/include/geode/inspector/surface_inspector.hpp b/include/geode/inspector/surface_inspector.hpp index ab20b2ac..95eacd8e 100644 --- a/include/geode/inspector/surface_inspector.hpp +++ b/include/geode/inspector/surface_inspector.hpp @@ -37,10 +37,10 @@ namespace geode struct opengeode_inspector_inspector_api SurfaceInspectionResult { InspectionIssues< PolygonEdge > polygon_edges_with_wrong_adjacency{ - "Adjacencies between polygon edges not tested" + "Adjacencies between polygon and edges not tested" }; InspectionIssues< std::vector< index_t > > colocated_points_groups{ - "Colocation of vertices not tested" + "Colocalization of vertices not tested" }; InspectionIssues< index_t > degenerated_edges{ "Degeneration of edges not tested" diff --git a/include/geode/inspector/topology/brep_blocks_topology.hpp b/include/geode/inspector/topology/brep_blocks_topology.hpp index 02cb0b20..70b846d6 100644 --- a/include/geode/inspector/topology/brep_blocks_topology.hpp +++ b/include/geode/inspector/topology/brep_blocks_topology.hpp @@ -46,42 +46,42 @@ namespace geode struct opengeode_inspector_inspector_api BRepBlocksTopologyInspectionResult { InspectionIssues< uuid > some_blocks_not_meshed{ - "blocks without mesh (UUIDs listed)." + "blocks without mesh (UUIDs listed)" }; InspectionIssues< uuid > wrong_block_boundary_surface{ - "surfaces incorrectly bounding blocks (UUIDs listed)." + "surfaces incorrectly bounding blocks (UUIDs listed)" }; InspectionIssuesMap< index_t > blocks_not_linked_to_a_unique_vertex{ - "blocks containing mesh vertices not linked to unique vertices." + "blocks containing mesh vertices not linked to unique vertices" }; InspectionIssues< index_t > unique_vertices_part_of_two_blocks_and_no_boundary_surface{ "unique vertices shared by two blocks without a boundary " - "surface or incident block line." + "surface or incident block line" }; InspectionIssues< index_t > unique_vertices_with_incorrect_block_cmvs_count{ "unique vertices in a block with incorrect " - "ComponentMeshVertices count." + "ComponentMeshVertices count" }; InspectionIssues< index_t > unique_vertices_linked_to_surface_with_wrong_relationship_to_blocks{ "unique vertices linked to surfaces with neither boundary nor " - "internal status." + "internal status" }; InspectionIssues< index_t > unique_vertices_linked_to_a_single_and_invalid_surface{ - "unique vertices linked to a single surface that is invalid." + "unique vertices linked to a single surface that is invalid" }; InspectionIssues< uuid > blocks_with_not_closed_boundary_surfaces{ - "blocks with non-closed boundary surfaces." + "blocks with non-closed boundary surfaces" }; InspectionIssues< index_t > model_boundaries_dont_form_a_closed_surface{ - "model boundaries don't form a closed surface (UUIDs listed)." + "model boundaries don't form a closed surface (UUIDs listed)" }; InspectionIssues< index_t > unique_vertex_linked_to_multiple_invalid_surfaces{ - "unique vertices linked to multiple surfaces in an invalid way." + "unique vertices linked to multiple surfaces in an invalid way" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/topology/brep_corners_topology.hpp b/include/geode/inspector/topology/brep_corners_topology.hpp index 690f9922..634389de 100644 --- a/include/geode/inspector/topology/brep_corners_topology.hpp +++ b/include/geode/inspector/topology/brep_corners_topology.hpp @@ -43,23 +43,23 @@ namespace geode struct opengeode_inspector_inspector_api BRepCornersTopologyInspectionResult { InspectionIssues< uuid > corners_not_meshed{ - "corners without mesh (UUIDs listed)." + "corners without mesh (UUIDs listed)" }; InspectionIssuesMap< index_t > corners_not_linked_to_a_unique_vertex{ - "corners containing mesh vertices not linked to unique vertices." + "corners containing mesh vertices not linked to unique vertices" }; InspectionIssues< index_t > unique_vertices_linked_to_multiple_corners{ - "unique vertices shared by several corners." + "unique vertices shared by several corners" }; InspectionIssues< index_t > unique_vertices_linked_to_not_internal_nor_boundary_corner{ "unique vertices linked to a corner with neither " - "boundary nor internal status." + "boundary nor internal status" }; InspectionIssues< index_t > unique_vertices_liked_to_not_boundary_line_corner{ "unique vertices linked to a line corner without boundary " - "status." + "status" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/topology/brep_lines_topology.hpp b/include/geode/inspector/topology/brep_lines_topology.hpp index 99078535..3d524047 100644 --- a/include/geode/inspector/topology/brep_lines_topology.hpp +++ b/include/geode/inspector/topology/brep_lines_topology.hpp @@ -43,12 +43,12 @@ namespace geode struct opengeode_inspector_inspector_api BRepLinesTopologyInspectionResult { InspectionIssues< uuid > lines_not_meshed{ - "lines without mesh (UUIDs listed)." + "lines without mesh (UUIDs listed)" }; InspectionIssues< index_t > unique_vertices_linked_to_line_with_wrong_relationship_to_surface{ "unique vertices linked to a line with an incorrect " - "relationship to a surface." + "relationship to a surface" }; InspectionIssuesMap< index_t > lines_not_linked_to_a_unique_vertex{ "lines with mesh vertices not linked to a unique vertex" @@ -56,19 +56,19 @@ namespace geode InspectionIssues< index_t > unique_vertices_linked_to_a_line_with_invalid_embeddings{ "unique vertices linked to a line with invalid internal " - "topology." + "topology" }; InspectionIssues< index_t > unique_vertices_linked_to_a_single_and_invalid_line{ - "unique vertices linked to a single invalid line." + "unique vertices linked to a single invalid line" }; InspectionIssues< index_t > unique_vertices_linked_to_several_lines_but_not_linked_to_a_corner{ - "unique vertices linked to multiple lines but not to a corner." + "unique vertices linked to multiple lines but not to a corner" }; InspectionIssuesMap< index_t > line_edges_with_wrong_component_edges_around{ - "line edges with incorrect surrounding component edges." + "line edges with incorrect surrounding component edges" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/topology/brep_surfaces_topology.hpp b/include/geode/inspector/topology/brep_surfaces_topology.hpp index c1389953..d4c5bf6e 100644 --- a/include/geode/inspector/topology/brep_surfaces_topology.hpp +++ b/include/geode/inspector/topology/brep_surfaces_topology.hpp @@ -42,7 +42,7 @@ namespace geode opengeode_inspector_inspector_api BRepSurfacesTopologyInspectionResult { InspectionIssues< uuid > surfaces_not_meshed{ - "surface without mesh (UUIDs listed)." + "surface without mesh (UUIDs listed)" }; InspectionIssuesMap< index_t > surfaces_not_linked_to_a_unique_vertex{ "surfaces containing mesh vertices not linked to unique vertices" @@ -50,19 +50,19 @@ namespace geode InspectionIssues< index_t > unique_vertices_linked_to_a_surface_with_invalid_embbedings{ "unique vertices linked to a surface with invalid " - "internal topology." + "internal topology" }; InspectionIssues< index_t > unique_vertices_linked_to_several_and_invalid_surfaces{ - "unique vertices improperly linked to several surfaces." + "unique vertices improperly linked to several surfaces" }; InspectionIssues< index_t > unique_vertices_linked_to_a_line_but_is_not_on_a_surface_border{ - "unique vertices linked to a line but not to a surface border." + "unique vertices linked to a line but not to a surface border" }; InspectionIssuesMap< index_t > surface_polygons_with_wrong_component_facets_around{ - "Surface polygons with invalid surrounding facets." + "Surface polygons with invalid surrounding facets" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/topology/brep_topology.hpp b/include/geode/inspector/topology/brep_topology.hpp index 75b74188..25ef2f0e 100644 --- a/include/geode/inspector/topology/brep_topology.hpp +++ b/include/geode/inspector/topology/brep_topology.hpp @@ -46,7 +46,7 @@ namespace geode BRepSurfacesTopologyInspectionResult surfaces; BRepBlocksTopologyInspectionResult blocks; InspectionIssues< index_t > unique_vertices_not_linked_to_any_component{ - "unique vertices with no component links." + "unique vertices with no component links" }; InspectionIssues< index_t > unique_vertices_linked_to_inexistant_cmv{ "unique vertices linked to inexistant ComponentMeshVertex" @@ -54,7 +54,7 @@ namespace geode InspectionIssues< index_t > unique_vertices_nonbijectively_linked_to_cmv{ "unique vertices with non-bijective links to " - "ComponentMeshVertex." + "ComponentMeshVertex" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/topology/section_corners_topology.hpp b/include/geode/inspector/topology/section_corners_topology.hpp index 86a89fdc..22f435d6 100644 --- a/include/geode/inspector/topology/section_corners_topology.hpp +++ b/include/geode/inspector/topology/section_corners_topology.hpp @@ -43,13 +43,13 @@ namespace geode opengeode_inspector_inspector_api SectionCornersTopologyInspectionResult { InspectionIssues< uuid > corners_not_meshed{ - "corners without mesh (UUIDs listed)." + "corners without mesh (UUIDs listed)" }; InspectionIssuesMap< index_t > corners_not_linked_to_a_unique_vertex{ - "corners containing mesh vertices not linked to unique vertices." + "corners containing mesh vertices not linked to unique vertices" }; InspectionIssues< index_t > unique_vertices_linked_to_multiple_corners{ - "unique vertices shared by several corners." + "unique vertices shared by several corners" }; InspectionIssues< index_t > unique_vertices_linked_to_multiple_internals_corner{ @@ -59,12 +59,12 @@ namespace geode InspectionIssues< index_t > unique_vertices_linked_to_not_internal_nor_boundary_corner{ "unique vertices linked to a corner with neither " - "boundary nor internal status." + "boundary nor internal status" }; InspectionIssues< index_t > unique_vertices_linked_to_not_boundary_line_corner{ "unique vertices linked to a line corner without boundary " - "status." + "status" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/topology/section_lines_topology.hpp b/include/geode/inspector/topology/section_lines_topology.hpp index ee6835bc..bbb2e672 100644 --- a/include/geode/inspector/topology/section_lines_topology.hpp +++ b/include/geode/inspector/topology/section_lines_topology.hpp @@ -41,7 +41,7 @@ namespace geode opengeode_inspector_inspector_api SectionLinesTopologyInspectionResult { InspectionIssues< uuid > lines_not_meshed{ - "lines without mesh (UUIDs listed)." + "lines without mesh (UUIDs listed)" }; InspectionIssuesMap< index_t > lines_not_linked_to_a_unique_vertex{ "lines with mesh vertices not linked to a unique vertex" @@ -54,15 +54,15 @@ namespace geode InspectionIssues< index_t > unique_vertices_linked_to_a_line_with_invalid_embeddings{ "unique vertices linked to a line with invalid " - "internal topology." + "internal topology" }; InspectionIssues< index_t > unique_vertices_linked_to_a_single_and_invalid_line{ - "unique vertices linked to a single invalid line." + "unique vertices linked to a single invalid line" }; InspectionIssues< index_t > unique_vertices_linked_to_several_lines_but_not_linked_to_a_corner{ - "unique vertices linked to multiple lines but not to a corner." + "unique vertices linked to multiple lines but not to a corner" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/topology/section_surfaces_topology.hpp b/include/geode/inspector/topology/section_surfaces_topology.hpp index 3224915a..b1377f3f 100644 --- a/include/geode/inspector/topology/section_surfaces_topology.hpp +++ b/include/geode/inspector/topology/section_surfaces_topology.hpp @@ -42,7 +42,7 @@ namespace geode opengeode_inspector_inspector_api SectionSurfacesTopologyInspectionResult { InspectionIssues< uuid > surfaces_not_meshed{ - "surface without mesh (UUIDs listed)." + "surface without mesh (UUIDs listed)" }; InspectionIssuesMap< index_t > surfaces_not_linked_to_a_unique_vertex{ "surfaces containing mesh vertices not linked to unique vertices" @@ -50,11 +50,11 @@ namespace geode InspectionIssues< index_t > unique_vertices_linked_to_a_surface_with_invalid_embbedings{ "unique vertices linked to a surface with invalid " - "internal topology." + "internal topology" }; InspectionIssues< index_t > unique_vertices_linked_to_a_line_but_is_not_on_a_surface_border{ - "unique vertices linked to a line but not to a surface border." + "unique vertices linked to a line but not to a surface border" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/topology/section_topology.hpp b/include/geode/inspector/topology/section_topology.hpp index fbedd2aa..2e11d65a 100644 --- a/include/geode/inspector/topology/section_topology.hpp +++ b/include/geode/inspector/topology/section_topology.hpp @@ -44,15 +44,15 @@ namespace geode SectionLinesTopologyInspectionResult lines; SectionSurfacesTopologyInspectionResult surfaces; InspectionIssues< index_t > unique_vertices_not_linked_to_any_component{ - "unique vertices with no component links." + "unique vertices with no component links" }; InspectionIssues< index_t > unique_vertices_linked_to_inexistant_cmv{ - "Unique vertices linked to inexistant ComponentMeshVertex" + "unique vertices linked to inexistant ComponentMeshVertex" }; InspectionIssues< index_t > unique_vertices_nonbijectively_linked_to_cmv{ "unique vertices with non-bijective links to " - "ComponentMeshVertex." + "ComponentMeshVertex" }; [[nodiscard]] index_t nb_issues() const; From c8ba21c8a88ae276aee216fecaef0cf3c7c43b1d Mon Sep 17 00:00:00 2001 From: Francois Bonneau Date: Tue, 28 Oct 2025 18:32:50 +0100 Subject: [PATCH 05/14] further refactoring --- .../adjacency/brep_meshes_adjacency.cpp | 6 ++--- .../criterion/adjacency/solid_adjacency.cpp | 9 ++++--- .../criterion/adjacency/surface_adjacency.cpp | 9 ++++--- .../component_meshes_colocation.cpp | 23 +++++++--------- .../colocation/unique_vertices_colocation.cpp | 26 +++++++++---------- .../degeneration/brep_meshes_degeneration.cpp | 8 +++--- .../degeneration/edgedcurve_degeneration.cpp | 8 +++--- .../degeneration/solid_degeneration.cpp | 3 +-- .../degeneration/surface_degeneration.cpp | 3 +-- .../criterion/internal/colocation_impl.cpp | 12 ++++----- .../internal/component_meshes_adjacency.cpp | 9 +++---- .../component_meshes_degeneration.cpp | 6 ++--- .../criterion/internal/degeneration_impl.cpp | 9 +++---- .../surface_curve_intersections.cpp | 7 +++-- .../intersections/surface_intersections.cpp | 8 +++--- .../manifold/brep_meshes_manifold.cpp | 24 ++++++++++------- .../manifold/solid_edge_manifold.cpp | 9 +++---- .../manifold/solid_facet_manifold.cpp | 4 +-- .../manifold/solid_vertex_manifold.cpp | 11 ++++---- .../manifold/surface_edge_manifold.cpp | 8 +++--- .../manifold/surface_vertex_manifold.cpp | 11 ++++---- .../brep_meshes_negative_elements.cpp | 2 +- .../section_meshes_negative_elements.cpp | 2 +- .../solid_negative_elements.cpp | 5 ++-- .../surface_negative_elements.cpp | 7 ++--- 25 files changed, 111 insertions(+), 118 deletions(-) diff --git a/src/geode/inspector/criterion/adjacency/brep_meshes_adjacency.cpp b/src/geode/inspector/criterion/adjacency/brep_meshes_adjacency.cpp index 53a4c346..4ccb8b44 100644 --- a/src/geode/inspector/criterion/adjacency/brep_meshes_adjacency.cpp +++ b/src/geode/inspector/criterion/adjacency/brep_meshes_adjacency.cpp @@ -89,7 +89,7 @@ namespace geode auto wrong_adjacencies = inspector.polyhedron_facets_with_wrong_adjacency(); wrong_adjacencies.set_description( - absl::StrCat( "Block ", block.name(), + absl::StrCat( "block ", block.name(), " polyhedron facets adjacencies issues - uuid ", block.id().string() ) ); const auto& mesh = block.mesh(); @@ -112,10 +112,10 @@ namespace geode && !is_on_surface.value() ) { wrong_adjacencies.add_issue( polyhedron_facet, - absl::StrCat( "Local facet ", facet_id, + absl::StrCat( "facet ", facet_id, " of polyhedron ", polyhedron_id, " has no adjacencies but is not part of a " - "model Surface." ) ); + "model surface." ) ); } } } diff --git a/src/geode/inspector/criterion/adjacency/solid_adjacency.cpp b/src/geode/inspector/criterion/adjacency/solid_adjacency.cpp index ffd845b6..c1bc9946 100644 --- a/src/geode/inspector/criterion/adjacency/solid_adjacency.cpp +++ b/src/geode/inspector/criterion/adjacency/solid_adjacency.cpp @@ -61,7 +61,9 @@ namespace geode polyhedron_facets_with_wrong_adjacency() const { InspectionIssues< PolyhedronFacet > wrong_adjacency_facets{ - absl::StrCat( "Polyhedron facets with wrong adjacencies." ) + absl::StrCat( "Solid ", mesh_.name(), + " polyhedron facets adjacencies issues - uuid ", + mesh_.id().string() ) }; for( const auto polyhedron_id : Range{ mesh_.nb_polyhedra() } ) { @@ -75,9 +77,8 @@ namespace geode polyhedron_facet ) ) { wrong_adjacency_facets.add_issue( polyhedron_facet, - absl::StrCat( "Local facet ", facet_id, - " of polyhedron ", polyhedron_id, - " has wrong adjacencies." ) ); + absl::StrCat( "facet ", facet_id, " of polyhedron ", + polyhedron_id ) ); } } } diff --git a/src/geode/inspector/criterion/adjacency/surface_adjacency.cpp b/src/geode/inspector/criterion/adjacency/surface_adjacency.cpp index ae5b86bc..d7320583 100644 --- a/src/geode/inspector/criterion/adjacency/surface_adjacency.cpp +++ b/src/geode/inspector/criterion/adjacency/surface_adjacency.cpp @@ -59,7 +59,9 @@ namespace geode polygon_edges_with_wrong_adjacency() const { InspectionIssues< PolygonEdge > wrong_adjacency_edges{ absl::StrCat( - "Polygon edges with wrong adjacencies." ) }; + "Surface ", mesh_.name(), + " Polygon edges adjacencies issues - uuid ", + mesh_.id().string() ) }; for( const auto polygon_id : Range{ mesh_.nb_polygons() } ) { for( const auto edge_id : @@ -71,9 +73,8 @@ namespace geode polygon_edge ) ) { wrong_adjacency_edges.add_issue( - polygon_edge, absl::StrCat( "Local edge ", edge_id, - " of polygon ", polygon_id, - " has wrong adjacencies." ) ); + polygon_edge, absl::StrCat( "edge ", edge_id, + " of polygon ", polygon_id ) ); } } } diff --git a/src/geode/inspector/criterion/colocation/component_meshes_colocation.cpp b/src/geode/inspector/criterion/colocation/component_meshes_colocation.cpp index 893c79dd..5c0c513d 100644 --- a/src/geode/inspector/criterion/colocation/component_meshes_colocation.cpp +++ b/src/geode/inspector/criterion/colocation/component_meshes_colocation.cpp @@ -112,7 +112,7 @@ namespace if( !colocated_pts.empty() ) { geode::InspectionIssues< std::vector< geode::index_t > > - line_issues{ absl::StrCat( "Line ", line.name(), + line_issues{ absl::StrCat( "line ", line.name(), " colocated vertices - uuid ", line.id().string() ) }; const auto& line_mesh = line.mesh(); for( const auto& colocated_points_group : colocated_pts ) @@ -124,12 +124,11 @@ namespace &point_group_string, " ", point_index ); } line_issues.add_issue( colocated_points_group, - absl::StrCat( "Line ", line.name(), - " has vertices with indices", point_group_string, - " which are colocated at position [", + absl::StrCat( point_group_string, + " are colocated at position [", line_mesh.point( colocated_points_group[0] ) .string(), - "] - uuid ", line.id().string() ) ); + "]" ) ); } components_colocated_points.add_issues_to_map( line.id(), std::move( line_issues ) ); @@ -160,12 +159,11 @@ namespace &point_group_string, " ", point_index ); } surface_issues.add_issue( colocated_points_group, - absl::StrCat( "Surface ", surface.name(), - " has vertices with indices", point_group_string, - " which are colocated at position [", + absl::StrCat( point_group_string, + " are colocated at position [", surface_mesh.point( colocated_points_group[0] ) .string(), - "] - uuid ", surface.id().string() ) ); + "]" ) ); } components_colocated_points.add_issues_to_map( surface.id(), std::move( surface_issues ) ); @@ -210,12 +208,11 @@ namespace &point_group_string, " ", point_index ); } block_issues.add_issue( colocated_points_group, - absl::StrCat( "Block ", block.name(), - " has vertices with indices", point_group_string, - " which are colocated at position [", + absl::StrCat( point_group_string, + " are colocated at position [", block_mesh.point( colocated_points_group[0] ) .string(), - "] - uuid ", block.id().string() ) ); + "]" ) ); } components_colocated_points.add_issues_to_map( block.id(), std::move( block_issues ) ); diff --git a/src/geode/inspector/criterion/colocation/unique_vertices_colocation.cpp b/src/geode/inspector/criterion/colocation/unique_vertices_colocation.cpp index d58021a0..df760956 100644 --- a/src/geode/inspector/criterion/colocation/unique_vertices_colocation.cpp +++ b/src/geode/inspector/criterion/colocation/unique_vertices_colocation.cpp @@ -56,15 +56,15 @@ namespace == geode::Line< Model::dim >::component_type_static() ) { return point.inexact_equal( model.line( cmv.component_id.id() ) - .mesh() - .point( cmv.vertex ) ); + .mesh() + .point( cmv.vertex ) ); } else if( cmv.component_id.type() == geode::Surface< Model::dim >::component_type_static() ) { return point.inexact_equal( model.surface( cmv.component_id.id() ) - .mesh() - .point( cmv.vertex ) ); + .mesh() + .point( cmv.vertex ) ); } return point.inexact_equal( model.corner( cmv.component_id.id() ).mesh().point( cmv.vertex ) ); @@ -85,8 +85,8 @@ namespace if( cmv.component_id.type() == geode::Block3D::component_type_static() ) { return point.inexact_equal( model.block( cmv.component_id.id() ) - .mesh() - .point( cmv.vertex ) ); + .mesh() + .point( cmv.vertex ) ); } return model_cmv_is_colocated_on_point_base< geode::BRep >( model, cmv, point ); @@ -161,7 +161,7 @@ namespace geode std::string UniqueVerticesInspectionResult::inspection_type() const { - return "Unique vertices colocation inspection"; + return "Unique vertices colocalization inspection"; } template < typename Model > @@ -225,10 +225,8 @@ namespace geode unique_vertices_->point( unique_vertex_id ) ) ) { vertices_issues.add_issue( unique_vertex_id, - absl::StrCat( "Unique vertex with index ", - unique_vertex_id, - " has component mesh vertices which are not " - "on the same position." ) ); + absl::StrCat( "Unique vertex ", unique_vertex_id, + " is linked to several location." ) ); } } } @@ -260,11 +258,11 @@ namespace geode if( !fixed_point_group.empty() ) { vertices_issues.add_issue( fixed_point_group, - absl::StrCat( "Unique vertices with indices", - point_group_string, " are colocated at position [", + absl::StrCat( "Unique vertices ", point_group_string, + " are colocated at the position [", unique_vertices_->point( fixed_point_group[0] ) .string(), - "]." ) ); + "]" ) ); } } } diff --git a/src/geode/inspector/criterion/degeneration/brep_meshes_degeneration.cpp b/src/geode/inspector/criterion/degeneration/brep_meshes_degeneration.cpp index ceee0bbe..041780c7 100644 --- a/src/geode/inspector/criterion/degeneration/brep_meshes_degeneration.cpp +++ b/src/geode/inspector/criterion/degeneration/brep_meshes_degeneration.cpp @@ -59,7 +59,7 @@ namespace geode } if( message.empty() ) { - return "No degeneration issues in model \n"; + return "No degeneration issues in model\n"; } return message; } @@ -101,9 +101,9 @@ namespace geode } const geode::SolidMeshDegeneration3D inspector{ mesh }; auto small_edges = inspector.small_edges( threshold ); - small_edges.set_description( - absl::StrCat( "Block ", block.name(), - " small edges - uuid ", block.id().string() ) ); + small_edges.set_description( absl::StrCat( "Block ", + block.name(), " small edges polyhedra - uuid ", + block.id().string() ) ); small_edges_map.add_issues_to_map( block.id(), std::move( small_edges ) ); auto small_polyhedra = diff --git a/src/geode/inspector/criterion/degeneration/edgedcurve_degeneration.cpp b/src/geode/inspector/criterion/degeneration/edgedcurve_degeneration.cpp index 8f935712..3e3954bc 100644 --- a/src/geode/inspector/criterion/degeneration/edgedcurve_degeneration.cpp +++ b/src/geode/inspector/criterion/degeneration/edgedcurve_degeneration.cpp @@ -60,11 +60,9 @@ namespace geode { if( mesh_.edge_length( edge_id ) <= threshold ) { - degenerated_edges_index.add_issue( - edge_id, absl::StrCat( "Edge with index ", edge_id, - ", at position [", - mesh_.edge_barycenter( edge_id ).string(), - "], is degenerated." ) ); + degenerated_edges_index.add_issue( edge_id, + absl::StrCat( "Edge ", edge_id, ", at position [", + mesh_.edge_barycenter( edge_id ).string(), "]" ) ); } } return degenerated_edges_index; diff --git a/src/geode/inspector/criterion/degeneration/solid_degeneration.cpp b/src/geode/inspector/criterion/degeneration/solid_degeneration.cpp index dcf6a9e1..0cbaf7e2 100644 --- a/src/geode/inspector/criterion/degeneration/solid_degeneration.cpp +++ b/src/geode/inspector/criterion/degeneration/solid_degeneration.cpp @@ -77,8 +77,7 @@ namespace geode <= threshold ) { wrong_polyhedra.add_issue( polyhedron_id, - absl::StrCat( "Polyhedron ", polyhedron_id, - " is degenerated." ) ); + absl::StrCat( "Polyhedron ", polyhedron_id ) ); } } return wrong_polyhedra; diff --git a/src/geode/inspector/criterion/degeneration/surface_degeneration.cpp b/src/geode/inspector/criterion/degeneration/surface_degeneration.cpp index 9d42c421..d1707539 100644 --- a/src/geode/inspector/criterion/degeneration/surface_degeneration.cpp +++ b/src/geode/inspector/criterion/degeneration/surface_degeneration.cpp @@ -75,8 +75,7 @@ namespace geode <= threshold ) { wrong_polygons.add_issue( - polygon_id, absl::StrCat( "Polygon ", polygon_id, - " is degenerated." ) ); + polygon_id, absl::StrCat( "Polygon ", polygon_id ) ); } } return wrong_polygons; diff --git a/src/geode/inspector/criterion/internal/colocation_impl.cpp b/src/geode/inspector/criterion/internal/colocation_impl.cpp index 9dafe606..e57ad366 100644 --- a/src/geode/inspector/criterion/internal/colocation_impl.cpp +++ b/src/geode/inspector/criterion/internal/colocation_impl.cpp @@ -74,7 +74,7 @@ namespace colocated_points_groups_end, colocated_points_indices.end() ); geode::InspectionIssues< std::vector< geode::index_t > > - groups_of_colocated_points{ "Groups of colocated points." }; + groups_of_colocated_points{ "Groups of colocated points" }; for( const auto& colocated_points_group : colocated_points_indices ) { std::string point_group_string; @@ -83,13 +83,13 @@ namespace absl::StrAppend( &point_group_string, " ", point_index ); } groups_of_colocated_points.add_issue( colocated_points_group, - absl::StrCat( "Vertices with indices", point_group_string, - " are colocated at position [", + absl::StrCat( "Vertices ", point_group_string, + " are colocated at the position [", mesh_colocation_info - .unique_points[mesh_colocation_info - .colocated_mapping[colocated_points_group[0]]] + .unique_points[mesh_colocation_info.colocated_mapping + [colocated_points_group[0]]] .string(), - "]." ) ); + "]" ) ); } return groups_of_colocated_points; } diff --git a/src/geode/inspector/criterion/internal/component_meshes_adjacency.cpp b/src/geode/inspector/criterion/internal/component_meshes_adjacency.cpp index 8093ed90..08a8c0ee 100644 --- a/src/geode/inspector/criterion/internal/component_meshes_adjacency.cpp +++ b/src/geode/inspector/criterion/internal/component_meshes_adjacency.cpp @@ -96,19 +96,18 @@ namespace geode model_, surface, polygon_edge ) ) { issues.add_issue( polygon_edge, - absl::StrCat( "Local edge ", edge_id, + absl::StrCat( "edge ", edge_id, " of polygon ", polygon_id, " has no adjacencies but is not part " - "of a " - "model Line." ) ); + "of a model Line." ) ); } } catch( const OpenGeodeException& e ) { Logger::warn( e.what() ); issues.add_issue( polygon_edge, - absl::StrCat( "Local edge ", edge_id, - " of polygon ", polygon_id, + absl::StrCat( "edge ", edge_id, " of polygon ", + polygon_id, " has no adjacencies but is not part of a " "model Line." ) ); } diff --git a/src/geode/inspector/criterion/internal/component_meshes_degeneration.cpp b/src/geode/inspector/criterion/internal/component_meshes_degeneration.cpp index ff4ef0ce..b9623a49 100644 --- a/src/geode/inspector/criterion/internal/component_meshes_degeneration.cpp +++ b/src/geode/inspector/criterion/internal/component_meshes_degeneration.cpp @@ -72,7 +72,7 @@ namespace geode line.mesh() }; auto issues = inspector.small_edges( threshold ); - issues.set_description( absl::StrCat( "Line ", line.name(), + issues.set_description( absl::StrCat( "line ", line.name(), " small edges - uuid ", line.id().string() ) ); return std::make_pair( line.id(), std::move( issues ) ); } ) ); @@ -103,7 +103,7 @@ namespace geode inspector{ surface.mesh() }; auto issues = inspector.small_edges( threshold ); issues.set_description( absl::StrCat( "Surface ", - surface.name(), " small edges - uuid ", + surface.name(), " small facet edges - uuid ", surface.id().string() ) ); return std::make_pair( surface.id(), std::move( issues ) ); @@ -142,7 +142,7 @@ namespace geode inspector{ surface.mesh() }; auto issues = inspector.small_height_polygons( threshold ); issues.set_description( absl::StrCat( "Surface ", - surface.name(), " small polygons - uuid ", + surface.name(), " small height polygons - uuid ", surface.id().string() ) ); return std::make_pair( surface.id(), std::move( issues ) ); } ) ); diff --git a/src/geode/inspector/criterion/internal/degeneration_impl.cpp b/src/geode/inspector/criterion/internal/degeneration_impl.cpp index 12043c46..4c95cbb9 100644 --- a/src/geode/inspector/criterion/internal/degeneration_impl.cpp +++ b/src/geode/inspector/criterion/internal/degeneration_impl.cpp @@ -72,7 +72,7 @@ namespace geode { enable_edges_on_mesh(); InspectionIssues< index_t > degenerated_edges_index{ - "Degenerated Edges." + "Degenerated Edges" }; for( const auto edge_index : Range{ mesh_.edges().nb_edges() } ) { @@ -81,11 +81,10 @@ namespace geode const auto edge_vertices = mesh_.edges().edge_vertices( edge_index ); degenerated_edges_index.add_issue( edge_index, - absl::StrCat( "Edge between vertices with index ", - edge_vertices[0], " and index ", edge_vertices[1], + absl::StrCat( "Edge between vertices ", + edge_vertices[0], " and ", edge_vertices[1], ", at position [", - mesh_.point( edge_vertices[0] ).string(), - "], is degenerated." ) ); + mesh_.point( edge_vertices[0] ).string(), "]" ) ); } } return degenerated_edges_index; diff --git a/src/geode/inspector/criterion/intersections/surface_curve_intersections.cpp b/src/geode/inspector/criterion/intersections/surface_curve_intersections.cpp index fca895da..3e5ae548 100644 --- a/src/geode/inspector/criterion/intersections/surface_curve_intersections.cpp +++ b/src/geode/inspector/criterion/intersections/surface_curve_intersections.cpp @@ -240,13 +240,12 @@ namespace geode const auto intersections = intersecting_triangles_with_edges< AllTriangleEdgeIntersection< dimension > >(); InspectionIssues< std::pair< index_t, index_t > > issues{ - "Triangle edge intersections between triangle." + "intersections between triangles and edges" }; for( const auto& pair : intersections ) { - issues.add_issue( - pair, absl::StrCat( "Triangle ", pair.first, " and edge", - pair.second, " intersect each other." ) ); + issues.add_issue( pair, absl::StrCat( "Triangle ", pair.first, + " and edge", pair.second ) ); } return issues; } diff --git a/src/geode/inspector/criterion/intersections/surface_intersections.cpp b/src/geode/inspector/criterion/intersections/surface_intersections.cpp index 191aab3e..efce92f3 100644 --- a/src/geode/inspector/criterion/intersections/surface_intersections.cpp +++ b/src/geode/inspector/criterion/intersections/surface_intersections.cpp @@ -119,14 +119,14 @@ namespace geode { const auto intersections = intersecting_polygons( false ); InspectionIssues< std::pair< index_t, index_t > > issues{ - "Polygon - polygon intersections." + "intersections between polygons" }; for( const auto& polygon_pair : intersections ) { - issues.add_issue( polygon_pair, - absl::StrCat( "Polygons ", polygon_pair.first, " and ", - polygon_pair.second, " intersect each other." ) ); + issues.add_issue( + polygon_pair, absl::StrCat( "Polygons ", polygon_pair.first, + " and ", polygon_pair.second ) ); } return issues; } diff --git a/src/geode/inspector/criterion/manifold/brep_meshes_manifold.cpp b/src/geode/inspector/criterion/manifold/brep_meshes_manifold.cpp index d8c4a6bf..2dba49ca 100644 --- a/src/geode/inspector/criterion/manifold/brep_meshes_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/brep_meshes_manifold.cpp @@ -109,8 +109,9 @@ namespace geode { const SolidMeshVertexManifold3D inspector{ block.mesh() }; auto non_manifold_vertices = inspector.non_manifold_vertices(); - non_manifold_vertices.set_description( absl::StrCat( - "Block ", block.id().string(), " non manifold vertices" ) ); + non_manifold_vertices.set_description( absl::StrCat( "Block ", + block.name(), " non manifold vertices - uuid ", + block.id().string() ) ); components_non_manifold_vertices.add_issues_to_map( block.id(), std::move( non_manifold_vertices ) ); } @@ -127,8 +128,9 @@ namespace geode { const SolidMeshEdgeManifold3D inspector{ block.mesh() }; auto non_manifold_edges = inspector.non_manifold_edges(); - non_manifold_edges.set_description( absl::StrCat( - "Block ", block.id().string(), " non manifold edges" ) ); + non_manifold_edges.set_description( + absl::StrCat( "Block ", block.name(), + " non manifold edges - uuid ", block.id().string() ) ); components_non_manifold_edges.add_issues_to_map( block.id(), non_manifold_edges ); } @@ -142,8 +144,9 @@ namespace geode { const SolidMeshFacetManifold3D inspector{ block.mesh() }; auto non_manifold_facets = inspector.non_manifold_facets(); - non_manifold_facets.set_description( absl::StrCat( - "Block ", block.id().string(), " non manifold facets" ) ); + non_manifold_facets.set_description( + absl::StrCat( "Block ", block.name(), + " non manifold facets - uuid ", block.id().string() ) ); components_non_manifold_facets.add_issues_to_map( block.id(), non_manifold_facets ); } @@ -198,7 +201,8 @@ namespace geode "but is on surfaces " ); for( const auto surface_uuid : edge.second ) { - absl::StrAppend( &message, surface_uuid.string(), ", " ); + absl::StrAppend( &message, surface.name(), " (", + surface_uuid.string(), "), " ); } issues.add_issue( BRepNonManifoldEdge{ edge.first.vertices(), edge.second }, @@ -227,7 +231,8 @@ namespace geode "Model edge between unique vertices ", edge_unique_vertices[0], " and ", edge_unique_vertices[1], " is not manifold: it belongs to internal line ", - line.id().string(), " with only one edge" ); + line.name(), " (", line.id().string(), + ") with only one edge" ); issues.add_issue( BRepNonManifoldEdge{ edge_unique_vertices, { line.id() } }, message ); @@ -258,7 +263,8 @@ namespace geode } absl::StrAppend( &message, " is not manifold: it belongs to internal surface ", - surface.id().string(), " with only one facet" ); + surface.name(), " (", surface.id().string(), + ") with only one facet" ); issues.add_issue( BRepNonManifoldFacet{ facet_vertices, { surface.id() } }, message ); diff --git a/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp b/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp index a67caf7a..9983afb1 100644 --- a/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp @@ -68,8 +68,8 @@ namespace { const Edge polyhedron_edge{ polyhedron_edge_vertices }; if( !polyhedra_around_edges - .try_emplace( polyhedron_edge, 1, polyhedron_id ) - .second ) + .try_emplace( polyhedron_edge, 1, polyhedron_id ) + .second ) { polyhedra_around_edges[polyhedron_edge].push_back( polyhedron_id ); @@ -122,7 +122,7 @@ namespace geode InspectionIssues< std::array< index_t, 2 > > non_manifold_edges() const { InspectionIssues< std::array< index_t, 2 > > non_manifold_edges{ - "Non manifold edges." + "Non manifold edges" }; absl::flat_hash_set< Edge > checked_edges; for( const auto polyhedron_id : Range{ mesh_.nb_polyhedra() } ) @@ -148,8 +148,7 @@ namespace geode absl::StrCat( "Edge between vertices with index ", polyhedron_edge_vertices[0], " and index ", - polyhedron_edge_vertices[1], - " is not manifold." ) ); + polyhedron_edge_vertices[1] ) ); } } catch( const OpenGeodeException& ) diff --git a/src/geode/inspector/criterion/manifold/solid_facet_manifold.cpp b/src/geode/inspector/criterion/manifold/solid_facet_manifold.cpp index 466347ff..c625d21e 100644 --- a/src/geode/inspector/criterion/manifold/solid_facet_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/solid_facet_manifold.cpp @@ -51,7 +51,7 @@ namespace const Facet facet{ mesh.polyhedron_facet_vertices( { polyhedron_id, facet_id } ) }; if( !nb_polyhedra_adjacent_to_facets.try_emplace( facet, 1 ) - .second ) + .second ) { nb_polyhedra_adjacent_to_facets[facet] += 1; } @@ -89,7 +89,7 @@ namespace geode const auto nb_polyhedra_adjacent_to_facets = facets_to_nb_adjacent_polyhedra( mesh_ ); InspectionIssues< PolyhedronFacetVertices > non_manifold_facets{ - "Non manifold facets." + "Non manifold facets" }; for( const auto& nb_adjacent_polyhedra : nb_polyhedra_adjacent_to_facets ) diff --git a/src/geode/inspector/criterion/manifold/solid_vertex_manifold.cpp b/src/geode/inspector/criterion/manifold/solid_vertex_manifold.cpp index fef4add5..f4ff7175 100644 --- a/src/geode/inspector/criterion/manifold/solid_vertex_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/solid_vertex_manifold.cpp @@ -101,7 +101,7 @@ namespace geode const auto polyhedra_around_vertices_list = polyhedra_around_vertices( mesh_ ); InspectionIssues< geode::index_t > non_manifold_vertices{ - "Non manifold vertices." + "Non manifold vertices" }; for( const auto vertex_id : geode::Range{ mesh_.nb_vertices() } ) { @@ -109,11 +109,10 @@ namespace geode polyhedra_around_vertices_list[vertex_id], mesh_.polyhedra_around_vertex( vertex_id ) ) ) { - non_manifold_vertices.add_issue( - vertex_id, absl::StrCat( "Vertex with index ", - vertex_id, ", at position [", - mesh_.point( vertex_id ).string(), - "], is not manifold." ) ); + non_manifold_vertices.add_issue( vertex_id, + absl::StrCat( "Vertex with index ", vertex_id, + ", at position [", + mesh_.point( vertex_id ).string(), "]" ) ); } } return non_manifold_vertices; diff --git a/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp b/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp index 376c1ff9..a4b770e8 100644 --- a/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp @@ -51,9 +51,9 @@ namespace { polygon_id, polygon_edge_id } ) }; if( !polygons_around_edges - .try_emplace( polygon_edge_vertex_cycle, - std::make_pair( 1, false ) ) - .second ) + .try_emplace( polygon_edge_vertex_cycle, + std::make_pair( 1, false ) ) + .second ) { polygons_around_edges[polygon_edge_vertex_cycle].first += 1; } @@ -98,7 +98,7 @@ namespace geode InspectionIssues< std::array< index_t, 2 > > non_manifold_edges() const { InspectionIssues< std::array< index_t, 2 > > non_manifold_edges{ - "Non manifold edges;" + "Non manifold edges" }; for( const auto& edge : edge_to_polygons_around( mesh_ ) ) { diff --git a/src/geode/inspector/criterion/manifold/surface_vertex_manifold.cpp b/src/geode/inspector/criterion/manifold/surface_vertex_manifold.cpp index 7ddbc08b..cd6a6a5b 100644 --- a/src/geode/inspector/criterion/manifold/surface_vertex_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/surface_vertex_manifold.cpp @@ -107,7 +107,7 @@ namespace geode const auto polygons_around_vertices_list = polygons_around_vertices( mesh_ ); InspectionIssues< geode::index_t > non_manifold_vertices{ - "Non manifold vertices." + "Non manifold vertices" }; for( const auto vertex_id : geode::Range{ mesh_.nb_vertices() } ) { @@ -117,11 +117,10 @@ namespace geode polygons_around_vertices_list[vertex_id], mesh_.polygons_around_vertex( vertex_id ) ) ) { - non_manifold_vertices.add_issue( - vertex_id, absl::StrCat( "Vertex with index ", - vertex_id, ", at position [", - mesh_.point( vertex_id ).string(), - "], is not manifold." ) ); + non_manifold_vertices.add_issue( vertex_id, + absl::StrCat( "Vertex with index ", vertex_id, + ", at position [", + mesh_.point( vertex_id ).string(), "]" ) ); } } catch( const geode::OpenGeodeException& ) diff --git a/src/geode/inspector/criterion/negative_elements/brep_meshes_negative_elements.cpp b/src/geode/inspector/criterion/negative_elements/brep_meshes_negative_elements.cpp index f216acba..c3f8e404 100644 --- a/src/geode/inspector/criterion/negative_elements/brep_meshes_negative_elements.cpp +++ b/src/geode/inspector/criterion/negative_elements/brep_meshes_negative_elements.cpp @@ -44,7 +44,7 @@ namespace geode { return negative_polyhedra.string(); } - return "No negative polyhedra issues in model \n"; + return "No negative polyhedra issues in model\n"; } std::string diff --git a/src/geode/inspector/criterion/negative_elements/section_meshes_negative_elements.cpp b/src/geode/inspector/criterion/negative_elements/section_meshes_negative_elements.cpp index 9dc79637..7fd54822 100644 --- a/src/geode/inspector/criterion/negative_elements/section_meshes_negative_elements.cpp +++ b/src/geode/inspector/criterion/negative_elements/section_meshes_negative_elements.cpp @@ -46,7 +46,7 @@ namespace geode { return negative_polygons.string(); } - return "No negative polygons issues in model \n"; + return "No negative polygons issues in model\n"; } std::string diff --git a/src/geode/inspector/criterion/negative_elements/solid_negative_elements.cpp b/src/geode/inspector/criterion/negative_elements/solid_negative_elements.cpp index b15da02d..7f84e05a 100644 --- a/src/geode/inspector/criterion/negative_elements/solid_negative_elements.cpp +++ b/src/geode/inspector/criterion/negative_elements/solid_negative_elements.cpp @@ -56,15 +56,14 @@ namespace geode InspectionIssues< index_t > negative_polyhedra() const { InspectionIssues< index_t > wrong_polyhedra{ - "Negative Polyhedra." + "Negative Volume Polyhedra" }; for( const auto polyhedron_id : Range{ mesh_.nb_polyhedra() } ) { if( polyhedron_has_negative_volume( polyhedron_id ) ) { wrong_polyhedra.add_issue( polyhedron_id, - absl::StrCat( "Polyhedron ", polyhedron_id, - " has a negative volume." ) ); + absl::StrCat( "Polyhedron ", polyhedron_id ) ); } } return wrong_polyhedra; diff --git a/src/geode/inspector/criterion/negative_elements/surface_negative_elements.cpp b/src/geode/inspector/criterion/negative_elements/surface_negative_elements.cpp index 3ef3bcfb..efd1d88c 100644 --- a/src/geode/inspector/criterion/negative_elements/surface_negative_elements.cpp +++ b/src/geode/inspector/criterion/negative_elements/surface_negative_elements.cpp @@ -56,14 +56,15 @@ namespace geode InspectionIssues< index_t > negative_polygons() const { - InspectionIssues< index_t > wrong_polygons{ "Negative Polygons." }; + InspectionIssues< index_t > wrong_polygons{ + "Negative Area Polygons" + }; for( const auto polygon_id : Range{ mesh_.nb_polygons() } ) { if( polygon_has_negative_area( polygon_id ) ) { wrong_polygons.add_issue( - polygon_id, absl::StrCat( "Polygon ", polygon_id, - " has a negative area." ) ); + polygon_id, absl::StrCat( "Polygon ", polygon_id ) ); } } return wrong_polygons; From 1ff71784c4615fb09b280845d3fd22aafedcaf55 Mon Sep 17 00:00:00 2001 From: francoisbonneau <24669995+francoisbonneau@users.noreply.github.com> Date: Tue, 28 Oct 2025 17:33:36 +0000 Subject: [PATCH 06/14] Apply prepare changes --- .../colocation/unique_vertices_colocation.cpp | 12 ++++++------ .../inspector/criterion/internal/colocation_impl.cpp | 4 ++-- .../criterion/manifold/solid_edge_manifold.cpp | 4 ++-- .../criterion/manifold/solid_facet_manifold.cpp | 2 +- .../criterion/manifold/surface_edge_manifold.cpp | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/geode/inspector/criterion/colocation/unique_vertices_colocation.cpp b/src/geode/inspector/criterion/colocation/unique_vertices_colocation.cpp index df760956..d1a0a1ea 100644 --- a/src/geode/inspector/criterion/colocation/unique_vertices_colocation.cpp +++ b/src/geode/inspector/criterion/colocation/unique_vertices_colocation.cpp @@ -56,15 +56,15 @@ namespace == geode::Line< Model::dim >::component_type_static() ) { return point.inexact_equal( model.line( cmv.component_id.id() ) - .mesh() - .point( cmv.vertex ) ); + .mesh() + .point( cmv.vertex ) ); } else if( cmv.component_id.type() == geode::Surface< Model::dim >::component_type_static() ) { return point.inexact_equal( model.surface( cmv.component_id.id() ) - .mesh() - .point( cmv.vertex ) ); + .mesh() + .point( cmv.vertex ) ); } return point.inexact_equal( model.corner( cmv.component_id.id() ).mesh().point( cmv.vertex ) ); @@ -85,8 +85,8 @@ namespace if( cmv.component_id.type() == geode::Block3D::component_type_static() ) { return point.inexact_equal( model.block( cmv.component_id.id() ) - .mesh() - .point( cmv.vertex ) ); + .mesh() + .point( cmv.vertex ) ); } return model_cmv_is_colocated_on_point_base< geode::BRep >( model, cmv, point ); diff --git a/src/geode/inspector/criterion/internal/colocation_impl.cpp b/src/geode/inspector/criterion/internal/colocation_impl.cpp index e57ad366..afafa747 100644 --- a/src/geode/inspector/criterion/internal/colocation_impl.cpp +++ b/src/geode/inspector/criterion/internal/colocation_impl.cpp @@ -86,8 +86,8 @@ namespace absl::StrCat( "Vertices ", point_group_string, " are colocated at the position [", mesh_colocation_info - .unique_points[mesh_colocation_info.colocated_mapping - [colocated_points_group[0]]] + .unique_points[mesh_colocation_info + .colocated_mapping[colocated_points_group[0]]] .string(), "]" ) ); } diff --git a/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp b/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp index 9983afb1..36183e54 100644 --- a/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp @@ -68,8 +68,8 @@ namespace { const Edge polyhedron_edge{ polyhedron_edge_vertices }; if( !polyhedra_around_edges - .try_emplace( polyhedron_edge, 1, polyhedron_id ) - .second ) + .try_emplace( polyhedron_edge, 1, polyhedron_id ) + .second ) { polyhedra_around_edges[polyhedron_edge].push_back( polyhedron_id ); diff --git a/src/geode/inspector/criterion/manifold/solid_facet_manifold.cpp b/src/geode/inspector/criterion/manifold/solid_facet_manifold.cpp index c625d21e..4452e2d7 100644 --- a/src/geode/inspector/criterion/manifold/solid_facet_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/solid_facet_manifold.cpp @@ -51,7 +51,7 @@ namespace const Facet facet{ mesh.polyhedron_facet_vertices( { polyhedron_id, facet_id } ) }; if( !nb_polyhedra_adjacent_to_facets.try_emplace( facet, 1 ) - .second ) + .second ) { nb_polyhedra_adjacent_to_facets[facet] += 1; } diff --git a/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp b/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp index a4b770e8..2e9e023f 100644 --- a/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp @@ -51,9 +51,9 @@ namespace { polygon_id, polygon_edge_id } ) }; if( !polygons_around_edges - .try_emplace( polygon_edge_vertex_cycle, - std::make_pair( 1, false ) ) - .second ) + .try_emplace( polygon_edge_vertex_cycle, + std::make_pair( 1, false ) ) + .second ) { polygons_around_edges[polygon_edge_vertex_cycle].first += 1; } From 574e90d56672d4215f011ee51b73be0b8b35e7b9 Mon Sep 17 00:00:00 2001 From: Francois Bonneau Date: Mon, 3 Nov 2025 10:04:04 +0100 Subject: [PATCH 07/14] PA review --- include/geode/inspector/topology/brep_blocks_topology.hpp | 6 +++--- include/geode/inspector/topology/brep_corners_topology.hpp | 2 +- include/geode/inspector/topology/brep_lines_topology.hpp | 2 +- include/geode/inspector/topology/brep_surfaces_topology.hpp | 2 +- .../geode/inspector/topology/section_corners_topology.hpp | 2 +- include/geode/inspector/topology/section_lines_topology.hpp | 2 +- .../geode/inspector/topology/section_surfaces_topology.hpp | 2 +- .../criterion/colocation/component_meshes_colocation.cpp | 4 ++-- .../criterion/degeneration/edgedcurve_degeneration.cpp | 2 +- .../criterion/internal/component_meshes_degeneration.cpp | 4 ++-- .../criterion/intersections/model_intersections.cpp | 2 +- .../negative_elements/brep_meshes_negative_elements.cpp | 2 +- .../criterion/negative_elements/solid_negative_elements.cpp | 2 +- .../negative_elements/surface_negative_elements.cpp | 2 +- 14 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/geode/inspector/topology/brep_blocks_topology.hpp b/include/geode/inspector/topology/brep_blocks_topology.hpp index 70b846d6..3f792db8 100644 --- a/include/geode/inspector/topology/brep_blocks_topology.hpp +++ b/include/geode/inspector/topology/brep_blocks_topology.hpp @@ -46,10 +46,10 @@ namespace geode struct opengeode_inspector_inspector_api BRepBlocksTopologyInspectionResult { InspectionIssues< uuid > some_blocks_not_meshed{ - "blocks without mesh (UUIDs listed)" + "blocks without mesh (uuid listed)" }; InspectionIssues< uuid > wrong_block_boundary_surface{ - "surfaces incorrectly bounding blocks (UUIDs listed)" + "surfaces incorrectly bounding blocks (uuids listed)" }; InspectionIssuesMap< index_t > blocks_not_linked_to_a_unique_vertex{ "blocks containing mesh vertices not linked to unique vertices" @@ -77,7 +77,7 @@ namespace geode "blocks with non-closed boundary surfaces" }; InspectionIssues< index_t > model_boundaries_dont_form_a_closed_surface{ - "model boundaries don't form a closed surface (UUIDs listed)" + "model boundaries don't form a closed surface (uuids listed)" }; InspectionIssues< index_t > unique_vertex_linked_to_multiple_invalid_surfaces{ diff --git a/include/geode/inspector/topology/brep_corners_topology.hpp b/include/geode/inspector/topology/brep_corners_topology.hpp index 634389de..8ffc50f2 100644 --- a/include/geode/inspector/topology/brep_corners_topology.hpp +++ b/include/geode/inspector/topology/brep_corners_topology.hpp @@ -43,7 +43,7 @@ namespace geode struct opengeode_inspector_inspector_api BRepCornersTopologyInspectionResult { InspectionIssues< uuid > corners_not_meshed{ - "corners without mesh (UUIDs listed)" + "corners without mesh (uuids listed)" }; InspectionIssuesMap< index_t > corners_not_linked_to_a_unique_vertex{ "corners containing mesh vertices not linked to unique vertices" diff --git a/include/geode/inspector/topology/brep_lines_topology.hpp b/include/geode/inspector/topology/brep_lines_topology.hpp index 3d524047..084b4454 100644 --- a/include/geode/inspector/topology/brep_lines_topology.hpp +++ b/include/geode/inspector/topology/brep_lines_topology.hpp @@ -43,7 +43,7 @@ namespace geode struct opengeode_inspector_inspector_api BRepLinesTopologyInspectionResult { InspectionIssues< uuid > lines_not_meshed{ - "lines without mesh (UUIDs listed)" + "lines without mesh (uuids listed)" }; InspectionIssues< index_t > unique_vertices_linked_to_line_with_wrong_relationship_to_surface{ diff --git a/include/geode/inspector/topology/brep_surfaces_topology.hpp b/include/geode/inspector/topology/brep_surfaces_topology.hpp index d4c5bf6e..85948a85 100644 --- a/include/geode/inspector/topology/brep_surfaces_topology.hpp +++ b/include/geode/inspector/topology/brep_surfaces_topology.hpp @@ -42,7 +42,7 @@ namespace geode opengeode_inspector_inspector_api BRepSurfacesTopologyInspectionResult { InspectionIssues< uuid > surfaces_not_meshed{ - "surface without mesh (UUIDs listed)" + "surface without mesh (uuids listed)" }; InspectionIssuesMap< index_t > surfaces_not_linked_to_a_unique_vertex{ "surfaces containing mesh vertices not linked to unique vertices" diff --git a/include/geode/inspector/topology/section_corners_topology.hpp b/include/geode/inspector/topology/section_corners_topology.hpp index 22f435d6..dc6e591e 100644 --- a/include/geode/inspector/topology/section_corners_topology.hpp +++ b/include/geode/inspector/topology/section_corners_topology.hpp @@ -43,7 +43,7 @@ namespace geode opengeode_inspector_inspector_api SectionCornersTopologyInspectionResult { InspectionIssues< uuid > corners_not_meshed{ - "corners without mesh (UUIDs listed)" + "corners without mesh (uuids listed)" }; InspectionIssuesMap< index_t > corners_not_linked_to_a_unique_vertex{ "corners containing mesh vertices not linked to unique vertices" diff --git a/include/geode/inspector/topology/section_lines_topology.hpp b/include/geode/inspector/topology/section_lines_topology.hpp index bbb2e672..f23fc0e0 100644 --- a/include/geode/inspector/topology/section_lines_topology.hpp +++ b/include/geode/inspector/topology/section_lines_topology.hpp @@ -41,7 +41,7 @@ namespace geode opengeode_inspector_inspector_api SectionLinesTopologyInspectionResult { InspectionIssues< uuid > lines_not_meshed{ - "lines without mesh (UUIDs listed)" + "lines without mesh (uuids listed)" }; InspectionIssuesMap< index_t > lines_not_linked_to_a_unique_vertex{ "lines with mesh vertices not linked to a unique vertex" diff --git a/include/geode/inspector/topology/section_surfaces_topology.hpp b/include/geode/inspector/topology/section_surfaces_topology.hpp index b1377f3f..a95c2f30 100644 --- a/include/geode/inspector/topology/section_surfaces_topology.hpp +++ b/include/geode/inspector/topology/section_surfaces_topology.hpp @@ -42,7 +42,7 @@ namespace geode opengeode_inspector_inspector_api SectionSurfacesTopologyInspectionResult { InspectionIssues< uuid > surfaces_not_meshed{ - "surface without mesh (UUIDs listed)" + "surface without mesh (uuids listed)" }; InspectionIssuesMap< index_t > surfaces_not_linked_to_a_unique_vertex{ "surfaces containing mesh vertices not linked to unique vertices" diff --git a/src/geode/inspector/criterion/colocation/component_meshes_colocation.cpp b/src/geode/inspector/criterion/colocation/component_meshes_colocation.cpp index 5c0c513d..e2601e31 100644 --- a/src/geode/inspector/criterion/colocation/component_meshes_colocation.cpp +++ b/src/geode/inspector/criterion/colocation/component_meshes_colocation.cpp @@ -146,7 +146,7 @@ namespace if( !colocated_pts.empty() ) { geode::InspectionIssues< std::vector< geode::index_t > > - surface_issues{ absl::StrCat( "Surface ", surface.name(), + surface_issues{ absl::StrCat( "surface ", surface.name(), " colocated vertices - uuid ", surface.id().string() ) }; const auto& surface_mesh = surface.mesh(); @@ -196,7 +196,7 @@ namespace if( !colocated_pts.empty() ) { geode::InspectionIssues< std::vector< geode::index_t > > - block_issues{ absl::StrCat( "Block ", block.name(), + block_issues{ absl::StrCat( "block ", block.name(), " colocated vertices - uuid ", block.id().string() ) }; const auto& block_mesh = block.mesh(); for( const auto& colocated_points_group : colocated_pts ) diff --git a/src/geode/inspector/criterion/degeneration/edgedcurve_degeneration.cpp b/src/geode/inspector/criterion/degeneration/edgedcurve_degeneration.cpp index 3e3954bc..76b555f6 100644 --- a/src/geode/inspector/criterion/degeneration/edgedcurve_degeneration.cpp +++ b/src/geode/inspector/criterion/degeneration/edgedcurve_degeneration.cpp @@ -61,7 +61,7 @@ namespace geode if( mesh_.edge_length( edge_id ) <= threshold ) { degenerated_edges_index.add_issue( edge_id, - absl::StrCat( "Edge ", edge_id, ", at position [", + absl::StrCat( "edge ", edge_id, ", at position [", mesh_.edge_barycenter( edge_id ).string(), "]" ) ); } } diff --git a/src/geode/inspector/criterion/internal/component_meshes_degeneration.cpp b/src/geode/inspector/criterion/internal/component_meshes_degeneration.cpp index b9623a49..351d363f 100644 --- a/src/geode/inspector/criterion/internal/component_meshes_degeneration.cpp +++ b/src/geode/inspector/criterion/internal/component_meshes_degeneration.cpp @@ -102,7 +102,7 @@ namespace geode const geode::SurfaceMeshDegeneration< Model::dim > inspector{ surface.mesh() }; auto issues = inspector.small_edges( threshold ); - issues.set_description( absl::StrCat( "Surface ", + issues.set_description( absl::StrCat( "surface ", surface.name(), " small facet edges - uuid ", surface.id().string() ) ); return std::make_pair( @@ -141,7 +141,7 @@ namespace geode const geode::SurfaceMeshDegeneration< Model::dim > inspector{ surface.mesh() }; auto issues = inspector.small_height_polygons( threshold ); - issues.set_description( absl::StrCat( "Surface ", + issues.set_description( absl::StrCat( "surface ", surface.name(), " small height polygons - uuid ", surface.id().string() ) ); return std::make_pair( surface.id(), std::move( issues ) ); diff --git a/src/geode/inspector/criterion/intersections/model_intersections.cpp b/src/geode/inspector/criterion/intersections/model_intersections.cpp index 93621575..26c039df 100644 --- a/src/geode/inspector/criterion/intersections/model_intersections.cpp +++ b/src/geode/inspector/criterion/intersections/model_intersections.cpp @@ -522,7 +522,7 @@ namespace geode model_.surface( polygon_pair.second.component_id.id() ); intersection_issues.add_issue( polygon_pair, absl::StrCat( surface1.name(), " and ", surface2.name(), - " intersect each other on polygons ", + " intersect on polygons ", polygon_pair.first.element_id, " and ", polygon_pair.second.element_id, " - uuids ", polygon_pair.first.component_id.id().string(), " and ", diff --git a/src/geode/inspector/criterion/negative_elements/brep_meshes_negative_elements.cpp b/src/geode/inspector/criterion/negative_elements/brep_meshes_negative_elements.cpp index c3f8e404..a8700fb9 100644 --- a/src/geode/inspector/criterion/negative_elements/brep_meshes_negative_elements.cpp +++ b/src/geode/inspector/criterion/negative_elements/brep_meshes_negative_elements.cpp @@ -69,7 +69,7 @@ namespace geode }; auto negative_elements = inspector.negative_polyhedra(); negative_elements.set_description( - absl::StrCat( "Block ", block.name(), + absl::StrCat( "block ", block.name(), " negative polyhedra - uuid ", block.id().string() ) ); result.negative_polyhedra.add_issues_to_map( block.id(), std::move( negative_elements ) ); diff --git a/src/geode/inspector/criterion/negative_elements/solid_negative_elements.cpp b/src/geode/inspector/criterion/negative_elements/solid_negative_elements.cpp index 7f84e05a..5439ffb6 100644 --- a/src/geode/inspector/criterion/negative_elements/solid_negative_elements.cpp +++ b/src/geode/inspector/criterion/negative_elements/solid_negative_elements.cpp @@ -56,7 +56,7 @@ namespace geode InspectionIssues< index_t > negative_polyhedra() const { InspectionIssues< index_t > wrong_polyhedra{ - "Negative Volume Polyhedra" + "negative volume polyhedra" }; for( const auto polyhedron_id : Range{ mesh_.nb_polyhedra() } ) { diff --git a/src/geode/inspector/criterion/negative_elements/surface_negative_elements.cpp b/src/geode/inspector/criterion/negative_elements/surface_negative_elements.cpp index efd1d88c..b0d2bb35 100644 --- a/src/geode/inspector/criterion/negative_elements/surface_negative_elements.cpp +++ b/src/geode/inspector/criterion/negative_elements/surface_negative_elements.cpp @@ -57,7 +57,7 @@ namespace geode InspectionIssues< index_t > negative_polygons() const { InspectionIssues< index_t > wrong_polygons{ - "Negative Area Polygons" + "Negative area polygons" }; for( const auto polygon_id : Range{ mesh_.nb_polygons() } ) { From 2729115b26731d6b2135d1f0af9527bc4117d75a Mon Sep 17 00:00:00 2001 From: Francois Bonneau Date: Mon, 3 Nov 2025 19:51:36 +0100 Subject: [PATCH 08/14] MSS PR --- .../adjacency/brep_meshes_adjacency.hpp | 4 +-- .../adjacency/section_meshes_adjacency.hpp | 2 +- .../component_meshes_colocation.hpp | 2 +- .../colocation/unique_vertices_colocation.hpp | 4 +-- .../degeneration/brep_meshes_degeneration.hpp | 8 ++---- .../section_meshes_degeneration.hpp | 6 ++-- .../intersections/model_intersections.hpp | 2 +- .../manifold/brep_meshes_manifold.hpp | 13 +++++---- .../manifold/section_meshes_manifold.hpp | 4 +-- .../brep_meshes_negative_elements.hpp | 2 +- .../section_meshes_negative_elements.hpp | 4 +-- .../geode/inspector/edgedcurve_inspector.hpp | 2 +- .../topology/brep_blocks_topology.hpp | 24 ++++++++-------- .../topology/brep_corners_topology.hpp | 10 +++---- .../topology/brep_lines_topology.hpp | 16 +++++------ .../topology/brep_surfaces_topology.hpp | 10 +++---- .../inspector/topology/brep_topology.hpp | 6 ++-- .../topology/internal/topology_helpers.hpp | 6 ++-- .../topology/section_corners_topology.hpp | 12 ++++---- .../topology/section_lines_topology.hpp | 12 ++++---- .../topology/section_surfaces_topology.hpp | 8 +++--- .../inspector/topology/section_topology.hpp | 6 ++-- src/geode/inspector/brep_inspector.cpp | 2 +- .../adjacency/brep_meshes_adjacency.cpp | 13 ++++----- .../adjacency/section_meshes_adjacency.cpp | 4 +-- .../criterion/adjacency/solid_adjacency.cpp | 5 ++-- .../criterion/adjacency/surface_adjacency.cpp | 9 +++--- .../criterion/brep_meshes_inspector.cpp | 2 +- .../component_meshes_colocation.cpp | 28 ++++++++++--------- .../colocation/unique_vertices_colocation.cpp | 17 +++++------ .../degeneration/brep_meshes_degeneration.cpp | 16 +++++------ .../degeneration/edgedcurve_degeneration.cpp | 3 +- .../section_meshes_degeneration.cpp | 4 +-- .../degeneration/solid_degeneration.cpp | 5 ++-- .../degeneration/surface_degeneration.cpp | 4 +-- .../criterion/internal/colocation_impl.cpp | 8 +++--- .../internal/component_meshes_adjacency.cpp | 4 +-- .../component_meshes_degeneration.cpp | 16 +++++------ .../internal/component_meshes_manifold.cpp | 12 ++++---- .../criterion/internal/degeneration_impl.cpp | 4 +-- .../intersections/model_intersections.cpp | 19 +++++++------ .../surface_curve_intersections.cpp | 5 ++-- .../intersections/surface_intersections.cpp | 6 ++-- .../manifold/brep_meshes_manifold.cpp | 26 ++++++++--------- .../manifold/section_meshes_manifold.cpp | 4 +-- .../manifold/solid_edge_manifold.cpp | 8 +++--- .../manifold/solid_facet_manifold.cpp | 6 ++-- .../manifold/solid_vertex_manifold.cpp | 4 +-- .../manifold/surface_edge_manifold.cpp | 12 ++++---- .../manifold/surface_vertex_manifold.cpp | 4 +-- .../brep_meshes_negative_elements.cpp | 8 +++--- .../section_meshes_negative_elements.cpp | 8 +++--- .../solid_negative_elements.cpp | 2 +- .../surface_negative_elements.cpp | 6 ++-- .../criterion/section_meshes_inspector.cpp | 2 +- src/geode/inspector/edgedcurve_inspector.cpp | 2 +- src/geode/inspector/pointset_inspector.cpp | 2 +- src/geode/inspector/section_inspector.cpp | 2 +- src/geode/inspector/solid_inspector.cpp | 2 +- src/geode/inspector/surface_inspector.cpp | 2 +- 60 files changed, 225 insertions(+), 224 deletions(-) diff --git a/include/geode/inspector/criterion/adjacency/brep_meshes_adjacency.hpp b/include/geode/inspector/criterion/adjacency/brep_meshes_adjacency.hpp index 096937cb..62db5cf7 100644 --- a/include/geode/inspector/criterion/adjacency/brep_meshes_adjacency.hpp +++ b/include/geode/inspector/criterion/adjacency/brep_meshes_adjacency.hpp @@ -45,11 +45,11 @@ namespace geode { InspectionIssuesMap< PolygonEdge > surfaces_edges_with_wrong_adjacencies{ - "surface polygon edges adjacencies issues" + "polygon edges adjacencies" }; InspectionIssuesMap< PolyhedronFacet > blocks_facets_with_wrong_adjacencies{ - "block polyhedron facets adjacencies issues" + "polyhedron facets adjacencies" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/criterion/adjacency/section_meshes_adjacency.hpp b/include/geode/inspector/criterion/adjacency/section_meshes_adjacency.hpp index 8823bbb7..419b390d 100644 --- a/include/geode/inspector/criterion/adjacency/section_meshes_adjacency.hpp +++ b/include/geode/inspector/criterion/adjacency/section_meshes_adjacency.hpp @@ -45,7 +45,7 @@ namespace geode { InspectionIssuesMap< PolygonEdge > surfaces_edges_with_wrong_adjacencies{ - "surface polygon edges adjacencies issues" + "polygon edges adjacencies" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/criterion/colocation/component_meshes_colocation.hpp b/include/geode/inspector/criterion/colocation/component_meshes_colocation.hpp index 84d92ea3..cd4a0d91 100644 --- a/include/geode/inspector/criterion/colocation/component_meshes_colocation.hpp +++ b/include/geode/inspector/criterion/colocation/component_meshes_colocation.hpp @@ -41,7 +41,7 @@ namespace geode struct opengeode_inspector_inspector_api MeshesColocationInspectionResult { InspectionIssuesMap< std::vector< index_t > > colocated_points_groups{ - "meshes with colocated points" + "colocated point" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/criterion/colocation/unique_vertices_colocation.hpp b/include/geode/inspector/criterion/colocation/unique_vertices_colocation.hpp index 2448325b..539dcc87 100644 --- a/include/geode/inspector/criterion/colocation/unique_vertices_colocation.hpp +++ b/include/geode/inspector/criterion/colocation/unique_vertices_colocation.hpp @@ -39,9 +39,9 @@ namespace geode struct opengeode_inspector_inspector_api UniqueVerticesInspectionResult { InspectionIssues< std::vector< index_t > > - colocated_unique_vertices_groups{ "colocated unique vertices" }; + colocated_unique_vertices_groups{ "colocated unique vertex" }; InspectionIssues< index_t > unique_vertices_linked_to_different_points{ - "unique vertices linked to several positions" + "unique vertex refering multiple position" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/criterion/degeneration/brep_meshes_degeneration.hpp b/include/geode/inspector/criterion/degeneration/brep_meshes_degeneration.hpp index 19cbaf0c..5dd3781a 100644 --- a/include/geode/inspector/criterion/degeneration/brep_meshes_degeneration.hpp +++ b/include/geode/inspector/criterion/degeneration/brep_meshes_degeneration.hpp @@ -41,14 +41,12 @@ namespace geode struct opengeode_inspector_inspector_api BRepMeshesDegenerationInspectionResult { - InspectionIssuesMap< index_t > degenerated_edges{ - "meshes with degenerated edges" - }; + InspectionIssuesMap< index_t > degenerated_edges{ "degenerated edge" }; InspectionIssuesMap< index_t > degenerated_polygons{ - "meshes with degenerated polygons" + "degenerated polygon" }; InspectionIssuesMap< index_t > degenerated_polyhedra{ - "meshes with degenerated polyhedra" + "degenerated polyhedron" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/criterion/degeneration/section_meshes_degeneration.hpp b/include/geode/inspector/criterion/degeneration/section_meshes_degeneration.hpp index 90f96fca..7a63e1fa 100644 --- a/include/geode/inspector/criterion/degeneration/section_meshes_degeneration.hpp +++ b/include/geode/inspector/criterion/degeneration/section_meshes_degeneration.hpp @@ -41,11 +41,9 @@ namespace geode struct opengeode_inspector_inspector_api SectionMeshesDegenerationInspectionResult { - InspectionIssuesMap< index_t > degenerated_edges{ - "meshes with degenerated edges" - }; + InspectionIssuesMap< index_t > degenerated_edges{ "degenerated edge" }; InspectionIssuesMap< index_t > degenerated_polygons{ - "meshes with degenerated polygons" + "degenerated polygon" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/criterion/intersections/model_intersections.hpp b/include/geode/inspector/criterion/intersections/model_intersections.hpp index 451064ae..4e7cc493 100644 --- a/include/geode/inspector/criterion/intersections/model_intersections.hpp +++ b/include/geode/inspector/criterion/intersections/model_intersections.hpp @@ -43,7 +43,7 @@ namespace geode { InspectionIssues< std::pair< ComponentMeshElement, ComponentMeshElement > > - elements_intersections{ "surface intersections" }; + elements_intersections{ "intersections" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/criterion/manifold/brep_meshes_manifold.hpp b/include/geode/inspector/criterion/manifold/brep_meshes_manifold.hpp index d7669f04..f5a28603 100644 --- a/include/geode/inspector/criterion/manifold/brep_meshes_manifold.hpp +++ b/include/geode/inspector/criterion/manifold/brep_meshes_manifold.hpp @@ -58,18 +58,21 @@ namespace geode struct opengeode_inspector_inspector_api BRepMeshesManifoldInspectionResult { InspectionIssuesMap< index_t > meshes_non_manifold_vertices{ - "meshes with non manifold vertices" + "non manifold mesh vertex" }; + InspectionIssuesMap< std::array< index_t, 2 > > - meshes_non_manifold_edges{ "meshes with non manifold edges" }; + meshes_non_manifold_edges{ "non manifold mesh edge" }; + InspectionIssuesMap< PolyhedronFacetVertices > - meshes_non_manifold_facets{ "meshes with non manifold facets" }; + meshes_non_manifold_facets{ "non manifold mesh facet" }; + InspectionIssues< BRepNonManifoldEdge > brep_non_manifold_edges{ - "non manifold edges" + "non manifold model edge" }; InspectionIssues< BRepNonManifoldFacet > brep_non_manifold_facets{ - "non manifold facets" + "non manifold model facet" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/criterion/manifold/section_meshes_manifold.hpp b/include/geode/inspector/criterion/manifold/section_meshes_manifold.hpp index a2029d68..ca180a29 100644 --- a/include/geode/inspector/criterion/manifold/section_meshes_manifold.hpp +++ b/include/geode/inspector/criterion/manifold/section_meshes_manifold.hpp @@ -39,10 +39,10 @@ namespace geode opengeode_inspector_inspector_api SectionMeshesManifoldInspectionResult { InspectionIssuesMap< index_t > meshes_non_manifold_vertices{ - "meshes with non manifold vertices" + "non manifold mesh vertex" }; InspectionIssuesMap< std::array< index_t, 2 > > - meshes_non_manifold_edges{ "meshes with non manifold edges" }; + meshes_non_manifold_edges{ "non manifold mesh edge" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/criterion/negative_elements/brep_meshes_negative_elements.hpp b/include/geode/inspector/criterion/negative_elements/brep_meshes_negative_elements.hpp index 96cae98e..f3118127 100644 --- a/include/geode/inspector/criterion/negative_elements/brep_meshes_negative_elements.hpp +++ b/include/geode/inspector/criterion/negative_elements/brep_meshes_negative_elements.hpp @@ -42,7 +42,7 @@ namespace geode opengeode_inspector_inspector_api BRepMeshesNegativeElementsInspectionResult { InspectionIssuesMap< index_t > negative_polyhedra{ - "block with negative polyhedra" + "negative polyhedron" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/criterion/negative_elements/section_meshes_negative_elements.hpp b/include/geode/inspector/criterion/negative_elements/section_meshes_negative_elements.hpp index 1d05b590..30e9ed15 100644 --- a/include/geode/inspector/criterion/negative_elements/section_meshes_negative_elements.hpp +++ b/include/geode/inspector/criterion/negative_elements/section_meshes_negative_elements.hpp @@ -41,9 +41,7 @@ namespace geode struct opengeode_inspector_inspector_api SectionMeshesNegativeElementsInspectionResult { - InspectionIssuesMap< index_t > negative_polygons{ - "surface with negative polygons" - }; + InspectionIssuesMap< index_t > negative_polygons{ "negative polygon" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/edgedcurve_inspector.hpp b/include/geode/inspector/edgedcurve_inspector.hpp index 83758a61..9bb0f6e0 100644 --- a/include/geode/inspector/edgedcurve_inspector.hpp +++ b/include/geode/inspector/edgedcurve_inspector.hpp @@ -33,7 +33,7 @@ namespace geode struct opengeode_inspector_inspector_api EdgedCurveInspectionResult { InspectionIssues< std::vector< index_t > > colocated_points_groups{ - "Colocalization of vertices not tested" + "Colocation of vertices not tested" }; InspectionIssues< index_t > degenerated_edges{ "Degeneration of edges not tested" diff --git a/include/geode/inspector/topology/brep_blocks_topology.hpp b/include/geode/inspector/topology/brep_blocks_topology.hpp index 3f792db8..b609405d 100644 --- a/include/geode/inspector/topology/brep_blocks_topology.hpp +++ b/include/geode/inspector/topology/brep_blocks_topology.hpp @@ -46,42 +46,42 @@ namespace geode struct opengeode_inspector_inspector_api BRepBlocksTopologyInspectionResult { InspectionIssues< uuid > some_blocks_not_meshed{ - "blocks without mesh (uuid listed)" + "Blocks without mesh (uuid listed)" }; InspectionIssues< uuid > wrong_block_boundary_surface{ - "surfaces incorrectly bounding blocks (uuids listed)" + "Surfaces incorrectly bounding Blocks (uuids listed)" }; InspectionIssuesMap< index_t > blocks_not_linked_to_a_unique_vertex{ - "blocks containing mesh vertices not linked to unique vertices" + "Blocks containing mesh vertices not linked to unique vertices" }; InspectionIssues< index_t > unique_vertices_part_of_two_blocks_and_no_boundary_surface{ - "unique vertices shared by two blocks without a boundary " - "surface or incident block line" + "unique vertices shared by two Blocks without a boundary " + "Surface or incident Block Line" }; InspectionIssues< index_t > unique_vertices_with_incorrect_block_cmvs_count{ - "unique vertices in a block with incorrect " - "ComponentMeshVertices count" + "unique vertices in a Block with incorrect Component mesh " + "vertices count" }; InspectionIssues< index_t > unique_vertices_linked_to_surface_with_wrong_relationship_to_blocks{ - "unique vertices linked to surfaces with neither boundary nor " + "unique vertices linked to Surfaces with neither boundary nor " "internal status" }; InspectionIssues< index_t > unique_vertices_linked_to_a_single_and_invalid_surface{ - "unique vertices linked to a single surface that is invalid" + "unique vertices linked to a single Surface that is invalid" }; InspectionIssues< uuid > blocks_with_not_closed_boundary_surfaces{ - "blocks with non-closed boundary surfaces" + "Blocks with non-closed boundary Surfaces" }; InspectionIssues< index_t > model_boundaries_dont_form_a_closed_surface{ - "model boundaries don't form a closed surface (uuids listed)" + "model boundaries don't form a closed Surface (uuids listed)" }; InspectionIssues< index_t > unique_vertex_linked_to_multiple_invalid_surfaces{ - "unique vertices linked to multiple surfaces in an invalid way" + "unique vertices linked to multiple Surfaces in an invalid way" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/topology/brep_corners_topology.hpp b/include/geode/inspector/topology/brep_corners_topology.hpp index 8ffc50f2..0c664bea 100644 --- a/include/geode/inspector/topology/brep_corners_topology.hpp +++ b/include/geode/inspector/topology/brep_corners_topology.hpp @@ -43,22 +43,22 @@ namespace geode struct opengeode_inspector_inspector_api BRepCornersTopologyInspectionResult { InspectionIssues< uuid > corners_not_meshed{ - "corners without mesh (uuids listed)" + "Corners without mesh (uuids listed)" }; InspectionIssuesMap< index_t > corners_not_linked_to_a_unique_vertex{ - "corners containing mesh vertices not linked to unique vertices" + "Corners containing mesh vertices not linked to unique vertices" }; InspectionIssues< index_t > unique_vertices_linked_to_multiple_corners{ - "unique vertices shared by several corners" + "unique vertices shared by several Corners" }; InspectionIssues< index_t > unique_vertices_linked_to_not_internal_nor_boundary_corner{ - "unique vertices linked to a corner with neither " + "unique vertices linked to a Corner with neither " "boundary nor internal status" }; InspectionIssues< index_t > unique_vertices_liked_to_not_boundary_line_corner{ - "unique vertices linked to a line corner without boundary " + "unique vertices linked to a Line's Corner without boundary " "status" }; diff --git a/include/geode/inspector/topology/brep_lines_topology.hpp b/include/geode/inspector/topology/brep_lines_topology.hpp index 084b4454..38c199c4 100644 --- a/include/geode/inspector/topology/brep_lines_topology.hpp +++ b/include/geode/inspector/topology/brep_lines_topology.hpp @@ -43,32 +43,32 @@ namespace geode struct opengeode_inspector_inspector_api BRepLinesTopologyInspectionResult { InspectionIssues< uuid > lines_not_meshed{ - "lines without mesh (uuids listed)" + "Lines without mesh (uuids listed)" }; InspectionIssues< index_t > unique_vertices_linked_to_line_with_wrong_relationship_to_surface{ - "unique vertices linked to a line with an incorrect " - "relationship to a surface" + "unique vertices linked to a Line with an incorrect " + "relationship to a Surface" }; InspectionIssuesMap< index_t > lines_not_linked_to_a_unique_vertex{ - "lines with mesh vertices not linked to a unique vertex" + "Lines with mesh vertices not linked to a unique vertex" }; InspectionIssues< index_t > unique_vertices_linked_to_a_line_with_invalid_embeddings{ - "unique vertices linked to a line with invalid internal " + "unique vertices linked to a Line with invalid internal " "topology" }; InspectionIssues< index_t > unique_vertices_linked_to_a_single_and_invalid_line{ - "unique vertices linked to a single invalid line" + "unique vertices linked to a single invalid Line" }; InspectionIssues< index_t > unique_vertices_linked_to_several_lines_but_not_linked_to_a_corner{ - "unique vertices linked to multiple lines but not to a corner" + "unique vertices linked to multiple Lines but not to a Corner" }; InspectionIssuesMap< index_t > line_edges_with_wrong_component_edges_around{ - "line edges with incorrect surrounding component edges" + "Line edges with incorrect surrounding component edges" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/topology/brep_surfaces_topology.hpp b/include/geode/inspector/topology/brep_surfaces_topology.hpp index 85948a85..eb040197 100644 --- a/include/geode/inspector/topology/brep_surfaces_topology.hpp +++ b/include/geode/inspector/topology/brep_surfaces_topology.hpp @@ -42,23 +42,23 @@ namespace geode opengeode_inspector_inspector_api BRepSurfacesTopologyInspectionResult { InspectionIssues< uuid > surfaces_not_meshed{ - "surface without mesh (uuids listed)" + "Surface without mesh (uuids listed)" }; InspectionIssuesMap< index_t > surfaces_not_linked_to_a_unique_vertex{ - "surfaces containing mesh vertices not linked to unique vertices" + "Surfaces containing mesh vertices not linked to unique vertices" }; InspectionIssues< index_t > unique_vertices_linked_to_a_surface_with_invalid_embbedings{ - "unique vertices linked to a surface with invalid " + "unique vertices linked to a Surface with invalid " "internal topology" }; InspectionIssues< index_t > unique_vertices_linked_to_several_and_invalid_surfaces{ - "unique vertices improperly linked to several surfaces" + "unique vertices improperly linked to several Surfaces" }; InspectionIssues< index_t > unique_vertices_linked_to_a_line_but_is_not_on_a_surface_border{ - "unique vertices linked to a line but not to a surface border" + "unique vertices linked to a Line but not to a Surface border" }; InspectionIssuesMap< index_t > surface_polygons_with_wrong_component_facets_around{ diff --git a/include/geode/inspector/topology/brep_topology.hpp b/include/geode/inspector/topology/brep_topology.hpp index 25ef2f0e..c12e38c6 100644 --- a/include/geode/inspector/topology/brep_topology.hpp +++ b/include/geode/inspector/topology/brep_topology.hpp @@ -46,15 +46,15 @@ namespace geode BRepSurfacesTopologyInspectionResult surfaces; BRepBlocksTopologyInspectionResult blocks; InspectionIssues< index_t > unique_vertices_not_linked_to_any_component{ - "unique vertices with no component links" + "unique vertices not linked to Component" }; InspectionIssues< index_t > unique_vertices_linked_to_inexistant_cmv{ - "unique vertices linked to inexistant ComponentMeshVertex" + "unique vertices linked to inexistant vertex Component mesh vertex" }; InspectionIssues< index_t > unique_vertices_nonbijectively_linked_to_cmv{ "unique vertices with non-bijective links to " - "ComponentMeshVertex" + "Component mesh vertex" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/topology/internal/topology_helpers.hpp b/include/geode/inspector/topology/internal/topology_helpers.hpp index 8f029bf3..cfd67603 100644 --- a/include/geode/inspector/topology/internal/topology_helpers.hpp +++ b/include/geode/inspector/topology/internal/topology_helpers.hpp @@ -100,9 +100,9 @@ namespace geode vertex_id }; if( model.unique_vertex( component_mesh_vertex ) == NO_ID ) { - result.add_issue( vertex_id, - absl::StrCat( "Vertex '", vertex_id, - "' is not linked to a unique vertex." ) ); + result.add_issue( + vertex_id, absl::StrCat( "vertex '", vertex_id, + " is not linked to a unique vertex." ) ); } } return result; diff --git a/include/geode/inspector/topology/section_corners_topology.hpp b/include/geode/inspector/topology/section_corners_topology.hpp index dc6e591e..bae6bb67 100644 --- a/include/geode/inspector/topology/section_corners_topology.hpp +++ b/include/geode/inspector/topology/section_corners_topology.hpp @@ -43,27 +43,27 @@ namespace geode opengeode_inspector_inspector_api SectionCornersTopologyInspectionResult { InspectionIssues< uuid > corners_not_meshed{ - "corners without mesh (uuids listed)" + "Corners without mesh (uuids listed)" }; InspectionIssuesMap< index_t > corners_not_linked_to_a_unique_vertex{ - "corners containing mesh vertices not linked to unique vertices" + "Corners containing mesh vertices not linked to unique vertices" }; InspectionIssues< index_t > unique_vertices_linked_to_multiple_corners{ - "unique vertices shared by several corners" + "unique vertices shared by several Corners" }; InspectionIssues< index_t > unique_vertices_linked_to_multiple_internals_corner{ - "unique vertices linked to a corner with several " + "unique vertices linked to a Corner with several " "embeddings" }; InspectionIssues< index_t > unique_vertices_linked_to_not_internal_nor_boundary_corner{ - "unique vertices linked to a corner with neither " + "unique vertices linked to a Corner with neither " "boundary nor internal status" }; InspectionIssues< index_t > unique_vertices_linked_to_not_boundary_line_corner{ - "unique vertices linked to a line corner without boundary " + "unique vertices linked to a Line's Corner without boundary " "status" }; diff --git a/include/geode/inspector/topology/section_lines_topology.hpp b/include/geode/inspector/topology/section_lines_topology.hpp index f23fc0e0..0da38790 100644 --- a/include/geode/inspector/topology/section_lines_topology.hpp +++ b/include/geode/inspector/topology/section_lines_topology.hpp @@ -41,28 +41,28 @@ namespace geode opengeode_inspector_inspector_api SectionLinesTopologyInspectionResult { InspectionIssues< uuid > lines_not_meshed{ - "lines without mesh (uuids listed)" + "Lines without mesh (uuids listed)" }; InspectionIssuesMap< index_t > lines_not_linked_to_a_unique_vertex{ - "lines with mesh vertices not linked to a unique vertex" + "Lines with mesh vertices not linked to a unique vertex" }; InspectionIssues< index_t > unique_vertices_linked_to_line_with_wrong_relationship_to_surface{ - "unique vertices linked to a line incorrectly linked to a " + "unique vertices linked to a Line incorrectly linked to a " "surface" }; InspectionIssues< index_t > unique_vertices_linked_to_a_line_with_invalid_embeddings{ - "unique vertices linked to a line with invalid " + "unique vertices linked to a Line with invalid " "internal topology" }; InspectionIssues< index_t > unique_vertices_linked_to_a_single_and_invalid_line{ - "unique vertices linked to a single invalid line" + "unique vertices linked to a single invalid Line" }; InspectionIssues< index_t > unique_vertices_linked_to_several_lines_but_not_linked_to_a_corner{ - "unique vertices linked to multiple lines but not to a corner" + "unique vertices linked to multiple Lines but not to a Corner" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/topology/section_surfaces_topology.hpp b/include/geode/inspector/topology/section_surfaces_topology.hpp index a95c2f30..001e4b38 100644 --- a/include/geode/inspector/topology/section_surfaces_topology.hpp +++ b/include/geode/inspector/topology/section_surfaces_topology.hpp @@ -42,19 +42,19 @@ namespace geode opengeode_inspector_inspector_api SectionSurfacesTopologyInspectionResult { InspectionIssues< uuid > surfaces_not_meshed{ - "surface without mesh (uuids listed)" + "Surface without mesh (uuids listed)" }; InspectionIssuesMap< index_t > surfaces_not_linked_to_a_unique_vertex{ - "surfaces containing mesh vertices not linked to unique vertices" + "Surfaces containing mesh vertices not linked to unique vertices" }; InspectionIssues< index_t > unique_vertices_linked_to_a_surface_with_invalid_embbedings{ - "unique vertices linked to a surface with invalid " + "unique vertices linked to a Surface with invalid " "internal topology" }; InspectionIssues< index_t > unique_vertices_linked_to_a_line_but_is_not_on_a_surface_border{ - "unique vertices linked to a line but not to a surface border" + "unique vertices linked to a Line but not to a Surface border" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/topology/section_topology.hpp b/include/geode/inspector/topology/section_topology.hpp index 2e11d65a..da65411b 100644 --- a/include/geode/inspector/topology/section_topology.hpp +++ b/include/geode/inspector/topology/section_topology.hpp @@ -44,15 +44,15 @@ namespace geode SectionLinesTopologyInspectionResult lines; SectionSurfacesTopologyInspectionResult surfaces; InspectionIssues< index_t > unique_vertices_not_linked_to_any_component{ - "unique vertices with no component links" + "unique vertices not linked to Component" }; InspectionIssues< index_t > unique_vertices_linked_to_inexistant_cmv{ - "unique vertices linked to inexistant ComponentMeshVertex" + "unique vertices linked to inexistant Component mesh vertex" }; InspectionIssues< index_t > unique_vertices_nonbijectively_linked_to_cmv{ "unique vertices with non-bijective links to " - "ComponentMeshVertex" + "Component mesh vertex" }; [[nodiscard]] index_t nb_issues() const; diff --git a/src/geode/inspector/brep_inspector.cpp b/src/geode/inspector/brep_inspector.cpp index 5cf07d1e..7f4797cd 100644 --- a/src/geode/inspector/brep_inspector.cpp +++ b/src/geode/inspector/brep_inspector.cpp @@ -41,7 +41,7 @@ namespace geode std::string BRepInspectionResult::inspection_type() const { - return "BRep Inspection"; + return "Boundary Representation inspection"; } BRepInspector::BRepInspector( const BRep& brep ) diff --git a/src/geode/inspector/criterion/adjacency/brep_meshes_adjacency.cpp b/src/geode/inspector/criterion/adjacency/brep_meshes_adjacency.cpp index 4ccb8b44..fba712d2 100644 --- a/src/geode/inspector/criterion/adjacency/brep_meshes_adjacency.cpp +++ b/src/geode/inspector/criterion/adjacency/brep_meshes_adjacency.cpp @@ -62,12 +62,12 @@ namespace geode { return message; } - return "No adjacency issues in model \n"; + return "no adjacency issues in model meshes \n"; } std::string BRepMeshesAdjacencyInspectionResult::inspection_type() const { - return "Adjacencies inspection"; + return "adjacencies inspection"; } class BRepComponentMeshesAdjacency::Impl @@ -88,10 +88,9 @@ namespace geode const geode::SolidMeshAdjacency3D inspector{ block.mesh() }; auto wrong_adjacencies = inspector.polyhedron_facets_with_wrong_adjacency(); - wrong_adjacencies.set_description( - absl::StrCat( "block ", block.name(), - " polyhedron facets adjacencies issues - uuid ", - block.id().string() ) ); + wrong_adjacencies.set_description( absl::StrCat( "Block ", + block.name(), " (", block.id().string(), + ") polyhedron facets adjacencies issues" ) ); const auto& mesh = block.mesh(); for( const auto polyhedron_id : Range{ mesh.nb_polyhedra() } ) { @@ -115,7 +114,7 @@ namespace geode absl::StrCat( "facet ", facet_id, " of polyhedron ", polyhedron_id, " has no adjacencies but is not part of a " - "model surface." ) ); + "model Surface." ) ); } } } diff --git a/src/geode/inspector/criterion/adjacency/section_meshes_adjacency.cpp b/src/geode/inspector/criterion/adjacency/section_meshes_adjacency.cpp index d227df47..c989fa7e 100644 --- a/src/geode/inspector/criterion/adjacency/section_meshes_adjacency.cpp +++ b/src/geode/inspector/criterion/adjacency/section_meshes_adjacency.cpp @@ -53,12 +53,12 @@ namespace geode { return surfaces_edges_with_wrong_adjacencies.string(); } - return "No adjacency issues in model \n"; + return "no adjacency issues in model meshes \n"; } std::string SectionMeshesAdjacencyInspectionResult::inspection_type() const { - return "Adjacencies inspection"; + return "adjacencies inspection"; } SectionComponentMeshesAdjacency::SectionComponentMeshesAdjacency( diff --git a/src/geode/inspector/criterion/adjacency/solid_adjacency.cpp b/src/geode/inspector/criterion/adjacency/solid_adjacency.cpp index c1bc9946..8093766b 100644 --- a/src/geode/inspector/criterion/adjacency/solid_adjacency.cpp +++ b/src/geode/inspector/criterion/adjacency/solid_adjacency.cpp @@ -62,8 +62,7 @@ namespace geode { InspectionIssues< PolyhedronFacet > wrong_adjacency_facets{ absl::StrCat( "Solid ", mesh_.name(), - " polyhedron facets adjacencies issues - uuid ", - mesh_.id().string() ) + " polyhedron facets adjacencies issues" ) }; for( const auto polyhedron_id : Range{ mesh_.nb_polyhedra() } ) { @@ -78,7 +77,7 @@ namespace geode { wrong_adjacency_facets.add_issue( polyhedron_facet, absl::StrCat( "facet ", facet_id, " of polyhedron ", - polyhedron_id ) ); + polyhedron_id, " has wrong adjacencies" ) ); } } } diff --git a/src/geode/inspector/criterion/adjacency/surface_adjacency.cpp b/src/geode/inspector/criterion/adjacency/surface_adjacency.cpp index d7320583..d30a2cdb 100644 --- a/src/geode/inspector/criterion/adjacency/surface_adjacency.cpp +++ b/src/geode/inspector/criterion/adjacency/surface_adjacency.cpp @@ -60,8 +60,7 @@ namespace geode { InspectionIssues< PolygonEdge > wrong_adjacency_edges{ absl::StrCat( "Surface ", mesh_.name(), - " Polygon edges adjacencies issues - uuid ", - mesh_.id().string() ) }; + " polygon edges adjacencies issues" ) }; for( const auto polygon_id : Range{ mesh_.nb_polygons() } ) { for( const auto edge_id : @@ -72,9 +71,9 @@ namespace geode && !mesh_polygon_edge_has_right_adjacency( polygon_edge ) ) { - wrong_adjacency_edges.add_issue( - polygon_edge, absl::StrCat( "edge ", edge_id, - " of polygon ", polygon_id ) ); + wrong_adjacency_edges.add_issue( polygon_edge, + absl::StrCat( "edge ", edge_id, " of polygon ", + polygon_id, " has wrong adjacencies" ) ); } } } diff --git a/src/geode/inspector/criterion/brep_meshes_inspector.cpp b/src/geode/inspector/criterion/brep_meshes_inspector.cpp index 832c0c47..b890f2c5 100644 --- a/src/geode/inspector/criterion/brep_meshes_inspector.cpp +++ b/src/geode/inspector/criterion/brep_meshes_inspector.cpp @@ -47,7 +47,7 @@ namespace geode std::string BRepMeshesInspectionResult::inspection_type() const { - return "Meshes Inspection"; + return "model meshes inspection"; } BRepMeshesInspector::BRepMeshesInspector( const BRep& brep ) diff --git a/src/geode/inspector/criterion/colocation/component_meshes_colocation.cpp b/src/geode/inspector/criterion/colocation/component_meshes_colocation.cpp index e2601e31..ccb471b5 100644 --- a/src/geode/inspector/criterion/colocation/component_meshes_colocation.cpp +++ b/src/geode/inspector/criterion/colocation/component_meshes_colocation.cpp @@ -112,8 +112,8 @@ namespace if( !colocated_pts.empty() ) { geode::InspectionIssues< std::vector< geode::index_t > > - line_issues{ absl::StrCat( "line ", line.name(), - " colocated vertices - uuid ", line.id().string() ) }; + line_issues{ absl::StrCat( "Line ", line.name(), " (", + line.id().string(), ") colocated vertices" ) }; const auto& line_mesh = line.mesh(); for( const auto& colocated_points_group : colocated_pts ) { @@ -124,8 +124,9 @@ namespace &point_group_string, " ", point_index ); } line_issues.add_issue( colocated_points_group, - absl::StrCat( point_group_string, - " are colocated at position [", + absl::StrCat( "Line ", line.name(), " (", + line.id().string(), ") has vertices ", + point_group_string, " colocated at position [", line_mesh.point( colocated_points_group[0] ) .string(), "]" ) ); @@ -147,8 +148,7 @@ namespace { geode::InspectionIssues< std::vector< geode::index_t > > surface_issues{ absl::StrCat( "surface ", surface.name(), - " colocated vertices - uuid ", - surface.id().string() ) }; + " (", surface.id().string(), ") colocated vertices" ) }; const auto& surface_mesh = surface.mesh(); for( const auto& colocated_points_group : colocated_pts ) { @@ -159,8 +159,9 @@ namespace &point_group_string, " ", point_index ); } surface_issues.add_issue( colocated_points_group, - absl::StrCat( point_group_string, - " are colocated at position [", + absl::StrCat( "Surface ", surface.name(), " (", + surface.id().string(), ") has vertices ", + point_group_string, " colocated at position [", surface_mesh.point( colocated_points_group[0] ) .string(), "]" ) ); @@ -196,8 +197,8 @@ namespace if( !colocated_pts.empty() ) { geode::InspectionIssues< std::vector< geode::index_t > > - block_issues{ absl::StrCat( "block ", block.name(), - " colocated vertices - uuid ", block.id().string() ) }; + block_issues{ absl::StrCat( "Block ", block.name(), " (", + block.id().string(), ") colocated vertices" ) }; const auto& block_mesh = block.mesh(); for( const auto& colocated_points_group : colocated_pts ) { @@ -208,8 +209,9 @@ namespace &point_group_string, " ", point_index ); } block_issues.add_issue( colocated_points_group, - absl::StrCat( point_group_string, - " are colocated at position [", + absl::StrCat( "Block ", block.name(), " (", + block.id().string(), ") has vertices ", + point_group_string, " colocated at position [", block_mesh.point( colocated_points_group[0] ) .string(), "]" ) ); @@ -235,7 +237,7 @@ namespace geode { return colocated_points_groups.string(); } - return "No issues of colocation in model \n"; + return "No issues of colocation in meshes \n"; } std::string MeshesColocationInspectionResult::inspection_type() const diff --git a/src/geode/inspector/criterion/colocation/unique_vertices_colocation.cpp b/src/geode/inspector/criterion/colocation/unique_vertices_colocation.cpp index d1a0a1ea..65d79839 100644 --- a/src/geode/inspector/criterion/colocation/unique_vertices_colocation.cpp +++ b/src/geode/inspector/criterion/colocation/unique_vertices_colocation.cpp @@ -56,15 +56,15 @@ namespace == geode::Line< Model::dim >::component_type_static() ) { return point.inexact_equal( model.line( cmv.component_id.id() ) - .mesh() - .point( cmv.vertex ) ); + .mesh() + .point( cmv.vertex ) ); } else if( cmv.component_id.type() == geode::Surface< Model::dim >::component_type_static() ) { return point.inexact_equal( model.surface( cmv.component_id.id() ) - .mesh() - .point( cmv.vertex ) ); + .mesh() + .point( cmv.vertex ) ); } return point.inexact_equal( model.corner( cmv.component_id.id() ).mesh().point( cmv.vertex ) ); @@ -85,8 +85,8 @@ namespace if( cmv.component_id.type() == geode::Block3D::component_type_static() ) { return point.inexact_equal( model.block( cmv.component_id.id() ) - .mesh() - .point( cmv.vertex ) ); + .mesh() + .point( cmv.vertex ) ); } return model_cmv_is_colocated_on_point_base< geode::BRep >( model, cmv, point ); @@ -161,7 +161,7 @@ namespace geode std::string UniqueVerticesInspectionResult::inspection_type() const { - return "Unique vertices colocalization inspection"; + return "Unique vertices colocation inspection"; } template < typename Model > @@ -226,7 +226,8 @@ namespace geode { vertices_issues.add_issue( unique_vertex_id, absl::StrCat( "Unique vertex ", unique_vertex_id, - " is linked to several location." ) ); + " is linked to several mesh vertices on different " + "positions" ) ); } } } diff --git a/src/geode/inspector/criterion/degeneration/brep_meshes_degeneration.cpp b/src/geode/inspector/criterion/degeneration/brep_meshes_degeneration.cpp index 041780c7..b00f1755 100644 --- a/src/geode/inspector/criterion/degeneration/brep_meshes_degeneration.cpp +++ b/src/geode/inspector/criterion/degeneration/brep_meshes_degeneration.cpp @@ -59,14 +59,14 @@ namespace geode } if( message.empty() ) { - return "No degeneration issues in model\n"; + return "no degeneration issues in model meshes\n"; } return message; } std::string BRepMeshesDegenerationInspectionResult::inspection_type() const { - return "Degeneration inspection"; + return "degeneration inspection"; } class BRepComponentMeshesDegeneration::Impl @@ -101,16 +101,16 @@ namespace geode } const geode::SolidMeshDegeneration3D inspector{ mesh }; auto small_edges = inspector.small_edges( threshold ); - small_edges.set_description( absl::StrCat( "Block ", - block.name(), " small edges polyhedra - uuid ", - block.id().string() ) ); + small_edges.set_description( + absl::StrCat( "Block ", block.name(), " (", + block.id().string(), ") small edges polyhedra" ) ); small_edges_map.add_issues_to_map( block.id(), std::move( small_edges ) ); auto small_polyhedra = inspector.small_height_polyhedra( threshold ); - small_polyhedra.set_description( absl::StrCat( "Block ", - block.name(), " small height polyhedra - uuid ", - block.id().string() ) ); + small_polyhedra.set_description( + absl::StrCat( "Block ", block.name(), " (", + block.id().string(), ") small height polyhedra" ) ); small_polyhedra_map.add_issues_to_map( block.id(), std::move( small_polyhedra ) ); } diff --git a/src/geode/inspector/criterion/degeneration/edgedcurve_degeneration.cpp b/src/geode/inspector/criterion/degeneration/edgedcurve_degeneration.cpp index 76b555f6..16a5e286 100644 --- a/src/geode/inspector/criterion/degeneration/edgedcurve_degeneration.cpp +++ b/src/geode/inspector/criterion/degeneration/edgedcurve_degeneration.cpp @@ -61,7 +61,8 @@ namespace geode if( mesh_.edge_length( edge_id ) <= threshold ) { degenerated_edges_index.add_issue( edge_id, - absl::StrCat( "edge ", edge_id, ", at position [", + absl::StrCat( "degenerated edge ", edge_id, + ", at position [", mesh_.edge_barycenter( edge_id ).string(), "]" ) ); } } diff --git a/src/geode/inspector/criterion/degeneration/section_meshes_degeneration.cpp b/src/geode/inspector/criterion/degeneration/section_meshes_degeneration.cpp index 28c93fd6..bddcda7b 100644 --- a/src/geode/inspector/criterion/degeneration/section_meshes_degeneration.cpp +++ b/src/geode/inspector/criterion/degeneration/section_meshes_degeneration.cpp @@ -52,13 +52,13 @@ namespace geode { return message; } - return "No degeneration issues in model \n"; + return "no degeneration issues in model meshes \n"; } std::string SectionMeshesDegenerationInspectionResult::inspection_type() const { - return "Degeneration inspection"; + return "degeneration inspection"; } class SectionComponentMeshesDegeneration::Impl diff --git a/src/geode/inspector/criterion/degeneration/solid_degeneration.cpp b/src/geode/inspector/criterion/degeneration/solid_degeneration.cpp index 0cbaf7e2..ad91c686 100644 --- a/src/geode/inspector/criterion/degeneration/solid_degeneration.cpp +++ b/src/geode/inspector/criterion/degeneration/solid_degeneration.cpp @@ -76,8 +76,9 @@ namespace geode if( this->mesh().polyhedron_minimum_height( polyhedron_id ) <= threshold ) { - wrong_polyhedra.add_issue( polyhedron_id, - absl::StrCat( "Polyhedron ", polyhedron_id ) ); + wrong_polyhedra.add_issue( + polyhedron_id, absl::StrCat( "degenerated polyhedron ", + polyhedron_id ) ); } } return wrong_polyhedra; diff --git a/src/geode/inspector/criterion/degeneration/surface_degeneration.cpp b/src/geode/inspector/criterion/degeneration/surface_degeneration.cpp index d1707539..c568a801 100644 --- a/src/geode/inspector/criterion/degeneration/surface_degeneration.cpp +++ b/src/geode/inspector/criterion/degeneration/surface_degeneration.cpp @@ -74,8 +74,8 @@ namespace geode if( this->mesh().polygon_minimum_height( polygon_id ) <= threshold ) { - wrong_polygons.add_issue( - polygon_id, absl::StrCat( "Polygon ", polygon_id ) ); + wrong_polygons.add_issue( polygon_id, + absl::StrCat( "degenerated polygon ", polygon_id ) ); } } return wrong_polygons; diff --git a/src/geode/inspector/criterion/internal/colocation_impl.cpp b/src/geode/inspector/criterion/internal/colocation_impl.cpp index afafa747..8bc86606 100644 --- a/src/geode/inspector/criterion/internal/colocation_impl.cpp +++ b/src/geode/inspector/criterion/internal/colocation_impl.cpp @@ -74,7 +74,7 @@ namespace colocated_points_groups_end, colocated_points_indices.end() ); geode::InspectionIssues< std::vector< geode::index_t > > - groups_of_colocated_points{ "Groups of colocated points" }; + groups_of_colocated_points{ "groups of colocated points" }; for( const auto& colocated_points_group : colocated_points_indices ) { std::string point_group_string; @@ -83,11 +83,11 @@ namespace absl::StrAppend( &point_group_string, " ", point_index ); } groups_of_colocated_points.add_issue( colocated_points_group, - absl::StrCat( "Vertices ", point_group_string, + absl::StrCat( "vertices ", point_group_string, " are colocated at the position [", mesh_colocation_info - .unique_points[mesh_colocation_info - .colocated_mapping[colocated_points_group[0]]] + .unique_points[mesh_colocation_info.colocated_mapping + [colocated_points_group[0]]] .string(), "]" ) ); } diff --git a/src/geode/inspector/criterion/internal/component_meshes_adjacency.cpp b/src/geode/inspector/criterion/internal/component_meshes_adjacency.cpp index 08a8c0ee..8c32cadd 100644 --- a/src/geode/inspector/criterion/internal/component_meshes_adjacency.cpp +++ b/src/geode/inspector/criterion/internal/component_meshes_adjacency.cpp @@ -80,8 +80,8 @@ namespace geode }; auto issues = inspector.polygon_edges_with_wrong_adjacency(); issues.set_description( absl::StrCat( "Surface ", - surface.name(), " polygon edges adjacency issues - uuid ", - surface.id().string() ) ); + surface.name(), " (", surface.id().string(), + ") polygon edges adjacency issues" ) ); const auto& mesh = surface.mesh(); for( const auto polygon_id : Range{ mesh.nb_polygons() } ) { diff --git a/src/geode/inspector/criterion/internal/component_meshes_degeneration.cpp b/src/geode/inspector/criterion/internal/component_meshes_degeneration.cpp index 351d363f..961b9b72 100644 --- a/src/geode/inspector/criterion/internal/component_meshes_degeneration.cpp +++ b/src/geode/inspector/criterion/internal/component_meshes_degeneration.cpp @@ -72,8 +72,8 @@ namespace geode line.mesh() }; auto issues = inspector.small_edges( threshold ); - issues.set_description( absl::StrCat( "line ", line.name(), - " small edges - uuid ", line.id().string() ) ); + issues.set_description( absl::StrCat( "Line ", line.name(), + " (", line.id().string(), ") small edges" ) ); return std::make_pair( line.id(), std::move( issues ) ); } ) ); } @@ -102,9 +102,9 @@ namespace geode const geode::SurfaceMeshDegeneration< Model::dim > inspector{ surface.mesh() }; auto issues = inspector.small_edges( threshold ); - issues.set_description( absl::StrCat( "surface ", - surface.name(), " small facet edges - uuid ", - surface.id().string() ) ); + issues.set_description( absl::StrCat( "Surface ", + surface.name(), " (", surface.id().string(), + ") small facet edges" ) ); return std::make_pair( surface.id(), std::move( issues ) ); } ) ); @@ -141,9 +141,9 @@ namespace geode const geode::SurfaceMeshDegeneration< Model::dim > inspector{ surface.mesh() }; auto issues = inspector.small_height_polygons( threshold ); - issues.set_description( absl::StrCat( "surface ", - surface.name(), " small height polygons - uuid ", - surface.id().string() ) ); + issues.set_description( absl::StrCat( "Surface ", + surface.name(), " (", surface.id().string(), + ") small height polygons" ) ); return std::make_pair( surface.id(), std::move( issues ) ); } ) ); } diff --git a/src/geode/inspector/criterion/internal/component_meshes_manifold.cpp b/src/geode/inspector/criterion/internal/component_meshes_manifold.cpp index 51fb1ed6..b2d4c731 100644 --- a/src/geode/inspector/criterion/internal/component_meshes_manifold.cpp +++ b/src/geode/inspector/criterion/internal/component_meshes_manifold.cpp @@ -57,9 +57,9 @@ namespace geode surface.mesh() }; auto issues = inspector.non_manifold_vertices(); - issues.set_description( absl::StrCat( "Surface ", - surface.name(), " non manifold vertices - uuid ", - surface.id().string() ) ); + issues.set_description( + absl::StrCat( "Surface ", surface.name(), " (", + surface.id().string(), ") non manifold vertices" ) ); surfaces_non_manifold_vertices.add_issues_to_map( surface.id(), std::move( issues ) ); } @@ -78,9 +78,9 @@ namespace geode surface.mesh() }; auto issues = inspector.non_manifold_edges(); - issues.set_description( absl::StrCat( "Surface ", - surface.name(), " non manifold edges - uuid ", - surface.id().string() ) ); + issues.set_description( + absl::StrCat( "Surface ", surface.name(), " (", + surface.id().string(), ") non manifold edges" ) ); surfaces_non_manifold_edges.add_issues_to_map( surface.id(), std::move( issues ) ); } diff --git a/src/geode/inspector/criterion/internal/degeneration_impl.cpp b/src/geode/inspector/criterion/internal/degeneration_impl.cpp index 4c95cbb9..10760d49 100644 --- a/src/geode/inspector/criterion/internal/degeneration_impl.cpp +++ b/src/geode/inspector/criterion/internal/degeneration_impl.cpp @@ -72,7 +72,7 @@ namespace geode { enable_edges_on_mesh(); InspectionIssues< index_t > degenerated_edges_index{ - "Degenerated Edges" + "Degenerated edges" }; for( const auto edge_index : Range{ mesh_.edges().nb_edges() } ) { @@ -81,7 +81,7 @@ namespace geode const auto edge_vertices = mesh_.edges().edge_vertices( edge_index ); degenerated_edges_index.add_issue( edge_index, - absl::StrCat( "Edge between vertices ", + absl::StrCat( "degenerated edge between vertices ", edge_vertices[0], " and ", edge_vertices[1], ", at position [", mesh_.point( edge_vertices[0] ).string(), "]" ) ); diff --git a/src/geode/inspector/criterion/intersections/model_intersections.cpp b/src/geode/inspector/criterion/intersections/model_intersections.cpp index 26c039df..d933c017 100644 --- a/src/geode/inspector/criterion/intersections/model_intersections.cpp +++ b/src/geode/inspector/criterion/intersections/model_intersections.cpp @@ -521,12 +521,13 @@ namespace geode const auto& surface2 = model_.surface( polygon_pair.second.component_id.id() ); intersection_issues.add_issue( polygon_pair, - absl::StrCat( surface1.name(), " and ", surface2.name(), - " intersect on polygons ", + absl::StrCat( surface1.name(), " (", + polygon_pair.first.component_id.id().string(), ") and ", + surface2.name(), " (", + polygon_pair.second.component_id.id().string(), + ") intersect on polygons ", polygon_pair.first.element_id, " and ", - polygon_pair.second.element_id, " - uuids ", - polygon_pair.first.component_id.id().string(), " and ", - polygon_pair.second.component_id.id().string() ) ); + polygon_pair.second.element_id ) ); } } @@ -541,11 +542,11 @@ namespace geode const auto& surface = model_.surface( polygon_pair.first.component_id.id() ); intersection_issues.add_issue( polygon_pair, - absl::StrCat( "Surface ", surface.name(), - "have self intersection on polygons ", + absl::StrCat( "Surface ", surface.name(), " (", + polygon_pair.first.component_id.id().string(), + ") have a self intersection on polygons ", polygon_pair.first.element_id, "and ", - polygon_pair.second.element_id, " - uuid ", - polygon_pair.first.component_id.id().string() ) ); + polygon_pair.second.element_id ) ); } } diff --git a/src/geode/inspector/criterion/intersections/surface_curve_intersections.cpp b/src/geode/inspector/criterion/intersections/surface_curve_intersections.cpp index 3e5ae548..2f6c873d 100644 --- a/src/geode/inspector/criterion/intersections/surface_curve_intersections.cpp +++ b/src/geode/inspector/criterion/intersections/surface_curve_intersections.cpp @@ -244,8 +244,9 @@ namespace geode }; for( const auto& pair : intersections ) { - issues.add_issue( pair, absl::StrCat( "Triangle ", pair.first, - " and edge", pair.second ) ); + issues.add_issue( + pair, absl::StrCat( "Triangle ", pair.first, " and edge", + pair.second, " intersect" ) ); } return issues; } diff --git a/src/geode/inspector/criterion/intersections/surface_intersections.cpp b/src/geode/inspector/criterion/intersections/surface_intersections.cpp index efce92f3..9757e10c 100644 --- a/src/geode/inspector/criterion/intersections/surface_intersections.cpp +++ b/src/geode/inspector/criterion/intersections/surface_intersections.cpp @@ -124,9 +124,9 @@ namespace geode for( const auto& polygon_pair : intersections ) { - issues.add_issue( - polygon_pair, absl::StrCat( "Polygons ", polygon_pair.first, - " and ", polygon_pair.second ) ); + issues.add_issue( polygon_pair, + absl::StrCat( "Polygons ", polygon_pair.first, " and ", + polygon_pair.second, " intersect" ) ); } return issues; } diff --git a/src/geode/inspector/criterion/manifold/brep_meshes_manifold.cpp b/src/geode/inspector/criterion/manifold/brep_meshes_manifold.cpp index 2dba49ca..fbf94495 100644 --- a/src/geode/inspector/criterion/manifold/brep_meshes_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/brep_meshes_manifold.cpp @@ -81,12 +81,12 @@ namespace geode { return message; } - return "No manifold issues in model component meshes \n"; + return "no manifold issues in model meshes \n"; } std::string BRepMeshesManifoldInspectionResult::inspection_type() const { - return "Manifold inspection"; + return "manifold inspection"; } class BRepComponentMeshesManifold::Impl @@ -109,9 +109,9 @@ namespace geode { const SolidMeshVertexManifold3D inspector{ block.mesh() }; auto non_manifold_vertices = inspector.non_manifold_vertices(); - non_manifold_vertices.set_description( absl::StrCat( "Block ", - block.name(), " non manifold vertices - uuid ", - block.id().string() ) ); + non_manifold_vertices.set_description( + absl::StrCat( "Block ", block.name(), " (", + block.id().string(), ") non manifold vertices" ) ); components_non_manifold_vertices.add_issues_to_map( block.id(), std::move( non_manifold_vertices ) ); } @@ -129,8 +129,8 @@ namespace geode const SolidMeshEdgeManifold3D inspector{ block.mesh() }; auto non_manifold_edges = inspector.non_manifold_edges(); non_manifold_edges.set_description( - absl::StrCat( "Block ", block.name(), - " non manifold edges - uuid ", block.id().string() ) ); + absl::StrCat( "Block ", block.name(), " (", + block.id().string(), ") non manifold edges" ) ); components_non_manifold_edges.add_issues_to_map( block.id(), non_manifold_edges ); } @@ -145,8 +145,8 @@ namespace geode const SolidMeshFacetManifold3D inspector{ block.mesh() }; auto non_manifold_facets = inspector.non_manifold_facets(); non_manifold_facets.set_description( - absl::StrCat( "Block ", block.name(), - " non manifold facets - uuid ", block.id().string() ) ); + absl::StrCat( "Block ", block.name(), " (", + block.id().string(), ") non manifold facets" ) ); components_non_manifold_facets.add_issues_to_map( block.id(), non_manifold_facets ); } @@ -197,8 +197,8 @@ namespace geode std::string message = absl::StrCat( "Model edge between unique vertices ", edge.first.vertices()[0], " and ", edge.first.vertices()[1], - " is not manifold: it does not belong to a line " - "but is on surfaces " ); + " is not manifold: it does not belong to a Line " + "but is on Surfaces " ); for( const auto surface_uuid : edge.second ) { absl::StrAppend( &message, surface.name(), " (", @@ -230,7 +230,7 @@ namespace geode std::string message = absl::StrCat( "Model edge between unique vertices ", edge_unique_vertices[0], " and ", edge_unique_vertices[1], - " is not manifold: it belongs to internal line ", + " is not manifold: it belongs to internal Line ", line.name(), " (", line.id().string(), ") with only one edge" ); issues.add_issue( @@ -262,7 +262,7 @@ namespace geode absl::StrAppend( &message, polygon_vertex, " " ); } absl::StrAppend( &message, - " is not manifold: it belongs to internal surface ", + " is not manifold: it belongs to internal Surface ", surface.name(), " (", surface.id().string(), ") with only one facet" ); issues.add_issue( diff --git a/src/geode/inspector/criterion/manifold/section_meshes_manifold.cpp b/src/geode/inspector/criterion/manifold/section_meshes_manifold.cpp index 985e212e..b90ad360 100644 --- a/src/geode/inspector/criterion/manifold/section_meshes_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/section_meshes_manifold.cpp @@ -53,12 +53,12 @@ namespace geode { return message; } - return "No manifold issues in model \n"; + return "no manifold issues in model meshes \n"; } std::string SectionMeshesManifoldInspectionResult::inspection_type() const { - return "Manifold inspection"; + return "manifold inspection"; } class SectionComponentMeshesManifold::Impl diff --git a/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp b/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp index 36183e54..91c52f76 100644 --- a/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp @@ -68,8 +68,8 @@ namespace { const Edge polyhedron_edge{ polyhedron_edge_vertices }; if( !polyhedra_around_edges - .try_emplace( polyhedron_edge, 1, polyhedron_id ) - .second ) + .try_emplace( polyhedron_edge, 1, polyhedron_id ) + .second ) { polyhedra_around_edges[polyhedron_edge].push_back( polyhedron_id ); @@ -145,8 +145,8 @@ namespace geode { non_manifold_edges.add_issue( polyhedron_edge_vertices, - absl::StrCat( - "Edge between vertices with index ", + absl::StrCat( "Non manifold edge between " + "vertices with index ", polyhedron_edge_vertices[0], " and index ", polyhedron_edge_vertices[1] ) ); } diff --git a/src/geode/inspector/criterion/manifold/solid_facet_manifold.cpp b/src/geode/inspector/criterion/manifold/solid_facet_manifold.cpp index 4452e2d7..fe1f05ab 100644 --- a/src/geode/inspector/criterion/manifold/solid_facet_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/solid_facet_manifold.cpp @@ -51,7 +51,7 @@ namespace const Facet facet{ mesh.polyhedron_facet_vertices( { polyhedron_id, facet_id } ) }; if( !nb_polyhedra_adjacent_to_facets.try_emplace( facet, 1 ) - .second ) + .second ) { nb_polyhedra_adjacent_to_facets[facet] += 1; } @@ -89,14 +89,14 @@ namespace geode const auto nb_polyhedra_adjacent_to_facets = facets_to_nb_adjacent_polyhedra( mesh_ ); InspectionIssues< PolyhedronFacetVertices > non_manifold_facets{ - "Non manifold facets" + "non manifold facets" }; for( const auto& nb_adjacent_polyhedra : nb_polyhedra_adjacent_to_facets ) { if( nb_adjacent_polyhedra.second > 2 ) { - std::string message{ "Facet made of vertices with index " }; + std::string message{ "facet made of vertices with index " }; for( const auto vertex_id : nb_adjacent_polyhedra.first.vertices() ) { diff --git a/src/geode/inspector/criterion/manifold/solid_vertex_manifold.cpp b/src/geode/inspector/criterion/manifold/solid_vertex_manifold.cpp index f4ff7175..d18d40be 100644 --- a/src/geode/inspector/criterion/manifold/solid_vertex_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/solid_vertex_manifold.cpp @@ -101,7 +101,7 @@ namespace geode const auto polyhedra_around_vertices_list = polyhedra_around_vertices( mesh_ ); InspectionIssues< geode::index_t > non_manifold_vertices{ - "Non manifold vertices" + "non manifold vertices" }; for( const auto vertex_id : geode::Range{ mesh_.nb_vertices() } ) { @@ -110,7 +110,7 @@ namespace geode mesh_.polyhedra_around_vertex( vertex_id ) ) ) { non_manifold_vertices.add_issue( vertex_id, - absl::StrCat( "Vertex with index ", vertex_id, + absl::StrCat( "vertex with index ", vertex_id, ", at position [", mesh_.point( vertex_id ).string(), "]" ) ); } diff --git a/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp b/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp index 2e9e023f..caa7c0a8 100644 --- a/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp @@ -51,9 +51,9 @@ namespace { polygon_id, polygon_edge_id } ) }; if( !polygons_around_edges - .try_emplace( polygon_edge_vertex_cycle, - std::make_pair( 1, false ) ) - .second ) + .try_emplace( polygon_edge_vertex_cycle, + std::make_pair( 1, false ) ) + .second ) { polygons_around_edges[polygon_edge_vertex_cycle].first += 1; } @@ -98,7 +98,7 @@ namespace geode InspectionIssues< std::array< index_t, 2 > > non_manifold_edges() const { InspectionIssues< std::array< index_t, 2 > > non_manifold_edges{ - "Non manifold edges" + "non manifold edges" }; for( const auto& edge : edge_to_polygons_around( mesh_ ) ) { @@ -106,7 +106,7 @@ namespace geode if( on_border && nb_incident_polygons != 1 ) { non_manifold_edges.add_issue( edge.first.vertices(), - absl::StrCat( "Edge between vertices with index ", + absl::StrCat( "edge between vertices with index ", edge.first.vertices()[0], " and index ", edge.first.vertices()[1], " is not manifold (detected as on border)." ) ); @@ -114,7 +114,7 @@ namespace geode if( !on_border && nb_incident_polygons != 2 ) { non_manifold_edges.add_issue( edge.first.vertices(), - absl::StrCat( "Edge between vertices with index ", + absl::StrCat( "edge between vertices with index ", edge.first.vertices()[0], " and index ", edge.first.vertices()[1], " is not manifold (detected as not on border)." ) ); diff --git a/src/geode/inspector/criterion/manifold/surface_vertex_manifold.cpp b/src/geode/inspector/criterion/manifold/surface_vertex_manifold.cpp index cd6a6a5b..81193908 100644 --- a/src/geode/inspector/criterion/manifold/surface_vertex_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/surface_vertex_manifold.cpp @@ -107,7 +107,7 @@ namespace geode const auto polygons_around_vertices_list = polygons_around_vertices( mesh_ ); InspectionIssues< geode::index_t > non_manifold_vertices{ - "Non manifold vertices" + "non manifold vertices" }; for( const auto vertex_id : geode::Range{ mesh_.nb_vertices() } ) { @@ -118,7 +118,7 @@ namespace geode mesh_.polygons_around_vertex( vertex_id ) ) ) { non_manifold_vertices.add_issue( vertex_id, - absl::StrCat( "Vertex with index ", vertex_id, + absl::StrCat( "vertex with index ", vertex_id, ", at position [", mesh_.point( vertex_id ).string(), "]" ) ); } diff --git a/src/geode/inspector/criterion/negative_elements/brep_meshes_negative_elements.cpp b/src/geode/inspector/criterion/negative_elements/brep_meshes_negative_elements.cpp index a8700fb9..55f24c03 100644 --- a/src/geode/inspector/criterion/negative_elements/brep_meshes_negative_elements.cpp +++ b/src/geode/inspector/criterion/negative_elements/brep_meshes_negative_elements.cpp @@ -44,13 +44,13 @@ namespace geode { return negative_polyhedra.string(); } - return "No negative polyhedra issues in model\n"; + return "no negative polyhedra in model meshes\n"; } std::string BRepMeshesNegativeElementsInspectionResult::inspection_type() const { - return "Negative elements inspection"; + return "negative elements inspection"; } class BRepComponentMeshesNegativeElements::Impl @@ -69,8 +69,8 @@ namespace geode }; auto negative_elements = inspector.negative_polyhedra(); negative_elements.set_description( - absl::StrCat( "block ", block.name(), - " negative polyhedra - uuid ", block.id().string() ) ); + absl::StrCat( "Block ", block.name(), " (", + block.id().string(), ") negative polyhedra" ) ); result.negative_polyhedra.add_issues_to_map( block.id(), std::move( negative_elements ) ); } diff --git a/src/geode/inspector/criterion/negative_elements/section_meshes_negative_elements.cpp b/src/geode/inspector/criterion/negative_elements/section_meshes_negative_elements.cpp index 7fd54822..2777d940 100644 --- a/src/geode/inspector/criterion/negative_elements/section_meshes_negative_elements.cpp +++ b/src/geode/inspector/criterion/negative_elements/section_meshes_negative_elements.cpp @@ -46,13 +46,13 @@ namespace geode { return negative_polygons.string(); } - return "No negative polygons issues in model\n"; + return "no negative polygons in model meshes\n"; } std::string SectionMeshesNegativeElementsInspectionResult::inspection_type() const { - return "Negative elements inspection"; + return "negative elements inspection"; } class SectionComponentMeshesNegativeElements::Impl @@ -71,8 +71,8 @@ namespace geode }; auto negative_elements = inspector.negative_polygons(); negative_elements.set_description( - absl::StrCat( "Surface ", surface.name(), - " negative polygons - uuid ", surface.id().string() ) ); + absl::StrCat( "Surface ", surface.name(), " (", + surface.id().string(), ") negative polygons" ) ); result.negative_polygons.add_issues_to_map( surface.id(), std::move( negative_elements ) ); } diff --git a/src/geode/inspector/criterion/negative_elements/solid_negative_elements.cpp b/src/geode/inspector/criterion/negative_elements/solid_negative_elements.cpp index 5439ffb6..ccc379ec 100644 --- a/src/geode/inspector/criterion/negative_elements/solid_negative_elements.cpp +++ b/src/geode/inspector/criterion/negative_elements/solid_negative_elements.cpp @@ -63,7 +63,7 @@ namespace geode if( polyhedron_has_negative_volume( polyhedron_id ) ) { wrong_polyhedra.add_issue( polyhedron_id, - absl::StrCat( "Polyhedron ", polyhedron_id ) ); + absl::StrCat( "negative polyhedron ", polyhedron_id ) ); } } return wrong_polyhedra; diff --git a/src/geode/inspector/criterion/negative_elements/surface_negative_elements.cpp b/src/geode/inspector/criterion/negative_elements/surface_negative_elements.cpp index b0d2bb35..12fbc21c 100644 --- a/src/geode/inspector/criterion/negative_elements/surface_negative_elements.cpp +++ b/src/geode/inspector/criterion/negative_elements/surface_negative_elements.cpp @@ -57,14 +57,14 @@ namespace geode InspectionIssues< index_t > negative_polygons() const { InspectionIssues< index_t > wrong_polygons{ - "Negative area polygons" + "negative area polygons" }; for( const auto polygon_id : Range{ mesh_.nb_polygons() } ) { if( polygon_has_negative_area( polygon_id ) ) { - wrong_polygons.add_issue( - polygon_id, absl::StrCat( "Polygon ", polygon_id ) ); + wrong_polygons.add_issue( polygon_id, + absl::StrCat( "negative polygon ", polygon_id ) ); } } return wrong_polygons; diff --git a/src/geode/inspector/criterion/section_meshes_inspector.cpp b/src/geode/inspector/criterion/section_meshes_inspector.cpp index 0eabd673..2799dc7b 100644 --- a/src/geode/inspector/criterion/section_meshes_inspector.cpp +++ b/src/geode/inspector/criterion/section_meshes_inspector.cpp @@ -47,7 +47,7 @@ namespace geode std::string SectionMeshesInspectionResult::inspection_type() const { - return "Meshes Inspection"; + return "model meshes inspection"; } SectionMeshesInspector::SectionMeshesInspector( const Section& section ) diff --git a/src/geode/inspector/edgedcurve_inspector.cpp b/src/geode/inspector/edgedcurve_inspector.cpp index f1069823..fa551c53 100644 --- a/src/geode/inspector/edgedcurve_inspector.cpp +++ b/src/geode/inspector/edgedcurve_inspector.cpp @@ -43,7 +43,7 @@ namespace geode std::string EdgedCurveInspectionResult::inspection_type() const { - return "EdgedCurve Inspection"; + return "edged curve inspection"; } template < index_t dimension > diff --git a/src/geode/inspector/pointset_inspector.cpp b/src/geode/inspector/pointset_inspector.cpp index 5060b1ec..f0b58124 100644 --- a/src/geode/inspector/pointset_inspector.cpp +++ b/src/geode/inspector/pointset_inspector.cpp @@ -39,7 +39,7 @@ namespace geode std::string PointSetInspectionResult::inspection_type() const { - return "PointSet Inspection"; + return "point set inspection"; } template < index_t dimension > diff --git a/src/geode/inspector/section_inspector.cpp b/src/geode/inspector/section_inspector.cpp index 182f27fe..478589a0 100644 --- a/src/geode/inspector/section_inspector.cpp +++ b/src/geode/inspector/section_inspector.cpp @@ -41,7 +41,7 @@ namespace geode std::string SectionInspectionResult::inspection_type() const { - return "Section Inspection"; + return "Section inspection"; } SectionInspector::SectionInspector( const Section& section ) diff --git a/src/geode/inspector/solid_inspector.cpp b/src/geode/inspector/solid_inspector.cpp index c96d1acb..ae9eb15c 100644 --- a/src/geode/inspector/solid_inspector.cpp +++ b/src/geode/inspector/solid_inspector.cpp @@ -52,7 +52,7 @@ namespace geode std::string SolidInspectionResult::inspection_type() const { - return "Solid Inspection"; + return "solid inspection"; } template < index_t dimension > diff --git a/src/geode/inspector/surface_inspector.cpp b/src/geode/inspector/surface_inspector.cpp index 46aa069d..6e98bfa0 100644 --- a/src/geode/inspector/surface_inspector.cpp +++ b/src/geode/inspector/surface_inspector.cpp @@ -50,7 +50,7 @@ namespace geode std::string SurfaceInspectionResult::inspection_type() const { - return "SurfaceInspection"; + return "surface inspection"; } template < index_t dimension > From 57db410b2ad6aa61f5d57b0e81fe5c2893583e8b Mon Sep 17 00:00:00 2001 From: francoisbonneau <24669995+francoisbonneau@users.noreply.github.com> Date: Mon, 3 Nov 2025 18:52:16 +0000 Subject: [PATCH 09/14] Apply prepare changes --- .../colocation/unique_vertices_colocation.cpp | 12 ++++++------ .../inspector/criterion/internal/colocation_impl.cpp | 4 ++-- .../criterion/manifold/solid_edge_manifold.cpp | 4 ++-- .../criterion/manifold/solid_facet_manifold.cpp | 2 +- .../criterion/manifold/surface_edge_manifold.cpp | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/geode/inspector/criterion/colocation/unique_vertices_colocation.cpp b/src/geode/inspector/criterion/colocation/unique_vertices_colocation.cpp index 65d79839..dc99b61c 100644 --- a/src/geode/inspector/criterion/colocation/unique_vertices_colocation.cpp +++ b/src/geode/inspector/criterion/colocation/unique_vertices_colocation.cpp @@ -56,15 +56,15 @@ namespace == geode::Line< Model::dim >::component_type_static() ) { return point.inexact_equal( model.line( cmv.component_id.id() ) - .mesh() - .point( cmv.vertex ) ); + .mesh() + .point( cmv.vertex ) ); } else if( cmv.component_id.type() == geode::Surface< Model::dim >::component_type_static() ) { return point.inexact_equal( model.surface( cmv.component_id.id() ) - .mesh() - .point( cmv.vertex ) ); + .mesh() + .point( cmv.vertex ) ); } return point.inexact_equal( model.corner( cmv.component_id.id() ).mesh().point( cmv.vertex ) ); @@ -85,8 +85,8 @@ namespace if( cmv.component_id.type() == geode::Block3D::component_type_static() ) { return point.inexact_equal( model.block( cmv.component_id.id() ) - .mesh() - .point( cmv.vertex ) ); + .mesh() + .point( cmv.vertex ) ); } return model_cmv_is_colocated_on_point_base< geode::BRep >( model, cmv, point ); diff --git a/src/geode/inspector/criterion/internal/colocation_impl.cpp b/src/geode/inspector/criterion/internal/colocation_impl.cpp index 8bc86606..208e00d4 100644 --- a/src/geode/inspector/criterion/internal/colocation_impl.cpp +++ b/src/geode/inspector/criterion/internal/colocation_impl.cpp @@ -86,8 +86,8 @@ namespace absl::StrCat( "vertices ", point_group_string, " are colocated at the position [", mesh_colocation_info - .unique_points[mesh_colocation_info.colocated_mapping - [colocated_points_group[0]]] + .unique_points[mesh_colocation_info + .colocated_mapping[colocated_points_group[0]]] .string(), "]" ) ); } diff --git a/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp b/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp index 91c52f76..6a04a44e 100644 --- a/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp @@ -68,8 +68,8 @@ namespace { const Edge polyhedron_edge{ polyhedron_edge_vertices }; if( !polyhedra_around_edges - .try_emplace( polyhedron_edge, 1, polyhedron_id ) - .second ) + .try_emplace( polyhedron_edge, 1, polyhedron_id ) + .second ) { polyhedra_around_edges[polyhedron_edge].push_back( polyhedron_id ); diff --git a/src/geode/inspector/criterion/manifold/solid_facet_manifold.cpp b/src/geode/inspector/criterion/manifold/solid_facet_manifold.cpp index fe1f05ab..5f696ec9 100644 --- a/src/geode/inspector/criterion/manifold/solid_facet_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/solid_facet_manifold.cpp @@ -51,7 +51,7 @@ namespace const Facet facet{ mesh.polyhedron_facet_vertices( { polyhedron_id, facet_id } ) }; if( !nb_polyhedra_adjacent_to_facets.try_emplace( facet, 1 ) - .second ) + .second ) { nb_polyhedra_adjacent_to_facets[facet] += 1; } diff --git a/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp b/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp index caa7c0a8..14085780 100644 --- a/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp @@ -51,9 +51,9 @@ namespace { polygon_id, polygon_edge_id } ) }; if( !polygons_around_edges - .try_emplace( polygon_edge_vertex_cycle, - std::make_pair( 1, false ) ) - .second ) + .try_emplace( polygon_edge_vertex_cycle, + std::make_pair( 1, false ) ) + .second ) { polygons_around_edges[polygon_edge_vertex_cycle].first += 1; } From 94337b4b3aeeffa2cc83967a99863a0f0d836d66 Mon Sep 17 00:00:00 2001 From: Francois Bonneau Date: Tue, 4 Nov 2025 14:20:52 +0100 Subject: [PATCH 10/14] fix compilation issue --- .../inspector/criterion/manifold/brep_meshes_manifold.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/geode/inspector/criterion/manifold/brep_meshes_manifold.cpp b/src/geode/inspector/criterion/manifold/brep_meshes_manifold.cpp index fbf94495..47a9402a 100644 --- a/src/geode/inspector/criterion/manifold/brep_meshes_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/brep_meshes_manifold.cpp @@ -201,7 +201,8 @@ namespace geode "but is on Surfaces " ); for( const auto surface_uuid : edge.second ) { - absl::StrAppend( &message, surface.name(), " (", + absl::StrAppend( &message, + model().surface( surface_uuid ).name(), " (", surface_uuid.string(), "), " ); } issues.add_issue( From 462b0459b4f0f525e72c48b0d8148ebabbe12ecd Mon Sep 17 00:00:00 2001 From: Francois Bonneau Date: Tue, 4 Nov 2025 14:31:59 +0100 Subject: [PATCH 11/14] MSS review --- .../colocation/component_meshes_colocation.hpp | 2 +- .../colocation/unique_vertices_colocation.hpp | 4 ++-- .../degeneration/brep_meshes_degeneration.hpp | 6 +++--- .../criterion/manifold/brep_meshes_manifold.hpp | 2 +- .../criterion/degeneration/edgedcurve_degeneration.cpp | 2 +- .../inspector/criterion/internal/degeneration_impl.cpp | 2 +- .../criterion/intersections/model_intersections.cpp | 4 ++-- .../criterion/manifold/solid_edge_manifold.cpp | 10 +++++----- .../criterion/manifold/solid_vertex_manifold.cpp | 3 +-- .../criterion/manifold/surface_edge_manifold.cpp | 10 +++++----- .../criterion/manifold/surface_vertex_manifold.cpp | 2 +- 11 files changed, 23 insertions(+), 24 deletions(-) diff --git a/include/geode/inspector/criterion/colocation/component_meshes_colocation.hpp b/include/geode/inspector/criterion/colocation/component_meshes_colocation.hpp index cd4a0d91..1f930cb3 100644 --- a/include/geode/inspector/criterion/colocation/component_meshes_colocation.hpp +++ b/include/geode/inspector/criterion/colocation/component_meshes_colocation.hpp @@ -41,7 +41,7 @@ namespace geode struct opengeode_inspector_inspector_api MeshesColocationInspectionResult { InspectionIssuesMap< std::vector< index_t > > colocated_points_groups{ - "colocated point" + "colocated points" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/criterion/colocation/unique_vertices_colocation.hpp b/include/geode/inspector/criterion/colocation/unique_vertices_colocation.hpp index 539dcc87..3313a7b8 100644 --- a/include/geode/inspector/criterion/colocation/unique_vertices_colocation.hpp +++ b/include/geode/inspector/criterion/colocation/unique_vertices_colocation.hpp @@ -39,9 +39,9 @@ namespace geode struct opengeode_inspector_inspector_api UniqueVerticesInspectionResult { InspectionIssues< std::vector< index_t > > - colocated_unique_vertices_groups{ "colocated unique vertex" }; + colocated_unique_vertices_groups{ "colocated unique vertices" }; InspectionIssues< index_t > unique_vertices_linked_to_different_points{ - "unique vertex refering multiple position" + "unique vertex refering multiple positions" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/criterion/degeneration/brep_meshes_degeneration.hpp b/include/geode/inspector/criterion/degeneration/brep_meshes_degeneration.hpp index 5dd3781a..f4a508ab 100644 --- a/include/geode/inspector/criterion/degeneration/brep_meshes_degeneration.hpp +++ b/include/geode/inspector/criterion/degeneration/brep_meshes_degeneration.hpp @@ -41,12 +41,12 @@ namespace geode struct opengeode_inspector_inspector_api BRepMeshesDegenerationInspectionResult { - InspectionIssuesMap< index_t > degenerated_edges{ "degenerated edge" }; + InspectionIssuesMap< index_t > degenerated_edges{ "degenerated edges" }; InspectionIssuesMap< index_t > degenerated_polygons{ - "degenerated polygon" + "degenerated polygons" }; InspectionIssuesMap< index_t > degenerated_polyhedra{ - "degenerated polyhedron" + "degenerated polyhedra" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/criterion/manifold/brep_meshes_manifold.hpp b/include/geode/inspector/criterion/manifold/brep_meshes_manifold.hpp index f5a28603..d03b208b 100644 --- a/include/geode/inspector/criterion/manifold/brep_meshes_manifold.hpp +++ b/include/geode/inspector/criterion/manifold/brep_meshes_manifold.hpp @@ -58,7 +58,7 @@ namespace geode struct opengeode_inspector_inspector_api BRepMeshesManifoldInspectionResult { InspectionIssuesMap< index_t > meshes_non_manifold_vertices{ - "non manifold mesh vertex" + "non manifold mesh vertices" }; InspectionIssuesMap< std::array< index_t, 2 > > diff --git a/src/geode/inspector/criterion/degeneration/edgedcurve_degeneration.cpp b/src/geode/inspector/criterion/degeneration/edgedcurve_degeneration.cpp index 16a5e286..dcb1b6e6 100644 --- a/src/geode/inspector/criterion/degeneration/edgedcurve_degeneration.cpp +++ b/src/geode/inspector/criterion/degeneration/edgedcurve_degeneration.cpp @@ -54,7 +54,7 @@ namespace geode InspectionIssues< index_t > small_edges( double threshold ) const { InspectionIssues< index_t > degenerated_edges_index{ - "Degenerated Edges." + "degenerated Edges." }; for( const auto edge_id : Range{ mesh_.nb_edges() } ) { diff --git a/src/geode/inspector/criterion/internal/degeneration_impl.cpp b/src/geode/inspector/criterion/internal/degeneration_impl.cpp index 10760d49..db02e54e 100644 --- a/src/geode/inspector/criterion/internal/degeneration_impl.cpp +++ b/src/geode/inspector/criterion/internal/degeneration_impl.cpp @@ -72,7 +72,7 @@ namespace geode { enable_edges_on_mesh(); InspectionIssues< index_t > degenerated_edges_index{ - "Degenerated edges" + "degenerated edges" }; for( const auto edge_index : Range{ mesh_.edges().nb_edges() } ) { diff --git a/src/geode/inspector/criterion/intersections/model_intersections.cpp b/src/geode/inspector/criterion/intersections/model_intersections.cpp index d933c017..64af6b62 100644 --- a/src/geode/inspector/criterion/intersections/model_intersections.cpp +++ b/src/geode/inspector/criterion/intersections/model_intersections.cpp @@ -521,7 +521,7 @@ namespace geode const auto& surface2 = model_.surface( polygon_pair.second.component_id.id() ); intersection_issues.add_issue( polygon_pair, - absl::StrCat( surface1.name(), " (", + absl::StrCat( "Surfaces ", surface1.name(), " (", polygon_pair.first.component_id.id().string(), ") and ", surface2.name(), " (", polygon_pair.second.component_id.id().string(), @@ -544,7 +544,7 @@ namespace geode intersection_issues.add_issue( polygon_pair, absl::StrCat( "Surface ", surface.name(), " (", polygon_pair.first.component_id.id().string(), - ") have a self intersection on polygons ", + ") has a self intersection on polygons ", polygon_pair.first.element_id, "and ", polygon_pair.second.element_id ) ); } diff --git a/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp b/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp index 6a04a44e..7a705829 100644 --- a/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp @@ -68,8 +68,8 @@ namespace { const Edge polyhedron_edge{ polyhedron_edge_vertices }; if( !polyhedra_around_edges - .try_emplace( polyhedron_edge, 1, polyhedron_id ) - .second ) + .try_emplace( polyhedron_edge, 1, polyhedron_id ) + .second ) { polyhedra_around_edges[polyhedron_edge].push_back( polyhedron_id ); @@ -145,9 +145,9 @@ namespace geode { non_manifold_edges.add_issue( polyhedron_edge_vertices, - absl::StrCat( "Non manifold edge between " - "vertices with index ", - polyhedron_edge_vertices[0], " and index ", + absl::StrCat( + "Non manifold edge between vertices ", + polyhedron_edge_vertices[0], " and ", polyhedron_edge_vertices[1] ) ); } } diff --git a/src/geode/inspector/criterion/manifold/solid_vertex_manifold.cpp b/src/geode/inspector/criterion/manifold/solid_vertex_manifold.cpp index d18d40be..a3e04f1f 100644 --- a/src/geode/inspector/criterion/manifold/solid_vertex_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/solid_vertex_manifold.cpp @@ -110,8 +110,7 @@ namespace geode mesh_.polyhedra_around_vertex( vertex_id ) ) ) { non_manifold_vertices.add_issue( vertex_id, - absl::StrCat( "vertex with index ", vertex_id, - ", at position [", + absl::StrCat( "vertex ", vertex_id, ", at position [", mesh_.point( vertex_id ).string(), "]" ) ); } } diff --git a/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp b/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp index 14085780..90920c8a 100644 --- a/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp @@ -51,9 +51,9 @@ namespace { polygon_id, polygon_edge_id } ) }; if( !polygons_around_edges - .try_emplace( polygon_edge_vertex_cycle, - std::make_pair( 1, false ) ) - .second ) + .try_emplace( polygon_edge_vertex_cycle, + std::make_pair( 1, false ) ) + .second ) { polygons_around_edges[polygon_edge_vertex_cycle].first += 1; } @@ -106,8 +106,8 @@ namespace geode if( on_border && nb_incident_polygons != 1 ) { non_manifold_edges.add_issue( edge.first.vertices(), - absl::StrCat( "edge between vertices with index ", - edge.first.vertices()[0], " and index ", + absl::StrCat( "edge between vertices ", + edge.first.vertices()[0], " and ", edge.first.vertices()[1], " is not manifold (detected as on border)." ) ); } diff --git a/src/geode/inspector/criterion/manifold/surface_vertex_manifold.cpp b/src/geode/inspector/criterion/manifold/surface_vertex_manifold.cpp index 81193908..57def6a7 100644 --- a/src/geode/inspector/criterion/manifold/surface_vertex_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/surface_vertex_manifold.cpp @@ -118,7 +118,7 @@ namespace geode mesh_.polygons_around_vertex( vertex_id ) ) ) { non_manifold_vertices.add_issue( vertex_id, - absl::StrCat( "vertex with index ", vertex_id, + absl::StrCat( "vertex ", vertex_id, ", at position [", mesh_.point( vertex_id ).string(), "]" ) ); } From a471d7ab64470ef9f1ed67b704f417df56ac288d Mon Sep 17 00:00:00 2001 From: francoisbonneau <24669995+francoisbonneau@users.noreply.github.com> Date: Tue, 4 Nov 2025 13:32:37 +0000 Subject: [PATCH 12/14] Apply prepare changes --- .../inspector/criterion/manifold/solid_edge_manifold.cpp | 4 ++-- .../inspector/criterion/manifold/surface_edge_manifold.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp b/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp index 7a705829..2e077d3e 100644 --- a/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp @@ -68,8 +68,8 @@ namespace { const Edge polyhedron_edge{ polyhedron_edge_vertices }; if( !polyhedra_around_edges - .try_emplace( polyhedron_edge, 1, polyhedron_id ) - .second ) + .try_emplace( polyhedron_edge, 1, polyhedron_id ) + .second ) { polyhedra_around_edges[polyhedron_edge].push_back( polyhedron_id ); diff --git a/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp b/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp index 90920c8a..524c2400 100644 --- a/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp @@ -51,9 +51,9 @@ namespace { polygon_id, polygon_edge_id } ) }; if( !polygons_around_edges - .try_emplace( polygon_edge_vertex_cycle, - std::make_pair( 1, false ) ) - .second ) + .try_emplace( polygon_edge_vertex_cycle, + std::make_pair( 1, false ) ) + .second ) { polygons_around_edges[polygon_edge_vertex_cycle].first += 1; } From 30af42ab7c8c72f3bbf98f6c882aee27b008615b Mon Sep 17 00:00:00 2001 From: Francois Bonneau Date: Tue, 4 Nov 2025 14:54:37 +0100 Subject: [PATCH 13/14] other improvement --- .../degeneration/section_meshes_degeneration.hpp | 4 ++-- .../criterion/manifold/brep_meshes_manifold.hpp | 8 ++++---- .../manifold/section_meshes_manifold.hpp | 4 ++-- .../brep_meshes_negative_elements.hpp | 2 +- .../section_meshes_negative_elements.hpp | 2 +- include/geode/inspector/information.hpp | 4 ++-- include/geode/inspector/pointset_inspector.hpp | 2 +- include/geode/inspector/solid_inspector.hpp | 2 +- include/geode/inspector/surface_inspector.hpp | 4 ++-- .../geode/inspector/topology/brep_topology.hpp | 4 ++-- .../topology/section_surfaces_topology.hpp | 2 +- .../colocation/component_meshes_colocation.cpp | 6 +++--- .../colocation/unique_vertices_colocation.cpp | 16 ++++++++-------- .../degeneration/edgedcurve_degeneration.cpp | 2 +- .../degeneration/solid_degeneration.cpp | 2 +- .../degeneration/surface_degeneration.cpp | 2 +- 16 files changed, 33 insertions(+), 33 deletions(-) diff --git a/include/geode/inspector/criterion/degeneration/section_meshes_degeneration.hpp b/include/geode/inspector/criterion/degeneration/section_meshes_degeneration.hpp index 7a63e1fa..be89ed7a 100644 --- a/include/geode/inspector/criterion/degeneration/section_meshes_degeneration.hpp +++ b/include/geode/inspector/criterion/degeneration/section_meshes_degeneration.hpp @@ -41,9 +41,9 @@ namespace geode struct opengeode_inspector_inspector_api SectionMeshesDegenerationInspectionResult { - InspectionIssuesMap< index_t > degenerated_edges{ "degenerated edge" }; + InspectionIssuesMap< index_t > degenerated_edges{ "degenerated edges" }; InspectionIssuesMap< index_t > degenerated_polygons{ - "degenerated polygon" + "degenerated polygons" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/criterion/manifold/brep_meshes_manifold.hpp b/include/geode/inspector/criterion/manifold/brep_meshes_manifold.hpp index d03b208b..9d0acde6 100644 --- a/include/geode/inspector/criterion/manifold/brep_meshes_manifold.hpp +++ b/include/geode/inspector/criterion/manifold/brep_meshes_manifold.hpp @@ -62,17 +62,17 @@ namespace geode }; InspectionIssuesMap< std::array< index_t, 2 > > - meshes_non_manifold_edges{ "non manifold mesh edge" }; + meshes_non_manifold_edges{ "non manifold mesh edges" }; InspectionIssuesMap< PolyhedronFacetVertices > - meshes_non_manifold_facets{ "non manifold mesh facet" }; + meshes_non_manifold_facets{ "non manifold mesh facets" }; InspectionIssues< BRepNonManifoldEdge > brep_non_manifold_edges{ - "non manifold model edge" + "non manifold model edges" }; InspectionIssues< BRepNonManifoldFacet > brep_non_manifold_facets{ - "non manifold model facet" + "non manifold model facets" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/criterion/manifold/section_meshes_manifold.hpp b/include/geode/inspector/criterion/manifold/section_meshes_manifold.hpp index ca180a29..74edfd0c 100644 --- a/include/geode/inspector/criterion/manifold/section_meshes_manifold.hpp +++ b/include/geode/inspector/criterion/manifold/section_meshes_manifold.hpp @@ -39,10 +39,10 @@ namespace geode opengeode_inspector_inspector_api SectionMeshesManifoldInspectionResult { InspectionIssuesMap< index_t > meshes_non_manifold_vertices{ - "non manifold mesh vertex" + "non manifold mesh vertices" }; InspectionIssuesMap< std::array< index_t, 2 > > - meshes_non_manifold_edges{ "non manifold mesh edge" }; + meshes_non_manifold_edges{ "non manifold mesh edges" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/criterion/negative_elements/brep_meshes_negative_elements.hpp b/include/geode/inspector/criterion/negative_elements/brep_meshes_negative_elements.hpp index f3118127..2a4ec53f 100644 --- a/include/geode/inspector/criterion/negative_elements/brep_meshes_negative_elements.hpp +++ b/include/geode/inspector/criterion/negative_elements/brep_meshes_negative_elements.hpp @@ -42,7 +42,7 @@ namespace geode opengeode_inspector_inspector_api BRepMeshesNegativeElementsInspectionResult { InspectionIssuesMap< index_t > negative_polyhedra{ - "negative polyhedron" + "negative polyhedra" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/criterion/negative_elements/section_meshes_negative_elements.hpp b/include/geode/inspector/criterion/negative_elements/section_meshes_negative_elements.hpp index 30e9ed15..e0a5ba0c 100644 --- a/include/geode/inspector/criterion/negative_elements/section_meshes_negative_elements.hpp +++ b/include/geode/inspector/criterion/negative_elements/section_meshes_negative_elements.hpp @@ -41,7 +41,7 @@ namespace geode struct opengeode_inspector_inspector_api SectionMeshesNegativeElementsInspectionResult { - InspectionIssuesMap< index_t > negative_polygons{ "negative polygon" }; + InspectionIssuesMap< index_t > negative_polygons{ "negative polygons" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/information.hpp b/include/geode/inspector/information.hpp index f1e25861..800ec61c 100644 --- a/include/geode/inspector/information.hpp +++ b/include/geode/inspector/information.hpp @@ -72,7 +72,7 @@ namespace geode { if( issues_.empty() ) { - return absl::StrCat( "No issues with ", description_, "\n" ); + return absl::StrCat( "no issues with ", description_, "\n" ); } auto message = absl::StrCat( issues_.size(), " issues with ", description_ ); @@ -138,7 +138,7 @@ namespace geode { if( issues_map_.empty() ) { - return absl::StrCat( "No issues with ", description_, "\n" ); + return absl::StrCat( "no issues with ", description_, "\n" ); } auto message = absl::StrCat( issues_map_.size(), " issues with ", description_ ); diff --git a/include/geode/inspector/pointset_inspector.hpp b/include/geode/inspector/pointset_inspector.hpp index 6960b563..a3558420 100644 --- a/include/geode/inspector/pointset_inspector.hpp +++ b/include/geode/inspector/pointset_inspector.hpp @@ -32,7 +32,7 @@ namespace geode struct opengeode_inspector_inspector_api PointSetInspectionResult { InspectionIssues< std::vector< index_t > > colocated_points_groups{ - "Colocalization of vertices not tested" + "Colocation of vertices not tested" }; [[nodiscard]] index_t nb_issues() const; diff --git a/include/geode/inspector/solid_inspector.hpp b/include/geode/inspector/solid_inspector.hpp index 2ec583e3..c0f2ee1a 100644 --- a/include/geode/inspector/solid_inspector.hpp +++ b/include/geode/inspector/solid_inspector.hpp @@ -42,7 +42,7 @@ namespace geode "Adjacencies of facets not tested" }; InspectionIssues< std::vector< index_t > > colocated_points_groups{ - "Colocalization of vertices not tested" + "Colocation of vertices not tested" }; InspectionIssues< index_t > degenerated_edges{ "Degeneration of edges not tested" diff --git a/include/geode/inspector/surface_inspector.hpp b/include/geode/inspector/surface_inspector.hpp index 95eacd8e..ab20b2ac 100644 --- a/include/geode/inspector/surface_inspector.hpp +++ b/include/geode/inspector/surface_inspector.hpp @@ -37,10 +37,10 @@ namespace geode struct opengeode_inspector_inspector_api SurfaceInspectionResult { InspectionIssues< PolygonEdge > polygon_edges_with_wrong_adjacency{ - "Adjacencies between polygon and edges not tested" + "Adjacencies between polygon edges not tested" }; InspectionIssues< std::vector< index_t > > colocated_points_groups{ - "Colocalization of vertices not tested" + "Colocation of vertices not tested" }; InspectionIssues< index_t > degenerated_edges{ "Degeneration of edges not tested" diff --git a/include/geode/inspector/topology/brep_topology.hpp b/include/geode/inspector/topology/brep_topology.hpp index c12e38c6..026e6861 100644 --- a/include/geode/inspector/topology/brep_topology.hpp +++ b/include/geode/inspector/topology/brep_topology.hpp @@ -46,10 +46,10 @@ namespace geode BRepSurfacesTopologyInspectionResult surfaces; BRepBlocksTopologyInspectionResult blocks; InspectionIssues< index_t > unique_vertices_not_linked_to_any_component{ - "unique vertices not linked to Component" + "unique vertices not linked to a Component" }; InspectionIssues< index_t > unique_vertices_linked_to_inexistant_cmv{ - "unique vertices linked to inexistant vertex Component mesh vertex" + "unique vertices linked to inexistant Component mesh vertex" }; InspectionIssues< index_t > unique_vertices_nonbijectively_linked_to_cmv{ diff --git a/include/geode/inspector/topology/section_surfaces_topology.hpp b/include/geode/inspector/topology/section_surfaces_topology.hpp index 001e4b38..244bf84d 100644 --- a/include/geode/inspector/topology/section_surfaces_topology.hpp +++ b/include/geode/inspector/topology/section_surfaces_topology.hpp @@ -42,7 +42,7 @@ namespace geode opengeode_inspector_inspector_api SectionSurfacesTopologyInspectionResult { InspectionIssues< uuid > surfaces_not_meshed{ - "Surface without mesh (uuids listed)" + "Surfaces without mesh (uuids listed)" }; InspectionIssuesMap< index_t > surfaces_not_linked_to_a_unique_vertex{ "Surfaces containing mesh vertices not linked to unique vertices" diff --git a/src/geode/inspector/criterion/colocation/component_meshes_colocation.cpp b/src/geode/inspector/criterion/colocation/component_meshes_colocation.cpp index ccb471b5..90a8087d 100644 --- a/src/geode/inspector/criterion/colocation/component_meshes_colocation.cpp +++ b/src/geode/inspector/criterion/colocation/component_meshes_colocation.cpp @@ -147,7 +147,7 @@ namespace if( !colocated_pts.empty() ) { geode::InspectionIssues< std::vector< geode::index_t > > - surface_issues{ absl::StrCat( "surface ", surface.name(), + surface_issues{ absl::StrCat( "Surface ", surface.name(), " (", surface.id().string(), ") colocated vertices" ) }; const auto& surface_mesh = surface.mesh(); for( const auto& colocated_points_group : colocated_pts ) @@ -237,12 +237,12 @@ namespace geode { return colocated_points_groups.string(); } - return "No issues of colocation in meshes \n"; + return "no issues of colocation in meshes \n"; } std::string MeshesColocationInspectionResult::inspection_type() const { - return "Points colocation inspection"; + return "points colocation inspection"; } template < typename Model > diff --git a/src/geode/inspector/criterion/colocation/unique_vertices_colocation.cpp b/src/geode/inspector/criterion/colocation/unique_vertices_colocation.cpp index dc99b61c..f1a22b1d 100644 --- a/src/geode/inspector/criterion/colocation/unique_vertices_colocation.cpp +++ b/src/geode/inspector/criterion/colocation/unique_vertices_colocation.cpp @@ -56,15 +56,15 @@ namespace == geode::Line< Model::dim >::component_type_static() ) { return point.inexact_equal( model.line( cmv.component_id.id() ) - .mesh() - .point( cmv.vertex ) ); + .mesh() + .point( cmv.vertex ) ); } else if( cmv.component_id.type() == geode::Surface< Model::dim >::component_type_static() ) { return point.inexact_equal( model.surface( cmv.component_id.id() ) - .mesh() - .point( cmv.vertex ) ); + .mesh() + .point( cmv.vertex ) ); } return point.inexact_equal( model.corner( cmv.component_id.id() ).mesh().point( cmv.vertex ) ); @@ -85,8 +85,8 @@ namespace if( cmv.component_id.type() == geode::Block3D::component_type_static() ) { return point.inexact_equal( model.block( cmv.component_id.id() ) - .mesh() - .point( cmv.vertex ) ); + .mesh() + .point( cmv.vertex ) ); } return model_cmv_is_colocated_on_point_base< geode::BRep >( model, cmv, point ); @@ -225,7 +225,7 @@ namespace geode unique_vertices_->point( unique_vertex_id ) ) ) { vertices_issues.add_issue( unique_vertex_id, - absl::StrCat( "Unique vertex ", unique_vertex_id, + absl::StrCat( "unique vertex ", unique_vertex_id, " is linked to several mesh vertices on different " "positions" ) ); } @@ -259,7 +259,7 @@ namespace geode if( !fixed_point_group.empty() ) { vertices_issues.add_issue( fixed_point_group, - absl::StrCat( "Unique vertices ", point_group_string, + absl::StrCat( "unique vertices ", point_group_string, " are colocated at the position [", unique_vertices_->point( fixed_point_group[0] ) .string(), diff --git a/src/geode/inspector/criterion/degeneration/edgedcurve_degeneration.cpp b/src/geode/inspector/criterion/degeneration/edgedcurve_degeneration.cpp index dcb1b6e6..3979a29b 100644 --- a/src/geode/inspector/criterion/degeneration/edgedcurve_degeneration.cpp +++ b/src/geode/inspector/criterion/degeneration/edgedcurve_degeneration.cpp @@ -54,7 +54,7 @@ namespace geode InspectionIssues< index_t > small_edges( double threshold ) const { InspectionIssues< index_t > degenerated_edges_index{ - "degenerated Edges." + "degenerated edges." }; for( const auto edge_id : Range{ mesh_.nb_edges() } ) { diff --git a/src/geode/inspector/criterion/degeneration/solid_degeneration.cpp b/src/geode/inspector/criterion/degeneration/solid_degeneration.cpp index ad91c686..189b966c 100644 --- a/src/geode/inspector/criterion/degeneration/solid_degeneration.cpp +++ b/src/geode/inspector/criterion/degeneration/solid_degeneration.cpp @@ -77,7 +77,7 @@ namespace geode <= threshold ) { wrong_polyhedra.add_issue( - polyhedron_id, absl::StrCat( "degenerated polyhedron ", + polyhedron_id, absl::StrCat( "degenerated polyhedra ", polyhedron_id ) ); } } diff --git a/src/geode/inspector/criterion/degeneration/surface_degeneration.cpp b/src/geode/inspector/criterion/degeneration/surface_degeneration.cpp index c568a801..838ff15f 100644 --- a/src/geode/inspector/criterion/degeneration/surface_degeneration.cpp +++ b/src/geode/inspector/criterion/degeneration/surface_degeneration.cpp @@ -75,7 +75,7 @@ namespace geode <= threshold ) { wrong_polygons.add_issue( polygon_id, - absl::StrCat( "degenerated polygon ", polygon_id ) ); + absl::StrCat( "degenerated polygons ", polygon_id ) ); } } return wrong_polygons; From c3c808cfa3890bfee3ede58502de9454aabf5984 Mon Sep 17 00:00:00 2001 From: francoisbonneau <24669995+francoisbonneau@users.noreply.github.com> Date: Tue, 4 Nov 2025 13:55:11 +0000 Subject: [PATCH 14/14] Apply prepare changes --- .../colocation/unique_vertices_colocation.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/geode/inspector/criterion/colocation/unique_vertices_colocation.cpp b/src/geode/inspector/criterion/colocation/unique_vertices_colocation.cpp index f1a22b1d..79ce12da 100644 --- a/src/geode/inspector/criterion/colocation/unique_vertices_colocation.cpp +++ b/src/geode/inspector/criterion/colocation/unique_vertices_colocation.cpp @@ -56,15 +56,15 @@ namespace == geode::Line< Model::dim >::component_type_static() ) { return point.inexact_equal( model.line( cmv.component_id.id() ) - .mesh() - .point( cmv.vertex ) ); + .mesh() + .point( cmv.vertex ) ); } else if( cmv.component_id.type() == geode::Surface< Model::dim >::component_type_static() ) { return point.inexact_equal( model.surface( cmv.component_id.id() ) - .mesh() - .point( cmv.vertex ) ); + .mesh() + .point( cmv.vertex ) ); } return point.inexact_equal( model.corner( cmv.component_id.id() ).mesh().point( cmv.vertex ) ); @@ -85,8 +85,8 @@ namespace if( cmv.component_id.type() == geode::Block3D::component_type_static() ) { return point.inexact_equal( model.block( cmv.component_id.id() ) - .mesh() - .point( cmv.vertex ) ); + .mesh() + .point( cmv.vertex ) ); } return model_cmv_is_colocated_on_point_base< geode::BRep >( model, cmv, point );