From 8f94bc329b0d01bc02218d1191b20be5ba8d5243 Mon Sep 17 00:00:00 2001
From: "m.overtheil" <m.overtheil@gmail.com>
Date: Fri, 31 Oct 2014 15:01:20 +0100
Subject: [PATCH 1/5] Replaced all int dimension with dimension_tags

---
 .../Spatial_searching/CMakeLists.txt          |   1 +
 .../benchmark/Spatial_searching/nn3cgal.cpp   | 109 +++++++++
 .../include/CGAL/Euclidean_distance.h         |   5 +-
 .../include/CGAL/K_neighbor_search.h          |   3 +-
 Spatial_searching/include/CGAL/Kd_tree.h      |   7 +-
 Spatial_searching/include/CGAL/Kd_tree_node.h |   3 +-
 .../include/CGAL/Kd_tree_rectangle.h          | 208 +++++++++++++++++-
 .../include/CGAL/Point_container.h            |  10 +-
 .../include/CGAL/Search_traits.h              |   6 +-
 .../include/CGAL/Search_traits_2.h            |   2 +
 .../include/CGAL/Search_traits_3.h            |   4 +-
 .../include/CGAL/Search_traits_d.h            |   4 +-
 12 files changed, 335 insertions(+), 27 deletions(-)
 create mode 100644 Spatial_searching/benchmark/Spatial_searching/nn3cgal.cpp

diff --git a/Spatial_searching/benchmark/Spatial_searching/CMakeLists.txt b/Spatial_searching/benchmark/Spatial_searching/CMakeLists.txt
index 39144c0325a..79f9dafedc3 100644
--- a/Spatial_searching/benchmark/Spatial_searching/CMakeLists.txt
+++ b/Spatial_searching/benchmark/Spatial_searching/CMakeLists.txt
@@ -33,6 +33,7 @@ if ( CGAL_FOUND )
   create_single_source_cgal_program( "Nearest_neighbor_searching_2D.cpp" )
   create_single_source_cgal_program( "Nearest_neighbor_searching_2D_user_defined.cpp" )
   create_single_source_cgal_program( "Split_data.cpp" )
+create_single_source_cgal_program( "nn3cgal.cpp" )
 
 else()
   
