Avoid overhead in zeroLenLine tests for non-line features. Some inlin…

…eing of trivial accessors.
libgeos · Aug 15, 2024 · 1821b67 · 1821b67
1 parent e8e3e25
commit 1821b67
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 103 deletions.
diff --git a/include/geos/algorithm/CGAlgorithmsDD.h b/include/geos/algorithm/CGAlgorithmsDD.h
@@ -87,7 +87,7 @@ class GEOS_DLL CGAlgorithmsDD {
      *
      * Uses an approach due to Jonathan Shewchuk, which is in the public domain.
      */
-    static int orientationIndexFilter(
+    static inline int orientationIndexFilter(
         double pax, double pay,
         double pbx, double pby,
         double pcx, double pcy)

diff --git a/include/geos/operation/relateng/RelateGeometry.h b/include/geos/operation/relateng/RelateGeometry.h
@@ -97,6 +97,13 @@ class GEOS_DLL RelateGeometry {
 
     static bool isZeroLength(const LineString* line);
 
+    bool isZeroLengthLine(const Geometry* g) const {
+        // avoid expensive zero-length calculation if not linear
+        if (getDimension() != Dimension::L)
+            return false;
+        return isZeroLength(g);
+    };
+
     RelatePointLocator* getLocator();
 
     Coordinate::ConstXYSet createUniquePoints();
@@ -141,15 +148,30 @@ class GEOS_DLL RelateGeometry {
 
     static std::string name(bool isA);
 
-    const Geometry* getGeometry() const;
-
-    bool isPrepared() const;
-
-    const Envelope* getEnvelope() const;
-
-    int getDimension() const;
-
-    bool hasDimension(int dim) const;
+    const Geometry* getGeometry() const {
+        return geom;
+    }
+
+    bool isPrepared() const {
+        return m_isPrepared;
+    }
+
+    const Envelope* getEnvelope() const {
+        return geomEnv;
+    }
+
+    inline int getDimension() const {
+        return geomDim;
+    }
+
+    bool hasDimension(int dim) const {
+        switch (dim) {
+            case Dimension::P: return hasPoints;
+            case Dimension::L: return hasLines;
+            case Dimension::A: return hasAreas;
+        }
+        return false;
+    }
 
     /**
     * Gets the actual non-empty dimension of the geometry.

diff --git a/include/geos/operation/relateng/RelateSegmentString.h b/include/geos/operation/relateng/RelateSegmentString.h
@@ -123,11 +123,17 @@ class GEOS_DLL RelateSegmentString : public BasicSegmentString {
         bool isA, int elementId, int ringId,
         const Geometry* poly, const RelateGeometry* parent);
 
-    bool isA() const;
+    inline bool isA() const {
+        return m_isA;
+    }
 
-    const RelateGeometry* getGeometry() const;
+    inline const RelateGeometry* getGeometry() const {
+        return m_inputGeom;
+    }
 
-    const Geometry* getPolygonal() const;
+    inline const Geometry* getPolygonal() const {
+        return m_parentPolygonal;
+    }
 
     NodeSection* createNodeSection(std::size_t segIndex, const CoordinateXY intPt) const;
 

diff --git a/include/geos/operation/relateng/TopologyComputer.h b/include/geos/operation/relateng/TopologyComputer.h
@@ -67,7 +67,9 @@ class GEOS_DLL TopologyComputer {
 
     void initExteriorEmpty(bool geomNonEmpty);
 
-    RelateGeometry& getGeometry(bool isA) const;
+    inline RelateGeometry& getGeometry(bool isA) const {
+        return isA ? geomA : geomB;
+    };
 
     void updateDim(Location locA, Location locB, int dimension);
 
@@ -135,16 +137,16 @@ class GEOS_DLL TopologyComputer {
 
 public:
 
-        TopologyComputer(
-            TopologyPredicate& p_predicate,
-            RelateGeometry& p_geomA,
-            RelateGeometry& p_geomB)
-            : predicate(p_predicate)
-            , geomA(p_geomA)
-            , geomB(p_geomB)
-            {
-                initExteriorDims();
-            };
+    TopologyComputer(
+        TopologyPredicate& p_predicate,
+        RelateGeometry& p_geomA,
+        RelateGeometry& p_geomB)
+        : predicate(p_predicate)
+        , geomA(p_geomA)
+        , geomB(p_geomB)
+        {
+            initExteriorDims();
+        };
 
     int getDimension(bool isA) const;
 

diff --git a/src/operation/relateng/RelateGeometry.cpp b/src/operation/relateng/RelateGeometry.cpp
@@ -56,7 +56,7 @@ RelateGeometry::RelateGeometry(const Geometry* input, bool isPrepared, const Bou
     , geomEnv(input->getEnvelopeInternal())
     , boundaryNodeRule(bnRule)
     , geomDim(input->getDimension())
-    , isLineZeroLen(isZeroLength(input))
+    , isLineZeroLen(isZeroLengthLine(input))
     , isGeomEmpty(input->isEmpty())
 {
     analyzeDimensions();
@@ -154,47 +154,6 @@ RelateGeometry::isZeroLength(const LineString* line) {
 }
 
 
-/* public */
-const Geometry*
-RelateGeometry::getGeometry() const
-{
-    return geom;
-}
-
-/* public */
-bool
-RelateGeometry::isPrepared() const
-{
-    return m_isPrepared;
-}
-
-/* public */
-const Envelope*
-RelateGeometry::getEnvelope() const
-{
-    return geomEnv;
-}
-
-/* public */
-int
-RelateGeometry::getDimension() const
-{
-    return geomDim;
-}
-
-/* public */
-bool
-RelateGeometry::hasDimension(int dim) const
-{
-    switch (dim) {
-        case Dimension::P: return hasPoints;
-        case Dimension::L: return hasLines;
-        case Dimension::A: return hasAreas;
-    }
-    return false;
-}
-
-
 /* public */
 int
 RelateGeometry::getDimensionReal() const
@@ -210,6 +169,7 @@ RelateGeometry::getDimensionReal() const
     return Dimension::P;
 }
 
+
 /* public */
 bool
 RelateGeometry::hasEdges() const

diff --git a/src/operation/relateng/RelateSegmentString.cpp b/src/operation/relateng/RelateSegmentString.cpp
@@ -69,30 +69,6 @@ RelateSegmentString::createSegmentString(
 }
 
 
-/* public */
-bool
-RelateSegmentString::isA() const
-{
-    return m_isA;
-}
-
-
-/* public */
-const RelateGeometry*
-RelateSegmentString::getGeometry() const
-{
-    return m_inputGeom;
-}
-
-
-/* public */
-const Geometry*
-RelateSegmentString::getPolygonal() const
-{
-    return m_parentPolygonal;
-}
-
-
 /* public */
 NodeSection*
 RelateSegmentString::createNodeSection(std::size_t segIndex, const CoordinateXY intPt) const

diff --git a/src/operation/relateng/TopologyComputer.cpp b/src/operation/relateng/TopologyComputer.cpp
@@ -111,11 +111,12 @@ TopologyComputer::initExteriorEmpty(bool geomNonEmpty)
 }
 
 
-/* private */
-RelateGeometry&
-TopologyComputer::getGeometry(bool isA) const
+/* public */
+bool
+TopologyComputer::isAreaArea() const
 {
-    return isA ? geomA : geomB;
+    return getDimension(RelateGeometry::GEOM_A) == Dimension::A
+        && getDimension(RelateGeometry::GEOM_B) == Dimension::A;
 }
 
 
@@ -127,15 +128,6 @@ TopologyComputer::getDimension(bool isA) const
 }
 
 
-/* public */
-bool
-TopologyComputer::isAreaArea() const
-{
-    return getDimension(RelateGeometry::GEOM_A) == Dimension::A
-        && getDimension(RelateGeometry::GEOM_B) == Dimension::A;
-}
-
-
 /* public */
 bool
 TopologyComputer::isSelfNodingRequired() const