Skip to content

Commit

Permalink
patching expected results refs #21, #11642
Browse files Browse the repository at this point in the history
  • Loading branch information
namdre committed Jun 16, 2023
1 parent 9ad60f6 commit 26aa178
Show file tree
Hide file tree
Showing 9 changed files with 1,104 additions and 1,198 deletions.
14 changes: 1 addition & 13 deletions tests/sumo/extended/bidiEdge/TWLT_end/errors.sumo
@@ -1,13 +1 @@
Warning: Teleporting vehicle 'v.82'; waited too long (yield), lane=':J2_7_0', time=805.00.
Warning: Vehicle 'v.82' ends teleporting on edge 'E4', time=805.00.
Warning: Vehicle 'v.88'; junction collision with vehicle 't.9', lane=':J1_6_1', gap=-1.00, time=815.00 stage=move.
Warning: Teleporting vehicle 't.11'; waited too long (jam), lane='-E2_1', time=827.00.
Warning: Vehicle 't.11' teleports beyond arrival edge '-E0', time=839.00.
Warning: Teleporting vehicle 'v.83'; waited too long (yield), lane=':J2_7_0', time=1111.00.
Warning: Vehicle 'v.83' ends teleporting on edge 'E4', time=1111.00.
Warning: Teleporting vehicle 't.9'; waited too long (jam), lane=':J1_0_1', time=1115.00.
Warning: Teleporting vehicle 'v.89'; waited too long (jam), lane='E0_1', time=1117.00.
Warning: Vehicle 'v.89' teleports beyond arrival edge 'E4', time=1131.00.
Warning: Teleporting vehicle 't.12'; waited too long (jam), lane='-E2_1', time=1132.00.
Warning: Vehicle 't.9' ends teleporting on edge '-E0', time=1144.00.
Warning: Vehicle 't.12' teleports beyond arrival edge '-E0', time=1144.00.
Warning: Vehicle 'v.93'; junction collision with vehicle 't.11', lane=':J1_6_1', gap=-1.00, time=538.00 stage=laneChange.
12 changes: 6 additions & 6 deletions tests/sumo/extended/bidiEdge/TWLT_end/output.sumo
@@ -1,15 +1,15 @@
Loading net-file from 'net.net.xml' ... done (3ms).
Loading done.
Simulation version v1_17_0+0919-6a4cbca started with time: 0.00.
Simulation ended at time: 1239.00
Simulation version v1_17_0+0967-5755c26 started with time: 0.00.
Simulation ended at time: 915.00
Reason: All vehicles have left the simulation.
Performance:
Duration: 0.17s
Real time factor: 7509.09
UPS: 92139.393939
Duration: 0.04s
Real time factor: 24729.7
UPS: 77945.945946
Vehicles:
Inserted: 120
Running: 0
Waiting: 0
Teleports: 6 (Collisions: 1, Jam: 4, Yield: 2)
Teleports: 0 (Collisions: 1)

