Skip to content

Commit

Permalink
patching expected results refs #21, #14475
Browse files Browse the repository at this point in the history
  • Loading branch information
@namdre
namdre committed Mar 6, 2024
1 parent 65bceb0 commit 7624ad5
Show file tree
Hide file tree
Showing 3 changed files with 95 additions and 121 deletions.
20 changes: 10 additions & 10 deletions tests/sumo/opposite_direction_driving/slalom/2queues/output.sumo
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
Loading net-file from 'net2.net.xml' ... done (0ms).
Loading done.
Simulation version v1_17_0+0403-77a4ca0 started with time: 0.00.
Simulation ended at time: 1299.00
Simulation version v1_19_0+1177-856eca5a1ce started with time: 0.00.
Simulation ended at time: 1314.00
Reason: All vehicles have left the simulation.
Performance:
Duration: 0.25s
Real time factor: 5259.11
UPS: 250089.068826
Duration: 0.23s
Real time factor: 5840
UPS: 274164.444444
Vehicles:
Inserted: 988
Running: 0
Waiting: 0
Statistics (avg of 988):
RouteLength: 493.59
Speed: 11.02
Duration: 62.52
WaitingTime: 18.16
TimeLoss: 22.81
DepartDelay: 235.95
Speed: 10.96
Duration: 62.44
WaitingTime: 17.97
TimeLoss: 22.73
DepartDelay: 238.85

