Merge branch 'next' into feat/add-inspection-before-remesh-to-ensure-model-validity

Author: BenPinet

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/bin/CMakeLists.txt

@@ -62,6 +62,38 @@ add_geode_binary(
         ${PROJECT_NAME}::inspector
 )
 
+add_geode_binary(
+    SOURCE "geode-inspector-implicit-cross-section.cpp"
+    DEPENDENCIES
+        Async++
+        absl::flags
+        absl::flags_parse
+        absl::flags_usage
+        OpenGeode::basic
+        OpenGeode::geometry
+        OpenGeode::mesh
+        OpenGeode::model
+        OpenGeode-Geosciences::implicit
+        OpenGeode-GeosciencesIO::model
+        ${PROJECT_NAME}::inspector
+)
+
+add_geode_binary(
+    SOURCE "geode-inspector-implicit-structural-model.cpp"
+    DEPENDENCIES
+        Async++
+        absl::flags
+        absl::flags_parse
+        absl::flags_usage
+        OpenGeode::basic
+        OpenGeode::geometry
+        OpenGeode::mesh
+        OpenGeode::model
+        OpenGeode-Geosciences::implicit
+        OpenGeode-GeosciencesIO::model
+        ${PROJECT_NAME}::inspector
+)
+
 add_geode_binary(
     SOURCE "geode-inspector-pointset.cpp"
     DEPENDENCIES

src/bin/geode-inspector-implicit-cross-section.cpp

@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2019 - 2025 Geode-solutions
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#include <absl/flags/flag.h>
+#include <absl/flags/parse.h>
+#include <absl/flags/usage.h>
+
+#include <async++.h>
+
+#include <geode/basic/assert.hpp>
+#include <geode/basic/filename.hpp>
+#include <geode/basic/logger.hpp>
+
+#include <geode/geosciences/implicit/representation/core/implicit_cross_section.hpp>
+#include <geode/geosciences/implicit/representation/io/implicit_cross_section_input.hpp>
+
+#include <geode/geosciences_io/model/common.hpp>
+
+#include <geode/inspector/section_inspector.hpp>
+
+ABSL_FLAG( std::string, input, "/path/my/model.og_ixsctn", "Input model" );
+
+void inspect_implicit_cross_section(
+    const geode::ImplicitCrossSection& cross_section )
+{
+    const geode::SectionInspector cross_section_inspector{ cross_section };
+    auto result = cross_section_inspector.inspect_section();
+
+    geode::Logger::info( result.string() );
+}
+
+int main( int argc, char* argv[] )
+{
+    try
+    {
+        absl::SetProgramUsageMessage( absl::StrCat(
+            "ImplicitCrossSection inspector from Geode-solutions.\n",
+            "Sample usage:\n", argv[0], " --input my_cross_section.og_ixsctn\n",
+            "Default behavior tests all available criteria, to disable one "
+            "use --noXXX, e.g. --nocomponent_linking" ) );
+        absl::ParseCommandLine( argc, argv );
+
+        geode::GeosciencesIOModelLibrary::initialize();
+        const auto filename = absl::GetFlag( FLAGS_input );
+
+        inspect_implicit_cross_section(
+            geode::load_implicit_cross_section( filename ) );
+
+        return 0;
+    }
+    catch( ... )
+    {
+        return geode::geode_lippincott();
+    }
+}