From e94156d7b5cb2ca49f76c0d40dfdf47fd8323b3e Mon Sep 17 00:00:00 2001 From: Janek Kozicki Date: Thu, 20 Feb 2020 23:10:22 +0100 Subject: [PATCH 1/2] =?UTF-8?q?Replace=20two=20std::sqrt(=E2=80=A6);=20wit?= =?UTF-8?q?h=20using=20std::sqrt;=20=E2=80=A6=E2=80=A6=E2=80=A6=20sqrt(?= =?UTF-8?q?=E2=80=A6);=20Fix=20Yade=20compilation.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Principal_component_analysis/include/CGAL/PCA_util_Eigen.h | 3 ++- Principal_component_analysis_LGPL/include/CGAL/centroid.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Principal_component_analysis/include/CGAL/PCA_util_Eigen.h b/Principal_component_analysis/include/CGAL/PCA_util_Eigen.h index 09cac7bd6cb..45efdd2cff0 100644 --- a/Principal_component_analysis/include/CGAL/PCA_util_Eigen.h +++ b/Principal_component_analysis/include/CGAL/PCA_util_Eigen.h @@ -575,7 +575,8 @@ assemble_covariance_matrix_3(InputIterator first, transformation << t[0].x(), t[1].x(), 0.0, t[0].y(), t[1].y(), 0.0, t[0].z(), t[1].z(), 1.0; - FT length = std::sqrt(t.squared_length()); + using std::sqrt; + FT length = sqrt(t.squared_length()); // skip zero measure primitives if(length == (FT)0.0) diff --git a/Principal_component_analysis_LGPL/include/CGAL/centroid.h b/Principal_component_analysis_LGPL/include/CGAL/centroid.h index 0db7126ebcc..019a9a2a2be 100644 --- a/Principal_component_analysis_LGPL/include/CGAL/centroid.h +++ b/Principal_component_analysis_LGPL/include/CGAL/centroid.h @@ -449,7 +449,8 @@ centroid(InputIterator begin, it++) { const Segment& s = *it; - FT length = std::sqrt(s.squared_length()); + using std::sqrt; + FT length = sqrt(s.squared_length()); Point c = CGAL::midpoint(s.source(),s.target()); // Point c = K().construct_midpoint_3_object()(s[0],s[1]); //Point c = Point((s[0][0] + s[1][0])/2.0, (s[0][1] + s[1][1])/2.0, (s[0][2] + s[1][2])/2.0); From 7075455f42289750cc385a469567658472a93f28 Mon Sep 17 00:00:00 2001 From: Janek Kozicki Date: Thu, 20 Feb 2020 23:14:26 +0100 Subject: [PATCH 2/2] =?UTF-8?q?Replace=20three=20more=20std::sqrt(?= =?UTF-8?q?=E2=80=A6);=20with=20using=20std::sqrt;=20=E2=80=A6=E2=80=A6?= =?UTF-8?q?=E2=80=A6=20sqrt(=E2=80=A6);?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Principal_component_analysis/include/CGAL/PCA_util.h | 3 ++- .../include/CGAL/linear_least_squares_fitting_segments_2.h | 3 ++- Principal_component_analysis_LGPL/include/CGAL/centroid.h | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Principal_component_analysis/include/CGAL/PCA_util.h b/Principal_component_analysis/include/CGAL/PCA_util.h index 04eb14735f1..52a01fb46d6 100644 --- a/Principal_component_analysis/include/CGAL/PCA_util.h +++ b/Principal_component_analysis/include/CGAL/PCA_util.h @@ -657,7 +657,8 @@ assemble_covariance_matrix_3(InputIterator first, t[0].y(), t[1].y(), 0.0, t[0].z(), t[1].z(), 1.0}; Matrix transformation = init_matrix(3,delta); - FT length = std::sqrt(t.squared_length()); + using std::sqrt; + FT length = sqrt(t.squared_length()); // skip zero measure primitives if(length == (FT)0.0) diff --git a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_segments_2.h b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_segments_2.h index 80b830a1195..f0cf3affffc 100644 --- a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_segments_2.h +++ b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_segments_2.h @@ -91,7 +91,8 @@ linear_least_squares_fitting_2(InputIterator first, FT delta[4] = {t[0].x(), t[1].x(), t[0].y(), t[1].y()}; Matrix transformation = init_matrix(2,delta); - FT length = std::sqrt(t.squared_length()); + using std::sqrt; + FT length = sqrt(t.squared_length()); CGAL_assertion(length != 0.0); // Find the 2nd order moment for the segment wrt to the origin by an affine transformation. diff --git a/Principal_component_analysis_LGPL/include/CGAL/centroid.h b/Principal_component_analysis_LGPL/include/CGAL/centroid.h index 019a9a2a2be..e48ea8f0aec 100644 --- a/Principal_component_analysis_LGPL/include/CGAL/centroid.h +++ b/Principal_component_analysis_LGPL/include/CGAL/centroid.h @@ -129,7 +129,9 @@ centroid(InputIterator begin, it++) { const Segment& s = *it; - FT length = std::sqrt(std::abs(s.squared_length())); + using std::abs; + using std::sqrt; + FT length = sqrt(abs(s.squared_length())); Point c = K().construct_midpoint_2_object()(s[0],s[1]); v = v + length * (c - ORIGIN); sum_lengths += length;