From 8cc50f96f6c4045351d0089a23b3a757c6484a3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Fri, 7 Oct 2011 15:01:51 +0000 Subject: [PATCH] Bugfix for #248 end circulator broken for VertexFaceIter The vf_end function did not provide the correct end for the iteration. Added unittest for two cases with VertexFaceIter (hour glass case and full case) git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@415 fdac6126-5c0c-442c-9429-916003d36597 --- src/OpenMesh/Core/Mesh/CirculatorsT.hh | 4 +- src/Unittests/unittests_trimesh_iterators.hh | 355 +++++++++++++++---- 2 files changed, 287 insertions(+), 72 deletions(-) diff --git a/src/OpenMesh/Core/Mesh/CirculatorsT.hh b/src/OpenMesh/Core/Mesh/CirculatorsT.hh index df0acc62..5ae7b848 100644 --- a/src/OpenMesh/Core/Mesh/CirculatorsT.hh +++ b/src/OpenMesh/Core/Mesh/CirculatorsT.hh @@ -1689,7 +1689,7 @@ class VertexFaceIterT start_(_mesh.halfedge_handle(_start)), heh_(start_), lap_counter_(_end) - { if (heh_.is_valid() && !handle().is_valid()) operator++();; } + { if (heh_.is_valid() && !handle().is_valid() && !_end) operator++();; } /// Construct with mesh and start halfedge @@ -1881,7 +1881,7 @@ class ConstVertexFaceIterT start_(_mesh.halfedge_handle(_start)), heh_(start_), lap_counter_(_end) - { if (heh_.is_valid() && !handle().is_valid()) operator++();; } + { if (heh_.is_valid() && !handle().is_valid() && !_end) operator++();; } /// Construct with mesh and start halfedge diff --git a/src/Unittests/unittests_trimesh_iterators.hh b/src/Unittests/unittests_trimesh_iterators.hh index 7e3b02dd..6844a5f6 100644 --- a/src/Unittests/unittests_trimesh_iterators.hh +++ b/src/Unittests/unittests_trimesh_iterators.hh @@ -12,28 +12,6 @@ class OpenMeshIterators : public OpenMeshBase { // This function is called before each test is run virtual void SetUp() { - // Add some vertices - Mesh::VertexHandle vhandle[4]; - - vhandle[0] = mesh_.add_vertex(Mesh::Point(0, 0, 0)); - vhandle[1] = mesh_.add_vertex(Mesh::Point(0, 1, 0)); - vhandle[2] = mesh_.add_vertex(Mesh::Point(1, 1, 0)); - vhandle[3] = mesh_.add_vertex(Mesh::Point(1, 0, 0)); - - // Add two faces - std::vector face_vhandles; - - face_vhandles.push_back(vhandle[2]); - face_vhandles.push_back(vhandle[1]); - face_vhandles.push_back(vhandle[0]); - mesh_.add_face(face_vhandles); - - face_vhandles.clear(); - - face_vhandles.push_back(vhandle[2]); - face_vhandles.push_back(vhandle[0]); - face_vhandles.push_back(vhandle[3]); - mesh_.add_face(face_vhandles); } // This function is called after all tests are through @@ -57,25 +35,57 @@ class OpenMeshIterators : public OpenMeshBase { */ TEST_F(OpenMeshIterators, VertexIter) { - unsigned int i = 0; + unsigned int i = 0; - Mesh::VertexIter v_it=mesh_.vertices_begin(); - Mesh::VertexIter v_end=mesh_.vertices_end(); + mesh_.clear(); + + // Add some vertices + Mesh::VertexHandle vhandle[4]; + + vhandle[0] = mesh_.add_vertex(Mesh::Point(0, 0, 0)); + vhandle[1] = mesh_.add_vertex(Mesh::Point(0, 1, 0)); + vhandle[2] = mesh_.add_vertex(Mesh::Point(1, 1, 0)); + vhandle[3] = mesh_.add_vertex(Mesh::Point(1, 0, 0)); + + // Add two faces + std::vector face_vhandles; + + face_vhandles.push_back(vhandle[2]); + face_vhandles.push_back(vhandle[1]); + face_vhandles.push_back(vhandle[0]); + mesh_.add_face(face_vhandles); + + face_vhandles.clear(); + + face_vhandles.push_back(vhandle[2]); + face_vhandles.push_back(vhandle[0]); + face_vhandles.push_back(vhandle[3]); + mesh_.add_face(face_vhandles); + + // Test setup: + // 1 === 2 + // | / | + // | / | + // | / | + // 0 === 3 + + Mesh::VertexIter v_it=mesh_.vertices_begin(); + Mesh::VertexIter v_end=mesh_.vertices_end(); - EXPECT_EQ(0, v_it.handle().idx()) << "Index wrong for vertex iterator vertices_begin()"; - ++v_it; - EXPECT_EQ(1, v_it.handle().idx()) << "Index wrong in vertex iterator"; - ++v_it; - EXPECT_EQ(2, v_it.handle().idx()) << "Index wrong in vertex iterator"; - ++v_it; - EXPECT_EQ(3, v_it.handle().idx()) << "Index wrong in vertex iterator"; - ++v_it; - EXPECT_EQ(4, v_it.handle().idx()) << "Index wrong in vertex iterator"; + EXPECT_EQ(0, v_it.handle().idx()) << "Index wrong for vertex iterator vertices_begin()"; + ++v_it; + EXPECT_EQ(1, v_it.handle().idx()) << "Index wrong in vertex iterator"; + ++v_it; + EXPECT_EQ(2, v_it.handle().idx()) << "Index wrong in vertex iterator"; + ++v_it; + EXPECT_EQ(3, v_it.handle().idx()) << "Index wrong in vertex iterator"; + ++v_it; + EXPECT_EQ(4, v_it.handle().idx()) << "Index wrong in vertex iterator"; - // Check end iterator - EXPECT_EQ(4, v_end.handle().idx()) << "Index wrong in vertex iterator for vertices_end()"; + // Check end iterator + EXPECT_EQ(4, v_end.handle().idx()) << "Index wrong in vertex iterator for vertices_end()"; } @@ -84,57 +94,262 @@ TEST_F(OpenMeshIterators, VertexIter) { */ TEST_F(OpenMeshIterators, EdgeIter) { - unsigned int i = 0; + mesh_.clear(); + + // Add some vertices + Mesh::VertexHandle vhandle[4]; + + vhandle[0] = mesh_.add_vertex(Mesh::Point(0, 0, 0)); + vhandle[1] = mesh_.add_vertex(Mesh::Point(0, 1, 0)); + vhandle[2] = mesh_.add_vertex(Mesh::Point(1, 1, 0)); + vhandle[3] = mesh_.add_vertex(Mesh::Point(1, 0, 0)); + + // Add two faces + std::vector face_vhandles; + + face_vhandles.push_back(vhandle[2]); + face_vhandles.push_back(vhandle[1]); + face_vhandles.push_back(vhandle[0]); + mesh_.add_face(face_vhandles); + + face_vhandles.clear(); + + face_vhandles.push_back(vhandle[2]); + face_vhandles.push_back(vhandle[0]); + face_vhandles.push_back(vhandle[3]); + mesh_.add_face(face_vhandles); + + // Test setup: + // 1 === 2 + // | / | + // | / | + // | / | + // 0 === 3 + + unsigned int i = 0; - Mesh::EdgeIter e_it = mesh_.edges_begin(); - Mesh::EdgeIter e_end = mesh_.edges_end(); - - EXPECT_EQ(0, e_it.handle().idx()) << "Wrong start index in edge iterator"; - EXPECT_EQ(5, e_end.handle().idx()) << "Wrong end index in edge iterator"; + Mesh::EdgeIter e_it = mesh_.edges_begin(); + Mesh::EdgeIter e_end = mesh_.edges_end(); + + EXPECT_EQ(0, e_it.handle().idx()) << "Wrong start index in edge iterator"; + EXPECT_EQ(5, e_end.handle().idx()) << "Wrong end index in edge iterator"; - EXPECT_EQ(1, mesh_.to_vertex_handle(mesh_.halfedge_handle(e_it,0)).idx() ) << "1: Wrong to vertex handle of halfedge 0"; - EXPECT_EQ(2, mesh_.from_vertex_handle(mesh_.halfedge_handle(e_it,0)).idx() ) << "1: Wrong from vertex handle of halfedge 0"; - EXPECT_EQ(2, mesh_.to_vertex_handle(mesh_.halfedge_handle(e_it,1)).idx() ) << "1: Wrong to vertex handle of halfedge 1"; - EXPECT_EQ(1, mesh_.from_vertex_handle(mesh_.halfedge_handle(e_it,1)).idx() ) << "1: Wrong from vertex handle of halfedge 1"; + EXPECT_EQ(1, mesh_.to_vertex_handle(mesh_.halfedge_handle(e_it,0)).idx() ) << "1: Wrong to vertex handle of halfedge 0"; + EXPECT_EQ(2, mesh_.from_vertex_handle(mesh_.halfedge_handle(e_it,0)).idx() ) << "1: Wrong from vertex handle of halfedge 0"; + EXPECT_EQ(2, mesh_.to_vertex_handle(mesh_.halfedge_handle(e_it,1)).idx() ) << "1: Wrong to vertex handle of halfedge 1"; + EXPECT_EQ(1, mesh_.from_vertex_handle(mesh_.halfedge_handle(e_it,1)).idx() ) << "1: Wrong from vertex handle of halfedge 1"; - ++e_it; - EXPECT_EQ(1, e_it.handle().idx()) << "Wrong index in edge iterator"; + ++e_it; + EXPECT_EQ(1, e_it.handle().idx()) << "Wrong index in edge iterator"; - EXPECT_EQ(0, mesh_.to_vertex_handle(mesh_.halfedge_handle(e_it,0)).idx() ) << "2: Wrong to vertex handle of halfedge 0"; - EXPECT_EQ(1, mesh_.from_vertex_handle(mesh_.halfedge_handle(e_it,0)).idx() ) << "2: Wrong from vertex handle of halfedge 0"; - EXPECT_EQ(1, mesh_.to_vertex_handle(mesh_.halfedge_handle(e_it,1)).idx() ) << "2: Wrong to vertex handle of halfedge 1"; - EXPECT_EQ(0, mesh_.from_vertex_handle(mesh_.halfedge_handle(e_it,1)).idx() ) << "2: Wrong from vertex handle of halfedge 1"; + EXPECT_EQ(0, mesh_.to_vertex_handle(mesh_.halfedge_handle(e_it,0)).idx() ) << "2: Wrong to vertex handle of halfedge 0"; + EXPECT_EQ(1, mesh_.from_vertex_handle(mesh_.halfedge_handle(e_it,0)).idx() ) << "2: Wrong from vertex handle of halfedge 0"; + EXPECT_EQ(1, mesh_.to_vertex_handle(mesh_.halfedge_handle(e_it,1)).idx() ) << "2: Wrong to vertex handle of halfedge 1"; + EXPECT_EQ(0, mesh_.from_vertex_handle(mesh_.halfedge_handle(e_it,1)).idx() ) << "2: Wrong from vertex handle of halfedge 1"; - ++e_it; - EXPECT_EQ(2, e_it.handle().idx()) << "Wrong index in edge iterator"; + ++e_it; + EXPECT_EQ(2, e_it.handle().idx()) << "Wrong index in edge iterator"; - EXPECT_EQ(2, mesh_.to_vertex_handle(mesh_.halfedge_handle(e_it,0)).idx() ) << "3: Wrong to vertex handle of halfedge 0"; - EXPECT_EQ(0, mesh_.from_vertex_handle(mesh_.halfedge_handle(e_it,0)).idx() ) << "3: Wrong from vertex handle of halfedge 0"; - EXPECT_EQ(0, mesh_.to_vertex_handle(mesh_.halfedge_handle(e_it,1)).idx() ) << "3: Wrong to vertex handle of halfedge 1"; - EXPECT_EQ(2, mesh_.from_vertex_handle(mesh_.halfedge_handle(e_it,1)).idx() ) << "3: Wrong from vertex handle of halfedge 1"; + EXPECT_EQ(2, mesh_.to_vertex_handle(mesh_.halfedge_handle(e_it,0)).idx() ) << "3: Wrong to vertex handle of halfedge 0"; + EXPECT_EQ(0, mesh_.from_vertex_handle(mesh_.halfedge_handle(e_it,0)).idx() ) << "3: Wrong from vertex handle of halfedge 0"; + EXPECT_EQ(0, mesh_.to_vertex_handle(mesh_.halfedge_handle(e_it,1)).idx() ) << "3: Wrong to vertex handle of halfedge 1"; + EXPECT_EQ(2, mesh_.from_vertex_handle(mesh_.halfedge_handle(e_it,1)).idx() ) << "3: Wrong from vertex handle of halfedge 1"; - ++e_it; - EXPECT_EQ(3, e_it.handle().idx()) << "Wrong index in edge iterator"; + ++e_it; + EXPECT_EQ(3, e_it.handle().idx()) << "Wrong index in edge iterator"; - EXPECT_EQ(3, mesh_.to_vertex_handle(mesh_.halfedge_handle(e_it,0)).idx() ) << "4: Wrong to vertex handle of halfedge 0"; - EXPECT_EQ(0, mesh_.from_vertex_handle(mesh_.halfedge_handle(e_it,0)).idx() ) << "4: Wrong from vertex handle of halfedge 0"; - EXPECT_EQ(0, mesh_.to_vertex_handle(mesh_.halfedge_handle(e_it,1)).idx() ) << "4: Wrong to vertex handle of halfedge 1"; - EXPECT_EQ(3, mesh_.from_vertex_handle(mesh_.halfedge_handle(e_it,1)).idx() ) << "4: Wrong from vertex handle of halfedge 1"; + EXPECT_EQ(3, mesh_.to_vertex_handle(mesh_.halfedge_handle(e_it,0)).idx() ) << "4: Wrong to vertex handle of halfedge 0"; + EXPECT_EQ(0, mesh_.from_vertex_handle(mesh_.halfedge_handle(e_it,0)).idx() ) << "4: Wrong from vertex handle of halfedge 0"; + EXPECT_EQ(0, mesh_.to_vertex_handle(mesh_.halfedge_handle(e_it,1)).idx() ) << "4: Wrong to vertex handle of halfedge 1"; + EXPECT_EQ(3, mesh_.from_vertex_handle(mesh_.halfedge_handle(e_it,1)).idx() ) << "4: Wrong from vertex handle of halfedge 1"; - ++e_it; - EXPECT_EQ(4, e_it.handle().idx()) << "Wrong index in edge iterator"; + ++e_it; + EXPECT_EQ(4, e_it.handle().idx()) << "Wrong index in edge iterator"; - EXPECT_EQ(2, mesh_.to_vertex_handle(mesh_.halfedge_handle(e_it,0)).idx() ) << "5: Wrong to vertex handle of halfedge 0"; - EXPECT_EQ(3, mesh_.from_vertex_handle(mesh_.halfedge_handle(e_it,0)).idx() ) << "5: Wrong from vertex handle of halfedge 0"; - EXPECT_EQ(3, mesh_.to_vertex_handle(mesh_.halfedge_handle(e_it,1)).idx() ) << "5: Wrong to vertex handle of halfedge 1"; - EXPECT_EQ(2, mesh_.from_vertex_handle(mesh_.halfedge_handle(e_it,1)).idx() ) << "5: Wrong from vertex handle of halfedge 1"; + EXPECT_EQ(2, mesh_.to_vertex_handle(mesh_.halfedge_handle(e_it,0)).idx() ) << "5: Wrong to vertex handle of halfedge 0"; + EXPECT_EQ(3, mesh_.from_vertex_handle(mesh_.halfedge_handle(e_it,0)).idx() ) << "5: Wrong from vertex handle of halfedge 0"; + EXPECT_EQ(3, mesh_.to_vertex_handle(mesh_.halfedge_handle(e_it,1)).idx() ) << "5: Wrong to vertex handle of halfedge 1"; + EXPECT_EQ(2, mesh_.from_vertex_handle(mesh_.halfedge_handle(e_it,1)).idx() ) << "5: Wrong from vertex handle of halfedge 1"; + + +} + +/* + * Small VertexFaceIterator Test with holes in it + */ +TEST_F(OpenMeshIterators, VertexFaceIterWithHoles) { + + mesh_.clear(); + + // Add some vertices + Mesh::VertexHandle vhandle[5]; + + vhandle[0] = mesh_.add_vertex(Mesh::Point(0, 1, 0)); + vhandle[1] = mesh_.add_vertex(Mesh::Point(1, 0, 0)); + vhandle[2] = mesh_.add_vertex(Mesh::Point(2, 1, 0)); + vhandle[3] = mesh_.add_vertex(Mesh::Point(0,-1, 0)); + vhandle[4] = mesh_.add_vertex(Mesh::Point(2,-1, 0)); + + // Add two faces + std::vector face_vhandles; + + face_vhandles.push_back(vhandle[0]); + face_vhandles.push_back(vhandle[1]); + face_vhandles.push_back(vhandle[2]); + mesh_.add_face(face_vhandles); + + face_vhandles.clear(); + + face_vhandles.push_back(vhandle[1]); + face_vhandles.push_back(vhandle[3]); + face_vhandles.push_back(vhandle[4]); + mesh_.add_face(face_vhandles); + + /* Test setup: + 0 ==== 2 + \ / + \ / + 1 + / \ + / \ + 3 ==== 4 */ + + unsigned int i = 0; + + + // Iterate around vertex 1 at the middle (with holes in between) + Mesh::VertexFaceIter vf_it = mesh_.vf_begin(vhandle[1]); + Mesh::VertexFaceIter vf_end = mesh_.vf_end(vhandle[1]); + EXPECT_EQ(0, vf_it.handle().idx() ) << "Index wrong in VertexFaceIter at initialization"; + EXPECT_TRUE(vf_it) << "Iterator invalid in VertexFaceIter at initialization"; + ++vf_it ; + EXPECT_EQ(1, vf_it.handle().idx() ) << "Index wrong in VertexFaceIter at step 1"; + EXPECT_TRUE(vf_it) << "Iterator invalid in VertexFaceIter at step 1"; + ++vf_it ; + EXPECT_EQ(-1, vf_it.handle().idx() ) << "Index wrong in VertexFaceIter at end"; + EXPECT_FALSE(vf_it) << "Iterator not invalid in VertexFaceIter at end"; + EXPECT_TRUE( vf_it == vf_end ) << "End iterator for VertexFaceIter not matching"; + + // Iterate around vertex 1 at the middle (with holes in between) with const iterator + Mesh::ConstVertexFaceIter cvf_it = mesh_.cvf_begin(vhandle[1]); + Mesh::ConstVertexFaceIter cvf_end = mesh_.cvf_end(vhandle[1]); + EXPECT_EQ(0, cvf_it.handle().idx() ) << "Index wrong in ConstVertexFaceIter at initialization"; + EXPECT_TRUE(cvf_it) << "Iterator invalid in ConstVertexFaceIter at initialization"; + ++cvf_it ; + EXPECT_EQ(1, cvf_it.handle().idx() ) << "Index wrong in ConstVertexFaceIter at step one"; + EXPECT_TRUE(cvf_it) << "Iterator invalid in ConstVertexFaceIter at step one"; + ++cvf_it ; + EXPECT_EQ(-1, cvf_it.handle().idx() ) << "Index wrong in ConstVertexFaceIter at end"; + EXPECT_FALSE(cvf_it) << "Iterator not invalid in ConstVertexFaceIter at end"; + EXPECT_TRUE( cvf_it == cvf_end ) << "End iterator for ConstVertexFaceIter not matching"; + +} + +/* + * Small VertexFaceIterator Test without holes in it + */ +TEST_F(OpenMeshIterators, VertexFaceIterWithoutHoles) { + + mesh_.clear(); + + // Add some vertices + Mesh::VertexHandle vhandle[5]; + + vhandle[0] = mesh_.add_vertex(Mesh::Point(0, 1, 0)); + vhandle[1] = mesh_.add_vertex(Mesh::Point(1, 0, 0)); + vhandle[2] = mesh_.add_vertex(Mesh::Point(2, 1, 0)); + vhandle[3] = mesh_.add_vertex(Mesh::Point(0,-1, 0)); + vhandle[4] = mesh_.add_vertex(Mesh::Point(2,-1, 0)); + + // Add two faces + std::vector face_vhandles; + + face_vhandles.push_back(vhandle[0]); + face_vhandles.push_back(vhandle[1]); + face_vhandles.push_back(vhandle[2]); + mesh_.add_face(face_vhandles); + + face_vhandles.clear(); + + face_vhandles.push_back(vhandle[1]); + face_vhandles.push_back(vhandle[3]); + face_vhandles.push_back(vhandle[4]); + mesh_.add_face(face_vhandles); + + face_vhandles.clear(); + + face_vhandles.push_back(vhandle[0]); + face_vhandles.push_back(vhandle[3]); + face_vhandles.push_back(vhandle[1]); + mesh_.add_face(face_vhandles); + + face_vhandles.clear(); + + face_vhandles.push_back(vhandle[2]); + face_vhandles.push_back(vhandle[1]); + face_vhandles.push_back(vhandle[4]); + mesh_.add_face(face_vhandles); + + /* Test setup: + 0 ==== 2 + |\ 0 /| + | \ / | + |2 1 3| + | / \ | + |/ 1 \| + 3 ==== 4 */ + + unsigned int i = 0; + + Mesh::VertexFaceIter vfa_it = mesh_.vf_begin(vhandle[1]); + + // Iterate around vertex 1 at the middle (with holes in between) + Mesh::VertexFaceIter vf_it = mesh_.vf_begin(vhandle[1]); + Mesh::VertexFaceIter vf_end = mesh_.vf_end(vhandle[1]); + EXPECT_EQ(3, vf_it.handle().idx() ) << "Index wrong in VertexFaceIter at initialization"; + EXPECT_TRUE(vf_it) << "Iterator invalid in VertexFaceIter at initialization"; + ++vf_it ; + EXPECT_EQ(1, vf_it.handle().idx() ) << "Index wrong in VertexFaceIter at step 1"; + EXPECT_TRUE(vf_it) << "Iterator invalid in VertexFaceIter at step 1"; + ++vf_it ; + EXPECT_EQ(2, vf_it.handle().idx() ) << "Index wrong in VertexFaceIter at step 2"; + EXPECT_TRUE(vf_it) << "Iterator invalid in VertexFaceIter at step 2"; + ++vf_it ; + EXPECT_EQ(0, vf_it.handle().idx() ) << "Index wrong in VertexFaceIter at step 3"; + EXPECT_TRUE(vf_it) << "Iterator invalid in VertexFaceIter at step 3"; + ++vf_it ; + EXPECT_FALSE(vf_it) << "Iterator not invalid in VertexFaceIter at end"; + EXPECT_TRUE( vf_it == vf_end ) << "End iterator for VertexFaceIter not matching"; + + // Iterate around vertex 1 at the middle (with holes in between) with const iterator + Mesh::ConstVertexFaceIter cvf_it = mesh_.cvf_begin(vhandle[1]); + Mesh::ConstVertexFaceIter cvf_end = mesh_.cvf_end(vhandle[1]); + EXPECT_EQ(3, cvf_it.handle().idx() ) << "Index wrong in ConstVertexFaceIter at initialization"; + EXPECT_TRUE(cvf_it) << "Iterator invalid in ConstVertexFaceIter at initialization"; + ++cvf_it ; + EXPECT_EQ(1, cvf_it.handle().idx() ) << "Index wrong in ConstVertexFaceIter at step 1"; + EXPECT_TRUE(cvf_it) << "Iterator invalid in ConstVertexFaceIter at step 1"; + ++cvf_it ; + EXPECT_EQ(2, cvf_it.handle().idx() ) << "Index wrong in ConstVertexFaceIter at step 2"; + EXPECT_TRUE(cvf_it) << "Iterator invalid in ConstVertexFaceIter at step 2"; + ++cvf_it ; + EXPECT_EQ(0, cvf_it.handle().idx() ) << "Index wrong in ConstVertexFaceIter at step 3"; + EXPECT_TRUE(cvf_it) << "Iterator invalid in ConstVertexFaceIter at step 3"; + ++cvf_it ; + EXPECT_FALSE(cvf_it) << "Iterator not invalid in VertexFaceIter at end"; + EXPECT_TRUE( cvf_it == cvf_end ) << "End iterator for ConstVertexFaceIter not matching"; } + + + + + #endif // INCLUDE GUARD