From 86f8f7971054bac634c08b6e5ae94c40d0809bed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20M=C3=B6ller?= Date: Thu, 30 Aug 2012 08:13:34 +0000 Subject: [PATCH] remove mixed decimater unittest refs #1007 git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@655 fdac6126-5c0c-442c-9429-916003d36597 --- src/Unittests/unittests.cc | 1 - src/Unittests/unittests_mixed_decimater.hh | 61 ---------------------- 2 files changed, 62 deletions(-) delete mode 100644 src/Unittests/unittests_mixed_decimater.hh diff --git a/src/Unittests/unittests.cc b/src/Unittests/unittests.cc index 95a6fcab..7d8a5eee 100644 --- a/src/Unittests/unittests.cc +++ b/src/Unittests/unittests.cc @@ -8,7 +8,6 @@ #include "unittests_trimesh_circulators.hh" #include "unittests_decimater.hh" #include "unittests_mc_decimater.hh" -#include "unittests_mixed_decimater.hh" #include "unittests_subdivider.hh" #include "unittests_trimesh_normal_calculations.hh" #include "unittests_trimesh_others.hh" diff --git a/src/Unittests/unittests_mixed_decimater.hh b/src/Unittests/unittests_mixed_decimater.hh deleted file mode 100644 index 1c05c01a..00000000 --- a/src/Unittests/unittests_mixed_decimater.hh +++ /dev/null @@ -1,61 +0,0 @@ -#ifndef INCLUDE_UNITTESTS_MIXED_DECIMATER_HH -#define INCLUDE_UNITTESTS_MIXED_DECIMATER_HH - -#include -#include -#include -#include -#include - -class OpenMeshMixedDecimater : public OpenMeshBase { - - protected: - - // This function is called before each test is run - virtual void SetUp() { - - // Do some initial stuff with the member data here... - } - - // This function is called after all tests are through - virtual void TearDown() { - - // Do some final stuff with the member data here... - } - - // Member already defined in OpenMeshBase - //Mesh mesh_; -}; - -/* - * ==================================================================== - * Define tests below - * ==================================================================== - */ - -/* - */ -TEST_F(OpenMeshMixedDecimater, DecimateMesh80PercentMc) { - - bool ok = OpenMesh::IO::read_mesh(mesh_, "cube1.off"); - - ASSERT_TRUE(ok); - - typedef OpenMesh::Decimater::MixedDecimaterT< Mesh > Decimater; - typedef OpenMesh::Decimater::ModQuadricT< Mesh >::Handle HModQuadric; - typedef OpenMesh::Decimater::ModNormalFlippingT< Mesh >::Handle HModNormal; - - Decimater decimaterDBG(mesh_); - HModQuadric hModQuadricDBG; - decimaterDBG.add( hModQuadricDBG ); - decimaterDBG.initialize(); - int removedVertices = 0; - removedVertices = decimaterDBG.decimate_to(5000,0.8); - decimaterDBG.mesh().garbage_collection(); - - EXPECT_EQ(2526, removedVertices) << "The number of remove vertices is not correct!"; - EXPECT_EQ(5000u, mesh_.n_vertices()) << "The number of vertices after decimation is not correct!"; - EXPECT_EQ(14994u, mesh_.n_edges()) << "The number of edges after decimation is not correct!"; - EXPECT_EQ(9996u, mesh_.n_faces()) << "The number of faces after decimation is not correct!"; -} -#endif // INCLUDE GUARD