diff options
| author | Gard Spreemann <gspreemann@gmail.com> | 2018-06-15 12:42:55 +0200 |
|---|---|---|
| committer | Gard Spreemann <gspreemann@gmail.com> | 2018-06-15 12:42:55 +0200 |
| commit | c31bac6af57af917b8f799d0c21eb6af34ee1f6e (patch) | |
| tree | 5a9603a4ec016f1aa09c7da52510790680c790c3 /include/gudhi/Alpha_complex.h | |
| parent | 02de1136cf9850803cb1e1ac1141f11b50be2992 (diff) | |
| parent | 41482b4260b4aff3d6803e340d5c94fbefb9af67 (diff) | |
Merge branch 'dfsg/latest' into debian/sid
Diffstat (limited to 'include/gudhi/Alpha_complex.h')
| -rw-r--r-- | include/gudhi/Alpha_complex.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/gudhi/Alpha_complex.h b/include/gudhi/Alpha_complex.h index 63c6675c..4c07eddb 100644 --- a/include/gudhi/Alpha_complex.h +++ b/include/gudhi/Alpha_complex.h @@ -4,7 +4,7 @@ * * Author(s): Vincent Rouvreau * - * Copyright (C) 2015 INRIA + * Copyright (C) 2015 Inria * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -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 |