adapting to typo in processing output, refs eclipse-sumo#22, eclipse-…

…sumo#21

tests/activitygen/demand_generation/activitygen-example_v/output.activitygen

@@ -1,16 +1,16 @@
-Loading net... done.
+Loading net ... done.
 Loaded 266 edges.
-Reading input... first completed in getStreet() of City: Consolidation of data not needed in ActivityGen any more
+Reading input ... first completed in getStreet() of City: Consolidation of data not needed in ActivityGen any more
 done.
-Consolidating statistics... done.
-Building street representation... done.
-Generating work positions... --> work position: 
+Consolidating statistics ... done.
+Building street representation ... done.
+Generating work positions ... --> work position: 
   |-> in city: 790
   |-> out city: 80
   |-> in+out city: 870
 done.
-Building bus lines... done.
-Generating population... --> population: 
+Building bus lines ... done.
+Generating population ... --> population: 
   |-> city households: 500
   |-> city people: 1000
     |-> city single: 190 / (in) couple: 620
@@ -20,12 +20,12 @@ Generating population... --> population:
     |-> city children: 190
       |-> estimation: 190
 done.
-Allocating schools... done.
-Allocating work places...   |-> working people: 730
+Allocating schools ... done.
+Allocating work places ...   |-> working people: 730
     |-> working people in city: 530
     |-> working people from outside: 200
 done.
-Allocating car places... done.
+Allocating car places ... done.
 no problem during bus line trip generation...
 after public transportation: 248
 no problem during households' trips generation...

tests/complex/broken_nets/dfrouter/output.complex

@@ -1,4 +1,4 @@
-Loading configuration... done.
+Loading configuration ... done.
 Success.
 Success.
 >>> Building the correct network

tests/complex/broken_nets/dfrouter_no_validation/output.complex

@@ -1,4 +1,4 @@
-Loading configuration... done.
+Loading configuration ... done.
 Success.
 Success.
 >>> Building the correct network

tests/complex/broken_nets/duarouter/output.complex

@@ -1,4 +1,4 @@
-Loading configuration... done.
+Loading configuration ... done.
 Success.
 Success.
 >>> Building the correct network

tests/complex/broken_nets/duarouter_no_validation/output.complex

@@ -1,4 +1,4 @@
-Loading configuration... done.
+Loading configuration ... done.
 Success.
 Success.
 >>> Building the correct network

tests/complex/broken_nets/jtrrouter/output.complex

@@ -1,4 +1,4 @@
-Loading configuration... done.
+Loading configuration ... done.
 Success.
 Success.
 >>> Building the correct network

tests/complex/broken_nets/jtrrouter_no_validation/output.complex

@@ -1,4 +1,4 @@
-Loading configuration... done.
+Loading configuration ... done.
 Success.
 Success.
 >>> Building the correct network

tests/complex/broken_nets/netconvert/output.complex

@@ -1,4 +1,4 @@
-Loading configuration... done.
+Loading configuration ... done.
 Success.
 Success.
 >>> Building the correct network

tests/complex/broken_nets/netconvert_no_validation/output.complex

@@ -1,4 +1,4 @@
-Loading configuration... done.
+Loading configuration ... done.
 Success.
 Success.
 >>> Building the correct network

tests/complex/broken_nets/sumo/output.complex

@@ -1,4 +1,4 @@
-Loading configuration... done.
+Loading configuration ... done.
 Success.
 >>> Building the correct network
 >>> Trying the correct network

tests/complex/broken_nets/sumo_no_validation/output.complex

@@ -1,4 +1,4 @@
-Loading configuration... done.
+Loading configuration ... done.
 Success.
 >>> Building the correct network
 >>> Trying the correct network

tests/complex/netconvert/left_turn_noblocking_double_intersection/errors.complex

