songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

This commit is contained in:
Andreas Fabri 2003-11-17 23:00:05 +00:00
parent e73a0be4c5
commit 1547696504
19 changed files with 53 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Euclidean_distance.tex
View File

@ -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<NT> r);}
\ccMethod{NT min_distance_to_rectangle(Point q, Kd_tree_rectangle<NT> 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<NT> r;);}
\ccMethod{NT max_distance_to_rectangle(Point q, Kd_tree_rectangle<NT> 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}.}

4
Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Euclidean_distance_sphere_point.tex
View File

@ -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<PointTraits> r);}
\ccMethod{NT min_distance_to_rectangle(Sphere s, Kd_tree_rectangle<PointTraits> 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<PointTraits> r);}
\ccMethod{NT max_distance_to_rectangle(Sphere s, Kd_tree_rectangle<PointTraits> r);}
{Returns the maximal distance between the sphere \ccc{s} and
a point from \ccc{r} furthest to \ccc{s}. }

4
Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Manhattan_distance_iso_box_point.tex
View File

@ -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<PointTraits> r);}
\ccMethod{NT min_distance_to_rectangle(IsoBox b, Kd_tree_rectangle<PointTraits> 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<PointTraits> r);}
\ccMethod{NT max_distance_to_rectangle(IsoBox b, Kd_tree_rectangle<PointTraits> r);}
{Returns the maximal distance between the iso-box \ccc{b} and
a point from \ccc{r} furthest to \ccc{b}.}

4
Packages/Spatial_searching/doc_tex/Spatial_searching_ref/Weighted_Minkowski_distance.tex
View File

@ -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<PointTraits> r;);}
\ccMethod{NT min_distance_to_rectangle(Point q, Kd_tree_rectangle<PointTraits> 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<PointTraits> r;);}
\ccMethod{NT max_distance_to_rectangle(Point q, Kd_tree_rectangle<PointTraits> 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}.}

8
Packages/Spatial_searching/doc_tex/Spatial_searching_ref/intro.tex
View File

@ -51,15 +51,15 @@ classes that are described in the reference pages.
\ccHeading{Classes}
\ccRefIdfierPage{CGAL::Euclidean_distance<PointTraits>} \\
\ccRefIdfierPage{CGAL::Euclidean_distance_sphere_point<SpatialPoint,Sphere>} \\
\ccRefIdfierPage{CGAL::Euclidean_distance_sphere_point<PointTraits,Sphere>} \\
\ccRefIdfierPage{CGAL::Fair<PointTraits, PointContainer, SpatialSeparator>} \\
\ccRefIdfierPage{CGAL::Fuzzy_iso_box<PointTraits, IsoBox>} \\
\ccRefIdfierPage{CGAL::Fuzzy_sphere<PointTraits>} \\
\ccRefIdfierPage{CGAL::Incremental_neighbor_search<PointTraits, GeneralDistance, Splitter, SpatialTree>} \\
\ccRefIdfierPage{CGAL::K_neighbor_search<PointTraits, GeneralDistance, Splitter, SpatialTree>} \\
\ccRefIdfierPage{CGAL::Kd_tree<PointTraits>} \\
\ccRefIdfierPage{CGAL::Kd_tree_node<PointTraits>} \\
\ccRefIdfierPage{CGAL::Kd_tree_rectangle<NT>} \\
\ccRefIdfierPage{CGAL::Kd_tree<PointTraits, Splitter, UseExtendedNode>} \\
\ccRefIdfierPage{CGAL::Kd_tree_node<PointTraits, Splitter, UseExtendedNode>} \\
\ccRefIdfierPage{CGAL::Kd_tree_rectangle<PointTraits>} \\
\ccRefIdfierPage{CGAL::Kd_tree_traits_point<NT_, Point_, CartesianConstIterator,ConstructCartesianConstIterator>} \\
\ccRefIdfierPage{CGAL::Kd_tree_traits_point_2<Kernel>}\\
\ccRefIdfierPage{CGAL::Kd_tree_traits_point_3<Kernel>}\\

4
Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Euclidean_distance.tex
View File

@ -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<NT> r);}
\ccMethod{NT min_distance_to_rectangle(Point q, Kd_tree_rectangle<NT> 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<NT> r;);}
\ccMethod{NT max_distance_to_rectangle(Point q, Kd_tree_rectangle<NT> 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}.}

4
Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Euclidean_distance_sphere_point.tex
View File

@ -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<PointTraits> r);}
\ccMethod{NT min_distance_to_rectangle(Sphere s, Kd_tree_rectangle<PointTraits> 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<PointTraits> r);}
\ccMethod{NT max_distance_to_rectangle(Sphere s, Kd_tree_rectangle<PointTraits> r);}
{Returns the maximal distance between the sphere \ccc{s} and
a point from \ccc{r} furthest to \ccc{s}. }

4
Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Manhattan_distance_iso_box_point.tex
View File

@ -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<PointTraits> r);}
\ccMethod{NT min_distance_to_rectangle(IsoBox b, Kd_tree_rectangle<PointTraits> 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<PointTraits> r);}
\ccMethod{NT max_distance_to_rectangle(IsoBox b, Kd_tree_rectangle<PointTraits> r);}
{Returns the maximal distance between the iso-box \ccc{b} and
a point from \ccc{r} furthest to \ccc{b}.}

