Changeset e6ca85 for src/Fragmentation/Exporters/unittests/SphericalPointDistributionUnitTest.hpp

Timestamp:

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

Author:

Frederik Heber <heber@…>

Children:

ff72fb

Parents:

0b517b

git-author:

Frederik Heber <heber@…> (07/12/14 19:07:44)

git-committer:

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

Message:

recurseMatching() now takes connections into account.

• matchSphericalPointDistribution() replaced by getRemainingPoints() as that describes what it does. match...() sounds symmetrical which the function is no longer as connection is associated with former _newpolygon.
• SphericalPointDistribution now has internal points and adjacency, initialized by initSelf().
• findBestMatching() and getRemainingPoints() are no longer static functions.
• all unit tests are working again, including the .._multiple() that tests for joint points due to bond degree greater than 1.
• the huge case switch in SaturatedFragment::saturateAtom() now resides in initSelf().

File:

• src/Fragmentation/Exporters/unittests/SphericalPointDistributionUnitTest.hpp (modified) (2 diffs)

src/Fragmentation/Exporters/unittests/SphericalPointDistributionUnitTest.hpp

@@ -59 +59 @@
     CPPUNIT_TEST ( getConnectionTest<12> );
     CPPUNIT_TEST ( getConnectionTest<14> );
-    CPPUNIT_TEST ( matchSphericalPointDistributionsTest_2 );
-    CPPUNIT_TEST ( matchSphericalPointDistributionsTest_3 );
-    CPPUNIT_TEST ( matchSphericalPointDistributionsTest_4 );
-    CPPUNIT_TEST ( matchSphericalPointDistributionsTest_5 );
-    CPPUNIT_TEST ( matchSphericalPointDistributionsTest_6 );
-    CPPUNIT_TEST ( matchSphericalPointDistributionsTest_7 );
-    CPPUNIT_TEST ( matchSphericalPointDistributionsTest_8 );
-//    CPPUNIT_TEST ( matchSphericalPointDistributionsTest_multiple );
+    CPPUNIT_TEST ( getRemainingPointsTest_2 );
+    CPPUNIT_TEST ( getRemainingPointsTest_3 );
+    CPPUNIT_TEST ( getRemainingPointsTest_4 );
+    CPPUNIT_TEST ( getRemainingPointsTest_5 );
+    CPPUNIT_TEST ( getRemainingPointsTest_6 );
+    CPPUNIT_TEST ( getRemainingPointsTest_7 );
+    CPPUNIT_TEST ( getRemainingPointsTest_8 );
+    CPPUNIT_TEST ( getRemainingPointsTest_multiple );
     CPPUNIT_TEST_SUITE_END();
 
@@ -75 +75 @@
       void areEqualToWithinBoundsTest();
       void joinPointsTest();
-      void matchSphericalPointDistributionsTest_2();
-      void matchSphericalPointDistributionsTest_3();
-      void matchSphericalPointDistributionsTest_4();
-      void matchSphericalPointDistributionsTest_5();
-      void matchSphericalPointDistributionsTest_6();
-      void matchSphericalPointDistributionsTest_7();
-      void matchSphericalPointDistributionsTest_8();
-      void matchSphericalPointDistributionsTest_multiple();
+      void getRemainingPointsTest_2();
+      void getRemainingPointsTest_3();
+      void getRemainingPointsTest_4();
+      void getRemainingPointsTest_5();
+      void getRemainingPointsTest_6();
+      void getRemainingPointsTest_7();
+      void getRemainingPointsTest_8();
+      void getRemainingPointsTest_multiple();
 
 private: