Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions include/nigiri/routing/one_to_all.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,13 @@ fastest_offset get_fastest_one_to_all_offsets(timetable const& tt,
unixtime_t start_time,
std::uint8_t transfers);

void for_each_one_to_all_round_time(
timetable const&,
raptor_state const&,
direction,
location_idx_t,
unixtime_t start_time,
std::uint8_t transfers,
std::function<void(std::uint8_t, duration_t)> const&);

} // namespace nigiri::routing
24 changes: 24 additions & 0 deletions src/routing/one_to_all.cc
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,30 @@ fastest_offset get_fastest_one_to_all_offsets(timetable const& tt,
return {};
};

void for_each_one_to_all_round_time(
timetable const& tt,
raptor_state const& state,
direction const search_dir,
location_idx_t const l,
unixtime_t const start_time,
std::uint8_t const transfers,
std::function<void(std::uint8_t, duration_t)> const& cb) {
auto const invalid_delta = search_dir == direction::kForward
? kInvalidDelta<direction::kForward>
: kInvalidDelta<direction::kBackward>;
auto const& round_times = state.get_round_times<kVias>();
auto const base =
tt.internal_interval_days().from_ +
static_cast<int>(to_idx(make_base(tt, start_time))) * date::days{1};
for (auto const k : std::views::iota(std::uint8_t{0U}, transfers + 2U)) {
if (round_times[k][to_idx(l)][kVias] != invalid_delta) {
auto end_time = delta_to_unix(base, round_times[k][to_idx(l)][kVias]);
cb(k, search_dir == direction::kForward ? end_time - start_time
: start_time - end_time);
}
}
}

template raptor_state one_to_all<direction::kForward>(timetable const&,
rt_timetable const*,
query const&);
Expand Down
31 changes: 31 additions & 0 deletions test/rt/frun_shape_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,12 @@ TEST(
leg_shape.push_back(point);
};

using round_times_t = std::vector<std::pair<std::uint8_t, duration_t>>;
auto round_times = round_times_t{};
auto const add_round_time = [&](std::uint8_t const k, duration_t const d) {
round_times.emplace_back(k, d);
};

auto const to_location_idx = [&](std::string_view x) {
auto const src = source_idx_t{0};
return tt.locations_.location_id_to_idx_.at({x, src});
Expand Down Expand Up @@ -894,6 +900,24 @@ TEST(
delta_t{185 + kDefaultFootpathDuration.count()});
ASSERT_EQ(stats_s_direct.k_, 1U);
}
// Test round times
{
round_times.clear();
routing::for_each_one_to_all_round_time(
tt, state, kSearchDir, to_location_idx("S"), start_time,
q.max_transfers_, add_round_time);
EXPECT_EQ(
(round_times_t{{1, duration_t{185} + kDefaultFootpathDuration},
{2, duration_t{140} + kDefaultFootpathDuration}}),
round_times);
round_times.clear();
routing::for_each_one_to_all_round_time(
tt, state, kSearchDir, to_location_idx("W"), start_time,
q.max_transfers_, add_round_time);
EXPECT_EQ(
(round_times_t{{2, duration_t{200} + kDefaultFootpathDuration}}),
round_times);
}
}
}
// One-to-All backwards search for time point
Expand Down Expand Up @@ -971,6 +995,13 @@ TEST(
q.max_transfers_);
EXPECT_EQ(stats_f.duration_,
delta_t{-110 - kDefaultFootpathDuration.count()});
// Test round times
round_times.clear();
routing::for_each_one_to_all_round_time(tt, state, kSearchDir,
to_location_idx("F"), start_time,
q.max_transfers_, add_round_time);
EXPECT_EQ((round_times_t{{1, duration_t{110} + kDefaultFootpathDuration}}),
round_times);
}
// Loading statistics
{
Expand Down
Loading