diff --git a/Spatial_searching/benchmark/Spatial_searching/nn3cgal.cpp b/Spatial_searching/benchmark/Spatial_searching/nn3cgal.cpp
new file mode 100644
index 00000000000..cc924681225
--- /dev/null
+++ b/Spatial_searching/benchmark/Spatial_searching/nn3cgal.cpp
@@ -0,0 +1,109 @@
+
+#include <CGAL/Simple_cartesian.h>
+#include <CGAL/K_neighbor_search.h>
+#include <CGAL/Orthogonal_k_neighbor_search.h>
+#include <CGAL/Search_traits_3.h>
+#include <CGAL/Search_traits_2.h>
+#include <CGAL/Orthogonal_k_neighbor_search.h>
+#include <CGAL/Timer.h>
+#include <CGAL/Memory_sizer.h>
+
+#include <iostream>
+#include <fstream>
+
+#include <boost/lexical_cast.hpp>
+
+typedef CGAL::Simple_cartesian<double> K;
+typedef CGAL::Search_traits_3<K> TreeTraits_3;
+//typedef CGAL::Search_traits_2<K> TreeTraits_3;
+typedef K::Point_3 Point_3;
+typedef CGAL::Euclidean_distance<TreeTraits_3> Distance;
+typedef CGAL::Sliding_midpoint<TreeTraits_3> Splitter;
+typedef CGAL::Orthogonal_k_neighbor_search<TreeTraits_3,Distance,Splitter> Neighbor_search_3;
+typedef Neighbor_search_3::Tree Tree_3;
+typedef CGAL::Timer Timer;
+
+
+typedef std::vector<Point_3> Points;
+		 
+
+void read(Points& points, char* argv)
+{
+  int d, n;
+  Point_3 p;
+#if 0
+  std::ifstream data(argv);
+  data >> d >> n;
+  assert(d == 3);
+  points.reserve(n);
+  while(data >> p){
+    points.push_back(p);
+  }
+  data.close();
+    
+#else
+ std::ifstream data(argv, std::ios::in | std::ios::binary);
+  CGAL::set_binary_mode(data);
+  CGAL::read(data,d);
+  CGAL::read(data,n);
+
+  points.reserve(n);
+  for(int i=0; i < n; i++){
+    data >> p;
+    points.push_back(p);
+  }
+#endif
+  data.close();
+}
+
+int main(int argc,char *argv[]) 
+{
+  int NN_number = 10;
+  Points query_points_3, data_points_3;
+
+  Point_3 p;
+  Timer t;
+
+  read(data_points_3, argv[1]);
+  read(query_points_3, argv[2]);
+ 
+  int bucketsize = (argc>3) ? boost::lexical_cast<int>(argv[3]) : 10;
+  std::cerr << "bucketsize = "  << bucketsize <<std::endl;
+
+  t.start();
+  // Insert data points in the tree
+  Splitter splitter(bucketsize);
+  Tree_3 tree(data_points_3.begin(), data_points_3.end(),splitter);
+  tree.build();
+  t.stop();
+  std::cerr << "build " << t.time() << " sec\n";
+  int items=0,leafs=0,internals=0;
+  Points result(NN_number);
+
+  t.reset();t.start();
+  bool dump = true;
+  for(Points::iterator it = query_points_3.begin(); it != query_points_3.end(); ++it) {
+    // Initialize the search structure, and search all NN_number neighbors
+    Neighbor_search_3 search(tree, *it, NN_number);
+    int i=0;
+    for (Neighbor_search_3::iterator it = search.begin(); it != search.end();it++, i++) {
+      result[i] = it->first;
+      if(dump){
+        std::cerr << result[i] << std::endl;
+      }
+	}
+	if(dump){
+		tree.statistics(std::cerr);
+		//tree.print();
+	}
+    dump = false;
+//	items += search.items_visited();
+//	leafs += search.leafs_visited();
+//	internals += search.internals_visited();
+  }
+  t.stop();
+  std::cerr << "queries " << t.time() << " sec\n";
+  std::cerr << items <<" items "<<internals<<" internals "<<leafs<< " leafs visited\n";
+  std::cerr << "done\n";
+  return 0;
+}
diff --git a/Spatial_searching/include/CGAL/Euclidean_distance.h b/Spatial_searching/include/CGAL/Euclidean_distance.h
index 4d1031431af..4cbbbd2fdc7 100644
--- a/Spatial_searching/include/CGAL/Euclidean_distance.h
+++ b/Spatial_searching/include/CGAL/Euclidean_distance.h
@@ -46,6 +46,7 @@ namespace CGAL {
     typedef typename SearchTraits::FT    FT;
     typedef typename SearchTraits::Point_d Point_d;
     typedef Point_d Query_item;
+	typedef typename SearchTraits::Dimension D;
 
     	// default constructor
     	Euclidean_distance(const SearchTraits& traits_=SearchTraits()):traits(traits_) {}
@@ -64,7 +65,7 @@ namespace CGAL {
 
 
 	inline FT min_distance_to_rectangle(const Query_item& q,
-					    const Kd_tree_rectangle<FT>& r) const {
+					    const Kd_tree_rectangle<FT,D>& r) const {
 		FT distance = FT(0);
 		typename SearchTraits::Construct_cartesian_const_iterator_d construct_it=traits.construct_cartesian_const_iterator_d_object();
                 typename SearchTraits::Cartesian_const_iterator_d qit = construct_it(q),
@@ -82,7 +83,7 @@ namespace CGAL {
 	}
 
 	inline FT max_distance_to_rectangle(const Query_item& q,
-					     const Kd_tree_rectangle<FT>& r) const {
+					     const Kd_tree_rectangle<FT,D>& r) const {
 		FT distance=FT(0);
 		typename SearchTraits::Construct_cartesian_const_iterator_d construct_it=traits.construct_cartesian_const_iterator_d_object();
                 typename SearchTraits::Cartesian_const_iterator_d qit = construct_it(q),
diff --git a/Spatial_searching/include/CGAL/K_neighbor_search.h b/Spatial_searching/include/CGAL/K_neighbor_search.h
index 434650a1206..4ec5474a0ad 100644
--- a/Spatial_searching/include/CGAL/K_neighbor_search.h
+++ b/Spatial_searching/include/CGAL/K_neighbor_search.h
@@ -34,6 +34,7 @@ class K_neighbor_search: public internal::K_neighbor_search<SearchTraits,Distanc
   
 public:
   typedef typename Base::FT FT;  
+  typedef typename SearchTraits::DIMENSION D;
 
   K_neighbor_search(const Tree& tree, const typename Base::Query_item& q,  
     unsigned int k=1, FT Eps=FT(0.0), bool Search_nearest=true, const Distance& d=Distance(),bool sorted=true)
@@ -49,7 +50,7 @@ private:
   using Base::branch;
 
   void 
-  compute_neighbors_general(typename Base::Node_const_handle N, const Kd_tree_rectangle<FT>& r) 
+  compute_neighbors_general(typename Base::Node_const_handle N, const Kd_tree_rectangle<FT,D>& r) 
   {
     if (!(N->is_leaf())) {
       this->number_of_internal_nodes_visited++;
diff --git a/Spatial_searching/include/CGAL/Kd_tree.h b/Spatial_searching/include/CGAL/Kd_tree.h
index 2d541378128..9e5df76f019 100644
--- a/Spatial_searching/include/CGAL/Kd_tree.h
+++ b/Spatial_searching/include/CGAL/Kd_tree.h
@@ -60,6 +60,7 @@ public:
   typedef typename std::vector<Point_d>::const_iterator const_iterator;
 
   typedef typename std::vector<Point_d>::size_type size_type;
+  typedef typename SearchTraits::Dimension D;
 
 private:
   SearchTraits traits_;
@@ -68,7 +69,7 @@ private:
 
   Node_handle tree_root;
 
-  Kd_tree_rectangle<FT>* bbox;
+  Kd_tree_rectangle<FT,D>* bbox;
   std::vector<Point_d> pts;
 
   // Instead of storing the points in arrays in the Kd_tree_node
@@ -210,7 +211,7 @@ public:
       data.push_back(&pts[i]);
     }
     Point_container c(dim, data.begin(), data.end(),traits_);
-    bbox = new Kd_tree_rectangle<FT>(c.bounding_box());
+    bbox = new Kd_tree_rectangle<FT,D>(c.bounding_box());
     if (c.size() <= split.bucket_size()){
       tree_root = create_leaf_node(c);
     }else {
@@ -335,7 +336,7 @@ public:
     root()->print();
   }
 
-  const Kd_tree_rectangle<FT>&
+  const Kd_tree_rectangle<FT,D>&
   bounding_box() const
   {
     if(! is_built()){
diff --git a/Spatial_searching/include/CGAL/Kd_tree_node.h b/Spatial_searching/include/CGAL/Kd_tree_node.h
index 9d082536a87..43b6b87884c 100644
--- a/Spatial_searching/include/CGAL/Kd_tree_node.h
+++ b/Spatial_searching/include/CGAL/Kd_tree_node.h
@@ -42,6 +42,7 @@ namespace CGAL {
     typedef typename TreeTraits::FT FT;
     typedef typename Kd_tree<TreeTraits,Splitter,UseExtendedNode>::Separator Separator;
     typedef typename Kd_tree<TreeTraits,Splitter,UseExtendedNode>::Point_d_iterator Point_d_iterator;
+	typedef typename TreeTraits::Dimension D;
 
   private:
 
@@ -264,7 +265,7 @@ namespace CGAL {
     template <class OutputIterator, class FuzzyQueryItem>
     OutputIterator 
     search(OutputIterator it, const FuzzyQueryItem& q,
-	   Kd_tree_rectangle<FT>& b) const
+	   Kd_tree_rectangle<FT,D>& b) const
     {
       if (is_leaf()) { 
 	if (n>0) 
diff --git a/Spatial_searching/include/CGAL/Kd_tree_rectangle.h b/Spatial_searching/include/CGAL/Kd_tree_rectangle.h
index a10ac002749..639647a9d8f 100644
--- a/Spatial_searching/include/CGAL/Kd_tree_rectangle.h
+++ b/Spatial_searching/include/CGAL/Kd_tree_rectangle.h
@@ -25,6 +25,8 @@
 #include <algorithm>
 #include <new>
 #include <CGAL/assertions.h>
+#include <CGAL/array.h>
+#include <CGAL/Dimension.h>
 
 namespace CGAL {
 
@@ -53,8 +55,189 @@ namespace CGAL {
   };
 
 
-  template <class FT_> 
+  template <class FT_, typename D> 
   class Kd_tree_rectangle {
+  public:
+    typedef FT_ FT;
+    typedef FT T;
+    
+  private:
+    
+    //int dim;
+    CGAL::cpp11::array<T,D::value> lower_;
+    CGAL::cpp11::array<T,D::value> upper_;
+    int max_span_coord_;
+    
+  public:
+    
+    inline void 
+    set_upper_bound(int i, const FT& x) 
+    {
+      CGAL_assertion(i >= 0 && i < D);
+      CGAL_assertion(x >= lower_[i]);
+      upper_[i] = x;
+      set_max_span();
+    }
+
+    inline void 
+    set_lower_bound(int i, const FT& x) 
+    {
+      CGAL_assertion(i >= 0 && i < D);
+      CGAL_assertion(x <= upper_[i]);
+      lower_[i] = x;
+      set_max_span();
+    }
+
+    inline void 
+    set_max_span() 
+    {
+      FT span = upper_[0]-lower_[0];
+      max_span_coord_ = 0;
+      for (int i = 1; i < D::value; ++i) {
+	FT tmp = upper_[i] - lower_[i];
+	if (span < tmp) {
+	  span = tmp;
+	  max_span_coord_ = i;
+	}
+      }
+    }
+    
+    Kd_tree_rectangle(int d) 
+      : max_span_coord_(0)
+    {
+      lower_.assign(FT(0));
+      upper_.assign(FT(0));
+    }
+
+    Kd_tree_rectangle() 
+    {}
+    
+    
+    explicit 
+    Kd_tree_rectangle(const Kd_tree_rectangle<FT,D>& r) 
+    : max_span_coord_(r.max_span_coord_) 
+    {
+      lower_ = r.lower_;
+      upper_ = r.upper_;
+    }
+
+    template <class Construct_cartesian_const_iterator_d,class PointPointerIter>
+    void update_from_point_pointers(PointPointerIter begin, 
+                                    PointPointerIter end,
+                                    const Construct_cartesian_const_iterator_d& construct_it
+    ) 
+    {
+      if (begin ==end)
+        return;
+      // initialize with values of first point
+      typename Construct_cartesian_const_iterator_d::result_type bit = construct_it(**begin);
+      
+      for (int i=0; i < D::value; ++i, ++bit) {
+        lower_[i]= *bit; upper_[i]=lower_[i];
+      }
+      begin++;
+      typedef typename std::iterator_traits<PointPointerIter>::value_type P;
+      std::for_each(begin, end,set_bounds_from_pointer<Construct_cartesian_const_iterator_d,P,T>(D::value, &(lower_[0]), &(upper_[0]), construct_it));
+      set_max_span();
+    }
+    
+    template <class Construct_cartesian_const_iterator_d,class PointPointerIter> // was PointIter
+    Kd_tree_rectangle(int d,  PointPointerIter begin,  PointPointerIter end,const Construct_cartesian_const_iterator_d& construct_it)
+    {
+      update_from_point_pointers<Construct_cartesian_const_iterator_d>(begin,end,construct_it);
+    }
+
+    inline int 
+    max_span_coord() const 
+    { 
+      return max_span_coord_; 
+    }
+
+    inline FT 
+    max_span() const 
+    {
+      return upper_[max_span_coord_] - lower_[max_span_coord_];
+    }
+
+    inline FT 
+    min_coord(int i) const 
+    {
+      CGAL_assertion(lower_ != NULL);
+      return lower_[i];
+    }
+    
+    inline FT 
+    max_coord(int i) const 
+    {
+      return upper_[i];
+    }
+    
+    std::ostream& 
+    print(std::ostream& s) const 
+    {
+      s << "Rectangle dimension = " << D;
+      s << "\n lower: ";
+      for (int i=0; i < D; ++i)
+	s << lower_[i] << " ";
+      // std::copy(lower_, lower_ + D,
+      // 	      std::ostream_iterator<FT>(s," "));
+      s << "\n upper: ";
+      for (int j=0; j < D; ++j)
+	s << upper_[j] << " ";
+      // std::copy(upper_, upper_ + D,
+      //	      std::ostream_iterator<FT>(s," "));
+      s << "\n maximum span " << max_span() <<
+	" at coordinate " << max_span_coord() << std::endl;
+      return s;
+    }
+    
+    // Splits rectangle by modifying itself to lower half 
+    // and returns upper half
+    //    Kd_tree_rectangle* 
+    void
+    split(Kd_tree_rectangle& r, int d, FT value)
+    {
+      CGAL_assertion(d >= 0 && d < D);
+      CGAL_assertion(lower_[d] <= value && value <= upper_[d]);
+      
+      //Kd_tree_rectangle* r = new Kd_tree_rectangle(*this);
+      upper_[d]=value;
+      r.lower_[d]=value;
+      //return r;
+    }
+    
+
+    int 
+    dimension() const 
+    {
+      return D::value;
+    }
+
+    const T* lower() const {return lower_;}
+    const T* upper() const {return upper_;}    
+ 
+    Kd_tree_rectangle<FT,D>& 
+    operator=(const Kd_tree_rectangle<FT,D>& r) 
+    {
+      CGAL_assertion(dimension() == r.dimension());
+      if (this != &r) {
+        lower_ = r.lower_;
+        upper_ = r.upper_;
+	set_max_span();
+      }
+      return *this;
+    }
+
+  
+
+  }; // of class Kd_tree_rectangle
+
+
+  // Partial specialization for dimension == 0, which means dimension at runtime
+
+  template <class FT_> 
+  class Kd_tree_rectangle<FT_, Dynamic_dimension_tag> {
+
   public:
     typedef FT_ FT;
     typedef FT T;
@@ -62,8 +245,8 @@ namespace CGAL {
   private:
     
     int dim;
-    T *lower_;
-    T *upper_;
+    T* lower_;
+    T* upper_;
     int max_span_coord_;
     
   public:
@@ -109,11 +292,12 @@ namespace CGAL {
 
     Kd_tree_rectangle() 
       : dim(0), lower_(0), upper_(0) 
-    {}
+    {
+}
     
     
     explicit 
-    Kd_tree_rectangle(const Kd_tree_rectangle<FT>& r) 
+    Kd_tree_rectangle(const Kd_tree_rectangle<FT,Dynamic_dimension_tag>& r) 
       : dim(r.dim), lower_(new FT[dim]), upper_(new FT[dim]), 
 	max_span_coord_(r.max_span_coord_) 
     {
@@ -143,7 +327,7 @@ namespace CGAL {
     
     template <class Construct_cartesian_const_iterator_d,class PointPointerIter> // was PointIter
     Kd_tree_rectangle(int d,  PointPointerIter begin,  PointPointerIter end,const Construct_cartesian_const_iterator_d& construct_it)
-      : dim(d), lower_(new FT[d]), upper_(new FT[d]) 
+      : dim(d), lower_(new FT[d]), upper_(new FT[d])
     {
       update_from_point_pointers<Construct_cartesian_const_iterator_d>(begin,end,construct_it);
     }
@@ -215,7 +399,7 @@ namespace CGAL {
 	if (upper_) delete [] upper_;
       }
     }
-
+    
     int 
     dimension() const 
     {
@@ -225,8 +409,8 @@ namespace CGAL {
     const T* lower() const {return lower_;}
     const T* upper() const {return upper_;}    
  
-    Kd_tree_rectangle<FT>& 
-    operator=(const Kd_tree_rectangle<FT>& r) 
+    Kd_tree_rectangle<FT,Dynamic_dimension_tag>& 
+    operator=(const Kd_tree_rectangle<FT,Dynamic_dimension_tag>& r) 
     {
       CGAL_assertion(dimension() == r.dimension());
       if (this != &r) {
@@ -239,11 +423,11 @@ namespace CGAL {
 
   
 
-  }; // of class Kd_tree_rectangle
+  }; // of partial specialization of class Kd_tree_rectangle<FT,0>
 
-  template <class FT>
+  template <class FT, typename D>
   std::ostream& 
-  operator<<(std::ostream& s, const Kd_tree_rectangle<FT>& r) 
+  operator<<(std::ostream& s, const Kd_tree_rectangle<FT,D>& r) 
   {
     return r.print(s);
   }
diff --git a/Spatial_searching/include/CGAL/Point_container.h b/Spatial_searching/include/CGAL/Point_container.h
index b3f44264756..6ca8100ef6a 100644
--- a/Spatial_searching/include/CGAL/Point_container.h
+++ b/Spatial_searching/include/CGAL/Point_container.h
@@ -45,7 +45,7 @@ public:
   
   typedef typename Point_vector::iterator iterator;
   typedef typename Point_vector::const_iterator const_iterator;
-  
+  typedef typename Traits::Dimension D;
 private:
   Traits traits;
   // the iterator range of the Point_container 
@@ -53,20 +53,20 @@ private:
   boost::optional<iterator> m_e ;
   
   int built_coord;    // a coordinate for which the pointer list is built
-  Kd_tree_rectangle<FT> bbox;       // bounding box, i.e. rectangle of node
-  Kd_tree_rectangle<FT> tbox;       // tight bounding box, 
+  Kd_tree_rectangle<FT,D> bbox;       // bounding box, i.e. rectangle of node
+  Kd_tree_rectangle<FT,D> tbox;       // tight bounding box, 
   // i.e. minimal enclosing bounding
   // box of points
 	                	    
 public:
 
-  inline const Kd_tree_rectangle<FT>& 
+  inline const Kd_tree_rectangle<FT,D>& 
   bounding_box() const 
   { 
     return bbox; 
   }
   
-  inline const Kd_tree_rectangle<FT>&
+  inline const Kd_tree_rectangle<FT,D>&
   tight_bounding_box() const 
   { 
     return tbox; 
diff --git a/Spatial_searching/include/CGAL/Search_traits.h b/Spatial_searching/include/CGAL/Search_traits.h
index fb39d0d28ef..6af99f50e08 100644
--- a/Spatial_searching/include/CGAL/Search_traits.h
+++ b/Spatial_searching/include/CGAL/Search_traits.h
@@ -21,13 +21,17 @@
 
 #ifndef CGAL_KD_TREE_TRAITS_POINT_H
 #define CGAL_KD_TREE_TRAITS_POINT_H
+#include <CGAL\Dimension.h>
 
 
 namespace CGAL {
-  template <class FT_, class Point, class CartesianCoordinateIterator, class ConstructCartesianCoordinateIterator>
+  template <class FT_, class Point, class CartesianCoordinateIterator, class ConstructCartesianCoordinateIterator, int D>
   class Search_traits {
     
   public:
+
+    typedef typename Dimension_tag<D> Dimension;
+
     typedef CartesianCoordinateIterator Cartesian_const_iterator_d;
     typedef ConstructCartesianCoordinateIterator Construct_cartesian_const_iterator_d;
     typedef Point Point_d;
diff --git a/Spatial_searching/include/CGAL/Search_traits_2.h b/Spatial_searching/include/CGAL/Search_traits_2.h
index 666591a8ad3..07e80e3331f 100644
--- a/Spatial_searching/include/CGAL/Search_traits_2.h
+++ b/Spatial_searching/include/CGAL/Search_traits_2.h
@@ -21,6 +21,7 @@
 
 #ifndef CGAL_SEARCH_TRAITS_2_H
 #define CGAL_SEARCH_TRAITS_2_H
+#include <CGAL\Dimension.h>
 
 namespace CGAL {
 
@@ -30,6 +31,7 @@ namespace CGAL {
   class Search_traits_2 {
 
   public:
+    typedef typename Dimension_tag<2> Dimension;
     typedef typename K::Point_2 Point_d;
     typedef typename K::Iso_rectangle_2 Iso_box_d;
     typedef typename K::Circle_2 Sphere_d;
diff --git a/Spatial_searching/include/CGAL/Search_traits_3.h b/Spatial_searching/include/CGAL/Search_traits_3.h
index 9c6288d7825..8cd8bf3d49e 100644
--- a/Spatial_searching/include/CGAL/Search_traits_3.h
+++ b/Spatial_searching/include/CGAL/Search_traits_3.h
@@ -21,6 +21,7 @@
 
 #ifndef CGAL_SEARCH_TRAITS_3_H
 #define CGAL_SEARCH_TRAITS_3_H
+#include <CGAL\Dimension.h>
 
 namespace CGAL {
 
@@ -30,7 +31,8 @@ namespace CGAL {
   class Search_traits_3 {
 
   public:
-    
+
+   typedef typename Dimension_tag<3> Dimension;
     typedef typename K::Cartesian_const_iterator_3 Cartesian_const_iterator_d;
     typedef typename K::Construct_cartesian_const_iterator_3 Construct_cartesian_const_iterator_d;
     typedef typename K::Point_3 Point_d;
diff --git a/Spatial_searching/include/CGAL/Search_traits_d.h b/Spatial_searching/include/CGAL/Search_traits_d.h
index b0aba510310..8c2f3c31de0 100644
--- a/Spatial_searching/include/CGAL/Search_traits_d.h
+++ b/Spatial_searching/include/CGAL/Search_traits_d.h
@@ -21,13 +21,15 @@
 
 #ifndef CGAL_SEARCH_TRAITS_D_H
 #define CGAL_SEARCH_TRAITS_D_H
+#include <CGAL\Dimension.h>
 
 namespace CGAL {
 
-  template <class K>
+  template <class K,typename D = Dynamic_dimension_tag>
   class Search_traits_d {
 
   public:
+	  typedef typename D Dimension;
     typedef typename K::Cartesian_const_iterator_d Cartesian_const_iterator_d;
     typedef typename K::Construct_cartesian_const_iterator_d Construct_cartesian_const_iterator_d;
     typedef typename K::Construct_iso_box_d Construct_iso_box_d;

From 9a7660b6fa6231d5955fdf13a023bd6143b40c31 Mon Sep 17 00:00:00 2001
From: "m.overtheil" <m.overtheil@gmail.com>
Date: Mon, 3 Nov 2014 11:15:49 +0100
Subject: [PATCH 2/5] Added compatibility for traits without dimension_tag

---
 .../include/CGAL/Euclidean_distance.h         | 26 ++++++++++++++++-
 .../include/CGAL/K_neighbor_search.h          | 27 +++++++++++++++--
 Spatial_searching/include/CGAL/Kd_tree.h      | 29 +++++++++++++++++--
 Spatial_searching/include/CGAL/Kd_tree_node.h |  4 +--
 .../include/CGAL/Kd_tree_rectangle.h          |  2 +-
 .../include/CGAL/Point_container.h            | 24 ++++++++++++++-
 .../include/CGAL/Search_traits.h              |  4 +--
 .../include/CGAL/Search_traits_d.h            |  5 ++--
 8 files changed, 107 insertions(+), 14 deletions(-)

diff --git a/Spatial_searching/include/CGAL/Euclidean_distance.h b/Spatial_searching/include/CGAL/Euclidean_distance.h
index 4cbbbd2fdc7..44721407007 100644
--- a/Spatial_searching/include/CGAL/Euclidean_distance.h
+++ b/Spatial_searching/include/CGAL/Euclidean_distance.h
@@ -21,13 +21,35 @@
 
 #ifndef CGAL_EUCLIDEAN_DISTANCE_H
 #define CGAL_EUCLIDEAN_DISTANCE_H
+
 #include <CGAL/Kd_tree_rectangle.h>
 #include <CGAL/number_utils.h>
+#include <CGAL/Dimension.h>
+#include <boost/mpl/has_xxx.hpp>
+
+
+#ifndef HAS_DIMENSION
+#define HAS_DIMENSION
+BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(has_dimension,Dimension,false);
+#endif
 
 namespace CGAL {
 
   template <class SearchTraits>
   class Euclidean_distance;
+
+  template <class SearchTraits, bool has_dim = has_dimension<SearchTraits>::value>
+  struct Euclidean_distance_base;
+
+  template <class SearchTraits>
+  struct Euclidean_distance_base<SearchTraits,true>{
+	  typedef typename SearchTraits::Dimension Dimension;
+  };
+
+  template <class SearchTraits>
+  struct Euclidean_distance_base<SearchTraits,false>{
+	  typedef Dynamic_dimension_tag Dimension;
+  };
   
   namespace internal{
     template <class SearchTraits>
@@ -46,7 +68,9 @@ namespace CGAL {
     typedef typename SearchTraits::FT    FT;
     typedef typename SearchTraits::Point_d Point_d;
     typedef Point_d Query_item;
-	typedef typename SearchTraits::Dimension D;
+
+	typedef typename Euclidean_distance_base<SearchTraits>::Dimension D;
+	
 
     	// default constructor
     	Euclidean_distance(const SearchTraits& traits_=SearchTraits()):traits(traits_) {}
diff --git a/Spatial_searching/include/CGAL/K_neighbor_search.h b/Spatial_searching/include/CGAL/K_neighbor_search.h
index 4ec5474a0ad..abab45987ab 100644
--- a/Spatial_searching/include/CGAL/K_neighbor_search.h
+++ b/Spatial_searching/include/CGAL/K_neighbor_search.h
@@ -22,9 +22,30 @@
 #define  CGAL_K_NEIGHBOR_SEARCH_H
 
 #include <CGAL/internal/K_neighbor_search.h>
+#include <boost/mpl/has_xxx.hpp>
+
+
+#ifndef HAS_DIMENSION
+#define HAS_DIMENSION
+BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(has_dimension,Dimension,false);
+#endif
 
 namespace CGAL {
+	template <class SearchTraits, class Distance,class Splitter,class Tree>
+class K_neighbor_search;
 
+	template <class SearchTraits, bool has_dim = has_dimension<SearchTraits>::value>
+  struct K_neighbor_search_base;
+
+  template <class SearchTraits>
+  struct K_neighbor_search_base<SearchTraits,true>{
+	  typedef typename SearchTraits::Dimension Dimension;
+  };
+
+  template <class SearchTraits>
+  struct K_neighbor_search_base<SearchTraits,false>{
+	  typedef Dynamic_dimension_tag Dimension;
+  };
 template <class SearchTraits, 
           class Distance= typename internal::Spatial_searching_default_distance<SearchTraits>::type,
           class Splitter= Sliding_midpoint<SearchTraits> ,
@@ -34,7 +55,7 @@ class K_neighbor_search: public internal::K_neighbor_search<SearchTraits,Distanc
   
 public:
   typedef typename Base::FT FT;  
-  typedef typename SearchTraits::DIMENSION D;
+  typedef typename K_neighbor_search_base<SearchTraits>::Dimension D;
 
   K_neighbor_search(const Tree& tree, const typename Base::Query_item& q,  
     unsigned int k=1, FT Eps=FT(0.0), bool Search_nearest=true, const Distance& d=Distance(),bool sorted=true)
@@ -57,10 +78,10 @@ private:
       int new_cut_dim=N->cutting_dimension();
       FT  new_cut_val=N->cutting_value();
 
-      Kd_tree_rectangle<FT> r_lower(r);
+      Kd_tree_rectangle<FT,D> r_lower(r);
 
       // modifies also r_lower to lower half
-      Kd_tree_rectangle<FT> r_upper(r_lower);
+      Kd_tree_rectangle<FT,D> r_upper(r_lower);
       r_lower.split(r_upper, new_cut_dim, new_cut_val);
 
       FT distance_to_lower_half;
diff --git a/Spatial_searching/include/CGAL/Kd_tree.h b/Spatial_searching/include/CGAL/Kd_tree.h
index 9e5df76f019..94077a21d7d 100644
--- a/Spatial_searching/include/CGAL/Kd_tree.h
+++ b/Spatial_searching/include/CGAL/Kd_tree.h
@@ -29,6 +29,12 @@
 #include <CGAL/Kd_tree_node.h>
 #include <CGAL/Splitters.h>
 #include <CGAL/Compact_container.h>
+#include <boost/mpl/has_xxx.hpp>
+
+#ifndef HAS_DIMENSION
+#define HAS_DIMENSION
+BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(has_dimension,Dimension,false);
+#endif
 
 #ifdef CGAL_HAS_THREADS
 #include <boost/thread/mutex.hpp>
@@ -36,6 +42,22 @@
 
 namespace CGAL {
 
+	template <class SearchTraits, class Splitter_, class UseExtendedNode >
+class Kd_tree;
+
+ template <class SearchTraits, bool has_dim = has_dimension<SearchTraits>::value>
+  struct Kd_tree_base;
+
+  template <class SearchTraits>
+  struct Kd_tree_base<SearchTraits,true>{
+	  typedef typename SearchTraits::Dimension Dimension;
+  };
+
+  template <class SearchTraits>
+  struct Kd_tree_base<SearchTraits,false>{
+	  typedef Dynamic_dimension_tag Dimension;
+  };
+
   //template <class SearchTraits, class Splitter_=Median_of_rectangle<SearchTraits>, class UseExtendedNode = Tag_true >
 template <class SearchTraits, class Splitter_=Sliding_midpoint<SearchTraits>, class UseExtendedNode = Tag_true >
 class Kd_tree {
@@ -60,7 +82,10 @@ public:
   typedef typename std::vector<Point_d>::const_iterator const_iterator;
 
   typedef typename std::vector<Point_d>::size_type size_type;
-  typedef typename SearchTraits::Dimension D;
+
+  
+
+  typedef typename Kd_tree_base<SearchTraits>::Dimension D;
 
 private:
   SearchTraits traits_;
@@ -290,7 +315,7 @@ public:
       if(! is_built()){
 	const_build();
       }
-      Kd_tree_rectangle<FT> b(*bbox);
+      Kd_tree_rectangle<FT,D> b(*bbox);
       tree_root->search(it,q,b);
     }
     return it;
diff --git a/Spatial_searching/include/CGAL/Kd_tree_node.h b/Spatial_searching/include/CGAL/Kd_tree_node.h
index 43b6b87884c..734028305dc 100644
--- a/Spatial_searching/include/CGAL/Kd_tree_node.h
+++ b/Spatial_searching/include/CGAL/Kd_tree_node.h
@@ -42,7 +42,7 @@ namespace CGAL {
     typedef typename TreeTraits::FT FT;
     typedef typename Kd_tree<TreeTraits,Splitter,UseExtendedNode>::Separator Separator;
     typedef typename Kd_tree<TreeTraits,Splitter,UseExtendedNode>::Point_d_iterator Point_d_iterator;
-	typedef typename TreeTraits::Dimension D;
+	typedef typename Kd_tree<TreeTraits,Splitter,UseExtendedNode>::D D;
 
   private:
 
@@ -275,7 +275,7 @@ namespace CGAL {
       }
       else {
 	// after splitting b denotes the lower part of b
-	Kd_tree_rectangle<FT> b_upper(b);
+	Kd_tree_rectangle<FT,D> b_upper(b);
 	b.split(b_upper, sep.cutting_dimension(),
 		sep.cutting_value());
                              
diff --git a/Spatial_searching/include/CGAL/Kd_tree_rectangle.h b/Spatial_searching/include/CGAL/Kd_tree_rectangle.h
index 639647a9d8f..632e29fed45 100644
--- a/Spatial_searching/include/CGAL/Kd_tree_rectangle.h
+++ b/Spatial_searching/include/CGAL/Kd_tree_rectangle.h
@@ -233,7 +233,7 @@ namespace CGAL {
   }; // of class Kd_tree_rectangle
 
 
-  // Partial specialization for dimension == 0, which means dimension at runtime
+  // Partial specialization for dynamic dimension, which means dimension at runtime
 
   template <class FT_> 
   class Kd_tree_rectangle<FT_, Dynamic_dimension_tag> {
diff --git a/Spatial_searching/include/CGAL/Point_container.h b/Spatial_searching/include/CGAL/Point_container.h
index 6ca8100ef6a..0a181e7c07c 100644
--- a/Spatial_searching/include/CGAL/Point_container.h
+++ b/Spatial_searching/include/CGAL/Point_container.h
@@ -30,9 +30,31 @@
 #include <CGAL/Kd_tree_rectangle.h>
 
 #include <boost/optional.hpp>
+#ifndef HAS_DIMENSION
+#define HAS_DIMENSION
+BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(has_dimension,Dimension,false);
+#endif
+
+
 
 namespace CGAL {
 
+	template <class Traits> 
+class Point_container;
+
+	template <class SearchTraits, bool has_dim = has_dimension<SearchTraits>::value>
+  struct Point_container_base;
+
+  template <class SearchTraits>
+  struct Point_container_base<SearchTraits,true>{
+	  typedef typename SearchTraits::Dimension Dimension;
+  };
+
+  template <class SearchTraits>
+  struct Point_container_base<SearchTraits,false>{
+	  typedef Dynamic_dimension_tag Dimension;
+  };
+
 template <class Traits> 
 class Point_container {
 
@@ -45,7 +67,7 @@ public:
   
   typedef typename Point_vector::iterator iterator;
   typedef typename Point_vector::const_iterator const_iterator;
-  typedef typename Traits::Dimension D;
+  typedef typename Point_container_base<Traits>::Dimension D;
 private:
   Traits traits;
   // the iterator range of the Point_container 
diff --git a/Spatial_searching/include/CGAL/Search_traits.h b/Spatial_searching/include/CGAL/Search_traits.h
index 6af99f50e08..33b4474324e 100644
--- a/Spatial_searching/include/CGAL/Search_traits.h
+++ b/Spatial_searching/include/CGAL/Search_traits.h
@@ -25,12 +25,12 @@
 
 
 namespace CGAL {
-  template <class FT_, class Point, class CartesianCoordinateIterator, class ConstructCartesianCoordinateIterator, int D>
+  template <class FT_, class Point, class CartesianCoordinateIterator, class ConstructCartesianCoordinateIterator, typename D>
   class Search_traits {
     
   public:
 
-    typedef typename Dimension_tag<D> Dimension;
+    typedef D Dimension;
 
     typedef CartesianCoordinateIterator Cartesian_const_iterator_d;
     typedef ConstructCartesianCoordinateIterator Construct_cartesian_const_iterator_d;
diff --git a/Spatial_searching/include/CGAL/Search_traits_d.h b/Spatial_searching/include/CGAL/Search_traits_d.h
index 8c2f3c31de0..5648511b436 100644
--- a/Spatial_searching/include/CGAL/Search_traits_d.h
+++ b/Spatial_searching/include/CGAL/Search_traits_d.h
@@ -21,15 +21,16 @@
 
 #ifndef CGAL_SEARCH_TRAITS_D_H
 #define CGAL_SEARCH_TRAITS_D_H
-#include <CGAL\Dimension.h>
+#include <CGAL/Dimension.h>
 
 namespace CGAL {
 
+
   template <class K,typename D = Dynamic_dimension_tag>
   class Search_traits_d {
 
   public:
-	  typedef typename D Dimension;
+	  typedef D Dimension;
     typedef typename K::Cartesian_const_iterator_d Cartesian_const_iterator_d;
     typedef typename K::Construct_cartesian_const_iterator_d Construct_cartesian_const_iterator_d;
     typedef typename K::Construct_iso_box_d Construct_iso_box_d;

From 19f729802ac7c3fce7431ed5e51933f8b6accd9a Mon Sep 17 00:00:00 2001
From: "m.overtheil" <m.overtheil@gmail.com>
Date: Mon, 3 Nov 2014 12:02:51 +0100
Subject: [PATCH 3/5] Moved to namespace internal,renamed HAS_DIMENSION to
 HAS_DIMENSION_TAG

---
 .../include/CGAL/Euclidean_distance.h         | 40 ++++++++++---------
 .../include/CGAL/K_neighbor_search.h          | 14 ++++---
 Spatial_searching/include/CGAL/Kd_tree.h      | 30 +++++++++-----
 .../include/CGAL/Point_container.h            | 29 +++++++++-----
 4 files changed, 67 insertions(+), 46 deletions(-)

diff --git a/Spatial_searching/include/CGAL/Euclidean_distance.h b/Spatial_searching/include/CGAL/Euclidean_distance.h
index 44721407007..eb2f45f44a2 100644
--- a/Spatial_searching/include/CGAL/Euclidean_distance.h
+++ b/Spatial_searching/include/CGAL/Euclidean_distance.h
@@ -28,30 +28,32 @@
 #include <boost/mpl/has_xxx.hpp>
 
 
-#ifndef HAS_DIMENSION
-#define HAS_DIMENSION
-BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(has_dimension,Dimension,false);
-#endif
-
 namespace CGAL {
 
   template <class SearchTraits>
   class Euclidean_distance;
 
-  template <class SearchTraits, bool has_dim = has_dimension<SearchTraits>::value>
-  struct Euclidean_distance_base;
-
-  template <class SearchTraits>
-  struct Euclidean_distance_base<SearchTraits,true>{
-	  typedef typename SearchTraits::Dimension Dimension;
-  };
-
-  template <class SearchTraits>
-  struct Euclidean_distance_base<SearchTraits,false>{
-	  typedef Dynamic_dimension_tag Dimension;
-  };
-  
+    
   namespace internal{
+	    #ifndef HAS_DIMENSION_TAG
+		#define HAS_DIMENSION_TAG
+		BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(has_dimension,Dimension,false);
+		#endif
+
+	  template <class SearchTraits, bool has_dim = has_dimension<SearchTraits>::value>
+	  struct Euclidean_distance_base;
+
+	  template <class SearchTraits>
+	  struct Euclidean_distance_base<SearchTraits,true>{
+		  typedef typename SearchTraits::Dimension Dimension;
+	  };
+
+	  template <class SearchTraits>
+	  struct Euclidean_distance_base<SearchTraits,false>{
+		  typedef Dynamic_dimension_tag Dimension;
+	  };
+
+
     template <class SearchTraits>
     struct Spatial_searching_default_distance{
       typedef ::CGAL::Euclidean_distance<SearchTraits> type;
@@ -69,7 +71,7 @@ namespace CGAL {
     typedef typename SearchTraits::Point_d Point_d;
     typedef Point_d Query_item;
 
-	typedef typename Euclidean_distance_base<SearchTraits>::Dimension D;
+	typedef typename internal::Euclidean_distance_base<SearchTraits>::Dimension D;
 	
 
     	// default constructor
diff --git a/Spatial_searching/include/CGAL/K_neighbor_search.h b/Spatial_searching/include/CGAL/K_neighbor_search.h
index abab45987ab..61297913cb3 100644
--- a/Spatial_searching/include/CGAL/K_neighbor_search.h
+++ b/Spatial_searching/include/CGAL/K_neighbor_search.h
@@ -25,15 +25,18 @@
 #include <boost/mpl/has_xxx.hpp>
 
 
-#ifndef HAS_DIMENSION
-#define HAS_DIMENSION
-BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(has_dimension,Dimension,false);
-#endif
+
 
 namespace CGAL {
 	template <class SearchTraits, class Distance,class Splitter,class Tree>
 class K_neighbor_search;
 
+namespace internal{
+	 #ifndef HAS_DIMENSION_TAG
+	 #define HAS_DIMENSION_TAG
+	 BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(has_dimension,Dimension,false);
+	 #endif
+
 	template <class SearchTraits, bool has_dim = has_dimension<SearchTraits>::value>
   struct K_neighbor_search_base;
 
@@ -46,6 +49,7 @@ class K_neighbor_search;
   struct K_neighbor_search_base<SearchTraits,false>{
 	  typedef Dynamic_dimension_tag Dimension;
   };
+}//internal
 template <class SearchTraits, 
           class Distance= typename internal::Spatial_searching_default_distance<SearchTraits>::type,
           class Splitter= Sliding_midpoint<SearchTraits> ,
@@ -55,7 +59,7 @@ class K_neighbor_search: public internal::K_neighbor_search<SearchTraits,Distanc
   
 public:
   typedef typename Base::FT FT;  
-  typedef typename K_neighbor_search_base<SearchTraits>::Dimension D;
+  typedef typename internal::K_neighbor_search_base<SearchTraits>::Dimension D;
 
   K_neighbor_search(const Tree& tree, const typename Base::Query_item& q,  
     unsigned int k=1, FT Eps=FT(0.0), bool Search_nearest=true, const Distance& d=Distance(),bool sorted=true)
diff --git a/Spatial_searching/include/CGAL/Kd_tree.h b/Spatial_searching/include/CGAL/Kd_tree.h
index 94077a21d7d..1c7e94a27a4 100644
--- a/Spatial_searching/include/CGAL/Kd_tree.h
+++ b/Spatial_searching/include/CGAL/Kd_tree.h
@@ -42,21 +42,29 @@ BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(has_dimension,Dimension,false);
 
 namespace CGAL {
 
+
 	template <class SearchTraits, class Splitter_, class UseExtendedNode >
 class Kd_tree;
 
- template <class SearchTraits, bool has_dim = has_dimension<SearchTraits>::value>
-  struct Kd_tree_base;
+	namespace internal{
+		#ifndef HAS_DIMENSION_TAG
+		#define HAS_DIMENSION_TAG
+		BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(has_dimension,Dimension,false);
+		#endif
 
-  template <class SearchTraits>
-  struct Kd_tree_base<SearchTraits,true>{
-	  typedef typename SearchTraits::Dimension Dimension;
-  };
+	 template <class SearchTraits, bool has_dim = has_dimension<SearchTraits>::value>
+	  struct Kd_tree_base;
 
-  template <class SearchTraits>
-  struct Kd_tree_base<SearchTraits,false>{
-	  typedef Dynamic_dimension_tag Dimension;
-  };
+	  template <class SearchTraits>
+	  struct Kd_tree_base<SearchTraits,true>{
+		  typedef typename SearchTraits::Dimension Dimension;
+	  };
+
+	  template <class SearchTraits>
+	  struct Kd_tree_base<SearchTraits,false>{
+		  typedef Dynamic_dimension_tag Dimension;
+	  };
+	}
 
   //template <class SearchTraits, class Splitter_=Median_of_rectangle<SearchTraits>, class UseExtendedNode = Tag_true >
 template <class SearchTraits, class Splitter_=Sliding_midpoint<SearchTraits>, class UseExtendedNode = Tag_true >
@@ -85,7 +93,7 @@ public:
 
   
 
-  typedef typename Kd_tree_base<SearchTraits>::Dimension D;
+  typedef typename internal::Kd_tree_base<SearchTraits>::Dimension D;
 
 private:
   SearchTraits traits_;
diff --git a/Spatial_searching/include/CGAL/Point_container.h b/Spatial_searching/include/CGAL/Point_container.h
index 0a181e7c07c..b929d2f399c 100644
--- a/Spatial_searching/include/CGAL/Point_container.h
+++ b/Spatial_searching/include/CGAL/Point_container.h
@@ -42,18 +42,25 @@ namespace CGAL {
 	template <class Traits> 
 class Point_container;
 
-	template <class SearchTraits, bool has_dim = has_dimension<SearchTraits>::value>
-  struct Point_container_base;
+namespace internal{
+	    #ifndef HAS_DIMENSION_TAG
+		#define HAS_DIMENSION_TAG
+		BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(has_dimension,Dimension,false);
+		#endif
 
-  template <class SearchTraits>
-  struct Point_container_base<SearchTraits,true>{
-	  typedef typename SearchTraits::Dimension Dimension;
-  };
+		template <class SearchTraits, bool has_dim = has_dimension<SearchTraits>::value>
+	  struct Point_container_base;
 
-  template <class SearchTraits>
-  struct Point_container_base<SearchTraits,false>{
-	  typedef Dynamic_dimension_tag Dimension;
-  };
+	  template <class SearchTraits>
+	  struct Point_container_base<SearchTraits,true>{
+		  typedef typename SearchTraits::Dimension Dimension;
+	  };
+
+	  template <class SearchTraits>
+	  struct Point_container_base<SearchTraits,false>{
+		  typedef Dynamic_dimension_tag Dimension;
+	  };
+}
 
 template <class Traits> 
 class Point_container {
@@ -67,7 +74,7 @@ public:
   
   typedef typename Point_vector::iterator iterator;
   typedef typename Point_vector::const_iterator const_iterator;
-  typedef typename Point_container_base<Traits>::Dimension D;
+  typedef typename internal::Point_container_base<Traits>::Dimension D;
 private:
   Traits traits;
   // the iterator range of the Point_container 

From 87aa5ad7c347a8e8f50aadc63b706492ca2901b0 Mon Sep 17 00:00:00 2001
From: "m.overtheil" <m.overtheil@gmail.com>
Date: Mon, 3 Nov 2014 12:02:51 +0100
Subject: [PATCH 4/5] Moved to namespace internal,renamed HAS_DIMENSION to
 HAS_DIMENSION_TAG

---
 .../include/CGAL/Euclidean_distance.h         | 40 ++++++++++---------
 .../include/CGAL/K_neighbor_search.h          | 14 ++++---
 Spatial_searching/include/CGAL/Kd_tree.h      | 35 ++++++++--------
 .../include/CGAL/Point_container.h            | 33 ++++++++-------
 4 files changed, 67 insertions(+), 55 deletions(-)

diff --git a/Spatial_searching/include/CGAL/Euclidean_distance.h b/Spatial_searching/include/CGAL/Euclidean_distance.h
index 44721407007..eb2f45f44a2 100644
--- a/Spatial_searching/include/CGAL/Euclidean_distance.h
+++ b/Spatial_searching/include/CGAL/Euclidean_distance.h
@@ -28,30 +28,32 @@
 #include <boost/mpl/has_xxx.hpp>
 
 
-#ifndef HAS_DIMENSION
-#define HAS_DIMENSION
-BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(has_dimension,Dimension,false);
-#endif
-
 namespace CGAL {
 
   template <class SearchTraits>
   class Euclidean_distance;
 
-  template <class SearchTraits, bool has_dim = has_dimension<SearchTraits>::value>
-  struct Euclidean_distance_base;
-
-  template <class SearchTraits>
-  struct Euclidean_distance_base<SearchTraits,true>{
-	  typedef typename SearchTraits::Dimension Dimension;
-  };
-
-  template <class SearchTraits>
-  struct Euclidean_distance_base<SearchTraits,false>{
-	  typedef Dynamic_dimension_tag Dimension;
-  };
-  
+    
   namespace internal{
+	    #ifndef HAS_DIMENSION_TAG
+		#define HAS_DIMENSION_TAG
+		BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(has_dimension,Dimension,false);
+		#endif
+
+	  template <class SearchTraits, bool has_dim = has_dimension<SearchTraits>::value>
+	  struct Euclidean_distance_base;
+
+	  template <class SearchTraits>
+	  struct Euclidean_distance_base<SearchTraits,true>{
+		  typedef typename SearchTraits::Dimension Dimension;
+	  };
+
+	  template <class SearchTraits>
+	  struct Euclidean_distance_base<SearchTraits,false>{
+		  typedef Dynamic_dimension_tag Dimension;
+	  };
+
+
     template <class SearchTraits>
     struct Spatial_searching_default_distance{
       typedef ::CGAL::Euclidean_distance<SearchTraits> type;
@@ -69,7 +71,7 @@ namespace CGAL {
     typedef typename SearchTraits::Point_d Point_d;
     typedef Point_d Query_item;
 
-	typedef typename Euclidean_distance_base<SearchTraits>::Dimension D;
+	typedef typename internal::Euclidean_distance_base<SearchTraits>::Dimension D;
 	
 
     	// default constructor
diff --git a/Spatial_searching/include/CGAL/K_neighbor_search.h b/Spatial_searching/include/CGAL/K_neighbor_search.h
index abab45987ab..61297913cb3 100644
--- a/Spatial_searching/include/CGAL/K_neighbor_search.h
+++ b/Spatial_searching/include/CGAL/K_neighbor_search.h
@@ -25,15 +25,18 @@
 #include <boost/mpl/has_xxx.hpp>
 
 
-#ifndef HAS_DIMENSION
-#define HAS_DIMENSION
-BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(has_dimension,Dimension,false);
-#endif
+
 
 namespace CGAL {
 	template <class SearchTraits, class Distance,class Splitter,class Tree>
 class K_neighbor_search;
 
+namespace internal{
+	 #ifndef HAS_DIMENSION_TAG
+	 #define HAS_DIMENSION_TAG
+	 BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(has_dimension,Dimension,false);
+	 #endif
+
 	template <class SearchTraits, bool has_dim = has_dimension<SearchTraits>::value>
   struct K_neighbor_search_base;
 
@@ -46,6 +49,7 @@ class K_neighbor_search;
   struct K_neighbor_search_base<SearchTraits,false>{
 	  typedef Dynamic_dimension_tag Dimension;
   };
+}//internal
 template <class SearchTraits, 
           class Distance= typename internal::Spatial_searching_default_distance<SearchTraits>::type,
           class Splitter= Sliding_midpoint<SearchTraits> ,
@@ -55,7 +59,7 @@ class K_neighbor_search: public internal::K_neighbor_search<SearchTraits,Distanc
   
 public:
   typedef typename Base::FT FT;  
-  typedef typename K_neighbor_search_base<SearchTraits>::Dimension D;
+  typedef typename internal::K_neighbor_search_base<SearchTraits>::Dimension D;
 
   K_neighbor_search(const Tree& tree, const typename Base::Query_item& q,  
     unsigned int k=1, FT Eps=FT(0.0), bool Search_nearest=true, const Distance& d=Distance(),bool sorted=true)
diff --git a/Spatial_searching/include/CGAL/Kd_tree.h b/Spatial_searching/include/CGAL/Kd_tree.h
index 94077a21d7d..c7c9226fed2 100644
--- a/Spatial_searching/include/CGAL/Kd_tree.h
+++ b/Spatial_searching/include/CGAL/Kd_tree.h
@@ -31,32 +31,35 @@
 #include <CGAL/Compact_container.h>
 #include <boost/mpl/has_xxx.hpp>
 
-#ifndef HAS_DIMENSION
-#define HAS_DIMENSION
-BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(has_dimension,Dimension,false);
-#endif
-
 #ifdef CGAL_HAS_THREADS
 #include <boost/thread/mutex.hpp>
 #endif
 
 namespace CGAL {
 
+
 	template <class SearchTraits, class Splitter_, class UseExtendedNode >
 class Kd_tree;
 
- template <class SearchTraits, bool has_dim = has_dimension<SearchTraits>::value>
-  struct Kd_tree_base;
+	namespace internal{
+		#ifndef HAS_DIMENSION_TAG
+		#define HAS_DIMENSION_TAG
+		BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(has_dimension,Dimension,false);
+		#endif
 
-  template <class SearchTraits>
-  struct Kd_tree_base<SearchTraits,true>{
-	  typedef typename SearchTraits::Dimension Dimension;
-  };
+	 template <class SearchTraits, bool has_dim = has_dimension<SearchTraits>::value>
+	  struct Kd_tree_base;
 
-  template <class SearchTraits>
-  struct Kd_tree_base<SearchTraits,false>{
-	  typedef Dynamic_dimension_tag Dimension;
-  };
+	  template <class SearchTraits>
+	  struct Kd_tree_base<SearchTraits,true>{
+		  typedef typename SearchTraits::Dimension Dimension;
+	  };
+
+	  template <class SearchTraits>
+	  struct Kd_tree_base<SearchTraits,false>{
+		  typedef Dynamic_dimension_tag Dimension;
+	  };
+	}
 
   //template <class SearchTraits, class Splitter_=Median_of_rectangle<SearchTraits>, class UseExtendedNode = Tag_true >
 template <class SearchTraits, class Splitter_=Sliding_midpoint<SearchTraits>, class UseExtendedNode = Tag_true >
@@ -85,7 +88,7 @@ public:
 
   
 
-  typedef typename Kd_tree_base<SearchTraits>::Dimension D;
+  typedef typename internal::Kd_tree_base<SearchTraits>::Dimension D;
 
 private:
   SearchTraits traits_;
diff --git a/Spatial_searching/include/CGAL/Point_container.h b/Spatial_searching/include/CGAL/Point_container.h
index 0a181e7c07c..d2b04883071 100644
--- a/Spatial_searching/include/CGAL/Point_container.h
+++ b/Spatial_searching/include/CGAL/Point_container.h
@@ -30,10 +30,6 @@
 #include <CGAL/Kd_tree_rectangle.h>
 
 #include <boost/optional.hpp>
-#ifndef HAS_DIMENSION
-#define HAS_DIMENSION
-BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(has_dimension,Dimension,false);
-#endif
 
 
 
@@ -42,18 +38,25 @@ namespace CGAL {
 	template <class Traits> 
 class Point_container;
 
-	template <class SearchTraits, bool has_dim = has_dimension<SearchTraits>::value>
-  struct Point_container_base;
+namespace internal{
+	    #ifndef HAS_DIMENSION_TAG
+		#define HAS_DIMENSION_TAG
+		BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(has_dimension,Dimension,false);
+		#endif
 
-  template <class SearchTraits>
-  struct Point_container_base<SearchTraits,true>{
-	  typedef typename SearchTraits::Dimension Dimension;
-  };
+		template <class SearchTraits, bool has_dim = has_dimension<SearchTraits>::value>
+	  struct Point_container_base;
 
-  template <class SearchTraits>
-  struct Point_container_base<SearchTraits,false>{
-	  typedef Dynamic_dimension_tag Dimension;
-  };
+	  template <class SearchTraits>
+	  struct Point_container_base<SearchTraits,true>{
+		  typedef typename SearchTraits::Dimension Dimension;
+	  };
+
+	  template <class SearchTraits>
+	  struct Point_container_base<SearchTraits,false>{
+		  typedef Dynamic_dimension_tag Dimension;
+	  };
+}
 
 template <class Traits> 
 class Point_container {
@@ -67,7 +70,7 @@ public:
   
   typedef typename Point_vector::iterator iterator;
   typedef typename Point_vector::const_iterator const_iterator;
-  typedef typename Point_container_base<Traits>::Dimension D;
+  typedef typename internal::Point_container_base<Traits>::Dimension D;
 private:
   Traits traits;
   // the iterator range of the Point_container 

From d598526bfe3429a81c3d3e3ed35552ae4c2d97f0 Mon Sep 17 00:00:00 2001
From: "m.overtheil" <m.overtheil@gmail.com>
Date: Tue, 4 Nov 2014 11:15:07 +0100
Subject: [PATCH 5/5] added dimension template argument to doc

---
 .../doc/Spatial_searching/CGAL/Search_traits.h  | 12 ++++++++++--
 .../Spatial_searching/CGAL/Search_traits_2.h    |  9 ++++++++-
 .../Spatial_searching/CGAL/Search_traits_3.h    |  8 +++++++-
 .../Spatial_searching/CGAL/Search_traits_d.h    | 17 +++++++++++++----
 .../Spatial_searching/Concepts/SearchTraits.h   | 10 ++++++++++
 5 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/Spatial_searching/doc/Spatial_searching/CGAL/Search_traits.h b/Spatial_searching/doc/Spatial_searching/CGAL/Search_traits.h
index 37fac8b60c2..1f91c10d060 100644
--- a/Spatial_searching/doc/Spatial_searching/CGAL/Search_traits.h
+++ b/Spatial_searching/doc/Spatial_searching/CGAL/Search_traits.h
@@ -6,7 +6,9 @@ namespace CGAL {
 The class `Search_traits` can be used as a template parameter of the kd tree 
 and the search classes. It is a mere wrapper for the geometric types needed 
 by these classes. 
-
+\cgalModifBegin
+Added Dimension
+\cgalModifEnd
 \cgalModels `SearchTraits`
 
 \sa `Search_traits_2<Kernel>` 
@@ -14,13 +16,19 @@ by these classes.
 \sa `Search_traits_d<Kernel>` 
 
 */
-template< typename NT, typename Point, typename CartesianIterator, typename ConstructCartesianIterator, typename ConstructMinVertex, typename ConstructMaxVertex >
+template< typename NT, typename Point, typename CartesianIterator, typename ConstructCartesianIterator, typename ConstructMinVertex, typename ConstructMaxVertex, typename Dim >
 class Search_traits {
 public:
 
 /// \name Types 
 /// @{
 
+/*!
+Dimension type. Either `Dimension_tag<int dim>`
+or `Dynamic_dimension_tag`.
+*/
+typedef unspecified_type Dimension;
+
 /*!
 The number type of the coordinates. 
 */ 
diff --git a/Spatial_searching/doc/Spatial_searching/CGAL/Search_traits_2.h b/Spatial_searching/doc/Spatial_searching/CGAL/Search_traits_2.h
index a4c74419dee..dd9a24a1fe7 100644
--- a/Spatial_searching/doc/Spatial_searching/CGAL/Search_traits_2.h
+++ b/Spatial_searching/doc/Spatial_searching/CGAL/Search_traits_2.h
@@ -5,7 +5,9 @@ namespace CGAL {
 
 The class `Search_traits_2` can be used as a template parameter of the kd tree 
 and the search classes. 
-
+\cgalModifBegin
+Added Dimension
+\cgalModifEnd
 \cgalHeading{Parameters}
 
 Expects for the template argument a model of the concept `Kernel`, 
@@ -25,6 +27,11 @@ public:
 /// \name Types 
 /// @{
 
+/*!
+Dimension type.
+*/
+typedef Dimension_tag<2> Dimension;
+
 /*!
 Number type. 
 */ 
diff --git a/Spatial_searching/doc/Spatial_searching/CGAL/Search_traits_3.h b/Spatial_searching/doc/Spatial_searching/CGAL/Search_traits_3.h
index f68d21ff3f4..21e9c8e7f74 100644
--- a/Spatial_searching/doc/Spatial_searching/CGAL/Search_traits_3.h
+++ b/Spatial_searching/doc/Spatial_searching/CGAL/Search_traits_3.h
@@ -5,7 +5,9 @@ namespace CGAL {
 
 The class `Search_traits_3` can be used as a template parameter of the kd tree 
 and the search classes. `Kernel` must be a \cgal kernel. 
-
+\cgalModifBegin
+Added Dimension
+\cgalModifEnd
 \cgalHeading{Parameters}
 
 Expects for the template argument a model of the concept `Kernel`, 
@@ -25,6 +27,10 @@ public:
 /// \name Types 
 /// @{
 
+/*!
+Dimension type.
+*/
+typedef Dimension_tag<3> Dimension;
 /*!
 Number type. 
 */ 
diff --git a/Spatial_searching/doc/Spatial_searching/CGAL/Search_traits_d.h b/Spatial_searching/doc/Spatial_searching/CGAL/Search_traits_d.h
index ac8f8ebf44e..4c173266eaf 100644
--- a/Spatial_searching/doc/Spatial_searching/CGAL/Search_traits_d.h
+++ b/Spatial_searching/doc/Spatial_searching/CGAL/Search_traits_d.h
@@ -5,13 +5,16 @@ namespace CGAL {
 
 The class `Search_traits_d` can be used as a template parameter of the kd tree 
 and the search classes. `Kernel` must be a \cgal kernel. 
-
+\cgalModifBegin
+Added Dimension
+\cgalModifEnd
 `Kernel` must be a d-dimensional \cgal kernel. 
 
 \cgalHeading{Parameters}
 
-Expects for the template argument a model of the concept `Kernel_d`, 
-for example `Cartesian_d<double>`. 
+Expects for the first template argument a model of the concept `Kernel_d` 
+(for example `Cartesian_d<double>`) and for the second argument a `Dimension_tag`
+(default value is `Dynamic_dimension_tag`).
 
 \cgalModels `SearchTraits`
 \cgalModels `RangeSearchTraits`
@@ -21,13 +24,19 @@ for example `Cartesian_d<double>`.
 \sa `Search_traits<Point,CartesianConstIterator,ConstructCartesianConstIterator>` 
 
 */
-template< typename Kernel >
+template< typename Kernel, typename Dim >
 class Search_traits_d {
 public:
 
 /// \name Types 
 /// @{
 
+/*!
+Dimension type. Either `Dimension_tag<int dim>`
+or `Dynamic_dimension_tag`.
+*/
+typedef Dim Dimension;
+
 /*!
 Number type. 
 */ 
diff --git a/Spatial_searching/doc/Spatial_searching/Concepts/SearchTraits.h b/Spatial_searching/doc/Spatial_searching/Concepts/SearchTraits.h
index 89a9fb559d7..87a7d6a1e5f 100644
--- a/Spatial_searching/doc/Spatial_searching/Concepts/SearchTraits.h
+++ b/Spatial_searching/doc/Spatial_searching/Concepts/SearchTraits.h
@@ -4,11 +4,15 @@
 
 The concept `SearchTraits` defines the requirements for the template 
 parameter of the search classes. 
+\cgalModifBegin
+Added Search_traits_d and Dimension
+\cgalModifEnd
 
 \cgalHasModel `CGAL::Cartesian_d<FT>` 
 \cgalHasModel `CGAL::Homogeneous_d<RT>` 
 \cgalHasModel `CGAL::Search_traits_2<Kernel>` 
 \cgalHasModel `CGAL::Search_traits_3<Kernel>`
+\cgalHasModel `CGAL::Search_traits_d<Kernel,Dim>`
 \cgalHasModel `CGAL::Search_traits<NT,Point,CartesianCoordinateIterator,ConstructCartesianCoordinateIterator,ConstructMinVertex,ConstructMaxVertex>`
 
 \sa `RangeSearchTraits` 
@@ -22,6 +26,12 @@ public:
 /// \name Types 
 /// @{
 
+/*!
+Dimension type. Either `CGAL::Dimension_tag`
+or `CGAL::Dynamic_dimension_tag`.
+*/
+typedef unspecified_type Dimension;
+
 /*!
 Point type. `CGAL::Kernel_traits` has to be 
 specialized for this type.