diff --git a/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Euclidean_distance.tex b/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Euclidean_distance.tex index 38b68291547..258c655be64 100755 --- a/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Euclidean_distance.tex +++ b/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Euclidean_distance.tex @@ -49,11 +49,11 @@ OrthogonalDistance \ccMethod{NT distance(Point q, Point p);}{Returns the squared Euclidean distance between \ccc{q} and \ccc{p}.} -\ccMethod{NT min_distance_to_query_item(Point q, Kd_tree_rectangle r);} +\ccMethod{NT min_distance_to_rectangle(Point q, Kd_tree_rectangle r);} {Returns the squared Euclidean distance between \ccc{q} and the point on the boundary of \ccc{r} closest to \ccc{q}.} -\ccMethod{NT max_distance_to_queryitem(Point q, Kd_tree_rectangle r;);} +\ccMethod{NT max_distance_to_rectangle(Point q, Kd_tree_rectangle r;);} {Returns the squared Euclidean distance, where $d$ denotes the distance between \ccc{q} and the point on the boundary of \ccc{r} farthest to \ccc{q}.} diff --git a/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Euclidean_distance_sphere_point.tex b/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Euclidean_distance_sphere_point.tex index a8dbd568425..f0b438aa50a 100755 --- a/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Euclidean_distance_sphere_point.tex +++ b/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Euclidean_distance_sphere_point.tex @@ -61,11 +61,11 @@ GeneralDistance \ccMethod{NT distance(Sphere s, Point p);}{Returns the distance between \ccc{s} and \ccc{p}.} -\ccMethod{NT min_distance_to_queryitem(Sphere s, Kd_tree_rectangle r);} +\ccMethod{NT min_distance_to_rectangle(Sphere s, Kd_tree_rectangle r);} {Returns the minimal distance between a point from the sphere \ccc{s} and a point from \ccc{r}.} -\ccMethod{NT max_distance_to_queryitem(Sphere s, Kd_tree_rectangle r);} +\ccMethod{NT max_distance_to_rectangle(Sphere s, Kd_tree_rectangle r);} {Returns the maximal distance between the sphere \ccc{s} and a point from \ccc{r} furthest to \ccc{s}. } diff --git a/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Manhattan_distance_iso_box_point.tex b/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Manhattan_distance_iso_box_point.tex index 0deb713c13d..59728818487 100755 --- a/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Manhattan_distance_iso_box_point.tex +++ b/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Manhattan_distance_iso_box_point.tex @@ -59,11 +59,11 @@ GeneralDistance \ccMethod{NT distance(IsoBox b, Point p);}{Returns the distance between \ccc{b} and \ccc{p}.} -\ccMethod{NT min_distance_to_queryitem(IsoBox b, Kd_tree_rectangle r);} +\ccMethod{NT min_distance_to_rectangle(IsoBox b, Kd_tree_rectangle r);} {Returns the minimal distance between a point from \ccc{b} and a point from \ccc{r}.} -\ccMethod{NT max_distance_to_queryitem(IsoBox b, Kd_tree_rectangle r);} +\ccMethod{NT max_distance_to_rectangle(IsoBox b, Kd_tree_rectangle r);} {Returns the maximal distance between the iso-box \ccc{b} and a point from \ccc{r} furthest to \ccc{b}.} diff --git a/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Weighted_Minkowski_distance.tex b/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Weighted_Minkowski_distance.tex index c380e61da1c..95ce41685c0 100755 --- a/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Weighted_Minkowski_distance.tex +++ b/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Weighted_Minkowski_distance.tex @@ -59,11 +59,11 @@ The values in the iterator range \ccc{[wb,we)} are the weight. } \ccMethod{NT distance(Point q, Point r);}{Returns $d^{power}$, where $d$ denotes the distance between \ccc{q} and \ccc{r}.} -\ccMethod{NT min_distance_to_queryitem(Point q, Kd_tree_rectangle r;);} +\ccMethod{NT min_distance_to_rectangle(Point q, Kd_tree_rectangle r;);} {Returns $d^{power}$, where $d$ denotes the distance between the query item \ccc{q} and the point on the boundary of \ccc{r} closest to \ccc{q}.} -\ccMethod{NT max_distance_to_queryitem(Point q, Kd_tree_rectangle r;);} +\ccMethod{NT max_distance_to_rectangle(Point q, Kd_tree_rectangle r;);} {Returns $d^{power}$, where $d$ denotes the distance between the query item \ccc{q} and the point on the boundary of \ccc{r} farthest to \ccc{q}.} diff --git a/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/intro.tex b/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/intro.tex index d2f52fed218..1705ce006cd 100755 --- a/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/intro.tex +++ b/Packages/Spatial_searching/doc_tex/Spatial_searching_ref/intro.tex @@ -51,15 +51,15 @@ classes that are described in the reference pages. \ccHeading{Classes} \ccRefIdfierPage{CGAL::Euclidean_distance} \\ -\ccRefIdfierPage{CGAL::Euclidean_distance_sphere_point} \\ +\ccRefIdfierPage{CGAL::Euclidean_distance_sphere_point} \\ \ccRefIdfierPage{CGAL::Fair} \\ \ccRefIdfierPage{CGAL::Fuzzy_iso_box} \\ \ccRefIdfierPage{CGAL::Fuzzy_sphere} \\ \ccRefIdfierPage{CGAL::Incremental_neighbor_search} \\ \ccRefIdfierPage{CGAL::K_neighbor_search} \\ -\ccRefIdfierPage{CGAL::Kd_tree} \\ -\ccRefIdfierPage{CGAL::Kd_tree_node} \\ -\ccRefIdfierPage{CGAL::Kd_tree_rectangle} \\ +\ccRefIdfierPage{CGAL::Kd_tree} \\ +\ccRefIdfierPage{CGAL::Kd_tree_node} \\ +\ccRefIdfierPage{CGAL::Kd_tree_rectangle} \\ \ccRefIdfierPage{CGAL::Kd_tree_traits_point} \\ \ccRefIdfierPage{CGAL::Kd_tree_traits_point_2}\\ \ccRefIdfierPage{CGAL::Kd_tree_traits_point_3}\\ diff --git a/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Euclidean_distance.tex b/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Euclidean_distance.tex index 38b68291547..258c655be64 100755 --- a/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Euclidean_distance.tex +++ b/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Euclidean_distance.tex @@ -49,11 +49,11 @@ OrthogonalDistance \ccMethod{NT distance(Point q, Point p);}{Returns the squared Euclidean distance between \ccc{q} and \ccc{p}.} -\ccMethod{NT min_distance_to_query_item(Point q, Kd_tree_rectangle r);} +\ccMethod{NT min_distance_to_rectangle(Point q, Kd_tree_rectangle r);} {Returns the squared Euclidean distance between \ccc{q} and the point on the boundary of \ccc{r} closest to \ccc{q}.} -\ccMethod{NT max_distance_to_queryitem(Point q, Kd_tree_rectangle r;);} +\ccMethod{NT max_distance_to_rectangle(Point q, Kd_tree_rectangle r;);} {Returns the squared Euclidean distance, where $d$ denotes the distance between \ccc{q} and the point on the boundary of \ccc{r} farthest to \ccc{q}.} diff --git a/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Euclidean_distance_sphere_point.tex b/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Euclidean_distance_sphere_point.tex index a8dbd568425..f0b438aa50a 100755 --- a/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Euclidean_distance_sphere_point.tex +++ b/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Euclidean_distance_sphere_point.tex @@ -61,11 +61,11 @@ GeneralDistance \ccMethod{NT distance(Sphere s, Point p);}{Returns the distance between \ccc{s} and \ccc{p}.} -\ccMethod{NT min_distance_to_queryitem(Sphere s, Kd_tree_rectangle r);} +\ccMethod{NT min_distance_to_rectangle(Sphere s, Kd_tree_rectangle r);} {Returns the minimal distance between a point from the sphere \ccc{s} and a point from \ccc{r}.} -\ccMethod{NT max_distance_to_queryitem(Sphere s, Kd_tree_rectangle r);} +\ccMethod{NT max_distance_to_rectangle(Sphere s, Kd_tree_rectangle r);} {Returns the maximal distance between the sphere \ccc{s} and a point from \ccc{r} furthest to \ccc{s}. } diff --git a/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Manhattan_distance_iso_box_point.tex b/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Manhattan_distance_iso_box_point.tex index 0deb713c13d..59728818487 100755 --- a/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Manhattan_distance_iso_box_point.tex +++ b/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Manhattan_distance_iso_box_point.tex @@ -59,11 +59,11 @@ GeneralDistance \ccMethod{NT distance(IsoBox b, Point p);}{Returns the distance between \ccc{b} and \ccc{p}.} -\ccMethod{NT min_distance_to_queryitem(IsoBox b, Kd_tree_rectangle r);} +\ccMethod{NT min_distance_to_rectangle(IsoBox b, Kd_tree_rectangle r);} {Returns the minimal distance between a point from \ccc{b} and a point from \ccc{r}.} -\ccMethod{NT max_distance_to_queryitem(IsoBox b, Kd_tree_rectangle r);} +\ccMethod{NT max_distance_to_rectangle(IsoBox b, Kd_tree_rectangle r);} {Returns the maximal distance between the iso-box \ccc{b} and a point from \ccc{r} furthest to \ccc{b}.} diff --git a/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Weighted_Minkowski_distance.tex b/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Weighted_Minkowski_distance.tex index c380e61da1c..95ce41685c0 100755 --- a/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Weighted_Minkowski_distance.tex +++ b/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Weighted_Minkowski_distance.tex @@ -59,11 +59,11 @@ The values in the iterator range \ccc{[wb,we)} are the weight. } \ccMethod{NT distance(Point q, Point r);}{Returns $d^{power}$, where $d$ denotes the distance between \ccc{q} and \ccc{r}.} -\ccMethod{NT min_distance_to_queryitem(Point q, Kd_tree_rectangle r;);} +\ccMethod{NT min_distance_to_rectangle(Point q, Kd_tree_rectangle r;);} {Returns $d^{power}$, where $d$ denotes the distance between the query item \ccc{q} and the point on the boundary of \ccc{r} closest to \ccc{q}.} -\ccMethod{NT max_distance_to_queryitem(Point q, Kd_tree_rectangle r;);} +\ccMethod{NT max_distance_to_rectangle(Point q, Kd_tree_rectangle r;);} {Returns $d^{power}$, where $d$ denotes the distance between the query item \ccc{q} and the point on the boundary of \ccc{r} farthest to \ccc{q}.} diff --git a/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/intro.tex b/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/intro.tex index d2f52fed218..1705ce006cd 100755 --- a/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/intro.tex +++ b/Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/intro.tex @@ -51,15 +51,15 @@ classes that are described in the reference pages. \ccHeading{Classes} \ccRefIdfierPage{CGAL::Euclidean_distance} \\ -\ccRefIdfierPage{CGAL::Euclidean_distance_sphere_point} \\ +\ccRefIdfierPage{CGAL::Euclidean_distance_sphere_point} \\ \ccRefIdfierPage{CGAL::Fair} \\ \ccRefIdfierPage{CGAL::Fuzzy_iso_box} \\ \ccRefIdfierPage{CGAL::Fuzzy_sphere} \\ \ccRefIdfierPage{CGAL::Incremental_neighbor_search} \\ \ccRefIdfierPage{CGAL::K_neighbor_search} \\ -\ccRefIdfierPage{CGAL::Kd_tree} \\ -\ccRefIdfierPage{CGAL::Kd_tree_node} \\ -\ccRefIdfierPage{CGAL::Kd_tree_rectangle} \\ +\ccRefIdfierPage{CGAL::Kd_tree} \\ +\ccRefIdfierPage{CGAL::Kd_tree_node} \\ +\ccRefIdfierPage{CGAL::Kd_tree_rectangle} \\ \ccRefIdfierPage{CGAL::Kd_tree_traits_point} \\ \ccRefIdfierPage{CGAL::Kd_tree_traits_point_2}\\ \ccRefIdfierPage{CGAL::Kd_tree_traits_point_3}\\ diff --git a/Packages/Spatial_searching/examples/Spatial_searching/Point.h b/Packages/Spatial_searching/examples/Spatial_searching/Point.h index a29f4805e69..1d1ebfb91a8 100755 --- a/Packages/Spatial_searching/examples/Spatial_searching/Point.h +++ b/Packages/Spatial_searching/examples/Spatial_searching/Point.h @@ -67,7 +67,7 @@ public: } template - double min_distance_to_queryitem(const Point& p, + double min_distance_to_rectangle(const Point& p, const CGAL::Kd_tree_rectangle& b) const { double distance(0.0); @@ -85,7 +85,7 @@ public: } template - double max_distance_to_queryitem(const Point& p, + double max_distance_to_rectangle(const Point& p, const CGAL::Kd_tree_rectangle& b) const { double distance(0.0); diff --git a/Packages/Spatial_searching/include/CGAL/Euclidean_distance.h b/Packages/Spatial_searching/include/CGAL/Euclidean_distance.h index 27b04e2a6a6..895629846ad 100644 --- a/Packages/Spatial_searching/include/CGAL/Euclidean_distance.h +++ b/Packages/Spatial_searching/include/CGAL/Euclidean_distance.h @@ -43,9 +43,6 @@ namespace CGAL { // default constructor Euclidean_distance() {} - // obsolete as we no longer store dimension Euclidean_distance(const int d) {} - - ~Euclidean_distance() {} inline NT distance(const Point& q, const Point& p) const { NT distance = NT(0); @@ -59,7 +56,7 @@ namespace CGAL { } - inline NT min_distance_to_queryitem(const Point& q, + inline NT min_distance_to_rectangle(const Point& q, const Kd_tree_rectangle& r) const { NT distance = NT(0); typename GeomTraits::Construct_cartesian_const_iterator construct_it; @@ -77,8 +74,8 @@ namespace CGAL { return distance; } - inline NT max_distance_to_queryitem(const Point& q, - const Kd_tree_rectangle& r) const { + inline NT max_distance_to_rectangle(const Point& q, + const Kd_tree_rectangle& r) const { NT distance=NT(0); typename GeomTraits::Construct_cartesian_const_iterator construct_it; typename GeomTraits::Cartesian_const_iterator qit = construct_it(q), diff --git a/Packages/Spatial_searching/include/CGAL/Euclidean_distance_sphere_point.h b/Packages/Spatial_searching/include/CGAL/Euclidean_distance_sphere_point.h index 6d5e1f84b00..46bf5066e31 100644 --- a/Packages/Spatial_searching/include/CGAL/Euclidean_distance_sphere_point.h +++ b/Packages/Spatial_searching/include/CGAL/Euclidean_distance_sphere_point.h @@ -29,24 +29,21 @@ namespace CGAL { - template + template class Euclidean_distance_sphere_point { public: typedef typename GeomTraits::Point Point; typedef typename GeomTraits::NT NT; - typedef QueryItem Query_item; + typedef Sphere Query_item; public: // default constructor Euclidean_distance_sphere_point() {} - // obsolete as we no longer store dimension Euclidean_distance_sphere_point(const int d) {} - ~Euclidean_distance_sphere_point() {} - - inline NT distance(const Query_item& q, const Point& p) const { + inline NT distance(const Sphere& q, const Point& p) const { Point c=q.center(); NT distance = NT(0); typename GeomTraits::Construct_cartesian_const_iterator construct_it; @@ -61,8 +58,8 @@ namespace CGAL { } - inline NT min_distance_to_queryitem(const Query_item& q, - const Kd_tree_rectangle& r) const { + inline NT min_distance_to_rectangle(const Sphere& q, + const Kd_tree_rectangle& r) const { Point c=q.center(); NT distance = NT(0); typename GeomTraits::Construct_cartesian_const_iterator construct_it; @@ -82,7 +79,7 @@ namespace CGAL { return distance; } - inline NT max_distance_to_queryitem(const Query_item& q, + inline NT max_distance_to_rectangle(const Sphere& q, const Kd_tree_rectangle& r) const { Point c=q.center(); NT distance=NT(0); diff --git a/Packages/Spatial_searching/include/CGAL/Incremental_neighbor_search.h b/Packages/Spatial_searching/include/CGAL/Incremental_neighbor_search.h index 83f187150e5..53e32554a76 100644 --- a/Packages/Spatial_searching/include/CGAL/Incremental_neighbor_search.h +++ b/Packages/Spatial_searching/include/CGAL/Incremental_neighbor_search.h @@ -303,9 +303,9 @@ class Distance_smaller search_nearest_neighbour=search_nearest; if (search_nearest) distance_to_root= - Distance_instance->min_distance_to_queryitem(q,*bounding_box); + Distance_instance->min_distance_to_rectangle(q,*bounding_box); else distance_to_root= - Distance_instance->max_distance_to_queryitem(q,*bounding_box); + Distance_instance->max_distance_to_rectangle(q,*bounding_box); @@ -430,9 +430,9 @@ class Distance_smaller delete B; if (search_nearest_neighbour) { NT distance_to_box_lower = -Distance_instance->min_distance_to_queryitem(query_point, *lower_box); +Distance_instance->min_distance_to_rectangle(query_point, *lower_box); NT distance_to_box_upper = -Distance_instance->min_distance_to_queryitem(query_point, *upper_box); +Distance_instance->min_distance_to_rectangle(query_point, *upper_box); if (distance_to_box_lower <= distance_to_box_upper) { Cell* C_upper = new Cell(upper_box, N->upper()); Cell_with_distance *Upper_Child = @@ -452,9 +452,9 @@ else { } else { // search furthest NT distance_to_box_lower = -Distance_instance->max_distance_to_queryitem(query_point, *lower_box); +Distance_instance->max_distance_to_rectangle(query_point, *lower_box); NT distance_to_box_upper = -Distance_instance->max_distance_to_queryitem(query_point, *upper_box); +Distance_instance->max_distance_to_rectangle(query_point, *upper_box); if (distance_to_box_lower >= distance_to_box_upper) { Cell* C_upper = new Cell(upper_box, N->upper()); Cell_with_distance *Upper_Child = diff --git a/Packages/Spatial_searching/include/CGAL/K_neighbor_search.h b/Packages/Spatial_searching/include/CGAL/K_neighbor_search.h index 86bdc5bf4e7..6816d7e7fa4 100644 --- a/Packages/Spatial_searching/include/CGAL/K_neighbor_search.h +++ b/Packages/Spatial_searching/include/CGAL/K_neighbor_search.h @@ -190,12 +190,12 @@ public: distance_to_lower_half = distance_instance -> - min_distance_to_queryitem(query_object, + min_distance_to_rectangle(query_object, r_lower); distance_to_upper_half = distance_instance -> - min_distance_to_queryitem(query_object, + min_distance_to_rectangle(query_object, r_upper); @@ -205,12 +205,12 @@ public: distance_to_lower_half = distance_instance -> - max_distance_to_queryitem(query_object, + max_distance_to_rectangle(query_object, r_lower); distance_to_upper_half = distance_instance -> - max_distance_to_queryitem(query_object, + max_distance_to_rectangle(query_object, r_upper); } diff --git a/Packages/Spatial_searching/include/CGAL/Manhattan_distance_iso_box_point.h b/Packages/Spatial_searching/include/CGAL/Manhattan_distance_iso_box_point.h index cb442d9c7bf..738e21e66b2 100644 --- a/Packages/Spatial_searching/include/CGAL/Manhattan_distance_iso_box_point.h +++ b/Packages/Spatial_searching/include/CGAL/Manhattan_distance_iso_box_point.h @@ -65,7 +65,7 @@ namespace CGAL { } - inline NT min_distance_to_queryitem(const QueryItem& q, + inline NT min_distance_to_rectangle(const QueryItem& q, const Kd_tree_rectangle& r) { NT distance = NT(0); typename GeomTraits::Construct_cartesian_const_iterator construct_it; @@ -82,7 +82,7 @@ namespace CGAL { inline NT - max_distance_to_queryitem(const QueryItem& q, + max_distance_to_rectangle(const QueryItem& q, const Kd_tree_rectangle& r) { NT distance=NT(0); typename GeomTraits::Construct_cartesian_const_iterator construct_it; diff --git a/Packages/Spatial_searching/include/CGAL/Orthogonal_incremental_neighbor_search.h b/Packages/Spatial_searching/include/CGAL/Orthogonal_incremental_neighbor_search.h index aada5c03092..323bd19b11c 100644 --- a/Packages/Spatial_searching/include/CGAL/Orthogonal_incremental_neighbor_search.h +++ b/Packages/Spatial_searching/include/CGAL/Orthogonal_incremental_neighbor_search.h @@ -160,10 +160,10 @@ class Iterator_implementation { // if (search_nearest) distance_to_root= - Orthogonal_distance_instance->min_distance_to_queryitem(q, + Orthogonal_distance_instance->min_distance_to_rectangle(q, tree.bounding_box()); // else distance_to_root= - // Orthogonal_Distance_instance->max_distance_to_queryitem(q, + // Orthogonal_Distance_instance->max_distance_to_rectangle(q, // tree.bounding_box()); diff --git a/Packages/Spatial_searching/include/CGAL/Orthogonal_k_neighbor_search.h b/Packages/Spatial_searching/include/CGAL/Orthogonal_k_neighbor_search.h index 8cd6b22be88..6605ab835ef 100644 --- a/Packages/Spatial_searching/include/CGAL/Orthogonal_k_neighbor_search.h +++ b/Packages/Spatial_searching/include/CGAL/Orthogonal_k_neighbor_search.h @@ -136,10 +136,10 @@ Distance* distance_instance; // if (search_nearest) distance_to_root= - d.min_distance_to_queryitem(q, tree.bounding_box()); + d.min_distance_to_rectangle(q, tree.bounding_box()); // else // distance_to_root= - // distance_instance->max_distance_to_queryitem(q, + // distance_instance->max_distance_to_rectangle(q, // tree.bounding_box()); query_object = q; diff --git a/Packages/Spatial_searching/include/CGAL/Weighted_Minkowski_distance.h b/Packages/Spatial_searching/include/CGAL/Weighted_Minkowski_distance.h index 99085132b87..3a0aa22ad07 100644 --- a/Packages/Spatial_searching/include/CGAL/Weighted_Minkowski_distance.h +++ b/Packages/Spatial_searching/include/CGAL/Weighted_Minkowski_distance.h @@ -118,7 +118,7 @@ namespace CGAL { inline NT - min_distance_to_queryitem(const Point& q, + min_distance_to_rectangle(const Point& q, const Kd_tree_rectangle& r) const { NT distance = NT(0); @@ -153,7 +153,7 @@ namespace CGAL { inline NT - max_distance_to_queryitem(const Point& q, + max_distance_to_rectangle(const Point& q, const Kd_tree_rectangle& r) const { NT distance=NT(0); typename GeomTraits::Construct_cartesian_const_iterator construct_it;