Skip to content

Commit

Permalink
patching expected results refs #21, #14587
Browse files Browse the repository at this point in the history
  • Loading branch information
namdre committed Mar 23, 2024
1 parent 66b9241 commit 2f9f2ee
Show file tree
Hide file tree
Showing 33 changed files with 323 additions and 327 deletions.
2 changes: 1 addition & 1 deletion tests/sumo/bugs/13xxx/ticket13290/errors.sumo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Warning: Vehicle 'v_1.15' performs emergency braking on lane 'E1.17_0' with decel=9.00, wished=4.50, severity=1.00, time=81.10.
Warning: Vehicle 'v_0.9' performs emergency braking on lane ':J14_4_0' with decel=9.00, wished=4.50, severity=1.00, time=81.60.
Warning: Vehicle 'v_1.56' performs emergency braking on lane 'E1.17_0' with decel=9.00, wished=4.50, severity=1.00, time=284.20.
Warning: Vehicle 'v_1.41' performs emergency braking on lane 'E1.17_0' with decel=9.00, wished=4.50, severity=1.00, time=203.70.
8 changes: 3 additions & 5 deletions tests/sumo/lc_model/bugs/ticket14587/errors.sumo
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Warning: Vehicle 'f_18.1' performs emergency braking on lane ':J5_0_1' with decel=9.00, wished=4.50, severity=1.00, time=50.00.
Warning: Vehicle 'f_20.11' performs emergency braking on lane 'E4_0' with decel=9.00, wished=4.50, severity=1.00, time=147.50.
Warning: Vehicle 'f_13.19' performs emergency braking on lane 'E6_0' with decel=9.00, wished=4.50, severity=1.00, time=256.50.
Warning: Vehicle 'f_17.42' performs emergency braking on lane 'E2_0' with decel=9.00, wished=4.50, severity=1.00, time=457.50.
Warning: Vehicle 'f_18.57' performs emergency braking on lane ':J5_0_0' with decel=9.00, wished=4.50, severity=1.00, time=641.50.
Warning: Vehicle 'f_12.5' performs emergency braking on lane 'E6_0' with decel=9.00, wished=4.50, severity=1.00, time=87.50.
Warning: Vehicle 'f_19.52' performs emergency braking on lane 'E2_0' with decel=9.00, wished=4.50, severity=1.00, time=580.50.
Warning: Vehicle 'f_22.73' performs emergency braking on lane ':J9_0_0' with decel=9.00, wished=4.50, severity=1.00, time=870.00.
24 changes: 12 additions & 12 deletions tests/sumo/lc_model/bugs/ticket14587/output.sumo
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
Loading net-file from 'net.net.xml' ... done (1ms).
Loading done.
Simulation version v1_19_0+1497-a4c58d93ab1 started with time: 0.00.
Simulation version v1_19_0+1498-888d18b5504 started with time: 0.00.
Simulation ended at time: 1000.00
Reason: The final simulation step has been reached.
Performance:
Duration: 0.42s
Real time factor: 2392.34
UPS: 738964.114833
Real time factor: 2380.95
UPS: 717492.857143
Vehicles:
Inserted: 1200
Running: 206
Running: 196
Waiting: 0
Emergency Braking: 5
Statistics (avg of 994):
RouteLength: 1150.41
Speed: 9.09
Duration: 136.50
WaitingTime: 17.54
TimeLoss: 50.62
DepartDelay: 1.64
Emergency Braking: 3
Statistics (avg of 1004):
RouteLength: 1149.62
Speed: 9.18
Duration: 133.02
WaitingTime: 16.23
TimeLoss: 47.21
DepartDelay: 1.63

22 changes: 11 additions & 11 deletions tests/sumo/lc_model/roundabout/high_traffic/output.sumo
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
Loading net-file from 'net.net.xml' ... done (4ms).
Loading net-file from 'net.net.xml' ... done (1ms).
Loading additional-files from 'input_additional.add.xml' ... done (0ms).
Loading done.
Simulation version v1_17_0+1028-14cfdc2 started with time: 0.00.
Simulation ended at time: 1142.00
Simulation version v1_19_0+1498-888d18b5504 started with time: 0.00.
Simulation ended at time: 1125.00
Reason: All vehicles have left the simulation.
Performance:
Duration: 1.42s
Real time factor: 804.792
UPS: 79054.968288
Duration: 0.19s
Real time factor: 6048.39
UPS: 587505.376344
Vehicles:
Inserted: 1015
Running: 0
Waiting: 0
Statistics (avg of 1015):
RouteLength: 616.70
Speed: 6.72
Duration: 110.52
WaitingTime: 22.18
TimeLoss: 64.44
DepartDelay: 1.67
Speed: 6.71
Duration: 107.66
WaitingTime: 21.08
TimeLoss: 61.59
DepartDelay: 1.49

