patching expected results refs #21

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

@@ -132,5 +132,9 @@ Warning: Person 'ped122' is jammed on edge ':1828018040_c0', time=639.00.
 Warning: Vehicle 'pt_tram_12:0.1' performs emergency braking on lane ':98973667_3_0' with decel=7.00, wished=3.00, severity=1.00, time=755.00.
 Warning: Person 'ped67' aborted waiting for M5:3 at busStop '30731481'.
 Warning: Person 'ped94' aborted waiting for N2:0 at busStop '2915590925'.
+Warning: Person 'ped145' aborted waiting for N42:0 at busStop '2915590925'.
+Warning: Person 'ped157' aborted waiting for N42:1 at busStop '3867910439'.
+Warning: Person 'ped136' aborted waiting for N42:1 at busStop '3867910439'.
+Warning: Person 'ped155' aborted waiting for N42:1 at busStop '3867910439'.
 Warning: Person 'ped59' aborted waiting for M5:0 at busStop '1633759766'.
 Warning: Person 'ped47' aborted waiting for TXL:0 at busStop '3869306771'.

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 (28ms).
-Parsing nodes from osm-file '/home/erdm_ja/.texttest/tmp/tools.05Dec084312.1988220/tools/import/OSM/webWizard/osm_bbox.osm.xml' ... done (229ms).
-Parsing relations from osm-file '/home/erdm_ja/.texttest/tmp/tools.05Dec084312.1988220/tools/import/OSM/webWizard/osm_bbox.osm.xml' ... done (170ms).
-Parsing edges from osm-file '/home/erdm_ja/.texttest/tmp/tools.05Dec084312.1988220/tools/import/OSM/webWizard/osm_bbox.osm.xml' ... done (187ms).
+Parsing network projection from 'osm.net.xml.gz' ... done (8ms).
+Parsing nodes from osm-file '/home/erdm_ja/.texttest/tmp/tools.20Dec120215.3674958/tools/import/OSM/webWizard/osm_bbox.osm.xml' ... done (235ms).
+Parsing relations from osm-file '/home/erdm_ja/.texttest/tmp/tools.20Dec120215.3674958/tools/import/OSM/webWizard/osm_bbox.osm.xml' ... done (163ms).
+Parsing edges from osm-file '/home/erdm_ja/.texttest/tmp/tools.20Dec120215.3674958/tools/import/OSM/webWizard/osm_bbox.osm.xml' ... done (180ms).
 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.05Dec084312.1988220/tools/import/OSM/webWizard/test'.
+Building scenario in '/home/erdm_ja/.texttest/tmp/tools.20Dec120215.3674958/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.05Dec084312.1988220/tools/import/OSM/webWizard/test/osm.net.xml.gz' ... done (270ms).
-Loading additional-files from '/home/erdm_ja/.texttest/tmp/tools.05Dec084312.1988220/tools/import/OSM/webWizard/test/osm.poly.xml.gz' ... done (110ms).
-Loading additional-files from '/home/erdm_ja/.texttest/tmp/tools.05Dec084312.1988220/tools/import/OSM/webWizard/test/osm_stops.add.xml' ... done (9ms).
+Loading net-file from '/home/erdm_ja/.texttest/tmp/tools.20Dec120215.3674958/tools/import/OSM/webWizard/test/osm.net.xml.gz' ... done (249ms).
+Loading additional-files from '/home/erdm_ja/.texttest/tmp/tools.20Dec120215.3674958/tools/import/OSM/webWizard/test/osm.poly.xml.gz' ... done (114ms).
+Loading additional-files from '/home/erdm_ja/.texttest/tmp/tools.20Dec120215.3674958/tools/import/OSM/webWizard/test/osm_stops.add.xml' ... done (9ms).
 Loading done.
-Simulation version v1_21_0+1188-de3782bea46 started with time: 0.00.
-Simulation ended at time: 3100.00.
+Simulation version v1_21_0+1543-d05ff320712 started with time: 0.00.
+Simulation ended at time: 3123.00.
 Reason: All vehicles have left the simulation.
 Performance:
- Duration: 1.28s
- Real time factor: 2416.21
- UPS: 109813.717849
- UPS-Persons: 114042.868277
+ Duration: 1.11s
+ Real time factor: 2816.05
+ UPS: 126506.762849
+ UPS-Persons: 136401.262399
 Vehicles:
  Inserted: 414
  Running: 0
@@ -194,31 +194,31 @@ Persons:
  Running: 0
  Jammed: 1
 Statistics (avg of 344):
- RouteLength: 1881.64
- Speed: 6.47
- Duration: 331.80
- WaitingTime: 58.76
- TimeLoss: 118.15
+ RouteLength: 1881.66
+ Speed: 6.49
+ Duration: 329.17
+ WaitingTime: 56.38
+ TimeLoss: 115.56
+ DepartDelay: 3.85
 Bike Statistics (avg of 70):
  RouteLength: 1577.22
- Speed: 4.23
- Duration: 382.16
- WaitingTime: 50.21
- TimeLoss: 86.34
-Statistics (avg of 414):
- DepartDelay: 3.95
-Pedestrian Statistics (avg of 438 walks):
- RouteLength: 257.23
- Duration: 213.67
- TimeLoss: 28.11
-Ride Statistics (avg of 171 rides):
- WaitingTime: 114.17
- RouteLength: 915.58
- Duration: 117.97
+ Speed: 4.18
+ Duration: 386.57
+ WaitingTime: 54.06
+ TimeLoss: 90.80
+ DepartDelay: 0.49
+Pedestrian Statistics (avg of 441 walks):
+ RouteLength: 249.52
+ Duration: 207.43
+ TimeLoss: 27.75
+Ride Statistics (avg of 176 rides):
+ WaitingTime: 113.78
+ RouteLength: 893.40
+ Duration: 118.33
  Bus: 60
- Train: 106
- Aborted: 5
-DijkstraRouter answered 6477 queries and explored 10.58 edges on average.
+ Train: 107
+ Aborted: 9
+DijkstraRouter answered 6596 queries and explored 10.84 edges on average.
 DijkstraRouter spent 0.01s answering queries (0.00ms on average).
-DijkstraRouter answered 259 queries and explored 576.47 edges on average.
-DijkstraRouter spent 0.06s answering queries (0.24ms on average).
+DijkstraRouter answered 259 queries and explored 576.41 edges on average.
+DijkstraRouter spent 0.04s answering queries (0.14ms on average).