From cb1d28bf859b2cdc01330f6a67b74bbc2f37e630 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?=
 <mael.rouxel.labbe@geometryfactory.com>
Date: Fri, 24 May 2019 13:34:50 +0200
Subject: [PATCH] Misc cleaning

---
 .../mesh_smoothing_example.cpp                |  9 ++--
 .../internal/Smoothing/mesh_smoothing_impl.h  | 41 +++++++++++--------
 2 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/mesh_smoothing_example.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/mesh_smoothing_example.cpp
index 3e4682c7845..f47c503f4ea 100644
--- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/mesh_smoothing_example.cpp
+++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/mesh_smoothing_example.cpp
@@ -6,12 +6,12 @@
 #include <iostream>
 #include <fstream>
 
-typedef CGAL::Exact_predicates_inexact_constructions_kernel K;
-typedef CGAL::Surface_mesh<K::Point_3> Mesh;
+typedef CGAL::Exact_predicates_inexact_constructions_kernel     K;
+typedef CGAL::Surface_mesh<K::Point_3>                          Mesh;
 
 namespace PMP = CGAL::Polygon_mesh_processing;
 
-int main(int argc, char* argv[])
+int main(int argc, char** argv)
 {
   const char* filename = argc > 1 ? argv[1] : "data/eight.off";
   std::ifstream input(filename);
@@ -27,8 +27,9 @@ int main(int argc, char* argv[])
   const unsigned int nb_iterations = 5;
   const double gradient_descent_precision = 1e-6;
 
-  for(unsigned int t = 0 ; t < repeat; ++t)
+  for(unsigned int t=0 ; t<repeat; ++t)
   {
+    std::cout << "Smooth angles..." << std::endl;
     PMP::smooth_angles(mesh, PMP::parameters::number_of_iterations(nb_iterations));
     PMP::smooth_areas(mesh, PMP::parameters::gradient_descent_precision(gradient_descent_precision));
     PMP::smooth_angles(mesh, PMP::parameters::number_of_iterations(nb_iterations));
diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Smoothing/mesh_smoothing_impl.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Smoothing/mesh_smoothing_impl.h
index 3b718157759..dc8cbdc1f14 100644
--- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Smoothing/mesh_smoothing_impl.h
+++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Smoothing/mesh_smoothing_impl.h
@@ -133,13 +133,13 @@ public:
       }
       else
       {
-        std::cout << "move rejected!!" << std::endl;
+#ifdef CGAL_PMP_SMOOTHING_DEBUG
+        std::cout << "move rejected!" << std::endl;
+#endif
         put(new_positions, v, pos);
       }
     }
 
-    std::cout << moved_points << " moves" << std::endl;
-
     // update locations
     for(vertex_descriptor v : vrange_)
     {
@@ -267,13 +267,9 @@ private:
   bool does_improve(const vertex_descriptor v,
                     const Point_3& new_pos) const
   {
-    std::cout << "DOES IMPROVE AT V " << v << std::endl;
-
     // check for null faces and face inversions
     for(halfedge_descriptor main_he : halfedges_around_source(v, mesh_))
     {
-      const Point_ref old_pos = get(vpmap_, v);
-
       const halfedge_descriptor prev_he = prev(main_he, mesh_);
       const Point_ref lpt = get(vpmap_, target(main_he, mesh_));
       const Point_ref rpt = get(vpmap_, source(prev_he, mesh_));
@@ -281,6 +277,7 @@ private:
       if(traits_.collinear_3_object()(lpt, rpt, new_pos))
         return false;
 
+      const Point_ref old_pos = get(vpmap_, v);
       Vector ov_1 = traits_.construct_vector_3_object()(old_pos, lpt);
       Vector ov_2 = traits_.construct_vector_3_object()(old_pos, rpt);
       Vector old_n = traits_.construct_cross_product_vector_3_object()(ov_1, ov_2);
@@ -289,7 +286,12 @@ private:
       Vector new_n = traits_.construct_cross_product_vector_3_object()(nv_1, nv_2);
 
       if(!is_positive(traits_.compute_scalar_product_3_object()(old_n, new_n)))
+      {
+#ifdef CGAL_PMP_SMOOTHING_DEBUG
+      std::cout << "Moving vertex would result in the inversion of a face normal!" << std::endl;
+#endif
         return false;
+      }
     }
 
     // check if the minimum angle of the star has not deteriorated
@@ -307,7 +309,6 @@ private:
                                             (std::min)(get_angle(Vector(lpt, rpt), Vector(lpt, old_pos)),
                                                        get_angle(Vector(rpt, old_pos), Vector(rpt, lpt)))));
     }
-    std::cout << "old min angle: " << old_min_angle << std::endl;
 
     for(halfedge_descriptor main_he : halfedges_around_source(v, mesh_))
     {
@@ -315,17 +316,23 @@ private:
       const Point_ref lpt = get(vpmap_, target(main_he, mesh_));
       const Point_ref rpt = get(vpmap_, source(prev_he, mesh_));
 
-      std::cout << "new angles: " << std::endl;
-      std::cout << get_angle(Vector(new_pos, lpt), Vector(new_pos, rpt)) << " ";
-      std::cout << get_angle(Vector(lpt, rpt), Vector(lpt, new_pos)) << " ";
-      std::cout << get_angle(Vector(rpt, new_pos), Vector(rpt, lpt)) << std::endl;
+      if(get_angle(Vector(new_pos, lpt), Vector(new_pos, rpt)) < old_min_angle ||
+         get_angle(Vector(lpt, rpt), Vector(lpt, new_pos)) < old_min_angle ||
+         get_angle(Vector(rpt, new_pos), Vector(rpt, lpt)) < old_min_angle)
+      {
+#ifdef CGAL_PMP_SMOOTHING_DEBUG
+        const Point_ref old_pos = get(vpmap_, v);
 
-      if(get_angle(Vector(new_pos, lpt), Vector(new_pos, rpt)) < old_min_angle)
-        return false;
-      if(get_angle(Vector(lpt, rpt), Vector(lpt, new_pos)) < old_min_angle)
-        return false;
-      if(get_angle(Vector(rpt, new_pos), Vector(rpt, lpt)) < old_min_angle)
+        std::cout << "deterioration of min angle in the star!" << std::endl;
+        std::cout << "old/new positions: " << old_pos << " " << new_pos << std::endl;;
+        std::cout << "old min angle: " << old_min_angle << std::endl;
+        std::cout << "new angles: " << std::endl;
+        std::cout << get_angle(Vector(new_pos, lpt), Vector(new_pos, rpt)) << " ";
+        std::cout << get_angle(Vector(lpt, rpt), Vector(lpt, new_pos)) << " ";
+        std::cout << get_angle(Vector(rpt, new_pos), Vector(rpt, lpt)) << std::endl;
+#endif
         return false;
+      }
     }
 
     return true;