DijkstraRouter answered 1015 queries and explored 5.03 edges on average.
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
26 changes: 13 additions & 13 deletions tests/sumo/lc_model/roundabout/low_traffic/output.sumo
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
Loading net-file from 'net.net.xml' ... done (3ms).
Loading additional-files from 'input_additional.add.xml' ... done (1ms).
Loading net-file from 'net.net.xml' ... done (1ms).
Loading additional-files from 'input_additional.add.xml' ... done (0ms).
Loading done.
Simulation version v1_17_0+1028-14cfdc2 started with time: 0.00.
Simulation ended at time: 1052.00
Simulation version v1_19_0+1498-888d18b5504 started with time: 0.00.
Simulation ended at time: 1051.00
Reason: All vehicles have left the simulation.
Performance:
Duration: 0.30s
Real time factor: 3471.95
UPS: 51712.871287
Duration: 0.03s
Real time factor: 31848.5
UPS: 474151.515152
Vehicles:
Inserted: 282 (Loaded: 564)
Running: 0
Waiting: 0
Statistics (avg of 282):
RouteLength: 615.62
Speed: 11.10
Duration: 55.56
WaitingTime: 0.32
TimeLoss: 9.56
RouteLength: 615.71
Speed: 11.11
Duration: 55.48
WaitingTime: 0.23
TimeLoss: 9.45
DepartDelay: 0.05

DijkstraRouter answered 282 queries and explored 4.94 edges on average.
DijkstraRouter spent 0.01s answering queries (0.05ms on average).
DijkstraRouter spent 0.00s answering queries (0.01ms on average).
20 changes: 10 additions & 10 deletions tests/sumo/lc_model/roundabout/medium_traffic/output.sumo
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
Loading net-file from 'net.net.xml' ... done (3ms).
Loading net-file from 'net.net.xml' ... done (1ms).
Loading additional-files from 'input_additional.add.xml' ... done (0ms).
Loading done.
Simulation version v1_17_0+1028-14cfdc2 started with time: 0.00.
Simulation version v1_19_0+1498-888d18b5504 started with time: 0.00.
Simulation ended at time: 1066.00
Reason: All vehicles have left the simulation.
Performance:
Duration: 0.56s
Real time factor: 1890.07
UPS: 59095.744681
Duration: 0.06s
Real time factor: 17193.5
UPS: 541935.483871
Vehicles:
Inserted: 564
Running: 0
Waiting: 0
Statistics (avg of 564):
RouteLength: 615.98
Speed: 10.56
Duration: 59.09
WaitingTime: 2.23
TimeLoss: 13.04
RouteLength: 615.94
Speed: 10.48
Duration: 59.57
WaitingTime: 2.43
TimeLoss: 13.53
DepartDelay: 0.29

DijkstraRouter answered 564 queries and explored 4.97 edges on average.
Expand Down
24 changes: 12 additions & 12 deletions tests/sumo/lc_model/roundabout/mixed/high_traffic/output.sumo
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
Loading net-file from 'net.net.xml' ... done (4ms).
Loading net-file from 'net.net.xml' ... done (0ms).
Loading additional-files from 'input_additional.add.xml' ... done (0ms).
Loading done.
Simulation version v1_17_0+1028-14cfdc2 started with time: 0.00.
Simulation ended at time: 1157.00
Simulation version v1_19_0+1498-888d18b5504 started with time: 0.00.
Simulation ended at time: 1147.00
Reason: All vehicles have left the simulation.
Performance:
Duration: 1.97s
Real time factor: 587.608
UPS: 60348.400203
Duration: 0.20s
Real time factor: 5622.55
UPS: 551764.705882
Vehicles:
Inserted: 1015
Running: 0
Waiting: 0
Statistics (avg of 1015):
RouteLength: 616.47
Speed: 6.22
Duration: 117.07
WaitingTime: 24.05
TimeLoss: 71.01
DepartDelay: 1.66
RouteLength: 616.50
Speed: 6.41
Duration: 110.90
WaitingTime: 21.06
TimeLoss: 64.84
DepartDelay: 1.67

DijkstraRouter answered 1015 queries and explored 5.03 edges on average.
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
22 changes: 11 additions & 11 deletions tests/sumo/lc_model/roundabout/mixed/low_traffic/output.sumo
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
Loading net-file from 'net.net.xml' ... done (4ms).
Loading additional-files from 'input_additional.add.xml' ... done (0ms).
Loading net-file from 'net.net.xml' ... done (0ms).
Loading additional-files from 'input_additional.add.xml' ... done (1ms).
Loading done.
Simulation version v1_17_0+1028-14cfdc2 started with time: 0.00.
Simulation version v1_19_0+1498-888d18b5504 started with time: 0.00.
Simulation ended at time: 1051.00
Reason: All vehicles have left the simulation.
Performance:
Duration: 0.34s
Real time factor: 3091.18
UPS: 46450.000000
Duration: 0.04s
Real time factor: 30028.6
UPS: 450600.000000
Vehicles:
Inserted: 282 (Loaded: 564)
Running: 0
Waiting: 0
Statistics (avg of 282):
RouteLength: 615.34
Speed: 11.01
Duration: 56.00
WaitingTime: 0.26
TimeLoss: 10.00
RouteLength: 615.31
Speed: 11.02
Duration: 55.92
WaitingTime: 0.20
TimeLoss: 9.94
DepartDelay: 0.05

