Skip to content

Commit

Permalink
patching expected results refs #21, #15972
Browse files Browse the repository at this point in the history
  • Loading branch information
@namdre
namdre committed Jan 6, 2025
1 parent 1ea6ffe commit a1068c5
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 62 deletions.
8 changes: 4 additions & 4 deletions tests/sumo/bugs/15xxx/ticket15757b/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-06 17:03:57 by Eclipse SUMO sumo Version v1_21_0+1684-07c849faa0a
<!-- generated on 2025-01-06 17:52:07 by Eclipse SUMO sumo Version v1_21_0+1691-39ca16d960a
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 @@ -37,8 +37,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="6761.00" id="DEFAULT_EDGEDATA">
<edge id="E0" sampledSeconds="125373.97" traveltime="1808.39" overlapTraveltime="1836.31" density="92.72" laneDensity="46.36" occupancy="32.13" waitingTime="116767.00" timeLoss="124216.20" speed="0.11" speedRelative="0.01" departed="0" arrived="69" entered="217" left="148" laneChangedFrom="45" laneChangedTo="54" teleported="8"/>
<edge id="E1" sampledSeconds="64175.61" traveltime="744.41" overlapTraveltime="849.86" density="94.92" laneDensity="47.46" occupancy="30.83" waitingTime="59391.00" timeLoss="63593.35" speed="0.13" speedRelative="0.01" departed="77" arrived="0" entered="0" left="77" laneChangedFrom="18" laneChangedTo="18" teleported="12"/>
<interval begin="0.00" end="7339.00" id="DEFAULT_EDGEDATA">
<edge id="E0" sampledSeconds="136766.41" traveltime="1823.95" overlapTraveltime="1848.48" density="93.18" laneDensity="46.59" occupancy="32.35" waitingTime="124743.23" timeLoss="135515.53" speed="0.11" speedRelative="0.01" departed="0" arrived="74" entered="225" left="151" laneChangedFrom="35" laneChangedTo="35" teleported="3"/>
<edge id="E1" sampledSeconds="79498.96" traveltime="928.76" overlapTraveltime="1034.02" density="108.32" laneDensity="54.16" occupancy="34.87" waitingTime="73613.85" timeLoss="78906.15" speed="0.10" speedRelative="0.01" departed="77" arrived="0" entered="0" left="77" laneChangedFrom="18" laneChangedTo="18" teleported="1"/>
</interval>
</meandata>
64 changes: 12 additions & 52 deletions tests/sumo/bugs/15xxx/ticket15757b/errors.sumo
View file
Original file line number Diff line number Diff line change
@@ -1,54 +1,14 @@
Warning: Teleporting vehicle 'f_0.25'; waited too long (jam), lane='E1_0', time=1807.00.
Warning: Vehicle 'f_0.25' skips stop on lane 'E0_0' time=1807.00.
Warning: Vehicle 'f_0.25' ends teleporting on edge 'E0', time=1807.00.
Warning: Teleporting vehicle 'f_0.26'; waited too long (jam), lane='E1_0', time=2113.00.
Warning: Vehicle 'f_0.26' ends teleporting on edge 'E0', time=2113.00.
Warning: Teleporting vehicle 'f_0.38'; waited too long (jam), lane='E0_0', time=2592.00.
Warning: Vehicle 'f_0.38' teleports beyond arrival edge 'E0', time=2592.00.
Warning: Vehicle 'f_0.38' skips stop on lane 'E0_0' time=2592.00.
Warning: Teleporting vehicle 'f_0.30'; waited too long (jam), lane='E1_0', time=2614.00.
Warning: Vehicle 'f_0.30' ends teleporting on edge 'E0', time=2614.00.
Warning: Teleporting vehicle 'f_0.46'; waited too long (jam), lane='E0_0', time=2905.00.
Warning: Vehicle 'f_0.46' teleports beyond arrival edge 'E0', time=2905.00.
Warning: Vehicle 'f_0.46' skips stop on lane 'E0_0' time=2905.00.
Warning: Teleporting vehicle 'f_0.56'; waited too long (wrong lane), lane='E0_1', time=2907.00.
Warning: Vehicle 'f_0.56' teleports beyond arrival edge 'E0', time=2907.00.
Warning: Vehicle 'f_0.56' skips stop on lane 'E0_0' time=2907.00.
Warning: Vehicle 'f_0.56' skips stop on lane 'E0_0' time=2907.00.
Warning: Teleporting vehicle 'f_0.58'; waited too long (wrong lane), lane='E0_1', time=2909.00.
Warning: Vehicle 'f_0.58' teleports beyond arrival edge 'E0', time=2909.00.
Warning: Vehicle 'f_0.58' skips stop on lane 'E0_0' time=2909.00.
Warning: Vehicle 'f_0.58' skips stop on lane 'E0_0' time=2909.00.
Warning: Teleporting vehicle 'f_0.73'; waited too long (jam), lane='E1_0', time=2919.00.
Warning: Vehicle 'f_0.73' ends teleporting on edge 'E0', time=2919.00.
Warning: Teleporting vehicle 'f_0.31'; waited too long (jam), lane='E1_0', time=3226.00.
Warning: Vehicle 'f_0.31' ends teleporting on edge 'E0', time=3226.00.
Warning: Teleporting vehicle 'f_0.57'; waited too long (wrong lane), lane='E0_1', time=3513.00.
Warning: Vehicle 'f_0.57' teleports beyond arrival edge 'E0', time=3513.00.
Warning: Vehicle 'f_0.57' skips stop on lane 'E0_0' time=3513.00.
Warning: Vehicle 'f_0.57' skips stop on lane 'E0_0' time=3513.00.
Warning: Teleporting vehicle 'f_0.40'; waited too long (jam), lane='E1_0', time=3535.00.
Warning: Vehicle 'f_0.40' ends teleporting on edge 'E0', time=3535.00.
Warning: Teleporting vehicle 'f_0.53'; waited too long (jam), lane='E1_0', time=3846.00.
Warning: Vehicle 'f_0.53' ends teleporting on edge 'E0', time=3846.00.
Warning: Teleporting vehicle 'f_0.54'; waited too long (jam), lane='E1_0', time=4153.00.
Warning: Vehicle 'f_0.54' ends teleporting on edge 'E0', time=4153.00.
Warning: Teleporting vehicle 'f_0.69'; waited too long (wrong lane), lane='E0_1', time=4387.00.
Warning: Vehicle 'f_0.69' teleports beyond arrival edge 'E0', time=4387.00.
Warning: Vehicle 'f_0.69' skips stop on lane 'E0_0' time=4387.00.
Warning: Vehicle 'f_0.69' skips stop on lane 'E0_0' time=4387.00.
Warning: Teleporting vehicle 'f_0.75'; waited too long (wrong lane), lane='E0_1', time=4388.00.
Warning: Vehicle 'f_0.75' teleports beyond arrival edge 'E0', time=4388.00.
Warning: Vehicle 'f_0.75' skips stop on lane 'E0_0' time=4388.00.
Warning: Vehicle 'f_0.75' skips stop on lane 'E0_0' time=4388.00.
Warning: Teleporting vehicle 'f_0.55'; waited too long (jam), lane='E1_0', time=4460.00.
Warning: Vehicle 'f_0.55' ends teleporting on edge 'E0', time=4460.00.
Warning: Teleporting vehicle 'f_0.59'; waited too long (jam), lane='E1_0', time=4766.00.
Warning: Vehicle 'f_0.59' ends teleporting on edge 'E0', time=4766.00.
Warning: Teleporting vehicle 'f_0.62'; waited too long (jam), lane='E1_0', time=5072.00.
Warning: Vehicle 'f_0.62' ends teleporting on edge 'E0', time=5072.00.
Warning: Teleporting vehicle 'f_0.64'; waited too long (jam), lane='E1_0', time=5379.00.
Warning: Vehicle 'f_0.64' ends teleporting on edge 'E0', time=5379.00.
Warning: Teleporting vehicle 'f_0.14'; waited too long (jam), lane='E0_0', time=5618.00.
Warning: Vehicle 'f_0.14' teleports beyond arrival edge 'E0', time=5618.00.
Warning: Vehicle 'f_0.14' skips stop on lane 'E0_0' time=5618.00.
Warning: Vehicle 'f_0.14' skips stop on lane 'E0_0' time=5618.00.
Warning: Teleporting vehicle 'f_0.13'; waited too long (jam), lane='E0_0', time=1976.00.
Warning: Vehicle 'f_0.13' teleports beyond arrival edge 'E0', time=1976.00.
Warning: Vehicle 'f_0.13' skips stop on lane 'E0_0' time=1976.00.
Warning: Teleporting vehicle 'f_0.52'; waited too long (jam), lane='E0_0', time=4509.00.
Warning: Vehicle 'f_0.52' teleports beyond arrival edge 'E0', time=4509.00.
Warning: Vehicle 'f_0.52' skips stop on lane 'E0_0' time=4509.00.
Warning: Vehicle 'f_0.52' skips stop on lane 'E0_0' time=4509.00.
Warning: Teleporting vehicle 'f_0.61'; waited too long (jam), lane='E0_0', time=5814.00.
Warning: Vehicle 'f_0.61' teleports beyond arrival edge 'E0', time=5814.00.
Warning: Vehicle 'f_0.61' skips stop on lane 'E0_0' time=5814.00.
Warning: Vehicle 'f_0.61' skips stop on lane 'E0_0' time=5814.00.
1 change: 1 addition & 0 deletions tests/sumo/bugs/15xxx/ticket15972/errors.sumo
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
Warning: Teleporting vehicle 'ego'; waited too long (jam), lane='E1_0', time=325.00.
Warning: Vehicle 'ego' skips stop on lane 'E0_0' time=325.00.
Warning: Vehicle 'ego' ends teleporting on edge 'E0', time=325.00.
3 changes: 1 addition & 2 deletions tests/sumo/bugs/15xxx/ticket15972/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 2025-01-06 17:41:31 by Eclipse SUMO sumo Version v1_21_0+1690-0433f82c0c5
<!-- generated on 2025-01-06 17:52:07 by Eclipse SUMO sumo Version v1_21_0+1691-39ca16d960a
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 @@ -37,6 +37,5 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-->

