-
Notifications
You must be signed in to change notification settings - Fork 54
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
101 changed files
with
5,129 additions
and
1,195 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -45,7 +45,7 @@ | |
| [net] | ||
| [email protected]:motis-project/net.git | ||
| branch=master | ||
| commit=9ea612ff034accbd01825959496ee03a3fece1ef | ||
| commit=126869fa3a2ea5c3024c44c180daf4031f802853 | ||
| [osrm-backend] | ||
| [email protected]:motis-project/osrm-backend.git | ||
| branch=motis | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,129 @@ | ||
| #pragma once | ||
|
|
||
| #include <iomanip> | ||
| #include <iostream> | ||
|
|
||
| #include "motis/core/schedule/schedule.h" | ||
|
|
||
| #include "motis/core/access/realtime_access.h" | ||
| #include "motis/core/access/trip_iterator.h" | ||
|
|
||
| namespace motis::debug { | ||
|
|
||
| struct station { | ||
| friend std::ostream& operator<<(std::ostream& out, station const& s) { | ||
| auto const& sched = s.sched_; | ||
| auto const idx = s.idx_; | ||
| auto const& st = sched.stations_[idx]; | ||
| out << "{idx=" << idx << ", eva=" << st->eva_nr_ << ", name=" << st->name_ | ||
| << "}"; | ||
| return out; | ||
| } | ||
|
|
||
| schedule const& sched_; | ||
| uint32_t idx_; | ||
| }; | ||
|
|
||
| struct trip_id { | ||
| friend std::ostream& operator<<(std::ostream& out, trip_id const& t) { | ||
| auto const& sched = t.sched_; | ||
| auto const& id = t.id_; | ||
| if (id == full_trip_id{}) { | ||
| return out << "{expanded rule service trip}"; | ||
| } | ||
| out << "{primary={station=" | ||
| << station{sched, static_cast<uint32_t>(id.primary_.station_id_)} | ||
| << ", time=" << format_time(id.primary_.get_time()) | ||
| << ", train_nr=" << id.primary_.get_train_nr() | ||
| << "}, secondary={station=" | ||
| << station{sched, | ||
| static_cast<uint32_t>(id.secondary_.target_station_id_)} | ||
| << ", time=" << format_time(id.secondary_.target_time_) << ", line " | ||
| << id.secondary_.line_id_ << "}}"; | ||
| return out; | ||
| } | ||
|
|
||
| schedule const& sched_; | ||
| full_trip_id id_; | ||
| }; | ||
|
|
||
| struct trip { | ||
| friend std::ostream& operator<<(std::ostream& out, trip const& t) { | ||
| auto const& sched = t.sched_; | ||
| auto const* trp = t.trp_; | ||
| out << "{" | ||
| << "ptr=" << trp << ", id=" << trip_id{sched, trp->id_} | ||
| << ", edges=" << trp->edges_->size() << ", lcon_idx=" << trp->lcon_idx_ | ||
| << ", dbg=" << trp->dbg_.str() << "}"; | ||
| return out; | ||
| } | ||
|
|
||
| schedule const& sched_; | ||
| motis::trip const* trp_; | ||
| }; | ||
|
|
||
| struct trip_with_sections { | ||
| friend std::ostream& operator<<(std::ostream& out, | ||
| trip_with_sections const& t) { | ||
| auto const& sched = t.sched_; | ||
| auto const* trp = t.trp_; | ||
|
|
||
| auto const print_event = [&](ev_key const& ek) { | ||
| auto const di = get_delay_info(sched, ek); | ||
| out << " " << (ek.is_departure() ? "dep" : "arr"); | ||
| out << "={time=" << format_time(ek.get_time()) | ||
| << ", current=" << format_time(di.get_current_time()) | ||
| << ", schedule=" << format_time(di.get_schedule_time()) | ||
| << ", reason=" << di.get_reason() << ", canceled=" << ek.is_canceled() | ||
| << ", station=" << station{sched, ek.get_station_idx()} << "}"; | ||
| }; | ||
|
|
||
| out << "trip " << trip{sched, trp} << ":\n"; | ||
| auto sec_idx = 0U; | ||
| auto last_time = time{0}; | ||
| auto last_merged_trips = 0U; | ||
| for (auto const& sec : access::sections{trp}) { | ||
| auto const kd = sec.ev_key_from(); | ||
| auto const ka = sec.ev_key_to(); | ||
|
|
||
| out << " section " << std::setw(2) << sec_idx | ||
| << ": route_edge={ptr=" << sec.get_route_edge() | ||
| << ", node=" << kd.route_edge_.route_node_ | ||
| << ", edge_idx=" << kd.route_edge_.outgoing_edge_idx_ | ||
| << "}, lcons=" << sec.get_route_edge()->m_.route_edge_.conns_.size() | ||
| << ", route=" << kd.get_node()->route_ | ||
| << ", merged_trips=" << sec.lcon().trips_ << " [ "; | ||
| for (auto const& mt : *sched.merged_trips_[sec.lcon().trips_]) { | ||
| out << cista::ptr_cast(mt) << " "; | ||
| } | ||
| out << "]"; | ||
| if (sec_idx != 0U && last_merged_trips != sec.lcon().trips_) { | ||
| out << " (merged trips change)"; | ||
| } | ||
| out << "\n"; | ||
|
|
||
| print_event(kd); | ||
| if (kd.get_time() < last_time) { | ||
| out << " !!! time < previous arrival time !!!"; | ||
| } | ||
| out << "\n"; | ||
|
|
||
| print_event(ka); | ||
| if (ka.get_time() < kd.get_time()) { | ||
| out << " !!! time < previous departure time !!!"; | ||
| } | ||
| out << "\n\n"; | ||
|
|
||
| ++sec_idx; | ||
| last_time = ka.get_time(); | ||
| last_merged_trips = sec.lcon().trips_; | ||
| } | ||
| out << "\n"; | ||
| return out; | ||
| } | ||
|
|
||
| schedule const& sched_; | ||
| motis::trip const* trp_; | ||
| }; | ||
|
|
||
| } // namespace motis::debug |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.