From 4ef81fc1fcee89dfcbc73cd0cbe2f9d003a59cf9 Mon Sep 17 00:00:00 2001 From: Patric Schmitz Date: Mon, 28 Oct 2024 09:57:37 +0100 Subject: [PATCH 1/2] add missing include --- source/Triangulate.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/source/Triangulate.cpp b/source/Triangulate.cpp index af4f975..c3034b0 100644 --- a/source/Triangulate.cpp +++ b/source/Triangulate.cpp @@ -14,6 +14,7 @@ #include #include #include +#include // To ensure the loop is a simple polygon for the triangulation, // ensure q is strictly closer to this_center than any other center, and strictly inside box From da4ef3d8249e627b6b9fb31e534c328ebda944ca Mon Sep 17 00:00:00 2001 From: Patric Schmitz Date: Mon, 28 Oct 2024 09:57:51 +0100 Subject: [PATCH 2/2] use std namespace for isnan --- source/Triangulate.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/Triangulate.cpp b/source/Triangulate.cpp index c3034b0..383ae7c 100644 --- a/source/Triangulate.cpp +++ b/source/Triangulate.cpp @@ -733,7 +733,7 @@ int sharpest_empty_triangle(int k, const std::vector &next_vertex, const double obtuse_thresh = 1.9999; const double almost_obtuse_thresh = 1.8; bool failed = false; - while (!is_empty_triangle[j] || angle_measure[j]>=obtuse_thresh || isnan(angle_measure[j])) + while (!is_empty_triangle[j] || angle_measure[j]>=obtuse_thresh || std::isnan(angle_measure[j])) { j = next_vertex[j]; if (j==k) // failsafe @@ -760,7 +760,7 @@ int sharpest_empty_triangle(int k, const std::vector &next_vertex, double best_angle_measure = angle_measure[j]; double best_circumradius = circumradius_measure[j]; int best_empty_circ = empty_circ[j]; - bool best_is_bad = !best_empty_triangle || best_angle_measure>=obtuse_thresh || isnan(best_angle_measure); + bool best_is_bad = !best_empty_triangle || best_angle_measure>=obtuse_thresh || std::isnan(best_angle_measure); j = next_vertex[j]; const double zero_angle_measure = 1.0e-10; do @@ -783,7 +783,7 @@ int sharpest_empty_triangle(int k, const std::vector &next_vertex, // 3b. small circumradius bool use_j = false; // 1. - const bool j_is_bad = !is_empty_triangle[j] || (angle_measure[j]>=obtuse_thresh) || isnan(angle_measure[j]); + const bool j_is_bad = !is_empty_triangle[j] || (angle_measure[j]>=obtuse_thresh) || std::isnan(angle_measure[j]); if (j_is_bad && !best_is_bad) { // don't use j @@ -805,7 +805,7 @@ int sharpest_empty_triangle(int k, const std::vector &next_vertex, use_j = true; } // 2. best is almost obtuse, and j has a smaller angle - else if ((isnan(best_angle_measure) && !isnan(angle_measure[j])) || + else if ((std::isnan(best_angle_measure) && !std::isnan(angle_measure[j])) || (best_angle_measure>=almost_obtuse_thresh && angle_measure[j] &next_vertex, else if ( empty_circ[j] > best_empty_circ || (empty_circ[j] == best_empty_circ && (circumradius_measure[j] < best_circumradius || - (isnan(best_circumradius) &&!isnan(circumradius_measure[j]))))) + (std::isnan(best_circumradius) &&!std::isnan(circumradius_measure[j]))))) { use_j = true; }