Changeset c8d2e7

Timestamp:

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

Author:

Frederik Heber <heber@…>

Children:

ce0ca4

Parents:

c1413b

git-author:

Frederik Heber <heber@…> (07/18/14 16:06:44)

git-committer:

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

Message:

findBestMatching() now returns the MCS instead of the joined Points.

• this is preparatory to obtain an association and not join points.

Location:

src/Fragmentation/Exporters

Files:

• SphericalPointDistribution.cpp (modified) (3 diffs)
• SphericalPointDistribution.hpp (modified) (1 diff)

src/Fragmentation/Exporters/SphericalPointDistribution.cpp

@@ -578 +578 @@
  * \param _polygon here, we have indices 0,1,2,...
  * \param _newpolygon and here we need to find the correct indices
- * \return list of indices: first in \a _polygon goes to first index for \a _newpolygon
+ * \return control structure containing the matching and more
  */
-SphericalPointDistribution::IndexList_t SphericalPointDistribution::findBestMatching(
+SphericalPointDistribution::MatchingControlStructure
+SphericalPointDistribution::findBestMatching(
     const WeightedPolygon_t &_polygon
     )
@@ -622 +623 @@
   }
 
-  // combine multiple points and create simple IndexList from IndexTupleList
-  const SphericalPointDistribution::IndexList_t IndexList =
-      joinPoints(points, MCS.newpoints, MCS.bestmatching);
-
-  return IndexList;
+  return MCS;
 }
 
@@ -893 +890 @@
 
   if (_N > 0) {
-    IndexList_t bestmatching = findBestMatching(_polygon);
+    // combine multiple points and create simple IndexList from IndexTupleList
+    MatchingControlStructure MCS = findBestMatching(_polygon);
+    IndexList_t bestmatching = joinPoints(points, MCS.newpoints, MCS.bestmatching);
     LOG(2, "INFO: Best matching is " << bestmatching);
 

src/Fragmentation/Exporters/SphericalPointDistribution.hpp

@@ -181 +181 @@
       );
 
-  IndexList_t findBestMatching(const WeightedPolygon_t &_polygon);
+  MatchingControlStructure findBestMatching(const WeightedPolygon_t &_polygon);
 
   static IndexList_t joinPoints(