mirror of https://github.com/CGAL/cgal
Changed CGAL::sqrt(double) to std::sqrt().
This commit is contained in:
parent
bca17f414a
commit
a26f984913
|
|
@ -270,7 +270,7 @@ protected:
|
||||||
n= arr->number_of_vertices();
|
n= arr->number_of_vertices();
|
||||||
|
|
||||||
//calculate the step size
|
//calculate the step size
|
||||||
sqrt_n = static_cast<int> (CGAL::sqrt(static_cast<double> (n)) + 0.99999);
|
sqrt_n = static_cast<int> (std::sqrt(static_cast<double> (n)) + 0.99999);
|
||||||
FT delta_x = right.x() - left.x();
|
FT delta_x = right.x() - left.x();
|
||||||
FT delta_y = top.y() - bottom.y();
|
FT delta_y = top.y() - bottom.y();
|
||||||
step_x = delta_x / (sqrt_n-1);
|
step_x = delta_x / (sqrt_n-1);
|
||||||
|
|
|
||||||
|
|
@ -274,7 +274,7 @@ protected:
|
||||||
|
|
||||||
double nl = static_cast<double> (num_landmarks);
|
double nl = static_cast<double> (num_landmarks);
|
||||||
const int sqrt_num_landmarks =
|
const int sqrt_num_landmarks =
|
||||||
static_cast<int> (CGAL::sqrt(nl) + 0.5);
|
static_cast<int> (std::sqrt (nl) + 0.5);
|
||||||
|
|
||||||
num_small_not_updated_changes++;
|
num_small_not_updated_changes++;
|
||||||
if ((num_landmarks < 10) ||
|
if ((num_landmarks < 10) ||
|
||||||
|
|
|
||||||
|
|
@ -1330,12 +1330,12 @@ public:
|
||||||
if(_is_upper())
|
if(_is_upper())
|
||||||
{
|
{
|
||||||
y_max = to_double(circ.center().y())+
|
y_max = to_double(circ.center().y())+
|
||||||
CGAL::sqrt(to_double(circ.squared_radius()));
|
std::sqrt(to_double(circ.squared_radius()));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
y_min = to_double(circ.center().y()) -
|
y_min = to_double(circ.center().y()) -
|
||||||
CGAL::sqrt(to_double(circ.squared_radius()));
|
std::sqrt(to_double(circ.squared_radius()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -2396,9 +2396,9 @@ protected:
|
||||||
disc = app_sqr_rad - CGAL::square(x - app_xcenter);
|
disc = app_sqr_rad - CGAL::square(x - app_xcenter);
|
||||||
CGAL_precondition(disc >= 0);
|
CGAL_precondition(disc >= 0);
|
||||||
if(is_up)
|
if(is_up)
|
||||||
y = app_ycenter + CGAL::sqrt(disc);
|
y = app_ycenter + std::sqrt(disc);
|
||||||
else
|
else
|
||||||
y = app_ycenter - CGAL::sqrt(disc);
|
y = app_ycenter - std::sqrt(disc);
|
||||||
|
|
||||||
*oi = std::make_pair(x, y);
|
*oi = std::make_pair(x, y);
|
||||||
++oi;
|
++oi;
|
||||||
|
|
|
||||||
|
|
@ -633,11 +633,11 @@ public:
|
||||||
// based on the information flags.
|
// based on the information flags.
|
||||||
if ((this->_info & PLUS_SQRT_DISC_ROOT) != 0)
|
if ((this->_info & PLUS_SQRT_DISC_ROOT) != 0)
|
||||||
{
|
{
|
||||||
y = (::sqrt(disc) - B) / (2*A);
|
y = (std::sqrt(disc) - B) / (2*A);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
y = -(B + ::sqrt (disc)) / (2*A);
|
y = -(B + std::sqrt (disc)) / (2*A);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue