updating meso tests (less teleports are better, results closer to mic…

…ro), refs eclipse-sumo#21

tests/sumo/basic/person/ride_and_stop/tripinfos.sumo.meso

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Fri Apr 17 07:57:35 2020 by Eclipse SUMO Version v1_5_0+1182-c674b91ce6
+<!-- generated on Fri Oct 16 15:32:30 2020 by Eclipse SUMO sumo Version v1_7_0+0625-fbb42d88cd
 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
@@ -26,6 +26,7 @@ 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>
@@ -40,7 +41,7 @@ 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="v1" depart="0.00" departLane="" departPos="0.00" departSpeed="7.35" departDelay="0.00" arrival="102.00" arrivalLane="" arrivalPos="500.00" arrivalSpeed="27.80" duration="102.00" routeLength="2000.00" waitingTime="0.00" waitingCount="0" stopTime="30.00" timeLoss="30.00" rerouteNo="0" devices="tripinfo_v1 person_v1" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
     <personinfo id="p1" depart="0.00" type="DEFAULT_PEDTYPE">
-        <ride waitingTime="0.00" vehicle="v1" depart="0.00" arrival="42.00" arrivalPos="0.00" duration="42.00" routeLength="499.00" timeLoss="-0.00"/>
+        <ride waitingTime="0.00" vehicle="v1" depart="0.00" arrival="42.00" arrivalPos="0.00" duration="42.00" routeLength="500.00" timeLoss="0.00"/>
         <stop duration="100.00" arrival="142.00" arrivalPos="100.00" actType="waiting"/>
     </personinfo>
     <personinfo id="p2" depart="0.00" type="DEFAULT_PEDTYPE">
@@ -49,7 +50,7 @@ SPDX-License-Identifier: EPL-2.0
     </personinfo>
     <personinfo id="p3" depart="0.00" type="DEFAULT_PEDTYPE">
         <ride waitingTime="18.00" vehicle="v1" depart="18.00" arrival="42.00" arrivalPos="0.00" duration="24.00" routeLength="500.00" timeLoss="0.00"/>
-        <stop duration="100.00" arrival="142.00" arrivalPos="500.00" actType="waiting"/>
+        <stop duration="100.00" arrival="142.00" arrivalPos="105.00" actType="waiting"/>
     </personinfo>
     <personinfo id="p4" depart="0.00" type="DEFAULT_PEDTYPE">
         <ride waitingTime="18.00" vehicle="v1" depart="18.00" arrival="42.00" arrivalPos="0.00" duration="24.00" routeLength="500.00" timeLoss="0.00"/>

tests/sumo/basic/personFlow/ferry_trip/output.sumo.meso

@@ -0,0 +1,25 @@
+Loading net-file from 'net.net.xml' ... done (5ms).
+Loading additional-files from 'input_additional.add.xml' ... done (1ms).
+Loading done.
+Simulation version v1_7_0+0625-fbb42d88cd started with time: 0.00
+Simulation ended at time: 1957.00
+Reason: All vehicles have left the simulation.
+Statistics (avg):
+ RouteLength: 5919.72
+ Speed: 3.03
+ Duration: 1956.00
+ WaitingTime: 0.00
+ TimeLoss: 520.00
+ DepartDelay: 0.00
+Pedestrian Statistics (avg of 320 walks):
+ RouteLength: 36.95
+ Duration: 27.25
+ TimeLoss: 0.65
+Ride Statistics (avg of 160 rides):
+ WaitingTime: 346.13
+ RouteLength: 739.96
+ Duration: 215.50
+ Bus: 160
+
+DijkstraRouter answered 160 queries and explored 29.50 edges on average.
+DijkstraRouter spent 0.00s answering queries (0.00ms on average).

tests/sumo/errors/too_many_teleports/errors.sumo.meso

@@ -2,10 +2,10 @@ Warning: Teleporting vehicle 'always_right.20'; waited too long, from edge '4o':
 Warning: Vehicle 'always_right.20' ends teleporting on edge '4si':0, time 721.51.
 Warning: Teleporting vehicle 'always_right.21'; waited too long, from edge '4o':3, time 978.09.
 Warning: Vehicle 'always_right.21' ends teleporting on edge '4si':0, time 1023.09.
