Fix compilation error and test with 0. weights

3 files changed, 14 insertions, 15 deletions

diff --git a/src/Alpha_complex/example/CMakeLists.txt b/src/Alpha_complex/example/CMakeLists.txt
index 08eb979e..17dc896c 100644
--- a/src/Alpha_complex/example/CMakeLists.txt
+++ b/src/Alpha_complex/example/CMakeLists.txt
@@ -28,6 +28,8 @@ if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.11.0)
   add_test(NAME Alpha_complex_example_fast_from_off_32 COMMAND $<TARGET_FILE:Alpha_complex_example_fast_from_off>
       "${CMAKE_SOURCE_DIR}/data/points/alphacomplexdoc.off" "32.0" "${CMAKE_CURRENT_BINARY_DIR}/fastalphaoffreader_result_32.txt")
 
+  add_test(NAME Weighted_alpha_complex_example_from_points COMMAND $<TARGET_FILE:Weighted_alpha_complex_example_from_points>)
+
   if (DIFF_PATH)
     # Do not forget to copy test results files in current binary dir
     file(COPY "alphaoffreader_for_doc_32.txt" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
@@ -47,7 +49,7 @@ if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.11.0)
         ${CMAKE_CURRENT_BINARY_DIR}/fastalphaoffreader_result_32.txt ${CMAKE_CURRENT_BINARY_DIR}/alphaoffreader_for_doc_32.txt)
     set_tests_properties(Alpha_complex_example_fast_from_off_32_diff_files PROPERTIES DEPENDS Alpha_complex_example_fast_from_off_32) 
   endif()
- endif(NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.11.0)
+endif(NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.11.0)
 
 if (NOT CGAL_VERSION VERSION_LESS 4.11.0)
   add_executable ( Alpha_complex_example_weighted_3d_from_points Weighted_alpha_complex_3d_from_points.cpp )
diff --git a/src/Alpha_complex/example/Weighted_alpha_complex_from_points.cpp b/src/Alpha_complex/example/Weighted_alpha_complex_from_points.cpp
index 19a04282..05858084 100644
--- a/src/Alpha_complex/example/Weighted_alpha_complex_from_points.cpp
+++ b/src/Alpha_complex/example/Weighted_alpha_complex_from_points.cpp
@@ -18,13 +18,13 @@ int main() {
   // Init of a list of points
   // ----------------------------------------------------------------------------
   Vector_of_points points;
-  points.push_back(Weighted_point(Bare_point(1.0, 1.0) , 1.));
-  points.push_back(Weighted_point(Bare_point(7.0, 0.0) , 1.));
-  points.push_back(Weighted_point(Bare_point(4.0, 6.0) , 1.));
-  points.push_back(Weighted_point(Bare_point(9.0, 6.0) , 1.));
-  points.push_back(Weighted_point(Bare_point(0.0, 14.0), 1.));
-  points.push_back(Weighted_point(Bare_point(2.0, 19.0), 1.));
-  points.push_back(Weighted_point(Bare_point(9.0, 17.0), 1.));
+  points.push_back(Weighted_point(Bare_point(1.0, 1.0) , 0.));
+  points.push_back(Weighted_point(Bare_point(7.0, 0.0) , 0.));
+  points.push_back(Weighted_point(Bare_point(4.0, 6.0) , 0.));
+  points.push_back(Weighted_point(Bare_point(9.0, 6.0) , 0.));
+  points.push_back(Weighted_point(Bare_point(0.0, 14.0), 0.));
+  points.push_back(Weighted_point(Bare_point(2.0, 19.0), 0.));
+  points.push_back(Weighted_point(Bare_point(9.0, 17.0), 0.));
 
   // ----------------------------------------------------------------------------
   // Init of an alpha complex from the list of points
diff --git a/src/Alpha_complex/include/gudhi/Alpha_complex/Alpha_kernel_d.h b/src/Alpha_complex/include/gudhi/Alpha_complex/Alpha_kernel_d.h
index 87604ec4..a3e3845a 100644
--- a/src/Alpha_complex/include/gudhi/Alpha_complex/Alpha_kernel_d.h
+++ b/src/Alpha_complex/include/gudhi/Alpha_complex/Alpha_kernel_d.h
@@ -71,8 +71,7 @@ class Alpha_kernel_d<Kernel, false> {
     return sph.second;
   }
 
-  template<class Point>
-  Point get_circumcenter(const Sphere& sph) const {
+  auto get_circumcenter(const Sphere& sph) const {
     return sph.first;
   }
 
@@ -117,13 +116,11 @@ class Alpha_kernel_d<Kernel, true> {
     return sph.weight();
   }
 
-  template<class Point>
-  Point get_circumcenter(const Sphere& sph) const {
-    return sph.point();
+  auto get_circumcenter(const Sphere& sph) const {
+    return sph;
   }
 
-  template<class Point>
-  FT get_squared_distance(const Point& first, const Point& second) const {
+  FT get_squared_distance(const Weighted_point_d& first, const Weighted_point_d& second) const {
     return kernel_.power_distance_d_object()(first, second);
   }
 };