diff --git a/include/geode/inspector/criterion/adjacency/brep_meshes_adjacency.hpp b/include/geode/inspector/criterion/adjacency/brep_meshes_adjacency.hpp index 990b8b36..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{ - "BRep Surface mesh with polygon edges adjacencies issues" + "polygon edges adjacencies" }; InspectionIssuesMap< PolyhedronFacet > blocks_facets_with_wrong_adjacencies{ - "BRep Block mesh with 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 74b57f4b..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{ - "Section Surface mesh 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 04b943c2..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{ - "Model component meshes with colocated points" + "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 1cb9d9b3..3313a7b8 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 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 20cc1cb8..f4a508ab 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{ - "BRep component meshes with degenerated edges" - }; + InspectionIssuesMap< index_t > degenerated_edges{ "degenerated edges" }; InspectionIssuesMap< index_t > degenerated_polygons{ - "BRep component meshes with degenerated polygons" + "degenerated polygons" }; InspectionIssuesMap< index_t > degenerated_polyhedra{ - "BRep component meshes with degenerated polyhedra" + "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..be89ed7a 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{ - "Section component meshes with degenerated edges" - }; + InspectionIssuesMap< index_t > degenerated_edges{ "degenerated edges" }; InspectionIssuesMap< index_t > degenerated_polygons{ - "Section component meshes with degenerated polygons" + "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..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 9b734950..9d0acde6 100644 --- a/include/geode/inspector/criterion/manifold/brep_meshes_manifold.hpp +++ b/include/geode/inspector/criterion/manifold/brep_meshes_manifold.hpp @@ -58,22 +58,21 @@ namespace geode struct opengeode_inspector_inspector_api BRepMeshesManifoldInspectionResult { InspectionIssuesMap< index_t > meshes_non_manifold_vertices{ - "BRep component meshes with non manifold vertices" + "non manifold mesh vertices" }; + InspectionIssuesMap< std::array< index_t, 2 > > - meshes_non_manifold_edges{ - "BRep component meshes with non manifold edges" - }; + meshes_non_manifold_edges{ "non manifold mesh edges" }; + InspectionIssuesMap< PolyhedronFacetVertices > - meshes_non_manifold_facets{ - "BRep component meshes with non manifold facets" - }; + meshes_non_manifold_facets{ "non manifold mesh facets" }; + InspectionIssues< BRepNonManifoldEdge > brep_non_manifold_edges{ - "BRep non manifold edges" + "non manifold model edges" }; InspectionIssues< BRepNonManifoldFacet > brep_non_manifold_facets{ - "BRep non manifold facets" + "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 a66cfb56..74edfd0c 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" + "non manifold mesh vertices" }; InspectionIssuesMap< std::array< index_t, 2 > > - meshes_non_manifold_edges{ - "Section component meshes with non manifold edges" - }; + 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 dd21b025..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{ - "BRep block meshes with negative polyhedra" + "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..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,9 +41,7 @@ namespace geode struct opengeode_inspector_inspector_api SectionMeshesNegativeElementsInspectionResult { - InspectionIssuesMap< index_t > negative_polygons{ - "Section surface meshes with negative polygons" - }; + 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 22e3cd26..800ec61c 100644 --- a/include/geode/inspector/information.hpp +++ b/include/geode/inspector/information.hpp @@ -72,12 +72,13 @@ 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_ ); + 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; @@ -137,12 +138,13 @@ 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_ ); + 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..b609405d 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 (uuid 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 Component mesh " + "vertices 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..0c664bea 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 " - "boundary nor internal status." + "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's 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..38c199c4 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" }; 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..eb040197 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 " - "internal topology." + "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..026e6861 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 not linked to a 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 links to ComponentMeshVertex that are " - "not bijective" + "unique vertices with non-bijective links to " + "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 89a63669..bae6bb67 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 " - "boundary nor internal status." + "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's 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..0da38790 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" }; 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 " - "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" }; [[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..244bf84d 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." + "Surfaces 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 " - "internal topology." + "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..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 not linked to any component" + "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 links to ComponentMeshVertex that are " - "not bijective" + "unique vertices with non-bijective links to " + "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 a15797d2..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 component meshes \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,9 +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 with uuid ", block.id().string(), - " polyhedron facets adjacencies issues" ) ); + 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() } ) { @@ -111,7 +111,7 @@ 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." ) ); diff --git a/src/geode/inspector/criterion/adjacency/section_meshes_adjacency.cpp b/src/geode/inspector/criterion/adjacency/section_meshes_adjacency.cpp index 7d69be5b..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 component meshes \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 ffd845b6..8093766b 100644 --- a/src/geode/inspector/criterion/adjacency/solid_adjacency.cpp +++ b/src/geode/inspector/criterion/adjacency/solid_adjacency.cpp @@ -61,7 +61,8 @@ 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" ) }; for( const auto polyhedron_id : Range{ mesh_.nb_polyhedra() } ) { @@ -75,9 +76,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, " has wrong adjacencies" ) ); } } } diff --git a/src/geode/inspector/criterion/adjacency/surface_adjacency.cpp b/src/geode/inspector/criterion/adjacency/surface_adjacency.cpp index ae5b86bc..d30a2cdb 100644 --- a/src/geode/inspector/criterion/adjacency/surface_adjacency.cpp +++ b/src/geode/inspector/criterion/adjacency/surface_adjacency.cpp @@ -59,7 +59,8 @@ 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" ) }; for( const auto polygon_id : Range{ mesh_.nb_polygons() } ) { for( const auto edge_id : @@ -70,10 +71,9 @@ namespace geode && !mesh_polygon_edge_has_right_adjacency( polygon_edge ) ) { - wrong_adjacency_edges.add_issue( - polygon_edge, absl::StrCat( "Local edge ", edge_id, - " of polygon ", polygon_id, - " has wrong adjacencies." ) ); + 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 afb92f52..90a8087d 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(), " (", + line.id().string(), ") colocated vertices" ) }; 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(), - " has vertices with indices", point_group_string, - " which 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(), - "]." ) ); + "]" ) ); } components_colocated_points.add_issues_to_map( line.id(), std::move( line_issues ) ); @@ -147,8 +147,8 @@ 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(), + " (", surface.id().string(), ") colocated vertices" ) }; const auto& surface_mesh = surface.mesh(); for( const auto& colocated_points_group : colocated_pts ) { @@ -159,13 +159,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, - " which 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(), - "]." ) ); + "]" ) ); } components_colocated_points.add_issues_to_map( surface.id(), std::move( surface_issues ) ); @@ -198,8 +197,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(), " (", + block.id().string(), ") colocated vertices" ) }; const auto& block_mesh = block.mesh(); for( const auto& colocated_points_group : colocated_pts ) { @@ -210,12 +209,12 @@ namespace &point_group_string, " ", point_index ); } block_issues.add_issue( colocated_points_group, - absl::StrCat( "Block with uuid ", block.id().string(), - " has vertices with indices", point_group_string, - " which 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(), - "]." ) ); + "]" ) ); } components_colocated_points.add_issues_to_map( block.id(), std::move( block_issues ) ); @@ -238,12 +237,12 @@ namespace geode { return colocated_points_groups.string(); } - return "No issues of colocation in model component 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 d58021a0..79ce12da 100644 --- a/src/geode/inspector/criterion/colocation/unique_vertices_colocation.cpp +++ b/src/geode/inspector/criterion/colocation/unique_vertices_colocation.cpp @@ -225,10 +225,9 @@ 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 mesh vertices on different " + "positions" ) ); } } } @@ -260,11 +259,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 3e51f74b..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 component meshes \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,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(), " (", + 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.id().string(), " small height polyhedra" ) ); + 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 821d5527..3979a29b 100644 --- a/src/geode/inspector/criterion/degeneration/edgedcurve_degeneration.cpp +++ b/src/geode/inspector/criterion/degeneration/edgedcurve_degeneration.cpp @@ -54,17 +54,16 @@ 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() } ) { 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( "degenerated edge ", edge_id, + ", at position [", + mesh_.edge_barycenter( edge_id ).string(), "]" ) ); } } return degenerated_edges_index; diff --git a/src/geode/inspector/criterion/degeneration/section_meshes_degeneration.cpp b/src/geode/inspector/criterion/degeneration/section_meshes_degeneration.cpp index e729d92b..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 component meshes \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 0450d520..189b966c 100644 --- a/src/geode/inspector/criterion/degeneration/solid_degeneration.cpp +++ b/src/geode/inspector/criterion/degeneration/solid_degeneration.cpp @@ -76,10 +76,9 @@ namespace geode if( this->mesh().polyhedron_minimum_height( polyhedron_id ) <= threshold ) { - wrong_polyhedra.add_issue( polyhedron_id, - absl::StrCat( "Polyhedron ", polyhedron_id, - " of Solid ", this->mesh().id().string(), - " is degenerated." ) ); + wrong_polyhedra.add_issue( + polyhedron_id, absl::StrCat( "degenerated polyhedra ", + 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 3b4dae67..838ff15f 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, " of Surface ", - this->mesh().id().string(), " is degenerated." ) ); + absl::StrCat( "degenerated polygons ", 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..208e00d4 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]]] .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 458cb693..8c32cadd 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(), " (", surface.id().string(), + ") polygon edges adjacency issues" ) ); const auto& mesh = surface.mesh(); for( const auto polygon_id : Range{ mesh.nb_polygons() } ) { @@ -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 22e7bc9a..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.id().string(), " small edges" ) ); + issues.set_description( absl::StrCat( "Line ", line.name(), + " (", line.id().string(), ") small edges" ) ); 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(), " (", surface.id().string(), + ") small facet edges" ) ); 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(), " (", 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 7d011fa6..b2d4c731 100644 --- a/src/geode/inspector/criterion/internal/component_meshes_manifold.cpp +++ b/src/geode/inspector/criterion/internal/component_meshes_manifold.cpp @@ -57,8 +57,9 @@ namespace geode surface.mesh() }; auto issues = inspector.non_manifold_vertices(); - issues.set_description( absl::StrCat( "Surface ", - surface.id().string(), " non manifold vertices" ) ); + 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 ) ); } @@ -77,8 +78,9 @@ namespace geode surface.mesh() }; auto issues = inspector.non_manifold_edges(); - issues.set_description( absl::StrCat( "Surface ", - surface.id().string(), " non manifold edges" ) ); + 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 12043c46..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() } ) { @@ -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( "degenerated 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/model_intersections.cpp b/src/geode/inspector/criterion/intersections/model_intersections.cpp index d8743f73..64af6b62 100644 --- a/src/geode/inspector/criterion/intersections/model_intersections.cpp +++ b/src/geode/inspector/criterion/intersections/model_intersections.cpp @@ -516,13 +516,18 @@ 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 ", - polygon_pair.first.component_id.id().string(), " and ", - polygon_pair.second.element_id, " of surface ", + absl::StrCat( "Surfaces ", surface1.name(), " (", + polygon_pair.first.component_id.id().string(), ") and ", + surface2.name(), " (", polygon_pair.second.component_id.id().string(), - " intersect each other." ) ); + ") intersect on polygons ", + polygon_pair.first.element_id, " and ", + polygon_pair.second.element_id ) ); } } @@ -534,11 +539,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 ", + absl::StrCat( "Surface ", surface.name(), " (", polygon_pair.first.component_id.id().string(), - " intersect each other." ) ); + ") has a self intersection on polygons ", + polygon_pair.first.element_id, "and ", + 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 fca895da..2f6c873d 100644 --- a/src/geode/inspector/criterion/intersections/surface_curve_intersections.cpp +++ b/src/geode/inspector/criterion/intersections/surface_curve_intersections.cpp @@ -240,13 +240,13 @@ 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." ) ); + 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 191aab3e..9757e10c 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." ) ); + 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 d8c4a6bf..47a9402a 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,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(), " (", + block.id().string(), ") non manifold vertices" ) ); 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(), " (", + block.id().string(), ") non manifold edges" ) ); 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(), " (", + block.id().string(), ") non manifold facets" ) ); components_non_manifold_facets.add_issues_to_map( block.id(), non_manifold_facets ); } @@ -194,11 +197,13 @@ 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_uuid.string(), ", " ); + absl::StrAppend( &message, + model().surface( surface_uuid ).name(), " (", + surface_uuid.string(), "), " ); } issues.add_issue( BRepNonManifoldEdge{ edge.first.vertices(), edge.second }, @@ -226,8 +231,9 @@ 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 ", - line.id().string(), " with only one edge" ); + " is not manifold: it belongs to internal Line ", + line.name(), " (", line.id().string(), + ") with only one edge" ); issues.add_issue( BRepNonManifoldEdge{ edge_unique_vertices, { line.id() } }, message ); @@ -257,8 +263,9 @@ namespace geode absl::StrAppend( &message, polygon_vertex, " " ); } absl::StrAppend( &message, - " is not manifold: it belongs to internal surface ", - surface.id().string(), " with only one facet" ); + " is not manifold: it belongs to internal Surface ", + 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/section_meshes_manifold.cpp b/src/geode/inspector/criterion/manifold/section_meshes_manifold.cpp index 0a460aab..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 component meshes \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 8d1ed6ea..2e077d3e 100644 --- a/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/solid_edge_manifold.cpp @@ -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() } ) @@ -146,10 +146,9 @@ namespace geode non_manifold_edges.add_issue( polyhedron_edge_vertices, absl::StrCat( - "Edge between vertices with index ", - polyhedron_edge_vertices[0], " and index ", - polyhedron_edge_vertices[1], - " is not manifold." ) ); + "Non manifold edge between vertices ", + polyhedron_edge_vertices[0], " and ", + polyhedron_edge_vertices[1] ) ); } } catch( const OpenGeodeException& ) @@ -159,8 +158,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..5f696ec9 100644 --- a/src/geode/inspector/criterion/manifold/solid_facet_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/solid_facet_manifold.cpp @@ -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 fef4add5..a3e04f1f 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,9 @@ 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 ", 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..524c2400 100644 --- a/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/surface_edge_manifold.cpp @@ -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,15 +106,15 @@ 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)." ) ); } 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 7ddbc08b..57def6a7 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 ", 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 c9292c66..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 elements issues in model component meshes \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 @@ -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(), " (", + 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 d0e72d95..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 elements issues in model component meshes \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 @@ -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(), " (", + 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 38f01742..ccc379ec 100644 --- a/src/geode/inspector/criterion/negative_elements/solid_negative_elements.cpp +++ b/src/geode/inspector/criterion/negative_elements/solid_negative_elements.cpp @@ -56,16 +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, - " of Solid ", mesh_.id().string(), - " has a negative volume." ) ); + 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 186c1462..12fbc21c 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, " of Surface ", - mesh_.id().string(), " has a negative area." ) ); + 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 >