patching expected results refs #21, refs #4566

eclipse-sumo · Sep 13, 2018 · e9b8211 · e9b8211
1 parent e6ada97
commit e9b8211
Show file tree

Hide file tree

Showing 15 changed files with 2,997 additions and 3,168 deletions.
diff --git a/tests/sumo/cf_model/jam_resolution/bottleneck_departLane_random/aggregated25.sumo b/tests/sumo/cf_model/jam_resolution/bottleneck_departLane_random/aggregated25.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Mon Aug 27 12:57:05 2018 by Eclipse SUMO Version cac3710
+<!-- generated on Tue Sep 11 16:28:57 2018 by Eclipse SUMO Version v1_0_0+0099-3e104b6
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -28,8 +28,9 @@ SPDX-License-Identifier: EPL-2.0
     </processing>
 
     <report>
+        <verbose value="true"/>
         <xml-validation value="never"/>
-        <duration-log.disable value="true"/>
+        <duration-log.statistics value="true"/>
         <no-step-log value="true"/>
     </report>
 
@@ -38,31 +39,31 @@ SPDX-License-Identifier: EPL-2.0
 
 <meandata xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/meandata_file.xsd">
     <interval begin="0.00" end="360.00" id="expect_300_vehs">
-        <edge id="bottleneck" sampledSeconds="857.75" traveltime="3.20" overlapTraveltime="3.35" density="24.19" occupancy="11.49" waitingTime="0.00" speed="30.92" departed="0" arrived="0" entered="258" left="255" laneChangedFrom="0" laneChangedTo="0"/>
-        <edge id="end" sampledSeconds="758.11" traveltime="2.85" overlapTraveltime="2.99" density="21.06" occupancy="10.05" waitingTime="0.00" speed="35.11" departed="0" arrived="254" entered="255" left="0" laneChangedFrom="0" laneChangedTo="0"/>
-        <edge id="jam" sampledSeconds="1432.73" traveltime="5.32" overlapTraveltime="5.50" density="40.40" occupancy="9.60" waitingTime="63.00" speed="18.81" departed="0" arrived="0" entered="265" left="258" laneChangedFrom="48" laneChangedTo="48"/>
-        <edge id="middle" sampledSeconds="2204.63" traveltime="7.83" overlapTraveltime="8.20" density="61.24" occupancy="14.63" waitingTime="451.00" speed="12.81" departed="0" arrived="0" entered="275" left="265" laneChangedFrom="77" laneChangedTo="77"/>
-        <edge id="start" sampledSeconds="2038.99" traveltime="6.88" overlapTraveltime="7.30" density="56.64" occupancy="13.35" waitingTime="432.00" speed="14.38" departed="289" arrived="0" entered="0" left="275" laneChangedFrom="5" laneChangedTo="5"/>
+        <edge id="bottleneck" sampledSeconds="842.92" traveltime="3.20" overlapTraveltime="3.35" density="23.77" occupancy="11.30" waitingTime="0.00" speed="30.93" departed="0" arrived="0" entered="253" left="251" laneChangedFrom="0" laneChangedTo="0"/>
+        <edge id="end" sampledSeconds="745.54" traveltime="2.85" overlapTraveltime="2.99" density="20.71" occupancy="9.88" waitingTime="0.00" speed="35.12" departed="0" arrived="250" entered="251" left="0" laneChangedFrom="0" laneChangedTo="0"/>
+        <edge id="jam" sampledSeconds="1433.96" traveltime="5.42" overlapTraveltime="5.61" density="40.44" occupancy="9.59" waitingTime="63.00" speed="18.45" departed="0" arrived="0" entered="261" left="253" laneChangedFrom="52" laneChangedTo="52"/>
+        <edge id="middle" sampledSeconds="2395.35" traveltime="8.57" overlapTraveltime="8.96" density="66.54" occupancy="15.97" waitingTime="487.00" speed="11.73" departed="0" arrived="0" entered="276" left="261" laneChangedFrom="74" laneChangedTo="74"/>
+        <edge id="start" sampledSeconds="1993.40" traveltime="6.64" overlapTraveltime="7.05" density="55.37" occupancy="13.02" waitingTime="409.00" speed="14.89" departed="293" arrived="0" entered="0" left="276" laneChangedFrom="5" laneChangedTo="5"/>
     </interval>
     <interval begin="360.00" end="720.00" id="expect_300_vehs">
