From 5e3871c2d99249bd7560faa4e1229d3b3751b0ff Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Mon, 14 Sep 2020 11:17:40 +0200
Subject: alpha_complex_persistence utils can use weighted points. Update
 Alpha_kernel_d_unit_test to work

---
 .../test/Alpha_kernel_d_unit_test.cpp              | 28 ----------------------
 .../test/Weighted_alpha_complex_unit_test.cpp      |  2 +-
 2 files changed, 1 insertion(+), 29 deletions(-)

(limited to 'src/Alpha_complex/test')

diff --git a/src/Alpha_complex/test/Alpha_kernel_d_unit_test.cpp b/src/Alpha_complex/test/Alpha_kernel_d_unit_test.cpp
index 70b65aad..192834b3 100644
--- a/src/Alpha_complex/test/Alpha_kernel_d_unit_test.cpp
+++ b/src/Alpha_complex/test/Alpha_kernel_d_unit_test.cpp
@@ -102,31 +102,3 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(Alpha_kernel_d_sphere, TestedKernel, list_of_kerne
   std::clog << "Squared radius is " << w_sq_rd << std::endl;
   GUDHI_TEST_FLOAT_EQUALITY_CHECK(cast_to_double(w_sphere.weight()), cast_to_double(w_sq_rd));
 }
-
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(Alpha_kernel_d_distance, TestedKernel, list_of_kernel_variants) {
-  using Unweighted_kernel = Gudhi::alpha_complex::Alpha_kernel_d<TestedKernel, false>;
-
-  std::vector<double> p0 {1., 0., 0., 0.};
-  std::vector<double> p1 {0., 1., 0., 0.};
-
-  using Point_d = typename Unweighted_kernel::Point_d;
-  Unweighted_kernel kernel;
-  auto dist_01 = kernel.get_squared_distance(Point_d(p0.begin(), p0.end()), Point_d(p1.begin(), p1.end()));
-  std::clog << "Distance is " << dist_01 << std::endl;
-
-  using Weighted_kernel = Gudhi::alpha_complex::Alpha_kernel_d<TestedKernel, true>;
-
-  using Weighted_point_d = typename Weighted_kernel::Weighted_point_d;
-  using Bare_point_d = typename Weighted_kernel::Bare_point_d;
-  std::vector<Weighted_point_d> w_pts;
-
-  Weighted_kernel w_kernel;
-  auto w_dist_01 = w_kernel.get_squared_distance(Weighted_point_d(Bare_point_d(p0.begin(), p0.end()), 0.),
-                                                 Weighted_point_d(Bare_point_d(p1.begin(), p1.end()), 0.));
-  std::clog << "Distance is " << w_dist_01 << std::endl;
-
-  CGAL::NT_converter<typename Weighted_kernel::FT, double> cast_to_double;
-  // The results shall be the same with weights = 0.
-  GUDHI_TEST_FLOAT_EQUALITY_CHECK(cast_to_double(dist_01), cast_to_double(w_dist_01));
-}
diff --git a/src/Alpha_complex/test/Weighted_alpha_complex_unit_test.cpp b/src/Alpha_complex/test/Weighted_alpha_complex_unit_test.cpp
index b4fc76de..57a57058 100644
--- a/src/Alpha_complex/test/Weighted_alpha_complex_unit_test.cpp
+++ b/src/Alpha_complex/test/Weighted_alpha_complex_unit_test.cpp
@@ -21,6 +21,7 @@
 #include <random>
 
 #include <gudhi/Alpha_complex.h>
+#include <gudhi/Alpha_complex_3d.h>
 #include <gudhi/Simplex_tree.h>
 #include <gudhi/Unitary_tests_utils.h>
 
@@ -32,7 +33,6 @@ typedef CGAL::Epeck_d< CGAL::Dimension_tag<4> > Exact_kernel_s;
 typedef CGAL::Epick_d< CGAL::Dynamic_dimension_tag > Inexact_kernel_d;
 // Use static dimension_tag for the user not to be able to set dimension
 typedef CGAL::Epick_d< CGAL::Dimension_tag<4> > Inexact_kernel_s;
-// The triangulation uses the default instantiation of the TriangulationDataStructure template parameter
 
 typedef boost::mpl::list<Exact_kernel_d, Exact_kernel_s, Inexact_kernel_d, Inexact_kernel_s> list_of_kernel_variants;
 
-- 
cgit v1.2.3