-Warning: Teleporting vehicle 'always_right.42'; waited too long, from edge '4o':3, time 1895.81.
-Warning: Vehicle 'always_right.42' ends teleporting on edge '4si':0, time 1940.82.
-Warning: Teleporting vehicle 'always_right.63'; waited too long, from edge '4o':3, time 3010.19.
-Warning: Vehicle 'always_right.63' ends teleporting on edge '4si':0, time 3055.20.
-Warning: Teleporting vehicle 'always_right.54'; waited too long, from edge '1o':4, time 4078.43.
-Warning: Vehicle 'always_right.54' teleports beyond arrival edge '1fi', time 4123.43.
-Warning: Teleporting vehicle 'always_right.84'; waited too long, from edge '4o':3, time 4079.69.
+Warning: Teleporting vehicle 'always_right.122'; waited too long, from edge '1si':2, time 2011.71.
+Warning: Vehicle 'always_right.122' ends teleporting on edge '4fi':0, time 2029.71.
+Warning: Teleporting vehicle 'always_right.123'; waited too long, from edge '1si':2, time 2044.91.
+Warning: Teleporting vehicle 'always_right.42'; waited too long, from edge '4o':3, time 2061.02.
+Warning: Vehicle 'always_right.123' ends teleporting on edge '4fi':0, time 2062.91.
+Warning: Vehicle 'always_right.42' ends teleporting on edge '4si':0, time 2106.02.
+Warning: Teleporting vehicle 'always_right.145'; waited too long, from edge '1si':2, time 3026.77.

tests/sumo/errors/too_many_teleports/output.sumo.meso

@@ -1,15 +1,15 @@
-Loading net-file from 'net.net.xml' ... done (1ms).
+Loading net-file from 'net.net.xml' ... done (4ms).
 Loading done.
-Simulation started with time: 0.00
-Simulation ended at time: 4081.00
+Simulation version v1_7_0+0625-fbb42d88cd started with time: 0.00
+Simulation ended at time: 3028.00
 Reason: Too many teleports.
 Performance: 
- Duration: 25ms
- Real time factor: 163240
- UPS: 27842080.000000
+ Duration: 0.06s
+ Real time factor: 55054.5
+ UPS: 7076200.000000
 Vehicles: 
- Inserted: 350 (Loaded: 399)
- Running: 306
- Waiting: 49
+ Inserted: 293
+ Running: 248
+ Waiting: 0
 Teleports: 6 (Jam: 6)
 

tests/sumo/meso/bugs/ticket2769/output.sumo.meso

@@ -1,21 +1,21 @@
-Loading net-file from 'net.net.xml' ... done (3ms).
+Loading net-file from 'net.net.xml' ... done (4ms).
 Loading done.
-Simulation version v1_5_0+0174-0b4d252505 started with time: 0.00
-Simulation ended at time: 1126.00
+Simulation version v1_7_0+0625-fbb42d88cd started with time: 0.00
+Simulation ended at time: 983.00
 Reason: All vehicles have left the simulation.
 Performance: 
- Duration: 82ms
- Real time factor: 13731.7
- UPS: 3836402.439024
+ Duration: 0.12s
+ Real time factor: 8123.97
+ UPS: 2543371.900826
 Vehicles: 
  Inserted: 783
  Running: 0
  Waiting: 0
 Statistics (avg):
  RouteLength: 1079.69
- Speed: 3.73
- Duration: 401.77
- WaitingTime: 8.09
- TimeLoss: 319.42
- DepartDelay: 176.83
+ Speed: 4.12
+ Duration: 393.04
+ WaitingTime: 12.06
+ TimeLoss: 310.76
+ DepartDelay: 164.96
 

tests/sumo/meso/junction_control/no_tls/errors.sumo.meso

@@ -1,2 +1 @@
-Warning: Teleporting vehicle '1to2.6'; waited too long, from edge '1si':2 to edge '2o':1, time 3110.95.
-Warning: Teleporting vehicle '1to2.8'; waited too long, from edge '1si':2 to edge '2o':1, time 4331.94.
+Warning: Teleporting vehicle '2to1.0'; waited too long, from edge '2si':2 to edge '1o':1, time 342.66.

