From 7d69e65cef280cd5ba79ced19ed03da1f3d5af6e Mon Sep 17 00:00:00 2001 From: Clement Jamin Date: Mon, 20 Nov 2017 10:56:47 +0100 Subject: [PATCH] Fix indentation --- .../include/CGAL/Euclidean_distance.h | 160 +++++++++--------- 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/Spatial_searching/include/CGAL/Euclidean_distance.h b/Spatial_searching/include/CGAL/Euclidean_distance.h index 20693a3f91d..d379c74eb6f 100644 --- a/Spatial_searching/include/CGAL/Euclidean_distance.h +++ b/Spatial_searching/include/CGAL/Euclidean_distance.h @@ -172,92 +172,92 @@ namespace CGAL { return distance; } - inline FT min_distance_to_rectangle(const Query_item& q, - const Kd_tree_rectangle& 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), - qe = construct_it(q,1); - for(unsigned int i = 0;qit != qe; i++, qit++){ - if((*qit) < r.min_coord(i)) - distance += - (r.min_coord(i)-(*qit))*(r.min_coord(i)-(*qit)); - else if ((*qit) > r.max_coord(i)) - distance += - ((*qit)-r.max_coord(i))*((*qit)-r.max_coord(i)); - - } - return distance; - } + inline FT min_distance_to_rectangle(const Query_item& q, + const Kd_tree_rectangle& 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), + qe = construct_it(q, 1); + for (unsigned int i = 0; qit != qe; i++, qit++) { + if ((*qit) < r.min_coord(i)) + distance += + (r.min_coord(i) - (*qit))*(r.min_coord(i) - (*qit)); + else if ((*qit) > r.max_coord(i)) + distance += + ((*qit) - r.max_coord(i))*((*qit) - r.max_coord(i)); - inline FT min_distance_to_rectangle(const Query_item& q, - const Kd_tree_rectangle& r,std::vector& dists) 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), - qe = construct_it(q,1); - for(unsigned int i = 0;qit != qe; i++, qit++){ - if((*qit) < r.min_coord(i)){ - dists[i] = (r.min_coord(i)-(*qit)); - distance += dists[i] * dists[i]; - } - else if ((*qit) > r.max_coord(i)){ - dists[i] = ((*qit)-r.max_coord(i)); - distance += dists[i] * dists[i]; - } - - } - return distance; - } + } + return distance; + } - inline FT max_distance_to_rectangle(const Query_item& q, - const Kd_tree_rectangle& 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), - qe = construct_it(q,1); - for(unsigned int i = 0;qit != qe; i++, qit++){ - if ((*qit) <= (r.min_coord(i)+r.max_coord(i))/FT(2.0)) - distance += (r.max_coord(i)-(*qit))*(r.max_coord(i)-(*qit)); - else - distance += ((*qit)-r.min_coord(i))*((*qit)-r.min_coord(i)); - }; - return distance; - } + inline FT min_distance_to_rectangle(const Query_item& q, + const Kd_tree_rectangle& r, std::vector& dists) 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), + qe = construct_it(q, 1); + for (unsigned int i = 0; qit != qe; i++, qit++) { + if ((*qit) < r.min_coord(i)) { + dists[i] = (r.min_coord(i) - (*qit)); + distance += dists[i] * dists[i]; + } + else if ((*qit) > r.max_coord(i)) { + dists[i] = ((*qit) - r.max_coord(i)); + distance += dists[i] * dists[i]; + } - inline FT max_distance_to_rectangle(const Query_item& q, - const Kd_tree_rectangle& r,std::vector& dists ) 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), - qe = construct_it(q,1); - for(unsigned int i = 0;qit != qe; i++, qit++){ - if ((*qit) <= (r.min_coord(i)+r.max_coord(i))/FT(2.0)){ - dists[i] = (r.max_coord(i)-(*qit)); - distance += dists[i] * dists[i]; - } - else{ - dists[i] = ((*qit)-r.min_coord(i)); - distance += dists[i] * dists[i]; - } - }; - return distance; - } + } + return distance; + } - inline FT new_distance(FT dist, FT old_off, FT new_off, - int /* cutting_dimension */) const { - - FT new_dist = dist + (new_off*new_off - old_off*old_off); - return new_dist; - } + inline FT max_distance_to_rectangle(const Query_item& q, + const Kd_tree_rectangle& 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), + qe = construct_it(q, 1); + for (unsigned int i = 0; qit != qe; i++, qit++) { + if ((*qit) <= (r.min_coord(i) + r.max_coord(i)) / FT(2.0)) + distance += (r.max_coord(i) - (*qit))*(r.max_coord(i) - (*qit)); + else + distance += ((*qit) - r.min_coord(i))*((*qit) - r.min_coord(i)); + }; + return distance; + } - inline FT transformed_distance(FT d) const { - return d*d; - } + inline FT max_distance_to_rectangle(const Query_item& q, + const Kd_tree_rectangle& r, std::vector& dists) 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), + qe = construct_it(q, 1); + for (unsigned int i = 0; qit != qe; i++, qit++) { + if ((*qit) <= (r.min_coord(i) + r.max_coord(i)) / FT(2.0)) { + dists[i] = (r.max_coord(i) - (*qit)); + distance += dists[i] * dists[i]; + } + else { + dists[i] = ((*qit) - r.min_coord(i)); + distance += dists[i] * dists[i]; + } + }; + return distance; + } - inline FT inverse_of_transformed_distance(FT d) const { - return CGAL::sqrt(d); - } + inline FT new_distance(FT dist, FT old_off, FT new_off, + int /* cutting_dimension */) const { + + FT new_dist = dist + (new_off*new_off - old_off*old_off); + return new_dist; + } + + inline FT transformed_distance(FT d) const { + return d*d; + } + + inline FT inverse_of_transformed_distance(FT d) const { + return CGAL::sqrt(d); + } }; // class Euclidean_distance