patching results after [15320] refs #21

git-svn-id: file:///home/behr_mi/git/sumo_synched/trunk@15322 afbd958f-9f77-42d5-a016-97a22340ccf4

sumo/tests/complex/sumo/b50/errors.complex

@@ -1,8 +1,6 @@
-Warning: Teleporting vehicle 'vehicle.1379'; waited too long (wrong lane), lane='i7_2', time=4176.00.
-Warning: Vehicle 'vehicle.1379' ends teleporting on edge 'e1', time 4197.00.
-Warning: Teleporting vehicle 'vehicle.1489'; waited too long (wrong lane), lane='i7_2', time=4575.00.
-Warning: Vehicle 'vehicle.1489' ends teleporting on edge 'e1', time 4608.00.
-Warning: Teleporting vehicle 'vehicle.1810'; waited too long (jam), lane='i4_0', time=5496.00.
-Warning: Vehicle 'vehicle.1810' ends teleporting on edge 'i5', time 5496.00.
-Warning: Teleporting vehicle 'vehicle.2354'; waited too long (jam), lane='i4_1', time=6830.00.
-Warning: Vehicle 'vehicle.2354' ends teleporting on edge 'i5', time 6830.00.
+Warning: Teleporting vehicle 'vehicle.508'; waited too long (wrong lane), lane='i7_2', time=1701.00.
+Warning: Vehicle 'vehicle.508' ends teleporting on edge 'e1', time 1724.00.
+Warning: Teleporting vehicle 'vehicle.969'; waited too long (jam), lane='i2_0', time=2894.00.
+Warning: Vehicle 'vehicle.969' ends teleporting on edge 'i3', time 2897.00.
+Warning: Teleporting vehicle 'vehicle.2935'; waited too long (wrong lane), lane='i7_2', time=8662.00.
+Warning: Vehicle 'vehicle.2935' ends teleporting on edge 'e1', time 8685.00.

sumo/tests/complex/sumo/b50/output.complex

@@ -1,7 +1,7 @@
 Success.
 Loading configuration... done.
-Loading net-file from 'net.net.xml'...  done (3ms).
+Loading net-file from 'net.net.xml'...  done (4ms).
 Loading done.
 Simulation started with time: 0.00
-Simulation ended at time: 8775.00
+Simulation ended at time: 9064.00
 Reason: All vehicles have left the simulation.

sumo/tests/complex/tutorial/quickstart/net.complex

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Fri Nov 15 09:20:44 2013 by SUMO netconvert Version dev-SVN-r15111
+<!-- generated on Thu Dec 12 07:45:07 2013 by SUMO netconvert Version dev-SVN-r15319
 <?xml version="1.0" encoding="UTF-8"?>
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/netconvertConfiguration.xsd">
@@ -501,11 +501,11 @@
     <connection from=":3_9" to="L18" fromLane="0" toLane="0" dir="s" state="M"/>
     <connection from=":3_9" to="L18" fromLane="1" toLane="1" dir="s" state="M"/>
     <connection from=":3_9" to="L18" fromLane="2" toLane="2" dir="s" state="M"/>
-    <connection from=":3_12" to="L16" fromLane="0" toLane="0" via=":3_15_0" dir="s" state="M"/>
+    <connection from=":3_12" to="L16" fromLane="0" toLane="0" via=":3_15_0" dir="s" state="m"/>
     <connection from=":3_15" to="L16" fromLane="0" toLane="0" dir="s" state="M"/>
-    <connection from=":3_12" to="L16" fromLane="1" toLane="1" via=":3_16_0" dir="s" state="M"/>
+    <connection from=":3_12" to="L16" fromLane="1" toLane="1" via=":3_16_0" dir="s" state="m"/>
     <connection from=":3_16" to="L16" fromLane="0" toLane="1" dir="s" state="M"/>
-    <connection from=":3_12" to="L16" fromLane="2" toLane="2" via=":3_17_0" dir="s" state="M"/>
+    <connection from=":3_12" to="L16" fromLane="2" toLane="2" via=":3_17_0" dir="s" state="m"/>
     <connection from=":3_17" to="L16" fromLane="0" toLane="2" dir="s" state="M"/>
     <connection from=":4_0" to="L17" fromLane="0" toLane="0" dir="s" state="M"/>
     <connection from=":4_0" to="L17" fromLane="1" toLane="1" dir="s" state="M"/>
@@ -522,9 +522,9 @@
     <connection from=":6_0" to="L11" fromLane="0" toLane="0" dir="s" state="M"/>
     <connection from=":6_0" to="L11" fromLane="1" toLane="1" dir="s" state="M"/>
     <connection from=":6_0" to="L11" fromLane="2" toLane="2" dir="s" state="M"/>
-    <connection from=":6_3" to="L15" fromLane="0" toLane="1" via=":6_14_0" dir="s" state="M"/>
+    <connection from=":6_3" to="L15" fromLane="0" toLane="1" via=":6_14_0" dir="s" state="m"/>
     <connection from=":6_14" to="L15" fromLane="0" toLane="1" dir="s" state="M"/>
-    <connection from=":6_3" to="L15" fromLane="1" toLane="2" via=":6_15_0" dir="s" state="M"/>
+    <connection from=":6_3" to="L15" fromLane="1" toLane="2" via=":6_15_0" dir="s" state="m"/>
     <connection from=":6_15" to="L15" fromLane="0" toLane="2" dir="s" state="M"/>
     <connection from=":6_5" to="L10" fromLane="0" toLane="0" dir="s" state="M"/>
     <connection from=":6_5" to="L10" fromLane="1" toLane="1" dir="s" state="M"/>

sumo/tests/complex/tutorial/traci_tls/plain/output.complex

@@ -4,12 +4,12 @@ Loading additional-files from 'data/cross.det.xml'...  done (0ms).
 Loading done.
 Simulation started with time: 0.00
 ***Starting server on port 8813 ***
-Simulation ended at time: 3710.00
+Simulation ended at time: 3711.00
 Reason: TraCI requested termination.
 Performance: 
- Duration: 2385 ms
- Real time factor: 1555.56
- UPS: 31492.662474
+ Duration: 2886 ms
+ Real time factor: 1285.86
+ UPS: 26336.105336
 Vehicles: 
  Inserted: 768
  Running: 0