Skip to content

Commit

Permalink
patching expected results refs #21, #15887
Browse files Browse the repository at this point in the history
  • Loading branch information
namdre committed Dec 10, 2024
1 parent 46e3118 commit e319093
Show file tree
Hide file tree
Showing 9 changed files with 60 additions and 98 deletions.
16 changes: 0 additions & 16 deletions tests/sumo/lc_model/bugs/ticket15887/errors.sumo
Original file line number Diff line number Diff line change
@@ -1,16 +0,0 @@
Warning: Teleporting vehicle 'f_0.52'; waited too long (jam), lane=':J1_0_0', time=559.00.
Warning: Vehicle 'f_0.52' ends teleporting on edge 'E1', time=559.00.
Warning: Teleporting vehicle 'f_0.70'; waited too long (jam), lane=':J1_0_0', time=863.00.
Warning: Vehicle 'f_0.70' ends teleporting on edge 'E1', time=863.00.
Warning: Teleporting vehicle 'f_0.92'; waited too long (jam), lane=':J1_0_0', time=1201.00.
Warning: Vehicle 'f_0.92' ends teleporting on edge 'E1', time=1201.00.
Warning: Teleporting vehicle 'f_0.93'; waited too long (jam), lane=':J1_0_0', time=1505.00.
Warning: Vehicle 'f_0.93' ends teleporting on edge 'E1', time=1505.00.
Warning: Teleporting vehicle 'f_0.171'; waited too long (jam), lane=':J1_0_0', time=1809.00.
Warning: Vehicle 'f_0.171' ends teleporting on edge 'E1', time=1809.00.
Warning: Teleporting vehicle 'f_0.252'; waited too long (jam), lane=':J1_0_0', time=2113.00.
Warning: Vehicle 'f_0.252' ends teleporting on edge 'E1', time=2113.00.
Warning: Teleporting vehicle 'f_0.271'; waited too long (jam), lane=':J1_0_0', time=2431.00.
Warning: Vehicle 'f_0.271' ends teleporting on edge 'E1', time=2431.00.
Warning: Teleporting vehicle 'f_0.272'; waited too long (jam), lane=':J1_0_0', time=2735.00.
Warning: Vehicle 'f_0.272' ends teleporting on edge 'E1', time=2735.00.
25 changes: 12 additions & 13 deletions tests/sumo/lc_model/bugs/ticket15887/output.sumo
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
Loading net-file from 'net.net.xml' ... done (1ms).
Loading done.
Simulation version v1_21_0+1293-3e583085999 started with time: 0.00.
Simulation ended at time: 2794.00.
Simulation version v1_21_0+1306-3ccc848829e started with time: 0.00.
Simulation ended at time: 1148.00.
Reason: All vehicles have left the simulation.
Performance:
Duration: 0.13s
Real time factor: 21658.9
UPS: 417666.666667
Duration: 0.04s
Real time factor: 28700
UPS: 638550.000000
Vehicles:
Inserted: 115 (Loaded: 277)
Inserted: 207 (Loaded: 277)
Running: 0
Waiting: 0
Teleports: 8 (Jam: 8)
Statistics (avg of 115):
Statistics (avg of 207):
RouteLength: 296.02
Speed: 2.59
Duration: 468.51
WaitingTime: 406.35
TimeLoss: 446.22
DepartDelay: 1.74
Speed: 2.94
Duration: 123.39
WaitingTime: 57.79
TimeLoss: 101.01
DepartDelay: 1.84
3 changes: 1 addition & 2 deletions tests/sumo/sublane_model/bugs/ticket12581b/errors.sumo
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
Warning: Vehicle 'f_0.1627' performs emergency braking on lane 'E0_0' with decel=9.00, wished=4.50, severity=1.00, time=2388.00.
Warning: Vehicle 'f_0.2336' performs emergency braking on lane 'E0_0' with decel=9.00, wished=4.50, severity=1.00, time=3444.00.
Warning: Vehicle 'f_0.2301' performs emergency braking on lane 'E0_0' with decel=9.00, wished=4.50, severity=1.00, time=3383.00.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-02-10 08:32:04 by Eclipse SUMO sumo Version v1_16_0+0106-3669718
<!-- generated on 2024-12-10 19:04:28 by Eclipse SUMO sumo Version v1_21_0+1306-3ccc848829e
This data file and the accompanying materials
are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
Expand All @@ -11,7 +11,7 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
or later which is available at
https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
<input>
<net-file value="net.net.xml"/>
Expand All @@ -34,32 +34,32 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<no-step-log value="true"/>
</report>
</configuration>
</sumoConfiguration>
-->

