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 8, 2025
1 parent 534e5b0 commit df89c55
Show file tree
Hide file tree
Showing 5 changed files with 87 additions and 151 deletions.
76 changes: 6 additions & 70 deletions tests/sumo/bugs/15xxx/ticket15757_parkingArea/errors.sumo
View file
Original file line number Diff line number Diff line change
@@ -1,70 +1,6 @@
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=1090.00.
Warning: Vehicle 'f_0.6' teleports beyond arrival edge 'E0', time=1090.00.
Warning: Vehicle 'f_0.6' skips stop on lane 'E0_0' time=1090.00.
Warning: Teleporting vehicle 'f_0.30'; waited too long (jam), lane='E0_0', time=1434.00.
Warning: Vehicle 'f_0.30' teleports beyond arrival edge 'E0', time=1434.00.
Warning: Vehicle 'f_0.30' skips stop on lane 'E0_0' time=1434.00.
Warning: Vehicle 'f_0.30' skips stop on lane 'E0_0' time=1434.00.
Warning: Teleporting vehicle 'f_0.44'; waited too long (jam), lane='E1_1', time=1484.00.
Warning: Vehicle 'f_0.44' ends teleporting on edge 'E0', time=1484.00.
Warning: Teleporting vehicle 'f_0.32'; waited too long (jam), lane='E0_0', time=1845.00.
Warning: Vehicle 'f_0.32' teleports beyond arrival edge 'E0', time=1845.00.
Warning: Vehicle 'f_0.32' skips stop on lane 'E0_0' time=1845.00.
Warning: Vehicle 'f_0.32' skips stop on lane 'E0_0' time=1845.00.
Warning: Teleporting vehicle 'f_0.14'; waited too long (jam), lane='E0_0', time=2255.00.
Warning: Vehicle 'f_0.14' teleports beyond arrival edge 'E0', time=2255.00.
Warning: Vehicle 'f_0.14' skips stop on lane 'E0_0' time=2255.00.
Warning: Vehicle 'f_0.14' skips stop on lane 'E0_0' time=2255.00.
Warning: Teleporting vehicle 'f_0.16'; waited too long (jam), lane='E0_0', time=2774.00.
Warning: Vehicle 'f_0.16' teleports beyond arrival edge 'E0', time=2774.00.
Warning: Vehicle 'f_0.16' skips stop on lane 'E0_0' time=2774.00.
Warning: Vehicle 'f_0.16' skips stop on lane 'E0_0' time=2774.00.
Warning: Teleporting vehicle 'f_0.26'; waited too long (jam), lane='E1_0', time=2809.00.
Warning: Vehicle 'f_0.26' ends teleporting on edge 'E0', time=2809.00.
Warning: Teleporting vehicle 'f_0.55'; waited too long (jam), lane='E1_1', time=2811.00.
Warning: Vehicle 'f_0.55' ends teleporting on edge 'E0', time=2811.00.
Warning: Teleporting vehicle 'f_0.17'; waited too long (jam), lane='E0_0', time=3186.00.
Warning: Vehicle 'f_0.17' teleports beyond arrival edge 'E0', time=3186.00.
Warning: Vehicle 'f_0.17' skips stop on lane 'E0_0' time=3186.00.
Warning: Vehicle 'f_0.17' skips stop on lane 'E0_0' time=3186.00.
Warning: Teleporting vehicle 'f_0.55'; waited too long (jam), lane='E0_0', time=3595.00.
Warning: Vehicle 'f_0.55' teleports beyond arrival edge 'E0', time=3595.00.
Warning: Vehicle 'f_0.55' skips stop on lane 'E0_0' time=3595.00.
Warning: Vehicle 'f_0.55' skips stop on lane 'E0_0' time=3595.00.
Warning: Teleporting vehicle 'f_0.42'; waited too long (wrong lane), lane='E0_1', time=3596.00.
Warning: Vehicle 'f_0.42' teleports beyond arrival edge 'E0', time=3596.00.
Warning: Vehicle 'f_0.42' skips stop on lane 'E0_0' time=3596.00.
Warning: Vehicle 'f_0.42' skips stop on lane 'E0_0' time=3596.00.
Warning: Teleporting vehicle 'f_0.46'; waited too long (jam), lane='E0_0', time=4114.00.
Warning: Vehicle 'f_0.46' teleports beyond arrival edge 'E0', time=4114.00.
Warning: Vehicle 'f_0.46' skips stop on lane 'E0_0' time=4114.00.
Warning: Vehicle 'f_0.46' skips stop on lane 'E0_0' time=4114.00.
Warning: Teleporting vehicle 'f_0.51'; waited too long (jam), lane='E1_0', time=4144.00.
Warning: Vehicle 'f_0.51' ends teleporting on edge 'E0', time=4144.00.
Warning: Teleporting vehicle 'f_0.47'; waited too long (jam), lane='E0_0', time=4525.00.
Warning: Vehicle 'f_0.47' teleports beyond arrival edge 'E0', time=4525.00.
Warning: Vehicle 'f_0.47' skips stop on lane 'E0_0' time=4525.00.
Warning: Vehicle 'f_0.47' skips stop on lane 'E0_0' time=4525.00.
Warning: Teleporting vehicle 'f_0.51'; waited too long (jam), lane='E0_0', time=4548.00.
Warning: Vehicle 'f_0.51' teleports beyond arrival edge 'E0', time=4548.00.
Warning: Vehicle 'f_0.51' skips stop on lane 'E0_0' time=4548.00.
Warning: Vehicle 'f_0.51' skips stop on lane 'E0_0' time=4548.00.
Warning: Teleporting vehicle 'f_0.52'; waited too long (jam), lane='E0_0', time=5090.00.
Warning: Vehicle 'f_0.52' teleports beyond arrival edge 'E0', time=5090.00.
Warning: Vehicle 'f_0.52' skips stop on lane 'E0_0' time=5090.00.
Warning: Teleporting vehicle 'f_0.57'; waited too long (jam), lane='E0_0', time=5505.00.
Warning: Vehicle 'f_0.57' teleports beyond arrival edge 'E0', time=5505.00.
Warning: Vehicle 'f_0.57' skips stop on lane 'E0_0' time=5505.00.
Warning: Vehicle 'f_0.57' skips stop on lane 'E0_0' time=5505.00.
Warning: Teleporting vehicle 'f_0.60'; waited too long (jam), lane='E0_0', time=6026.00.
Warning: Vehicle 'f_0.60' teleports beyond arrival edge 'E0', time=6026.00.
Warning: Vehicle 'f_0.60' skips stop on lane 'E0_0' time=6026.00.
Warning: Vehicle 'f_0.60' skips stop on lane 'E0_0' time=6026.00.
Warning: Teleporting vehicle 'f_0.68'; waited too long (jam), lane='E0_0', time=6436.00.
Warning: Vehicle 'f_0.68' teleports beyond arrival edge 'E0', time=6436.00.
Warning: Vehicle 'f_0.68' skips stop on lane 'E0_0' time=6436.00.
Warning: Vehicle 'f_0.68' skips stop on lane 'E0_0' time=6436.00.
Warning: Teleporting vehicle 'f_0.27'; waited too long (jam), lane='E0_0', time=777.00.
Warning: Vehicle 'f_0.27' teleports beyond arrival edge 'E0', time=777.00.
Warning: Vehicle 'f_0.27' skips stop on lane 'E0_0' time=777.00.
Warning: Vehicle 'f_0.27' skips stop on lane 'E0_0' time=777.00.
Warning: Teleporting vehicle 'f_0.19'; waited too long (jam), lane='E1_0', time=785.00.
Warning: Vehicle 'f_0.19' ends teleporting on edge 'E0', time=785.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.
26 changes: 15 additions & 11 deletions tests/sumo/bugs/8xxx/ticket8404/tripinfos.sumo
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2022-01-20 14:45:36 by Eclipse SUMO sumo Version v1_11_0+1329-95d2bce
<!-- generated on 2025-01-08 09:54:17 by Eclipse SUMO sumo Version v1_21_0+1713-6bafd5359a0
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
http://www.eclipse.org/legal/epl-v20.html
SPDX-License-Identifier: EPL-2.0
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
This file may also be made available under the following Secondary
Licenses when the conditions for such availability set forth in the Eclipse
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
<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 @@ -25,19 +30,18 @@ SPDX-License-Identifier: EPL-2.0
<report>
<xml-validation value="never"/>
<xml-validation.routes value="never"/>
<duration-log.disable value="true"/>
<no-step-log value="true"/>
</report>
</configuration>
</sumoConfiguration>
-->

<tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
<tripinfo id="vehicle_1" depart="0.00" departLane="gneE0_0" departPos="6.60" departSpeed="0.00" departDelay="0.00" arrival="222.00" arrivalLane="gneE2_0" arrivalPos="26.80" arrivalSpeed="11.57" duration="222.00" routeLength="72.16" waitingTime="1.00" waitingCount="1" stopTime="200.00" timeLoss="15.71" rerouteNo="1" devices="tripinfo_vehicle_1 routing_vehicle_1" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
<tripinfo id="vehicle_2" depart="5.00" departLane="gneE0_0" departPos="6.60" departSpeed="0.00" departDelay="5.00" arrival="247.00" arrivalLane="gneE2_0" arrivalPos="26.80" arrivalSpeed="10.05" duration="242.00" routeLength="72.16" waitingTime="1.00" waitingCount="1" stopTime="220.00" timeLoss="15.24" rerouteNo="1" devices="tripinfo_vehicle_2 routing_vehicle_2" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
<tripinfo id="vehicle_3" depart="8.00" departLane="gneE0_0" departPos="6.60" departSpeed="0.00" departDelay="8.00" arrival="273.00" arrivalLane="gneE2_0" arrivalPos="26.80" arrivalSpeed="10.76" duration="265.00" routeLength="72.16" waitingTime="1.00" waitingCount="1" stopTime="240.00" timeLoss="18.52" rerouteNo="1" devices="tripinfo_vehicle_3 routing_vehicle_3" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
<tripinfo id="vehicle_4" depart="13.00" departLane="gneE0_0" departPos="6.60" departSpeed="0.00" departDelay="13.00" arrival="295.00" arrivalLane="gneE2_0" arrivalPos="26.80" arrivalSpeed="9.53" duration="282.00" routeLength="72.16" waitingTime="0.00" waitingCount="0" stopTime="260.00" timeLoss="15.74" rerouteNo="1" devices="tripinfo_vehicle_4 routing_vehicle_4" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
<tripinfo id="vehicle_6" depart="22.00" departLane="gneE0_0" departPos="6.60" departSpeed="0.00" departDelay="22.00" arrival="341.00" arrivalLane="gneE2_0" arrivalPos="26.80" arrivalSpeed="11.31" duration="319.00" routeLength="72.16" waitingTime="1.00" waitingCount="1" stopTime="300.00" timeLoss="12.20" rerouteNo="1" devices="tripinfo_vehicle_6 routing_vehicle_6" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
<tripinfo id="vehicle_5" depart="16.00" departLane="gneE0_0" departPos="6.60" departSpeed="0.00" departDelay="16.00" arrival="401.00" arrivalLane="gneE2_0" arrivalPos="26.80" arrivalSpeed="11.57" duration="385.00" routeLength="72.16" waitingTime="84.00" waitingCount="3" stopTime="280.00" timeLoss="98.16" rerouteNo="1" devices="tripinfo_vehicle_5 routing_vehicle_5" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
<tripinfo id="vehicle_1" depart="0.00" departLane="gneE0_0" departPos="6.60" departSpeed="0.00" departDelay="0.00" arrival="241.00" arrivalLane="gneE2_0" arrivalPos="26.80" arrivalSpeed="11.57" duration="241.00" routeLength="72.16" waitingTime="20.00" waitingCount="2" stopTime="218.00" timeLoss="16.77" rerouteNo="1" devices="tripinfo_vehicle_1 routing_vehicle_1" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
<tripinfo id="vehicle_2" depart="5.00" departLane="gneE0_0" departPos="6.60" departSpeed="0.00" departDelay="5.00" arrival="246.00" arrivalLane="gneE2_0" arrivalPos="26.80" arrivalSpeed="10.05" duration="241.00" routeLength="72.16" waitingTime="0.00" waitingCount="0" stopTime="220.00" timeLoss="14.87" rerouteNo="1" devices="tripinfo_vehicle_2 routing_vehicle_2" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
<tripinfo id="vehicle_3" depart="8.00" departLane="gneE0_0" departPos="6.60" departSpeed="0.00" departDelay="8.00" arrival="271.00" arrivalLane="gneE2_0" arrivalPos="26.80" arrivalSpeed="10.99" duration="263.00" routeLength="72.16" waitingTime="1.00" waitingCount="1" stopTime="240.00" timeLoss="17.31" rerouteNo="1" devices="tripinfo_vehicle_3 routing_vehicle_3" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
<tripinfo id="vehicle_4" depart="13.00" departLane="gneE0_0" departPos="6.60" departSpeed="0.00" departDelay="13.00" arrival="294.00" arrivalLane="gneE2_0" arrivalPos="26.80" arrivalSpeed="10.04" duration="281.00" routeLength="72.16" waitingTime="0.00" waitingCount="0" stopTime="260.00" timeLoss="14.94" rerouteNo="1" devices="tripinfo_vehicle_4 routing_vehicle_4" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
<tripinfo id="vehicle_5" depart="16.00" departLane="gneE0_0" departPos="6.60" departSpeed="0.00" departDelay="16.00" arrival="322.00" arrivalLane="gneE2_0" arrivalPos="26.80" arrivalSpeed="11.24" duration="306.00" routeLength="72.16" waitingTime="3.00" waitingCount="3" stopTime="280.00" timeLoss="18.83" rerouteNo="1" devices="tripinfo_vehicle_5 routing_vehicle_5" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
<tripinfo id="vehicle_6" depart="22.00" departLane="gneE0_0" departPos="6.60" departSpeed="0.00" departDelay="22.00" arrival="437.00" arrivalLane="gneE2_0" arrivalPos="26.80" arrivalSpeed="11.60" duration="415.00" routeLength="72.16" waitingTime="98.00" waitingCount="1" stopTime="300.00" timeLoss="108.79" rerouteNo="1" devices="tripinfo_vehicle_6 routing_vehicle_6" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
</tripinfos>
30 changes: 15 additions & 15 deletions tests/sumo/extended/rerouter/parking/congestion_alternatives/output.sumo
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
Loading net-file from 'net.net.xml' ... done (0ms).
Loading additional-files from 'input_additional.add.xml' ... done (0ms).
Loading additional-files from 'input_additional.add.xml' ... done (1ms).
Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Simulation version v1_21_0+1557-fb9ec070d59 started with time: 0.00.
Simulation ended at time: 702.00.
Simulation version v1_21_0+1713-6bafd5359a0 started with time: 0.00.
Simulation ended at time: 677.00.
Reason: All vehicles have left the simulation.
Performance:
Duration: 0.03s
Real time factor: 22645.2
UPS: 608806.451613
Duration: 0.02s
Real time factor: 45133.3
UPS: 1253200.000000
Vehicles:
Inserted: 50
Running: 0
Waiting: 0
Statistics (avg of 50):
RouteLength: 737.23
Speed: 1.97
Duration: 377.46
WaitingTime: 47.08
TimeLoss: 105.38
RouteLength: 726.38
Speed: 1.96
Duration: 375.96
WaitingTime: 46.42
TimeLoss: 107.28
DepartDelay: 0.40
DijkstraRouter answered 410 queries and explored 3.99 edges on average.
DijkstraRouter answered 392 queries and explored 3.99 edges on average.
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
DijkstraRouter answered 330 queries and explored 3.00 edges on average.
DijkstraRouter answered 312 queries and explored 3.00 edges on average.
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
DijkstraRouter answered 258 queries and explored 3.33 edges on average.
DijkstraRouter answered 240 queries and explored 3.33 edges on average.
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
DijkstraRouter answered 186 queries and explored 3.67 edges on average.
DijkstraRouter answered 168 queries and explored 3.67 edges on average.
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
DijkstraRouter answered 100 queries and explored 2.00 edges on average.
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
Loading

0 comments on commit df89c55

Please sign in to comment.