From 69f33fb81bd37c97ca6dffdadb33639c544bf2f8 Mon Sep 17 00:00:00 2001 From: mority Date: Fri, 20 Dec 2024 17:46:06 +0100 Subject: [PATCH] wip --- include/nigiri/routing/raptor/raptor.h | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/include/nigiri/routing/raptor/raptor.h b/include/nigiri/routing/raptor/raptor.h index 5bb9cd1b..429bb9d0 100644 --- a/include/nigiri/routing/raptor/raptor.h +++ b/include/nigiri/routing/raptor/raptor.h @@ -799,7 +799,7 @@ struct raptor { "┊ │k={} v={} stop_idx={} {}: not marked, no et - " "skip\n", k, v, stop_idx, location{tt_, location_idx_t{l_idx}}); - continue; + goto stop_skip; } trace( @@ -879,8 +879,7 @@ struct raptor { location{tt_, stp.location_idx()}); ++stats_.n_earliest_arrival_updated_by_route_; - tmp_[l_idx][target_v] = - get_best(by_transport, tmp_[l_idx][target_v]); + tmp_[l_idx][target_v] = by_transport; state_.station_mark_.set(l_idx, true); current_best[v] = by_transport; any_marked = true; @@ -995,6 +994,7 @@ struct raptor { } } } + stop_skip: } return any_marked; } @@ -1058,15 +1058,6 @@ struct raptor { } auto const t = tt_.route_transport_ranges_[r][t_offset]; - if (i == 0U && !is_better_or_eq(mam_at_stop.count(), ev_mam)) { - trace( - "┊ │k={} => transport={}, name={}, dbg={}, day={}/{}, " - "best_mam={}, " - "transport_mam={}, transport_time={} => NO REACH!\n", - k, t, tt_.transport_name(t), tt_.dbg(t), i, day, mam_at_stop, - ev_mam, ev); - continue; - } auto const ev_day_offset = ev.days(); auto const start_day =