Merge pull request #134 from Geode-solutions/fix/missing_namespaces_and_disable_edges

fix(Inspectors): Added missing internal namespaces and disable_edges …

Author: MelchiorSchuh

bindings/python/src/inspector/criterion/degeneration/solid_degeneration.hpp

@@ -39,8 +39,10 @@ namespace geode
             .def( pybind11::init< const SolidMesh& >() )
             .def( "is_mesh_degenerated",
                 &SolidMeshDegeneration::is_mesh_degenerated )
-            .def( "degenerated_edges",
-                &SolidMeshDegeneration::degenerated_edges );
+            .def(
+                "degenerated_edges", &SolidMeshDegeneration::degenerated_edges )
+            .def( "degenerated_polyhedra",
+                &SolidMeshDegeneration::degenerated_polyhedra );
     }
     void define_solid_degeneration( pybind11::module& module )
     {

bindings/python/src/inspector/criterion/degeneration/surface_degeneration.hpp

@@ -40,7 +40,9 @@ namespace geode
             .def( "is_mesh_degenerated",
                 &SurfaceMeshDegeneration::is_mesh_degenerated )
             .def( "degenerated_edges",
-                &SurfaceMeshDegeneration::degenerated_edges );
+                &SurfaceMeshDegeneration::degenerated_edges )
+            .def( "degenerated_polygons",
+                &SurfaceMeshDegeneration::degenerated_polygons );
     }
     void define_surface_degeneration( pybind11::module& module )
     {

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

@@ -50,6 +50,7 @@ def check_non_degeneration():
     if not degeneration_inspector.degenerated_edges().nb_issues() == 0:
         raise ValueError(
             "[Test] Solid has more degenerated edges than it should.")
+    del degeneration_inspector
 
 def check_degeneration_by_colocalisation():
     solid = geode.TetrahedralSolid3D.create()
@@ -73,6 +74,7 @@ def check_degeneration_by_colocalisation():
         raise ValueError("[Test] Solid has wrong number of degenerated edges.")
     if not degeneration_inspector.degenerated_edges().issues()[0] == solid.edges().edge_from_vertices([1, 4]):
         raise ValueError("[Test] Solid has wrong degenerated edges.")
+    del degeneration_inspector
 
 
 def check_degeneration_by_point_multiple_presence():
@@ -97,6 +99,7 @@ def check_degeneration_by_point_multiple_presence():
             "[Test] Solid has the wrong number of degenerated edges.")
     if not degeneration_inspector.degenerated_edges().issues()[0] == solid.edges().edge_from_vertices([1, 1]):
         raise ValueError("[Test] Solid shows the wrong degenerated edges.")
+    del degeneration_inspector
 
 
 if __name__ == '__main__':

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

@@ -49,6 +49,7 @@ def check_non_degeneration2D():
     if not degeneration_inspector.degenerated_edges().nb_issues() == 0:
         raise ValueError(
             "[Test] Surface has more degenerated edges than it should.")
+    del degeneration_inspector
 
 def check_degeneration_by_colocalisation2D():
     surface = geode.TriangulatedSurface2D.create()
@@ -72,6 +73,7 @@ def check_degeneration_by_colocalisation2D():
     surface.enable_edges()
     if not degeneration_inspector.degenerated_edges().issues()[0] == surface.edges().edge_from_vertices([1, 3]):
         raise ValueError("[Test] Surface has wrong degenerated edges.")
+    del degeneration_inspector
 
 
 def check_degeneration_by_point_multiple_presence2D():
@@ -95,6 +97,7 @@ def check_degeneration_by_point_multiple_presence2D():
     surface.enable_edges()
     if not degeneration_inspector.degenerated_edges().issues()[0] == surface.edges().edge_from_vertices([1, 1]):
         raise ValueError("[Test] Surface shows the wrong degenerated edges.")
+    del degeneration_inspector
 
 
 def check_non_degeneration3D():
@@ -116,6 +119,7 @@ def check_non_degeneration3D():
     if not degeneration_inspector.degenerated_edges().nb_issues() == 0:
         raise ValueError(
             "[Test] (3D) Surface has more degenerated edges than it should.")
+    del degeneration_inspector
 
 def check_degeneration_by_colocalisation3D():
     surface = geode.TriangulatedSurface3D.create()
@@ -140,6 +144,7 @@ def check_degeneration_by_colocalisation3D():
     surface.enable_edges()
     if not degeneration_inspector.degenerated_edges().issues()[0] == surface.edges().edge_from_vertices([1, 3]):
         raise ValueError("[Test] (3D) Surface has wrong degenerated edges.")
+    del degeneration_inspector
 
 
 def check_degeneration_by_point_multiple_presence3D():
@@ -164,6 +169,7 @@ def check_degeneration_by_point_multiple_presence3D():
     if not degeneration_inspector.degenerated_edges().issues()[0] == surface.edges().edge_from_vertices([1, 1]):
         raise ValueError(
             "[Test] (3D) Surface shows the wrong degenerated edges.")
+    del degeneration_inspector
 
 
 if __name__ == '__main__':

include/geode/inspector/criterion/internal/component_meshes_adjacency.hpp

