diff options
| author | glisse <glisse@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-03-29 13:42:53 +0000 |
|---|---|---|
| committer | glisse <glisse@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-03-29 13:42:53 +0000 |
| commit | 133a4a2d3056f244df93bd06918441fe39a7c861 (patch) | |
| tree | 2c33ae1710925fda672ebace644fdf28554a2550 /src/Bottleneck_distance/include/gudhi | |
| parent | 439fc9387d7a14f486173c7e7b7ff76c4d8cf2c1 (diff) | |
Declare the Kd_tree directly.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bottleneck-glisse@2282 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: c017cc9368a167fe99b5004636bcbe8734266d3a
Diffstat (limited to 'src/Bottleneck_distance/include/gudhi')
| -rw-r--r-- | src/Bottleneck_distance/include/gudhi/Neighbors_finder.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/Bottleneck_distance/include/gudhi/Neighbors_finder.h b/src/Bottleneck_distance/include/gudhi/Neighbors_finder.h index 4159bcb1..8553494d 100644 --- a/src/Bottleneck_distance/include/gudhi/Neighbors_finder.h +++ b/src/Bottleneck_distance/include/gudhi/Neighbors_finder.h @@ -25,9 +25,6 @@ // Inclusion order is important for CGAL patch #include <CGAL/Kd_tree.h> -#include <CGAL/Kd_tree_node.h> -#include <CGAL/Orthogonal_k_neighbor_search.h> -#include <CGAL/Weighted_Minkowski_distance.h> #include <CGAL/Search_traits.h> #include <gudhi/Persistence_graph.h> @@ -78,9 +75,7 @@ struct Square_query { class Neighbors_finder { typedef CGAL::Dimension_tag<2> D; typedef CGAL::Search_traits<double, Internal_point, const double*, Construct_coord_iterator, D> Traits; - typedef CGAL::Weighted_Minkowski_distance<Traits> Distance; - typedef CGAL::Orthogonal_k_neighbor_search<Traits, Distance> K_neighbor_search; - typedef K_neighbor_search::Tree Kd_tree; + typedef CGAL::Kd_tree<Traits> Kd_tree; public: /** \internal \brief Constructor taking the near distance definition as parameter. */ |