Merge pull request #137 from Geode-solutions/feat/degeneration_adding_function_with_tolerance

MelchiorSchuh · web-flow · commit e2fd059468ec · 2025-06-03T14:42:06.000+02:00
feat(Degeneration): adding degeneration inspection function with tolerance argument.
diff --git a/bindings/python/src/inspector/criterion/degeneration/brep_meshes_degeneration.hpp b/bindings/python/src/inspector/criterion/degeneration/brep_meshes_degeneration.hpp
@@ -47,6 +47,14 @@ namespace geode
             .def( pybind11::init< const BRep& >() )
             .def( "inspect_elements_degeneration",
                 &BRepComponentMeshesDegeneration::
-                    inspect_elements_degeneration );
+                    inspect_elements_degeneration )
+            .def( "inspect_polygons_degeneration",
+                &BRepComponentMeshesDegeneration::
+                    inspect_polygons_degeneration )
+            .def( "inspect_edges_degeneration",
+                &BRepComponentMeshesDegeneration::inspect_edges_degeneration )
+            .def( "inspect_polyhedra_degeneration",
+                &BRepComponentMeshesDegeneration::
+                    inspect_polyhedra_degeneration );
     }
 } // namespace geode
diff --git a/bindings/python/src/inspector/criterion/degeneration/edgedcurve_degeneration.hpp b/bindings/python/src/inspector/criterion/degeneration/edgedcurve_degeneration.hpp
@@ -40,7 +40,8 @@ namespace geode
             .def( "is_mesh_degenerated",
                 &EdgedCurveDegeneration::is_mesh_degenerated )
             .def( "degenerated_edges",
-                &EdgedCurveDegeneration::degenerated_edges );
+                &EdgedCurveDegeneration::degenerated_edges )
+            .def( "small_edges", &EdgedCurveDegeneration::small_edges );
     }
     void define_edged_curve_degeneration( pybind11::module& module )
     {
diff --git a/bindings/python/src/inspector/criterion/degeneration/solid_degeneration.hpp b/bindings/python/src/inspector/criterion/degeneration/solid_degeneration.hpp
@@ -41,8 +41,11 @@ namespace geode
                 &SolidMeshDegeneration::is_mesh_degenerated )
             .def(
                 "degenerated_edges", &SolidMeshDegeneration::degenerated_edges )
+            .def( "small_edges", &SolidMeshDegeneration::small_edges )
             .def( "degenerated_polyhedra",
-                &SolidMeshDegeneration::degenerated_polyhedra );
+                &SolidMeshDegeneration::degenerated_polyhedra )
+            .def( "small_height_polyhedra",
+                &SolidMeshDegeneration::small_height_polyhedra );
     }
     void define_solid_degeneration( pybind11::module& module )
     {
diff --git a/bindings/python/src/inspector/criterion/degeneration/surface_degeneration.hpp b/bindings/python/src/inspector/criterion/degeneration/surface_degeneration.hpp
@@ -41,8 +41,11 @@ namespace geode
                 &SurfaceMeshDegeneration::is_mesh_degenerated )
             .def( "degenerated_edges",
                 &SurfaceMeshDegeneration::degenerated_edges )
+            .def( "small_edges", &SurfaceMeshDegeneration::small_edges )
             .def( "degenerated_polygons",
-                &SurfaceMeshDegeneration::degenerated_polygons );
+                &SurfaceMeshDegeneration::degenerated_polygons )
+            .def( "small_height_polygons",
+                &SurfaceMeshDegeneration::small_height_polygons );
     }
     void define_surface_degeneration( pybind11::module& module )
     {
diff --git a/include/geode/inspector/criterion/degeneration/brep_meshes_degeneration.hpp b/include/geode/inspector/criterion/degeneration/brep_meshes_degeneration.hpp
@@ -74,6 +74,15 @@ namespace geode
         [[nodiscard]] BRepMeshesDegenerationInspectionResult
             inspect_elements_degeneration() const;
 
+        [[nodiscard]] BRepMeshesDegenerationInspectionResult
+            inspect_edges_degeneration( double threshold ) const;
+
+        [[nodiscard]] BRepMeshesDegenerationInspectionResult
+            inspect_polygons_degeneration( double threshold ) const;
+
+        [[nodiscard]] BRepMeshesDegenerationInspectionResult
+            inspect_polyhedra_degeneration( double threshold ) const;
+
     private:
         IMPLEMENTATION_MEMBER( impl_ );
     };
diff --git a/include/geode/inspector/criterion/degeneration/edgedcurve_degeneration.hpp b/include/geode/inspector/criterion/degeneration/edgedcurve_degeneration.hpp
@@ -52,6 +52,9 @@ namespace geode
 
         [[nodiscard]] InspectionIssues< index_t > degenerated_edges() const;
 
