From d6d42e58efa39ceb96790fe3d325e6ff4ad4e12b Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Fri, 29 Nov 2019 09:26:35 +0100 Subject: [PATCH] Reset Edge-collapse --- .../CGAL/Surface_mesh_simplification/Detail/Edge_collapse.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Detail/Edge_collapse.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Detail/Edge_collapse.h index 44b579f0365..2eeea15d937 100644 --- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Detail/Edge_collapse.h +++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Detail/Edge_collapse.h @@ -136,7 +136,7 @@ public: } ; - typedef Modifiable_priority_queue PQ; + typedef Modifiable_priority_queue PQ ; typedef typename PQ::handle pq_handle ; // An Edge_data is associated with EVERY _ edge in the mesh (collapsable or not). @@ -300,6 +300,7 @@ private: CGAL_SURF_SIMPL_TEST_assertion(mPQ->contains(aEdge) ) ; aData.set_PQ_handle(mPQ->update(aEdge,aData.PQ_handle())) ; + CGAL_SURF_SIMPL_TEST_assertion(aData.is_in_PQ()); CGAL_SURF_SIMPL_TEST_assertion(mPQ->contains(aEdge) ) ; } @@ -309,7 +310,7 @@ private: CGAL_SURF_SIMPL_TEST_assertion(is_primary_edge(aEdge)) ; CGAL_SURF_SIMPL_TEST_assertion(aData.is_in_PQ()); CGAL_SURF_SIMPL_TEST_assertion(mPQ->contains(aEdge) ) ; - std::cout<<"remove"<erase(aEdge,aData.PQ_handle())); CGAL_SURF_SIMPL_TEST_assertion(!aData.is_in_PQ());