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

Fix indentation

This commit is contained in:
Clement Jamin 2017-11-20 10:56:47 +01:00
parent be5870e269
commit 7d69e65cef
1 changed files with 80 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
Spatial_searching/include/CGAL/Euclidean_distance.h
View File

@ -172,92 +172,92 @@ namespace CGAL {
return distance; return distance;
} }
inline FT min_distance_to_rectangle(const Query_item& q, inline FT min_distance_to_rectangle(const Query_item& q,
const Kd_tree_rectangle<FT,D>& r) const { const Kd_tree_rectangle<FT, D>& r) const {
FT distance = FT(0); FT distance = FT(0);
typename SearchTraits::Construct_cartesian_const_iterator_d construct_it=traits.construct_cartesian_const_iterator_d_object(); 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), typename SearchTraits::Cartesian_const_iterator_d qit = construct_it(q),
qe = construct_it(q,1); qe = construct_it(q, 1);
for(unsigned int i = 0;qit != qe; i++, qit++){ for (unsigned int i = 0; qit != qe; i++, qit++) {
if((*qit) < r.min_coord(i)) if ((*qit) < r.min_coord(i))
distance += distance +=
(r.min_coord(i)-(*qit))*(r.min_coord(i)-(*qit)); (r.min_coord(i) - (*qit))*(r.min_coord(i) - (*qit));
else if ((*qit) > r.max_coord(i)) else if ((*qit) > r.max_coord(i))
distance += distance +=
((*qit)-r.max_coord(i))*((*qit)-r.max_coord(i)); ((*qit) - r.max_coord(i))*((*qit) - r.max_coord(i));
} }
return distance; return distance;
} }
inline FT min_distance_to_rectangle(const Query_item& q, inline FT min_distance_to_rectangle(const Query_item& q,
const Kd_tree_rectangle<FT,D>& r,std::vector<FT>& dists) const { const Kd_tree_rectangle<FT, D>& r, std::vector<FT>& dists) const {
FT distance = FT(0); FT distance = FT(0);
typename SearchTraits::Construct_cartesian_const_iterator_d construct_it=traits.construct_cartesian_const_iterator_d_object(); 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), typename SearchTraits::Cartesian_const_iterator_d qit = construct_it(q),
qe = construct_it(q,1); qe = construct_it(q, 1);
for(unsigned int i = 0;qit != qe; i++, qit++){ for (unsigned int i = 0; qit != qe; i++, qit++) {
if((*qit) < r.min_coord(i)){ if ((*qit) < r.min_coord(i)) {
dists[i] = (r.min_coord(i)-(*qit)); dists[i] = (r.min_coord(i) - (*qit));
distance += dists[i] * dists[i]; distance += dists[i] * dists[i];
} }
else if ((*qit) > r.max_coord(i)){ else if ((*qit) > r.max_coord(i)) {
dists[i] = ((*qit)-r.max_coord(i)); dists[i] = ((*qit) - r.max_coord(i));
distance += dists[i] * dists[i]; distance += dists[i] * dists[i];
} }
} }
return distance; return distance;
} }
inline FT max_distance_to_rectangle(const Query_item& q, inline FT max_distance_to_rectangle(const Query_item& q,
const Kd_tree_rectangle<FT,D>& r) const { const Kd_tree_rectangle<FT, D>& r) const {
FT distance=FT(0); FT distance = FT(0);
typename SearchTraits::Construct_cartesian_const_iterator_d construct_it=traits.construct_cartesian_const_iterator_d_object(); 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), typename SearchTraits::Cartesian_const_iterator_d qit = construct_it(q),
qe = construct_it(q,1); qe = construct_it(q, 1);
for(unsigned int i = 0;qit != qe; i++, qit++){ for (unsigned int i = 0; qit != qe; i++, qit++) {
if ((*qit) <= (r.min_coord(i)+r.max_coord(i))/FT(2.0)) if ((*qit) <= (r.min_coord(i) + r.max_coord(i)) / FT(2.0))
distance += (r.max_coord(i)-(*qit))*(r.max_coord(i)-(*qit)); distance += (r.max_coord(i) - (*qit))*(r.max_coord(i) - (*qit));
else else
distance += ((*qit)-r.min_coord(i))*((*qit)-r.min_coord(i)); distance += ((*qit) - r.min_coord(i))*((*qit) - r.min_coord(i));
}; };
return distance; return distance;
} }
inline FT max_distance_to_rectangle(const Query_item& q, inline FT max_distance_to_rectangle(const Query_item& q,
const Kd_tree_rectangle<FT,D>& r,std::vector<FT>& dists ) const { const Kd_tree_rectangle<FT, D>& r, std::vector<FT>& dists) const {
FT distance=FT(0); FT distance = FT(0);
typename SearchTraits::Construct_cartesian_const_iterator_d construct_it=traits.construct_cartesian_const_iterator_d_object(); 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), typename SearchTraits::Cartesian_const_iterator_d qit = construct_it(q),
qe = construct_it(q,1); qe = construct_it(q, 1);
for(unsigned int i = 0;qit != qe; i++, qit++){ for (unsigned int i = 0; qit != qe; i++, qit++) {
if ((*qit) <= (r.min_coord(i)+r.max_coord(i))/FT(2.0)){ if ((*qit) <= (r.min_coord(i) + r.max_coord(i)) / FT(2.0)) {
dists[i] = (r.max_coord(i)-(*qit)); dists[i] = (r.max_coord(i) - (*qit));
distance += dists[i] * dists[i]; distance += dists[i] * dists[i];
} }
else{ else {
dists[i] = ((*qit)-r.min_coord(i)); dists[i] = ((*qit) - r.min_coord(i));
distance += dists[i] * dists[i]; distance += dists[i] * dists[i];
} }
}; };
return distance; return distance;
} }
inline FT new_distance(FT dist, FT old_off, FT new_off, inline FT new_distance(FT dist, FT old_off, FT new_off,
int /* cutting_dimension */) const { int /* cutting_dimension */) const {
FT new_dist = dist + (new_off*new_off - old_off*old_off); FT new_dist = dist + (new_off*new_off - old_off*old_off);
return new_dist; return new_dist;
} }
inline FT transformed_distance(FT d) const { inline FT transformed_distance(FT d) const {
return d*d; return d*d;
} }
inline FT inverse_of_transformed_distance(FT d) const { inline FT inverse_of_transformed_distance(FT d) const {
return CGAL::sqrt(d); return CGAL::sqrt(d);
} }
}; // class Euclidean_distance }; // class Euclidean_distance