patching expected results. refs #21, #5205

tests/sumo/extended/rail/tramwayLoop/track_closed/errors.sumo

@@ -20,5 +20,3 @@ Warning: Teleporting vehicle 'tram6'; waited too long (yield), lane='T29_0_0', t
 Warning: Vehicle 'tram6' ends teleporting on edge 'T32_0', time 2588.00.
 Warning: Vehicle 'tram9' performs emergency stop at the end of lane 'T6_0_0' because of a red traffic light (decel=-4.81, offset=0.64), time=2590.00.
 Warning: Vehicle 'tram2' performs emergency stop at the end of lane 'T29_0_0' because of a red traffic light (decel=-3.84, offset=1.88), time=2637.00.
-Warning: Vehicle 'tram5' performs emergency stop at the end of lane 'TleftLoop_1_0' because there is no connection to the next edge (decel=-8.12, offset=6.84), time=2931.00.
-Warning: Vehicle 'tram6' stops on edge 'TleftLoop_1', time 3561.00 without ending the previous stop entered at time 3040.00

tests/sumo/extended/rail/tramwayLoop/track_closed/output.sumo

@@ -1,28 +1,28 @@
-Loading net-file from 'net.net.xml'... done (8ms).
+Loading net-file from 'net.net.xml'... done (27ms).
 Loading additional-files from 'input_additional.add.xml'... done (0ms).
-Loading additional-files from 'input_additional2.add.xml'... done (0ms).
+Loading additional-files from 'input_additional2.add.xml'... done (1ms).
 Loading done.
-Simulation version v1_0_1+0645-93703db started with time: 0.00
-Simulation ended at time: 4558.00
+Simulation version v1_1_0+0433-16c2ffa started with time: 0.00
+Simulation ended at time: 3970.00
 Reason: All vehicles have left the simulation.
 Performance: 
- Duration: 193ms
- Real time factor: 23616.6
- UPS: 143886.010363
+ Duration: 1134ms
+ Real time factor: 3500.88
+ UPS: 24346.560847
 Vehicles: 
  Inserted: 9
  Running: 0
  Waiting: 0
 Teleports: 3 (Yield: 3)
-Emergency Stops: 14
+Emergency Stops: 13
 Statistics (avg):
- RouteLength: 42296.54
- Duration: 3085.56
- WaitingTime: 529.22
- TimeLoss: 1727.75
+ RouteLength: 41707.93
+ Duration: 3067.67
+ WaitingTime: 531.22
+ TimeLoss: 1721.89
  DepartDelay: 0.67
 
-AStarRouter answered 224 queries and explored 4.97 edges on average.
-AStarRouter spent 0ms answering queries (0.00ms on average).
-DijkstraRouter answered 9153 queries and explored 24.94 edges on average.
-DijkstraRouter spent 19ms answering queries (0.00ms on average).
+AStarRouter answered 222 queries and explored 4.76 edges on average.
+AStarRouter spent 1ms answering queries (0.00ms on average).
+DijkstraRouter answered 9105 queries and explored 24.91 edges on average.
+DijkstraRouter spent 187ms answering queries (0.02ms on average).

tests/sumo/extended/rail/tramwayLoop/track_closed/stopinfos.sumo

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Thu Feb 21 14:17:58 2019 by Eclipse SUMO Version v1_0_1+0645-93703db
+<!-- generated on Thu Feb 21 14:37:04 2019 by Eclipse SUMO Version v1_1_0+0433-16c2ffa
 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
@@ -17,6 +17,7 @@ SPDX-License-Identifier: EPL-2.0
     <output>
         <write-license value="true"/>
         <tripinfo-output value="tripinfos.xml"/>
+        <vehroute-output value="vehroutes.xml"/>
         <railsignal-block-output value="railsignal_blocks.xml"/>
         <stop-output value="stopinfos.xml"/>
     </output>