+        [[nodiscard]] InspectionIssues< index_t > small_edges(
+            double threshold ) const;
+
     private:
         IMPLEMENTATION_MEMBER( impl_ );
     };
diff --git a/include/geode/inspector/criterion/degeneration/solid_degeneration.hpp b/include/geode/inspector/criterion/degeneration/solid_degeneration.hpp
@@ -51,8 +51,14 @@ namespace geode
 
         [[nodiscard]] bool is_mesh_degenerated() const;
 
+        [[nodiscard]] InspectionIssues< index_t > small_edges(
+            double threshold ) const;
+
         [[nodiscard]] InspectionIssues< index_t > degenerated_edges() const;
 
+        [[nodiscard]] InspectionIssues< index_t > small_height_polyhedra(
+            double threshold ) const;
+
         [[nodiscard]] InspectionIssues< index_t > degenerated_polyhedra() const;
 
     private:
diff --git a/include/geode/inspector/criterion/degeneration/surface_degeneration.hpp b/include/geode/inspector/criterion/degeneration/surface_degeneration.hpp
@@ -51,8 +51,14 @@ namespace geode
 
         [[nodiscard]] bool is_mesh_degenerated() const;
 
+        [[nodiscard]] InspectionIssues< index_t > small_edges(
+            double threshold ) const;
+
         [[nodiscard]] InspectionIssues< index_t > degenerated_edges() const;
 
+        [[nodiscard]] InspectionIssues< index_t > small_height_polygons(
+            double threshold ) const;
+
         [[nodiscard]] InspectionIssues< index_t > degenerated_polygons() const;
 
     private:
diff --git a/include/geode/inspector/criterion/internal/component_meshes_degeneration.hpp b/include/geode/inspector/criterion/internal/component_meshes_degeneration.hpp
@@ -48,6 +48,13 @@ namespace geode
             OPENGEODE_DISABLE_COPY( ComponentMeshesDegeneration );
 
         public:
+            void add_small_edges( InspectionIssuesMap< index_t >& issues_map,
+                double threshold ) const;
+
+            void add_small_height_polygons(
+                InspectionIssuesMap< index_t >& issues_map,
+                double threshold ) const;
+
             void add_degenerated_edges(
                 InspectionIssuesMap< index_t >& issues_map ) const;
 
diff --git a/include/geode/inspector/criterion/internal/degeneration_impl.hpp b/include/geode/inspector/criterion/internal/degeneration_impl.hpp
@@ -41,9 +41,15 @@ namespace geode
 
             [[nodiscard]] virtual bool is_mesh_degenerated() const;
 
+            [[nodiscard]] InspectionIssues< index_t > small_edges(
+                double threshold ) const;
+
             [[nodiscard]] InspectionIssues< index_t > degenerated_edges() const;
 
         private:
+            [[nodiscard]] bool edge_is_smaller_than_threshold(
+                index_t edge_index, double threshold ) const;
+
             [[nodiscard]] bool edge_is_degenerated( index_t edge_index ) const;
 
         protected:
diff --git a/src/geode/inspector/criterion/degeneration/brep_meshes_degeneration.cpp b/src/geode/inspector/criterion/degeneration/brep_meshes_degeneration.cpp
@@ -76,25 +76,35 @@ namespace geode
         {
         }
 
-        void add_solid_degenerations(
-            InspectionIssuesMap< index_t >& degenerated_edges_map,
-            InspectionIssuesMap< index_t >& degenerated_polyhedra_map ) const
+        void add_solid_small_elements(
+            InspectionIssuesMap< index_t >& small_edges_map,
+            InspectionIssuesMap< index_t >& small_polyhedra_map,
+            double threshold ) const
         {
             for( const auto& block : model().blocks() )
             {
                 const geode::SolidMeshDegeneration3D inspector{ block.mesh() };
-                auto degenerated_edges = inspector.degenerated_edges();
-                degenerated_edges.set_description( absl::StrCat(
-                    "Block ", block.id().string(), " degenerated edges" ) );
-                degenerated_edges_map.add_issues_to_map(
-                    block.id(), std::move( degenerated_edges ) );
-                auto degenerated_polyhedra = inspector.degenerated_polyhedra();
-                degenerated_polyhedra.set_description( absl::StrCat(
-                    "Block ", block.id().string(), " degenerated polyhedra" ) );
-                degenerated_polyhedra_map.add_issues_to_map(
-                    block.id(), std::move( degenerated_polyhedra ) );
+                auto small_edges = inspector.small_edges( threshold );
+                small_edges.set_description( absl::StrCat(
+                    "Block ", block.id().string(), " small edges" ) );
+                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_map.add_issues_to_map(
+                    block.id(), std::move( small_polyhedra ) );
             }
         }
+
+        void add_solid_degenerations(
+            InspectionIssuesMap< index_t >& degenerated_edges_map,
+            InspectionIssuesMap< index_t >& degenerated_polyhedra_map ) const
+        {
+            add_solid_small_elements( degenerated_edges_map,
+                degenerated_polyhedra_map, GLOBAL_EPSILON );
+        }
     };
 
     BRepComponentMeshesDegeneration::BRepComponentMeshesDegeneration(
@@ -116,4 +126,34 @@ namespace geode
             result.degenerated_edges, result.degenerated_polyhedra );
         return result;
     }
+
+    BRepMeshesDegenerationInspectionResult
+        BRepComponentMeshesDegeneration::inspect_edges_degeneration(
+            double threshold ) const
+    {
+        BRepMeshesDegenerationInspectionResult result;
+        impl_->add_small_edges( result.degenerated_edges, threshold );
+        return result;
+    }
+
+    BRepMeshesDegenerationInspectionResult
+        BRepComponentMeshesDegeneration::inspect_polygons_degeneration(
+            double threshold ) const
+    {
+        BRepMeshesDegenerationInspectionResult result;
+        impl_->add_small_height_polygons(
+            result.degenerated_polygons, threshold );
+        return result;
+    }
+
+    BRepMeshesDegenerationInspectionResult
+        BRepComponentMeshesDegeneration::inspect_polyhedra_degeneration(
+            double threshold ) const
+    {
+        BRepMeshesDegenerationInspectionResult result;
+        impl_->add_solid_small_elements(
+            result.degenerated_edges, result.degenerated_polyhedra, threshold );
+        return result;
+    }
+
 } // namespace geode
diff --git a/src/geode/inspector/criterion/degeneration/edgedcurve_degeneration.cpp b/src/geode/inspector/criterion/degeneration/edgedcurve_degeneration.cpp
@@ -51,14 +51,14 @@ namespace geode
             return false;
         }
 
