Skip to content

Commit

Permalink
patching expected results refs #21, #15976
Browse files Browse the repository at this point in the history
  • Loading branch information
@namdre
namdre committed Jan 7, 2025
1 parent f6f3db2 commit cd4bcfc
Show file tree
Hide file tree
Showing 40 changed files with 6,696 additions and 6,819 deletions.
1,603 changes: 768 additions & 835 deletions tests/complex/state/rerouting_looped_stops/errors.complex
View file

Large diffs are not rendered by default.

6,790 changes: 3,375 additions & 3,415 deletions tests/complex/state/rerouting_looped_stops/state.complex
View file

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions tests/complex/traci/parkingarea/parkingarea/output.complex
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Retrying in 1 seconds
parkingareas ('stop1', 'stop2')
parkingarea count 2
stop attributes:
Expand All @@ -18,7 +19,7 @@ time: 15.0
stop=stop1 vC=2 vIDs=('f.0', 'f.1')
stop=stop2 vC=0 vIDs=()
time: 20.0
stop=stop1 vC=2 vIDs=('f.1', 'f.2')
stop=stop1 vC=1 vIDs=('f.1',)
stop=stop2 vC=0 vIDs=()
time: 25.0
stop=stop1 vC=1 vIDs=('f.2',)
Expand All @@ -27,11 +28,11 @@ time: 30.0
stop=stop1 vC=1 vIDs=('f.2',)
stop=stop2 vC=0 vIDs=()
time: 35.0
stop=stop1 vC=2 vIDs=('f.3', 'f.4')
stop=stop1 vC=1 vIDs=('f.3',)
stop=stop2 vC=0 vIDs=()
time: 40.0
stop=stop1 vC=2 vIDs=('f.3', 'f.4')
stop=stop2 vC=0 vIDs=()
time: 45.0
stop=stop1 vC=0 vIDs=()
stop=stop1 vC=1 vIDs=('f.4',)
stop=stop2 vC=0 vIDs=()
10 changes: 5 additions & 5 deletions tests/sumo/bugs/13xxx/ticket13453/detector.sumo
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-06-19 15:28:12 by Eclipse SUMO sumo Version v1_17_0+1022-1804990
<!-- generated on 2025-01-07 12:37:19 by Eclipse SUMO sumo Version v1_21_0+1707-e20019a517b
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 @@ -36,13 +36,13 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<no-step-log value="true"/>
</report>
</configuration>
</sumoConfiguration>
-->

<detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/det_e2_file.xsd">
<interval begin="0.00" end="10.00" id="e2_0" sampledSeconds="3.80" nVehEntered="1" nVehLeft="0" nVehSeen="1" meanSpeed="10.92" meanTimeLoss="0.81" meanOccupancy="4.00" maxOccupancy="10.00" meanMaxJamLengthInVehicles="0.00" meanMaxJamLengthInMeters="0.00" maxJamLengthInVehicles="0" maxJamLengthInMeters="0.00" jamLengthInVehiclesSum="0" jamLengthInMetersSum="0.00" meanHaltingDuration="0.00" maxHaltingDuration="0.00" haltingDurationSum="0.00" meanIntervalHaltingDuration="0.00" maxIntervalHaltingDuration="0.00" intervalHaltingDurationSum="0.00" startedHalts="0.00" meanVehicleNumber="0.40" maxVehicleNumber="1" />
<interval begin="10.00" end="20.00" id="e2_0" sampledSeconds="11.97" nVehEntered="1" nVehLeft="1" nVehSeen="2" meanSpeed="3.47" meanTimeLoss="4.49" meanOccupancy="12.00" maxOccupancy="20.00" meanMaxJamLengthInVehicles="0.50" meanMaxJamLengthInMeters="2.50" maxJamLengthInVehicles="1" maxJamLengthInMeters="5.00" jamLengthInVehiclesSum="5" jamLengthInMetersSum="25.00" meanHaltingDuration="5.00" maxHaltingDuration="5.00" haltingDurationSum="5.00" meanIntervalHaltingDuration="5.00" maxIntervalHaltingDuration="5.00" intervalHaltingDurationSum="5.00" startedHalts="2.00" meanVehicleNumber="1.20" maxVehicleNumber="2" />
<interval begin="10.00" end="20.00" id="e2_0" sampledSeconds="11.97" nVehEntered="1" nVehLeft="1" nVehSeen="2" meanSpeed="3.26" meanTimeLoss="4.58" meanOccupancy="12.00" maxOccupancy="20.00" meanMaxJamLengthInVehicles="0.50" meanMaxJamLengthInMeters="2.50" maxJamLengthInVehicles="1" maxJamLengthInMeters="5.00" jamLengthInVehiclesSum="5" jamLengthInMetersSum="25.00" meanHaltingDuration="5.00" maxHaltingDuration="5.00" haltingDurationSum="5.00" meanIntervalHaltingDuration="5.00" maxIntervalHaltingDuration="5.00" intervalHaltingDurationSum="5.00" startedHalts="2.00" meanVehicleNumber="1.20" maxVehicleNumber="2" />
<interval begin="20.00" end="30.00" id="e2_0" sampledSeconds="10.00" nVehEntered="0" nVehLeft="0" nVehSeen="1" meanSpeed="0.00" meanTimeLoss="10.00" meanOccupancy="10.00" maxOccupancy="10.00" meanMaxJamLengthInVehicles="1.00" meanMaxJamLengthInMeters="5.00" maxJamLengthInVehicles="1" maxJamLengthInMeters="5.00" jamLengthInVehiclesSum="10" jamLengthInMetersSum="50.00" meanHaltingDuration="15.00" maxHaltingDuration="15.00" haltingDurationSum="15.00" meanIntervalHaltingDuration="10.00" maxIntervalHaltingDuration="10.00" intervalHaltingDurationSum="10.00" startedHalts="0.00" meanVehicleNumber="1.00" maxVehicleNumber="1" />
<interval begin="30.00" end="40.00" id="e2_0" sampledSeconds="10.00" nVehEntered="0" nVehLeft="0" nVehSeen="1" meanSpeed="0.00" meanTimeLoss="10.00" meanOccupancy="10.00" maxOccupancy="10.00" meanMaxJamLengthInVehicles="1.00" meanMaxJamLengthInMeters="5.00" maxJamLengthInVehicles="1" maxJamLengthInMeters="5.00" jamLengthInVehiclesSum="10" jamLengthInMetersSum="50.00" meanHaltingDuration="25.00" maxHaltingDuration="25.00" haltingDurationSum="25.00" meanIntervalHaltingDuration="10.00" maxIntervalHaltingDuration="10.00" intervalHaltingDurationSum="10.00" startedHalts="0.00" meanVehicleNumber="1.00" maxVehicleNumber="1" />
<interval begin="40.00" end="50.00" id="e2_0" sampledSeconds="5.41" nVehEntered="1" nVehLeft="2" nVehSeen="2" meanSpeed="1.68" meanTimeLoss="2.38" meanOccupancy="4.49" maxOccupancy="20.00" meanMaxJamLengthInVehicles="0.30" meanMaxJamLengthInMeters="1.50" maxJamLengthInVehicles="1" maxJamLengthInMeters="5.00" jamLengthInVehiclesSum="3" jamLengthInMetersSum="15.00" meanHaltingDuration="0.00" maxHaltingDuration="0.00" haltingDurationSum="0.00" meanIntervalHaltingDuration="0.00" maxIntervalHaltingDuration="0.00" intervalHaltingDurationSum="0.00" startedHalts="0.00" meanVehicleNumber="0.60" maxVehicleNumber="2" />
<interval begin="40.00" end="50.00" id="e2_0" sampledSeconds="11.42" nVehEntered="1" nVehLeft="2" nVehSeen="2" meanSpeed="1.78" meanTimeLoss="4.98" meanOccupancy="10.49" maxOccupancy="20.00" meanMaxJamLengthInVehicles="0.50" meanMaxJamLengthInMeters="2.50" maxJamLengthInVehicles="1" maxJamLengthInMeters="5.00" jamLengthInVehiclesSum="5" jamLengthInMetersSum="25.00" meanHaltingDuration="28.00" maxHaltingDuration="28.00" haltingDurationSum="28.00" meanIntervalHaltingDuration="3.00" maxIntervalHaltingDuration="3.00" intervalHaltingDurationSum="3.00" startedHalts="1.00" meanVehicleNumber="1.20" maxVehicleNumber="2" />
</detector>
8 changes: 4 additions & 4 deletions tests/sumo/bugs/15xxx/ticket15757_parkingArea/aggregated.sumo
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2025-01-07 11:55:59 by Eclipse SUMO sumo Version v1_21_0+1705-23b70bff074
<!-- generated on 2025-01-07 12:37:19 by Eclipse SUMO sumo Version v1_21_0+1707-e20019a517b
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 Down Expand Up @@ -38,8 +38,8 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-->