@@ -67,11 +68,14 @@ SPDX-License-Identifier: EPL-2.0
     <stopinfo id="tram2" type="RB628" lane="TleftLoop_1_0" pos="400.00" parking="0" started="2329.00" ended="2350.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="leftStop"/>
     <stopinfo id="tram9" type="RB628" lane="TrightLoop_1_0" pos="400.00" parking="0" started="2679.00" ended="2700.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="rightStop"/>
     <stopinfo id="tram1" type="RB628" lane="TrightLoop_1_0" pos="400.00" parking="0" started="2854.00" ended="2875.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="rightStop"/>
+    <stopinfo id="tram5" type="RB628" lane="TleftLoop_1_0" pos="400.00" parking="0" started="2942.00" ended="2963.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="leftStop"/>
     <stopinfo id="tram4" type="RB628" lane="TrightLoop_1_0" pos="400.00" parking="0" started="2947.00" ended="2968.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="rightStop"/>
-    <stopinfo id="tram7" type="RB628" lane="TleftLoop_1_0" pos="351.50" parking="0" started="3040.00" ended="3061.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="leftStop"/>
-    <stopinfo id="tram2" type="RB628" lane="TrightLoop_1_0" pos="351.50" parking="0" started="3117.00" ended="3138.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="rightStop"/>
-    <stopinfo id="tram9" type="RB628" lane="TleftLoop_1_0" pos="351.50" parking="0" started="3248.00" ended="3269.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="leftStop"/>
-    <stopinfo id="tram1" type="RB628" lane="TleftLoop_1_0" pos="351.50" parking="0" started="3381.00" ended="3402.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="leftStop"/>
-    <stopinfo id="tram6" type="RB628" lane="TleftLoop_1_0" pos="351.50" parking="0" started="3561.00" ended="3582.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="leftStop"/>
-    <stopinfo id="tram2" type="RB628" lane="TleftLoop_1_0" pos="351.50" parking="0" started="4267.00" ended="4288.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="leftStop"/>
+    <stopinfo id="tram6" type="RB628" lane="TrightLoop_1_0" pos="400.00" parking="0" started="3040.00" ended="3061.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="rightStop"/>
+    <stopinfo id="tram7" type="RB628" lane="TleftLoop_1_0" pos="400.00" parking="0" started="3045.00" ended="3066.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="leftStop"/>
+    <stopinfo id="tram2" type="RB628" lane="TrightLoop_1_0" pos="400.00" parking="0" started="3132.00" ended="3153.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="rightStop"/>
+    <stopinfo id="tram9" type="RB628" lane="TleftLoop_1_0" pos="400.00" parking="0" started="3252.00" ended="3273.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="leftStop"/>
+    <stopinfo id="tram1" type="RB628" lane="TleftLoop_1_0" pos="400.00" parking="0" started="3385.00" ended="3406.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="leftStop"/>
+    <stopinfo id="tram4" type="RB628" lane="TleftLoop_1_0" pos="400.00" parking="0" started="3481.00" ended="3502.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="leftStop"/>
+    <stopinfo id="tram6" type="RB628" lane="TleftLoop_1_0" pos="400.00" parking="0" started="3574.00" ended="3595.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="leftStop"/>
+    <stopinfo id="tram2" type="RB628" lane="TleftLoop_1_0" pos="400.00" parking="0" started="3667.00" ended="3688.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="leftStop"/>
 </stops>

tests/sumo/extended/rail/tramwayLoop/track_closed/tripinfos.sumo

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Thu Feb 21 14:22:35 2019 by Eclipse SUMO Version v1_0_1+0645-93703db
+<!-- generated on Thu Feb 21 14:37:04 2019 by Eclipse SUMO Version v1_1_0+0433-16c2ffa
 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
