Store index of the edge label in the map. This removes the need for

a separate map of adj. list entries and simplifies code.

Author: dnesbitt61

src/thor/edgestatus.cc

@@ -16,15 +16,20 @@ void EdgeStatus::Init() {
 
 // Set the edge status of a GraphId
 void EdgeStatus::Set(const baldr::GraphId& edgeid,
-                     const EdgeStatusType status) {
-  edgestatus_[edgeid] = status;
+                     const EdgeSet set, const uint32_t index) {
+  edgestatus_[edgeid] = { set, index };
 }
 
 // Get the edge status of a GraphId. If not found in the map the
 // edge is considered unreached.
-EdgeStatusType EdgeStatus::Get(const baldr::GraphId& edgeid) const {
+EdgeStatusInfo EdgeStatus::Get(const baldr::GraphId& edgeid) const {
   auto p = edgestatus_.find(edgeid);
-  return (p == edgestatus_.end()) ? kUnreached : p->second;
+  return (p == edgestatus_.end()) ? EdgeStatusInfo() : p->second;
+/*  if (p == edgestatus_.end()) {
+    return EdgeStatusInfo();
+  } else {
+    return p->second;
+  }*/
 }
 
 }

test/edgestatus.cc

@@ -10,25 +10,25 @@ using namespace valhalla::thor;
 namespace {
 
 void TryGet(const EdgeStatus& edgestatus, const GraphId& edgeid,
-               const EdgeStatusType expected) {
-  EdgeStatusType r = edgestatus.Get(edgeid);
-  if (r != expected)
+               const EdgeSet expected) {
+  EdgeStatusInfo r = edgestatus.Get(edgeid);
+  if (r.status.set != expected)
     throw runtime_error("EdgeStatus get test failed");
 }
 
 void TestStatus() {
   EdgeStatus edgestatus;
 
   // Add some edges
-  edgestatus.Set(GraphId(555, 1, 100100), kPermanent);
-  edgestatus.Set(GraphId(555, 2, 100100), kPermanent);
-  edgestatus.Set(GraphId(555, 3, 100100), kPermanent);
-  edgestatus.Set(GraphId(555, 1, 55555), kTemporary);
-  edgestatus.Set(GraphId(555, 2, 55555), kTemporary);
-  edgestatus.Set(GraphId(555, 3, 55555), kTemporary);
-  edgestatus.Set(GraphId(555, 1, 1), kPermanent);
-  edgestatus.Set(GraphId(555, 2, 1), kPermanent);
-  edgestatus.Set(GraphId(555, 3, 1), kPermanent);
+  edgestatus.Set(GraphId(555, 1, 100100), kPermanent, 1);
+  edgestatus.Set(GraphId(555, 2, 100100), kPermanent, 2);
+  edgestatus.Set(GraphId(555, 3, 100100), kPermanent, 3);
+  edgestatus.Set(GraphId(555, 1, 55555), kTemporary, 4);
+  edgestatus.Set(GraphId(555, 2, 55555), kTemporary, 5);
+  edgestatus.Set(GraphId(555, 3, 55555), kTemporary, 6);
+  edgestatus.Set(GraphId(555, 1, 1), kPermanent, 7);
+  edgestatus.Set(GraphId(555, 2, 1), kPermanent, 8);
+  edgestatus.Set(GraphId(555, 3, 1), kPermanent, 9);
 
   // Test various get
   TryGet(edgestatus, GraphId(555, 1, 100100), kPermanent);

valhalla/thor/edgestatus.h

@@ -7,17 +7,37 @@
 namespace valhalla {
 namespace thor {
 
-enum EdgeStatusType {
+// Edge label status
+enum EdgeSet {
   kUnreached = 0,   // Unreached - not yet encountered in search
   kPermanent = 1,   // Permanent - shortest path to this edge has been found
   kTemporary = 2    // Temporary - edge has been encountered but there could
                     //   still be a shorter path to this edge. This edge will
                     //   be "adjacent" to an edge that is permanently labeled.
 };
 
+// Store the edge label status and its index in the EdgeLabels list
+struct EdgeStatusInfo {
+  struct SetAndIndex {
+    uint32_t index : 28;
+    uint32_t set   : 4;
+  };
+  SetAndIndex status;
+
+  EdgeStatusInfo() {
+    status.set   = static_cast<uint32_t>(kUnreached);
+    status.index = 0;
+  }
+
+  EdgeStatusInfo(const EdgeSet set, const uint32_t index) {
+    status.set   = static_cast<uint32_t>(set);
+    status.index = index;
+  }
+};
+
 /**
- * Class to define / lookup the status of an edge during the shortest path
- * algorithm.
+ * Class to define / lookup the status and index of an edge in the edge label
+ * list during the shortest path algorithm.
  */
 class EdgeStatus {
  public:
@@ -34,19 +54,23 @@ class EdgeStatus {
   /**
    * Set the status of a directed edge given its GraphId.
    * @param  edgeid   GraphId of the directed edge to set.
-   * @param  status   Label status for this directed edge.
+   * @param  set      Label set for this directed edge.
+   * @param  index    Index of the edge label.
    */
-  void Set(const baldr::GraphId& edgeid, const EdgeStatusType status);
+  void Set(const baldr::GraphId& edgeid, const EdgeSet set,
+           const uint32_t index);
 
   /**
-   * Get the status of a directed edge given its GraphId.
+   * Get the status info of a directed edge given its GraphId.
+   * @param   edgeid  GraphId of the directed edge.
+   * @return  Returns edge status info.
    */
-  EdgeStatusType Get(const baldr::GraphId& edgeid) const;
+  EdgeStatusInfo Get(const baldr::GraphId& edgeid) const;
 
  private:
-  // Map to store the status of GraphIds that have been encountered.
+  // Map to store the status and index of GraphIds that have been encountered.
   // Any unreached edges are not added to the map.
-  std::unordered_map<baldr::GraphId, EdgeStatusType> edgestatus_;
+  std::unordered_map<baldr::GraphId, EdgeStatusInfo> edgestatus_;
 };
 
 }