@@ -1,2 +1,2 @@
-Warning: Intersecting left turns at junction 'cluster_node_C_node_C2' from lane 'edge_U2C2_0' and lane 'edge_D2C_0'. (increase junction radius to avoid this)
-Warning: Intersecting left turns at junction 'cluster_node_C_node_C2' from lane 'edge_R2C2_0' and lane 'edge_L2C_0'. (increase junction radius to avoid this)
+Warning: Intersecting left turns at junction 'cluster_node_C_node_C2' from lane 'edge_U2C2_0' and lane 'edge_D2C_0' (increase junction radius to avoid this).
+Warning: Intersecting left turns at junction 'cluster_node_C_node_C2' from lane 'edge_R2C2_0' and lane 'edge_L2C_0' (increase junction radius to avoid this).

tests/complex/scenario_generation/cross/RiLSA1/output.complex

@@ -1,32 +1,32 @@
-Parsing nodes from '/tmp/tmpJ_Dpa9'... done.
-Parsing edges from '/tmp/tmpijkdNA'... done.
-Parsing connections from '/tmp/tmpN28gXX'... done.
+Parsing nodes from '/tmp/tmp_Gx2DA' ... done.
+Parsing edges from '/tmp/tmpXzsZ6o' ... done.
+Parsing connections from '/tmp/tmpn7LmCo' ... done.
  Import done:
    13 nodes loaded.
    16 edges loaded.
 The split of edges was performed 8 times.
-Removing self-loops... done (0ms).
-Removing empty nodes... done (0ms).
+Removing self-loops ... done (0ms).
+Removing empty nodes ... done (0ms).
    0 nodes removed.
-Moving network to origin... done (0ms).
-Computing turning directions... done (0ms).
-Assigning nodes to traffic lights... done (0ms).
-Sorting nodes' edges... done (0ms).
-Computing node shapes... done (1ms).
-Computing edge shapes... done (0ms).
-Computing node types... done (0ms).
-Computing priorities... done (0ms).
-Computing approached edges... done (0ms).
-Guessing and setting roundabouts... done (0ms).
-Computing approaching lanes... done (0ms).
-Dividing of lanes on approached lanes... done (0ms).
-Processing turnarounds... done (0ms).
-Rechecking of lane endings... done (0ms).
-Computing traffic light control information... done (0ms).
-Computing node logics... done (0ms).
-Computing traffic light logics... done (1ms).
+Moving network to origin ... done (0ms).
+Computing turning directions ... done (0ms).
+Assigning nodes to traffic lights ... done (0ms).
+Sorting nodes' edges ... done (0ms).
+Computing node shapes ... done (1ms).
+Computing edge shapes ... done (0ms).
+Computing node types ... done (0ms).
+Computing priorities ... done (1ms).
+Computing approached edges ... done (0ms).
+Guessing and setting roundabouts ... done (0ms).
+Computing approaching lanes ... done (0ms).
+Dividing of lanes on approached lanes ... done (0ms).
+Processing turnarounds ... done (0ms).
+Rechecking of lane endings ... done (0ms).
+Computing traffic light control information ... done (0ms).
+Computing node logics ... done (0ms).
+Computing traffic light logics ... done (0ms).
  1 traffic light(s) computed.
-Building inner edges... done (0ms).
+Building inner edges ... done (1ms).
 -----------------------------------------------------
 Summary:
  Node type statistics:
@@ -39,5 +39,5 @@ Summary:
   Applied offset     : 0.00,0.00
   Converted boundary : 0.00,0.00,1000.00,1000.00
 -----------------------------------------------------
-Writing network... done (4ms).
+Writing network ... done (7ms).
 Success.

tests/complex/scenario_generation/cross/RiLSA3/output.complex

@@ -1,32 +1,32 @@
-Parsing nodes from '/tmp/tmpipt0cv'... done.
-Parsing edges from '/tmp/tmpaVhVxy'... done.
-Parsing connections from '/tmp/tmpgMTlB5'... done.
+Parsing nodes from '/tmp/tmp_jEVei' ... done.
+Parsing edges from '/tmp/tmpwA6qFG' ... done.
+Parsing connections from '/tmp/tmpKnop6v' ... done.
  Import done:
    12 nodes loaded.
    15 edges loaded.
 The split of edges was performed 7 times.
