patching expected results refs #21, #14580

tests/tools/import/OSM/webWizard/errors.tools

@@ -153,16 +153,8 @@ Warning: Unequal lengths of bidi lane ':cluster_1668685163_262478055_3253177076_
 Warning: Unequal lengths of bidi lane ':cluster_25664673_4590472030_4590472039_4590472040_4_0' and lane ':cluster_25664673_4590472030_4590472039_4590472040_3_0' (30.14 != 30.13).
 Warning: Unequal lengths of bidi lane ':cluster_30731510_588181257_588181258_588181259_1_0' and lane ':cluster_30731510_588181257_588181258_588181259_6_0' (33.10 != 28.85).
 Warning: Unequal lengths of bidi lane ':cluster_30731510_588181257_588181258_588181259_2_0' and lane ':cluster_30731510_588181257_588181258_588181259_5_0' (33.14 != 29.02).
-Warning: At actuated tlLogic 'cluster_1673527224_1673527227_21487161_303436603_#9more', linkIndex 8,9,10,30 has no controlling detector.
-Warning: At actuated tlLogic 'joinedS_1840326421_cluster_1828018077_1828018093_1828018094_1828018095_#5more', linkIndex 2,8,9,10,31,32,33,34 has no controlling detector.
-Warning: At actuated tlLogic 'joinedS_cluster_1876468341_25665883_29219439_5747234980_#4more_cluster_262469634_29219441_961875301_961875308_#2more', linkIndex 5,6,16,24,32,33 has no controlling detector.
 Warning: busStop '30731700' on lane '167272531#9_0' is too short for vehicle 'pt_tram_12:1.0'.
 Warning: Teleporting vehicle 'pt_tram_M2:0.1'; frontal collision with vehicle 'pt_tram_M2:3.0', lane='148458500#0_0', gap=-1.00, time=476.00 stage=move.
 Warning: Vehicle 'pt_tram_M2:0.1' ends teleporting on edge '148458500#1', time=480.00.
-Warning: Teleporting vehicle 'bike45'; waited too long (wrong lane), lane='24992428_1', time=1013.00.
-Warning: Vehicle 'bike45' ends teleporting on edge '606078065', time=1013.00.
-Warning: Teleporting vehicle 'bike55'; waited too long (wrong lane), lane='24992428_1', time=1014.00.
-Warning: Vehicle 'bike55' ends teleporting on edge '81112790#1', time=1014.00.
-Warning: Person 'ped155' is jammed on edge ':cluster_611334710_611335401_w0', time=1167.00.
 Warning: Person 'ped185' aborted waiting for M4:1 at busStop '1633759766'.
 Warning: Person 'ped81' aborted waiting for S3:0 at busStop '2603331695'.

tests/tools/import/OSM/webWizard/output.tools

@@ -1,9 +1,9 @@
 Success.
 Written configuration to 'osm.polycfg'
-Parsing network projection from 'osm.net.xml.gz' ... done (7ms).
-Parsing nodes from osm-file '/home/erdm_ja/.texttest/tmp/tools.10Apr172720.3592776/tools/import/OSM/webWizard/osm_bbox.osm.xml' ... done (254ms).
-Parsing relations from osm-file '/home/erdm_ja/.texttest/tmp/tools.10Apr172720.3592776/tools/import/OSM/webWizard/osm_bbox.osm.xml' ... done (173ms).
-Parsing edges from osm-file '/home/erdm_ja/.texttest/tmp/tools.10Apr172720.3592776/tools/import/OSM/webWizard/osm_bbox.osm.xml' ... done (189ms).
+Parsing network projection from 'osm.net.xml.gz' ... done (12ms).
+Parsing nodes from osm-file '/home/erdm_ja/.texttest/tmp/tools.10Apr174955.3657869/tools/import/OSM/webWizard/osm_bbox.osm.xml' ... done (260ms).
+Parsing relations from osm-file '/home/erdm_ja/.texttest/tmp/tools.10Apr174955.3657869/tools/import/OSM/webWizard/osm_bbox.osm.xml' ... done (167ms).
+Parsing edges from osm-file '/home/erdm_ja/.texttest/tmp/tools.10Apr174955.3657869/tools/import/OSM/webWizard/osm_bbox.osm.xml' ... done (185ms).
 Assembled polygon from relation '3619' (name:Altes Museum)
 Assembled polygon from relation '6647' (name:Humboldt-Universität zu Berlin)
 Assembled polygon from relation '23745' (name:Altes Stadthaus)
