From 154ad58568f15d56251aa63d38cdfe8d2518a35c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 18 Feb 2013 16:06:16 +0000 Subject: [PATCH] Removed unused variable git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@801 fdac6126-5c0c-442c-9429-916003d36597 --- Doc/Tutorial/09-persistence/persistence.cc | 1 - .../unittests_trimesh_circulator_face_edge.hh | 96 +++++++++++++++++++ 2 files changed, 96 insertions(+), 1 deletion(-) diff --git a/Doc/Tutorial/09-persistence/persistence.cc b/Doc/Tutorial/09-persistence/persistence.cc index 54b25ff1..ffc7ac4a 100644 --- a/Doc/Tutorial/09-persistence/persistence.cc +++ b/Doc/Tutorial/09-persistence/persistence.cc @@ -195,7 +195,6 @@ namespace OpenMesh { bytes += IO::restore( _is, N, _swap ); - value_type::iterator it = _v.begin(); std::string key; size_t val; diff --git a/src/Unittests/unittests_trimesh_circulator_face_edge.hh b/src/Unittests/unittests_trimesh_circulator_face_edge.hh index c4c43cc3..34bf368a 100644 --- a/src/Unittests/unittests_trimesh_circulator_face_edge.hh +++ b/src/Unittests/unittests_trimesh_circulator_face_edge.hh @@ -127,3 +127,99 @@ TEST_F(OpenMeshTrimeshCirculatorFaceEdge, FaceEdgeIterWithoutHolesIncrement) { EXPECT_TRUE( cfe_it == cfe_end ) << "End iterator for ConstFaceEdgeIter not matching"; } + + +/* + * Small FaceEdgeIterator Test + */ +TEST_F(OpenMeshTrimeshCirculatorFaceEdge, FaceEdgeIterWithoutHolesDecrement) { + + mesh_.clear(); + + // Add some vertices + Mesh::VertexHandle vhandle[6]; + + 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(3, 0, 0)); + vhandle[4] = mesh_.add_vertex(Mesh::Point(4, 1, 0)); + vhandle[5] = mesh_.add_vertex(Mesh::Point(2,-1, 0)); + + // Add three 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[2]); + face_vhandles.push_back(vhandle[1]); + face_vhandles.push_back(vhandle[3]); + mesh_.add_face(face_vhandles); + + face_vhandles.clear(); + + face_vhandles.push_back(vhandle[2]); + 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[1]); + face_vhandles.push_back(vhandle[5]); + face_vhandles.push_back(vhandle[3]); + mesh_.add_face(face_vhandles); + + /* Test setup: + * + * 0 ------ 2 ------ 4 + * \ / \ / + * \ 0 / \ 2 / + * \ / 1 \ / + * 1 ------- 3 + * \ / + * \ 3 / + * \ / + * \ / + * 5 + */ + + + Mesh::FaceEdgeIter fe_it = mesh_.fe_begin(mesh_.face_handle(1)); + Mesh::FaceEdgeIter fe_end = mesh_.fe_end(mesh_.face_handle(1)); + + EXPECT_EQ(4, fe_it.handle().idx() ) << "Index wrong in FaceEdgeIter at initialization"; + EXPECT_TRUE(fe_it) << "Iterator invalid in FaceEdgeIter at initialization"; + --fe_it; + EXPECT_EQ(1, fe_it.handle().idx() ) << "Index wrong in FaceEdgeIter at step 1"; + EXPECT_TRUE(fe_it) << "Iterator invalid in FaceEdgeIter at step 1"; + --fe_it; + EXPECT_EQ(3, fe_it.handle().idx() ) << "Index wrong in FaceEdgeIter at step 2"; + EXPECT_TRUE(fe_it) << "Iterator invalid in FaceEdgeIter at step 2"; + --fe_it; + EXPECT_EQ(4, fe_it.handle().idx() ) << "Index wrong in FaceEdgeIter at end"; + EXPECT_FALSE(fe_it) << "Iterator invalid in FaceEdgeIter at end"; + EXPECT_TRUE( fe_it == fe_end ) << "End iterator for FaceEdgeIter not matching"; + + Mesh::ConstFaceEdgeIter cfe_it = mesh_.cfe_begin(mesh_.face_handle(1)); + Mesh::ConstFaceEdgeIter cfe_end = mesh_.cfe_end(mesh_.face_handle(1)); + + EXPECT_EQ(4, cfe_it.handle().idx() ) << "Index wrong in ConstFaceEdgeIter at initialization"; + EXPECT_TRUE(cfe_it) << "Iterator invalid in ConstFaceEdgeIter at initialization"; + --cfe_it; + EXPECT_EQ(1, cfe_it.handle().idx() ) << "Index wrong in ConstFaceEdgeIter at step 1"; + EXPECT_TRUE(cfe_it) << "Iterator invalid in ConstFaceEdgeIter at step 1"; + --cfe_it; + EXPECT_EQ(3, cfe_it.handle().idx() ) << "Index wrong in ConstFaceEdgeIter at step 2"; + EXPECT_TRUE(cfe_it) << "Iterator invalid in ConstFaceEdgeIter at step 2"; + --cfe_it; + EXPECT_EQ(4, cfe_it.handle().idx() ) << "Index wrong in ConstFaceEdgeIter at end"; + EXPECT_FALSE(cfe_it) << "Iterator invalid in ConstFaceEdgeIter at end"; + EXPECT_TRUE( cfe_it == cfe_end ) << "End iterator for ConstFaceEdgeIter not matching"; + +}