Changeset e6ca85 for src/Fragmentation/Exporters/SphericalPointDistribution.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/SphericalPointDistribution.hpp (modified) (5 diffs)

src/Fragmentation/Exporters/SphericalPointDistribution.hpp

@@ -73 +73 @@
   }
 
-  /** Matches a given spherical distribution with another containing more
-   * points.
+  /** Returns vacant spots to fill to get a complete spherical point distribution from
+   * given points \a _polygon, containing then \a _N in total.
    *
    * The idea is to produce a matching from all points in \a _polygon to those
@@ -86 +86 @@
    * hydrogens.
    *
-   * \param _polygon current occupied positions
-   * \param _newpolygon ideal distribution to match best with current occupied
-   *        positions
-   * \return remaining vacant positions relative to \a _polygon
-   */
-  static Polygon_t matchSphericalPointDistributions(
-      const WeightedPolygon_t &_polygon,
-      Polygon_t &_newpolygon
-      );
+   * \param _polygon already filled places to match
+   * \param _N desired total number fo points
+   */
+  Polygon_t getRemainingPoints(const WeightedPolygon_t &_polygon, const int _N);
 
   //!> default radius of the spherical distribution
@@ -137 +132 @@
 
 private:
+  //!> points for the ideal distribution
+  Polygon_t points;
+  //!> connection information between these ideal points
+  adjacency_t adjacency;
+
+  /** Initialize inner status (points and adjacency) to desired number of
+   * points.
+   *
+   * \param _N number of points
+   */
+  void initSelf(const int _N);
+
+private:
   //!> grant unit tests access to private parts
   friend class SphericalPointDistributionTest;
@@ -149 +157 @@
 
   struct MatchingControlStructure {
+    MatchingControlStructure(
+        const adjacency_t &_adjacency,
+        const VectorArray_t &_oldpoints,
+        const VectorArray_t &_newpoints,
+        const WeightsArray_t &_weights
+        );
     bool foundflag;
     double bestL2;
+    const adjacency_t &adjacency;
+    const VectorArray_t oldpoints;
+    const VectorArray_t newpoints;
+    const WeightsArray_t weights;
     IndexTupleList_t bestmatching;
-    VectorArray_t oldpoints;
-    VectorArray_t newpoints;
-    WeightsArray_t weights;
   };
 
@@ -166 +181 @@
       );
 
-  static IndexList_t findBestMatching(
-      const WeightedPolygon_t &_polygon,
-      Polygon_t &_newpolygon
-      );
+  IndexList_t findBestMatching(const WeightedPolygon_t &_polygon);
 
   static IndexList_t joinPoints(