-        InspectionIssues< index_t > degenerated_edges() const
+        InspectionIssues< index_t > small_edges( double threshold ) const
         {
             InspectionIssues< index_t > degenerated_edges_index{
                 "Degenerated Edges of EdgeCurve " + mesh_.id().string() + "."
             };
             for( const auto edge_id : Range{ mesh_.nb_edges() } )
             {
-                if( mesh_.is_edge_degenerated( edge_id ) )
+                if( mesh_.edge_length( edge_id ) <= threshold )
                 {
                     degenerated_edges_index.add_issue(
                         edge_id, absl::StrCat( "Edge with index ", edge_id,
@@ -70,6 +70,11 @@ namespace geode
             return degenerated_edges_index;
         }
 
+        InspectionIssues< index_t > degenerated_edges() const
+        {
+            return small_edges( GLOBAL_EPSILON );
+        }
+
     private:
         const EdgedCurve< dimension >& mesh_;
     };
@@ -90,6 +95,14 @@ namespace geode
         return impl_->is_mesh_degenerated();
     }
 
+    template < index_t dimension >
+    InspectionIssues< index_t >
+        EdgedCurveDegeneration< dimension >::small_edges(
+            double threshold ) const
+    {
+        return impl_->small_edges( threshold );
+    }
+
     template < index_t dimension >
     InspectionIssues< index_t >
         EdgedCurveDegeneration< dimension >::degenerated_edges() const
diff --git a/src/geode/inspector/criterion/degeneration/solid_degeneration.cpp b/src/geode/inspector/criterion/degeneration/solid_degeneration.cpp
@@ -64,15 +64,17 @@ namespace geode
             return false;
         }
 
-        InspectionIssues< index_t > degenerated_polyhedra() const
+        InspectionIssues< index_t > small_height_polyhedra(
+            double threshold ) const
         {
             InspectionIssues< index_t > wrong_polyhedra{
                 "Degenerated Polyhedra."
             };
             for( const auto polyhedron_id :
                 Range{ this->mesh().nb_polyhedra() } )
             {
-                if( this->mesh().is_polyhedron_degenerated( polyhedron_id ) )
+                if( this->mesh().polyhedron_minimum_height( polyhedron_id )
+                    <= threshold )
                 {
                     wrong_polyhedra.add_issue( polyhedron_id,
                         absl::StrCat( "Polyhedron ", polyhedron_id,
@@ -82,6 +84,11 @@ namespace geode
             }
             return wrong_polyhedra;
         }
+
+        InspectionIssues< index_t > degenerated_polyhedra() const
+        {
+            return small_height_polyhedra( GLOBAL_EPSILON );
+        }
     };
 
     template < index_t dimension >
@@ -100,13 +107,28 @@ namespace geode
         return impl_->is_mesh_degenerated();
     }
 
+    template < index_t dimension >
+    InspectionIssues< index_t > SolidMeshDegeneration< dimension >::small_edges(
+        double threshold ) const
+    {
+        return impl_->small_edges( threshold );
+    }
+
     template < index_t dimension >
     InspectionIssues< index_t >
         SolidMeshDegeneration< dimension >::degenerated_edges() const
     {
         return impl_->degenerated_edges();
     }
 
+    template < index_t dimension >
+    InspectionIssues< index_t >
+        SolidMeshDegeneration< dimension >::small_height_polyhedra(
+            double threshold ) const
+    {
+        return impl_->small_height_polyhedra( threshold );
+    }
+
     template < index_t dimension >
     InspectionIssues< index_t >
         SolidMeshDegeneration< dimension >::degenerated_polyhedra() const
diff --git a/src/geode/inspector/criterion/degeneration/surface_degeneration.cpp b/src/geode/inspector/criterion/degeneration/surface_degeneration.cpp
@@ -63,14 +63,16 @@ namespace geode
             return false;
         }
 
-        InspectionIssues< index_t > degenerated_polygons() const
+        InspectionIssues< index_t > small_height_polygons(
+            double threshold ) const
         {
             InspectionIssues< index_t > wrong_polygons{
                 "Degenerated Polygons."
             };
             for( const auto polygon_id : Range{ this->mesh().nb_polygons() } )
             {
-                if( this->mesh().is_polygon_degenerated( polygon_id ) )
+                if( this->mesh().polygon_minimum_height( polygon_id )
+                    <= threshold )
                 {
                     wrong_polygons.add_issue( polygon_id,
                         absl::StrCat( "Polygon ", polygon_id, " of Surface ",
@@ -79,6 +81,11 @@ namespace geode
             }
             return wrong_polygons;
         }
+
+        InspectionIssues< index_t > degenerated_polygons() const
+        {
+            return small_height_polygons( GLOBAL_EPSILON );
+        }
     };
 
     template < index_t dimension >
@@ -97,6 +104,14 @@ namespace geode
         return impl_->is_mesh_degenerated();
     }
 
+    template < index_t dimension >
+    InspectionIssues< index_t >
+        SurfaceMeshDegeneration< dimension >::small_edges(
+            double threshold ) const
+    {
+        return impl_->small_edges( threshold );
+    }
+
     template < index_t dimension >
     InspectionIssues< index_t >
         SurfaceMeshDegeneration< dimension >::degenerated_edges() const
@@ -111,6 +126,14 @@ namespace geode
         return impl_->degenerated_polygons();
     }
 
+    template < index_t dimension >
+    InspectionIssues< index_t >
+        SurfaceMeshDegeneration< dimension >::small_height_polygons(
+            double threshold ) const
+    {
+        return impl_->small_height_polygons( threshold );
+    }
+
     template class opengeode_inspector_inspector_api
         SurfaceMeshDegeneration< 2 >;
     template class opengeode_inspector_inspector_api
diff --git a/src/geode/inspector/criterion/internal/component_meshes_degeneration.cpp b/src/geode/inspector/criterion/internal/component_meshes_degeneration.cpp
diff --git a/src/geode/inspector/criterion/internal/degeneration_impl.cpp b/src/geode/inspector/criterion/internal/degeneration_impl.cpp

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,8 @@ namespace geode`
`40`	`40`	`.def( "is_mesh_degenerated",`
`41`	`41`	`&EdgedCurveDegeneration::is_mesh_degenerated )`
`42`	`42`	`.def( "degenerated_edges",`
`43`		`- &EdgedCurveDegeneration::degenerated_edges );`
	`43`	`+ &EdgedCurveDegeneration::degenerated_edges )`
	`44`	`+ .def( "small_edges", &EdgedCurveDegeneration::small_edges );`
`44`	`45`	`}`
`45`	`46`	`void define_edged_curve_degeneration( pybind11::module& module )`
`46`	`47`	`{`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,11 @@ namespace geode`
`41`	`41`	`&SolidMeshDegeneration::is_mesh_degenerated )`
`42`	`42`	`.def(`
`43`	`43`	`"degenerated_edges", &SolidMeshDegeneration::degenerated_edges )`
	`44`	`+ .def( "small_edges", &SolidMeshDegeneration::small_edges )`
`44`	`45`	`.def( "degenerated_polyhedra",`
`45`		`- &SolidMeshDegeneration::degenerated_polyhedra );`
	`46`	`+ &SolidMeshDegeneration::degenerated_polyhedra )`
	`47`	`+ .def( "small_height_polyhedra",`
	`48`	`+ &SolidMeshDegeneration::small_height_polyhedra );`
`46`	`49`	`}`
`47`	`50`	`void define_solid_degeneration( pybind11::module& module )`
`48`	`51`	`{`