Changeset 23c605 for src/Fragmentation/Exporters/SphericalPointDistribution.hpp

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/SphericalPointDistribution.hpp (modified) (4 diffs)

src/Fragmentation/Exporters/SphericalPointDistribution.hpp

@@ -89 +89 @@
   //!> precalculated value for root of 3
   const double SQRT_3;
+  //!> threshold for L1 error below which matching is immediately acceptable
+  static const double L1THRESHOLD;
+  //!> threshold for L2 error below which matching is acceptable
+  static const double L2THRESHOLD;
 
   //!> typedef for a full rotation specification consisting of axis and angle.
@@ -103 +107 @@
   //!> typedef for a Vector of positions with weights
   typedef std::vector< std::pair<Vector, int> > WeightedVectorArray_t;
+  //!> typedef for a vector of degrees (or integral weights)
+  typedef std::vector<unsigned int> WeightsArray_t;
 
   //!> amplitude up to which deviations in checks of rotations are tolerated
@@ -112 +118 @@
 
   static std::pair<double, double> calculateErrorOfMatching(
-      const std::vector<Vector> &_old,
-      const std::vector<Vector> &_new,
-      const IndexList_t &_Matching);
+      const VectorArray_t &_old,
+      const VectorArray_t &_new,
+      const IndexTupleList_t &_Matching);
 
   static Polygon_t removeMatchingPoints(
@@ -124 +130 @@
     bool foundflag;
     double bestL2;
-    IndexList_t bestmatching;
+    IndexTupleList_t bestmatching;
     VectorArray_t oldpoints;
     VectorArray_t newpoints;
+    WeightsArray_t weights;
   };
 
   static void recurseMatchings(
       MatchingControlStructure &_MCS,
-      IndexList_t &_matching,
+      IndexTupleList_t &_matching,
       IndexList_t _indices,
-      unsigned int _matchingsize);
+      WeightsArray_t &_remainingweights,
+      WeightsArray_t::iterator _remainiter,
+      const unsigned int _matchingsize
+      );
 
   static IndexList_t findBestMatching(