tests/sumo/meso/junction_control/no_tls/output.sumo.meso

@@ -1,16 +1,16 @@
-Loading net-file from 'net.net.xml' ... done (2ms).
-Loading additional-files from 'input_additional.add.xml' ... done (0ms).
+Loading net-file from 'net.net.xml' ... done (4ms).
+Loading additional-files from 'input_additional.add.xml' ... done (1ms).
 Loading done.
-Simulation version v1_3_1+0031-146d62e started with time: 0.00
-Simulation ended at time: 9540.00
+Simulation version v1_7_0+0625-fbb42d88cd started with time: 0.00
+Simulation ended at time: 6404.00
 Reason: All vehicles have left the simulation.
 Performance: 
- Duration: 752ms
- Real time factor: 12686.2
- UPS: 5506045.212766
+ Duration: 0.89s
+ Real time factor: 7187.43
+ UPS: 2138034.792368
 Vehicles: 
  Inserted: 5400
  Running: 0
  Waiting: 0
-Teleports: 2 (Jam: 2)
+Teleports: 1 (Jam: 1)
 

tests/sumo/meso/teleport/single_jump_to_end/errors.sumo.meso

@@ -1,47 +1,43 @@
 Warning: Teleporting vehicle 'horizontal.0'; waited too long, from edge '2si':2, time 341.50.
-Warning: Teleporting vehicle 'long_jam.0'; waited too long, from edge '1si':2 to edge '2o':1, time 386.50.
-Warning: Vehicle 'horizontal.0' teleports beyond arrival edge '1si', time 427.00.
+Warning: Teleporting vehicle 'long_jam.0'; waited too long, from edge '1si':2 to edge '2o':1, time 386.51.
+Warning: Vehicle 'horizontal.0' teleports beyond arrival edge '1si', time 427.01.
 Warning: Teleporting vehicle 'horizontal.1'; waited too long, from edge '2si':2, time 641.50.