@@ -141,7 +141,7 @@ Assembled polygon from relation '8249214' (name:Hof V)
 Assembled polygon from relation '8249215' (name:)
 Assembled polygon from relation '8249216' (name:)
 Success.
-Building scenario in '/home/erdm_ja/.texttest/tmp/tools.10Apr172720.3592776/tools/import/OSM/webWizard/test'.
+Building scenario in '/home/erdm_ja/.texttest/tmp/tools.10Apr174955.3657869/tools/import/OSM/webWizard/test'.
 generating trips...
 Skipping line '2194813' because it only drives at night
 Skipping line '2194814' because it only drives at night
@@ -172,54 +172,53 @@ Success.
 Success.
 Success.
 Written configuration to 'osm.sumocfg'
-Loading net-file from '/home/erdm_ja/.texttest/tmp/tools.10Apr172720.3592776/tools/import/OSM/webWizard/test/osm.net.xml.gz' ... done (300ms).
-Loading additional-files from '/home/erdm_ja/.texttest/tmp/tools.10Apr172720.3592776/tools/import/OSM/webWizard/test/osm.poly.xml.gz' ... done (108ms).
-Loading additional-files from '/home/erdm_ja/.texttest/tmp/tools.10Apr172720.3592776/tools/import/OSM/webWizard/test/osm_stops.add.xml' ... done (8ms).
+Loading net-file from '/home/erdm_ja/.texttest/tmp/tools.10Apr174955.3657869/tools/import/OSM/webWizard/test/osm.net.xml.gz' ... done (253ms).
+Loading additional-files from '/home/erdm_ja/.texttest/tmp/tools.10Apr174955.3657869/tools/import/OSM/webWizard/test/osm.poly.xml.gz' ... done (103ms).
+Loading additional-files from '/home/erdm_ja/.texttest/tmp/tools.10Apr174955.3657869/tools/import/OSM/webWizard/test/osm_stops.add.xml' ... done (7ms).
 Loading done.
-Simulation version v1_19_0+1758-4e21544a219 started with time: 0.00.
-Simulation ended at time: 2820.00
+Simulation version v1_19_0+1767-eec17cd9cb5 started with time: 0.00.
+Simulation ended at time: 2814.00
 Reason: All vehicles have left the simulation.
 Performance: 
- Duration: 1.20s
- Real time factor: 2355.89
- UPS: 120243.107769
- UPS-Persons: 122344.193818
+ Duration: 1.07s
+ Real time factor: 2622.55
+ UPS: 134614.165890
+ UPS-Persons: 136147.250699
 Vehicles: 
  Inserted: 408
  Running: 0
  Waiting: 0
- Teleports: 3 (Collisions: 1, Wrong Lane: 2)
+ Teleports: 1 (Collisions: 1)
 Persons: 
  Inserted: 186
  Running: 0
- Jammed: 1
 Statistics (avg of 340):
- RouteLength: 1909.78
- Speed: 6.27
- Duration: 345.09
- WaitingTime: 63.56
- TimeLoss: 127.01
+ RouteLength: 1910.10
+ Speed: 6.18
+ Duration: 348.30
+ WaitingTime: 64.39
+ TimeLoss: 129.35
 Bike Statistics (avg of 68):
- RouteLength: 1574.96
- Speed: 4.14
- Duration: 391.18
- WaitingTime: 59.69
- TimeLoss: 97.95
+ RouteLength: 1575.79
+ Speed: 4.17
+ Duration: 382.65
+ WaitingTime: 51.66
+ TimeLoss: 89.30
 Statistics (avg of 408):
- DepartDelay: 0.44
+ DepartDelay: 0.39
 Pedestrian Statistics (avg of 455 walks):
- RouteLength: 254.87
- Duration: 210.09
- TimeLoss: 26.74
+ RouteLength: 254.77
+ Duration: 210.62
+ TimeLoss: 27.34
 Ride Statistics (avg of 181 rides):
- WaitingTime: 126.04
+ WaitingTime: 123.95
  RouteLength: 888.93
- Duration: 115.46
+ Duration: 114.30
  Bus: 67
  Train: 111
  Aborted: 3
 
-DijkstraRouter answered 6103 queries and explored 10.41 edges on average.
+DijkstraRouter answered 6419 queries and explored 11.00 edges on average.
 DijkstraRouter spent 0.01s answering queries (0.00ms on average).
-DijkstraRouter answered 253 queries and explored 578.03 edges on average.
-DijkstraRouter spent 0.07s answering queries (0.26ms on average).
+DijkstraRouter answered 253 queries and explored 577.83 edges on average.
+DijkstraRouter spent 0.03s answering queries (0.12ms on average).