<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="7390.00" id="DEFAULT_EDGEDATA">
<edge id="E0" sampledSeconds="131350.24" traveltime="2059.47" overlapTraveltime="2090.56" density="88.87" laneDensity="44.44" occupancy="30.70" waitingTime="121194.50" timeLoss="130294.62" speed="0.10" speedRelative="0.01" departed="0" arrived="58" entered="196" left="138" laneChangedFrom="44" laneChangedTo="46" teleported="19"/>
<edge id="E1" sampledSeconds="81943.65" traveltime="965.29" overlapTraveltime="1072.78" density="110.88" laneDensity="55.44" occupancy="36.58" waitingTime="76818.00" timeLoss="81354.68" speed="0.10" speedRelative="0.01" departed="77" arrived="0" entered="0" left="77" laneChangedFrom="23" laneChangedTo="23" teleported="3"/>
<interval begin="0.00" end="7434.00" id="DEFAULT_EDGEDATA">
<edge id="E0" sampledSeconds="139672.81" traveltime="1857.13" overlapTraveltime="1880.13" density="93.94" laneDensity="46.97" occupancy="32.78" waitingTime="125750.00" timeLoss="138411.45" speed="0.11" speedRelative="0.01" departed="0" arrived="77" entered="231" left="154" laneChangedFrom="34" laneChangedTo="34"/>
<edge id="E1" sampledSeconds="77856.43" traveltime="912.29" overlapTraveltime="1011.12" density="104.73" laneDensity="52.37" occupancy="33.26" waitingTime="71972.54" timeLoss="77262.71" speed="0.11" speedRelative="0.01" departed="77" arrived="0" entered="0" left="77" laneChangedFrom="23" laneChangedTo="23"/>
</interval>
</meandata>
79 changes: 0 additions & 79 deletions tests/sumo/bugs/15xxx/ticket15757_parkingArea/errors.sumo
View file
Original file line number Diff line number Diff line change
@@ -1,79 +0,0 @@
Warning: Teleporting vehicle 'f_0.3'; waited too long (jam), lane='E0_0', time=547.00.
Warning: Vehicle 'f_0.3' teleports beyond arrival edge 'E0', time=547.00.
Warning: Vehicle 'f_0.3' skips stop on lane 'E0_0' time=547.00.
Warning: Vehicle 'f_0.3' skips stop on lane 'E0_0' time=547.00.
Warning: Teleporting vehicle 'f_0.6'; waited too long (jam), lane='E0_0', time=1156.00.
Warning: Vehicle 'f_0.6' teleports beyond arrival edge 'E0', time=1156.00.
Warning: Vehicle 'f_0.6' skips stop on lane 'E0_0' time=1156.00.
Warning: Teleporting vehicle 'f_0.10'; waited too long (jam), lane='E0_0', time=1334.00.
Warning: Vehicle 'f_0.10' teleports beyond arrival edge 'E0', time=1334.00.
Warning: Vehicle 'f_0.10' skips stop on lane 'E0_0' time=1334.00.
Warning: Vehicle 'f_0.10' skips stop on lane 'E0_0' time=1334.00.
Warning: Teleporting vehicle 'f_0.11'; waited too long (jam), lane='E0_0', time=1745.00.
Warning: Vehicle 'f_0.11' teleports beyond arrival edge 'E0', time=1745.00.
Warning: Vehicle 'f_0.11' skips stop on lane 'E0_0' time=1745.00.
Warning: Vehicle 'f_0.11' skips stop on lane 'E0_0' time=1745.00.
Warning: Teleporting vehicle 'f_0.23'; waited too long (jam), lane='E1_0', time=1785.00.
Warning: Vehicle 'f_0.23' ends teleporting on edge 'E0', time=1785.00.
Warning: Teleporting vehicle 'f_0.33'; waited too long (jam), lane='E0_0', time=2155.00.
Warning: Vehicle 'f_0.33' teleports beyond arrival edge 'E0', time=2155.00.
Warning: Vehicle 'f_0.33' skips stop on lane 'E0_0' time=2155.00.
Warning: Vehicle 'f_0.33' skips stop on lane 'E0_0' time=2155.00.
Warning: Teleporting vehicle 'f_0.35'; waited too long (wrong lane), lane='E0_1', time=2161.00.
Warning: Vehicle 'f_0.35' teleports beyond arrival edge 'E0', time=2161.00.
Warning: Vehicle 'f_0.35' skips stop on lane 'E0_0' time=2161.00.
Warning: Vehicle 'f_0.35' skips stop on lane 'E0_0' time=2161.00.
Warning: Teleporting vehicle 'f_0.36'; waited too long (wrong lane), lane='E0_1', time=2179.00.
Warning: Vehicle 'f_0.36' teleports beyond arrival edge 'E0', time=2179.00.
Warning: Vehicle 'f_0.36' skips stop on lane 'E0_0' time=2179.00.
Warning: Vehicle 'f_0.36' skips stop on lane 'E0_0' time=2179.00.
Warning: Teleporting vehicle 'f_0.23'; waited too long (jam), lane='E0_0', time=2189.00.
Warning: Vehicle 'f_0.23' teleports beyond arrival edge 'E0', time=2189.00.
Warning: Vehicle 'f_0.23' skips stop on lane 'E0_0' time=2189.00.
Warning: Vehicle 'f_0.23' skips stop on lane 'E0_0' time=2189.00.
Warning: Teleporting vehicle 'f_0.47'; waited too long (jam), lane='E1_0', time=2198.00.
Warning: Vehicle 'f_0.47' skips stop on lane 'E0_0' time=2198.00.
Warning: Vehicle 'f_0.47' skips stop on lane 'E0_0' time=2198.00.
Warning: Vehicle 'f_0.47' ends teleporting on edge 'E0', time=2198.00.
Warning: Teleporting vehicle 'f_0.14'; waited too long (jam), lane='E0_0', time=2600.00.
Warning: Vehicle 'f_0.14' teleports beyond arrival edge 'E0', time=2600.00.
Warning: Vehicle 'f_0.14' skips stop on lane 'E0_0' time=2600.00.
Warning: Vehicle 'f_0.14' skips stop on lane 'E0_0' time=2600.00.
Warning: Teleporting vehicle 'f_0.16'; waited too long (jam), lane='E0_0', time=3207.00.
Warning: Vehicle 'f_0.16' teleports beyond arrival edge 'E0', time=3207.00.
Warning: Vehicle 'f_0.16' skips stop on lane 'E0_0' time=3207.00.
Warning: Teleporting vehicle 'f_0.42'; waited too long (jam), lane='E0_0', time=3232.00.
Warning: Vehicle 'f_0.42' teleports beyond arrival edge 'E0', time=3232.00.
Warning: Vehicle 'f_0.42' skips stop on lane 'E0_0' time=3232.00.
Warning: Vehicle 'f_0.42' skips stop on lane 'E0_0' time=3232.00.
Warning: Teleporting vehicle 'f_0.44'; waited too long (jam), lane='E0_0', time=3642.00.
Warning: Vehicle 'f_0.44' teleports beyond arrival edge 'E0', time=3642.00.
Warning: Vehicle 'f_0.44' skips stop on lane 'E0_0' time=3642.00.
Warning: Vehicle 'f_0.44' skips stop on lane 'E0_0' time=3642.00.
Warning: Teleporting vehicle 'f_0.69'; waited too long (jam), lane='E1_1', time=3676.00.
Warning: Vehicle 'f_0.69' ends teleporting on edge 'E0', time=3676.00.
Warning: Teleporting vehicle 'f_0.48'; waited too long (jam), lane='E0_0', time=4053.00.
Warning: Vehicle 'f_0.48' teleports beyond arrival edge 'E0', time=4053.00.
Warning: Vehicle 'f_0.48' skips stop on lane 'E0_0' time=4053.00.
Warning: Vehicle 'f_0.48' skips stop on lane 'E0_0' time=4053.00.
Warning: Teleporting vehicle 'f_0.63'; waited too long (jam), lane='E0_0', time=5221.00.
Warning: Vehicle 'f_0.63' teleports beyond arrival edge 'E0', time=5221.00.
Warning: Vehicle 'f_0.63' skips stop on lane 'E0_0' time=5221.00.
Warning: Teleporting vehicle 'f_0.59'; waited too long (jam), lane='E0_0', time=5230.00.
Warning: Vehicle 'f_0.59' teleports beyond arrival edge 'E0', time=5230.00.
Warning: Vehicle 'f_0.59' skips stop on lane 'E0_0' time=5230.00.
Warning: Vehicle 'f_0.59' skips stop on lane 'E0_0' time=5230.00.
Warning: Teleporting vehicle 'f_0.61'; waited too long (jam), lane='E0_0', time=5831.00.
Warning: Vehicle 'f_0.61' teleports beyond arrival edge 'E0', time=5831.00.
Warning: Vehicle 'f_0.61' skips stop on lane 'E0_0' time=5831.00.
Warning: Teleporting vehicle 'f_0.70'; waited too long (jam), lane='E0_0', time=6240.00.
Warning: Vehicle 'f_0.70' teleports beyond arrival edge 'E0', time=6240.00.
Warning: Vehicle 'f_0.70' skips stop on lane 'E0_0' time=6240.00.
Warning: Teleporting vehicle 'f_0.50'; waited too long (jam), lane='E0_0', time=6482.00.
Warning: Vehicle 'f_0.50' teleports beyond arrival edge 'E0', time=6482.00.
Warning: Vehicle 'f_0.50' skips stop on lane 'E0_0' time=6482.00.
Warning: Vehicle 'f_0.50' skips stop on lane 'E0_0' time=6482.00.
Warning: Teleporting vehicle 'f_0.65'; waited too long (jam), lane='E0_0', time=7002.00.
Warning: Vehicle 'f_0.65' teleports beyond arrival edge 'E0', time=7002.00.
Warning: Vehicle 'f_0.65' skips stop on lane 'E0_0' time=7002.00.
Warning: Vehicle 'f_0.65' skips stop on lane 'E0_0' time=7002.00.
4 changes: 0 additions & 4 deletions tests/sumo/bugs/15xxx/ticket15976/errors.sumo
View file
Original file line number Diff line number Diff line change
@@ -1,4 +0,0 @@
Warning: Teleporting vehicle 'f_0.3'; waited too long (jam), lane='E0_0', time=547.00.
Warning: Vehicle 'f_0.3' teleports beyond arrival edge 'E0', time=547.00.
Warning: Vehicle 'f_0.3' skips stop on lane 'E0_0' time=547.00.
Warning: Vehicle 'f_0.3' skips stop on lane 'E0_0' time=547.00.
8 changes: 4 additions & 4 deletions tests/sumo/bugs/6xxx/ticket6283/stopinfos.sumo
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-04-11 10:27:16 by Eclipse SUMO sumo Version v1_19_0+1774-c2740415b91
<!-- generated on 2025-01-07 12:37:18 by Eclipse SUMO sumo Version v1_21_0+1707-e20019a517b
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,12 +34,12 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<no-step-log value="true"/>
</report>
</configuration>
</sumoConfiguration>
-->

<stops xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/stopinfo_file.xsd">
<stopinfo id="veh.0" type="DEFAULT_VEHTYPE" lane="gneE0_0" pos="80.56" parking="1" started="13.00" ended="73.00" parkingArea="p2" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="veh.1" type="DEFAULT_VEHTYPE" lane="gneE0_0" pos="80.56" parking="1" started="73.00" ended="133.00" parkingArea="p2" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="veh.1" type="DEFAULT_VEHTYPE" lane="gneE0_0" pos="80.56" parking="1" started="79.00" ended="139.00" parkingArea="p2" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="veh.0" type="DEFAULT_VEHTYPE" lane="gneE1_0" pos="22.89" parking="1" started="82.00" ended="142.00" parkingArea="p3" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="veh.1" type="DEFAULT_VEHTYPE" lane="gneE1_0" pos="22.89" parking="1" started="149.00" ended="209.00" parkingArea="p3" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
</stops>
Loading

0 comments on commit cd4bcfc

Please sign in to comment.