Changeset 46e561

Timestamp:

May 25, 2016, 7:13:59 AM (9 years ago)

Author:

Frederik Heber <heber@…>

Children:

a52369

Parents:

a92c27

git-author:

Frederik Heber <heber@…> (05/18/16 21:47:15)

git-committer:

Frederik Heber <heber@…> (05/25/16 07:13:59)

Message:

Fixing getConnectionTest() due to ambiguous tesselation.

• with N=8 we have a cube with polygonal faces. Similarly, with N=11 we also have ambiguities.

Location:

src/Fragmentation/Exporters/unittests

Files:

• Makefile.am (modified) (1 diff)
• SphericalPointDistributionUnitTest.cpp (modified) (2 diffs)
• SphericalPointDistributionUnitTest.hpp (modified) (1 diff)

src/Fragmentation/Exporters/unittests/Makefile.am

@@ -21 +21 @@
         SphericalPointDistributionUnitTest
 
-XFAIL_TESTS += SphericalPointDistributionUnitTest
 TESTS += $(FRAGMENTATIONEXPORTERSTESTS)
 check_PROGRAMS += $(FRAGMENTATIONEXPORTERSTESTS) 

src/Fragmentation/Exporters/unittests/SphericalPointDistributionUnitTest.cpp

@@ -47 +47 @@
 #include <algorithm>
 #include <boost/assign.hpp>
-#include <boost/math/quaternion.hpp>
+#include <boost/bind.hpp>
+#include <numeric>
 
 #include "CodePatterns/Assert.hpp"
@@ -339 +340 @@
   // and compare the two
   CPPUNIT_ASSERT_EQUAL( expected, adjacency );