170 changes: 72 additions & 98 deletions tests/sumo/opposite_direction_driving/slalom/4queues_deadlock/errors.sumo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,103 +2,77 @@ Warning: Teleporting vehicle 'fwd.33'; waited too long (blocked), lane='a_0', ti
Warning: Vehicle 'fwd.33' teleports beyond arrival edge 'a', time=813.00.
Warning: Teleporting vehicle 'bwd.47'; waited too long (blocked), lane='-a_0', time=813.00.
Warning: Vehicle 'bwd.47' teleports beyond arrival edge '-a', time=813.00.
Warning: Teleporting vehicle 'bwd.55'; waited too long (wrong lane), lane='a_0', time=1138.00.
Warning: Vehicle 'bwd.55' teleports beyond arrival edge '-a', time=1138.00.
Warning: Teleporting vehicle 'fwd.49'; waited too long (wrong lane), lane='-a_0', time=1138.00.
Warning: Vehicle 'fwd.49' teleports beyond arrival edge 'a', time=1138.00.
Warning: Teleporting vehicle 'bwd.58'; waited too long (wrong lane), lane='a_0', time=1139.00.
Warning: Vehicle 'bwd.58' teleports beyond arrival edge '-a', time=1139.00.
Warning: Teleporting vehicle 'fwd.44'; waited too long (wrong lane), lane='-a_0', time=1139.00.
Warning: Vehicle 'fwd.44' teleports beyond arrival edge 'a', time=1139.00.
Warning: Teleporting vehicle 'fwd.34'; waited too long (blocked), lane='a_0', time=1140.00.
Warning: Vehicle 'fwd.34' teleports beyond arrival edge 'a', time=1140.00.
Warning: Teleporting vehicle 'fwd.45'; waited too long (wrong lane), lane='-a_0', time=1140.00.
Warning: Vehicle 'fwd.45' teleports beyond arrival edge 'a', time=1140.00.
Warning: Teleporting vehicle 'fwd.42'; waited too long (wrong lane), lane='-a_0', time=1141.00.
Warning: Vehicle 'fwd.42' teleports beyond arrival edge 'a', time=1141.00.
Warning: Teleporting vehicle 'bwd.48'; waited too long (blocked), lane='-a_0', time=1142.00.
Warning: Vehicle 'bwd.48' teleports beyond arrival edge '-a', time=1142.00.
Warning: Teleporting vehicle 'fwd.50'; waited too long (wrong lane), lane='-a_0', time=1462.00.
Warning: Vehicle 'fwd.50' teleports beyond arrival edge 'a', time=1462.00.
Warning: Teleporting vehicle 'fwd.48'; waited too long (wrong lane), lane='-a_0', time=1463.00.
Warning: Vehicle 'fwd.48' teleports beyond arrival edge 'a', time=1463.00.
Warning: Teleporting vehicle 'fwd.47'; waited too long (wrong lane), lane='-a_0', time=1464.00.
Warning: Vehicle 'fwd.47' teleports beyond arrival edge 'a', time=1464.00.
Warning: Teleporting vehicle 'bwd.63'; waited too long (wrong lane), lane='a_0', time=1465.00.
Warning: Vehicle 'bwd.63' teleports beyond arrival edge '-a', time=1465.00.
Warning: Teleporting vehicle 'bwd.49'; waited too long (blocked), lane='-a_0', time=1465.00.
Warning: Vehicle 'bwd.49' teleports beyond arrival edge '-a', time=1465.00.
Warning: Teleporting vehicle 'bwd.62'; waited too long (wrong lane), lane='a_0', time=1466.00.
Warning: Vehicle 'bwd.62' teleports beyond arrival edge '-a', time=1466.00.
Warning: Teleporting vehicle 'bwd.61'; waited too long (wrong lane), lane='a_0', time=1467.00.
Warning: Vehicle 'bwd.61' teleports beyond arrival edge '-a', time=1467.00.
Warning: Teleporting vehicle 'bwd.56'; waited too long (wrong lane), lane='a_0', time=1468.00.
Warning: Vehicle 'bwd.56' teleports beyond arrival edge '-a', time=1468.00.
Warning: Teleporting vehicle 'fwd.35'; waited too long (blocked), lane='a_0', time=1469.00.
Warning: Vehicle 'fwd.35' teleports beyond arrival edge 'a', time=1469.00.
Warning: Teleporting vehicle 'bwd.66'; waited too long (wrong lane), lane='a_0', time=1785.00.
Warning: Vehicle 'bwd.66' teleports beyond arrival edge '-a', time=1785.00.
Warning: Teleporting vehicle 'bwd.64'; waited too long (wrong lane), lane='a_0', time=1786.00.
Warning: Vehicle 'bwd.64' teleports beyond arrival edge '-a', time=1786.00.
Warning: Teleporting vehicle 'fwd.36'; waited too long (blocked), lane='a_0', time=1787.00.
Warning: Vehicle 'fwd.36' teleports beyond arrival edge 'a', time=1787.00.
Warning: Teleporting vehicle 'fwd.55'; waited too long (wrong lane), lane='-a_0', time=1794.00.
Warning: Vehicle 'fwd.55' teleports beyond arrival edge 'a', time=1794.00.
Warning: Teleporting vehicle 'fwd.54'; waited too long (wrong lane), lane='-a_0', time=1795.00.
Warning: Vehicle 'fwd.54' teleports beyond arrival edge 'a', time=1795.00.
Warning: Teleporting vehicle 'fwd.37'; waited too long (blocked), lane='a_0', time=2091.00.
Warning: Vehicle 'fwd.37' teleports beyond arrival edge 'a', time=2091.00.
Warning: Teleporting vehicle 'fwd.53'; waited too long (wrong lane), lane='-a_0', time=2098.00.
Warning: Vehicle 'fwd.53' teleports beyond arrival edge 'a', time=2098.00.
Warning: Teleporting vehicle 'bwd.50'; waited too long (blocked), lane='-a_0', time=2099.00.
Warning: Vehicle 'bwd.50' teleports beyond arrival edge '-a', time=2099.00.
Warning: Teleporting vehicle 'fwd.44'; waited too long (wrong lane), lane='-a_0', time=1133.00.
Warning: Vehicle 'fwd.44' teleports beyond arrival edge 'a', time=1133.00.
Warning: Teleporting vehicle 'fwd.45'; waited too long (wrong lane), lane='-a_0', time=1134.00.
Warning: Vehicle 'fwd.45' teleports beyond arrival edge 'a', time=1134.00.
Warning: Teleporting vehicle 'fwd.42'; waited too long (wrong lane), lane='-a_0', time=1135.00.
Warning: Vehicle 'fwd.42' teleports beyond arrival edge 'a', time=1135.00.
Warning: Teleporting vehicle 'bwd.48'; waited too long (blocked), lane='-a_0', time=1136.00.
Warning: Vehicle 'bwd.48' teleports beyond arrival edge '-a', time=1136.00.
Warning: Teleporting vehicle 'bwd.55'; waited too long (wrong lane), lane='a_0', time=1137.00.
Warning: Vehicle 'bwd.55' teleports beyond arrival edge '-a', time=1137.00.
Warning: Teleporting vehicle 'bwd.58'; waited too long (wrong lane), lane='a_0', time=1138.00.
Warning: Vehicle 'bwd.58' teleports beyond arrival edge '-a', time=1138.00.
Warning: Teleporting vehicle 'fwd.34'; waited too long (blocked), lane='a_0', time=1139.00.
Warning: Vehicle 'fwd.34' teleports beyond arrival edge 'a', time=1139.00.
Warning: Teleporting vehicle 'bwd.62'; waited too long (wrong lane), lane='a_0', time=1458.00.
Warning: Vehicle 'bwd.62' teleports beyond arrival edge '-a', time=1458.00.
Warning: Teleporting vehicle 'bwd.61'; waited too long (wrong lane), lane='a_0', time=1459.00.
Warning: Vehicle 'bwd.61' teleports beyond arrival edge '-a', time=1459.00.
Warning: Teleporting vehicle 'bwd.56'; waited too long (wrong lane), lane='a_0', time=1460.00.
Warning: Vehicle 'bwd.56' teleports beyond arrival edge '-a', time=1460.00.
Warning: Teleporting vehicle 'fwd.35'; waited too long (blocked), lane='a_0', time=1461.00.
Warning: Vehicle 'fwd.35' teleports beyond arrival edge 'a', time=1461.00.
Warning: Teleporting vehicle 'fwd.51'; waited too long (wrong lane), lane='-a_0', time=1463.00.
Warning: Vehicle 'fwd.51' teleports beyond arrival edge 'a', time=1463.00.
Warning: Teleporting vehicle 'fwd.49'; waited too long (wrong lane), lane='-a_0', time=1464.00.
Warning: Vehicle 'fwd.49' teleports beyond arrival edge 'a', time=1464.00.
Warning: Teleporting vehicle 'fwd.48'; waited too long (wrong lane), lane='-a_0', time=1465.00.
Warning: Vehicle 'fwd.48' teleports beyond arrival edge 'a', time=1465.00.
Warning: Teleporting vehicle 'fwd.47'; waited too long (wrong lane), lane='-a_0', time=1466.00.
Warning: Vehicle 'fwd.47' teleports beyond arrival edge 'a', time=1466.00.
Warning: Teleporting vehicle 'bwd.49'; waited too long (blocked), lane='-a_0', time=1467.00.
Warning: Vehicle 'bwd.49' teleports beyond arrival edge '-a', time=1467.00.
Warning: Teleporting vehicle 'fwd.54'; waited too long (wrong lane), lane='-a_0', time=1782.00.
Warning: Vehicle 'fwd.54' teleports beyond arrival edge 'a', time=1782.00.
Warning: Teleporting vehicle 'fwd.53'; waited too long (wrong lane), lane='-a_0', time=1783.00.
Warning: Vehicle 'fwd.53' teleports beyond arrival edge 'a', time=1783.00.
Warning: Teleporting vehicle 'fwd.50'; waited too long (wrong lane), lane='-a_0', time=1784.00.
Warning: Vehicle 'fwd.50' teleports beyond arrival edge 'a', time=1784.00.
Warning: Teleporting vehicle 'bwd.50'; waited too long (blocked), lane='-a_0', time=1785.00.
Warning: Vehicle 'bwd.50' teleports beyond arrival edge '-a', time=1785.00.
Warning: Teleporting vehicle 'bwd.68'; waited too long (wrong lane), lane='a_0', time=1790.00.
Warning: Vehicle 'bwd.68' teleports beyond arrival edge '-a', time=1790.00.
Warning: Teleporting vehicle 'bwd.66'; waited too long (wrong lane), lane='a_0', time=1791.00.
Warning: Vehicle 'bwd.66' teleports beyond arrival edge '-a', time=1791.00.
Warning: Teleporting vehicle 'bwd.65'; waited too long (wrong lane), lane='a_0', time=1792.00.
Warning: Vehicle 'bwd.65' teleports beyond arrival edge '-a', time=1792.00.
Warning: Teleporting vehicle 'fwd.36'; waited too long (blocked), lane='a_0', time=1793.00.
Warning: Vehicle 'fwd.36' teleports beyond arrival edge 'a', time=1793.00.
Warning: Teleporting vehicle 'fwd.37'; waited too long (blocked), lane='a_0', time=2097.00.
Warning: Vehicle 'fwd.37' teleports beyond arrival edge 'a', time=2097.00.
Warning: Teleporting vehicle 'fwd.38'; waited too long (blocked), lane='a_0', time=2401.00.
Warning: Vehicle 'fwd.38' teleports beyond arrival edge 'a', time=2401.00.
Warning: Teleporting vehicle 'fwd.59'; waited too long (wrong lane), lane='-a_0', time=2413.00.
Warning: Vehicle 'fwd.59' teleports beyond arrival edge 'a', time=2413.00.
Warning: Teleporting vehicle 'fwd.58'; waited too long (wrong lane), lane='-a_0', time=2414.00.
Warning: Vehicle 'fwd.58' teleports beyond arrival edge 'a', time=2414.00.
Warning: Teleporting vehicle 'fwd.56'; waited too long (wrong lane), lane='-a_0', time=2415.00.
Warning: Vehicle 'fwd.56' teleports beyond arrival edge 'a', time=2415.00.
Warning: Teleporting vehicle 'bwd.51'; waited too long (blocked), lane='-a_0', time=2416.00.
Warning: Vehicle 'bwd.51' teleports beyond arrival edge '-a', time=2416.00.
Warning: Teleporting vehicle 'bwd.71'; waited too long (wrong lane), lane='a_0', time=2423.00.
Warning: Vehicle 'bwd.71' teleports beyond arrival edge '-a', time=2423.00.
Warning: Teleporting vehicle 'bwd.70'; waited too long (wrong lane), lane='a_0', time=2424.00.
Warning: Vehicle 'bwd.70' teleports beyond arrival edge '-a', time=2424.00.
Warning: Teleporting vehicle 'bwd.52'; waited too long (blocked), lane='-a_0', time=2720.00.
Warning: Vehicle 'bwd.52' teleports beyond arrival edge '-a', time=2720.00.
Warning: Teleporting vehicle 'bwd.69'; waited too long (wrong lane), lane='a_0', time=2727.00.
Warning: Vehicle 'bwd.69' teleports beyond arrival edge '-a', time=2727.00.
Warning: Teleporting vehicle 'fwd.38'; waited too long (blocked), lane='a_0', time=2728.00.
Warning: Vehicle 'fwd.38' teleports beyond arrival edge 'a', time=2728.00.
Warning: Teleporting vehicle 'bwd.82'; waited too long (wrong lane), lane='a_0', time=3042.00.
Warning: Vehicle 'bwd.82' teleports beyond arrival edge '-a', time=3042.00.
Warning: Teleporting vehicle 'bwd.81'; waited too long (wrong lane), lane='a_0', time=3043.00.
Warning: Vehicle 'bwd.81' teleports beyond arrival edge '-a', time=3043.00.
Warning: Teleporting vehicle 'bwd.72'; waited too long (wrong lane), lane='a_0', time=3044.00.
Warning: Vehicle 'bwd.72' teleports beyond arrival edge '-a', time=3044.00.
Warning: Teleporting vehicle 'fwd.39'; waited too long (blocked), lane='a_0', time=3045.00.
Warning: Vehicle 'fwd.39' teleports beyond arrival edge 'a', time=3045.00.
Warning: Teleporting vehicle 'fwd.77'; waited too long (wrong lane), lane='-a_0', time=3053.00.
Warning: Vehicle 'fwd.77' teleports beyond arrival edge 'a', time=3053.00.
Warning: Teleporting vehicle 'fwd.76'; waited too long (wrong lane), lane='-a_0', time=3054.00.
Warning: Vehicle 'fwd.76' teleports beyond arrival edge 'a', time=3054.00.
Warning: Teleporting vehicle 'fwd.40'; waited too long (blocked), lane='a_0', time=3349.00.
Warning: Vehicle 'fwd.40' teleports beyond arrival edge 'a', time=3349.00.
Warning: Teleporting vehicle 'fwd.75'; waited too long (wrong lane), lane='-a_0', time=3356.00.
Warning: Vehicle 'fwd.75' teleports beyond arrival edge 'a', time=3356.00.
Warning: Teleporting vehicle 'bwd.53'; waited too long (blocked), lane='-a_0', time=3357.00.
Warning: Vehicle 'bwd.53' teleports beyond arrival edge '-a', time=3357.00.
Warning: Teleporting vehicle 'fwd.81'; waited too long (wrong lane), lane='-a_0', time=3671.00.
Warning: Vehicle 'fwd.81' teleports beyond arrival edge 'a', time=3671.00.
Warning: Teleporting vehicle 'fwd.80'; waited too long (wrong lane), lane='-a_0', time=3672.00.
Warning: Vehicle 'fwd.80' teleports beyond arrival edge 'a', time=3672.00.
Warning: Teleporting vehicle 'fwd.78'; waited too long (wrong lane), lane='-a_0', time=3673.00.
Warning: Vehicle 'fwd.78' teleports beyond arrival edge 'a', time=3673.00.
Warning: Teleporting vehicle 'bwd.87'; waited too long (wrong lane), lane='a_0', time=3679.00.
Warning: Vehicle 'bwd.87' teleports beyond arrival edge '-a', time=3679.00.
Warning: Teleporting vehicle 'bwd.86'; waited too long (wrong lane), lane='a_0', time=3680.00.
Warning: Vehicle 'bwd.86' teleports beyond arrival edge '-a', time=3680.00.
Warning: Teleporting vehicle 'bwd.85'; waited too long (wrong lane), lane='a_0', time=3681.00.
Warning: Vehicle 'bwd.85' teleports beyond arrival edge '-a', time=3681.00.
Warning: Teleporting vehicle 'bwd.83'; waited too long (wrong lane), lane='a_0', time=3682.00.
Warning: Vehicle 'bwd.83' teleports beyond arrival edge '-a', time=3682.00.
Warning: Teleporting vehicle 'bwd.51'; waited too long (blocked), lane='-a_0', time=2414.00.
Warning: Vehicle 'bwd.51' teleports beyond arrival edge '-a', time=2414.00.
Warning: Teleporting vehicle 'bwd.52'; waited too long (blocked), lane='-a_0', time=2718.00.
Warning: Vehicle 'bwd.52' teleports beyond arrival edge '-a', time=2718.00.
Warning: Teleporting vehicle 'bwd.53'; waited too long (blocked), lane='-a_0', time=3022.00.
Warning: Vehicle 'bwd.53' teleports beyond arrival edge '-a', time=3022.00.
Warning: Teleporting vehicle 'bwd.70'; waited too long (wrong lane), lane='a_0', time=3029.00.
Warning: Vehicle 'bwd.70' teleports beyond arrival edge '-a', time=3029.00.
Warning: Teleporting vehicle 'fwd.39'; waited too long (blocked), lane='a_0', time=3030.00.
Warning: Vehicle 'fwd.39' teleports beyond arrival edge 'a', time=3030.00.
Warning: Teleporting vehicle 'bwd.54'; waited too long (blocked), lane='-a_0', time=3326.00.
Warning: Vehicle 'bwd.54' teleports beyond arrival edge '-a', time=3326.00.
Warning: Teleporting vehicle 'fwd.40'; waited too long (blocked), lane='a_0', time=3334.00.
Warning: Vehicle 'fwd.40' teleports beyond arrival edge 'a', time=3334.00.
Warning: Teleporting vehicle 'bwd.82'; waited too long (wrong lane), lane='a_0', time=3648.00.
Warning: Vehicle 'bwd.82' teleports beyond arrival edge '-a', time=3648.00.
Warning: Teleporting vehicle 'bwd.81'; waited too long (wrong lane), lane='a_0', time=3649.00.
Warning: Vehicle 'bwd.81' teleports beyond arrival edge '-a', time=3649.00.
Warning: Teleporting vehicle 'bwd.73'; waited too long (wrong lane), lane='a_0', time=3650.00.
Warning: Vehicle 'bwd.73' teleports beyond arrival edge '-a', time=3650.00.
26 changes: 13 additions & 13 deletions tests/sumo/opposite_direction_driving/slalom/4queues_deadlock/output.sumo
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
Loading net-file from 'net2.net.xml' ... done (0ms).
Loading done.
Simulation version v1_15_0+1552-77b40087aab started with time: 0.00.
Simulation ended at time: 3723.00
Simulation version v1_19_0+1177-856eca5a1ce started with time: 0.00.
Simulation ended at time: 3720.00
Reason: All vehicles have left the simulation.
Performance:
Duration: 0.70s
Real time factor: 5356.83
UPS: 266748.201439
Duration: 0.59s
Real time factor: 6348.12
UPS: 324430.034130
Vehicles:
Inserted: 162 (Loaded: 201)
Inserted: 161 (Loaded: 201)
Running: 0
Waiting: 0
Teleports: 52 (Jam: 15, Wrong Lane: 37)
Statistics (avg of 162):
RouteLength: 478.24
Speed: 5.40
Duration: 1144.38
WaitingTime: 837.49
TimeLoss: 849.50
Teleports: 39 (Jam: 16, Wrong Lane: 23)
Statistics (avg of 161):
RouteLength: 478.14
Speed: 5.42
Duration: 1180.84
WaitingTime: 868.47
TimeLoss: 882.52
DepartDelay: 0.56

0 comments on commit 7624ad5

Please sign in to comment.