From b7f3439fefcf1c4a1c28ca47652d7e4844f1abf2 Mon Sep 17 00:00:00 2001 From: cjamin Date: Tue, 4 Oct 2016 13:32:02 +0000 Subject: Kernel => Search_traits git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/subsampling_and_spatialsearching@1622 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 72ecfe733a43c52ab82e3377e22fe47655b77b1f --- src/Spatial_searching/include/gudhi/Kd_tree_search.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Spatial_searching/include/gudhi/Kd_tree_search.h b/src/Spatial_searching/include/gudhi/Kd_tree_search.h index 314342b6..76b99d94 100644 --- a/src/Spatial_searching/include/gudhi/Kd_tree_search.h +++ b/src/Spatial_searching/include/gudhi/Kd_tree_search.h @@ -56,7 +56,7 @@ namespace spatial_searching { * and the incremental nearest or farthest neighbor query, where no number of neighbors is provided during the call, as the * neighbors will be computed incrementally when the iterator on the range is incremented. * - * \tparam K must be a model of the SearchTraits * concept, such as the CGAL::Epick_d class, which @@ -64,7 +64,7 @@ namespace spatial_searching { * \tparam Point_range is the type of the range that provides the points. * It must be a range whose iterator type is a `RandomAccessIterator`. */ -template +template class Kd_tree_search { typedef boost::iterator_property_map< @@ -72,17 +72,17 @@ class Kd_tree_search CGAL::Identity_property_map > Point_property_map; public: - /// The kernel. - typedef K Kernel; + /// The Traits. + typedef Search_traits Traits; /// Number type used for distances. - typedef typename Kernel::FT FT; + typedef typename Traits::FT FT; /// The point type. typedef typename Point_range::value_type Point; typedef CGAL::Search_traits< FT, Point, - typename Kernel::Cartesian_const_iterator_d, - typename Kernel::Construct_cartesian_const_iterator_d> Traits_base; + typename Traits::Cartesian_const_iterator_d, + typename Traits::Construct_cartesian_const_iterator_d> Traits_base; typedef CGAL::Search_traits_adapter< std::ptrdiff_t, -- cgit v1.2.3