<stops xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/stopinfo_file.xsd">
<stopinfo id="ego" type="DEFAULT_VEHTYPE" lane="E0_0" pos="188.59" parking="0" started="326.00" ended="336.00" busStop="bs_0" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="blocker" type="long" lane="E0_0" pos="180.99" parking="0" started="21.00" ended="421.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
</stops>
1 change: 1 addition & 0 deletions tests/sumo/rail/reversal/reverse_at_route_end_impossible/errors.sumo
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
Warning: Teleporting vehicle 'light_rail_S46:0.0'; waited too long (jam), lane='branch_0', time=363.00.
Warning: Vehicle 'light_rail_S46:0.0' skips stop on lane '-branch_0' time=363.00.
Warning: Vehicle 'light_rail_S46:0.0' ends teleporting on edge '-branch', time=363.00.
8 changes: 4 additions & 4 deletions tests/sumo/rail/reversal/reverse_at_route_end_impossible/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:13 by Eclipse SUMO sumo Version v1_19_0+1774-c2740415b91
<!-- generated on 2025-01-06 17:51:58 by Eclipse SUMO sumo Version v1_21_0+1691-39ca16d960a
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 @@ -30,6 +30,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
</time>
<processing>
<time-to-teleport.railsignal-deadlock value="200"/>
<default.speeddev value="0"/>
</processing>
Expand All @@ -39,10 +40,9 @@ 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="light_rail_S46:0.0" type="light_rail" lane="beg_0" pos="80.00" parking="0" started="1.00" ended="32.00" delay="0.00" busStop="stopBeg" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="light_rail_S46:0.0" type="light_rail" lane="-branch_0" pos="100.00" parking="0" started="364.00" ended="394.00" delay="301.00" busStop="-stopBranch" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
</stops>

0 comments on commit a1068c5

Please sign in to comment.