patching expected results refs #21

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

@@ -187,7 +187,9 @@ Warning: At actuated tlLogic 'joinedS_cluster_1876468341_25665883_29219439_57472
 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: Person 'ped3' is jammed on edge ':990017251_w0', time=564.00.
+Warning: Person 'ped3' is jammed on edge ':990017251_w0', time=575.00.
+Warning: Person 'ped134' is jammed on edge ':1472911083_w0', time=1022.00.
+Warning: Person 'ped55' is jammed on edge ':1472911083_w0', time=1031.00.
 Warning: Person 'ped94' aborted waiting for M5:3 at busStop '30731508'.
 Warning: Person 'ped116' aborted waiting for U6:1 at busStop '2071423334'.
 Warning: Person 'ped123' aborted waiting for U6:1 at busStop '2071423334'.

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 (10ms).
-Parsing nodes from osm-file '/home/erdm_ja/.texttest/tmp/tools.02Apr150908.3666360/tools/import/OSM/webWizard/osm_bbox.osm.xml' ... done (887ms).
-Parsing relations from osm-file '/home/erdm_ja/.texttest/tmp/tools.02Apr150908.3666360/tools/import/OSM/webWizard/osm_bbox.osm.xml' ... done (1163ms).
-Parsing edges from osm-file '/home/erdm_ja/.texttest/tmp/tools.02Apr150908.3666360/tools/import/OSM/webWizard/osm_bbox.osm.xml' ... done (525ms).
+Parsing network projection from 'osm.net.xml.gz' ... done (8ms).
+Parsing nodes from osm-file '/home/erdm_ja/.texttest/tmp/tools.03Apr085114.4124336/tools/import/OSM/webWizard/osm_bbox.osm.xml' ... done (254ms).
+Parsing relations from osm-file '/home/erdm_ja/.texttest/tmp/tools.03Apr085114.4124336/tools/import/OSM/webWizard/osm_bbox.osm.xml' ... done (169ms).
+Parsing edges from osm-file '/home/erdm_ja/.texttest/tmp/tools.03Apr085114.4124336/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.02Apr150908.3666360/tools/import/OSM/webWizard/test'.
+Building scenario in '/home/erdm_ja/.texttest/tmp/tools.03Apr085114.4124336/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,18 +172,18 @@ Success.
 Success.
 Success.
 Written configuration to 'osm.sumocfg'
-Loading net-file from '/home/erdm_ja/.texttest/tmp/tools.02Apr150908.3666360/tools/import/OSM/webWizard/test/osm.net.xml.gz' ... done (249ms).
-Loading additional-files from '/home/erdm_ja/.texttest/tmp/tools.02Apr150908.3666360/tools/import/OSM/webWizard/test/osm.poly.xml.gz' ... done (102ms).
-Loading additional-files from '/home/erdm_ja/.texttest/tmp/tools.02Apr150908.3666360/tools/import/OSM/webWizard/test/osm_stops.add.xml' ... done (8ms).
+Loading net-file from '/home/erdm_ja/.texttest/tmp/tools.03Apr085114.4124336/tools/import/OSM/webWizard/test/osm.net.xml.gz' ... done (251ms).
+Loading additional-files from '/home/erdm_ja/.texttest/tmp/tools.03Apr085114.4124336/tools/import/OSM/webWizard/test/osm.poly.xml.gz' ... done (104ms).
+Loading additional-files from '/home/erdm_ja/.texttest/tmp/tools.03Apr085114.4124336/tools/import/OSM/webWizard/test/osm_stops.add.xml' ... done (8ms).
 Loading done.
-Simulation version v1_19_0+1626-0c981d77e86 started with time: 0.00.
-Simulation ended at time: 2655.00
+Simulation version v1_19_0+1650-35e28c41478 started with time: 0.00.
+Simulation ended at time: 2669.00
 Reason: All vehicles have left the simulation.
 Performance: 
- Duration: 1.12s
- Real time factor: 2362.1
- UPS: 129194.839858
- UPS-Persons: 125766.903915
+ Duration: 1.11s
+ Real time factor: 2404.5
+ UPS: 130121.621622
+ UPS-Persons: 127345.945946
 Vehicles: 
  Inserted: 416
  Running: 0
@@ -192,34 +192,34 @@ Vehicles:
 Persons: 
  Inserted: 185
  Running: 0
- Jammed: 1
+ Jammed: 3
 Statistics (avg of 340):
- RouteLength: 1909.57
- Speed: 6.34
- Duration: 339.30
- WaitingTime: 58.05
- TimeLoss: 120.64
+ RouteLength: 1903.42
+ Speed: 6.36
+ Duration: 336.95
+ WaitingTime: 56.53
+ TimeLoss: 119.15
 Bike Statistics (avg of 76):
  RouteLength: 1626.43
- Speed: 4.19
- Duration: 392.79
- WaitingTime: 45.64
- TimeLoss: 83.31
+ Speed: 4.18
+ Duration: 393.06
+ WaitingTime: 45.35
+ TimeLoss: 83.60
 Statistics (avg of 416):
- DepartDelay: 0.40
-Pedestrian Statistics (avg of 401 walks):
- RouteLength: 284.13
- Duration: 235.28
- TimeLoss: 32.31
-Ride Statistics (avg of 169 rides):
- WaitingTime: 109.48
- RouteLength: 862.21
- Duration: 108.39
- Bus: 60
- Train: 102
+ DepartDelay: 0.39
+Pedestrian Statistics (avg of 405 walks):
+ RouteLength: 278.90
+ Duration: 230.46
+ TimeLoss: 31.30
+Ride Statistics (avg of 173 rides):
+ WaitingTime: 107.44
+ RouteLength: 854.26
+ Duration: 110.67
+ Bus: 65
+ Train: 101
  Aborted: 7
 
-DijkstraRouter answered 7316 queries and explored 11.48 edges on average.
+DijkstraRouter answered 6990 queries and explored 11.28 edges on average.
 DijkstraRouter spent 0.01s answering queries (0.00ms on average).
-DijkstraRouter answered 261 queries and explored 611.99 edges on average.
-DijkstraRouter spent 0.05s answering queries (0.18ms on average).
+DijkstraRouter answered 261 queries and explored 611.90 edges on average.
+DijkstraRouter spent 0.05s answering queries (0.17ms on average).