tracking: tracks an attribute for a path

works via labels + entry dijkstra updates entry tracking with the label tracking useful to know if a path contains an elevator somewhere without having to actually reconstruct the whole path
motis-project · Jul 20, 2024 · 9d3c63f · 9d3c63f
1 parent 6cf0a46
commit 9d3c63f
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 11 deletions.
diff --git a/include/osr/routing/dijkstra.h b/include/osr/routing/dijkstra.h
@@ -57,7 +57,7 @@ struct dijkstra {
                 cost_[neighbor.get_key()].update(
                     l, neighbor, static_cast<cost_t>(total), curr)) {
               auto next = label{neighbor, static_cast<cost_t>(total)};
-              next.track(r, way, neighbor.get_node());
+              next.track(l, r, way, neighbor.get_node());
               pq_.push(std::move(next));
             }
           });

diff --git a/include/osr/routing/profiles/bike.h b/include/osr/routing/profiles/bike.h
@@ -39,7 +39,7 @@ struct bike {
     constexpr node get_node() const noexcept { return {n_}; }
     constexpr cost_t cost() const noexcept { return cost_; }
 
-    void track(ways::routing const&, way_idx_t, node_idx_t) {}
+    void track(label const&, ways::routing const&, way_idx_t, node_idx_t) {}
 
     node_idx_t n_;
     level_t lvl_;

diff --git a/include/osr/routing/profiles/car.h b/include/osr/routing/profiles/car.h
@@ -33,8 +33,6 @@ struct car {
 
     constexpr node_idx_t get_key() const noexcept { return n_; }
 
-    void track(ways::routing const&, way_idx_t, node_idx_t) {}
-
     std::ostream& print(std::ostream& out, ways const& w) const {
       return out << "(node=" << w.node_to_osm_[n_] << ", dir=" << to_str(dir_)
                  << ", way=" << w.way_osm_idx_[w.r_->node_ways_[n_][way_]]
@@ -53,7 +51,7 @@ struct car {
     constexpr node get_node() const noexcept { return {n_, way_, dir_}; }
     constexpr cost_t cost() const noexcept { return cost_; }
 
-    void track(ways::routing const&, way_idx_t, node_idx_t) {}
+    void track(label const&, ways::routing const&, way_idx_t, node_idx_t) {}
 
     node_idx_t n_;
     way_pos_t way_;

diff --git a/include/osr/routing/profiles/car_parking.h b/include/osr/routing/profiles/car_parking.h
@@ -93,7 +93,7 @@ struct car_parking {
 
     constexpr cost_t cost() const noexcept { return cost_; }
 
-    void track(ways::routing const&, way_idx_t, node_idx_t) {}
+    void track(label const&, ways::routing const&, way_idx_t, node_idx_t) {}
 
     node_idx_t n_;
     cost_t cost_;

diff --git a/include/osr/routing/profiles/foot.h b/include/osr/routing/profiles/foot.h
@@ -41,8 +41,11 @@ struct foot {
     constexpr node get_node() const noexcept { return {n_, lvl_}; }
     constexpr cost_t cost() const noexcept { return cost_; }
 
-    void track(ways::routing const& r, way_idx_t const w, node_idx_t const n) {
-      tracking_.track(r, w, n);
+    void track(label const& l,
+               ways::routing const& r,
+               way_idx_t const w,
+               node_idx_t const n) {
+      tracking_.track(l.tracking_, r, w, n);
     }
 
     node_idx_t n_;

diff --git a/include/osr/routing/tracking.h b/include/osr/routing/tracking.h
@@ -7,16 +7,22 @@ namespace osr {
 
 struct elevator_tracking {
   void write(path& p) const { p.uses_elevator_ = uses_elevator_; }
-  void track(ways::routing const& r, way_idx_t, node_idx_t const n) {
-    uses_elevator_ |= r.node_properties_[n].is_elevator();
+  void track(elevator_tracking const& l,
+             ways::routing const& r,
+             way_idx_t,
+             node_idx_t const n) {
+    uses_elevator_ = l.uses_elevator_ || r.node_properties_[n].is_elevator();
   }
 
   bool uses_elevator_{false};
 };
 
 struct noop_tracking {
   void write(path&) const {}
-  void track(ways::routing const&, way_idx_t, node_idx_t) {}
+  void track(noop_tracking const&,
+             ways::routing const&,
+             way_idx_t,
+             node_idx_t) {}
 };
 
 }  // namespace osr