Skip to content

Commit

Permalink
Revert changes to console output (#529)
Browse files Browse the repository at this point in the history
  • Loading branch information
@MichaelKutzner
MichaelKutzner authored Jul 25, 2024
1 parent 8085a3c commit 1d6be6f
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 18 deletions.
5 changes: 2 additions & 3 deletions base/core/src/print_journey.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,8 @@ bool print_journey(journey const& j, std::ostream& out, bool local_time,
} else {
out << std::left << std::setw(10) << trans.name_
<< " duration=" << trans.duration_ << ", provider=\""
<< trans.provider_ << "\", provider_url=\"" << trans.provider_url_
<< "\", direction=\"" << trans.direction_ << "\", line=\""
<< trans.line_identifier_
<< trans.provider_ << "\", direction=\"" << trans.direction_
<< "\", line=\"" << trans.line_identifier_
<< "\", clasz=" << static_cast<int>(trans.clasz_) << ", duration=\""
<< trans.duration_ << "\"\n";
}
Expand Down
20 changes: 10 additions & 10 deletions modules/nigiri/test/max_transfers_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ constexpr auto const expected_max_transfers_default =
1: tag_D D............................................... a: 01.05. 09:00 d: exit
Transports:
0: 0 -> 1 TRAIN Bus 1 duration=60, provider="Deutsche Bahn", provider_url="https://deutschebahn.com", direction="", line="1", clasz=3, duration="60"
0: 0 -> 1 TRAIN Bus 1 duration=60, provider="Deutsche Bahn", direction="", line="1", clasz=3, duration="60"
Trips:
0: 0 -> 1 {tag_A , 0, 2019-05-01 08:00} -> { tag_D, 2019-05-01 09:00}, line_id=1, id=tag_T1
Expand All @@ -105,8 +105,8 @@ Journey: duration=50 transfers=1 accessibility=0 01.05. 08:00
2: tag_D D............................................... a: 01.05. 08:50 d: exit
Transports:
0: 0 -> 1 TRAIN Bus 2 duration=10, provider="Deutsche Bahn", provider_url="https://deutschebahn.com", direction="", line="2", clasz=3, duration="10"
1: 1 -> 2 TRAIN Bus 3 duration=35, provider="Deutsche Bahn", provider_url="https://deutschebahn.com", direction="", line="3", clasz=3, duration="35"
0: 0 -> 1 TRAIN Bus 2 duration=10, provider="Deutsche Bahn", direction="", line="2", clasz=3, duration="10"
1: 1 -> 2 TRAIN Bus 3 duration=35, provider="Deutsche Bahn", direction="", line="3", clasz=3, duration="35"
Trips:
0: 0 -> 1 {tag_A , 0, 2019-05-01 08:00} -> { tag_B, 2019-05-01 08:10}, line_id=2, id=tag_T2
Expand All @@ -124,9 +124,9 @@ Journey: duration=40 transfers=2 accessibility=0 01.05. 08:00
3: tag_D D............................................... a: 01.05. 08:40 d: exit
Transports:
0: 0 -> 1 TRAIN Bus 2 duration=10, provider="Deutsche Bahn", provider_url="https://deutschebahn.com", direction="", line="2", clasz=3, duration="10"
1: 1 -> 2 TRAIN Bus 4 duration=7, provider="Deutsche Bahn", provider_url="https://deutschebahn.com", direction="", line="4", clasz=3, duration="7"
2: 2 -> 3 TRAIN Bus 5 duration=15, provider="Deutsche Bahn", provider_url="https://deutschebahn.com", direction="", line="5", clasz=3, duration="15"
0: 0 -> 1 TRAIN Bus 2 duration=10, provider="Deutsche Bahn", direction="", line="2", clasz=3, duration="10"
1: 1 -> 2 TRAIN Bus 4 duration=7, provider="Deutsche Bahn", direction="", line="4", clasz=3, duration="7"
2: 2 -> 3 TRAIN Bus 5 duration=15, provider="Deutsche Bahn", direction="", line="5", clasz=3, duration="15"
Trips:
0: 0 -> 1 {tag_A , 0, 2019-05-01 08:00} -> { tag_B, 2019-05-01 08:10}, line_id=2, id=tag_T2
Expand All @@ -147,7 +147,7 @@ constexpr auto const expected_max_transfers_1 =
1: tag_D D............................................... a: 01.05. 09:00 d: exit
Transports:
0: 0 -> 1 TRAIN Bus 1 duration=60, provider="Deutsche Bahn", provider_url="https://deutschebahn.com", direction="", line="1", clasz=3, duration="60"
0: 0 -> 1 TRAIN Bus 1 duration=60, provider="Deutsche Bahn", direction="", line="1", clasz=3, duration="60"
Trips:
0: 0 -> 1 {tag_A , 0, 2019-05-01 08:00} -> { tag_D, 2019-05-01 09:00}, line_id=1, id=tag_T1
Expand All @@ -162,8 +162,8 @@ Journey: duration=50 transfers=1 accessibility=0 01.05. 08:00
2: tag_D D............................................... a: 01.05. 08:50 d: exit
Transports:
0: 0 -> 1 TRAIN Bus 2 duration=10, provider="Deutsche Bahn", provider_url="https://deutschebahn.com", direction="", line="2", clasz=3, duration="10"
1: 1 -> 2 TRAIN Bus 3 duration=35, provider="Deutsche Bahn", provider_url="https://deutschebahn.com", direction="", line="3", clasz=3, duration="35"
0: 0 -> 1 TRAIN Bus 2 duration=10, provider="Deutsche Bahn", direction="", line="2", clasz=3, duration="10"
1: 1 -> 2 TRAIN Bus 3 duration=35, provider="Deutsche Bahn", direction="", line="3", clasz=3, duration="35"
Trips:
0: 0 -> 1 {tag_A , 0, 2019-05-01 08:00} -> { tag_B, 2019-05-01 08:10}, line_id=2, id=tag_T2
Expand All @@ -182,7 +182,7 @@ constexpr auto const expected_max_transfers_0 =
1: tag_D D............................................... a: 01.05. 09:00 d: exit
Transports:
0: 0 -> 1 TRAIN Bus 1 duration=60, provider="Deutsche Bahn", provider_url="https://deutschebahn.com", direction="", line="1", clasz=3, duration="60"
0: 0 -> 1 TRAIN Bus 1 duration=60, provider="Deutsche Bahn", direction="", line="1", clasz=3, duration="60"
Trips:
0: 0 -> 1 {tag_A , 0, 2019-05-01 08:00} -> { tag_D, 2019-05-01 09:00}, line_id=1, id=tag_T1
Expand Down
10 changes: 5 additions & 5 deletions modules/nigiri/test/rt_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,9 @@ constexpr auto const expected =
4: tag_E E............................................... a: 01.05. 08:45 +15 F d: exit
Transports:
0: 0 -> 2 TRAIN Bus 1 duration=35, provider="Deutsche Bahn", provider_url="https://deutschebahn.com", direction="", line="1", clasz=3, duration="35"
0: 0 -> 2 TRAIN Bus 1 duration=35, provider="Deutsche Bahn", direction="", line="1", clasz=3, duration="35"
1: 2 -> 3 WALK type= id=-1 duration=2 accessibility=0
2: 3 -> 4 TRAIN Bus 2 duration=20, provider="Deutsche Bahn", provider_url="https://deutschebahn.com", direction="", line="2", clasz=3, duration="20"
2: 3 -> 4 TRAIN Bus 2 duration=20, provider="Deutsche Bahn", direction="", line="2", clasz=3, duration="20"
Trips:
0: 0 -> 2 {tag_A , 0, 2019-05-01 07:50} -> { tag_C, 2019-05-01 08:30}, line_id=1, id=tag_T1
Expand All @@ -133,9 +133,9 @@ Journey: duration=45 transfers=2 accessibility=0 01.05. 07:50 +
3: tag_E E............................................... a: 01.05. 08:45 +0 F d: exit
Transports:
0: 0 -> 1 TRAIN Bus 1 duration=10, provider="Deutsche Bahn", provider_url="https://deutschebahn.com", direction="", line="1", clasz=3, duration="10"
1: 1 -> 2 TRAIN Bus 3 duration=10, provider="Deutsche Bahn", provider_url="https://deutschebahn.com", direction="", line="3", clasz=3, duration="10"
2: 2 -> 3 TRAIN Bus 4 duration=10, provider="Deutsche Bahn", provider_url="https://deutschebahn.com", direction="", line="4", clasz=3, duration="10"
0: 0 -> 1 TRAIN Bus 1 duration=10, provider="Deutsche Bahn", direction="", line="1", clasz=3, duration="10"
1: 1 -> 2 TRAIN Bus 3 duration=10, provider="Deutsche Bahn", direction="", line="3", clasz=3, duration="10"
2: 2 -> 3 TRAIN Bus 4 duration=10, provider="Deutsche Bahn", direction="", line="4", clasz=3, duration="10"
Trips:
0: 0 -> 1 {tag_A , 0, 2019-05-01 07:50} -> { tag_C, 2019-05-01 08:30}, line_id=1, id=tag_T1
Expand Down

0 comments on commit 1d6be6f

Please sign in to comment.