Changeset 2732

Timestamp:

Nov 19, 2009, 1:30:01 PM (15 years ago)

Author:

strk

Message:

Don't heap-allocate std::vector in MCIndexSegmentSetMutualIntersector

Location:

trunk/source

Files:

• headers/geos/noding/MCIndexSegmentSetMutualIntersector.h (modified) (2 diffs)
• noding/MCIndexSegmentSetMutualIntersector.cpp (modified) (5 diffs)

trunk/source/headers/geos/noding/MCIndexSegmentSetMutualIntersector.h

@@ -57 +57 @@
         ~MCIndexSegmentSetMutualIntersector();
 
-        std::vector<index::chain::MonotoneChain *>* getMonotoneChains() 
+        std::vector<index::chain::MonotoneChain *>& getMonotoneChains() 
         { 
                 return monoChains; 
@@ -90 +90 @@
 private:
 
-        std::vector<index::chain::MonotoneChain *> * monoChains;
+        typedef std::vector<index::chain::MonotoneChain *> MonoChains;
+        MonoChains monoChains;
 
         /*

trunk/source/noding/MCIndexSegmentSetMutualIntersector.cpp

@@ -55 +55 @@
     MCIndexSegmentSetMutualIntersector::SegmentOverlapAction overlapAction( *segInt);
 
-    for (std::size_t i = 0, ni = monoChains->size(); i < ni; i++)
+    for (MonoChains::size_type i = 0, ni = monoChains.size(); i < ni; ++i)
     {
-        MonotoneChain * queryChain = (MonotoneChain *)((*monoChains)[i]);
+        MonotoneChain * queryChain = (MonotoneChain *)monoChains[i];
 
         std::vector<void*> overlapChains;
@@ -77 +77 @@
 MCIndexSegmentSetMutualIntersector::addToMonoChains(SegmentString* segStr)
 {
-    std::vector<MonotoneChain*>* segChains = 0; 
-    segChains = MonotoneChainBuilder::getChains(segStr->getCoordinates(), segStr);
+    MonoChains* segChains = 
+        MonotoneChainBuilder::getChains(segStr->getCoordinates(), segStr);
 
     chainStore.push_back(segChains);
 
-    for (std::size_t i = 0, ni = segChains->size(); i < ni; i++)
+    for (MonoChains::size_type i = 0, ni = segChains->size(); i < ni; i++)
     {
         MonotoneChain* mc = (*segChains)[i];
         mc->setId( processCounter++ );
-        monoChains->push_back(mc);
+        monoChains.push_back(mc);
     }
 }
@@ -95 +95 @@
 
 MCIndexSegmentSetMutualIntersector::MCIndexSegmentSetMutualIntersector() 
-:       monoChains( new std::vector<index::chain::MonotoneChain *>()),
+:       monoChains(),
 index(new geos::index::strtree::STRtree()),
 indexCounter(0),
@@ -106 +106 @@
 {
     delete index;
-    delete monoChains;
 
     chainstore_mm_type::iterator end = chainStore.end();
@@ -139 +138 @@
     processCounter = indexCounter + 1;
     nOverlaps = 0;
-    monoChains->clear();
+    monoChains.clear();
 
     for (std::size_t i = 0, n = segStrings->size(); i < n; i++)