From ef5c7835a0c891193e88187c8a8927fab481d3a1 Mon Sep 17 00:00:00 2001 From: Hans Tangelder Date: Tue, 27 May 2003 09:14:06 +0000 Subject: [PATCH] *** empty log message *** --- .../examples/Spatial_searching/Circular_query.C | 2 +- .../examples/Spatial_searching/Example01.C | 2 +- .../examples/Spatial_searching/Example02.C | 2 +- .../examples/Spatial_searching/Example03.C | 2 +- .../examples/Spatial_searching/Example04.C | 2 +- .../examples/Spatial_searching/Example05.C | 2 +- .../examples/Spatial_searching/Example06.C | 2 +- .../examples/Spatial_searching/Example07.C | 4 ++-- .../examples/Spatial_searching/Example08.C | 2 +- .../examples/Spatial_searching/Example09.C | 2 +- .../examples/Spatial_searching/Example10.C | 2 +- .../examples/Spatial_searching/Example11.C | 2 +- .../examples/Spatial_searching/ExampleA.C | 4 ++-- .../examples/Spatial_searching/ExampleB.C | 4 ++-- .../examples/Spatial_searching/ExampleC.C | 2 +- .../examples/Spatial_searching/ExampleD.C | 4 ++-- .../examples/Spatial_searching/ExampleE.C | 2 +- .../examples/Spatial_searching/Fair.C | 11 +++++++---- .../Spatial_searching/Iso_rectangle_2_query.C | 2 +- .../Spatial_searching/Median_of_max_spread.C | 2 +- .../Spatial_searching/Median_of_rectangle.C | 2 +- .../Spatial_searching/Midpoint_of_max_spread.C | 2 +- .../Spatial_searching/Midpoint_of_rectangle.C | 2 +- .../examples/Spatial_searching/Sliding_fair.C | 2 +- .../Spatial_searching/Sliding_midpoint.C | 2 +- .../Spatial_searching/include/CGAL/Kd_tree.h | 10 +++++----- .../include/CGAL/Kd_tree_traits_point.h | 7 +++---- .../include/CGAL/Orthogonal_standard_search.h | 10 +++++----- .../include/CGAL/Weighted_Minkowski_distance.h | 16 ++++++++-------- 29 files changed, 56 insertions(+), 54 deletions(-) diff --git a/Packages/Spatial_searching/examples/Spatial_searching/Circular_query.C b/Packages/Spatial_searching/examples/Spatial_searching/Circular_query.C index 17dcab69f5f..53ef4fd346a 100755 --- a/Packages/Spatial_searching/examples/Spatial_searching/Circular_query.C +++ b/Packages/Spatial_searching/examples/Spatial_searching/Circular_query.C @@ -16,7 +16,7 @@ typedef R::Point_2 Point; typedef CGAL::Creator_uniform_2 Creator; typedef CGAL::Plane_separator Separator; -typedef CGAL::Kd_tree_traits_point Traits; +typedef CGAL::Kd_tree_traits_point Traits; diff --git a/Packages/Spatial_searching/examples/Spatial_searching/Example01.C b/Packages/Spatial_searching/examples/Spatial_searching/Example01.C index 9553057c0e5..d3c1dca3a7e 100755 --- a/Packages/Spatial_searching/examples/Spatial_searching/Example01.C +++ b/Packages/Spatial_searching/examples/Spatial_searching/Example01.C @@ -32,7 +32,7 @@ typedef R::FT FT; typedef R::RT RT; typedef CGAL::Plane_separator Separator; // was double -typedef CGAL::Kd_tree_traits_point Traits; +typedef CGAL::Kd_tree_traits_point Traits; typedef CGAL::Creator_uniform_3 Creator; // was double int main() { diff --git a/Packages/Spatial_searching/examples/Spatial_searching/Example02.C b/Packages/Spatial_searching/examples/Spatial_searching/Example02.C index 0c63483c0a5..e47afc4662a 100755 --- a/Packages/Spatial_searching/examples/Spatial_searching/Example02.C +++ b/Packages/Spatial_searching/examples/Spatial_searching/Example02.C @@ -92,7 +92,7 @@ public: }; // end of class Point typedef CGAL::Plane_separator Separator; - typedef CGAL::Kd_tree_traits_point Traits; + typedef CGAL::Kd_tree_traits_point Traits; typedef CGAL::Creator_uniform_3 Creator; int main() { diff --git a/Packages/Spatial_searching/examples/Spatial_searching/Example03.C b/Packages/Spatial_searching/examples/Spatial_searching/Example03.C index 67dddc36efb..5b1286386b9 100755 --- a/Packages/Spatial_searching/examples/Spatial_searching/Example03.C +++ b/Packages/Spatial_searching/examples/Spatial_searching/Example03.C @@ -23,7 +23,7 @@ typedef CGAL::Point_d Point; typedef CGAL::Plane_separator Separator; - typedef CGAL::Kd_tree_traits_point Traits; + typedef CGAL::Kd_tree_traits_point Traits; int main() { diff --git a/Packages/Spatial_searching/examples/Spatial_searching/Example04.C b/Packages/Spatial_searching/examples/Spatial_searching/Example04.C index 288a542eecb..33326007b6c 100755 --- a/Packages/Spatial_searching/examples/Spatial_searching/Example04.C +++ b/Packages/Spatial_searching/examples/Spatial_searching/Example04.C @@ -178,7 +178,7 @@ inline double inverse_of_transformed_distance(double d) { typedef CGAL::Creator_uniform_3 Creator; typedef CGAL::Plane_separator Separator; -typedef CGAL::Kd_tree_traits_point Traits; +typedef CGAL::Kd_tree_traits_point Traits; typedef CGAL::Orthogonal_standard_search NN_orthogonal_search; typedef CGAL::General_standard_search diff --git a/Packages/Spatial_searching/examples/Spatial_searching/Example05.C b/Packages/Spatial_searching/examples/Spatial_searching/Example05.C index 79f534e02b9..aea04feeccb 100755 --- a/Packages/Spatial_searching/examples/Spatial_searching/Example05.C +++ b/Packages/Spatial_searching/examples/Spatial_searching/Example05.C @@ -28,7 +28,7 @@ typedef Point::R::FT NT; typedef CGAL::Iso_rectangle_d Rectangle; typedef CGAL::Plane_separator Separator; -typedef CGAL::Kd_tree_traits_point Traits; +typedef CGAL::Kd_tree_traits_point Traits; typedef CGAL::L1_distance_rectangle_point L1_distance; typedef CGAL::General_standard_search NN_standard_search; diff --git a/Packages/Spatial_searching/examples/Spatial_searching/Example06.C b/Packages/Spatial_searching/examples/Spatial_searching/Example06.C index 9128acfe1ce..bb903974f26 100755 --- a/Packages/Spatial_searching/examples/Spatial_searching/Example06.C +++ b/Packages/Spatial_searching/examples/Spatial_searching/Example06.C @@ -33,7 +33,7 @@ typedef Point::R::RT RT; typedef CGAL::Iso_cuboid_3 Rectangle; typedef CGAL::Plane_separator Separator; -typedef CGAL::Kd_tree_traits_point Traits; +typedef CGAL::Kd_tree_traits_point Traits; typedef CGAL::L1_distance_rectangle_point L1_distance; typedef CGAL::General_priority_search NN_priority_search; diff --git a/Packages/Spatial_searching/examples/Spatial_searching/Example07.C b/Packages/Spatial_searching/examples/Spatial_searching/Example07.C index 6316cec158f..f9582ce9f1d 100755 --- a/Packages/Spatial_searching/examples/Spatial_searching/Example07.C +++ b/Packages/Spatial_searching/examples/Spatial_searching/Example07.C @@ -28,8 +28,8 @@ typedef Point::R::FT NT; typedef CGAL::Kd_tree_rectangle Rectangle; typedef CGAL::Plane_separator Separator; -typedef CGAL::Kd_tree_traits_point Traits; -typedef CGAL::Weighted_Minkowski_distance Distance; +typedef CGAL::Kd_tree_traits_point Traits; +typedef CGAL::Weighted_Minkowski_distance Distance; typedef CGAL::Orthogonal_standard_search NN_standard_search; diff --git a/Packages/Spatial_searching/examples/Spatial_searching/Example08.C b/Packages/Spatial_searching/examples/Spatial_searching/Example08.C index 66d63c5f3cd..96aaf09444e 100755 --- a/Packages/Spatial_searching/examples/Spatial_searching/Example08.C +++ b/Packages/Spatial_searching/examples/Spatial_searching/Example08.C @@ -176,7 +176,7 @@ inline double inverse_of_transformed_distance(double d) { typedef CGAL::Kd_tree_rectangle Rectangle; typedef CGAL::Plane_separator Separator; -typedef CGAL::Kd_tree_traits_point Traits; +typedef CGAL::Kd_tree_traits_point Traits; typedef CGAL::Orthogonal_priority_search diff --git a/Packages/Spatial_searching/examples/Spatial_searching/Example09.C b/Packages/Spatial_searching/examples/Spatial_searching/Example09.C index d5bb5ae8b4f..ee5042718a9 100755 --- a/Packages/Spatial_searching/examples/Spatial_searching/Example09.C +++ b/Packages/Spatial_searching/examples/Spatial_searching/Example09.C @@ -176,7 +176,7 @@ inline double inverse_of_transformed_distance(double d) { typedef CGAL::Kd_tree_rectangle Rectangle; typedef CGAL::Plane_separator Separator; -typedef CGAL::Kd_tree_traits_point Traits; +typedef CGAL::Kd_tree_traits_point Traits; typedef CGAL::General_priority_search NN_priority_search; diff --git a/Packages/Spatial_searching/examples/Spatial_searching/Example10.C b/Packages/Spatial_searching/examples/Spatial_searching/Example10.C index 82a2eab8aeb..6dddd22215e 100755 --- a/Packages/Spatial_searching/examples/Spatial_searching/Example10.C +++ b/Packages/Spatial_searching/examples/Spatial_searching/Example10.C @@ -23,7 +23,7 @@ typedef CGAL::Point_d Point; typedef CGAL::Plane_separator Separator; - typedef CGAL::Kd_tree_traits_point Traits; + typedef CGAL::Kd_tree_traits_point Traits; int main() { diff --git a/Packages/Spatial_searching/examples/Spatial_searching/Example11.C b/Packages/Spatial_searching/examples/Spatial_searching/Example11.C index 3b2cfed177c..2a9736618ef 100644 --- a/Packages/Spatial_searching/examples/Spatial_searching/Example11.C +++ b/Packages/Spatial_searching/examples/Spatial_searching/Example11.C @@ -17,7 +17,7 @@ typedef CGAL::Simple_cartesian R; typedef R::Point_3 Point; typedef CGAL::Plane_separator Separator; -typedef CGAL::Kd_tree_traits_point Traits; +typedef CGAL::Kd_tree_traits_point Traits; typedef CGAL::Iso_cuboid_3 box; diff --git a/Packages/Spatial_searching/examples/Spatial_searching/ExampleA.C b/Packages/Spatial_searching/examples/Spatial_searching/ExampleA.C index f4ee3ae9b5f..42e81a5a0ca 100755 --- a/Packages/Spatial_searching/examples/Spatial_searching/ExampleA.C +++ b/Packages/Spatial_searching/examples/Spatial_searching/ExampleA.C @@ -16,8 +16,8 @@ typedef CGAL::Point_2 Point; typedef CGAL::Creator_uniform_2 Creator; typedef CGAL::Plane_separator Separator; -typedef CGAL::Kd_tree_traits_point Traits; -typedef CGAL::Weighted_Minkowski_distance Distance; +typedef CGAL::Kd_tree_traits_point Traits; +typedef CGAL::Weighted_Minkowski_distance Distance; typedef CGAL::Orthogonal_standard_search Neighbour_search; diff --git a/Packages/Spatial_searching/examples/Spatial_searching/ExampleB.C b/Packages/Spatial_searching/examples/Spatial_searching/ExampleB.C index 6ed152e3516..df9e2634a8f 100755 --- a/Packages/Spatial_searching/examples/Spatial_searching/ExampleB.C +++ b/Packages/Spatial_searching/examples/Spatial_searching/ExampleB.C @@ -18,8 +18,8 @@ typedef Point::R::FT NT; typedef CGAL::Kd_tree_rectangle Rectangle; typedef CGAL::Plane_separator Separator; -typedef CGAL::Kd_tree_traits_point Traits; -typedef CGAL::Weighted_Minkowski_distance Distance; +typedef CGAL::Kd_tree_traits_point Traits; +typedef CGAL::Weighted_Minkowski_distance Distance; typedef CGAL::General_standard_search Neighbour_search; diff --git a/Packages/Spatial_searching/examples/Spatial_searching/ExampleC.C b/Packages/Spatial_searching/examples/Spatial_searching/ExampleC.C index dd9456a799a..238ab63c5d8 100755 --- a/Packages/Spatial_searching/examples/Spatial_searching/ExampleC.C +++ b/Packages/Spatial_searching/examples/Spatial_searching/ExampleC.C @@ -16,7 +16,7 @@ typedef Point::R::FT NT; typedef CGAL::Iso_rectangle_d Rectangle; typedef CGAL::Plane_separator Separator; -typedef CGAL::Kd_tree_traits_point Traits; +typedef CGAL::Kd_tree_traits_point Traits; // after CGAL/Kernel/function_objectsHd.h diff --git a/Packages/Spatial_searching/examples/Spatial_searching/ExampleD.C b/Packages/Spatial_searching/examples/Spatial_searching/ExampleD.C index 90b4c58d231..7050fb1736f 100755 --- a/Packages/Spatial_searching/examples/Spatial_searching/ExampleD.C +++ b/Packages/Spatial_searching/examples/Spatial_searching/ExampleD.C @@ -17,8 +17,8 @@ typedef Point::R::FT NT; typedef CGAL::Kd_tree_rectangle Rectangle; typedef CGAL::Plane_separator Separator; -typedef CGAL::Kd_tree_traits_point Traits; -typedef CGAL::Weighted_Minkowski_distance Distance; +typedef CGAL::Kd_tree_traits_point Traits; +typedef CGAL::Weighted_Minkowski_distance Distance; typedef CGAL::Orthogonal_priority_search NN_priority_search; diff --git a/Packages/Spatial_searching/examples/Spatial_searching/ExampleE.C b/Packages/Spatial_searching/examples/Spatial_searching/ExampleE.C index 3431aa30a72..af45ce0759c 100755 --- a/Packages/Spatial_searching/examples/Spatial_searching/ExampleE.C +++ b/Packages/Spatial_searching/examples/Spatial_searching/ExampleE.C @@ -167,7 +167,7 @@ inline double inverse_of_transformed_distance(double d) { typedef CGAL::Creator_uniform_3 Creator; typedef CGAL::Plane_separator Separator; -typedef CGAL::Kd_tree_traits_point Traits; +typedef CGAL::Kd_tree_traits_point Traits; typedef CGAL::Orthogonal_standard_search NN_orthogonal_search; typedef CGAL::General_standard_search diff --git a/Packages/Spatial_searching/examples/Spatial_searching/Fair.C b/Packages/Spatial_searching/examples/Spatial_searching/Fair.C index 649f099a480..20e2320fbda 100644 --- a/Packages/Spatial_searching/examples/Spatial_searching/Fair.C +++ b/Packages/Spatial_searching/examples/Spatial_searching/Fair.C @@ -174,17 +174,21 @@ inline double inverse_of_transformed_distance(double d) { typedef CGAL::Kd_tree_rectangle Rectangle; -typedef CGAL::Plane_separator Separator; +// typedef CGAL::Plane_separator Separator; -typedef CGAL::Kd_tree_traits_point > Traits; + +typedef CGAL::Kd_tree_traits_point > Traits; typedef CGAL::Orthogonal_priority_search 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; diff --git a/Packages/Spatial_searching/examples/Spatial_searching/Iso_rectangle_2_query.C b/Packages/Spatial_searching/examples/Spatial_searching/Iso_rectangle_2_query.C index 9e55469784a..21e8b39041a 100755 --- a/Packages/Spatial_searching/examples/Spatial_searching/Iso_rectangle_2_query.C +++ b/Packages/Spatial_searching/examples/Spatial_searching/Iso_rectangle_2_query.C @@ -17,7 +17,7 @@ typedef R::Point_2 Point; typedef CGAL::Creator_uniform_2 Creator; typedef CGAL::Plane_separator Separator; -typedef CGAL::Kd_tree_traits_point Traits; +typedef CGAL::Kd_tree_traits_point Traits; typedef CGAL::Iso_rectangle_2 box; diff --git a/Packages/Spatial_searching/examples/Spatial_searching/Median_of_max_spread.C b/Packages/Spatial_searching/examples/Spatial_searching/Median_of_max_spread.C index 3f58142b916..0cede7d6ae1 100644 --- a/Packages/Spatial_searching/examples/Spatial_searching/Median_of_max_spread.C +++ b/Packages/Spatial_searching/examples/Spatial_searching/Median_of_max_spread.C @@ -176,7 +176,7 @@ inline double inverse_of_transformed_distance(double d) { typedef CGAL::Kd_tree_rectangle Rectangle; typedef CGAL::Plane_separator Separator; -typedef CGAL::Kd_tree_traits_point > Traits; typedef CGAL::Orthogonal_priority_search diff --git a/Packages/Spatial_searching/examples/Spatial_searching/Median_of_rectangle.C b/Packages/Spatial_searching/examples/Spatial_searching/Median_of_rectangle.C index 29e65b81256..929d4ac4539 100644 --- a/Packages/Spatial_searching/examples/Spatial_searching/Median_of_rectangle.C +++ b/Packages/Spatial_searching/examples/Spatial_searching/Median_of_rectangle.C @@ -176,7 +176,7 @@ inline double inverse_of_transformed_distance(double d) { typedef CGAL::Kd_tree_rectangle Rectangle; typedef CGAL::Plane_separator Separator; -typedef CGAL::Kd_tree_traits_point > Traits; typedef CGAL::Orthogonal_priority_search diff --git a/Packages/Spatial_searching/examples/Spatial_searching/Midpoint_of_max_spread.C b/Packages/Spatial_searching/examples/Spatial_searching/Midpoint_of_max_spread.C index 16edb0d2886..ea143c56641 100644 --- a/Packages/Spatial_searching/examples/Spatial_searching/Midpoint_of_max_spread.C +++ b/Packages/Spatial_searching/examples/Spatial_searching/Midpoint_of_max_spread.C @@ -176,7 +176,7 @@ inline double inverse_of_transformed_distance(double d) { typedef CGAL::Kd_tree_rectangle Rectangle; typedef CGAL::Plane_separator Separator; -typedef CGAL::Kd_tree_traits_point > Traits; typedef CGAL::Orthogonal_priority_search diff --git a/Packages/Spatial_searching/examples/Spatial_searching/Midpoint_of_rectangle.C b/Packages/Spatial_searching/examples/Spatial_searching/Midpoint_of_rectangle.C index 3c6b2d58355..0f9c48542c4 100644 --- a/Packages/Spatial_searching/examples/Spatial_searching/Midpoint_of_rectangle.C +++ b/Packages/Spatial_searching/examples/Spatial_searching/Midpoint_of_rectangle.C @@ -176,7 +176,7 @@ inline double inverse_of_transformed_distance(double d) { typedef CGAL::Kd_tree_rectangle Rectangle; typedef CGAL::Plane_separator Separator; -typedef CGAL::Kd_tree_traits_point > Traits; typedef CGAL::Orthogonal_priority_search diff --git a/Packages/Spatial_searching/examples/Spatial_searching/Sliding_fair.C b/Packages/Spatial_searching/examples/Spatial_searching/Sliding_fair.C index 66ce981402f..f69504ba467 100644 --- a/Packages/Spatial_searching/examples/Spatial_searching/Sliding_fair.C +++ b/Packages/Spatial_searching/examples/Spatial_searching/Sliding_fair.C @@ -176,7 +176,7 @@ inline double inverse_of_transformed_distance(double d) { typedef CGAL::Kd_tree_rectangle Rectangle; typedef CGAL::Plane_separator Separator; -typedef CGAL::Kd_tree_traits_point > Traits; typedef CGAL::Orthogonal_priority_search diff --git a/Packages/Spatial_searching/examples/Spatial_searching/Sliding_midpoint.C b/Packages/Spatial_searching/examples/Spatial_searching/Sliding_midpoint.C index 90cba386b91..dc10e732ec5 100644 --- a/Packages/Spatial_searching/examples/Spatial_searching/Sliding_midpoint.C +++ b/Packages/Spatial_searching/examples/Spatial_searching/Sliding_midpoint.C @@ -176,7 +176,7 @@ inline double inverse_of_transformed_distance(double d) { typedef CGAL::Kd_tree_rectangle Rectangle; typedef CGAL::Plane_separator Separator; -typedef CGAL::Kd_tree_traits_point > Traits; typedef CGAL::Orthogonal_priority_search diff --git a/Packages/Spatial_searching/include/CGAL/Kd_tree.h b/Packages/Spatial_searching/include/CGAL/Kd_tree.h index e622e98dc43..c18d0cd7873 100644 --- a/Packages/Spatial_searching/include/CGAL/Kd_tree.h +++ b/Packages/Spatial_searching/include/CGAL/Kd_tree.h @@ -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 // revision : 2.4 // revision_date : 2003/02/01 // authors : Hans Tangelder () -// maintainer : Hans Tangelder () // coordinator : Utrecht University // // ====================================================================== @@ -41,7 +41,7 @@ public: typedef Kd_tree Tree; typedef typename Compact_container::iterator Node_handle; - typedef std::vector::iterator Item_iterator; + typedef typename std::vector::iterator Item_iterator; private: Compact_container nodes; diff --git a/Packages/Spatial_searching/include/CGAL/Kd_tree_traits_point.h b/Packages/Spatial_searching/include/CGAL/Kd_tree_traits_point.h index c32cd62e8ac..121f607c8dc 100755 --- a/Packages/Spatial_searching/include/CGAL/Kd_tree_traits_point.h +++ b/Packages/Spatial_searching/include/CGAL/Kd_tree_traits_point.h @@ -25,15 +25,14 @@ #ifndef CGAL_KD_TREE_TRAITS_POINT_H #define CGAL_KD_TREE_TRAITS_POINT_H #include + namespace CGAL { - template > + template , class Separator_=Plane_separator > class Kd_tree_traits_point { public: - // typedef Separator_ Separator; - // typedef Item_ Item; typedef Item_ Item; typedef Separator_ Separator; typedef Item** Item_iterator; diff --git a/Packages/Spatial_searching/include/CGAL/Orthogonal_standard_search.h b/Packages/Spatial_searching/include/CGAL/Orthogonal_standard_search.h index 52930f2aa3e..124df557d74 100755 --- a/Packages/Spatial_searching/include/CGAL/Orthogonal_standard_search.h +++ b/Packages/Spatial_searching/include/CGAL/Orthogonal_standard_search.h @@ -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 // revision : 2.4 // revision_date : 2002/16/08 // authors : Hans Tangelder () -// maintainer : Hans Tangelder () // coordinator : Utrecht University // // ====================================================================== @@ -46,7 +46,7 @@ typedef typename Tree::Node_handle Node_handle; //private: -typedef Kd_tree::Item_iterator Item_iterator; +typedef typename Kd_tree::Item_iterator Item_iterator; typedef Kd_tree_rectangle Rectangle; private: diff --git a/Packages/Spatial_searching/include/CGAL/Weighted_Minkowski_distance.h b/Packages/Spatial_searching/include/CGAL/Weighted_Minkowski_distance.h index 30ccc5f5daf..7b1f8004e6f 100644 --- a/Packages/Spatial_searching/include/CGAL/Weighted_Minkowski_distance.h +++ b/Packages/Spatial_searching/include/CGAL/Weighted_Minkowski_distance.h @@ -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 // revision : 2.4 // revision_date : 2002/16/08 // authors : Hans Tangelder () -// maintainer : Hans Tangelder () // coordinator : Utrecht University // // ====================================================================== @@ -35,7 +35,7 @@ namespace CGAL { - template + template 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& 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& r) { NT distance=NT(0); if (p == NT(0))