Skip to content

Commit

Permalink
patching expected results refs #3861
Browse files Browse the repository at this point in the history
  • Loading branch information
@namdre
namdre committed Mar 2, 2018
1 parent 1be5765 commit c3b03f8
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 28 deletions.
6 changes: 3 additions & 3 deletions tests/sumo/output/examples/cross3ltl_inductloops/detector.sumo
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on Thu Mar 1 14:23:41 2018 by SUMO Version v0_32_0+0644-e3d532b
<!-- generated on Fri Mar 2 08:00:55 2018 by SUMO Version v0_32_0+0651-9ba87dc
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
Expand Down Expand Up @@ -15924,7 +15924,7 @@ SPDX-License-Identifier: EPL-2.0
<interval begin="993.00" end="994.00" id="1si_0" nVehContrib="0" flow="0.00" occupancy="0.00" speed="-1.00" length="-1.00" nVehEntered="0"/>
<interval begin="993.00" end="994.00" id="1si_1" nVehContrib="0" flow="0.00" occupancy="0.00" speed="-1.00" length="-1.00" nVehEntered="0"/>
<interval begin="993.00" end="994.00" id="1si_2" nVehContrib="0" flow="0.00" occupancy="100.00" speed="-1.00" length="-1.00" nVehEntered="0"/>
<interval begin="993.00" end="994.00" id="2si_0" nVehContrib="0" flow="0.00" occupancy="24.87" speed="-1.00" length="-1.00" nVehEntered="1"/>
<interval begin="993.00" end="994.00" id="2si_0" nVehContrib="0" flow="0.00" occupancy="24.75" speed="-1.00" length="-1.00" nVehEntered="1"/>
<interval begin="993.00" end="994.00" id="2si_1" nVehContrib="0" flow="0.00" occupancy="0.00" speed="-1.00" length="-1.00" nVehEntered="0"/>
<interval begin="993.00" end="994.00" id="2si_2" nVehContrib="0" flow="0.00" occupancy="0.00" speed="-1.00" length="-1.00" nVehEntered="0"/>
<interval begin="993.00" end="994.00" id="3si_0" nVehContrib="0" flow="0.00" occupancy="0.00" speed="-1.00" length="-1.00" nVehEntered="0"/>
Expand All @@ -15940,7 +15940,7 @@ SPDX-License-Identifier: EPL-2.0
<interval begin="994.00" end="995.00" id="1si_0" nVehContrib="1" flow="3600.00" occupancy="48.13" speed="10.39" length="5.00" nVehEntered="1"/>
<interval begin="994.00" end="995.00" id="1si_1" nVehContrib="0" flow="0.00" occupancy="0.00" speed="-1.00" length="-1.00" nVehEntered="0"/>
<interval begin="994.00" end="995.00" id="1si_2" nVehContrib="0" flow="0.00" occupancy="100.00" speed="-1.00" length="-1.00" nVehEntered="0"/>
<interval begin="994.00" end="995.00" id="2si_0" nVehContrib="1" flow="3600.00" occupancy="15.18" speed="12.48" length="5.00" nVehEntered="0"/>
<interval begin="994.00" end="995.00" id="2si_0" nVehContrib="1" flow="3600.00" occupancy="15.30" speed="12.48" length="5.00" nVehEntered="0"/>
<interval begin="994.00" end="995.00" id="2si_1" nVehContrib="0" flow="0.00" occupancy="0.00" speed="-1.00" length="-1.00" nVehEntered="0"/>
<interval begin="994.00" end="995.00" id="2si_2" nVehContrib="0" flow="0.00" occupancy="0.00" speed="-1.00" length="-1.00" nVehEntered="0"/>
<interval begin="994.00" end="995.00" id="3si_0" nVehContrib="0" flow="0.00" occupancy="0.00" speed="-1.00" length="-1.00" nVehEntered="0"/>
Expand Down
10 changes: 5 additions & 5 deletions tests/sumo/output/examples/cross3ltl_meandata_constrained/aggregated900.sumo
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on Thu Mar 1 14:23:41 2018 by SUMO Version v0_32_0+0644-e3d532b
<!-- generated on Fri Mar 2 08:00:55 2018 by SUMO Version v0_32_0+0651-9ba87dc
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
Expand Down Expand Up @@ -37,9 +37,9 @@ SPDX-License-Identifier: EPL-2.0
<edge id="1fi" sampledSeconds="5029.68" traveltime="24.70" overlapTraveltime="25.17" density="22.49" occupancy="11.07" waitingTime="0.00" speed="10.07" departed="78" arrived="15" entered="129" left="182" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="1o" sampledSeconds="6381.79" traveltime="47.06" overlapTraveltime="47.56" density="14.51" occupancy="7.18" waitingTime="0.00" speed="10.38" departed="0" arrived="0" entered="137" left="129" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="1si" sampledSeconds="12475.50" traveltime="71.55" overlapTraveltime="73.35" density="58.45" occupancy="9.66" waitingTime="6612.00" speed="3.30" departed="0" arrived="0" entered="182" left="155" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="2fi" sampledSeconds="5906.79" traveltime="24.66" overlapTraveltime="25.13" density="26.41" occupancy="13.00" waitingTime="0.00" speed="10.09" departed="79" arrived="56" entered="163" left="177" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="2fi" sampledSeconds="5906.84" traveltime="24.66" overlapTraveltime="25.13" density="26.41" occupancy="13.00" waitingTime="0.00" speed="10.09" departed="79" arrived="56" entered="163" left="177" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="2o" sampledSeconds="8043.38" traveltime="47.06" overlapTraveltime="47.58" density="18.29" occupancy="9.05" waitingTime="0.00" speed="10.38" departed="0" arrived="0" entered="172" left="164" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="2si" sampledSeconds="8649.76" traveltime="48.67" overlapTraveltime="50.12" density="40.53" occupancy="6.67" waitingTime="4202.00" speed="4.83" departed="0" arrived="0" entered="177" left="167" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="2si" sampledSeconds="8649.71" traveltime="48.67" overlapTraveltime="50.11" density="40.53" occupancy="6.67" waitingTime="4202.00" speed="4.83" departed="0" arrived="0" entered="177" left="167" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="3fi" sampledSeconds="6303.25" traveltime="25.19" overlapTraveltime="25.66" density="28.18" occupancy="13.92" waitingTime="0.00" speed="9.88" departed="143" arrived="81" entered="111" left="164" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="3o" sampledSeconds="5653.30" traveltime="47.19" overlapTraveltime="47.72" density="12.85" occupancy="6.36" waitingTime="0.00" speed="10.34" departed="0" arrived="0" entered="126" left="111" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="3si" sampledSeconds="7772.54" traveltime="46.67" overlapTraveltime="47.96" density="36.42" occupancy="6.00" waitingTime="3808.00" speed="5.05" departed="0" arrived="0" entered="164" left="146" laneChangedFrom="0" laneChangedTo="0"/>
Expand All @@ -60,13 +60,13 @@ SPDX-License-Identifier: EPL-2.0
<lane id="1si_2" sampledSeconds="9025.34" traveltime="127.38" overlapTraveltime="131.17" density="42.29" occupancy="21.01" waitingTime="5293.00" speed="1.85" departed="0" arrived="0" entered="76" left="58" laneChangedFrom="0" laneChangedTo="0"/>
</edge>
<edge id="2fi">
<lane id="2fi_0" sampledSeconds="5906.79" traveltime="24.66" overlapTraveltime="25.13" density="26.41" occupancy="13.00" waitingTime="0.00" speed="10.09" departed="79" arrived="56" entered="163" left="177" laneChangedFrom="0" laneChangedTo="0"/>
<lane id="2fi_0" sampledSeconds="5906.84" traveltime="24.66" overlapTraveltime="25.13" density="26.41" occupancy="13.00" waitingTime="0.00" speed="10.09" departed="79" arrived="56" entered="163" left="177" laneChangedFrom="0" laneChangedTo="0"/>
</edge>
<edge id="2o">
<lane id="2o_0" sampledSeconds="8043.38" traveltime="47.06" overlapTraveltime="47.58" density="18.29" occupancy="9.05" waitingTime="0.00" speed="10.38" departed="0" arrived="0" entered="172" left="164" laneChangedFrom="0" laneChangedTo="0"/>
</edge>
<edge id="2si">
<lane id="2si_0" sampledSeconds="3560.71" traveltime="58.59" overlapTraveltime="59.28" density="16.68" occupancy="8.27" waitingTime="2027.00" speed="4.09" departed="0" arrived="0" entered="61" left="58" laneChangedFrom="0" laneChangedTo="0"/>
<lane id="2si_0" sampledSeconds="3560.66" traveltime="58.59" overlapTraveltime="59.28" density="16.68" occupancy="8.27" waitingTime="2027.00" speed="4.09" departed="0" arrived="0" entered="61" left="58" laneChangedFrom="0" laneChangedTo="0"/>
<lane id="2si_1" sampledSeconds="2893.84" traveltime="37.35" overlapTraveltime="37.98" density="13.56" occupancy="6.69" waitingTime="1190.00" speed="6.38" departed="0" arrived="0" entered="77" left="73" laneChangedFrom="0" laneChangedTo="0"/>
<lane id="2si_2" sampledSeconds="2195.21" traveltime="56.01" overlapTraveltime="60.42" density="10.29" occupancy="5.06" waitingTime="985.00" speed="4.01" departed="0" arrived="0" entered="39" left="36" laneChangedFrom="0" laneChangedTo="0"/>
</edge>
Expand Down
6 changes: 3 additions & 3 deletions tests/sumo/output/examples/cross3ltl_meandata_edges/aggregated300.sumo
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on Thu Mar 1 14:23:41 2018 by SUMO Version v0_32_0+0644-e3d532b
<!-- generated on Fri Mar 2 08:00:55 2018 by SUMO Version v0_32_0+0651-9ba87dc
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
Expand Down Expand Up @@ -65,9 +65,9 @@ SPDX-License-Identifier: EPL-2.0
<edge id="1fi" sampledSeconds="2619.01" traveltime="24.48" overlapTraveltime="24.94" density="35.13" occupancy="17.28" waitingTime="0.00" speed="10.16" departed="29" arrived="15" entered="78" left="88" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="1o" sampledSeconds="3651.50" traveltime="47.10" overlapTraveltime="47.59" density="24.91" occupancy="12.33" waitingTime="0.00" speed="10.37" departed="0" arrived="0" entered="72" left="78" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="1si" sampledSeconds="7463.34" traveltime="87.79" overlapTraveltime="89.44" density="104.90" occupancy="17.36" waitingTime="4153.00" speed="2.71" departed="0" arrived="0" entered="89" left="80" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="2fi" sampledSeconds="2693.72" traveltime="24.57" overlapTraveltime="25.05" density="36.13" occupancy="17.78" waitingTime="0.00" speed="10.12" departed="30" arrived="26" entered="79" left="81" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="2fi" sampledSeconds="2693.77" traveltime="24.57" overlapTraveltime="25.05" density="36.13" occupancy="17.78" waitingTime="0.00" speed="10.12" departed="30" arrived="26" entered="79" left="81" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="2o" sampledSeconds="3690.23" traveltime="47.07" overlapTraveltime="47.59" density="25.17" occupancy="12.45" waitingTime="0.00" speed="10.37" departed="0" arrived="0" entered="72" left="80" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="2si" sampledSeconds="4110.12" traveltime="51.02" overlapTraveltime="52.69" density="57.77" occupancy="9.51" waitingTime="2021.00" speed="4.60" departed="0" arrived="0" entered="81" left="79" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="2si" sampledSeconds="4110.07" traveltime="51.02" overlapTraveltime="52.69" density="57.77" occupancy="9.51" waitingTime="2021.00" speed="4.60" departed="0" arrived="0" entered="81" left="79" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="3fi" sampledSeconds="2986.97" traveltime="24.73" overlapTraveltime="25.20" density="40.07" occupancy="19.77" waitingTime="0.00" speed="10.06" departed="45" arrived="57" entered="75" left="63" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="3o" sampledSeconds="3653.13" traveltime="47.16" overlapTraveltime="47.67" density="24.92" occupancy="12.33" waitingTime="0.00" speed="10.36" departed="0" arrived="0" entered="78" left="74" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="3si" sampledSeconds="3539.02" traveltime="52.65" overlapTraveltime="54.41" density="49.74" occupancy="8.20" waitingTime="1847.00" speed="4.45" departed="0" arrived="0" entered="63" left="59" laneChangedFrom="0" laneChangedTo="0"/>
Expand Down
6 changes: 3 additions & 3 deletions tests/sumo/output/examples/cross3ltl_meandata_edges/aggregated60.sumo
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on Thu Mar 1 14:23:41 2018 by SUMO Version v0_32_0+0644-e3d532b
<!-- generated on Fri Mar 2 08:00:55 2018 by SUMO Version v0_32_0+0651-9ba87dc
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
Expand Down Expand Up @@ -205,9 +205,9 @@ SPDX-License-Identifier: EPL-2.0
<edge id="1fi" sampledSeconds="499.49" traveltime="24.53" overlapTraveltime="24.98" density="33.50" occupancy="16.46" waitingTime="0.00" speed="10.15" departed="5" arrived="5" entered="14" left="18" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="1o" sampledSeconds="700.06" traveltime="47.19" overlapTraveltime="47.68" density="23.88" occupancy="11.79" waitingTime="0.00" speed="10.35" departed="0" arrived="0" entered="20" left="14" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="1si" sampledSeconds="1576.92" traveltime="82.24" overlapTraveltime="83.78" density="110.82" occupancy="18.37" waitingTime="997.00" speed="2.89" departed="0" arrived="0" entered="18" left="14" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="2fi" sampledSeconds="544.17" traveltime="24.57" overlapTraveltime="25.04" density="36.50" occupancy="17.95" waitingTime="0.00" speed="10.12" departed="7" arrived="9" entered="15" left="15" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="2fi" sampledSeconds="544.22" traveltime="24.57" overlapTraveltime="25.04" density="36.50" occupancy="17.95" waitingTime="0.00" speed="10.12" departed="7" arrived="9" entered="15" left="15" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="2o" sampledSeconds="653.11" traveltime="46.87" overlapTraveltime="47.36" density="22.28" occupancy="10.99" waitingTime="0.00" speed="10.42" departed="0" arrived="0" entered="19" left="15" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="2si" sampledSeconds="1004.42" traveltime="59.59" overlapTraveltime="61.01" density="70.59" occupancy="11.66" waitingTime="557.00" speed="3.97" departed="0" arrived="0" entered="15" left="15" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="2si" sampledSeconds="1004.37" traveltime="59.58" overlapTraveltime="61.01" density="70.59" occupancy="11.66" waitingTime="557.00" speed="3.97" departed="0" arrived="0" entered="15" left="15" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="3fi" sampledSeconds="576.46" traveltime="24.19" overlapTraveltime="24.67" density="38.66" occupancy="19.03" waitingTime="0.00" speed="10.28" departed="3" arrived="11" entered="21" left="12" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="3o" sampledSeconds="854.86" traveltime="47.05" overlapTraveltime="47.54" density="29.16" occupancy="14.43" waitingTime="0.00" speed="10.38" departed="0" arrived="0" entered="15" left="21" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="3si" sampledSeconds="515.14" traveltime="45.89" overlapTraveltime="48.48" density="36.20" occupancy="5.90" waitingTime="195.00" speed="4.99" departed="0" arrived="0" entered="12" left="20" laneChangedFrom="0" laneChangedTo="0"/>
Expand Down
6 changes: 3 additions & 3 deletions tests/sumo/output/examples/cross3ltl_meandata_edges/aggregated900.sumo
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on Thu Mar 1 14:23:41 2018 by SUMO Version v0_32_0+0644-e3d532b
<!-- generated on Fri Mar 2 08:00:55 2018 by SUMO Version v0_32_0+0651-9ba87dc
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
Expand Down Expand Up @@ -37,9 +37,9 @@ SPDX-License-Identifier: EPL-2.0
<edge id="1fi" sampledSeconds="5029.68" traveltime="24.70" overlapTraveltime="25.17" density="22.49" occupancy="11.07" waitingTime="0.00" speed="10.07" departed="78" arrived="15" entered="129" left="182" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="1o" sampledSeconds="6381.79" traveltime="47.06" overlapTraveltime="47.56" density="14.51" occupancy="7.18" waitingTime="0.00" speed="10.38" departed="0" arrived="0" entered="137" left="129" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="1si" sampledSeconds="12475.50" traveltime="71.55" overlapTraveltime="73.35" density="58.45" occupancy="9.66" waitingTime="6612.00" speed="3.30" departed="0" arrived="0" entered="182" left="155" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="2fi" sampledSeconds="5906.79" traveltime="24.66" overlapTraveltime="25.13" density="26.41" occupancy="13.00" waitingTime="0.00" speed="10.09" departed="79" arrived="56" entered="163" left="177" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="2fi" sampledSeconds="5906.84" traveltime="24.66" overlapTraveltime="25.13" density="26.41" occupancy="13.00" waitingTime="0.00" speed="10.09" departed="79" arrived="56" entered="163" left="177" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="2o" sampledSeconds="8043.38" traveltime="47.06" overlapTraveltime="47.58" density="18.29" occupancy="9.05" waitingTime="0.00" speed="10.38" departed="0" arrived="0" entered="172" left="164" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="2si" sampledSeconds="8649.76" traveltime="48.67" overlapTraveltime="50.12" density="40.53" occupancy="6.67" waitingTime="4202.00" speed="4.83" departed="0" arrived="0" entered="177" left="167" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="2si" sampledSeconds="8649.71" traveltime="48.67" overlapTraveltime="50.11" density="40.53" occupancy="6.67" waitingTime="4202.00" speed="4.83" departed="0" arrived="0" entered="177" left="167" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="3fi" sampledSeconds="6303.25" traveltime="25.19" overlapTraveltime="25.66" density="28.18" occupancy="13.92" waitingTime="0.00" speed="9.88" departed="143" arrived="81" entered="111" left="164" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="3o" sampledSeconds="5653.30" traveltime="47.19" overlapTraveltime="47.72" density="12.85" occupancy="6.36" waitingTime="0.00" speed="10.34" departed="0" arrived="0" entered="126" left="111" laneChangedFrom="0" laneChangedTo="0"/>
<edge id="3si" sampledSeconds="7772.54" traveltime="46.67" overlapTraveltime="47.96" density="36.42" occupancy="6.00" waitingTime="3808.00" speed="5.05" departed="0" arrived="0" entered="164" left="146" laneChangedFrom="0" laneChangedTo="0"/>
Expand Down
Loading

0 comments on commit c3b03f8

Please sign in to comment.