Changeset 23c605 for src/Fragmentation/Exporters/unittests/SphericalPointDistributionUnitTest.cpp

Timestamp:

Aug 20, 2014, 1:06:16 PM (11 years ago)

Author:

Frederik Heber <heber@…>

Children:

1cde4e8

Parents:

1ae9aa

git-author:

Frederik Heber <heber@…> (06/30/14 09:35:42)

git-committer:

Frederik Heber <heber@…> (08/20/14 13:06:16)

Message:

SphericalPointDistribution is now working with bond degree weights.

• recurseMatching() now works on IndexTupleList_t.
• also rewrote calculatePairwiseDistances() and calculateErrorOfMatching().
• L1THRESHOLD in recurseMatching() moved over to class body.
• increased verbosity level of ...Matching() functions by one, added note on eventually chosen matching and why.
• we assert that bestL2 is not too large.
• FIX: calculateErrorOfMatching() did not use absolute value of gap for L1 error.
• TESTS: Regresssion test FragmentMolecule-cycles working again.

File:

• src/Fragmentation/Exporters/unittests/SphericalPointDistributionUnitTest.cpp (modified) (1 diff)

src/Fragmentation/Exporters/unittests/SphericalPointDistributionUnitTest.cpp

@@ -638 +638 @@
 }
 
+/** UnitTest for matchSphericalPointDistributions() with four points and weights
+ * not all equal to one.
+ */
+void SphericalPointDistributionTest::matchSphericalPointDistributionsTest_multiple()
+{
+  SphericalPointDistribution SPD(1.);
+
+  // test with four points: one point having weight of two
+  {
+    SphericalPointDistribution::WeightedPolygon_t polygon;
+    polygon += std::make_pair( Vector(1.,0.,0.), 2);
+    SphericalPointDistribution::Polygon_t newpolygon =
+        SPD.get<4>();
+    SphericalPointDistribution::Polygon_t expected;
+    expected += Vector(-0.5773502691896,-5.551115123126e-17,0.8164965809277);
+    expected += Vector(-0.5773502691896,-5.551115123126e-17,-0.8164965809277);
+    SphericalPointDistribution::Polygon_t remaining =
+        SphericalPointDistribution::matchSphericalPointDistributions(
+            polygon,
+            newpolygon);
+//    std::cout << std::setprecision(13) << "Matched polygon is " << remaining << std::endl;
+    CPPUNIT_ASSERT_EQUAL( expected, remaining );
+  }
+
+  // test with five points: one point having weight of two
+  {
+    SphericalPointDistribution::WeightedPolygon_t polygon;
+    polygon += std::make_pair( Vector(1.,0.,0.), 2);
+    SphericalPointDistribution::Polygon_t newpolygon =
+        SPD.get<5>();
+    SphericalPointDistribution::Polygon_t expected;
+    expected += Vector(-0.7071067811865,0.7071067811865,0);
+    expected += Vector(-0.3535533905933,-0.3535533905933,0.8660254037844);
+    expected += Vector(-0.3535533905933,-0.3535533905933,-0.8660254037844);
+    SphericalPointDistribution::Polygon_t remaining =
+        SphericalPointDistribution::matchSphericalPointDistributions(
+            polygon,
+            newpolygon);
+//    std::cout << std::setprecision(13) << "Matched polygon is " << remaining << std::endl;
+    CPPUNIT_ASSERT_EQUAL( expected, remaining );
+  }
+
+
+  // test with five points: one point having weight of two, one weight of one
+  {
+    SphericalPointDistribution::WeightedPolygon_t polygon;
+    polygon += std::make_pair( Vector(M_SQRT1_2,M_SQRT1_2,0.), 2);
+    polygon += std::make_pair( Vector(-1.,0.,0.), 1);
+    SphericalPointDistribution::Polygon_t newpolygon =
+        SPD.get<5>();
+    SphericalPointDistribution::Polygon_t expected;
+    expected += Vector(0.3535533786708,-0.3535533955317,-0.8660254066357);
+    expected += Vector(0.3535534025157,-0.3535533856548,0.8660254009332);
+    SphericalPointDistribution::Polygon_t remaining =
+        SphericalPointDistribution::matchSphericalPointDistributions(
+            polygon,
+            newpolygon);
+//    std::cout << std::setprecision(13) << "Matched polygon is " << remaining << std::endl;
+    CPPUNIT_ASSERT_EQUAL( expected, remaining );
+  }
+
+  // test with six points: two points each having weight of two
+  {
+    SphericalPointDistribution::WeightedPolygon_t polygon;
+    polygon += std::make_pair( Vector(M_SQRT1_2,-M_SQRT1_2,0.), 2);
+    polygon += std::make_pair( Vector(-M_SQRT1_2,M_SQRT1_2,0.), 2);
+    SphericalPointDistribution::Polygon_t newpolygon =
+        SPD.get<6>();
+    SphericalPointDistribution::Polygon_t expected;
+    expected += Vector(0.,0.,-1.);
+    expected += Vector(0.,0.,1.);
+    SphericalPointDistribution::Polygon_t remaining =
+        SphericalPointDistribution::matchSphericalPointDistributions(
+            polygon,
+            newpolygon);
+//    std::cout << std::setprecision(13) << "Matched polygon is " << remaining << std::endl;
+    CPPUNIT_ASSERT_EQUAL( expected, remaining );
+  }
+}
+
 /** UnitTest for matchSphericalPointDistributions() with five points
  */