-        <edge id="bottleneck" sampledSeconds="911.99" traveltime="4.23" overlapTraveltime="4.40" density="25.72" occupancy="12.20" waitingTime="0.00" speed="23.55" departed="0" arrived="0" entered="207" left="208" laneChangedFrom="0" laneChangedTo="0"/>
-        <edge id="end" sampledSeconds="661.56" traveltime="3.05" overlapTraveltime="3.20" density="18.38" occupancy="8.76" waitingTime="0.00" speed="32.86" departed="0" arrived="207" entered="208" left="0" laneChangedFrom="0" laneChangedTo="0"/>
-        <edge id="jam" sampledSeconds="3494.36" traveltime="16.59" overlapTraveltime="16.88" density="98.54" occupancy="23.58" waitingTime="658.00" speed="6.13" departed="0" arrived="0" entered="206" left="207" laneChangedFrom="110" laneChangedTo="110"/>
-        <edge id="middle" sampledSeconds="6742.73" traveltime="31.28" overlapTraveltime="32.46" density="187.30" occupancy="44.98" waitingTime="3010.00" speed="3.23" departed="0" arrived="0" entered="208" left="206" laneChangedFrom="20" laneChangedTo="20"/>
-        <edge id="start" sampledSeconds="6880.30" traveltime="32.56" overlapTraveltime="34.18" density="191.12" occupancy="44.86" waitingTime="3157.00" speed="3.07" departed="214" arrived="0" entered="0" left="208" laneChangedFrom="19" laneChangedTo="19"/>
+        <edge id="bottleneck" sampledSeconds="873.11" traveltime="4.25" overlapTraveltime="4.43" density="24.62" occupancy="11.68" waitingTime="0.00" speed="23.39" departed="0" arrived="0" entered="197" left="197" laneChangedFrom="0" laneChangedTo="0"/>
+        <edge id="end" sampledSeconds="628.77" traveltime="3.06" overlapTraveltime="3.20" density="17.47" occupancy="8.32" waitingTime="0.00" speed="32.82" departed="0" arrived="196" entered="197" left="0" laneChangedFrom="0" laneChangedTo="0"/>
+        <edge id="jam" sampledSeconds="3716.51" traveltime="18.50" overlapTraveltime="18.80" density="104.81" occupancy="24.85" waitingTime="917.00" speed="5.51" departed="0" arrived="0" entered="200" left="197" laneChangedFrom="125" laneChangedTo="125"/>
+        <edge id="middle" sampledSeconds="7138.38" traveltime="33.35" overlapTraveltime="35.07" density="198.29" occupancy="47.24" waitingTime="3359.00" speed="2.99" departed="0" arrived="0" entered="204" left="200" laneChangedFrom="2" laneChangedTo="2"/>
+        <edge id="start" sampledSeconds="7124.22" traveltime="34.52" overlapTraveltime="36.15" density="197.90" occupancy="46.63" waitingTime="3366.00" speed="2.90" departed="201" arrived="0" entered="0" left="204" laneChangedFrom="9" laneChangedTo="9"/>
     </interval>
     <interval begin="720.00" end="1080.00" id="expect_300_vehs">
-        <edge id="bottleneck" sampledSeconds="916.41" traveltime="4.30" overlapTraveltime="4.47" density="25.84" occupancy="12.25" waitingTime="0.00" speed="23.14" departed="0" arrived="0" entered="205" left="204" laneChangedFrom="0" laneChangedTo="0"/>
-        <edge id="end" sampledSeconds="656.35" traveltime="3.07" overlapTraveltime="3.21" density="18.23" occupancy="8.68" waitingTime="0.00" speed="32.68" departed="0" arrived="205" entered="204" left="0" laneChangedFrom="0" laneChangedTo="0"/>
-        <edge id="jam" sampledSeconds="3720.65" traveltime="17.86" overlapTraveltime="18.16" density="104.93" occupancy="24.98" waitingTime="885.00" speed="5.70" departed="0" arrived="0" entered="207" left="205" laneChangedFrom="120" laneChangedTo="120"/>
-        <edge id="middle" sampledSeconds="6584.93" traveltime="29.52" overlapTraveltime="31.04" density="182.91" occupancy="43.39" waitingTime="2932.00" speed="3.38" departed="0" arrived="0" entered="217" left="207" laneChangedFrom="11" laneChangedTo="11"/>
-        <edge id="start" sampledSeconds="6752.82" traveltime="31.56" overlapTraveltime="33.00" density="187.58" occupancy="44.13" waitingTime="3087.00" speed="3.18" departed="215" arrived="0" entered="0" left="217" laneChangedFrom="23" laneChangedTo="23"/>
+        <edge id="bottleneck" sampledSeconds="909.96" traveltime="4.33" overlapTraveltime="4.51" density="25.66" occupancy="12.16" waitingTime="0.00" speed="22.96" departed="0" arrived="0" entered="203" left="202" laneChangedFrom="0" laneChangedTo="0"/>
+        <edge id="end" sampledSeconds="647.35" traveltime="3.09" overlapTraveltime="3.23" density="17.98" occupancy="8.57" waitingTime="0.00" speed="32.52" departed="0" arrived="201" entered="202" left="0" laneChangedFrom="0" laneChangedTo="0"/>
+        <edge id="jam" sampledSeconds="3728.87" traveltime="18.25" overlapTraveltime="18.55" density="105.16" occupancy="24.87" waitingTime="798.00" speed="5.58" departed="0" arrived="0" entered="195" left="203" laneChangedFrom="119" laneChangedTo="119"/>
+        <edge id="middle" sampledSeconds="7050.28" traveltime="35.17" overlapTraveltime="36.87" density="195.84" occupancy="46.58" waitingTime="3212.00" speed="2.85" departed="0" arrived="0" entered="191" left="195" laneChangedFrom="12" laneChangedTo="12"/>
+        <edge id="start" sampledSeconds="7103.37" traveltime="35.77" overlapTraveltime="37.64" density="197.32" occupancy="46.47" waitingTime="3337.00" speed="2.79" departed="201" arrived="0" entered="0" left="191" laneChangedFrom="14" laneChangedTo="14"/>
     </interval>
     <interval begin="1080.00" end="1440.00" id="expect_300_vehs">
