From a8313cc2cb793691fa3d854e1e576110a78c0f20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Fri, 6 May 2011 15:01:09 +0000 Subject: [PATCH] comments of Geert-Jan: *typos+rephrase doc *Search_traits_with_info -> Search_traits_adapter *Distance_for_point_with_info -> Distance_adapter --- .../doc_tex/Spatial_searching/intro.tex | 4 ++-- .../Distance_for_point_with_info.tex | 12 +++++------ .../Incremental_neighbor_search.tex | 4 ++-- .../K_neighbor_search.tex | 4 ++-- ...Orthogonal_incremental_neighbor_search.tex | 4 ++-- .../Orthogonal_k_neighbor_search.tex | 4 ++-- .../Spatial_searching_ref/SearchTraits.tex | 4 ++-- .../Search_traits_with_info.tex | 12 +++++------ .../doc_tex/Spatial_searching_ref/intro.tex | 4 ++-- .../doc_tex/Spatial_searching_ref/main.tex | 4 ++-- .../searching_with_point_with_info.cpp | 4 ++-- ...searching_with_point_with_info_inplace.cpp | 4 ++-- .../searching_with_point_with_info_pmap.cpp | 4 ++-- .../include/CGAL/Search_traits_with_info.h | 16 +++++++-------- .../Building_kd_tree_with_ddim_points.cpp | 10 +++++----- .../Building_kd_tree_with_own_pointtype.cpp | 8 ++++---- .../test/Spatial_searching/Circular_query.cpp | 4 ++-- .../Iso_rectangle_2_query.cpp | 4 ++-- ...search_manhattan_distance_isobox_point.cpp | 8 ++++---- .../K_neighbor_search_with_circle.cpp | 8 ++++---- ...Orthogonal_incremental_neighbor_search.cpp | 8 ++++---- .../Orthogonal_k_neighbor_search.cpp | 8 ++++---- .../Spatial_searching/Range_searching.cpp | 4 ++-- .../test/Spatial_searching/Splitters.cpp | 20 +++++++++---------- 24 files changed, 83 insertions(+), 83 deletions(-) diff --git a/Spatial_searching/doc_tex/Spatial_searching/intro.tex b/Spatial_searching/doc_tex/Spatial_searching/intro.tex index a8a1adf5f66..1c84bdd305e 100644 --- a/Spatial_searching/doc_tex/Spatial_searching/intro.tex +++ b/Spatial_searching/doc_tex/Spatial_searching/intro.tex @@ -317,8 +317,8 @@ wrapper for all these types. The searching itself works exactly as for \cgal\ k \newpage \subsection{Example for Associating an Information to a Point} -The following three example programs illustrate how to use the classes \ccc{Search_traits_with_info} and -\ccc{Distance_for_point_with_info} to store in the kd-tree points and additional information. +The following three example programs illustrate how to use the classes \ccc{Search_traits_adapter} and +\ccc{Distance_for_point_adapter} to store in the kd-tree points and additional information. \subsubsection{Using a Point and an Integer} In this example program, the search tree stores tuples of point and integer. diff --git a/Spatial_searching/doc_tex/Spatial_searching_ref/Distance_for_point_with_info.tex b/Spatial_searching/doc_tex/Spatial_searching_ref/Distance_for_point_with_info.tex index e5dff7ad17d..022401b9e56 100644 --- a/Spatial_searching/doc_tex/Spatial_searching_ref/Distance_for_point_with_info.tex +++ b/Spatial_searching/doc_tex/Spatial_searching_ref/Distance_for_point_with_info.tex @@ -1,17 +1,17 @@ -\begin{ccRefClass}{Distance_for_point_with_info} +\begin{ccRefClass}{Distance_for_point_adapter} \ccDefinition A class that uses a point accessor to adapt a distance class to work on a point with info type. -When using \ccc{Search_traits_with_info} +When using \ccc{Search_traits_adapter} in a nearest neighbor search algorithm, this class must be used as distance. -\ccInclude{CGAL/Search_traits_with_info.h} +\ccInclude{CGAL/Search_traits_adapter.h} \ccParameters -\ccc{Point_with_info} is a point type enhanced with an information.\\ +\ccc{Point_with_info} is a type that has an associated point of type \ccc{Base_distance::Point_d}.\\ \ccc{Point_accessor} is a model of \ccAnchor{http://www.boost.org/doc/libs/release/libs/property_map/index.html}{boost::ReadablePropertyMap} with \ccc{Point_with_info} as \ccc{key_type} and \ccc{Base_distance::Point_d} as \ccc{value_type}. In practice, the current implementation requires a class providing \ccc{Base_traits::Point_d operator[] (const Point_with_info& point) const}.\\ @@ -34,7 +34,7 @@ In practice, the current implementation requires a class providing \ccc{Base_tra \ccCreationVariable{d} %% choose variable name -\ccConstructor{Distance_for_point_with_info(const Point_accessor& accessor=Point_accessor(),const Base_distance& base=Base_distance());} +\ccConstructor{Distance_for_point_adapter(const Point_accessor& accessor=Point_accessor(),const Base_distance& base=Base_distance());} {Constructor initializing the class to \ccc{base} and setting the point accessor of the class to \ccc{accessor}.} \ccOperations @@ -45,7 +45,7 @@ In practice, the current implementation requires a class providing \ccc{Base_tra \ccSeeAlso -\ccc{Search_traits_with_info} +\ccc{Search_traits_adapter} \end{ccRefClass} diff --git a/Spatial_searching/doc_tex/Spatial_searching_ref/Incremental_neighbor_search.tex b/Spatial_searching/doc_tex/Spatial_searching_ref/Incremental_neighbor_search.tex index 1e58b1d6c43..b4f85266bdb 100644 --- a/Spatial_searching/doc_tex/Spatial_searching_ref/Incremental_neighbor_search.tex +++ b/Spatial_searching/doc_tex/Spatial_searching_ref/Incremental_neighbor_search.tex @@ -30,8 +30,8 @@ for example \ccc{CGAL::Search_traits_2 >}. Expects for the second template argument a model of the concept \ccc{GeneralDistance}. If \ccc{Traits} is -\ccc{CGAL::Search_traits_with_info} -the default type is \ccc{CGAL::Distance_for_point_with_info >}, +\ccc{CGAL::Search_traits_adapter} +the default type is \ccc{CGAL::Distance_for_point_adapter >}, and \ccc{CGAL::Euclidean_distance} otherwise. Expects for third template argument a model of the concept \ccc{Splitter}. diff --git a/Spatial_searching/doc_tex/Spatial_searching_ref/K_neighbor_search.tex b/Spatial_searching/doc_tex/Spatial_searching_ref/K_neighbor_search.tex index ace757d9b42..52fe6bff03d 100644 --- a/Spatial_searching/doc_tex/Spatial_searching_ref/K_neighbor_search.tex +++ b/Spatial_searching/doc_tex/Spatial_searching_ref/K_neighbor_search.tex @@ -31,8 +31,8 @@ for example \ccc{CGAL::Cartesian_d}. Expects for the second template argument a model of the concept \ccc{GeneralDistance}. If \ccc{Traits} is -\ccc{CGAL::Search_traits_with_info} -the default type is \ccc{CGAL::Distance_for_point_with_info >}, +\ccc{CGAL::Search_traits_adapter} +the default type is \ccc{CGAL::Distance_for_point_adapter >}, and \ccc{CGAL::Euclidean_distance} otherwise. diff --git a/Spatial_searching/doc_tex/Spatial_searching_ref/Orthogonal_incremental_neighbor_search.tex b/Spatial_searching/doc_tex/Spatial_searching_ref/Orthogonal_incremental_neighbor_search.tex index dc38099c6f7..6aeb5aacfbf 100644 --- a/Spatial_searching/doc_tex/Spatial_searching_ref/Orthogonal_incremental_neighbor_search.tex +++ b/Spatial_searching/doc_tex/Spatial_searching_ref/Orthogonal_incremental_neighbor_search.tex @@ -29,8 +29,8 @@ for example \ccc{CGAL::Search_traits_2 >}. Expects for the second template argument a model of the concept \ccc{GeneralDistance}. If \ccc{Traits} is -\ccc{CGAL::Search_traits_with_info} -the default type is \ccc{CGAL::Distance_for_point_with_info >}, +\ccc{CGAL::Search_traits_adapter} +the default type is \ccc{CGAL::Distance_for_point_adapter >}, and \ccc{CGAL::Euclidean_distance} otherwise. Expects for third template argument a model of the concept \ccc{Splitter}. diff --git a/Spatial_searching/doc_tex/Spatial_searching_ref/Orthogonal_k_neighbor_search.tex b/Spatial_searching/doc_tex/Spatial_searching_ref/Orthogonal_k_neighbor_search.tex index 30bfb6dabc8..6ba640e5805 100644 --- a/Spatial_searching/doc_tex/Spatial_searching_ref/Orthogonal_k_neighbor_search.tex +++ b/Spatial_searching/doc_tex/Spatial_searching_ref/Orthogonal_k_neighbor_search.tex @@ -31,8 +31,8 @@ for example \ccc{CGAL::Search_traits_2 >}. Expects for the second template argument a model of the concept \ccc{GeneralDistance}. If \ccc{Traits} is -\ccc{CGAL::Search_traits_with_info} -the default type is \ccc{CGAL::Distance_for_point_with_info >}, +\ccc{CGAL::Search_traits_adapter} +the default type is \ccc{CGAL::Distance_adapter >}, and \ccc{CGAL::Euclidean_distance} otherwise. diff --git a/Spatial_searching/doc_tex/Spatial_searching_ref/SearchTraits.tex b/Spatial_searching/doc_tex/Spatial_searching_ref/SearchTraits.tex index 224604ac723..79135eaf657 100644 --- a/Spatial_searching/doc_tex/Spatial_searching_ref/SearchTraits.tex +++ b/Spatial_searching/doc_tex/Spatial_searching_ref/SearchTraits.tex @@ -28,12 +28,12 @@ specialized for this type.} \ccNestedType{FT}{The number type of the \ccHtmlNoLinksFrom{Cartesian} coordinates of types \ccc{Point_d}} -\ccNestedType{Cartesian_const_iterator_d}{An random access iterator type to enumerate the +\ccNestedType{Cartesian_const_iterator_d}{A random access iterator type to enumerate the \ccHtmlNoLinksFrom{Cartesian} coordinates of a point.} \ccNestedType{Construct_cartesian_const_iterator_d}{Functor with operators to construct iterators on the first and the past-the-end iterator for the \ccHtmlNoLinksFrom{Cartesian} coordinates of a point. This functor must -provides the type \ccc{result_type} that must be the same than \ccc{Cartesian_const_iterator_d}.} +provides the type \ccc{result_type} that must be the same a \ccc{Cartesian_const_iterator_d}.} \ccCreation \ccCreationVariable{t} %% choose variable name diff --git a/Spatial_searching/doc_tex/Spatial_searching_ref/Search_traits_with_info.tex b/Spatial_searching/doc_tex/Spatial_searching_ref/Search_traits_with_info.tex index 068601cef32..4d60831c0ae 100644 --- a/Spatial_searching/doc_tex/Spatial_searching_ref/Search_traits_with_info.tex +++ b/Spatial_searching/doc_tex/Spatial_searching_ref/Search_traits_with_info.tex @@ -1,17 +1,17 @@ -\begin{ccRefClass}{Search_traits_with_info} +\begin{ccRefClass}{Search_traits_adapter} \ccDefinition The class \ccRefName\ can be used as a template parameter of the kd tree and the search classes. When using this traits class in a nearest neighbor search algorithm, the class -\ccc{Distance_for_point_with_info} +\ccc{Distance_for_point_adapter} must be used as distance. -\ccInclude{CGAL/Search_traits_with_info.h} +\ccInclude{CGAL/Search_traits_adapter.h} \ccParameters -\ccc{Point_with_info} is a point type enhanced with an information.\\ +\ccc{Point_with_info} is a type that has an associated point of type \ccc{Base_type::Point_d}.\\ \ccc{Point_accessor} is a model of \ccAnchor{http://www.boost.org/doc/libs/release/libs/property_map/index.html}{boost::ReadablePropertyMap} with \ccc{Point_with_info} as \ccc{key_type} and \ccc{Base_traits::Point_d} as \ccc{value_type}. In practice, the current implementation requires a class providing \ccc{Base_traits::Point_d operator[] (const Point_with_info& point) const}.\\ @@ -35,7 +35,7 @@ In practice, the current implementation requires a class providing \ccc{Base_tra \ccCreationVariable{t} %% choose variable name -\ccConstructor{Search_traits_with_info(const Point_accessor& accessor=Point_accessor(),const Base_traits& base=Base_traits());} +\ccConstructor{Search_traits_adapter(const Point_accessor& accessor=Point_accessor(),const Base_traits& base=Base_traits());} {Constructor initializing the class to \ccc{base} and setting the point accessor of the class to \ccc{accessor}.} \ccOperations @@ -46,7 +46,7 @@ In practice, the current implementation requires a class providing \ccc{Base_tra \ccSeeAlso -\ccc{Distance_for_point_with_info}\\ +\ccc{Distance_for_point_adapter}\\ \ccc{Search_traits_2}\\ \ccc{Search_traits_3}\\ \ccc{Search_traits_d}\\ diff --git a/Spatial_searching/doc_tex/Spatial_searching_ref/intro.tex b/Spatial_searching/doc_tex/Spatial_searching_ref/intro.tex index 370ba176d30..185b8d1efdc 100644 --- a/Spatial_searching/doc_tex/Spatial_searching_ref/intro.tex +++ b/Spatial_searching/doc_tex/Spatial_searching_ref/intro.tex @@ -56,7 +56,7 @@ classes that are described in the reference pages. \ccRefIdfierPage{CGAL::Search_traits_3}\\ \ccRefIdfierPage{CGAL::Search_traits_d}\\ \ccRefIdfierPage{CGAL::Search_traits}\\ -\ccRefIdfierPage{CGAL::Search_traits_with_info} +\ccRefIdfierPage{CGAL::Search_traits_adapter} \ccHeading{Distance Classes} @@ -64,7 +64,7 @@ classes that are described in the reference pages. \ccRefIdfierPage{CGAL::Euclidean_distance_sphere_point} \\ \ccRefIdfierPage{CGAL::Manhattan_distance_iso_box_point} \\ \ccRefIdfierPage{CGAL::Weighted_Minkowski_distance} \\ -\ccRefIdfierPage{CGAL::Distance_for_point_with_info} +\ccRefIdfierPage{CGAL::Distance_for_point_adapter} \ccHeading{Splitter Classes} diff --git a/Spatial_searching/doc_tex/Spatial_searching_ref/main.tex b/Spatial_searching/doc_tex/Spatial_searching_ref/main.tex index c32f1b0e53d..aef7c3eee70 100644 --- a/Spatial_searching/doc_tex/Spatial_searching_ref/main.tex +++ b/Spatial_searching/doc_tex/Spatial_searching_ref/main.tex @@ -35,8 +35,8 @@ \input{Spatial_searching_ref/Search_traits_3.tex} \input{Spatial_searching_ref/Search_traits_d.tex} \input{Spatial_searching_ref/Search_traits.tex} -\input{Spatial_searching_ref/Search_traits_with_info.tex} -\input{Spatial_searching_ref/Distance_for_point_with_info.tex} +\input{Spatial_searching_ref/Search_traits_adapter.tex} +\input{Spatial_searching_ref/Distance_adapter.tex} \input{Spatial_searching_ref/Sliding_fair.tex} \input{Spatial_searching_ref/Sliding_midpoint.tex} \input{Spatial_searching_ref/SpatialSeparator.tex} diff --git a/Spatial_searching/examples/Spatial_searching/searching_with_point_with_info.cpp b/Spatial_searching/examples/Spatial_searching/searching_with_point_with_info.cpp index aa685bf4076..a08381cb4b5 100644 --- a/Spatial_searching/examples/Spatial_searching/searching_with_point_with_info.cpp +++ b/Spatial_searching/examples/Spatial_searching/searching_with_point_with_info.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include #include #include @@ -19,7 +19,7 @@ struct My_Point_accessor{ typedef CGAL::Random_points_in_cube_3 Random_points_iterator; typedef CGAL::Search_traits_3 Traits_base; -typedef CGAL::Search_traits_with_info Traits; +typedef CGAL::Search_traits_adapter Traits; typedef CGAL::Orthogonal_k_neighbor_search K_neighbor_search; diff --git a/Spatial_searching/examples/Spatial_searching/searching_with_point_with_info_inplace.cpp b/Spatial_searching/examples/Spatial_searching/searching_with_point_with_info_inplace.cpp index 8eaa8d861d6..a26edb27357 100644 --- a/Spatial_searching/examples/Spatial_searching/searching_with_point_with_info_inplace.cpp +++ b/Spatial_searching/examples/Spatial_searching/searching_with_point_with_info_inplace.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include #include #include @@ -21,7 +21,7 @@ struct My_Point_accessor{ typedef CGAL::Random_points_in_cube_3 Random_points_iterator; typedef CGAL::Search_traits_3 Traits_base; -typedef CGAL::Search_traits_with_info Traits; +typedef CGAL::Search_traits_adapter Traits; typedef CGAL::Orthogonal_k_neighbor_search K_neighbor_search; diff --git a/Spatial_searching/examples/Spatial_searching/searching_with_point_with_info_pmap.cpp b/Spatial_searching/examples/Spatial_searching/searching_with_point_with_info_pmap.cpp index 7ef1420d91a..39ea302ec0b 100644 --- a/Spatial_searching/examples/Spatial_searching/searching_with_point_with_info_pmap.cpp +++ b/Spatial_searching/examples/Spatial_searching/searching_with_point_with_info_pmap.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include #include #include @@ -17,7 +17,7 @@ typedef boost::const_associative_property_map > typedef CGAL::Random_points_in_cube_3 Random_points_iterator; typedef CGAL::Search_traits_3 Traits_base; -typedef CGAL::Search_traits_with_info Traits; +typedef CGAL::Search_traits_adapter Traits; typedef CGAL::Orthogonal_k_neighbor_search K_neighbor_search; diff --git a/Spatial_searching/include/CGAL/Search_traits_with_info.h b/Spatial_searching/include/CGAL/Search_traits_with_info.h index c4a7c119df4..6e1fd002915 100644 --- a/Spatial_searching/include/CGAL/Search_traits_with_info.h +++ b/Spatial_searching/include/CGAL/Search_traits_with_info.h @@ -27,10 +27,10 @@ namespace CGAL{ template -class Search_traits_with_info; +class Search_traits_adapter; template -class Distance_for_point_with_info; +class Distance_adapter; namespace internal{ @@ -52,8 +52,8 @@ struct Get_iso_box_d }; template - struct Spatial_searching_default_distance< ::CGAL::Search_traits_with_info >{ - typedef ::CGAL::Distance_for_point_with_info >{ + typedef ::CGAL::Distance_adapter::type> type; }; @@ -62,13 +62,13 @@ struct Get_iso_box_d template -class Search_traits_with_info : public Base_traits{ +class Search_traits_adapter : public Base_traits{ Point_accessor accessor; public: typedef Base_traits Base; typedef typename internal::Get_iso_box_d::type Iso_box_d; - Search_traits_with_info(const Point_accessor& accessor_=Point_accessor(), + Search_traits_adapter(const Point_accessor& accessor_=Point_accessor(), const Base_traits& base=Base_traits() ):Base_traits(base),accessor(accessor_){} @@ -110,12 +110,12 @@ public: }; template -class Distance_for_point_with_info : public Base_distance { +class Distance_adapter : public Base_distance { Point_accessor accessor; typedef typename Base_distance::FT FT; public: - Distance_for_point_with_info( const Point_accessor& accessor_=Point_accessor(), + Distance_adapter( const Point_accessor& accessor_=Point_accessor(), const Base_distance& distance=Base_distance() ):Base_distance(distance),accessor(accessor_){} diff --git a/Spatial_searching/test/Spatial_searching/Building_kd_tree_with_ddim_points.cpp b/Spatial_searching/test/Spatial_searching/Building_kd_tree_with_ddim_points.cpp index 81735ffa34b..b2678dc7003 100644 --- a/Spatial_searching/test/Spatial_searching/Building_kd_tree_with_ddim_points.cpp +++ b/Spatial_searching/test/Spatial_searching/Building_kd_tree_with_ddim_points.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include "Point_with_info.h" #include #include @@ -27,10 +27,10 @@ typedef CGAL::K_neighbor_search K_neighbor_searc typedef Orthogonal_k_neighbor_search::Distance Distance; //typdefs for Point_with_info typedef Point_with_info_helper::type Point_with_info; -typedef CGAL::Search_traits_with_info Traits_with_info; -typedef CGAL::Distance_for_point_with_info Distance_with_info; -typedef CGAL::Orthogonal_k_neighbor_search Orthogonal_k_neighbor_search_with_info; -typedef CGAL::K_neighbor_search K_neighbor_search_with_info; +typedef CGAL::Search_traits_adapter Traits_with_info; +typedef CGAL::Distance_adapter Distance_adapter; +typedef CGAL::Orthogonal_k_neighbor_search Orthogonal_k_neighbor_search_with_info; +typedef CGAL::K_neighbor_search K_neighbor_search_with_info; const unsigned int N = 1000; diff --git a/Spatial_searching/test/Spatial_searching/Building_kd_tree_with_own_pointtype.cpp b/Spatial_searching/test/Spatial_searching/Building_kd_tree_with_own_pointtype.cpp index 119145cce29..a9b36ff9dbb 100644 --- a/Spatial_searching/test/Spatial_searching/Building_kd_tree_with_own_pointtype.cpp +++ b/Spatial_searching/test/Spatial_searching/Building_kd_tree_with_own_pointtype.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include #include @@ -16,9 +16,9 @@ typedef CGAL::Search_traits K_neighbor_search; //typdefs for Point_with_info typedef Point_with_info_helper::type Point_with_info; -typedef CGAL::Search_traits_with_info Traits_with_info; -typedef CGAL::Distance_for_point_with_info Distance_with_info; -typedef CGAL::Orthogonal_k_neighbor_search K_neighbor_search_with_info; +typedef CGAL::Search_traits_adapter Traits_with_info; +typedef CGAL::Distance_adapter Distance_adapter; +typedef CGAL::Orthogonal_k_neighbor_search K_neighbor_search_with_info; const unsigned int N = 1000; const unsigned int K = 5; diff --git a/Spatial_searching/test/Spatial_searching/Circular_query.cpp b/Spatial_searching/test/Spatial_searching/Circular_query.cpp index 8c37a307731..c86034ab149 100644 --- a/Spatial_searching/test/Spatial_searching/Circular_query.cpp +++ b/Spatial_searching/test/Spatial_searching/Circular_query.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include @@ -22,7 +22,7 @@ typedef CGAL::Counting_iterator N_Random_points_iterator typedef CGAL::Search_traits_2 Traits; //for Point_with_info typedef Point_with_info_helper::type Point_with_info; -typedef CGAL::Search_traits_with_info Traits_with_info; +typedef CGAL::Search_traits_adapter Traits_with_info; template diff --git a/Spatial_searching/test/Spatial_searching/Iso_rectangle_2_query.cpp b/Spatial_searching/test/Spatial_searching/Iso_rectangle_2_query.cpp index 3cc1bacfe2c..81d7fcdb757 100644 --- a/Spatial_searching/test/Spatial_searching/Iso_rectangle_2_query.cpp +++ b/Spatial_searching/test/Spatial_searching/Iso_rectangle_2_query.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include #include "Point_with_info.h" @@ -20,7 +20,7 @@ typedef CGAL::Random_points_in_square_2 Random_points_iterator; typedef CGAL::Counting_iterator N_Random_points_iterator; typedef CGAL::Search_traits_2 Traits; typedef Point_with_info_helper::type Point_with_info; -typedef CGAL::Search_traits_with_info Traits_with_info; +typedef CGAL::Search_traits_adapter Traits_with_info; template void run(std::list all_points) diff --git a/Spatial_searching/test/Spatial_searching/K_neighbor_search_manhattan_distance_isobox_point.cpp b/Spatial_searching/test/Spatial_searching/K_neighbor_search_manhattan_distance_isobox_point.cpp index fcf825c87f5..0b82bb5bb78 100644 --- a/Spatial_searching/test/Spatial_searching/K_neighbor_search_manhattan_distance_isobox_point.cpp +++ b/Spatial_searching/test/Spatial_searching/K_neighbor_search_manhattan_distance_isobox_point.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include "Point_with_info.h" typedef CGAL::Cartesian Kernel; @@ -16,9 +16,9 @@ typedef CGAL::Manhattan_distance_iso_box_point Distance; typedef CGAL::K_neighbor_search Neighbor_search; //typdefs for Point_with_info typedef Point_with_info_helper::type Point_with_info; -typedef CGAL::Search_traits_with_info Traits_with_info; -typedef CGAL::Distance_for_point_with_info Distance_with_info; -typedef CGAL::K_neighbor_search Neighbor_search_with_info; +typedef CGAL::Search_traits_adapter Traits_with_info; +typedef CGAL::Distance_adapter Distance_adapter; +typedef CGAL::K_neighbor_search Neighbor_search_with_info; const unsigned int K = 8; diff --git a/Spatial_searching/test/Spatial_searching/K_neighbor_search_with_circle.cpp b/Spatial_searching/test/Spatial_searching/K_neighbor_search_with_circle.cpp index 1f9f5288f75..f928b55dc38 100644 --- a/Spatial_searching/test/Spatial_searching/K_neighbor_search_with_circle.cpp +++ b/Spatial_searching/test/Spatial_searching/K_neighbor_search_with_circle.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include "Point_with_info.h" #include #include @@ -21,9 +21,9 @@ typedef CGAL::K_neighbor_search Neighbor_search; typedef CGAL::Random_points_in_square_2 Random_points_iterator; //typdefs for Point_with_info typedef Point_with_info_helper::type Point_with_info; -typedef CGAL::Search_traits_with_info Traits_with_info; -typedef CGAL::Distance_for_point_with_info Distance_with_info; -typedef CGAL::K_neighbor_search Neighbor_search_with_info; +typedef CGAL::Search_traits_adapter Traits_with_info; +typedef CGAL::Distance_adapter Distance_adapter; +typedef CGAL::K_neighbor_search Neighbor_search_with_info; const unsigned int N = 1000; diff --git a/Spatial_searching/test/Spatial_searching/Orthogonal_incremental_neighbor_search.cpp b/Spatial_searching/test/Spatial_searching/Orthogonal_incremental_neighbor_search.cpp index 17e71508622..fd844657a5b 100644 --- a/Spatial_searching/test/Spatial_searching/Orthogonal_incremental_neighbor_search.cpp +++ b/Spatial_searching/test/Spatial_searching/Orthogonal_incremental_neighbor_search.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include "Point_with_info.h" @@ -39,9 +39,9 @@ typedef Orthogonal_incremental_neighbor_search::iterator NN_iterator; typedef Orthogonal_incremental_neighbor_search::Point_with_transformed_distance Point_with_transformed_distance; //typdefs for Point_with_info typedef Point_with_info_helper::type Point_with_info; -typedef CGAL::Search_traits_with_info Traits_with_info; -typedef CGAL::Distance_for_point_with_info Distance_with_info; -typedef CGAL::Incremental_neighbor_search Orthogonal_incremental_neighbor_search_with_info; +typedef CGAL::Search_traits_adapter Traits_with_info; +typedef CGAL::Distance_adapter Distance_adapter; +typedef CGAL::Incremental_neighbor_search Orthogonal_incremental_neighbor_search_with_info; template diff --git a/Spatial_searching/test/Spatial_searching/Orthogonal_k_neighbor_search.cpp b/Spatial_searching/test/Spatial_searching/Orthogonal_k_neighbor_search.cpp index 0ef8bdfb1c3..f263262d76d 100644 --- a/Spatial_searching/test/Spatial_searching/Orthogonal_k_neighbor_search.cpp +++ b/Spatial_searching/test/Spatial_searching/Orthogonal_k_neighbor_search.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include "Point_with_info.h" #include @@ -16,9 +16,9 @@ typedef CGAL::Search_traits_2 TreeTrai typedef CGAL::Orthogonal_k_neighbor_search Neighbor_search; //typdefs fo Point_with_info typedef Point_with_info_helper::type Point_with_info; -typedef CGAL::Search_traits_with_info Traits_with_info; -typedef CGAL::Distance_for_point_with_info Distance_with_info; -typedef CGAL::Orthogonal_k_neighbor_search Neighbor_search_with_info; +typedef CGAL::Search_traits_adapter Traits_with_info; +typedef CGAL::Distance_adapter Distance_adapter; +typedef CGAL::Orthogonal_k_neighbor_search Neighbor_search_with_info; template void search(bool nearest) diff --git a/Spatial_searching/test/Spatial_searching/Range_searching.cpp b/Spatial_searching/test/Spatial_searching/Range_searching.cpp index 4789a73939e..f75cfc60152 100644 --- a/Spatial_searching/test/Spatial_searching/Range_searching.cpp +++ b/Spatial_searching/test/Spatial_searching/Range_searching.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include #include "Point_with_info.h" @@ -19,7 +19,7 @@ typedef CGAL::Counting_iterator N_Random_points_iterator typedef CGAL::Search_traits_3 Traits; //for Point_with_info typedef Point_with_info_helper::type Point_with_info; -typedef CGAL::Search_traits_with_info Traits_with_info; +typedef CGAL::Search_traits_adapter Traits_with_info; const int N=10000; diff --git a/Spatial_searching/test/Spatial_searching/Splitters.cpp b/Spatial_searching/test/Spatial_searching/Splitters.cpp index 928fb7974a7..c49896ee40a 100644 --- a/Spatial_searching/test/Spatial_searching/Splitters.cpp +++ b/Spatial_searching/test/Spatial_searching/Splitters.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include "Point_with_info.h" @@ -29,8 +29,8 @@ typedef CGAL::Search_traits_3 TreeTraits; typedef CGAL::Euclidean_distance Distance; #endif typedef Point_with_info_helper::type Point_with_info; -typedef CGAL::Search_traits_with_info Traits_with_info; -typedef CGAL::Distance_for_point_with_info Distance_with_info; +typedef CGAL::Search_traits_adapter Traits_with_info; +typedef CGAL::Distance_adapter Distance_adapter; typedef std::vector Vector; @@ -99,14 +99,14 @@ main() { std::cout << "Testing Sliding_midpoint" << std::endl; Splitter_test,Distance > st; st(points,query); - Splitter_test,Distance_with_info > sti; + Splitter_test,Distance_adapter > sti; sti(points,query); } { std::cout << "Testing Sliding_fair" << std::endl; Splitter_test,Distance > st; st(points,query); - Splitter_test,Distance_with_info > sti; + Splitter_test,Distance_adapter > sti; sti(points,query); } @@ -114,7 +114,7 @@ main() { std::cout << "Testing Fair" << std::endl; Splitter_test,Distance > st; st(points,query); - Splitter_test,Distance_with_info > sti; + Splitter_test,Distance_adapter > sti; sti(points,query); } @@ -122,7 +122,7 @@ main() { std::cout << "Testing Median_of_rectangle" << std::endl; Splitter_test,Distance > st; st(points,query); - Splitter_test,Distance_with_info > sti; + Splitter_test,Distance_adapter > sti; sti(points,query); } @@ -131,7 +131,7 @@ main() { std::cout << "Testing Midpoint_of_rectangle" << std::endl; Splitter_test,Distance > st; st(points,query); - Splitter_test,Distance_with_info > sti; + Splitter_test,Distance_adapter > sti; sti(points,query); } @@ -139,14 +139,14 @@ main() { std::cout << "Testing Midpoint_of_max_spread" << std::endl; Splitter_test,Distance > st; st(points,query); - Splitter_test,Distance_with_info > sti; + Splitter_test,Distance_adapter > sti; sti(points,query); } { std::cout << "Testing Median_of_max_spread" << std::endl; Splitter_test,Distance > st; st(points,query); - Splitter_test,Distance_with_info > sti; + Splitter_test,Distance_adapter > sti; sti(points,query); }