Merge branch 'dev' of github.com:Geode-solutions/OpenGeode-Inspector into dev

Author: MelchiorSchuh

cmake/MyModuleConfig.cmake.in renamed to cmake/OpenGeode-InspectorConfig.cmake.in

@@ -24,4 +24,4 @@ include(CMakeFindDependencyMacro)
 find_dependency(OpenGeode)
 
 # Load information for each target
-include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@_mylib_target.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@_inspector_target.cmake)

include/geode/inspector/criterion/adjacency.h

@@ -35,28 +35,24 @@ namespace geode
 
 namespace geode
 {
-    namespace inspector
+    /*!
+     * Class for inspecting the degeneration of a SolidMesh
+     */
+    class opengeode_inspector_inspector_api SolidMeshDegeneration
     {
-        /*!
-         * Class for inspecting the degeneration of a SolidMesh
-         */
-        class SolidMeshDegeneration
-        {
-        public:
-            SolidMeshDegeneration();
-            ~SolidMeshDegeneration();
+        OPENGEODE_DISABLE_COPY( SolidMeshDegeneration );
 
-            bool is_mesh_degenerated( const SolidMesh3D& mesh ) const;
+    public:
+        SolidMeshDegeneration( const SolidMesh3D& mesh );
+        ~SolidMeshDegeneration();
 
-            index_t nb_degenerated_edges( const SolidMesh3D& mesh ) const;
+        bool is_mesh_degenerated() const;
 
-            const std::vector< index_t > degenerated_edges(
-                const SolidMesh3D& mesh ) const;
+        index_t nb_degenerated_edges() const;
 
-        private:
-            // SolidMeshDegeneration( SolidMeshDegeneration&& other );
+        std::vector< index_t > degenerated_edges() const;
 
-            IMPLEMENTATION_MEMBER( impl_ );
-        };
-    } // namespace inspector
+    private:
+        IMPLEMENTATION_MEMBER( impl_ );
+    };
 } // namespace geode

include/geode/inspector/criterion/borders.h

@@ -34,32 +34,26 @@ namespace geode
 
 namespace geode
 {
-    namespace inspector
+    /*!
+     * Class for inspecting the degeneration of a SurfaceMesh
+     */
+    template < index_t dimension >
+    class opengeode_inspector_inspector_api SurfaceMeshDegeneration
     {
-        /*!
-         * Class for inspecting the degeneration of a SurfaceMesh
-         */
-        template < index_t dimension >
-        class opengeode_inspector_inspector_api SurfaceMeshDegeneration
-        {
-        public:
-            SurfaceMeshDegeneration();
-            ~SurfaceMeshDegeneration();
+        OPENGEODE_DISABLE_COPY( SurfaceMeshDegeneration );
 
-            bool is_mesh_degenerated(
-                const SurfaceMesh< dimension >& mesh ) const;
+    public:
+        SurfaceMeshDegeneration( const SurfaceMesh< dimension >& mesh );
+        ~SurfaceMeshDegeneration();
 
-            index_t nb_degenerated_edges(
-                const SurfaceMesh< dimension >& mesh ) const;
+        bool is_mesh_degenerated() const;
 
-            const std::vector< index_t > degenerated_edges(
-                const SurfaceMesh< dimension >& mesh ) const;
+        index_t nb_degenerated_edges() const;
 
-        private:
-            // SurfaceMeshDegeneration( SurfaceMeshDegeneration&& other );
+        std::vector< index_t > degenerated_edges() const;
 
-            IMPLEMENTATION_MEMBER( impl_ );
-        };
-        ALIAS_2D_AND_3D( SurfaceMeshDegeneration );
-    } // namespace inspector
+    private:
+        IMPLEMENTATION_MEMBER( impl_ );
+    };
+    ALIAS_2D_AND_3D( SurfaceMeshDegeneration );
 } // namespace geode

include/geode/inspector/criterion/colocalization.h

@@ -27,5 +27,30 @@
 
 namespace geode
 {
-    bool opengeode_inspector_inspector_api hello_world();
+    namespace detail
+    {
+        /*!
+         * Implementation of the inspection of the degeneration of a Mesh
+         */
+        template < class MeshType >
+        class opengeode_inspector_inspector_api DegenerationImpl
+        {
+            OPENGEODE_DISABLE_COPY( DegenerationImpl );
+
+        public:
+            DegenerationImpl( const MeshType& mesh );
+            ~DegenerationImpl();
+
+            bool is_mesh_degenerated() const;
+
+            index_t nb_degenerated_edges() const;
+
+            std::vector< index_t > degenerated_edges() const;
+
+        private:
+            bool edge_is_degenerated( index_t edge_index ) const;
+
+            const MeshType& mesh_;
+        };
+    } // namespace detail
 } // namespace geode

include/geode/inspector/criterion/degeneration/solid_degeneration.h

@@ -25,24 +25,17 @@ add_geode_library(
         "common.cpp"
         "criterion/degeneration/surface_degeneration.cpp"
         "criterion/degeneration/solid_degeneration.cpp"
+        "criterion/detail/degeneration_impl.cpp"
     PUBLIC_HEADERS
         "common.h"
         "criterion/degeneration/surface_degeneration.h"
         "criterion/degeneration/solid_degeneration.h"
-    ADVANCED_HEADERS
-        # "mixin/core/detail/components_storage.h"
     PRIVATE_HEADERS
-        # "helpers/private/simplicial_model_creator.h"
+        "criterion/detail/degeneration_impl.h"
     PUBLIC_DEPENDENCIES
         OpenGeode::basic
+    PRIVATE_DEPENDENCIES
         OpenGeode::geometry
         OpenGeode::mesh
-        # absl::flat_hash_map
-        # Bitsery::bitsery
-        # ghcFilesystem::ghc_filesystem
-        # ${PROJECT_NAME}::geometry
-        # ${PROJECT_NAME}::mesh
-    PRIVATE_DEPENDENCIES
-        # Async++
 )