-Warning: Teleporting vehicle 'single_jump_to_end.71'; waited too long, from edge '2fi':0, time 659.42.
-Warning: Vehicle 'single_jump_to_end.71' teleports beyond arrival edge '2si', time 681.92.
-Warning: Teleporting vehicle 'horizontal.70'; waited too long, from edge '2fi':1, time 659.64.
-Warning: Teleporting vehicle 'single_jump_to_end.38'; waited too long, from edge '2si':0, time 660.90.
-Warning: Vehicle 'single_jump_to_end.38' teleports beyond arrival edge '2si', time 678.90.
-Warning: Teleporting vehicle 'single_jump_to_end.18'; waited too long, from edge '2si':1, time 661.56.
-Warning: Vehicle 'single_jump_to_end.18' teleports beyond arrival edge '2si', time 679.56.
-Warning: Teleporting vehicle 'long_jam.1'; waited too long, from edge '1si':2 to edge '2o':1, time 689.68.
-Warning: Vehicle 'horizontal.1' teleports beyond arrival edge '1si', time 727.00.
-Warning: Vehicle 'horizontal.70' teleports beyond arrival edge '1si', time 767.65.
-Warning: Teleporting vehicle 'horizontal.2'; waited too long, from edge '2si':2, time 941.50.
-Warning: Teleporting vehicle 'single_jump_to_end.19'; waited too long, from edge '2si':1, time 981.63.
-Warning: Vehicle 'single_jump_to_end.19' teleports beyond arrival edge '2si', time 999.62.
-Warning: Teleporting vehicle 'long_jam.2'; waited too long, from edge '1si':2 to edge '2o':1, time 992.86.
-Warning: Vehicle 'horizontal.2' teleports beyond arrival edge '1si', time 1027.00.
-Warning: Teleporting vehicle 'horizontal.3'; waited too long, from edge '2si':2, time 1241.50.
-Warning: Teleporting vehicle 'long_jam.3'; waited too long, from edge '1si':2 to edge '2o':1, time 1296.04.
-Warning: Teleporting vehicle 'single_jump_to_end.20'; waited too long, from edge '2si':1, time 1301.69.
-Warning: Vehicle 'single_jump_to_end.20' teleports beyond arrival edge '2si', time 1319.69.
-Warning: Vehicle 'horizontal.3' teleports beyond arrival edge '1si', time 1327.00.
-Warning: Teleporting vehicle 'horizontal.4'; waited too long, from edge '2si':2, time 1541.50.
-Warning: Teleporting vehicle 'long_jam.4'; waited too long, from edge '1si':2 to edge '2o':1, time 1599.22.
+Warning: Teleporting vehicle 'single_jump_to_end.58'; waited too long, from edge '2fi':2, time 659.43.
+Warning: Vehicle 'single_jump_to_end.58' teleports beyond arrival edge '2si', time 681.93.
+Warning: Teleporting vehicle 'single_jump_to_end.18'; waited too long, from edge '2si':1, time 660.91.
+Warning: Vehicle 'single_jump_to_end.18' teleports beyond arrival edge '2si', time 678.91.
+Warning: Teleporting vehicle 'long_jam.1'; waited too long, from edge '1si':2 to edge '2o':1, time 688.20.
+Warning: Vehicle 'horizontal.1' teleports beyond arrival edge '1si', time 727.01.
+Warning: Teleporting vehicle 'horizontal.2'; waited too long, from edge '2si':2, time 941.51.
+Warning: Teleporting vehicle 'single_jump_to_end.19'; waited too long, from edge '2si':1, time 979.65.
+Warning: Vehicle 'single_jump_to_end.19' teleports beyond arrival edge '2si', time 997.65.
+Warning: Teleporting vehicle 'long_jam.2'; waited too long, from edge '1si':2 to edge '2o':1, time 989.90.
+Warning: Vehicle 'horizontal.2' teleports beyond arrival edge '1si', time 1027.01.
+Warning: Teleporting vehicle 'horizontal.3'; waited too long, from edge '2si':2, time 1241.51.
+Warning: Teleporting vehicle 'long_jam.3'; waited too long, from edge '1si':2 to edge '2o':1, time 1291.59.
+Warning: Teleporting vehicle 'single_jump_to_end.20'; waited too long, from edge '2si':1, time 1298.39.
+Warning: Vehicle 'single_jump_to_end.20' teleports beyond arrival edge '2si', time 1316.39.
+Warning: Vehicle 'horizontal.3' teleports beyond arrival edge '1si', time 1327.01.
+Warning: Teleporting vehicle 'horizontal.4'; waited too long, from edge '2si':2, time 1541.51.
+Warning: Teleporting vehicle 'long_jam.4'; waited too long, from edge '1si':2 to edge '2o':1, time 1593.29.
 Warning: Vehicle 'horizontal.4' teleports beyond arrival edge '1si', time 1627.01.
-Warning: Teleporting vehicle 'single_jump_to_end.21'; waited too long, from edge '2si':1, time 1621.75.
-Warning: Vehicle 'single_jump_to_end.21' teleports beyond arrival edge '2si', time 1639.75.
-Warning: Teleporting vehicle 'horizontal.5'; waited too long, from edge '2si':2, time 1841.50.
-Warning: Teleporting vehicle 'long_jam.5'; waited too long, from edge '1si':2 to edge '2o':1, time 1902.40.
+Warning: Teleporting vehicle 'single_jump_to_end.21'; waited too long, from edge '2si':1, time 1617.13.
+Warning: Vehicle 'single_jump_to_end.21' teleports beyond arrival edge '2si', time 1635.13.
+Warning: Teleporting vehicle 'horizontal.5'; waited too long, from edge '2si':2, time 1841.51.
+Warning: Teleporting vehicle 'long_jam.5'; waited too long, from edge '1si':2 to edge '2o':1, time 1894.98.
 Warning: Vehicle 'horizontal.5' teleports beyond arrival edge '1si', time 1927.01.
