From f44799cdfbe483baf3de3d84a97589f715e18ae3 Mon Sep 17 00:00:00 2001 From: Nico Kruithof Date: Thu, 21 Mar 2013 20:47:52 +0100 Subject: [PATCH] Fixed a test in the test suite --- .../include/CGAL/Periodic_2_triangulation_2.h | 4 ++-- .../test_p2t2_triangulation_flip.cpp | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2.h b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2.h index 34a180409cf..ad0e9c5e101 100644 --- a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2.h +++ b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2.h @@ -432,8 +432,8 @@ public: Periodic_segment periodic_segment(const Face_handle &f, int i) const { CGAL_triangulation_precondition( number_of_vertices() != 0 ); CGAL_triangulation_precondition( i >= 0 && i <= 2); - return make_array(periodic_point(f, ccw(i) % 3), - periodic_point(f, cw(i) % 3)); + return make_array(periodic_point(f, ccw(i)), + periodic_point(f, cw(i))); } /// Same as the previous method for edge e. diff --git a/Periodic_2_triangulation_2/test/Periodic_2_triangulation_2/test_p2t2_triangulation_flip.cpp b/Periodic_2_triangulation_2/test/Periodic_2_triangulation_2/test_p2t2_triangulation_flip.cpp index 1fa389d76c9..0f3896a0e2a 100644 --- a/Periodic_2_triangulation_2/test/Periodic_2_triangulation_2/test_p2t2_triangulation_flip.cpp +++ b/Periodic_2_triangulation_2/test/Periodic_2_triangulation_2/test_p2t2_triangulation_flip.cpp @@ -17,11 +17,15 @@ void greedy_flip_long_edges(Triangulation &t) { } } + bool is_1_cover = t.is_1_cover(); for (Edge_map::reverse_iterator it = edge_map.rbegin(); it != edge_map.rend(); ++it) { double sqr_length_orig = it->first; if (t.is_edge(it->second.first, it->second.second, f, i)) { if (t.flippable(f, i)) { t.flip(f, i); + // We flipped enough long edges, when we go to the 1-cover all faces are invalidated + if (is_1_cover != t.is_1_cover()) + return; double sqr_length_new = t.segment(f, t.ccw(i)).squared_length(); if (sqr_length_orig < sqr_length_new) { std::cout << sqr_length_orig << std::endl;