Changeset 87491e for src/Fragmentation/Exporters/SphericalPointDistribution.cpp

Timestamp:

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

Author:

Frederik Heber <heber@…>

Parents:

693036

git-author:

Frederik Heber <heber@…> (07/21/14 08:21:53)

git-committer:

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

Message:

tempcommit: Modified jointPoints() to just combine points and switch to trivial matching.

File:

• src/Fragmentation/Exporters/SphericalPointDistribution.cpp (modified) (2 diffs)

src/Fragmentation/Exporters/SphericalPointDistribution.cpp

@@ -632 +632 @@
     )
 {
+  // generate trivial index list
+  IndexList_t IndexList(_bestmatching.size(), (size_t)-1);
+  std::generate(IndexList.begin(), IndexList.end(), UniqueNumber);
+  LOG(4, "DEBUG: Our new trivial IndexList reads as " << IndexList);
+
   // combine all multiple points
-  IndexList_t IndexList;
-  IndexArray_t removalpoints;
-  unsigned int UniqueIndex = _newpolygon.size(); // all indices up to size are used right now
   VectorArray_t newCenters;
-  newCenters.reserve(_bestmatching.size());
+  newCenters.resize(_bestmatching.size());
+  VectorArray_t::iterator centeriter = newCenters.begin();
   for (IndexTupleList_t::const_iterator tupleiter = _bestmatching.begin();
-      tupleiter != _bestmatching.end(); ++tupleiter) {
+      tupleiter != _bestmatching.end(); ++tupleiter, ++centeriter) {
     ASSERT (tupleiter->size() > 0,
         "findBestMatching() - encountered tuple in bestmatching with size 0.");
     if (tupleiter->size() == 1) {
       // add point and index
-      IndexList.push_back(*tupleiter->begin());
+      *centeriter = _newpoints[*tupleiter->begin()];
     } else {
       // combine into weighted and normalized center
-      Vector Center = calculateCenter(_newpoints, *tupleiter);
-      Center.Normalize();
-      _newpolygon.push_back(Center);
+      *centeriter = calculateCenter(_newpoints, *tupleiter);
+      (*centeriter).Normalize();
       LOG(5, "DEBUG: Combining " << tupleiter->size() << " points to weighted center "
-          << Center << " with new index " << UniqueIndex);
-      // mark for removal
-      removalpoints.insert(removalpoints.end(), tupleiter->begin(), tupleiter->end());
-      // add new index
-      IndexList.push_back(UniqueIndex++);
-    }
-  }
-  // IndexList is now our new bestmatching (that is bijective)
-  LOG(4, "DEBUG: Our new bijective IndexList reads as " << IndexList);
-
-  // modifying _newpolygon: remove all points in removalpoints, add those in newCenters
-  Polygon_t allnewpoints = _newpolygon;
-  {
-    _newpolygon.clear();
-    std::sort(removalpoints.begin(), removalpoints.end());
-    size_t i = 0;
-    IndexArray_t::const_iterator removeiter = removalpoints.begin();
-    for (Polygon_t::iterator iter = allnewpoints.begin();
-        iter != allnewpoints.end(); ++iter, ++i) {
-      if ((removeiter != removalpoints.end()) && (i == *removeiter)) {
-        // don't add, go to next remove index
-        ++removeiter;
-      } else {
-        // otherwise add points
-        _newpolygon.push_back(*iter);
-      }
-    }
-  }
-  LOG(4, "DEBUG: The polygon with recentered points removed is " << _newpolygon);
-
-  // map IndexList to new shrinked _newpolygon
-  typedef std::set<unsigned int> IndexSet_t;
-  IndexSet_t SortedIndexList(IndexList.begin(), IndexList.end());
-  IndexList.clear();
-  {
-    size_t offset = 0;
-    IndexSet_t::const_iterator listiter = SortedIndexList.begin();
-    IndexArray_t::const_iterator removeiter = removalpoints.begin();
-    for (size_t i = 0; i < allnewpoints.size(); ++i) {
-      if ((removeiter != removalpoints.end()) && (i == *removeiter)) {
-        ++offset;
-        ++removeiter;
-      } else if ((listiter != SortedIndexList.end()) && (i == *listiter)) {
-        IndexList.push_back(*listiter - offset);
-        ++listiter;
-      }
-    }
-  }
-  LOG(4, "DEBUG: Our new bijective IndexList corrected for removed points reads as "
-      << IndexList);
+          << *centeriter << ".");
+    }
+  }
+  _newpolygon.insert(_newpolygon.begin(), newCenters.begin(), newCenters.end());
+  LOG(4, "DEBUG: The polygon with centered points is " << _newpolygon);
 
   return IndexList;
@@ -1045 +1002 @@
     // combine multiple points and create simple IndexList from IndexTupleList
     MatchingControlStructure MCS = findBestMatching(_polygon);
+    points.clear();
     IndexList_t bestmatching = joinPoints(points, MCS.newpoints, MCS.bestmatching);
     LOG(2, "INFO: Best matching is " << bestmatching);