4
Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/Weighted_Minkowski_distance.tex
View File

@ -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<PointTraits> r;);}
\ccMethod{NT min_distance_to_rectangle(Point q, Kd_tree_rectangle<PointTraits> 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<PointTraits> r;);}
\ccMethod{NT max_distance_to_rectangle(Point q, Kd_tree_rectangle<PointTraits> 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}.}

8
Packages/Spatial_searching/doc_tex/basic/Spatial_searching_ref/intro.tex
View File

@ -51,15 +51,15 @@ classes that are described in the reference pages.
\ccHeading{Classes}
\ccRefIdfierPage{CGAL::Euclidean_distance<PointTraits>} \\
\ccRefIdfierPage{CGAL::Euclidean_distance_sphere_point<SpatialPoint,Sphere>} \\
\ccRefIdfierPage{CGAL::Euclidean_distance_sphere_point<PointTraits,Sphere>} \\
\ccRefIdfierPage{CGAL::Fair<PointTraits, PointContainer, SpatialSeparator>} \\
\ccRefIdfierPage{CGAL::Fuzzy_iso_box<PointTraits, IsoBox>} \\
\ccRefIdfierPage{CGAL::Fuzzy_sphere<PointTraits>} \\
\ccRefIdfierPage{CGAL::Incremental_neighbor_search<PointTraits, GeneralDistance, Splitter, SpatialTree>} \\
\ccRefIdfierPage{CGAL::K_neighbor_search<PointTraits, GeneralDistance, Splitter, SpatialTree>} \\
\ccRefIdfierPage{CGAL::Kd_tree<PointTraits>} \\
\ccRefIdfierPage{CGAL::Kd_tree_node<PointTraits>} \\
\ccRefIdfierPage{CGAL::Kd_tree_rectangle<NT>} \\
\ccRefIdfierPage{CGAL::Kd_tree<PointTraits, Splitter, UseExtendedNode>} \\
\ccRefIdfierPage{CGAL::Kd_tree_node<PointTraits, Splitter, UseExtendedNode>} \\
\ccRefIdfierPage{CGAL::Kd_tree_rectangle<PointTraits>} \\
\ccRefIdfierPage{CGAL::Kd_tree_traits_point<NT_, Point_, CartesianConstIterator,ConstructCartesianConstIterator>} \\
\ccRefIdfierPage{CGAL::Kd_tree_traits_point_2<Kernel>}\\
\ccRefIdfierPage{CGAL::Kd_tree_traits_point_3<Kernel>}\\

4
Packages/Spatial_searching/examples/Spatial_searching/Point.h
View File

@ -67,7 +67,7 @@ public:
}
template <class TreeTraits>
double min_distance_to_queryitem(const Point& p,
double min_distance_to_rectangle(const Point& p,
const CGAL::Kd_tree_rectangle<TreeTraits>& b) const
{
double distance(0.0);
@ -85,7 +85,7 @@ public:
}
template <class TreeTraits>
double max_distance_to_queryitem(const Point& p,
double max_distance_to_rectangle(const Point& p,
const CGAL::Kd_tree_rectangle<TreeTraits>& b) const
{
double distance(0.0);

9
Packages/Spatial_searching/include/CGAL/Euclidean_distance.h
View File

@ -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<GeomTraits>& 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<GeomTraits>& r) const {
inline NT max_distance_to_rectangle(const Point& q,
const Kd_tree_rectangle<GeomTraits>& r) const {
NT distance=NT(0);
typename GeomTraits::Construct_cartesian_const_iterator construct_it;
typename GeomTraits::Cartesian_const_iterator qit = construct_it(q),

15
Packages/Spatial_searching/include/CGAL/Euclidean_distance_sphere_point.h
View File

@ -29,24 +29,21 @@
namespace CGAL {
template <class GeomTraits, class QueryItem>
template <class GeomTraits, class Sphere>
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<GeomTraits>& r) const {
inline NT min_distance_to_rectangle(const Sphere& q,
const Kd_tree_rectangle<GeomTraits>& 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<GeomTraits>& r) const {
Point c=q.center();
NT distance=NT(0);

12
Packages/Spatial_searching/include/CGAL/Incremental_neighbor_search.h
View File

@ -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 =

8
Packages/Spatial_searching/include/CGAL/K_neighbor_search.h
View File

@ -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);
}

4
Packages/Spatial_searching/include/CGAL/Manhattan_distance_iso_box_point.h
View File

@ -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<GeomTraits>& 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<GeomTraits>& r) {
NT distance=NT(0);
typename GeomTraits::Construct_cartesian_const_iterator construct_it;

4
Packages/Spatial_searching/include/CGAL/Orthogonal_incremental_neighbor_search.h
View File

@ -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());

4
Packages/Spatial_searching/include/CGAL/Orthogonal_k_neighbor_search.h
View File

@ -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;

4
Packages/Spatial_searching/include/CGAL/Weighted_Minkowski_distance.h
View File

@ -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<GeomTraits>& 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<GeomTraits>& r) const {
NT distance=NT(0);
typename GeomTraits::Construct_cartesian_const_iterator construct_it;