diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-04-03 21:20:42 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-04-03 21:20:42 +0000 |
| commit | 1e55ed3f7ce467f598c66e18e6a7337476961588 (patch) | |
| tree | 28abf10fee50e222c821eecde93878571a577198 /src/Alpha_complex/include/gudhi/Alpha_complex.h | |
| parent | 9a60bbaf5b0895ccc24a545aafe5190b2d108126 (diff) | |
| parent | c06596e61c92f54a01756e1ba1babaff800f0f02 (diff) | |
Merge last trunk modifications
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/sparserips-glisse@3335 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 41b78dbadb13e3eca889479c1112814b2b58f679
Diffstat (limited to 'src/Alpha_complex/include/gudhi/Alpha_complex.h')
| -rw-r--r-- | src/Alpha_complex/include/gudhi/Alpha_complex.h | 4 |
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 |