-        <edge id="bottleneck" sampledSeconds="932.14" traveltime="4.44" overlapTraveltime="4.62" density="26.29" occupancy="12.45" waitingTime="0.00" speed="22.40" departed="0" arrived="0" entered="202" left="202" laneChangedFrom="0" laneChangedTo="0"/>
-        <edge id="end" sampledSeconds="654.40" traveltime="3.11" overlapTraveltime="3.25" density="18.18" occupancy="8.66" waitingTime="0.00" speed="32.28" departed="0" arrived="202" entered="202" left="0" laneChangedFrom="0" laneChangedTo="0"/>
-        <edge id="jam" sampledSeconds="3905.69" traveltime="18.73" overlapTraveltime="19.06" density="110.14" occupancy="26.19" waitingTime="814.00" speed="5.43" departed="0" arrived="0" entered="206" left="202" laneChangedFrom="123" laneChangedTo="123"/>
-        <edge id="middle" sampledSeconds="6616.77" traveltime="30.74" overlapTraveltime="32.27" density="183.80" occupancy="43.81" waitingTime="2836.00" speed="3.25" departed="0" arrived="0" entered="208" left="206" laneChangedFrom="13" laneChangedTo="13"/>
-        <edge id="start" sampledSeconds="7043.12" traveltime="35.25" overlapTraveltime="36.62" density="195.64" occupancy="46.13" waitingTime="3391.00" speed="2.87" departed="208" arrived="0" entered="0" left="208" laneChangedFrom="17" laneChangedTo="17"/>
+        <edge id="bottleneck" sampledSeconds="890.31" traveltime="4.24" overlapTraveltime="4.41" density="25.11" occupancy="11.91" waitingTime="0.00" speed="23.45" departed="0" arrived="0" entered="201" left="202" laneChangedFrom="0" laneChangedTo="0"/>
+        <edge id="end" sampledSeconds="643.74" traveltime="3.06" overlapTraveltime="3.20" density="17.88" occupancy="8.52" waitingTime="0.00" speed="32.85" departed="0" arrived="203" entered="202" left="0" laneChangedFrom="0" laneChangedTo="0"/>
+        <edge id="jam" sampledSeconds="3704.03" traveltime="18.01" overlapTraveltime="18.30" density="104.46" occupancy="24.91" waitingTime="962.00" speed="5.65" departed="0" arrived="0" entered="207" left="201" laneChangedFrom="130" laneChangedTo="130"/>
+        <edge id="middle" sampledSeconds="7072.51" traveltime="32.55" overlapTraveltime="34.20" density="196.46" occupancy="46.91" waitingTime="3240.00" speed="3.07" departed="0" arrived="0" entered="207" left="207" laneChangedFrom="1" laneChangedTo="1"/>
+        <edge id="start" sampledSeconds="6894.61" traveltime="32.99" overlapTraveltime="34.20" density="191.52" occupancy="45.07" waitingTime="3055.00" speed="3.07" departed="208" arrived="0" entered="0" left="207" laneChangedFrom="14" laneChangedTo="14"/>
     </interval>
 </meandata>
diff --git a/tests/sumo/cf_model/jam_resolution/bottleneck_departLane_random/output.sumo b/tests/sumo/cf_model/jam_resolution/bottleneck_departLane_random/output.sumo
@@ -5,17 +5,17 @@ Simulation started with time: 0.00
 Simulation ended at time: 1440.00
 Reason: The final simulation step has been reached.
 Performance: 
- Duration: 336ms
- Real time factor: 4285.71
- UPS: 184369.047619
+ Duration: 1169ms
+ Real time factor: 1231.82
+ UPS: 54391.787853
 Vehicles: 
- Inserted: 926 (Loaded: 1200)
- Running: 58
- Waiting: 274
+ Inserted: 903 (Loaded: 1200)
+ Running: 53
+ Waiting: 297
 Statistics (avg):
- RouteLength: 496.58
- Duration: 67.96
- WaitingTime: 22.66
- TimeLoss: 53.71
- DepartDelay: 97.11
+ RouteLength: 498.47
+ Duration: 71.50
+ WaitingTime: 24.52
+ TimeLoss: 57.19
+ DepartDelay: 107.12