fix

Author: benoit2776

bindings/python/tests/geometry/test-py-nnsearch.py

@@ -22,16 +22,23 @@
 import os
 import sys
 import platform
+
 if sys.version_info >= (3, 8, 0) and platform.system() == "Windows":
-    for path in [x.strip() for x in os.environ['PATH'].split(';') if x]:
+    for path in [x.strip() for x in os.environ["PATH"].split(";") if x]:
         os.add_dll_directory(path)
 
 import opengeode_py_basic as basic
 import opengeode_py_geometry as geom
 
-if __name__ == '__main__':
-    search = geom.NNSearch2D([geom.Point2D([0.1, 4.2]), geom.Point2D(
-        [5.9, 7.3]), geom.Point2D([1.8, -5]), geom.Point2D([-7.3, -1.6])])
+if __name__ == "__main__":
+    search = geom.NNSearch2D(
+        [
+            geom.Point2D([0.1, 4.2]),
+            geom.Point2D([5.9, 7.3]),
+            geom.Point2D([1.8, -5]),
+            geom.Point2D([-7.3, -1.6]),
+        ]
+    )
 
     if search.closest_neighbor(geom.Point2D([0, 0])) != 0:
         raise ValueError("[Test] Error in closest neighbor")
@@ -52,6 +59,6 @@
     p3 = geom.Point3D([3.1, 9.4, 9.7])
     colocator = geom.NNSearch3D([p0, p0, p1, p0, p2, p1, p3])
 
-    colocated_info = colocator.colocated_index_mapping(basic.GLOBAL_EPSILON)
+    colocated_info = colocator.radius_colocated_index_mapping(basic.GLOBAL_EPSILON)
     if colocated_info.nb_colocated_points() != 3:
         raise ValueError("[Test] Should be 3 colocated points")

include/geode/mesh/helpers/detail/solid_merger.hpp

@@ -73,7 +73,7 @@ namespace geode
             ~SolidMeshMerger();
 
             [[nodiscard]] std::unique_ptr< SolidMesh< dimension > > merge(
-                double epsilon );
+                const double epsilon );
 
             [[nodiscard]] std::unique_ptr< SolidMesh< dimension > > merge(
                 const Frame< dimension >& epsilons_frame,

src/geode/mesh/helpers/detail/solid_merger.cpp

@@ -85,7 +85,7 @@ namespace geode
             }
 
             std::unique_ptr< SolidMesh< dimension > > merge(
-                SolidMeshMerger< dimension >& merger, double epsilon )
+                SolidMeshMerger< dimension >& merger, const double epsilon )
             {
                 merger.create_points( epsilon );
                 create_polyhedra( merger );
@@ -343,7 +343,7 @@ namespace geode
 
         template < index_t dimension >
         std::unique_ptr< SolidMesh< dimension > >
-            SolidMeshMerger< dimension >::merge( double epsilon )
+            SolidMeshMerger< dimension >::merge( const double epsilon )
         {
             return impl_->merge( *this, epsilon );
         }