@@ -36,25 +36,28 @@ namespace geode
 
 namespace geode
 {
-    /*!
-     * Class for inspecting the adjacency of edges in the Component Meshes of
-     * a Model (BRep or Section).
-     */
-    template < typename Model >
-    class ComponentMeshesAdjacency
+    namespace internal
     {
-        OPENGEODE_DISABLE_COPY( ComponentMeshesAdjacency );
-
-    public:
-        void add_surfaces_edges_with_wrong_adjacencies(
-            InspectionIssuesMap< PolygonEdge >& issues_map ) const;
-
-    protected:
-        explicit ComponentMeshesAdjacency( const Model& model );
-
-        [[nodiscard]] const Model& model() const;
-
-    private:
-        const Model& model_;
-    };
+        /*!
+         * Class for inspecting the adjacency of edges in the Component Meshes
+         * of a Model (BRep or Section).
+         */
+        template < typename Model >
+        class ComponentMeshesAdjacency
+        {
+            OPENGEODE_DISABLE_COPY( ComponentMeshesAdjacency );
+
+        public:
+            void add_surfaces_edges_with_wrong_adjacencies(
+                InspectionIssuesMap< PolygonEdge >& issues_map ) const;
+
+        protected:
+            explicit ComponentMeshesAdjacency( const Model& model );
+
+            [[nodiscard]] const Model& model() const;
+
+        private:
+            const Model& model_;
+        };
+    } // namespace internal
 } // namespace geode

include/geode/inspector/criterion/internal/component_meshes_degeneration.hpp

@@ -36,28 +36,31 @@ namespace geode
 
 namespace geode
 {
-    /*!
-     * Class for inspecting the degeneration of elements in the Component Meshes
-     * of a Model (BRep or Section).
-     */
-    template < typename Model >
-    class ComponentMeshesDegeneration
+    namespace internal
     {
-        OPENGEODE_DISABLE_COPY( ComponentMeshesDegeneration );
+        /*!
+         * Class for inspecting the degeneration of elements in the Component
+         * Meshes of a Model (BRep or Section).
+         */
+        template < typename Model >
+        class ComponentMeshesDegeneration
+        {
+            OPENGEODE_DISABLE_COPY( ComponentMeshesDegeneration );
 
-    public:
-        void add_degenerated_edges(
-            InspectionIssuesMap< index_t >& issues_map ) const;
+        public:
+            void add_degenerated_edges(
+                InspectionIssuesMap< index_t >& issues_map ) const;
 
-        void add_degenerated_polygons(
-            InspectionIssuesMap< index_t >& issues_map ) const;
+            void add_degenerated_polygons(
+                InspectionIssuesMap< index_t >& issues_map ) const;
 
-    protected:
-        explicit ComponentMeshesDegeneration( const Model& model );
+        protected:
+            explicit ComponentMeshesDegeneration( const Model& model );
 
-        [[nodiscard]] const Model& model() const;
+            [[nodiscard]] const Model& model() const;
 
-    private:
-        const Model& model_;
-    };
+        private:
+            const Model& model_;
+        };
+    } // namespace internal
 } // namespace geode

include/geode/inspector/criterion/internal/component_meshes_manifold.hpp

@@ -32,28 +32,32 @@
 
 namespace geode
 {
-    /*!
-     * Class for inspecting the manifold property in the Component Meshes of
-     * a Model (BRep or Section).
-     */
-    template < typename Model >
-    class ComponentMeshesManifold
+    namespace internal
     {
-        OPENGEODE_DISABLE_COPY( ComponentMeshesManifold );
-
-    public:
-        void add_surfaces_meshes_non_manifold_vertices(
-            InspectionIssuesMap< index_t >& issues_map ) const;
-
-        void add_surfaces_meshes_non_manifold_edges(
-            InspectionIssuesMap< std::array< index_t, 2 > >& issues_map ) const;
-
-    protected:
-        explicit ComponentMeshesManifold( const Model& model );
-
-        [[nodiscard]] const Model& model() const;
-
-    private:
-        const Model& model_;
-    };
+        /*!
+         * Class for inspecting the manifold property in the Component Meshes of
+         * a Model (BRep or Section).
+         */
+        template < typename Model >
+        class ComponentMeshesManifold
+        {
+            OPENGEODE_DISABLE_COPY( ComponentMeshesManifold );
+
+        public:
+            void add_surfaces_meshes_non_manifold_vertices(
+                InspectionIssuesMap< index_t >& issues_map ) const;
+
+            void add_surfaces_meshes_non_manifold_edges(
+                InspectionIssuesMap< std::array< index_t, 2 > >& issues_map )
+                const;
+
+        protected:
+            explicit ComponentMeshesManifold( const Model& model );
+
+            [[nodiscard]] const Model& model() const;
+
+        private:
+            const Model& model_;
+        };
+    } // namespace internal
 } // namespace geode

include/geode/inspector/criterion/internal/degeneration_impl.hpp

@@ -53,6 +53,7 @@ namespace geode
 
         private:
             const Mesh& mesh_;
+            bool enabled_edges_;
         };
     } // namespace internal
 } // namespace geode

src/geode/inspector/criterion/adjacency/brep_meshes_adjacency.cpp

@@ -71,10 +71,13 @@ namespace geode
     }
 
     class BRepComponentMeshesAdjacency::Impl
-        : public ComponentMeshesAdjacency< BRep >
+        : public internal::ComponentMeshesAdjacency< BRep >
     {
     public:
-        Impl( const BRep& brep ) : ComponentMeshesAdjacency< BRep >( brep ) {}
+        Impl( const BRep& brep )
+            : internal::ComponentMeshesAdjacency< BRep >( brep )
+        {
+        }
 
         void add_blocks_facets_with_wrong_adjacencies(
             InspectionIssuesMap< PolyhedronFacet >&

src/geode/inspector/criterion/adjacency/section_meshes_adjacency.cpp

@@ -33,11 +33,11 @@
 namespace geode
 {
     class SectionComponentMeshesAdjacency::Impl
-        : public ComponentMeshesAdjacency< Section >
+        : public internal::ComponentMeshesAdjacency< Section >
     {
     public:
         Impl( const Section& section )
-            : ComponentMeshesAdjacency< Section >( section )
+            : internal::ComponentMeshesAdjacency< Section >( section )
         {
         }
     };