Ticket #3588: UnorderedSetHierPath.patch

HierarchicalPathfinder.cpp

@@ -576 +576 @@
     RegionID source = Get(i0, j0, passClass);
 
     // Find everywhere that's reachable
-    std::set<RegionID> reachableRegions;
+    ReachableSet reachableRegions;
     FindReachableRegions(source, reachableRegions, passClass);
 
     // Check whether any reachable region contains the goal
@@ -641 +641 @@
 
 void HierarchicalPathfinder::FindNearestPassableNavcell(u16& i, u16& j, pass_class_t passClass)
 {
-    std::set<RegionID> regions;
+    ReachableSet regions;
     FindPassableRegions(regions, passClass);
     FindNearestNavcellInRegions(regions, i, j, passClass);
 }
 
-void HierarchicalPathfinder::FindNearestNavcellInRegions(const std::set<RegionID>& regions, u16& iGoal, u16& jGoal, pass_class_t passClass)
+void HierarchicalPathfinder::FindNearestNavcellInRegions(const ReachableSet& regions, u16& iGoal, u16& jGoal, pass_class_t passClass)
 {
     // Find the navcell in the given regions that's nearest to the goal navcell:
     // * For each region, record the (squared) minimal distance to the goal point
@@ -703 +703 @@
     jGoal = jBest;
 }
 
-void HierarchicalPathfinder::FindReachableRegions(RegionID from, std::set<RegionID>& reachable, pass_class_t passClass)
+void HierarchicalPathfinder::FindReachableRegions(RegionID from, ReachableSet& reachable, pass_class_t passClass)
 {
     // Flood-fill the region graph, starting at 'from',
     // collecting all the regions that are reachable via edges
@@ -725 +725 @@
     }
 }
 
-void HierarchicalPathfinder::FindPassableRegions(std::set<RegionID>& regions, pass_class_t passClass)
+void HierarchicalPathfinder::FindPassableRegions(ReachableSet& regions, pass_class_t passClass)
 {
     // Construct a set of all regions of all chunks for this pass class
     for (const Chunk& chunk : m_Chunks[passClass])
@@ -769 +769 @@
             if (from.r == 0)
                 continue;
 
-            std::set<RegionID> reachable;
+            ReachableSet reachable;
             FindReachableRegions(from, reachable, passClass);
 
             for (const RegionID& region : reachable)

HierarchicalPathfinder.h

@@ -24 +24 @@
 #include "Render.h"
 #include "graphics/SColor.h"
 
+#include <unordered_set>
+
 /**
  * Hierarchical pathfinder.
  *
@@ -73 +75 @@
             return ((ci == b.ci) && (cj == b.cj) && (r == b.r));
         }
     };
+    struct RegionIDHash
+    {
+        size_t operator() (const RegionID &a) const {
+            return *((u32*)&a);
+        }
+    };
 
     HierarchicalPathfinder();
     ~HierarchicalPathfinder();
@@ -147 +155 @@
     };
 
     typedef std::map<RegionID, std::set<RegionID> > EdgesMap;
+    typedef std::unordered_set<RegionID, RegionIDHash> ReachableSet;
 
     void FindEdges(u8 ci, u8 cj, pass_class_t passClass, EdgesMap& edges);
 
-    void FindReachableRegions(RegionID from, std::set<RegionID>& reachable, pass_class_t passClass);
+    void FindReachableRegions(RegionID from, ReachableSet& reachable, pass_class_t passClass);
 
-    void FindPassableRegions(std::set<RegionID>& regions, pass_class_t passClass);
+    void FindPassableRegions(ReachableSet& regions, pass_class_t passClass);
 
     /**
      * Updates @p iGoal and @p jGoal to the navcell that is the nearest to the
@@ -159 +168 @@
      * initial goal coordinates, in one of the given @p regions.
      * (Assumes @p regions is non-empty.)
      */
-    void FindNearestNavcellInRegions(const std::set<RegionID>& regions, u16& iGoal, u16& jGoal, pass_class_t passClass);
+    void FindNearestNavcellInRegions(const ReachableSet& regions, u16& iGoal, u16& jGoal, pass_class_t passClass);
 
     Chunk& GetChunk(u8 ci, u8 cj, pass_class_t passClass)
     {