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

Author: MelchiorSchuh

.github/workflows/CD.yml

@@ -36,7 +36,7 @@ jobs:
     - name: Upload
       uses: softprops/action-gh-release@v1
       with:
-        files: "build/OpenGeode-inspector-${{ steps.package.outputs.version }}-${{ matrix.config.system }}.tar.gz"
+        files: "build/OpenGeode-Inspector-${{ steps.package.outputs.version }}-${{ matrix.config.system }}.tar.gz"
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     - name: Doc
@@ -69,7 +69,7 @@ jobs:
     - name: Upload
       uses: softprops/action-gh-release@v1
       with:
-        files: "build/OpenGeode-inspector-${{ steps.package.outputs.version }}-darwin.tar.gz"
+        files: "build/OpenGeode-Inspector-${{ steps.package.outputs.version }}-darwin.tar.gz"
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -98,6 +98,6 @@ jobs:
     - name: Upload
       uses: softprops/action-gh-release@v1
       with:
-        files: "build/OpenGeode-inspector-${{ steps.package.outputs.version }}-win64.zip"
+        files: "build/OpenGeode-Inspector-${{ steps.package.outputs.version }}-win64.zip"
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}        

include/geode/inspector/criterion/colocalization.h

@@ -23,9 +23,36 @@
 
 #pragma once
 
+#include <geode/basic/pimpl.h>
+
 #include <geode/inspector/common.h>
 
 namespace geode
 {
-    bool opengeode_inspector_inspector_api hello_world();
+    FORWARD_DECLARATION_DIMENSION_CLASS( SolidMesh );
 } // namespace geode
+
+namespace geode
+{
+    /*!
+     * Class for inspecting the colocalization of points in a mesh
+     */
+    template < index_t dimension >
+    class opengeode_inspector_inspector_api SolidMeshColocalization
+    {
+    public:
+        SolidMeshColocalization( const SolidMesh< dimension >& mesh );
+        ~SolidMeshColocalization();
+
+        bool mesh_has_colocalized_points() const;
+
+        index_t nb_colocalized_points() const;
+
+        const std::vector< std::vector< index_t > >
+            colocalized_points_groups() const;
+
+    private:
+        IMPLEMENTATION_MEMBER( impl_ );
+    };
+    ALIAS_2D_AND_3D( SolidMeshColocalization );
+} // namespace geode

include/geode/inspector/criterion/borders.h renamed to include/geode/inspector/criterion/colocalization/solid_colocalization.h

@@ -23,9 +23,36 @@
 
 #pragma once
 
+#include <geode/basic/pimpl.h>
+
 #include <geode/inspector/common.h>
 
 namespace geode
 {
-    bool opengeode_inspector_inspector_api hello_world();
+    FORWARD_DECLARATION_DIMENSION_CLASS( SurfaceMesh );
 } // namespace geode
+
+namespace geode
+{
+    /*!
+     * Class for inspecting the colocalization of points in a mesh
+     */
+    template < index_t dimension >
+    class opengeode_inspector_inspector_api SurfaceMeshColocalization
+    {
+    public:
+        SurfaceMeshColocalization( const SurfaceMesh< dimension >& mesh );
+        ~SurfaceMeshColocalization();
+
+        bool mesh_has_colocalized_points() const;
+
+        index_t nb_colocalized_points() const;
+
+        const std::vector< std::vector< index_t > >
+            colocalized_points_groups() const;
+
+    private:
+        IMPLEMENTATION_MEMBER( impl_ );
+    };
+    ALIAS_2D_AND_3D( SurfaceMeshColocalization );
+} // namespace geode

include/geode/inspector/criterion/non_variety.h renamed to include/geode/inspector/criterion/colocalization/surface_colocalization.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 opengeode_inspector_inspector_api 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/degeneration/solid_degeneration.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/degeneration/surface_degeneration.h

@@ -27,5 +27,32 @@
 
 namespace geode
 {
-    bool opengeode_inspector_inspector_api hello_world();
+    namespace detail
+    {
+        /*!
+         * Implementation of the inspection of the colocalization of a Mesh
+         */
+        template < class MeshType >
+        class opengeode_inspector_inspector_api ColocalizationImpl
+        {
+            OPENGEODE_DISABLE_COPY( ColocalizationImpl );
+
+        public:
+            ColocalizationImpl( const MeshType& mesh );
+            ~ColocalizationImpl();
+
+            bool mesh_has_colocalized_points() const;
+
+            index_t nb_colocalized_points() const;
+
+            std::vector< std::vector< index_t > >
+                colocalized_points_groups() const;
+
+        private:
+            bool points_are_colocalized(
+                index_t pt_index_1, index_t pt_index_2 ) const;
+
+            const MeshType& mesh_;
+        };
+    } // namespace detail
 } // namespace geode

include/geode/inspector/criterion/connex_components.h renamed to include/geode/inspector/criterion/detail/colocalization_impl.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/adjacency.h renamed to include/geode/inspector/criterion/detail/degeneration_impl.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++
 )