Merge branch 'next' of https://github.com/Geode-solutions/OpenGeode into fix/basic-obj-degen

BotellaA · BotellaA · commit ba20e6c7148c · 2024-10-23T16:53:31.000+02:00
diff --git a/include/geode/geometry/bounding_box.hpp b/include/geode/geometry/bounding_box.hpp
@@ -57,6 +57,8 @@ namespace geode
 
         void add_point( const Point< dimension >& point );
 
+        void extends( double length );
+
         bool contains( const Point< dimension >& point ) const;
 
         [[nodiscard]] bool intersects(
diff --git a/include/geode/geometry/nn_search.hpp b/include/geode/geometry/nn_search.hpp
@@ -42,6 +42,7 @@ namespace geode
     public:
         struct ColocatedInfo
         {
+            ColocatedInfo() = default;
             [[nodiscard]] index_t nb_unique_points() const
             {
                 return unique_points.size();
@@ -52,13 +53,19 @@ namespace geode
                 return colocated_mapping.size() - nb_unique_points();
             }
 
+            std::vector< Point< dimension > > unique_points;
+            /*!
+             * This list has the size of the number of points in the tree.
+             * Each index is pointing to its old point index as given in input
+             * vector.
+             */
+            std::vector< index_t > colocated_mapping;
             /*!
              * This list has the size of the number of points in the tree.
              * Each index is pointing to its new unique point stored in the
              * unique_points vector.
              */
-            std::vector< index_t > colocated_mapping;
-            std::vector< Point< dimension > > unique_points;
+            std::vector< index_t > colocated_input_points;
         };
 
     public:
diff --git a/include/geode/mesh/builder/graph_builder.hpp b/include/geode/mesh/builder/graph_builder.hpp
@@ -89,6 +89,14 @@ namespace geode
         void set_edges_around_vertex(
             index_t vertex_id, EdgesAroundVertex edges );
 
+        /*!
+         * Replace old edge vertices from a given vertex to another.
+         * @param[in] old_vertex_id Index of the initial mesh vertex to modify
+         * @param[in] new_vertex_id Index of the target mesh vertex to set as
+         * edge vertex
+         */
+        void replace_vertex( index_t old_vertex_id, index_t new_vertex_id );
+
         /*!
          * Delete a set of edges
          * @param[in] to_delete Vector of size graph_.nb_edges(). If
diff --git a/include/geode/mesh/helpers/detail/curve_merger.hpp b/include/geode/mesh/helpers/detail/curve_merger.hpp
@@ -64,6 +64,7 @@ namespace geode
             EdgedCurveMerger( absl::Span< const std::reference_wrapper<
                                   const EdgedCurve< dimension > > > curves,
                 double epsilon );
+            EdgedCurveMerger( EdgedCurveMerger&& ) noexcept;
             ~EdgedCurveMerger();
 
             [[nodiscard]] std::unique_ptr< EdgedCurve< dimension > > merge();
diff --git a/include/geode/mesh/helpers/detail/point_set_merger.hpp b/include/geode/mesh/helpers/detail/point_set_merger.hpp
@@ -44,6 +44,7 @@ namespace geode
             PointSetMerger( absl::Span< const std::reference_wrapper<
                                 const PointSet< dimension > > > pointsets,
                 double epsilon );
+            PointSetMerger( PointSetMerger&& ) noexcept;
             ~PointSetMerger();
 
             [[nodiscard]] std::unique_ptr< PointSet< dimension > > merge();
diff --git a/include/geode/mesh/helpers/detail/solid_merger.hpp b/include/geode/mesh/helpers/detail/solid_merger.hpp
@@ -67,6 +67,7 @@ namespace geode
             SolidMeshMerger( absl::Span< const std::reference_wrapper<
                                  const SolidMesh< dimension > > > solids,
                 double epsilon );
+            SolidMeshMerger( SolidMeshMerger&& ) noexcept;
             ~SolidMeshMerger();
 
             [[nodiscard]] std::unique_ptr< SolidMesh< dimension > > merge();
diff --git a/include/geode/mesh/helpers/detail/surface_merger.hpp b/include/geode/mesh/helpers/detail/surface_merger.hpp
@@ -66,6 +66,7 @@ namespace geode
             SurfaceMeshMerger( absl::Span< const std::reference_wrapper<
                                    const SurfaceMesh< dimension > > > surfaces,
                 double epsilon );
+            SurfaceMeshMerger( SurfaceMeshMerger&& ) noexcept;
             ~SurfaceMeshMerger();
 
             [[nodiscard]] std::unique_ptr< SurfaceMesh< dimension > > merge();
diff --git a/include/geode/mesh/helpers/detail/vertex_merger.hpp b/include/geode/mesh/helpers/detail/vertex_merger.hpp
@@ -60,6 +60,7 @@ namespace geode
             VertexMerger(
                 absl::Span< const std::reference_wrapper< const Mesh > > meshes,
                 double epsilon );
+            VertexMerger( VertexMerger&& ) noexcept;
             ~VertexMerger();
 
             [[nodiscard]] absl::Span<
diff --git a/src/geode/geometry/basic_objects/tetrahedron.cpp b/src/geode/geometry/basic_objects/tetrahedron.cpp
@@ -85,30 +85,18 @@ namespace geode
     template < typename PointType >
     bool GenericTetrahedron< PointType >::is_degenerated() const
     {
-        for( const auto [vertex0, vertex1, vertex2] : tetrahedron_facet_vertex )
+        const Point3D& point0 = vertices_.at( 0 );
+        const Point3D& point1 = vertices_.at( 1 );
+        const Point3D& point2 = vertices_.at( 2 );
+        const Triangle3D triangle{ point0, point1, point2 };
+        if( triangle.is_degenerated() )
         {
-            const Point3D& point0 = vertices_.at( vertex0 );
-            const Point3D& point1 = vertices_.at( vertex1 );
-            const Point3D& point2 = vertices_.at( vertex2 );
-            const Triangle3D triangle{ point0, point1, point2 };
-            if( triangle.is_degenerated() )
-            {
-                return true;
-            }
-            for( const auto vertex3 : LRange{ 4 } )
-            {
-                if( vertex3 == vertex0 || vertex3 == vertex1
-                    || vertex3 == vertex2 )
-                {
-                    continue;
-                }
-                const Point3D& point3 = vertices_.at( vertex3 );
-                return std::get< 0 >(
-                           point_plane_distance( point3, Plane{ triangle } ) )
-                       <= GLOBAL_EPSILON;
-            }
+            return true;
         }
-        return true;
+        const Point3D& point3 = vertices_.at( 3 );
+        return std::get< 0 >(
+                   point_plane_distance( point3, Plane{ triangle } ) )
+               <= GLOBAL_EPSILON;
     }
 
     OwnerTetrahedron::OwnerTetrahedron( Point3D point0,
diff --git a/src/geode/geometry/basic_objects/triangle.cpp b/src/geode/geometry/basic_objects/triangle.cpp
@@ -273,23 +273,16 @@ namespace geode
     template < typename PointType, index_t dimension >
     bool GenericTriangle< PointType, dimension >::is_degenerated() const
     {
-        for( const auto edge_id : LRange{ 3 } )
+        const Point< dimension >& point0 = vertices_.at( 0 );
+        const Point< dimension >& point1 = vertices_.at( 1 );
+        const Segment< dimension > edge{ point0, point1 };
+        if( edge.is_degenerated() )
         {
-            const auto next_vertex = edge_id == 2 ? 0 : edge_id + 1;
-            const Point< dimension >& point0 = vertices_.at( edge_id );
-            const Point< dimension >& point1 = vertices_.at( next_vertex );
-            const Segment< dimension > edge{ point0, point1 };
-            if( edge.is_degenerated() )
-            {
-                return true;
-            }
-            const auto last_vertex = next_vertex == 2 ? 0 : next_vertex + 1;
-            const Point< dimension >& point2 = vertices_.at( last_vertex );
-            return point_line_distance(
-                       point2, InfiniteLine< dimension >{ edge } )
-                   <= GLOBAL_EPSILON;
+            return true;
         }
-        return true;
+        const Point< dimension >& point2 = vertices_.at( 2 );
+        return point_line_distance( point2, InfiniteLine< dimension >{ edge } )
+               <= GLOBAL_EPSILON;
     }
 
     template < index_t dimension >
diff --git a/src/geode/geometry/bounding_box.cpp b/src/geode/geometry/bounding_box.cpp
@@ -176,6 +176,16 @@ namespace geode
         }
     }
 
+    template < index_t dimension >
+    void BoundingBox< dimension >::extends( double length )
+    {
+        for( const auto i : LRange{ dimension } )
+        {
+            min_.set_value( i, min_.value( i ) - length );
+            max_.set_value( i, max_.value( i ) + length );
+        }
+    }
+
     template < index_t dimension >
     void BoundingBox< dimension >::add_box(
         const BoundingBox< dimension >& box )
diff --git a/src/geode/geometry/nn_search.cpp b/src/geode/geometry/nn_search.cpp
@@ -187,6 +187,7 @@ namespace geode
             "[NNSearch::colocated_index_mapping] Given epsilon too small, "
             "should be bigger than GLOBAL_EPSILON (i.e. ",
             GLOBAL_EPSILON, ")" );
+        typename NNSearch< dimension >::ColocatedInfo result;
         std::vector< index_t > mapping( nb_points() );
         absl::c_iota( mapping, 0 );
         async::parallel_for( async::irange( index_t{ 0 }, nb_points() ),
@@ -210,23 +211,25 @@ namespace geode
                 nb_unique_points++;
             }
         }
+        result.colocated_input_points = mapping;
         index_t nb_colocated{ 0 };
         index_t count{ 0 };
-        std::vector< Point< dimension > > unique_points( nb_unique_points );
+        result.unique_points.resize( nb_unique_points );
         for( const auto p : Range{ nb_points() } )
         {
             if( mapping[p] == p )
             {
                 mapping[p] -= nb_colocated;
-                unique_points[count++] = point( p );
+                result.unique_points[count++] = point( p );
             }
             else
             {
                 nb_colocated++;
                 mapping[p] = mapping[mapping[p]];
             }
         }
-        return { std::move( mapping ), std::move( unique_points ) };
+        result.colocated_mapping = mapping;
+        return result;
     }
 
     template class opengeode_geometry_api NNSearch< 2 >;
diff --git a/src/geode/mesh/builder/graph_builder.cpp b/src/geode/mesh/builder/graph_builder.cpp
@@ -205,6 +205,20 @@ namespace geode
         return delete_vertices( to_delete );
     }
 
+    void GraphBuilder::replace_vertex(
+        index_t old_vertex_id, index_t new_vertex_id )
+    {
+        if( old_vertex_id == new_vertex_id )
+        {
+            return;
+        }
+        const auto& edges_around = graph_.edges_around_vertex( old_vertex_id );
+        for( const auto& edge_around : edges_around )
+        {
+            set_edge_vertex( edge_around, new_vertex_id );
+        }
+    }
+
     void GraphBuilder::copy( const Graph& graph )
     {
         OPENGEODE_EXCEPTION(
diff --git a/src/geode/mesh/helpers/detail/curve_merger.cpp b/src/geode/mesh/helpers/detail/curve_merger.cpp
@@ -191,6 +191,10 @@ namespace geode
         {
         }
 
+        template < index_t dimension >
+        EdgedCurveMerger< dimension >::EdgedCurveMerger(
+            EdgedCurveMerger&& ) noexcept = default;
+
         template < index_t dimension >
         EdgedCurveMerger< dimension >::~EdgedCurveMerger() = default;
 
diff --git a/src/geode/mesh/helpers/detail/point_set_merger.cpp b/src/geode/mesh/helpers/detail/point_set_merger.cpp
@@ -38,6 +38,10 @@ namespace geode
         {
         }
 
+        template < index_t dimension >
+        PointSetMerger< dimension >::PointSetMerger(
+            PointSetMerger&& ) noexcept = default;
+
         template < index_t dimension >
         PointSetMerger< dimension >::~PointSetMerger() = default;
 
diff --git a/src/geode/mesh/helpers/detail/solid_merger.cpp b/src/geode/mesh/helpers/detail/solid_merger.cpp
@@ -322,6 +322,10 @@ namespace geode
         {
         }
 
+        template < index_t dimension >
+        SolidMeshMerger< dimension >::SolidMeshMerger(
+            SolidMeshMerger&& ) noexcept = default;
+
         template < index_t dimension >
         SolidMeshMerger< dimension >::~SolidMeshMerger() = default;
 
diff --git a/src/geode/mesh/helpers/detail/surface_merger.cpp b/src/geode/mesh/helpers/detail/surface_merger.cpp
@@ -304,6 +304,10 @@ namespace geode
         {
         }
 
+        template < index_t dimension >
+        SurfaceMeshMerger< dimension >::SurfaceMeshMerger(
+            SurfaceMeshMerger&& ) noexcept = default;
+
         template < index_t dimension >
         SurfaceMeshMerger< dimension >::~SurfaceMeshMerger() = default;
 
diff --git a/src/geode/mesh/helpers/detail/vertex_merger.cpp b/src/geode/mesh/helpers/detail/vertex_merger.cpp
@@ -167,6 +167,9 @@ namespace geode
         {
         }
 
+        template < typename Mesh >
+        VertexMerger< Mesh >::VertexMerger( VertexMerger&& ) noexcept = default;
+
         template < typename Mesh >
         VertexMerger< Mesh >::~VertexMerger() = default;
 