8 changes: 4 additions & 4 deletions tests/sumo/extended/bidiEdge/TWLT_side2/output.sumo
@@ -1,12 +1,12 @@
Loading net-file from 'net.net.xml' ... done (2ms).
Loading done.
Simulation version v1_17_0+0953-02ef852 started with time: 0.00.
Simulation ended at time: 97.00
Simulation version v1_17_0+0967-5755c26 started with time: 0.00.
Simulation ended at time: 96.00
Reason: All vehicles have left the simulation.
Performance:
Duration: 0.00s
Real time factor: 24250
UPS: 86250.000000
Real time factor: 24000
UPS: 85500.000000
Vehicles:
Inserted: 8
Running: 0
Expand Down
10 changes: 5 additions & 5 deletions tests/sumo/extended/bidiEdge/TWLT_side2/tripinfos.sumo
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-06-15 13:32:16 by Eclipse SUMO sumo Version v1_17_0+0953-02ef852
<!-- generated on 2023-06-16 10:27:17 by Eclipse SUMO sumo Version v1_17_0+0967-5755c26
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 @@ -43,8 +43,8 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<tripinfo id="main.1" depart="6.00" departLane="E0_0" departPos="20.00" departSpeed="13.89" departDelay="0.00" arrival="22.00" arrivalLane="E4_0" arrivalPos="41.20" arrivalSpeed="13.51" duration="16.00" routeLength="178.20" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="1.85" rerouteNo="0" devices="tripinfo_main.1" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
<tripinfo id="main.2" depart="9.00" departLane="E0_0" departPos="20.00" departSpeed="13.89" departDelay="0.00" arrival="25.00" arrivalLane="E4_0" arrivalPos="41.20" arrivalSpeed="13.09" duration="16.00" routeLength="178.20" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="2.42" rerouteNo="0" devices="tripinfo_main.2" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
<tripinfo id="main.3" depart="12.00" departLane="E0_0" departPos="20.00" departSpeed="13.89" departDelay="0.00" arrival="28.00" arrivalLane="E4_0" arrivalPos="41.20" arrivalSpeed="13.03" duration="16.00" routeLength="178.20" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="2.40" rerouteNo="0" devices="tripinfo_main.3" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
<tripinfo id="side.0" depart="0.00" departLane="-E4_0" departPos="41.10" departSpeed="0.10" departDelay="0.00" arrival="65.00" arrivalLane="-E0_0" arrivalPos="142.80" arrivalSpeed="2.89" duration="65.00" routeLength="154.63" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="14.58" rerouteNo="0" devices="tripinfo_side.0" vType="t0" speedFactor="1.00" vaporized=""/>
<tripinfo id="side.1" depart="3.00" departLane="-E4_0" departPos="41.10" departSpeed="0.10" departDelay="0.00" arrival="89.00" arrivalLane="-E0_0" arrivalPos="142.80" arrivalSpeed="2.98" duration="86.00" routeLength="154.63" waitingTime="21.00" waitingCount="1" stopTime="0.00" timeLoss="35.61" rerouteNo="0" devices="tripinfo_side.1" vType="t0" speedFactor="1.00" vaporized=""/>
<tripinfo id="side.2" depart="27.00" departLane="-E4_0" departPos="41.10" departSpeed="0.10" departDelay="21.00" arrival="92.00" arrivalLane="-E0_1" arrivalPos="142.80" arrivalSpeed="1.82" duration="65.00" routeLength="154.63" waitingTime="1.00" waitingCount="1" stopTime="0.00" timeLoss="14.88" rerouteNo="0" devices="tripinfo_side.2" vType="t0" speedFactor="1.00" vaporized=""/>
<tripinfo id="side.3" depart="31.00" departLane="-E4_0" departPos="41.10" departSpeed="0.10" departDelay="22.00" arrival="96.00" arrivalLane="-E0_0" arrivalPos="142.80" arrivalSpeed="2.99" duration="65.00" routeLength="154.63" waitingTime="1.00" waitingCount="1" stopTime="0.00" timeLoss="14.73" rerouteNo="0" devices="tripinfo_side.3" vType="t0" speedFactor="1.00" vaporized=""/>
<tripinfo id="side.0" depart="0.00" departLane="-E4_0" departPos="41.10" departSpeed="0.10" departDelay="0.00" arrival="65.00" arrivalLane="-E0_0" arrivalPos="142.80" arrivalSpeed="2.52" duration="65.00" routeLength="154.63" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="14.38" rerouteNo="0" devices="tripinfo_side.0" vType="t0" speedFactor="1.00" vaporized=""/>
<tripinfo id="side.1" depart="3.00" departLane="-E4_0" departPos="41.10" departSpeed="0.10" departDelay="0.00" arrival="87.00" arrivalLane="-E0_0" arrivalPos="142.80" arrivalSpeed="2.98" duration="84.00" routeLength="154.63" waitingTime="20.00" waitingCount="1" stopTime="0.00" timeLoss="34.11" rerouteNo="0" devices="tripinfo_side.1" vType="t0" speedFactor="1.00" vaporized=""/>
<tripinfo id="side.2" depart="25.00" departLane="-E4_0" departPos="41.10" departSpeed="0.10" departDelay="19.00" arrival="89.00" arrivalLane="-E0_1" arrivalPos="142.80" arrivalSpeed="2.16" duration="64.00" routeLength="154.63" waitingTime="2.00" waitingCount="1" stopTime="0.00" timeLoss="14.04" rerouteNo="0" devices="tripinfo_side.2" vType="t0" speedFactor="1.00" vaporized=""/>
<tripinfo id="side.3" depart="30.00" departLane="-E4_0" departPos="41.10" departSpeed="0.10" departDelay="21.00" arrival="95.00" arrivalLane="-E0_0" arrivalPos="142.80" arrivalSpeed="2.94" duration="65.00" routeLength="154.63" waitingTime="1.00" waitingCount="1" stopTime="0.00" timeLoss="14.95" rerouteNo="0" devices="tripinfo_side.3" vType="t0" speedFactor="1.00" vaporized=""/>
</tripinfos>
20 changes: 10 additions & 10 deletions tests/sumo/junction_model/roundabout/small/output.sumo
@@ -1,21 +1,21 @@
Loading net-file from 'net.net.xml' ... done (3ms).
Loading done.
Simulation version v1_16_0+0850-438bb8b started with time: 0.00.
Simulation ended at time: 418.00
Simulation version v1_17_0+0967-5755c26 started with time: 0.00.
Simulation ended at time: 426.00
Reason: All vehicles have left the simulation.
Performance:
Duration: 0.13s
Real time factor: 3240.31
UPS: 158217.054264
Duration: 0.14s
Real time factor: 3132.35
UPS: 150125.000000
Vehicles:
Inserted: 217
Running: 0
Waiting: 0
Statistics (avg of 217):
RouteLength: 638.22
Speed: 7.69
Duration: 94.06
WaitingTime: 11.95
TimeLoss: 47.62
DepartDelay: 21.21
Speed: 7.65
Duration: 94.09
WaitingTime: 11.65
TimeLoss: 47.67
DepartDelay: 22.11

@@ -1,13 +1,13 @@
Loading net-file from 'net3.net.xml' ... done (2ms).
Loading net-file from 'net3.net.xml' ... done (8ms).
Loading done.
Simulation version v1_15_0+1721-da6a1b6 started with time: 0.00.
Simulation version v1_17_0+0967-5755c26 started with time: 0.00.
Simulation ended at time: 340.00
Reason: All vehicles have left the simulation.
Performance:
Duration: 0.07s
Real time factor: 4788.73
UPS: 20492.957746
UPS-Persons: 188929.577465
Duration: 0.08s
Real time factor: 4473.68
UPS: 19144.736842
UPS-Persons: 176500.000000
Vehicles:
Inserted: 43
Running: 0
Expand All @@ -20,12 +20,12 @@ Statistics (avg of 43):
Speed: 11.84
Duration: 16.92
WaitingTime: 0.95
TimeLoss: 2.53
TimeLoss: 2.52
DepartDelay: 0.00
Pedestrian Statistics (avg of 60 walks):
RouteLength: 61.88
Duration: 111.78
TimeLoss: 67.23

DijkstraRouter answered 8011 queries and explored 8.96 edges on average.
DijkstraRouter answered 8003 queries and explored 8.96 edges on average.
DijkstraRouter spent 0.01s answering queries (0.00ms on average).

0 comments on commit 26aa178

Please sign in to comment.