<meandata xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/meandata_file.xsd">
<interval begin="0.00" end="1094.00" id="cars">
<edge id=":C_1" sampledSeconds="300.90" traveltime="2.57" overlapTraveltime="2.98" density="11.09" laneDensity="5.55" occupancy="2.26" waitingTime="0.00" timeLoss="84.21" speed="10.00" speedRelative="0.72" departed="0" arrived="0" entered="101" left="101" laneChangedFrom="0" laneChangedTo="0"/>
<edge id=":C_9" sampledSeconds="222.93" traveltime="2.78" overlapTraveltime="3.18" density="8.22" laneDensity="8.22" occupancy="3.29" waitingTime="1.00" timeLoss="72.75" speed="9.36" speedRelative="0.67" departed="0" arrived="0" entered="70" left="70" laneChangedFrom="0" laneChangedTo="0"/>
<edge id=":C_9" sampledSeconds="220.32" traveltime="2.75" overlapTraveltime="3.15" density="8.12" laneDensity="8.12" occupancy="3.24" waitingTime="0.00" timeLoss="70.14" speed="9.47" speedRelative="0.68" departed="0" arrived="0" entered="70" left="70" laneChangedFrom="0" laneChangedTo="0"/>
<edge id=":C_11" sampledSeconds="27.63" traveltime="27.21" overlapTraveltime="27.63" density="1.02" laneDensity="1.02" occupancy="0.10" waitingTime="23.00" timeLoss="25.48" speed="1.08" speedRelative="0.08" departed="0" arrived="0" entered="1" left="1" laneChangedFrom="0" laneChangedTo="0"/>
<edge id=":C_12" sampledSeconds="870.59" traveltime="17.89" overlapTraveltime="18.93" density="99.47" laneDensity="99.47" occupancy="28.24" waitingTime="713.00" timeLoss="827.54" speed="0.69" speedRelative="0.05" departed="0" arrived="0" entered="46" left="46" laneChangedFrom="0" laneChangedTo="0"/>
<edge id=":C_20" sampledSeconds="126.93" traveltime="2.30" overlapTraveltime="2.76" density="7.64" laneDensity="7.64" occupancy="2.71" waitingTime="0.00" timeLoss="60.07" speed="7.32" speedRelative="0.53" departed="0" arrived="0" entered="46" left="46" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="CN" sampledSeconds="480.48" traveltime="6.48" overlapTraveltime="6.85" density="5.01" laneDensity="2.51" occupancy="1.19" waitingTime="0.00" timeLoss="12.59" speed="13.53" speedRelative="0.97" departed="0" arrived="71" entered="71" left="0" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="CN" sampledSeconds="480.12" traveltime="6.48" overlapTraveltime="6.84" density="5.01" laneDensity="2.50" occupancy="1.19" waitingTime="0.00" timeLoss="12.24" speed="13.54" speedRelative="0.97" departed="0" arrived="71" entered="71" left="0" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="CS" sampledSeconds="689.89" traveltime="6.55" overlapTraveltime="6.91" density="7.20" laneDensity="3.60" occupancy="1.71" waitingTime="0.00" timeLoss="24.64" speed="13.39" speedRelative="0.96" departed="0" arrived="101" entered="101" left="0" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="CW" sampledSeconds="316.22" traveltime="6.54" overlapTraveltime="6.90" density="3.30" laneDensity="1.65" occupancy="0.78" waitingTime="0.00" timeLoss="10.51" speed="13.43" speedRelative="0.97" departed="0" arrived="46" entered="46" left="0" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="NC" sampledSeconds="2499.39" traveltime="25.57" overlapTraveltime="26.19" density="26.08" laneDensity="13.04" occupancy="6.44" waitingTime="1370.00" timeLoss="1863.14" speed="3.54" speedRelative="0.25" departed="101" arrived="0" entered="0" left="101" laneChangedFrom="39" laneChangedTo="39"/>
<edge id="SC" sampledSeconds="10334.74" traveltime="89.34" overlapTraveltime="93.48" density="107.84" laneDensity="53.92" occupancy="26.75" waitingTime="7985.00" timeLoss="9597.69" speed="0.99" speedRelative="0.07" departed="117" arrived="0" entered="0" left="117" laneChangedFrom="71" laneChangedTo="71"/>
<edge id="SC" sampledSeconds="10332.17" traveltime="89.33" overlapTraveltime="93.46" density="107.81" laneDensity="53.91" occupancy="26.74" waitingTime="7986.00" timeLoss="9595.13" speed="0.99" speedRelative="0.07" departed="117" arrived="0" entered="0" left="117" laneChangedFrom="71" laneChangedTo="71"/>
</interval>
<interval begin="0.00" end="1094.00" id="scooters">
<edge id=":C_1" sampledSeconds="364.25" traveltime="3.46" overlapTraveltime="3.68" density="13.43" laneDensity="6.71" occupancy="1.28" waitingTime="0.00" timeLoss="172.52" speed="7.31" speedRelative="0.53" departed="0" arrived="0" entered="99" left="99" laneChangedFrom="3" laneChangedTo="3"/>
<edge id=":C_9" sampledSeconds="274.46" traveltime="3.87" overlapTraveltime="4.10" density="10.12" laneDensity="10.12" occupancy="1.89" waitingTime="9.00" timeLoss="144.70" speed="6.57" speedRelative="0.47" departed="0" arrived="0" entered="67" left="67" laneChangedFrom="0" laneChangedTo="0"/>
<edge id=":C_10" sampledSeconds="1256.86" traveltime="32.18" overlapTraveltime="33.08" density="47.87" laneDensity="47.87" occupancy="9.82" waitingTime="986.00" timeLoss="1185.46" speed="0.79" speedRelative="0.06" departed="0" arrived="0" entered="38" left="38" laneChangedFrom="0" laneChangedTo="0"/>
<edge id=":C_9" sampledSeconds="275.82" traveltime="3.89" overlapTraveltime="4.12" density="10.17" laneDensity="10.17" occupancy="1.89" waitingTime="9.00" timeLoss="146.06" speed="6.53" speedRelative="0.47" departed="0" arrived="0" entered="67" left="67" laneChangedFrom="0" laneChangedTo="0"/>
<edge id=":C_10" sampledSeconds="1255.31" traveltime="32.14" overlapTraveltime="33.03" density="47.81" laneDensity="47.81" occupancy="9.81" waitingTime="982.00" timeLoss="1183.90" speed="0.79" speedRelative="0.06" departed="0" arrived="0" entered="38" left="38" laneChangedFrom="0" laneChangedTo="0"/>
<edge id=":C_11" sampledSeconds="35.95" traveltime="6.92" overlapTraveltime="7.19" density="1.33" laneDensity="1.33" occupancy="0.25" waitingTime="6.00" timeLoss="26.27" speed="3.74" speedRelative="0.27" departed="0" arrived="0" entered="5" left="5" laneChangedFrom="0" laneChangedTo="0"/>
<edge id=":C_19" sampledSeconds="183.40" traveltime="4.52" overlapTraveltime="4.83" density="8.37" laneDensity="8.37" occupancy="1.53" waitingTime="0.00" timeLoss="122.86" speed="4.59" speedRelative="0.33" departed="0" arrived="0" entered="38" left="38" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="CN" sampledSeconds="522.74" traveltime="7.14" overlapTraveltime="7.29" density="5.45" laneDensity="2.73" occupancy="0.56" waitingTime="0.00" timeLoss="59.73" speed="12.30" speedRelative="0.89" departed="0" arrived="72" entered="72" left="0" laneChangedFrom="2" laneChangedTo="2"/>
<edge id="CN" sampledSeconds="523.42" traveltime="7.15" overlapTraveltime="7.30" density="5.46" laneDensity="2.73" occupancy="0.56" waitingTime="0.00" timeLoss="60.44" speed="12.29" speedRelative="0.88" departed="0" arrived="72" entered="72" left="0" laneChangedFrom="2" laneChangedTo="2"/>
<edge id="CS" sampledSeconds="703.66" traveltime="6.99" overlapTraveltime="7.15" density="7.34" laneDensity="3.67" occupancy="0.75" waitingTime="0.00" timeLoss="67.86" speed="12.55" speedRelative="0.90" departed="0" arrived="99" entered="99" left="0" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="CW" sampledSeconds="305.24" traveltime="7.88" overlapTraveltime="8.04" density="3.19" laneDensity="1.59" occupancy="0.33" waitingTime="0.00" timeLoss="59.95" speed="11.16" speedRelative="0.80" departed="0" arrived="38" entered="38" left="0" laneChangedFrom="9" laneChangedTo="9"/>
<edge id="NC" sampledSeconds="2857.91" traveltime="29.13" overlapTraveltime="29.59" density="29.82" laneDensity="14.91" occupancy="3.11" waitingTime="1386.00" timeLoss="2234.26" speed="3.03" speedRelative="0.22" departed="99" arrived="0" entered="0" left="99" laneChangedFrom="21" laneChangedTo="21"/>
<edge id="SC" sampledSeconds="5973.16" traveltime="54.97" overlapTraveltime="55.67" density="62.33" laneDensity="31.16" occupancy="6.50" waitingTime="3666.00" timeLoss="5280.22" speed="1.61" speedRelative="0.12" departed="110" arrived="0" entered="0" left="110" laneChangedFrom="13" laneChangedTo="13"/>
<edge id="SC" sampledSeconds="5975.90" traveltime="54.97" overlapTraveltime="55.69" density="62.36" laneDensity="31.18" occupancy="6.50" waitingTime="3670.00" timeLoss="5282.96" speed="1.61" speedRelative="0.12" departed="110" arrived="0" entered="0" left="110" laneChangedFrom="13" laneChangedTo="13"/>
</interval>
</meandata>
20 changes: 10 additions & 10 deletions tests/sumo/sublane_model/roundabout/high_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 (1ms).
Loading additional-files from 'input_additional.add.xml' ... done (0ms).
Loading done.
Simulation version v1_20_0+0875-c7310f6279d started with time: 0.00.
Simulation ended at time: 1183.00.
Simulation version v1_21_0+1306-3ccc848829e started with time: 0.00.
Simulation ended at time: 1182.00.
Reason: All vehicles have left the simulation.
Performance:
Duration: 1.85s
Real time factor: 640.845
UPS: 71000.000000
Real time factor: 639.61
UPS: 71969.696970
Vehicles:
Inserted: 1015
Running: 0
Waiting: 0
Statistics (avg of 1015):
RouteLength: 618.18
Speed: 5.83
Duration: 129.13
WaitingTime: 31.70
TimeLoss: 82.87
DepartDelay: 1.85
RouteLength: 618.17
Speed: 5.73
Duration: 131.03
WaitingTime: 30.57
TimeLoss: 84.77
DepartDelay: 1.78
DijkstraRouter answered 1015 queries and explored 5.09 edges on average.
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
Warning: Vehicle 'WN.53' performs emergency braking on lane ':RE_4_1' with decel=9.00, wished=4.50, severity=1.00, time=814.00.
27 changes: 13 additions & 14 deletions tests/sumo/sublane_model/roundabout/mixed/high_traffic/output.sumo
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
Loading net-file from 'net.net.xml' ... done (2ms).
Loading net-file from 'net.net.xml' ... done (1ms).
Loading additional-files from 'input_additional.add.xml' ... done (0ms).
Loading done.
Simulation version v1_20_0+0875-c7310f6279d started with time: 0.00.
Simulation ended at time: 1247.00.
Simulation version v1_21_0+1306-3ccc848829e started with time: 0.00.
Simulation ended at time: 1260.00.
Reason: All vehicles have left the simulation.
Performance:
Duration: 2.67s
Real time factor: 466.692
UPS: 62354.790419
Duration: 2.85s
Real time factor: 441.486
UPS: 59144.358795
Vehicles:
Inserted: 1015
Running: 0
Waiting: 0
Emergency Braking: 1
Statistics (avg of 1015):
RouteLength: 617.94
Speed: 4.58
Duration: 164.15
WaitingTime: 45.75
TimeLoss: 117.91
DepartDelay: 2.00
DijkstraRouter answered 1015 queries and explored 5.10 edges on average.
RouteLength: 617.88
Speed: 4.62
Duration: 166.30
WaitingTime: 44.15
TimeLoss: 120.08
DepartDelay: 9.19
DijkstraRouter answered 1070 queries and explored 5.10 edges 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,5 @@
Warning: Unused states in tlLogic 'C', program '0' in phase 0 after tl-index 19
Warning: Vehicle 'f_0.57'; junction collision with vehicle 'f_0.55', lane=':C_3_1', gap=-0.39, latGap=-0.45, time=155.00, stage=move.
Warning: Vehicle 'f_0.90'; junction collision with vehicle 'f_0.89', lane=':C_3_1', gap=-1.17, latGap=-0.20, time=241.00, stage=move.
Warning: Vehicle 'f_0.89'; junction collision with vehicle 'f_0.94', lane=':C_3_1', gap=-1.66, latGap=-0.20, time=243.00, stage=move.
Warning: Vehicle 'f_0.98'; junction collision with vehicle 'f_0.90', lane=':C_3_0', gap=-0.23, latGap=-0.20, time=248.00, stage=move.
Warning: Vehicle 'f_0.115'; junction collision with vehicle 'f_0.119', lane=':C_3_0', gap=-0.62, latGap=-0.34, time=329.00, stage=move.
Warning: Vehicle 'f_0.134'; junction collision with vehicle 'f_0.136', lane=':C_3_0', gap=-1.10, latGap=-0.05, time=335.00, stage=move.
Warning: Vehicle 'f_0.141'; junction collision with vehicle 'f_0.140', lane=':C_3_1', gap=-0.24, latGap=-0.38, time=339.00, stage=move.
Warning: Vehicle 'f_0.136'; collision with vehicle 'f_0.134', lane='CE_0', gap=-1.69, latGap=-0.05, time=346.00, stage=move.
Warning: Vehicle 'f_0.134'; collision with vehicle 'f_0.135', lane='CE_0', gap=-1.61, latGap=-0.05, time=348.00, stage=move.
Warning: Vehicle 'f_0.135'; collision with vehicle 'f_0.134', lane='CE_0', gap=-1.18, latGap=-0.05, time=349.00, stage=move.
Warning: Vehicle 'f_0.135'; collision with vehicle 'f_0.134', lane='CE_0', gap=-0.21, latGap=-0.05, time=353.00, stage=move.
Warning: Vehicle 'f_0.138'; collision with vehicle 'f_0.136', lane='CE_0', gap=-1.57, latGap=-0.05, time=356.00, stage=move.
Warning: Vehicle 'f_0.136'; collision with vehicle 'f_0.138', lane='CE_0', gap=-1.90, latGap=-0.05, time=357.00, stage=move.
Warning: Vehicle 'f_0.134'; collision with vehicle 'f_0.135', lane='CE_0', gap=-2.07, latGap=-0.05, time=357.00, stage=move.
Warning: Vehicle 'f_0.135'; collision with vehicle 'f_0.134', lane='CE_0', gap=-1.96, latGap=-0.05, time=358.00, stage=move.
Warning: Vehicle 'f_0.138'; collision with vehicle 'f_0.136', lane='CE_0', gap=-1.90, latGap=-0.05, time=359.00, stage=move.
Warning: Vehicle 'f_0.136'; collision with vehicle 'f_0.138', lane='CE_0', gap=-1.89, latGap=-0.05, time=360.00, stage=move.
Warning: Vehicle 'f_0.134'; collision with vehicle 'f_0.135', lane='CE_0', gap=-1.99, latGap=-0.05, time=360.00, stage=move.
Warning: Vehicle 'f_0.138'; collision with vehicle 'f_0.136', lane='CE_0', gap=-2.08, latGap=-0.05, time=363.00, stage=move.
Warning: Vehicle 'f_0.177'; collision with vehicle 'f_0.180', lane='CE_0', gap=-1.68, latGap=-0.50, time=438.00, stage=move.
Warning: Vehicle 'f_0.218'; junction collision with vehicle 'f_0.215', lane=':C_3_1', gap=-1.10, latGap=-0.65, time=508.00, stage=move.
Warning: Vehicle 'f_0.218'; junction collision with vehicle 'f_0.219', lane=':C_3_1', gap=-1.79, latGap=-0.65, time=510.00, stage=move.
Warning: Vehicle 'f_0.33'; junction collision with vehicle 'f_0.40', lane=':C_3_0', gap=-0.82, latGap=-0.57, time=140.00, stage=move.
Warning: Vehicle 'f_0.202'; junction collision with vehicle 'f_0.204', lane=':C_3_1', gap=-0.94, latGap=-0.05, time=505.00, stage=move.
Warning: Vehicle 'f_0.203'; collision with vehicle 'f_0.196', lane='CE_0', gap=-0.36, latGap=-0.65, time=511.00, stage=move.
Warning: Vehicle 'f_0.226'; junction collision with vehicle 'f_0.219', lane=':C_3_0', gap=-0.47, latGap=-0.65, time=519.00, stage=move.
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
Loading net-file from 'net.net.xml' ... done (2ms).
Loading net-file from 'net.net.xml' ... done (1ms).
Loading done.
Simulation version v1_18_0+0183-909cae9 started with time: 0.00.
Simulation ended at time: 560.00.
Simulation version v1_21_0+1306-3ccc848829e started with time: 0.00.
Simulation ended at time: 611.00.
Reason: All vehicles have left the simulation.
Performance:
Duration: 0.43s
Real time factor: 1293.3
UPS: 34986.143187
Duration: 0.18s
Real time factor: 3491.43
UPS: 87217.142857
Vehicles:
Inserted: 235
Running: 0
Waiting: 0
Teleports: 0 (Collisions: 22)
Teleports: 0 (Collisions: 4)
Bike Statistics (avg of 235):
RouteLength: 198.33
Speed: 3.29
Duration: 64.46
WaitingTime: 12.17
TimeLoss: 28.38
Duration: 64.95
WaitingTime: 12.30
TimeLoss: 28.84
DepartDelay: 0.00

0 comments on commit e319093

Please sign in to comment.