Dump round times

exe/benchmark.cc

@@ -115,8 +115,9 @@ void generate_queries(
   std::cout << "--- Query generator settings ---\n" << gs << "\n--- --- ---\n";
   queries.reserve(n_queries);
   for (auto i = 0U; i != n_queries; ++i) {
-    auto const sdq = qg.random_query();
+    auto sdq = qg.random_query();
     if (sdq.has_value()) {
+      sdq.value().q_.id_ = i;
       queries.emplace_back(sdq.value());
     }
   }

include/nigiri/common/delta_t.h

@@ -5,9 +5,6 @@
 
 namespace nigiri {
 
-using delta_t = std::int16_t;
-static_assert(sizeof(delta_t) == 2);
-
 template <direction SearchDir>
 inline constexpr auto const kInvalidDelta =
     SearchDir == direction::kForward ? std::numeric_limits<delta_t>::max()

include/nigiri/routing/dump_round_times.h

@@ -0,0 +1,31 @@
+#pragma once
+
+#include "nigiri/routing/raptor/raptor_state.h"
+#include "nigiri/types.h"
+
+// #define NIGIRI_DUMP_ROUND_TIMES_DIR "./round_times"
+#ifdef NIGIRI_DUMP_ROUND_TIMES_DIR
+#define dump_round_times(dbg_dir, tag, state, k, Vias) \
+  dump_round_times_fun<Vias>(dbg_dir, tag, state, k)
+
+namespace nigiri::routing {
+
+template <via_offset_t Vias>
+void dump_round_times_fun(std::optional<std::string> const& dbg_dir,
+                          std::string_view tag,
+                          raptor_state const& rs,
+                          unsigned const k) {
+  if (dbg_dir) {
+    auto ostrm = std::ofstream{fmt::format("{}/k{}_{}.bin", *dbg_dir, k, tag),
+                               std::ios::binary};
+    ostrm.write(reinterpret_cast<char const*>(
+                    &rs.round_times_storage_[k * rs.n_locations_ * (Vias + 1)]),
+                rs.n_locations_ * (Vias + 1) * sizeof(delta_t));
+  }
+}
+
+}  // namespace nigiri::routing
+
+#else
+#define dump_round_times(dbg_dir, tag, state, k, Vias)
+#endif

include/nigiri/routing/query.h

@@ -82,6 +82,7 @@ struct query {
   transfer_time_settings transfer_time_settings_{};
   std::vector<via_stop> via_stops_{};
   std::optional<duration_t> fastest_direct_{};
+  std::uint32_t id_{};
 };
 
 }  // namespace nigiri::routing

include/nigiri/routing/raptor/raptor.h

@@ -4,6 +4,7 @@
 
 #include "nigiri/common/delta_t.h"
 #include "nigiri/common/linear_lower_bound.h"
+#include "nigiri/routing/dump_round_times.h"
 #include "nigiri/routing/journey.h"
 #include "nigiri/routing/limits.h"
 #include "nigiri/routing/pareto_set.h"
@@ -123,6 +124,8 @@ struct raptor {
 
   algo_stats_t get_stats() const { return stats_; }
 
+  day_idx_t get_base() const { return base_; }
+
   void reset_arrivals() {
     utl::fill(time_at_dest_, kInvalid);
     round_times_.reset(kInvalidArray);
@@ -160,6 +163,7 @@ struct raptor {
     }
 
     trace_print_init_state();
+    dump_round_times(dbg_dir_, "init", state_, 0U, Vias);
 
     for (auto k = 1U; k != end_k; ++k) {
       for (auto i = 0U; i != n_locations_; ++i) {
@@ -254,6 +258,10 @@ struct raptor {
     reconstruct_journey<SearchDir>(tt_, rtt_, q, state_, j, base(), base_);
   }
 
+#ifdef NIGIRI_DUMP_ROUND_TIMES_DIR
+  std::optional<std::string> dbg_dir_;
+#endif
+
 private:
   date::sys_days base() const {
     return tt_.internal_interval_days().from_ + as_int(base_) * date::days{1};
@@ -382,6 +390,7 @@ struct raptor {
         }
       }
     });
+    dump_round_times(dbg_dir_, "1_update_transfers", state_, k, Vias);
   }
 
   void update_footpaths(unsigned const k, profile_idx_t const prf_idx) {
@@ -477,6 +486,7 @@ struct raptor {
         }
       }
     });
+    dump_round_times(dbg_dir_, "3_update_footpaths", state_, k, Vias);
   }
 
   void update_td_offsets(unsigned const k, profile_idx_t const prf_idx) {
@@ -576,6 +586,7 @@ struct raptor {
         });
       }
     });
+    dump_round_times(dbg_dir_, "4_update_td_offsets", state_, k, Vias);
   }
 
   void update_intermodal_footpaths(unsigned const k) {
@@ -628,6 +639,8 @@ struct raptor {
         }
       }
     });
+    dump_round_times(dbg_dir_, "2_update_intermodal_footpaths", state_, k,
+                     Vias);
   }
 
   template <bool WithSectionBikeFilter>

include/nigiri/routing/search.h

@@ -12,6 +12,7 @@
 #include "nigiri/get_otel_tracer.h"
 #include "nigiri/logging.h"
 #include "nigiri/routing/dijkstra.h"
+#include "nigiri/routing/dump_round_times.h"
 #include "nigiri/routing/get_fastest_direct.h"
 #include "nigiri/routing/interval_estimate.h"
 #include "nigiri/routing/journey.h"
@@ -404,6 +405,16 @@ struct search {
           auto const worst_time_at_dest =
               start_time +
               (kFwd ? 1 : -1) * std::min(fastest_direct_, kMaxTravelTime);
+
+#ifdef NIGIRI_DUMP_ROUND_TIMES_DIR
+          algo_.dbg_dir_ = fmt::format(
+              "{}/query_{}_[{}]/interval_{}_[{}]-[{}]/start_[{}]",
+              NIGIRI_DUMP_ROUND_TIMES_DIR, q_.id_,
+              tt_.to_unixtime(algo_.get_base()), stats_.interval_extensions_,
+              search_interval_.from_, search_interval_.to_, start_time);
+          std::filesystem::create_directories(*algo_.dbg_dir_);
+#endif
+
           algo_.execute(start_time, q_.max_transfers_, worst_time_at_dest,
                         q_.prf_idx_, state_.results_);
 

include/nigiri/types.h

@@ -350,6 +350,8 @@ using transport_mode_id_t = std::int32_t;
 
 using via_offset_t = std::uint8_t;
 
+using delta_t = std::int16_t;
+static_assert(sizeof(delta_t) == 2);
 }  // namespace nigiri
 
 #include <iomanip>