summaryrefslogtreecommitdiff
path: root/src/Alpha_complex
diff options
context:
space:
mode:
authorglisse <glisse@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2018-03-29 15:17:42 +0000
committerglisse <glisse@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2018-03-29 15:17:42 +0000
commit91448f9ae1c13c74441f521a25d29375bc4643ee (patch)
treee8289e298dd1f21101a3a73cea8c0a07e8829c60 /src/Alpha_complex
parent9cceba4f1ed5cca6daa273166a2ec38fe0ab6c91 (diff)
Use CGAL::NT_converter to convert filtration values.
Alpha_complex may produce something different from what the Simplex_tree expects, convert it explicitly. git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@3317 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: d6c7492bbf48401a9f63f6462c7704e380eff6e1
Diffstat (limited to 'src/Alpha_complex')
-rw-r--r--src/Alpha_complex/include/gudhi/Alpha_complex.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Alpha_complex/include/gudhi/Alpha_complex.h b/src/Alpha_complex/include/gudhi/Alpha_complex.h
index 63c6675c..91305032 100644
--- a/src/Alpha_complex/include/gudhi/Alpha_complex.h
+++ b/src/Alpha_complex/include/gudhi/Alpha_complex.h
@@ -34,6 +34,7 @@
#include <CGAL/Epick_d.h>
#include <CGAL/Spatial_sort_traits_adapter_d.h>
#include <CGAL/property_map.h> // for CGAL::Identity_property_map
+#include <CGAL/NT_converter.h>
#include <iostream>
#include <vector>
@@ -323,8 +324,9 @@ class Alpha_complex {
if (f_simplex_dim > 0) {
// squared_radius function initialization
Squared_Radius squared_radius = kernel_.compute_squared_radius_d_object();
+ CGAL::NT_converter<typename Geom_traits::FT, Filtration_value> cv;
- alpha_complex_filtration = squared_radius(pointVector.begin(), pointVector.end());
+ alpha_complex_filtration = cv(squared_radius(pointVector.begin(), pointVector.end()));
}
complex.assign_filtration(f_simplex, alpha_complex_filtration);
#ifdef DEBUG_TRACES