Changeset 2731

Timestamp:

Nov 19, 2009, 1:06:16 PM (15 years ago)

Author:

strk

Message:

Don't force heap allocation when building edge rings for isValidOp

Location:

trunk/source

Files:

• headers/geos/operation/overlay/MaximalEdgeRing.h (modified) (2 diffs)
• headers/geos/operation/valid/ConnectedInteriorTester.h (modified) (1 diff)
• operation/overlay/MaximalEdgeRing.cpp (modified) (1 diff)
• operation/valid/ConnectedInteriorTester.cpp (modified) (8 diffs)

trunk/source/headers/geos/operation/overlay/MaximalEdgeRing.h

@@ -83 +83 @@
         /// pointers to newly allocated MinimalEdgeRing objects.
         ///
+        /// @deprecated pass the vector yourself instead
+        ///
         std::vector<MinimalEdgeRing*>* buildMinimalRings();
 
@@ -90 +92 @@
         ///
         void buildMinimalRings(std::vector<MinimalEdgeRing*>& minEdgeRings);
+        void buildMinimalRings(std::vector<EdgeRing*>& minEdgeRings);
 
         /// \brief

trunk/source/headers/geos/operation/valid/ConnectedInteriorTester.h

@@ -92 +92 @@
         
         /**
+         * \brief
          * Form DirectedEdges in graph into Minimal EdgeRings.
-         * (Minimal Edgerings must be used, because only they are guaranteed to provide
-         * a correct isHole computation)
          *
-         * The returned vector and its contents are allocated on the
-         * heap; deletion responsibility is left to caller.
+         * Minimal Edgerings must be used, because only they are
+         * guaranteed to provide a correct isHole computation.
+         *
+         * @param minEdgeRings : newly allocated minimal edge rings will
+         *                       be push_back'ed here.
+         *                       deletion responsibility is left to caller.
          */
-        std::vector<geomgraph::EdgeRing*>* buildEdgeRings(
-                        std::vector<geomgraph::EdgeEnd*> *dirEdges);
+        void buildEdgeRings(std::vector<geomgraph::EdgeEnd*> *dirEdges,
+                            std::vector<geomgraph::EdgeRing*>& minEdgeRings);
 
         /**

trunk/source/operation/overlay/MaximalEdgeRing.cpp

@@ -125 +125 @@
 }
 
+/*public*/
+void
+MaximalEdgeRing::buildMinimalRings(vector<EdgeRing*>& minEdgeRings)
+{
+        DirectedEdge *de=startDe;
+        do {
+                if(de->getMinEdgeRing()==NULL) {
+                        MinimalEdgeRing *minEr=new MinimalEdgeRing(de, geometryFactory);
+                        minEdgeRings.push_back(minEr);
+                }
+                de=de->getNext();
+        } while(de!=startDe);
+}
+
 } // namespace geos.operation.overlay
 } // namespace geos.operation

trunk/source/operation/valid/ConnectedInteriorTester.cpp

@@ -54 +54 @@
 #endif
 
+//#define GEOS_CAST_PARANOIA 1
+
 #if GEOS_DEBUG
 #include <iostream>
@@ -115 +117 @@
         graph.linkResultDirectedEdges();
 
-        // Someone has to delete the returned vector and its contents
-        std::vector<EdgeRing*>* edgeRings=buildEdgeRings(graph.getEdgeEnds());
-        assert(edgeRings);
-
-#if GEOS_DEBUG
-        cerr << "buildEdgeRings constructed " << edgeRings->size() << " edgeRings." << endl;
+        std::vector<EdgeRing*> edgeRings;
+        buildEdgeRings(graph.getEdgeEnds(), edgeRings);
+
+#if GEOS_DEBUG
+        cerr << "buildEdgeRings constructed " << edgeRings.size() << " edgeRings." << endl;
 #endif
 
@@ -133 +134 @@
 
 #if GEOS_DEBUG
-        cerr << "after visitShellInteriors edgeRings are " << edgeRings->size() << " edgeRings." << endl;
+        cerr << "after visitShellInteriors edgeRings are " << edgeRings.size() << " edgeRings." << endl;
 #endif
 
@@ -143 +144 @@
          * polygon into at least two pieces.  The polygon is thus invalid.
          */
-        bool res=!hasUnvisitedShellEdge(edgeRings);
-
-        assert(edgeRings);
-#if GEOS_DEBUG
-        cerr << "releasing " << edgeRings->size() << " edgeRings." << endl;
+        bool res=!hasUnvisitedShellEdge(&edgeRings);
+
+#if GEOS_DEBUG
+        cerr << "releasing " << edgeRings.size() << " edgeRings." << endl;
 #endif
         // Release memory allocated by buildEdgeRings
-        for(size_t i=0, n=edgeRings->size(); i<n; ++i)
-        {
-                EdgeRing* er = (*edgeRings)[i];
+        for(size_t i=0, n=edgeRings.size(); i<n; ++i)
+        {
+                EdgeRing* er = edgeRings[i];
 #if GEOS_DEBUG
                 cerr<<*er<<endl;
@@ -162 +162 @@
 #endif
         }
-        delete edgeRings;
+        edgeRings.clear();
 
         // Release memory allocated by MaximalEdgeRings
@@ -194 +194 @@
 
 /*private*/
-std::vector<EdgeRing*>*
-ConnectedInteriorTester::buildEdgeRings(std::vector<EdgeEnd*> *dirEdges)
+void
+ConnectedInteriorTester::buildEdgeRings(std::vector<EdgeEnd*> *dirEdges,
+                                        std::vector<EdgeRing*>& minEdgeRings)
 {
 #if GEOS_DEBUG
         cerr << __FUNCTION__ << " got " << dirEdges->size() << " EdgeEnd vector" << endl;
 #endif
-        std::vector<MinimalEdgeRing*> minEdgeRings;
-        for(size_t i=0, n=dirEdges->size(); i<n; ++i)
-        {
+
+        typedef std::vector<EdgeEnd*> EdgeEnds;
+
+        //std::vector<MinimalEdgeRing*> minEdgeRings;
+        for(EdgeEnds::size_type i=0, n=dirEdges->size(); i<n; ++i)
+        {
+#ifdef GEOS_CAST_PARANOIA 
                 assert(dynamic_cast<DirectedEdge*>((*dirEdges)[i]));
+#endif
                 DirectedEdge *de=static_cast<DirectedEdge*>((*dirEdges)[i]);
 
@@ -213 +219 @@
                 if(de->isInResult() && de->getEdgeRing()==NULL)
                 {
-                        //EdgeRing *er=new MaximalEdgeRing(de,geometryFactory);
-                        //edgeRings->push_back(er);
-
-                        MaximalEdgeRing* er=new MaximalEdgeRing(de, geometryFactory);
+                        MaximalEdgeRing* er = new MaximalEdgeRing(de,
+                                                           geometryFactory);
                         // We track MaximalEdgeRings allocations
                         // using the private maximalEdgeRings vector
@@ -225 +229 @@
                 }
         }
+/*
         std::vector<EdgeRing*> *edgeRings=new std::vector<EdgeRing*>();
         edgeRings->assign(minEdgeRings.begin(), minEdgeRings.end());
         return edgeRings;
+*/
 }