+}
+
+/** UnitTest for getConnections()
+ */
+template <>
+void SphericalPointDistributionTest_assistant::getConnectionTest<8>()
+{
+  const int N=8;
+  SphericalPointDistribution SPD(1.);
+  // get the points and convert into TesselPoint list
+  SphericalPointDistribution::Polygon_t newpolygon = SPD.get<N>();
+  TesselPointSTLList Corners;
+  SphericalPointDistribution::IndexList_t indices(N);
+  std::generate(indices.begin(), indices.end(), UniqueNumber);
+  std::transform(
+      newpolygon.begin(), newpolygon.end(),
+      indices.begin(),
+      std::back_inserter(Corners),
+      VectorToTesselPoint());
+
+  // create the tesselation
+  const double SPHERERADIUS = 1.5;
+  Tesselation TesselStruct;
+  PointCloudAdaptor<TesselPointSTLList> cloud(&Corners, "TesselPointSTLList");
+  TesselStruct(cloud, SPHERERADIUS);
+
+  // create a adjacency list from a tesselation of the (convex set of) points
+  SphericalPointDistribution::adjacency_t adjacency;
+  for (LineMap::const_iterator iter = TesselStruct.LinesOnBoundary.begin();
+      iter != TesselStruct.LinesOnBoundary.end(); ++iter) {
+    const BoundaryLineSet * const line = iter->second;
+    {
+      std::pair< SphericalPointDistribution::adjacency_t::iterator, bool > inserter =
+          adjacency.insert(
+                std::make_pair(
+                    line->endpoints[0]->Nr,
+                    SphericalPointDistribution::IndexSet_t() ));
+      inserter.first->second.insert(line->endpoints[1]->Nr);
+      LOG(6, "DEBUG: Inserting " << line->endpoints[0]->Nr << "," << line->endpoints[1]->Nr);
+    }
+    {
+      std::pair< SphericalPointDistribution::adjacency_t::iterator, bool > inserter =
+          adjacency.insert(
+                std::make_pair(
+                    line->endpoints[1]->Nr,
+                    SphericalPointDistribution::IndexSet_t() ));
+      inserter.first->second.insert(line->endpoints[0]->Nr);
+      LOG(6, "DEBUG: Inserting " << line->endpoints[1]->Nr << "," << line->endpoints[0]->Nr);
+    }
+  }
+
+  // get the implemented connections
+  SphericalPointDistribution::adjacency_t expected =
+      SPD.getConnections<N>();
+
+  // and compare the two
+//  CPPUNIT_ASSERT_EQUAL( expected, adjacency );
+
+  // with eight points we obtain a cube. The problem is that each side
+  // is a polygon with four corners that is ambiguous in the tesselation
+  // it receives. Hence, we cannot directly test the linking but only
+  // the properties.
+  size_t NumberEdges_expected = 0;
+  for (SphericalPointDistribution::adjacency_t::const_iterator iter = expected.begin();
+      iter != expected.begin(); ++iter) {
+    NumberEdges_expected += iter->second.size();
+    CPPUNIT_ASSERT( iter->second.size() >= 3 );
+    CPPUNIT_ASSERT( iter->second.size() <= 6 );
+  }
+  size_t NumberEdges_adjacency = 0;
+  for (SphericalPointDistribution::adjacency_t::const_iterator iter = adjacency.begin();
+      iter != adjacency.begin(); ++iter) {
+    NumberEdges_adjacency += iter->second.size();
+    CPPUNIT_ASSERT( iter->second.size() >= 3 );
+    CPPUNIT_ASSERT( iter->second.size() <= 6 );
+  }
+  CPPUNIT_ASSERT_EQUAL( NumberEdges_expected, NumberEdges_adjacency);
+}
+
+/** UnitTest for getConnections()
+ */
+template <>
+void SphericalPointDistributionTest_assistant::getConnectionTest<11>()
+{
+  const int N=11;
+  SphericalPointDistribution SPD(1.);
+  // get the points and convert into TesselPoint list
+  SphericalPointDistribution::Polygon_t newpolygon = SPD.get<N>();
+  TesselPointSTLList Corners;
+  SphericalPointDistribution::IndexList_t indices(N);
+  std::generate(indices.begin(), indices.end(), UniqueNumber);
+  std::transform(
+      newpolygon.begin(), newpolygon.end(),
+      indices.begin(),
+      std::back_inserter(Corners),
+      VectorToTesselPoint());
+
+  // create the tesselation
+  const double SPHERERADIUS = 1.5;
+  Tesselation TesselStruct;
+  PointCloudAdaptor<TesselPointSTLList> cloud(&Corners, "TesselPointSTLList");
+  TesselStruct(cloud, SPHERERADIUS);
+
+  // create a adjacency list from a tesselation of the (convex set of) points
+  SphericalPointDistribution::adjacency_t adjacency;
+  for (LineMap::const_iterator iter = TesselStruct.LinesOnBoundary.begin();
+      iter != TesselStruct.LinesOnBoundary.end(); ++iter) {
+    const BoundaryLineSet * const line = iter->second;
+    {
+      std::pair< SphericalPointDistribution::adjacency_t::iterator, bool > inserter =
+          adjacency.insert(
+                std::make_pair(
+                    line->endpoints[0]->Nr,
+                    SphericalPointDistribution::IndexSet_t() ));
+      inserter.first->second.insert(line->endpoints[1]->Nr);
+      LOG(6, "DEBUG: Inserting " << line->endpoints[0]->Nr << "," << line->endpoints[1]->Nr);
+    }
+    {
+      std::pair< SphericalPointDistribution::adjacency_t::iterator, bool > inserter =
+          adjacency.insert(
+                std::make_pair(
+                    line->endpoints[1]->Nr,
+                    SphericalPointDistribution::IndexSet_t() ));
+      inserter.first->second.insert(line->endpoints[0]->Nr);
+      LOG(6, "DEBUG: Inserting " << line->endpoints[1]->Nr << "," << line->endpoints[0]->Nr);
+    }
+  }
+
+  // get the implemented connections
+  SphericalPointDistribution::adjacency_t expected =
+      SPD.getConnections<N>();
+
+  // and compare the two
+//  CPPUNIT_ASSERT_EQUAL( expected, adjacency );
+
+  // again, we only check properties as tesselation has ambiguities.
+  size_t NumberEdges_expected = 0;
+  for (SphericalPointDistribution::adjacency_t::const_iterator iter = expected.begin();
+      iter != expected.begin(); ++iter) {
+    NumberEdges_expected += iter->second.size();
+    CPPUNIT_ASSERT( iter->second.size() >= 4 );
+    CPPUNIT_ASSERT( iter->second.size() <= 6 );
+  }
+  size_t NumberEdges_adjacency = 0;
+  for (SphericalPointDistribution::adjacency_t::const_iterator iter = adjacency.begin();
+      iter != adjacency.begin(); ++iter) {
+    NumberEdges_adjacency += iter->second.size();
+    CPPUNIT_ASSERT( iter->second.size() >= 4 );
+    CPPUNIT_ASSERT( iter->second.size() <= 6 );
+  }
+  CPPUNIT_ASSERT_EQUAL( NumberEdges_expected, NumberEdges_adjacency);
 }
 

src/Fragmentation/Exporters/unittests/SphericalPointDistributionUnitTest.hpp

@@ -32 +32 @@
 template <> void SphericalPointDistributionTest_assistant::getConnectionTest<1>();
 template <> void SphericalPointDistributionTest_assistant::getConnectionTest<2>();
+template <> void SphericalPointDistributionTest_assistant::getConnectionTest<8>();
+template <> void SphericalPointDistributionTest_assistant::getConnectionTest<11>();
 
 #include "SphericalPointDistributionUnitTest_assistant.hpp"