Changeset 2727

Timestamp:

Nov 19, 2009, 11:31:43 AM (15 years ago)

Author:

strk

Message:

Don't force heap-allocation of vectors for finding/labeling edge rings

Location:

trunk/source

Files:

• headers/geos/operation/polygonize/PolygonizeGraph.h (modified) (2 diffs)
• operation/polygonize/PolygonizeGraph.cpp (modified) (7 diffs)

trunk/source/headers/geos/operation/polygonize/PolygonizeGraph.h

@@ -144 +144 @@
          *      the list of start edges for the edgeRings to convert.
          *
-         * TODO: take ringEdges by ref
          */
         void convertMaximalToMinimalEdgeRings(
-                        std::vector<PolygonizeDirectedEdge*> *ringEdges);
+                        std::vector<PolygonizeDirectedEdge*> &ringEdges);
 
         /**
@@ -164 +163 @@
 
         /**
-         * @param dirEdges a List of the DirectedEdges in the graph
-         * @return a List of DirectedEdges, one for each edge ring found
-         */
-        static std::vector<PolygonizeDirectedEdge*>* findLabeledEdgeRings(
-                        std::vector<planargraph::DirectedEdge*> &dirEdges);
+         * Finds and labels all edgerings in the graph.
+         *
+         * The edge rings are labelling with unique integers.
+         * The labelling allows detecting cut edges.
+         *
+         * @param dirEdgesIn  a list of the DirectedEdges in the graph
+         * @param dirEdgesOut each ring found will be pushed here
+         */
+        static void findLabeledEdgeRings(
+                        std::vector<planargraph::DirectedEdge*> &dirEdgesIn,
+                        std::vector<PolygonizeDirectedEdge*> &dirEdgesOut);
 
         static void label(std::vector<planargraph::DirectedEdge*> &dirEdges, long label);

trunk/source/operation/polygonize/PolygonizeGraph.cpp

@@ -172 +172 @@
 void
 PolygonizeGraph::convertMaximalToMinimalEdgeRings(
-                std::vector<PolygonizeDirectedEdge*> *ringEdges)
+                std::vector<PolygonizeDirectedEdge*> &ringEdges)
 {
         typedef std::vector<Node*> IntersectionNodes;
@@ -178 +178 @@
 
         IntersectionNodes intNodes;
-        for(RingEdges::size_type i=0, in=ringEdges->size();
+        for(RingEdges::size_type i=0, in=ringEdges.size();
                         i<in; ++i)
         {
-                PolygonizeDirectedEdge *de=(*ringEdges)[i];
+                PolygonizeDirectedEdge *de = ringEdges[i];
                 long label=de->getLabel();
                 findIntersectionNodes(de, label, intNodes);
@@ -225 +225 @@
         // clear labels of all edges in graph
         label(dirEdges, -1);
-        std::vector<PolygonizeDirectedEdge*> *maximalRings=findLabeledEdgeRings(dirEdges);
+        std::vector<PolygonizeDirectedEdge*> maximalRings;
+        findLabeledEdgeRings(dirEdges, maximalRings);
         convertMaximalToMinimalEdgeRings(maximalRings);
-        delete maximalRings;
+        maximalRings.clear(); // not needed anymore
 
         // find all edgerings
@@ -240 +241 @@
 }
 
-/**
-*
-* @param dirEdges a List of the DirectedEdges in the graph
-* @return a List of DirectedEdges, one for each edge ring found
-*/
-std::vector<PolygonizeDirectedEdge*>*
-PolygonizeGraph::findLabeledEdgeRings(std::vector<DirectedEdge*> &dirEdges)
-{
-        std::vector<PolygonizeDirectedEdge*> *edgeRingStarts=new std::vector<PolygonizeDirectedEdge*>();
+/* static private */
+void
+PolygonizeGraph::findLabeledEdgeRings(std::vector<DirectedEdge*> &dirEdges,
+                std::vector<PolygonizeDirectedEdge*> &edgeRingStarts)
+{
         // label the edge rings formed
         long currLabel=1;
@@ -256 +253 @@
                 if (de->isMarked()) continue;
                 if (de->getLabel() >= 0) continue;
-                edgeRingStarts->push_back(de);
+                edgeRingStarts.push_back(de);
                 std::vector<DirectedEdge*> *edges=findDirEdgesInRing(de);
                 label(*edges, currLabel);
@@ -262 +259 @@
                 ++currLabel;
         }
-        return edgeRingStarts;
 }
 
@@ -275 +271 @@
 
         // label the current set of edgerings
-        delete findLabeledEdgeRings(dirEdges);
+        std::vector<PolygonizeDirectedEdge*> junk;
+        findLabeledEdgeRings(dirEdges, junk);
+        junk.clear(); // not needed anymore
 
         /*