-Removing self-loops... done (0ms).
-Removing empty nodes... done (0ms).
+Removing self-loops ... done (0ms).
+Removing empty nodes ... done (0ms).
    0 nodes removed.
-Moving network to origin... done (0ms).
-Computing turning directions... done (0ms).
-Assigning nodes to traffic lights... done (0ms).
-Sorting nodes' edges... done (0ms).
-Computing node shapes... done (1ms).
-Computing edge shapes... done (0ms).
-Computing node types... done (0ms).
-Computing priorities... done (0ms).
-Computing approached edges... done (0ms).
-Guessing and setting roundabouts... done (0ms).
-Computing approaching lanes... done (0ms).
-Dividing of lanes on approached lanes... done (0ms).
-Processing turnarounds... done (0ms).
-Rechecking of lane endings... done (0ms).
-Computing traffic light control information... done (0ms).
-Computing node logics... done (1ms).
-Computing traffic light logics... done (0ms).
+Moving network to origin ... done (0ms).
+Computing turning directions ... done (0ms).
+Assigning nodes to traffic lights ... done (0ms).
+Sorting nodes' edges ... done (0ms).
+Computing node shapes ... done (1ms).
+Computing edge shapes ... done (0ms).
+Computing node types ... done (0ms).
+Computing priorities ... done (0ms).
+Computing approached edges ... done (0ms).
+Guessing and setting roundabouts ... done (0ms).
+Computing approaching lanes ... done (0ms).
+Dividing of lanes on approached lanes ... done (0ms).
+Processing turnarounds ... done (0ms).
+Rechecking of lane endings ... done (1ms).
+Computing traffic light control information ... done (0ms).
+Computing node logics ... done (0ms).
+Computing traffic light logics ... done (0ms).
  1 traffic light(s) computed.
-Building inner edges... done (1ms).
+Building inner edges ... done (1ms).
 -----------------------------------------------------
 Summary:
  Node type statistics:
@@ -39,5 +39,5 @@ Summary:
   Applied offset     : 0.00,0.00
   Converted boundary : 0.00,0.00,1000.00,1000.00
 -----------------------------------------------------
-Writing network... done (5ms).
+Writing network ... done (6ms).
 Success.

tests/complex/scenario_generation/cross/RiLSA4/output.complex

@@ -1,32 +1,32 @@
-Parsing nodes from '/tmp/tmp0Pg60y'... done.
-Parsing edges from '/tmp/tmpQPlzh9'... done.
-Parsing connections from '/tmp/tmpTFbISY'... done.
+Parsing nodes from '/tmp/tmpaZeP8Q' ... done.
+Parsing edges from '/tmp/tmpomOYlz' ... done.
+Parsing connections from '/tmp/tmpvviuUf' ... done.
  Import done:
    12 nodes loaded.
    15 edges loaded.
 The split of edges was performed 7 times.
-Removing self-loops... done (0ms).
-Removing empty nodes... done (0ms).
+Removing self-loops ... done (0ms).
+Removing empty nodes ... done (0ms).
    0 nodes removed.
-Moving network to origin... done (0ms).
-Computing turning directions... done (0ms).
-Assigning nodes to traffic lights... done (0ms).
-Sorting nodes' edges... done (0ms).
-Computing node shapes... done (1ms).
-Computing edge shapes... done (0ms).
-Computing node types... done (0ms).
-Computing priorities... done (0ms).
-Computing approached edges... done (0ms).
-Guessing and setting roundabouts... done (0ms).
-Computing approaching lanes... done (0ms).
-Dividing of lanes on approached lanes... done (0ms).
-Processing turnarounds... done (0ms).
-Rechecking of lane endings... done (0ms).
-Computing traffic light control information... done (0ms).
-Computing node logics... done (0ms).
-Computing traffic light logics... done (0ms).
+Moving network to origin ... done (0ms).
+Computing turning directions ... done (0ms).
+Assigning nodes to traffic lights ... done (0ms).
+Sorting nodes' edges ... done (0ms).
+Computing node shapes ... done (0ms).
+Computing edge shapes ... done (1ms).
+Computing node types ... done (0ms).
+Computing priorities ... done (0ms).
+Computing approached edges ... done (0ms).
+Guessing and setting roundabouts ... done (0ms).
+Computing approaching lanes ... done (0ms).
+Dividing of lanes on approached lanes ... done (0ms).
+Processing turnarounds ... done (0ms).
+Rechecking of lane endings ... done (0ms).
+Computing traffic light control information ... done (0ms).
+Computing node logics ... done (0ms).
+Computing traffic light logics ... done (1ms).
  1 traffic light(s) computed.
