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

Compact Kd_tree_rectangle a bit in the dynamic case.

This commit is contained in:
Marc Glisse 2016-03-25 21:17:37 +01:00
parent f5e9aa8941
commit 667ca8f417
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Spatial_searching/include/CGAL/Kd_tree_rectangle.h
View File

@ -244,8 +244,7 @@ namespace CGAL {
private: private:
T* lower_; T* coords_;
T* upper_;
int dim; int dim;
int max_span_coord_; int max_span_coord_;
@ -284,25 +283,23 @@ namespace CGAL {
} }
Kd_tree_rectangle(int d) Kd_tree_rectangle(int d)
: lower_(new FT[d]), upper_(new FT[d]), dim(d), max_span_coord_(0) : coords_(new FT[2*d]), dim(d), max_span_coord_(0)
{ {
std::fill(lower(), lower() + dim, FT(0)); std::fill(coords_, coords_ + 2*dim, FT(0));
std::fill(upper(), upper() + dim, FT(0));
} }
Kd_tree_rectangle() Kd_tree_rectangle()
: lower_(0), upper_(0), dim(0) : coords_(0), dim(0)
{ {
} }
explicit explicit
Kd_tree_rectangle(const Kd_tree_rectangle<FT,Dynamic_dimension_tag>& r) Kd_tree_rectangle(const Kd_tree_rectangle<FT,Dynamic_dimension_tag>& r)
: lower_(new FT[r.dim]), upper_(new FT[r.dim]), dim(r.dim), : coords_(new FT[2*r.dim]), dim(r.dim),
max_span_coord_(r.max_span_coord_) max_span_coord_(r.max_span_coord_)
{ {
std::copy(r.lower(), r.lower()+dim, lower()); std::copy(r.coords_, r.coords_+2*dim, lower());
std::copy(r.upper(), r.upper()+dim, upper());
} }
template <class Construct_cartesian_const_iterator_d,class PointPointerIter> template <class Construct_cartesian_const_iterator_d,class PointPointerIter>
@ -327,7 +324,7 @@ namespace CGAL {
template <class Construct_cartesian_const_iterator_d,class PointPointerIter> // was PointIter 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) Kd_tree_rectangle(int d, PointPointerIter begin, PointPointerIter end,const Construct_cartesian_const_iterator_d& construct_it)
: lower_(new FT[d]), upper_(new FT[d]), dim(d) : coords_(new FT[2*d]), dim(d)
{ {
update_from_point_pointers<Construct_cartesian_const_iterator_d>(begin,end,construct_it); update_from_point_pointers<Construct_cartesian_const_iterator_d>(begin,end,construct_it);
} }
@ -347,7 +344,7 @@ namespace CGAL {
inline FT inline FT
min_coord(int i) const min_coord(int i) const
{ {
CGAL_assertion(lower() != NULL); CGAL_assertion(coords_ != NULL);
return lower()[i]; return lower()[i];
} }
@ -395,8 +392,7 @@ namespace CGAL {
~Kd_tree_rectangle() ~Kd_tree_rectangle()
{ {
if (dim) { if (dim) {
if (lower_) delete [] lower_; if (coords_) delete [] coords_;
if (upper_) delete [] upper_;
} }
} }
@ -406,18 +402,17 @@ namespace CGAL {
return dim; return dim;
} }
T* lower() {return lower_;} T* lower() {return coords_;}
T* upper() {return upper_;} T* upper() {return coords_ + dim;}
const T* lower() const {return lower_;} const T* lower() const {return coords_;}
const T* upper() const {return upper_;} const T* upper() const {return coords_ + dim;}
Kd_tree_rectangle<FT,Dynamic_dimension_tag>& Kd_tree_rectangle<FT,Dynamic_dimension_tag>&
operator=(const Kd_tree_rectangle<FT,Dynamic_dimension_tag>& r) operator=(const Kd_tree_rectangle<FT,Dynamic_dimension_tag>& r)
{ {
CGAL_assertion(dimension() == r.dimension()); CGAL_assertion(dimension() == r.dimension());
if (this != &r) { if (this != &r) {
std::copy(r.lower(), r.lower()+dim, lower()); std::copy(r.coords_, r.coords_+2*dim, coords_);
std::copy(r.upper(), r.upper()+dim, upper());
set_max_span(); set_max_span();
} }
return *this; return *this;