Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rounded time at start #115

Draft
wants to merge 9 commits into
base: master
Choose a base branch
from
Draft

Rounded time at start #115

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
aa845e3
adds correction of rounded time_at_start
mority Jun 19, 2024
b64ab54
sets expected journey arrival to arrival time of last leg, necessary …
mority Jun 19, 2024
ae8ac80
round time_at_start to multiple of a constant
mority Jun 19, 2024
dd88421
adds test case for rounding start times out of the search interval
mority Jun 19, 2024
ad66f20
adds explicit template instantiation
mority Jun 19, 2024
187a835
adds round_to parameter
mority Jun 19, 2024
afe88f3
adds round_to parameter test cases
mority Jun 19, 2024
75bb972
change round_to data type to unsigned short
mority Jun 19, 2024
48a5784
rm print
mority Jun 19, 2024
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
Prev Previous commit
Next Next commit
round time_at_start to multiple of a constant
  • Loading branch information
@mority
mority committed Jun 19, 2024
commit ae8ac801925dbffd3213a70709f87fbe87b3e7f1
2 changes: 2 additions & 0 deletions include/nigiri/routing/start_times.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ struct rt_timetable;

namespace nigiri::routing {

static constexpr auto const kStartTimeDivisor = 2;

struct start {
CISTA_FRIEND_COMPARABLE(start)
unixtime_t time_at_start_;
Expand Down
51 changes: 33 additions & 18 deletions src/routing/start_times.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,33 @@ void trace_start(char const* fmt_str, Args... args) {
}
}

unixtime_t rounded_time_at_start(unixtime_t const event_time,
duration_t const offset_time,
direction const search_dir,
interval<unixtime_t> const& interval) {
auto const time_at_start = search_dir == direction::kForward
? event_time - offset_time
: event_time + offset_time;
return interval.clamp(unixtime_t{i32_minutes{
(time_at_start.time_since_epoch().count() / kStartTimeDivisor) *
kStartTimeDivisor +
(search_dir == direction::kBackward &&
time_at_start.time_since_epoch().count() % kStartTimeDivisor != 0
? kStartTimeDivisor
: 0)}});
}

void add_start_times_at_stop(direction const search_dir,
timetable const& tt,
rt_timetable const* rtt,
route_idx_t const route_idx,
stop_idx_t const stop_idx,
location_idx_t const location_idx,
interval<unixtime_t> const& interval_with_offset,
interval<unixtime_t> const& interval,
duration_t const offset,
std::vector<start>& starts) {
auto const interval_with_offset =
search_dir == direction::kForward ? interval + offset : interval - offset;
auto const first_day_idx = tt.day_idx_mam(interval_with_offset.from_).first;
auto const last_day_idx = tt.day_idx_mam(interval_with_offset.to_).first;
trace_start(
Expand Down Expand Up @@ -56,12 +74,11 @@ void add_start_times_at_stop(direction const search_dir,
if (traffic_days.test(to_idx(day - day_offset)) &&
interval_with_offset.contains(tt.to_unixtime(day, stop_time_mam))) {
auto const ev_time = tt.to_unixtime(day, stop_time_mam);
auto const& s = starts.emplace_back(
start{.time_at_start_ = search_dir == direction::kForward
? ev_time - offset
: ev_time + offset,
.time_at_stop_ = ev_time,
.stop_ = location_idx});
auto const& s = starts.emplace_back(start{
.time_at_start_ =
rounded_time_at_start(ev_time, offset, search_dir, interval),
.time_at_stop_ = ev_time,
.stop_ = location_idx});
trace_start(
" => ADD START: time_at_start={}, time_at_stop={}, "
"stop={}\n",
Expand Down Expand Up @@ -122,11 +139,9 @@ void add_starts_in_interval(direction const search_dir,
}

trace_start(" -> no skip -> add_start_times_at_stop()\n");
add_start_times_at_stop(
search_dir, tt, rtt, r, static_cast<stop_idx_t>(i),
stop{s}.location_idx(),
search_dir == direction::kForward ? interval + d : interval - d, d,
starts);
add_start_times_at_stop(search_dir, tt, rtt, r,
static_cast<stop_idx_t>(i),
stop{s}.location_idx(), interval, d, starts);
}
}

Expand All @@ -153,11 +168,11 @@ void add_starts_in_interval(direction const search_dir,
rt_t, static_cast<stop_idx_t>(i),
(search_dir == direction::kForward ? event_type::kDep
: event_type::kArr));
auto const& inserted = starts.emplace_back(start{
.time_at_start_ =
search_dir == direction::kForward ? ev_time - d : ev_time + d,
.time_at_stop_ = ev_time,
.stop_ = l});
auto const& inserted =
starts.emplace_back(start{.time_at_start_ = rounded_time_at_start(
ev_time, d, search_dir, interval),
.time_at_stop_ = ev_time,
.stop_ = l});
trace_start(
" => ADD RT START: time_at_start={}, time_at_stop={}, "
"stop={}\n",
Expand Down Expand Up @@ -267,4 +282,4 @@ void collect_destinations(timetable const& tt,
}
}

} // namespace nigiri::routing
} // namespace nigiri::routing