-Building inner edges... done (1ms).
+Building inner edges ... done (1ms).
 -----------------------------------------------------
 Summary:
  Node type statistics:
@@ -39,5 +39,5 @@ Summary:
   Applied offset     : 0.00,0.00
   Converted boundary : 0.00,0.00,1000.00,1000.00
 -----------------------------------------------------
-Writing network... done (6ms).
+Writing network ... done (6ms).
 Success.

tests/complex/scenario_generation/cross/d11_example1/output.complex

@@ -1,32 +1,32 @@
-Parsing nodes from '/tmp/tmpEwV2_f'... done.
-Parsing edges from '/tmp/tmpsni35t'... done.
-Parsing connections from '/tmp/tmpotHhvh'... done.
+Parsing nodes from '/tmp/tmp6Nnfti' ... done.
+Parsing edges from '/tmp/tmpZ2YZVr' ... done.
+Parsing connections from '/tmp/tmpNebon_' ... done.
  Import done:
    5 nodes loaded.
    8 edges loaded.
-Removing self-loops... done (0ms).
-Removing empty nodes... done (0ms).
+Removing self-loops ... done (0ms).
+Removing empty nodes ... done (0ms).
    0 nodes removed.
-Moving network to origin... done (0ms).
-Computing turning directions... done (0ms).
-Assigning nodes to traffic lights... done (0ms).
-Sorting nodes' edges... done (0ms).
-Computing node shapes... done (0ms).
-Computing edge shapes... done (0ms).
-Computing node types... done (0ms).
-Computing priorities... done (0ms).
-Computing approached edges... done (0ms).
-Guessing and setting roundabouts... done (0ms).
-Computing approaching lanes... done (0ms).
-Dividing of lanes on approached lanes... done (0ms).
-Processing turnarounds... done (0ms).
-Rechecking of lane endings... 
-done (0ms).
-Computing traffic light control information... done (0ms).
-Computing node logics... done (0ms).
-Computing traffic light logics... done (1ms).
+Moving network to origin ... done (0ms).
+Computing turning directions ... done (0ms).
+Assigning nodes to traffic lights ... done (1ms).
+Sorting nodes' edges ... done (0ms).
+Computing node shapes ... done (0ms).
+Computing edge shapes ... done (0ms).
+Computing node types ... done (0ms).
+Computing priorities ... done (0ms).
+Computing approached edges ... done (0ms).
+Guessing and setting roundabouts ... done (0ms).
+Computing approaching lanes ... done (0ms).
+Dividing of lanes on approached lanes ... done (0ms).
+Processing turnarounds ... done (0ms).
+Rechecking of lane endings ... 
+done (1ms).
+Computing traffic light control information ... done (0ms).
+Computing node logics ... done (0ms).
+Computing traffic light logics ... done (1ms).
  1 traffic light(s) computed.
-Building inner edges... done (0ms).
+Building inner edges ... done (0ms).
 -----------------------------------------------------
 Summary:
  Node type statistics:
@@ -39,5 +39,5 @@ Summary:
   Applied offset     : 0.00,0.00
   Converted boundary : 0.00,0.00,1000.00,1000.00
 -----------------------------------------------------
-Writing network... done (3ms).
+Writing network ... done (4ms).
 Success.