DijkstraRouter answered 282 queries and explored 4.94 edges on average.
Expand Down
22 changes: 11 additions & 11 deletions tests/sumo/lc_model/roundabout/mixed/medium_traffic/output.sumo
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
Loading net-file from 'net.net.xml' ... done (16ms).
Loading net-file from 'net.net.xml' ... done (1ms).
Loading additional-files from 'input_additional.add.xml' ... done (0ms).
Loading done.
Simulation version v1_17_0+1028-14cfdc2 started with time: 0.00.
Simulation ended at time: 1068.00
Simulation version v1_19_0+1498-888d18b5504 started with time: 0.00.
Simulation ended at time: 1067.00
Reason: All vehicles have left the simulation.
Performance:
Duration: 0.59s
Real time factor: 1810.17
UPS: 57723.728814
Duration: 0.06s
Real time factor: 16671.9
UPS: 529984.375000
Vehicles:
Inserted: 564
Running: 0
Waiting: 0
Statistics (avg of 564):
RouteLength: 615.72
Speed: 10.36
Duration: 60.38
WaitingTime: 2.71
TimeLoss: 14.38
RouteLength: 615.66
Speed: 10.39
Duration: 60.14
WaitingTime: 2.58
TimeLoss: 14.15
DepartDelay: 0.32

DijkstraRouter answered 564 queries and explored 4.97 edges on average.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
Loading net-file from 'net.net.xml' ... done (16ms).
Loading net-file from 'net.net.xml' ... done (1ms).
Loading additional-files from 'input_additional.add.xml' ... done (0ms).
Loading done.
Simulation version v1_17_0+1028-14cfdc2 started with time: 0.00.
Simulation ended at time: 1175.00
Simulation version v1_19_0+1498-888d18b5504 started with time: 0.00.
Simulation ended at time: 1148.00
Reason: All vehicles have left the simulation.
Performance:
Duration: 1.80s
Real time factor: 651.33
UPS: 68491.130820
Duration: 0.19s
Real time factor: 5917.53
UPS: 584530.927835
Vehicles:
Inserted: 1015
Running: 0
Waiting: 0
Statistics (avg of 1015):
RouteLength: 616.95
Speed: 6.40
Duration: 121.73
WaitingTime: 29.60
TimeLoss: 75.64
DepartDelay: 3.10
RouteLength: 616.81
Speed: 6.78
Duration: 111.72
WaitingTime: 23.14
TimeLoss: 65.60
DepartDelay: 1.61

DijkstraRouter answered 1015 queries and explored 5.03 edges on average.
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
Loading net-file from 'net.net.xml' ... done (4ms).
Loading net-file from 'net.net.xml' ... done (1ms).
Loading additional-files from 'input_additional.add.xml' ... done (0ms).
Loading done.
Simulation version v1_16_0+0853-bb3bf2e started with time: 0.00.
Simulation ended at time: 1050.00
Simulation version v1_19_0+1498-888d18b5504 started with time: 0.00.
Simulation ended at time: 1051.00
Reason: All vehicles have left the simulation.
Performance:
Duration: 0.32s
Real time factor: 3281.25
UPS: 48875.000000
Duration: 0.03s
Real time factor: 31848.5
UPS: 474121.212121
Vehicles:
Inserted: 282 (Loaded: 564)
Running: 0
Waiting: 0
Statistics (avg of 282):
RouteLength: 615.51
Speed: 11.12
Duration: 55.46
WaitingTime: 0.36
TimeLoss: 9.41
RouteLength: 615.48
Speed: 11.11
Duration: 55.48
WaitingTime: 0.37
TimeLoss: 9.43
DepartDelay: 0.05

DijkstraRouter answered 282 queries and explored 4.94 edges on average.
DijkstraRouter spent 0.00s answering queries (0.01ms on average).
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
Loading net-file from 'net.net.xml' ... done (8ms).
Loading additional-files from 'input_additional.add.xml' ... done (1ms).
Loading net-file from 'net.net.xml' ... done (1ms).
Loading additional-files from 'input_additional.add.xml' ... done (0ms).
Loading done.
Simulation version v1_17_0+1028-14cfdc2 started with time: 0.00.
Simulation ended at time: 1065.00
Simulation version v1_19_0+1498-888d18b5504 started with time: 0.00.
Simulation ended at time: 1063.00
Reason: All vehicles have left the simulation.
Performance:
Duration: 0.50s
Real time factor: 2117.3
UPS: 65683.896620
Duration: 0.06s
Real time factor: 17426.2
UPS: 547245.901639
Vehicles:
Inserted: 564
Running: 0
Waiting: 0
Statistics (avg of 564):
RouteLength: 615.80
Speed: 10.62
Duration: 58.58
WaitingTime: 1.95
TimeLoss: 12.55
RouteLength: 615.90
Speed: 10.54
Duration: 59.19
WaitingTime: 2.34
TimeLoss: 13.17
DepartDelay: 0.30

DijkstraRouter answered 564 queries and explored 4.97 edges on average.
Expand Down

0 comments on commit 2f9f2ee

Please sign in to comment.