Pass time to EdgeCost for initial edges in Dijkstra (valhalla#5677)

Author: chrstnbwnkl

CHANGELOG.md

@@ -3,6 +3,7 @@
    * REMOVED: ENABLE_GDAL define for **Linux-only** Python binding releases [#5642](https://github.com/valhalla/valhalla/pull/5642)
    * REMOVED: pyvalhalla-weekly PyPI package [#5673](https://github.com/valhalla/valhalla/pull/5673)
 * **Bug Fix**
+   * FIXED: Pass time to `EdgeCost` for initial edges in Dijkstra [#5677](https://github.com/valhalla/valhalla/pull/5677)
 * **Enhancement**
    * CHANGED: Removed black and flake8 with ruff [#5639](https://github.com/valhalla/valhalla/pull/5639)
    * FIXED:  Fix hard exclusions with shortcuts [#5647](https://github.com/valhalla/valhalla/pull/5647) 

src/thor/dijkstras.cc

@@ -337,15 +337,16 @@ void Dijkstras::Compute(google::protobuf::RepeatedPtrField<valhalla::Location>&
 
   // Prepare for a graph traversal
   Initialize(bdedgelabels_, adjacencylist_, costing_->UnitSize());
-  if (expansion_direction == ExpansionType::forward) {
-    SetOriginLocations(graphreader, locations, costing_);
-  } else {
-    SetDestinationLocations(graphreader, locations, costing_);
-  }
 
   // Get the time information for all the origin locations
   auto time_infos = SetTime(locations, graphreader);
 
+  if (expansion_direction == ExpansionType::forward) {
+    SetOriginLocations(graphreader, locations, time_infos, costing_);
+  } else {
+    SetDestinationLocations(graphreader, locations, time_infos, costing_);
+  }
+
   // Compute the isotile
   auto cb_decision = ExpansionRecommendation::continue_expansion;
   while (cb_decision != ExpansionRecommendation::stop_expansion) {
@@ -773,15 +774,16 @@ void Dijkstras::ComputeMultiModal(
 // Add edge(s) at each origin to the adjacency list
 void Dijkstras::SetOriginLocations(GraphReader& graphreader,
                                    google::protobuf::RepeatedPtrField<valhalla::Location>& locations,
+                                   const std::vector<baldr::TimeInfo>& time_infos,
                                    const cost_ptr_t& costing) {
   // Bail if you want to do a multipath expansion with more locations than edge label/status supports
   if (multipath_ && locations.size() > baldr::kMaxMultiPathId)
     throw std::runtime_error("Max number of locations exceeded");
 
   // Add edges for each location to the adjacency list
-  uint8_t path_id = -1;
+  uint8_t loc_idx = -1;
   for (auto& location : locations) {
-    ++path_id;
+    ++loc_idx;
 
     // Only skip inbound edges if we have other options
     bool has_other_edges = false;
@@ -790,6 +792,8 @@ void Dijkstras::SetOriginLocations(GraphReader& graphreader,
                     has_other_edges = has_other_edges || !e.end_node();
                   });
 
+    const auto& time_info = time_infos[loc_idx];
+
     // Iterate through edges and add to adjacency list
     for (const auto& edge : (location.correlation().edges())) {
       // If origin is at a node - skip any inbound edge (dist = 1)
@@ -819,7 +823,7 @@ void Dijkstras::SetOriginLocations(GraphReader& graphreader,
 
       // Get cost
       uint8_t flow_sources;
-      Cost cost = costing->EdgeCost(directededge, tile, TimeInfo::invalid(), flow_sources) *
+      Cost cost = costing->EdgeCost(directededge, tile, time_info, flow_sources) *
                   (1.0f - edge.percent_along());
       // Get path distance
       auto path_dist = directededge->length() * (1 - edge.percent_along());
@@ -839,7 +843,7 @@ void Dijkstras::SetOriginLocations(GraphReader& graphreader,
       bdedgelabels_.emplace_back(kInvalidLabel, edgeid, opp_edge_id, directededge, cost, mode_,
                                  Cost{}, path_dist, false, !(costing_->IsClosed(directededge, tile)),
                                  static_cast<bool>(flow_sources & kDefaultFlowMask),
-                                 InternalTurn::kNoTurn, kInvalidRestriction, multipath_ ? path_id : 0,
+                                 InternalTurn::kNoTurn, kInvalidRestriction, multipath_ ? loc_idx : 0,
                                  directededge->destonly() ||
                                      (costing_->is_hgv() && directededge->destonly_hgv()),
                                  directededge->forwardaccess() & kTruckAccess,
@@ -849,7 +853,7 @@ void Dijkstras::SetOriginLocations(GraphReader& graphreader,
 
       // Add EdgeLabel to the adjacency list
       adjacencylist_.add(idx);
-      edgestatus_.Set(edgeid, EdgeSet::kTemporary, idx, tile, multipath_ ? path_id : 0);
+      edgestatus_.Set(edgeid, EdgeSet::kTemporary, idx, tile, multipath_ ? loc_idx : 0);
     }
   }
 }
@@ -858,15 +862,18 @@ void Dijkstras::SetOriginLocations(GraphReader& graphreader,
 void Dijkstras::SetDestinationLocations(
     GraphReader& graphreader,
     google::protobuf::RepeatedPtrField<valhalla::Location>& locations,
+    const std::vector<baldr::TimeInfo>& time_infos,
     const cost_ptr_t& costing) {
   // Bail if you want to do a multipath expansion with more locations than edge label/status supports
   if (multipath_ && locations.size() > baldr::kMaxMultiPathId)
     throw std::runtime_error("Max number of locations exceeded");
 
   // Add edges for each location to the adjacency list
-  uint8_t path_id = -1;
+  uint8_t loc_idx = -1;
   for (auto& location : locations) {
-    ++path_id;
+    ++loc_idx;
+
+    const auto& time_info = time_infos[loc_idx];
 
     // Only skip outbound edges if we have other options
     bool has_other_edges = false;
@@ -906,8 +913,8 @@ void Dijkstras::SetDestinationLocations(
 
       // Get the cost
       uint8_t flow_sources;
-      Cost cost = costing->EdgeCost(directededge, tile, TimeInfo::invalid(), flow_sources) *
-                  edge.percent_along();
+      Cost cost =
+          costing->EdgeCost(directededge, tile, time_info, flow_sources) * edge.percent_along();
       // Get the path distance
       auto path_dist = directededge->length() * edge.percent_along();
 
@@ -938,13 +945,13 @@ void Dijkstras::SetDestinationLocations(
       bdedgelabels_.emplace_back(kInvalidLabel, opp_edge_id, edgeid, opp_dir_edge, cost, mode_,
                                  Cost{}, path_dist, false, !(costing_->IsClosed(directededge, tile)),
                                  static_cast<bool>(flow_sources & kDefaultFlowMask),
-                                 InternalTurn::kNoTurn, restriction_idx, multipath_ ? path_id : 0,
+                                 InternalTurn::kNoTurn, restriction_idx, multipath_ ? loc_idx : 0,
                                  directededge->destonly() ||
                                      (costing_->is_hgv() && directededge->destonly_hgv()),
                                  directededge->forwardaccess() & kTruckAccess,
                                  destonly_restriction_mask);
       adjacencylist_.add(idx);
-      edgestatus_.Set(opp_edge_id, EdgeSet::kTemporary, idx, opp_tile, multipath_ ? path_id : 0);
+      edgestatus_.Set(opp_edge_id, EdgeSet::kTemporary, idx, opp_tile, multipath_ ? loc_idx : 0);
     }
   }
 }

valhalla/thor/dijkstras.h

@@ -244,6 +244,7 @@ class Dijkstras {
    */
   void SetOriginLocations(baldr::GraphReader& graphreader,
                           google::protobuf::RepeatedPtrField<valhalla::Location>& locations,
+                          const std::vector<baldr::TimeInfo>& time_infos,
                           const sif::cost_ptr_t& costing);
 
   /**
@@ -265,6 +266,7 @@ class Dijkstras {
    */
   void SetDestinationLocations(baldr::GraphReader& graphreader,
                                google::protobuf::RepeatedPtrField<valhalla::Location>& locations,
+                               const std::vector<baldr::TimeInfo>& time_infos,
                                const sif::cost_ptr_t& costing);
 
   /**