@@ -44,11 +44,11 @@ SPDX-License-Identifier: EPL-2.0
 <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
     <tripinfo id="tram3" depart="10.00" departLane="TrightLoop_1_0" departPos="46.10" departSpeed="21.21" departDelay="0.00" arrival="703.00" arrivalLane="TleftLoop_1_0" arrivalPos="400.00" arrivalSpeed="16.02" duration="693.00" routeLength="10318.12" waitingTime="95.00" waitingCount="3" stopTime="0.00" timeLoss="382.01" rerouteNo="1" devices="vehroute_tram3 tripinfo_tram3 routing_tram3" vType="RB628" speedFactor="1.00" vaporized=""/>
     <tripinfo id="tram8" depart="210.00" departLane="Tdepot_1_0" departPos="46.10" departSpeed="9.68" departDelay="0.00" arrival="2446.00" arrivalLane="Tdepot_1_0" arrivalPos="150.00" arrivalSpeed="7.35" duration="2236.00" routeLength="31030.79" waitingTime="329.00" waitingCount="10" stopTime="63.00" timeLoss="1234.24" rerouteNo="5" devices="vehroute_tram8 tripinfo_tram8 routing_tram8" vType="RB628" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="tram5" depart="100.00" departLane="Tdepot_1_0" departPos="46.10" departSpeed="12.38" departDelay="0.00" arrival="3209.00" arrivalLane="Tdepot_1_0" arrivalPos="150.00" arrivalSpeed="7.35" duration="3109.00" routeLength="40292.86" waitingTime="664.00" waitingCount="11" stopTime="71.00" timeLoss="1809.84" rerouteNo="9" devices="vehroute_tram5 tripinfo_tram5 routing_tram5" vType="RB628" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="tram7" depart="200.00" departLane="Tdepot_1_0" departPos="46.10" departSpeed="12.38" departDelay="0.00" arrival="3330.00" arrivalLane="Tdepot_1_0" arrivalPos="150.00" arrivalSpeed="6.81" duration="3130.00" routeLength="40292.86" waitingTime="627.00" waitingCount="14" stopTime="84.00" timeLoss="1820.78" rerouteNo="9" devices="vehroute_tram7 tripinfo_tram7 routing_tram7" vType="RB628" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="tram4" depart="13.00" departLane="Tdepot_1_0" departPos="46.10" departSpeed="5.98" departDelay="2.00" arrival="3415.00" arrivalLane="T1_1_0" arrivalPos="400.00" arrivalSpeed="16.31" duration="3402.00" routeLength="45280.75" waitingTime="578.00" waitingCount="15" stopTime="84.00" timeLoss="1950.41" rerouteNo="10" devices="vehroute_tram4 tripinfo_tram4 routing_tram4" vType="RB628" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="tram9" depart="300.00" departLane="Tdepot_1_0" departPos="46.10" departSpeed="12.38" departDelay="0.00" arrival="3538.00" arrivalLane="Tdepot_1_0" arrivalPos="150.00" arrivalSpeed="6.81" duration="3238.00" routeLength="40292.86" waitingTime="694.00" waitingCount="13" stopTime="84.00" timeLoss="1929.46" rerouteNo="9" devices="vehroute_tram9 tripinfo_tram9 routing_tram9" vType="RB628" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="tram1" depart="1.00" departLane="Tdepot_1_0" departPos="46.10" departSpeed="12.45" departDelay="0.00" arrival="3671.00" arrivalLane="Tdepot_1_0" arrivalPos="150.00" arrivalSpeed="6.81" duration="3670.00" routeLength="50970.45" waitingTime="639.00" waitingCount="14" stopTime="105.00" timeLoss="2030.01" rerouteNo="9" devices="vehroute_tram1 tripinfo_tram1 routing_tram1" vType="RB628" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="tram6" depart="110.00" departLane="Tdepot_1_0" departPos="46.10" departSpeed="9.68" departDelay="0.00" arrival="3851.00" arrivalLane="Tdepot_1_0" arrivalPos="150.00" arrivalSpeed="6.81" duration="3741.00" routeLength="50970.45" waitingTime="744.00" waitingCount="13" stopTime="94.00" timeLoss="2122.73" rerouteNo="13" devices="vehroute_tram6 tripinfo_tram6 routing_tram6" vType="RB628" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="tram2" depart="6.00" departLane="Tdepot_1_0" departPos="46.10" departSpeed="9.76" departDelay="4.00" arrival="4557.00" arrivalLane="Tdepot_1_0" arrivalPos="150.00" arrivalSpeed="6.81" duration="4551.00" routeLength="71219.75" waitingTime="393.00" waitingCount="14" stopTime="126.00" timeLoss="2270.23" rerouteNo="10" devices="vehroute_tram2 tripinfo_tram2 routing_tram2" vType="RB628" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="tram5" depart="100.00" departLane="Tdepot_1_0" departPos="46.10" departSpeed="12.38" departDelay="0.00" arrival="3233.00" arrivalLane="Tdepot_1_0" arrivalPos="150.00" arrivalSpeed="7.35" duration="3133.00" routeLength="40292.86" waitingTime="664.00" waitingCount="11" stopTime="84.00" timeLoss="1821.05" rerouteNo="7" devices="vehroute_tram5 tripinfo_tram5 routing_tram5" vType="RB628" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="tram7" depart="200.00" departLane="Tdepot_1_0" departPos="46.10" departSpeed="12.38" departDelay="0.00" arrival="3338.00" arrivalLane="Tdepot_1_0" arrivalPos="150.00" arrivalSpeed="6.81" duration="3138.00" routeLength="40292.86" waitingTime="628.00" waitingCount="15" stopTime="84.00" timeLoss="1827.51" rerouteNo="9" devices="vehroute_tram7 tripinfo_tram7 routing_tram7" vType="RB628" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="tram9" depart="300.00" departLane="Tdepot_1_0" departPos="46.10" departSpeed="12.38" departDelay="0.00" arrival="3543.00" arrivalLane="Tdepot_1_0" arrivalPos="150.00" arrivalSpeed="7.35" duration="3243.00" routeLength="40292.86" waitingTime="695.00" waitingCount="14" stopTime="84.00" timeLoss="1932.93" rerouteNo="7" devices="vehroute_tram9 tripinfo_tram9 routing_tram9" vType="RB628" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="tram1" depart="1.00" departLane="Tdepot_1_0" departPos="46.10" departSpeed="12.45" departDelay="0.00" arrival="3676.00" arrivalLane="Tdepot_1_0" arrivalPos="150.00" arrivalSpeed="7.35" duration="3675.00" routeLength="50970.45" waitingTime="640.00" waitingCount="15" stopTime="105.00" timeLoss="2033.48" rerouteNo="7" devices="vehroute_tram1 tripinfo_tram1 routing_tram1" vType="RB628" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="tram4" depart="13.00" departLane="Tdepot_1_0" departPos="46.10" departSpeed="5.98" departDelay="2.00" arrival="3777.00" arrivalLane="Tdepot_1_0" arrivalPos="150.00" arrivalSpeed="6.81" duration="3764.00" routeLength="50970.45" waitingTime="581.00" waitingCount="17" stopTime="105.00" timeLoss="2119.94" rerouteNo="9" devices="vehroute_tram4 tripinfo_tram4 routing_tram4" vType="RB628" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="tram6" depart="110.00" departLane="Tdepot_1_0" departPos="46.10" departSpeed="9.68" departDelay="0.00" arrival="3874.00" arrivalLane="Tdepot_1_0" arrivalPos="150.00" arrivalSpeed="6.81" duration="3764.00" routeLength="50970.45" waitingTime="745.00" waitingCount="14" stopTime="105.00" timeLoss="2133.36" rerouteNo="13" devices="vehroute_tram6 tripinfo_tram6 routing_tram6" vType="RB628" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="tram2" depart="6.00" departLane="Tdepot_1_0" departPos="46.10" departSpeed="9.76" departDelay="4.00" arrival="3969.00" arrivalLane="Tdepot_1_0" arrivalPos="150.00" arrivalSpeed="6.81" duration="3963.00" routeLength="60232.52" waitingTime="404.00" waitingCount="15" stopTime="126.00" timeLoss="2012.47" rerouteNo="9" devices="vehroute_tram2 tripinfo_tram2 routing_tram2" vType="RB628" speedFactor="1.00" vaporized=""/>
 </tripinfos>