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:
Hans Tangelder 2003-05-27 09:14:06 +00:00
parent b87b1017b3
commit ef5c7835a0
29 changed files with 56 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Packages/Spatial_searching/examples/Spatial_searching/Circular_query.C
View File

@ -16,7 +16,7 @@ typedef R::Point_2 Point;
typedef CGAL::Creator_uniform_2<double,Point> Creator;
typedef CGAL::Plane_separator<double> Separator;
typedef CGAL::Kd_tree_traits_point<Separator,Point> Traits;
typedef CGAL::Kd_tree_traits_point<Point> Traits;

2
Packages/Spatial_searching/examples/Spatial_searching/Example01.C
View File

@ -32,7 +32,7 @@ typedef R::FT FT;
typedef R::RT RT;
typedef CGAL::Plane_separator<FT> Separator; // was double
typedef CGAL::Kd_tree_traits_point<Separator,Point> Traits;
typedef CGAL::Kd_tree_traits_point<Point> Traits;
typedef CGAL::Creator_uniform_3<RT,Point> Creator; // was double
int main() {

2
Packages/Spatial_searching/examples/Spatial_searching/Example02.C
View File

@ -92,7 +92,7 @@ public:
}; // end of class Point
typedef CGAL::Plane_separator<double> Separator;
typedef CGAL::Kd_tree_traits_point<Separator,Point> Traits;
typedef CGAL::Kd_tree_traits_point<Point> Traits;
typedef CGAL::Creator_uniform_3<double,Point> Creator;
int main() {

2
Packages/Spatial_searching/examples/Spatial_searching/Example03.C
View File

@ -23,7 +23,7 @@
typedef CGAL::Point_d<R> Point;
typedef CGAL::Plane_separator<double> Separator;
typedef CGAL::Kd_tree_traits_point<Separator,Point> Traits;
typedef CGAL::Kd_tree_traits_point<Point> Traits;
int main() {

2
Packages/Spatial_searching/examples/Spatial_searching/Example04.C
View File

@ -178,7 +178,7 @@ inline double inverse_of_transformed_distance(double d) {
typedef CGAL::Creator_uniform_3<double,Point> Creator;
typedef CGAL::Plane_separator<double> Separator;
typedef CGAL::Kd_tree_traits_point<Separator,Point> Traits;
typedef CGAL::Kd_tree_traits_point<Point> Traits;
typedef CGAL::Orthogonal_standard_search<Traits, Point, Point3D_distance>
NN_orthogonal_search;
typedef CGAL::General_standard_search<Traits, Point, Point3D_distance>

2
Packages/Spatial_searching/examples/Spatial_searching/Example05.C
View File

@ -28,7 +28,7 @@ typedef Point::R::FT NT;
typedef CGAL::Iso_rectangle_d<R> Rectangle;
typedef CGAL::Plane_separator<NT> Separator;
typedef CGAL::Kd_tree_traits_point<Separator,Point> Traits;
typedef CGAL::Kd_tree_traits_point<Point> Traits;
typedef CGAL::L1_distance_rectangle_point<Rectangle,Point> L1_distance;
typedef CGAL::General_standard_search<Traits, Rectangle, L1_distance>
NN_standard_search;

2
Packages/Spatial_searching/examples/Spatial_searching/Example06.C
View File

@ -33,7 +33,7 @@ typedef Point::R::RT RT;
typedef CGAL::Iso_cuboid_3<R> Rectangle;
typedef CGAL::Plane_separator<FT> Separator;
typedef CGAL::Kd_tree_traits_point<Separator,Point> Traits;
typedef CGAL::Kd_tree_traits_point<Point> Traits;
typedef CGAL::L1_distance_rectangle_point<Rectangle,Point> L1_distance;
typedef CGAL::General_priority_search<Traits, Rectangle, L1_distance>
NN_priority_search;

4
Packages/Spatial_searching/examples/Spatial_searching/Example07.C
View File

@ -28,8 +28,8 @@ typedef Point::R::FT NT;
typedef CGAL::Kd_tree_rectangle<NT> Rectangle;
typedef CGAL::Plane_separator<NT> Separator;
typedef CGAL::Kd_tree_traits_point<Separator,Point> Traits;
typedef CGAL::Weighted_Minkowski_distance<Point, Point> Distance;
typedef CGAL::Kd_tree_traits_point<Point> Traits;
typedef CGAL::Weighted_Minkowski_distance<Point> Distance;
typedef CGAL::Orthogonal_standard_search<Traits, Point, Distance>
NN_standard_search;

2
Packages/Spatial_searching/examples/Spatial_searching/Example08.C
View File

@ -176,7 +176,7 @@ inline double inverse_of_transformed_distance(double d) {
typedef CGAL::Kd_tree_rectangle<double> Rectangle;
typedef CGAL::Plane_separator<double> Separator;
typedef CGAL::Kd_tree_traits_point<Separator,Point> Traits;
typedef CGAL::Kd_tree_traits_point<Point> Traits;
typedef CGAL::Orthogonal_priority_search<Traits, Point, Point3D_distance>

2
Packages/Spatial_searching/examples/Spatial_searching/Example09.C
View File

@ -176,7 +176,7 @@ inline double inverse_of_transformed_distance(double d) {
typedef CGAL::Kd_tree_rectangle<double> Rectangle;
typedef CGAL::Plane_separator<double> Separator;
typedef CGAL::Kd_tree_traits_point<Separator,Point> Traits;
typedef CGAL::Kd_tree_traits_point<Point> Traits;
typedef CGAL::General_priority_search<Traits, Point, Point3D_distance>
NN_priority_search;

2
Packages/Spatial_searching/examples/Spatial_searching/Example10.C
View File

@ -23,7 +23,7 @@
typedef CGAL::Point_d<R> Point;
typedef CGAL::Plane_separator<double> Separator;
typedef CGAL::Kd_tree_traits_point<Separator,Point> Traits;
typedef CGAL::Kd_tree_traits_point<Point> Traits;
int main() {

2
Packages/Spatial_searching/examples/Spatial_searching/Example11.C
View File

@ -17,7 +17,7 @@ typedef CGAL::Simple_cartesian<double> R;
typedef R::Point_3 Point;
typedef CGAL::Plane_separator<double> Separator;
typedef CGAL::Kd_tree_traits_point<Separator,Point> Traits;
typedef CGAL::Kd_tree_traits_point<Point> Traits;
typedef CGAL::Iso_cuboid_3<R> box;

4
Packages/Spatial_searching/examples/Spatial_searching/ExampleA.C
View File

@ -16,8 +16,8 @@ typedef CGAL::Point_2<R> Point;
typedef CGAL::Creator_uniform_2<double,Point> Creator;
typedef CGAL::Plane_separator<double> Separator;
typedef CGAL::Kd_tree_traits_point<Separator,Point> Traits;
typedef CGAL::Weighted_Minkowski_distance<Point, Point> Distance;
typedef CGAL::Kd_tree_traits_point<Point> Traits;
typedef CGAL::Weighted_Minkowski_distance<Point> Distance;
typedef CGAL::Orthogonal_standard_search<Traits, Point, Distance>
Neighbour_search;

4
Packages/Spatial_searching/examples/Spatial_searching/ExampleB.C
View File

@ -18,8 +18,8 @@ typedef Point::R::FT NT;
typedef CGAL::Kd_tree_rectangle<NT> Rectangle;
typedef CGAL::Plane_separator<NT> Separator;
typedef CGAL::Kd_tree_traits_point<Separator,Point> Traits;
typedef CGAL::Weighted_Minkowski_distance<Point, Point> Distance;
typedef CGAL::Kd_tree_traits_point<Point> Traits;
typedef CGAL::Weighted_Minkowski_distance<Point> Distance;
typedef CGAL::General_standard_search<Traits, Point, Distance>
Neighbour_search;

2
Packages/Spatial_searching/examples/Spatial_searching/ExampleC.C
View File

@ -16,7 +16,7 @@ typedef Point::R::FT NT;
typedef CGAL::Iso_rectangle_d<R> Rectangle;
typedef CGAL::Plane_separator<NT> Separator;
typedef CGAL::Kd_tree_traits_point<Separator,Point> Traits;
typedef CGAL::Kd_tree_traits_point<Point> Traits;
// after CGAL/Kernel/function_objectsHd.h

4
Packages/Spatial_searching/examples/Spatial_searching/ExampleD.C
View File

@ -17,8 +17,8 @@ typedef Point::R::FT NT;
typedef CGAL::Kd_tree_rectangle<NT> Rectangle;
typedef CGAL::Plane_separator<NT> Separator;
typedef CGAL::Kd_tree_traits_point<Separator,Point> Traits;
typedef CGAL::Weighted_Minkowski_distance<Point, Point> Distance;
typedef CGAL::Kd_tree_traits_point<Point> Traits;
typedef CGAL::Weighted_Minkowski_distance<Point> Distance;
typedef CGAL::Orthogonal_priority_search<Traits, Point, Distance>
NN_priority_search;

2
Packages/Spatial_searching/examples/Spatial_searching/ExampleE.C
View File

@ -167,7 +167,7 @@ inline double inverse_of_transformed_distance(double d) {
typedef CGAL::Creator_uniform_3<double,Point> Creator;
typedef CGAL::Plane_separator<double> Separator;
typedef CGAL::Kd_tree_traits_point<Separator,Point> Traits;
typedef CGAL::Kd_tree_traits_point<Point> Traits;
typedef CGAL::Orthogonal_standard_search<Traits, Point, Point3D_distance>
NN_orthogonal_search;
typedef CGAL::General_standard_search<Traits, Point, Point3D_distance>

11
Packages/Spatial_searching/examples/Spatial_searching/Fair.C
View File

@ -174,17 +174,21 @@ inline double inverse_of_transformed_distance(double d) {
typedef CGAL::Kd_tree_rectangle<double> Rectangle;
typedef CGAL::Plane_separator<double> Separator;
// typedef CGAL::Plane_separator<double> Separator;
typedef CGAL::Kd_tree_traits_point<Separator,Point,
// typedef CGAL::Kd_tree_traits_point<Separator,Point,
// CGAL::Fair<Point> > Traits;
typedef CGAL::Kd_tree_traits_point<Point,
CGAL::Fair<Point> > Traits;
typedef CGAL::Orthogonal_priority_search<Traits, Point, Point3D_distance>
NN_priority_search;
int main() {
std::cout << "test started" << std::endl;
std::cout << "test started" << std::endl;
int bucket_size=1;
const int dim=3;
@ -205,7 +209,6 @@ int main() {
data_points.push_front(Random_point);
}
Traits tr(bucket_size, 3.0, true);
Point3D_distance tr_dist;

2
Packages/Spatial_searching/examples/Spatial_searching/Iso_rectangle_2_query.C
View File

@ -17,7 +17,7 @@ typedef R::Point_2 Point;
typedef CGAL::Creator_uniform_2<double,Point> Creator;
typedef CGAL::Plane_separator<double> Separator;
typedef CGAL::Kd_tree_traits_point<Separator,Point> Traits;
typedef CGAL::Kd_tree_traits_point<Point> Traits;
typedef CGAL::Iso_rectangle_2<R> box;

2
Packages/Spatial_searching/examples/Spatial_searching/Median_of_max_spread.C
View File

@ -176,7 +176,7 @@ inline double inverse_of_transformed_distance(double d) {
typedef CGAL::Kd_tree_rectangle<double> Rectangle;
typedef CGAL::Plane_separator<double> Separator;
typedef CGAL::Kd_tree_traits_point<Separator,Point,
typedef CGAL::Kd_tree_traits_point<Point,
CGAL::Median_of_max_spread<Point> > Traits;
typedef CGAL::Orthogonal_priority_search<Traits, Point, Point3D_distance>

2
Packages/Spatial_searching/examples/Spatial_searching/Median_of_rectangle.C
View File

@ -176,7 +176,7 @@ inline double inverse_of_transformed_distance(double d) {
typedef CGAL::Kd_tree_rectangle<double> Rectangle;
typedef CGAL::Plane_separator<double> Separator;
typedef CGAL::Kd_tree_traits_point<Separator,Point,
typedef CGAL::Kd_tree_traits_point<Point,
CGAL::Median_of_rectangle<Point> > Traits;
typedef CGAL::Orthogonal_priority_search<Traits, Point, Point3D_distance>

2
Packages/Spatial_searching/examples/Spatial_searching/Midpoint_of_max_spread.C
View File

@ -176,7 +176,7 @@ inline double inverse_of_transformed_distance(double d) {
typedef CGAL::Kd_tree_rectangle<double> Rectangle;
typedef CGAL::Plane_separator<double> Separator;
typedef CGAL::Kd_tree_traits_point<Separator,Point,
typedef CGAL::Kd_tree_traits_point<Point,
CGAL::Midpoint_of_max_spread<Point> > Traits;
typedef CGAL::Orthogonal_priority_search<Traits, Point, Point3D_distance>

2
Packages/Spatial_searching/examples/Spatial_searching/Midpoint_of_rectangle.C
View File

@ -176,7 +176,7 @@ inline double inverse_of_transformed_distance(double d) {
typedef CGAL::Kd_tree_rectangle<double> Rectangle;
typedef CGAL::Plane_separator<double> Separator;
typedef CGAL::Kd_tree_traits_point<Separator,Point,
typedef CGAL::Kd_tree_traits_point<Point,
CGAL::Midpoint_of_rectangle<Point> > Traits;
typedef CGAL::Orthogonal_priority_search<Traits, Point, Point3D_distance>

2
Packages/Spatial_searching/examples/Spatial_searching/Sliding_fair.C
View File

@ -176,7 +176,7 @@ inline double inverse_of_transformed_distance(double d) {
typedef CGAL::Kd_tree_rectangle<double> Rectangle;
typedef CGAL::Plane_separator<double> Separator;
typedef CGAL::Kd_tree_traits_point<Separator,Point,
typedef CGAL::Kd_tree_traits_point<Point,
CGAL::Sliding_fair<Point> > Traits;
typedef CGAL::Orthogonal_priority_search<Traits, Point, Point3D_distance>

2
Packages/Spatial_searching/examples/Spatial_searching/Sliding_midpoint.C
View File

@ -176,7 +176,7 @@ inline double inverse_of_transformed_distance(double d) {
typedef CGAL::Kd_tree_rectangle<double> Rectangle;
typedef CGAL::Plane_separator<double> Separator;
typedef CGAL::Kd_tree_traits_point<Separator,Point,
typedef CGAL::Kd_tree_traits_point<Point,
CGAL::Sliding_midpoint<Point> > Traits;
typedef CGAL::Orthogonal_priority_search<Traits, Point, Point3D_distance>

10
Packages/Spatial_searching/include/CGAL/Kd_tree.h
View File

@ -8,15 +8,15 @@
//
// ----------------------------------------------------------------------
//
// release :
// release_date :
// release : $CGAL_Revision: CGAL-2.5-I-99 $
// release_date : $CGAL_Date: 2003/05/23 $
//
// file : include/CGAL/Kd_tree.h
// package : ASPAS
// package : ASPAS (3.12)
// maintainer : Hans Tangelder <hanst@cs.uu.nl>
// revision : 2.4
// revision_date : 2003/02/01
// authors : Hans Tangelder (<hanst@cs.uu.nl>)
// maintainer : Hans Tangelder (<hanst@cs.uu.nl>)
// coordinator : Utrecht University
//
// ======================================================================
@ -41,7 +41,7 @@ public:
typedef Kd_tree<Traits> Tree;
typedef typename Compact_container<Node>::iterator Node_handle;
typedef std::vector<Item*>::iterator Item_iterator;
typedef typename std::vector<Item*>::iterator Item_iterator;
private:
Compact_container<Node> nodes;

7
Packages/Spatial_searching/include/CGAL/Kd_tree_traits_point.h
View File

@ -25,15 +25,14 @@
#ifndef CGAL_KD_TREE_TRAITS_POINT_H
#define CGAL_KD_TREE_TRAITS_POINT_H
#include <CGAL/Splitters.h>
namespace CGAL {
template <class Separator_, class Item_,
class Splitter=Sliding_midpoint<Item_> >
template <class Item_,
class Splitter=Sliding_midpoint<Item_>, class Separator_=Plane_separator<typename Item_::R::FT> >
class Kd_tree_traits_point {
public:
// typedef Separator_ Separator;
// typedef Item_ Item;
typedef Item_ Item;
typedef Separator_ Separator;
typedef Item** Item_iterator;

10
Packages/Spatial_searching/include/CGAL/Orthogonal_standard_search.h
View File

@ -8,15 +8,15 @@
//
// ----------------------------------------------------------------------
//
// release :
// release_date :
// release : $CGAL_Revision: CGAL-2.5-I-99 $
// release_date : $CGAL_Date: 2003/05/23 $
//
// file : include/CGAL/Orthogonal_standard_search.h
// package : ASPAS
// package : ASPAS (3.12)
// maintainer : Hans Tangelder <hanst@cs.uu.nl>
// revision : 2.4
// revision_date : 2002/16/08
// authors : Hans Tangelder (<hanst@cs.uu.nl>)
// maintainer : Hans Tangelder (<hanst@cs.uu.nl>)
// coordinator : Utrecht University
//
// ======================================================================
@ -46,7 +46,7 @@ typedef typename Tree::Node_handle Node_handle;
//private:
typedef Kd_tree<Traits>::Item_iterator Item_iterator;
typedef typename Kd_tree<Traits>::Item_iterator Item_iterator;
typedef Kd_tree_rectangle<NT> Rectangle;
private:

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

@ -8,15 +8,15 @@
//
// ----------------------------------------------------------------------
//
// release :
// release_date :
// release : $CGAL_Revision: CGAL-2.5-I-99 $
// release_date : $CGAL_Date: 2003/05/23 $
//
// file : include/CGAL/Weighted_Minkowski_distance.h
// package : ASPAS
// package : ASPAS (3.12)
// maintainer : Hans Tangelder <hanst@cs.uu.nl>
// revision : 2.4
// revision_date : 2002/16/08
// authors : Hans Tangelder (<hanst@cs.uu.nl>)
// maintainer : Hans Tangelder (<hanst@cs.uu.nl>)
// coordinator : Utrecht University
//
// ======================================================================
@ -35,7 +35,7 @@
namespace CGAL {
template <class Query_item, class Item>
template <class Item>
class Weighted_Minkowski_distance {
public:
@ -79,7 +79,7 @@ namespace CGAL {
delete The_weights;
};
inline NT distance(const Query_item& p1, const Item& p2) {
inline NT distance(const Item& p1, const Item& p2) {
NT distance = NT(0);
if (p == NT(0)) {
for (unsigned int i = 0; i < The_dimension; ++i)
@ -94,7 +94,7 @@ namespace CGAL {
}
inline NT min_distance_to_queryitem(const Query_item& Point,
inline NT min_distance_to_queryitem(const Item& Point,
const Kd_tree_rectangle<NT>& r) {
NT distance = NT(0);
if (p == NT(0))
@ -124,7 +124,7 @@ namespace CGAL {
return distance;
}
inline NT max_distance_to_queryitem(const Query_item& Point,
inline NT max_distance_to_queryitem(const Item& Point,
const Kd_tree_rectangle<NT>& r) {
NT distance=NT(0);
if (p == NT(0))