-Warning: Teleporting vehicle 'horizontal.6'; waited too long, from edge '2si':2, time 2141.50.
-Warning: Vehicle 'horizontal.6' teleports beyond arrival edge '1si', time 2227.01.
-Warning: Teleporting vehicle 'long_jam.6'; waited too long, from edge '1si':2 to edge '2o':1, time 2205.58.
-Warning: Teleporting vehicle 'horizontal.7'; waited too long, from edge '2si':2, time 2441.50.
-Warning: Vehicle 'horizontal.7' teleports beyond arrival edge '1si', time 2527.01.
-Warning: Teleporting vehicle 'long_jam.7'; waited too long, from edge '1si':2 to edge '2o':1, time 2508.76.
+Warning: Teleporting vehicle 'horizontal.6'; waited too long, from edge '2si':2, time 2141.51.
+Warning: Teleporting vehicle 'long_jam.6'; waited too long, from edge '1si':2 to edge '2o':1, time 2196.68.
+Warning: Vehicle 'horizontal.6' teleports beyond arrival edge '1si', time 2227.02.
+Warning: Teleporting vehicle 'horizontal.7'; waited too long, from edge '2si':2, time 2441.51.
+Warning: Teleporting vehicle 'long_jam.7'; waited too long, from edge '1si':2 to edge '2o':1, time 2498.37.
+Warning: Vehicle 'horizontal.7' teleports beyond arrival edge '1si', time 2527.02.
 Warning: Teleporting vehicle 'horizontal.8'; waited too long, from edge '2si':2, time 2741.51.
-Warning: Vehicle 'horizontal.8' teleports beyond arrival edge '1si', time 2827.01.
-Warning: Teleporting vehicle 'long_jam.8'; waited too long, from edge '1si':2 to edge '2o':1, time 2811.94.
+Warning: Teleporting vehicle 'long_jam.8'; waited too long, from edge '1si':2 to edge '2o':1, time 2800.07.
+Warning: Vehicle 'horizontal.8' teleports beyond arrival edge '1si', time 2827.02.
 Warning: Teleporting vehicle 'horizontal.9'; waited too long, from edge '2si':2, time 3041.51.
-Warning: Vehicle 'horizontal.9' teleports beyond arrival edge '1si', time 3127.01.
-Warning: Teleporting vehicle 'long_jam.9'; waited too long, from edge '1si':2 to edge '2o':1, time 3115.12.
+Warning: Teleporting vehicle 'long_jam.9'; waited too long, from edge '1si':2 to edge '2o':1, time 3101.76.
+Warning: Vehicle 'horizontal.9' teleports beyond arrival edge '1si', time 3127.02.
 Warning: Teleporting vehicle 'horizontal.10'; waited too long, from edge '2si':2, time 3341.51.
-Warning: Vehicle 'horizontal.10' teleports beyond arrival edge '1si', time 3427.01.
-Warning: Teleporting vehicle 'long_jam.10'; waited too long, from edge '1si':2 to edge '2o':1, time 3418.30.
+Warning: Teleporting vehicle 'long_jam.10'; waited too long, from edge '1si':2 to edge '2o':1, time 3403.46.
+Warning: Vehicle 'horizontal.10' teleports beyond arrival edge '1si', time 3427.02.

tests/sumo/meso/teleport/single_jump_to_end/output.sumo.meso

@@ -1,16 +1,16 @@
-Loading net-file from 'net.net.xml' ... done (2ms).
-Loading additional-files from 'input_additional.add.xml' ... done (0ms).
+Loading net-file from 'net.net.xml' ... done (4ms).
+Loading additional-files from 'input_additional.add.xml' ... done (1ms).
 Loading done.
-Simulation started with time: 0.00
-Simulation ended at time: 15512.00
+Simulation version v1_7_0+0625-fbb42d88cd started with time: 0.00
+Simulation ended at time: 15003.00
 Reason: All vehicles have left the simulation.
 Performance: 
- Duration: 4263ms
- Real time factor: 3638.75
- UPS: 909226.131832
+ Duration: 5.15s
+ Real time factor: 2913.2
+ UPS: 787395.145631
 Vehicles: 
  Inserted: 7695
  Running: 0
  Waiting: 0
-Teleports: 29 (Jam: 29)
+Teleports: 27 (Jam: 27)