Skip to content

Commit

Permalink
patching expected results refs #21, refs #3861
Browse files Browse the repository at this point in the history
  • Loading branch information
@namdre
namdre committed Mar 1, 2018
1 parent 844d4a1 commit 19a5c90
Show file tree
Hide file tree
Showing 16 changed files with 138 additions and 98 deletions.
12 changes: 8 additions & 4 deletions tests/sumo/bugs/ticket3108/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 Oct 26 17:02:25 2017 by SUMO Version dev-SVN-r26746
<!-- generated on Thu Mar 1 14:24:18 2018 by SUMO Version v0_32_0+0644-e3d532b
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 All @@ -14,6 +14,10 @@ SPDX-License-Identifier: EPL-2.0
<additional-files value="input_additional.add.xml,input_additional2.add.xml"/>
</input>
<output>
<write-license value="true"/>
</output>
<report>
<xml-validation value="never"/>
<duration-log.disable value="true"/>
Expand All @@ -24,8 +28,8 @@ SPDX-License-Identifier: EPL-2.0
-->

<e3Detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/det_e3_file.xsd">
<interval begin="0.00" end="992.00" id="e3_0_1i" meanTravelTime="32.01" meanOverlapTravelTime="37.29" meanSpeed="4.89" meanHaltsPerVehicle="26.88" meanTimeLoss="32.24" vehicleSum="16" meanSpeedWithin="-1.00" meanHaltsPerVehicleWithin="-1.00" meanDurationWithin="-1.00" vehicleSumWithin="0" meanIntervalSpeedWithin="-1.00" meanIntervalHaltsPerVehicleWithin="-1.00" meanIntervalDurationWithin="-1.00" meanTimeLossWithin="-1.00"/>
<interval begin="0.00" end="992.00" id="e3_0_2i" meanTravelTime="32.98" meanOverlapTravelTime="34.38" meanSpeed="7.33" meanHaltsPerVehicle="25.18" meanTimeLoss="29.27" vehicleSum="22" meanSpeedWithin="-1.00" meanHaltsPerVehicleWithin="-1.00" meanDurationWithin="-1.00" vehicleSumWithin="0" meanIntervalSpeedWithin="-1.00" meanIntervalHaltsPerVehicleWithin="-1.00" meanIntervalDurationWithin="-1.00" meanTimeLossWithin="-1.00"/>
<interval begin="0.00" end="992.00" id="e3_0_3i" meanTravelTime="29.94" meanOverlapTravelTime="30.84" meanSpeed="8.09" meanHaltsPerVehicle="20.58" meanTimeLoss="25.49" vehicleSum="31" meanSpeedWithin="-1.00" meanHaltsPerVehicleWithin="-1.00" meanDurationWithin="-1.00" vehicleSumWithin="0" meanIntervalSpeedWithin="-1.00" meanIntervalHaltsPerVehicleWithin="-1.00" meanIntervalDurationWithin="-1.00" meanTimeLossWithin="-1.00"/>
<interval begin="0.00" end="992.00" id="e3_0_1i" meanTravelTime="32.18" meanOverlapTravelTime="36.80" meanSpeed="6.10" meanHaltsPerVehicle="26.78" meanTimeLoss="31.76" vehicleSum="18" meanSpeedWithin="-1.00" meanHaltsPerVehicleWithin="-1.00" meanDurationWithin="-1.00" vehicleSumWithin="0" meanIntervalSpeedWithin="-1.00" meanIntervalHaltsPerVehicleWithin="-1.00" meanIntervalDurationWithin="-1.00" meanTimeLossWithin="-1.00"/>
<interval begin="0.00" end="992.00" id="e3_0_2i" meanTravelTime="28.58" meanOverlapTravelTime="29.77" meanSpeed="9.04" meanHaltsPerVehicle="20.95" meanTimeLoss="24.59" vehicleSum="21" meanSpeedWithin="-1.00" meanHaltsPerVehicleWithin="-1.00" meanDurationWithin="-1.00" vehicleSumWithin="0" meanIntervalSpeedWithin="-1.00" meanIntervalHaltsPerVehicleWithin="-1.00" meanIntervalDurationWithin="-1.00" meanTimeLossWithin="-1.00"/>
<interval begin="0.00" end="992.00" id="e3_0_3i" meanTravelTime="32.22" meanOverlapTravelTime="33.23" meanSpeed="7.45" meanHaltsPerVehicle="22.97" meanTimeLoss="27.92" vehicleSum="34" meanSpeedWithin="-1.00" meanHaltsPerVehicleWithin="-1.00" meanDurationWithin="-1.00" vehicleSumWithin="0" meanIntervalSpeedWithin="-1.00" meanIntervalHaltsPerVehicleWithin="-1.00" meanIntervalDurationWithin="-1.00" meanTimeLossWithin="-1.00"/>
<interval begin="0.00" end="992.00" id="e3_0_4i" meanTravelTime="-1.00" meanOverlapTravelTime="-1.00" meanSpeed="-1.00" meanHaltsPerVehicle="-1.00" meanTimeLoss="-1.00" vehicleSum="0" meanSpeedWithin="-1.00" meanHaltsPerVehicleWithin="-1.00" meanDurationWithin="-1.00" vehicleSumWithin="0" meanIntervalSpeedWithin="-1.00" meanIntervalHaltsPerVehicleWithin="-1.00" meanIntervalDurationWithin="-1.00" meanTimeLossWithin="-1.00"/>
</e3Detector>
8 changes: 6 additions & 2 deletions tests/sumo/bugs/ticket3108/detector2.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 Oct 26 17:02:25 2017 by SUMO Version dev-SVN-r26746
<!-- generated on Thu Mar 1 14:24:18 2018 by SUMO Version v0_32_0+0644-e3d532b
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 All @@ -14,6 +14,10 @@ SPDX-License-Identifier: EPL-2.0
<additional-files value="input_additional.add.xml,input_additional2.add.xml"/>
</input>
<output>
<write-license value="true"/>
</output>
<report>
<xml-validation value="never"/>
<duration-log.disable value="true"/>
Expand All @@ -26,6 +30,6 @@ SPDX-License-Identifier: EPL-2.0
<detector xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/det_e2_file.xsd">
<interval begin="0.00" end="992.00" id="e2det_1i_0" sampledSeconds="914.26" nVehEntered="30" nVehLeft="30" nVehSeen="30" meanSpeed="3.45" meanTimeLoss="24.99" meanOccupancy="4.29" maxOccupancy="11.91" meanMaxJamLengthInVehicles="0.59" meanMaxJamLengthInMeters="3.17" maxJamLengthInVehicles="3" maxJamLengthInMeters="20.00" jamLengthInVehiclesSum="582" jamLengthInMetersSum="3141.36" meanHaltingDuration="14.86" maxHaltingDuration="52.00" haltingDurationSum="624.00" meanIntervalHaltingDuration="14.86" maxIntervalHaltingDuration="52.00" intervalHaltingDurationSum="624.00" startedHalts="42.00" meanVehicleNumber="0.96" maxVehicleNumber="3" />
<interval begin="0.00" end="992.00" id="e2det_2i_0" sampledSeconds="935.68" nVehEntered="30" nVehLeft="30" nVehSeen="30" meanSpeed="3.37" meanTimeLoss="25.66" meanOccupancy="4.66" maxOccupancy="14.99" meanMaxJamLengthInVehicles="0.65" meanMaxJamLengthInMeters="3.62" maxJamLengthInVehicles="3" maxJamLengthInMeters="19.80" jamLengthInVehiclesSum="642" jamLengthInMetersSum="3588.19" meanHaltingDuration="31.57" maxHaltingDuration="64.00" haltingDurationSum="663.00" meanIntervalHaltingDuration="31.57" maxIntervalHaltingDuration="64.00" intervalHaltingDurationSum="663.00" startedHalts="21.00" meanVehicleNumber="0.98" maxVehicleNumber="3" />
<interval begin="0.00" end="992.00" id="e2det_3i_0" sampledSeconds="2030.16" nVehEntered="60" nVehLeft="60" nVehSeen="60" meanSpeed="3.11" meanTimeLoss="28.28" meanOccupancy="10.18" maxOccupancy="29.97" meanMaxJamLengthInVehicles="1.38" meanMaxJamLengthInMeters="8.62" maxJamLengthInVehicles="5" maxJamLengthInMeters="33.80" jamLengthInVehiclesSum="1364" jamLengthInMetersSum="8555.25" meanHaltingDuration="32.00" maxHaltingDuration="63.00" haltingDurationSum="1408.00" meanIntervalHaltingDuration="32.00" maxIntervalHaltingDuration="63.00" intervalHaltingDurationSum="1408.00" startedHalts="44.00" meanVehicleNumber="2.12" maxVehicleNumber="6" />
<interval begin="0.00" end="992.00" id="e2det_3i_0" sampledSeconds="2030.23" nVehEntered="60" nVehLeft="60" nVehSeen="60" meanSpeed="3.11" meanTimeLoss="28.28" meanOccupancy="10.18" maxOccupancy="29.97" meanMaxJamLengthInVehicles="1.38" meanMaxJamLengthInMeters="8.62" maxJamLengthInVehicles="5" maxJamLengthInMeters="33.80" jamLengthInVehiclesSum="1364" jamLengthInMetersSum="8555.25" meanHaltingDuration="32.00" maxHaltingDuration="63.00" haltingDurationSum="1408.00" meanIntervalHaltingDuration="32.00" maxIntervalHaltingDuration="63.00" intervalHaltingDurationSum="1408.00" startedHalts="44.00" meanVehicleNumber="2.12" maxVehicleNumber="6" />
<interval begin="0.00" end="992.00" id="e2det_4i_0" sampledSeconds="0.00" nVehEntered="0" nVehLeft="0" nVehSeen="0" meanSpeed="-1.00" meanTimeLoss="-1.00" meanOccupancy="0.00" maxOccupancy="0.00" meanMaxJamLengthInVehicles="0.00" meanMaxJamLengthInMeters="0.00" maxJamLengthInVehicles="0" maxJamLengthInMeters="0.00" jamLengthInVehiclesSum="0" jamLengthInMetersSum="0.00" meanHaltingDuration="0.00" maxHaltingDuration="0.00" haltingDurationSum="0.00" meanIntervalHaltingDuration="0.00" maxIntervalHaltingDuration="0.00" intervalHaltingDurationSum="0.00" startedHalts="0.00" meanVehicleNumber="0.00" maxVehicleNumber="0" />
</detector>
8 changes: 4 additions & 4 deletions tests/sumo/junction_model/internal_lanes/diverging_siblings/input_routes.rou.xml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<routes>
<vType id="slow" maxSpeed="2"/>
<vType id="fast"/>
<vType id="slow" sigma="0" maxSpeed="2"/>
<vType id="fast" sigma="0"/>
<route id="r0" edges="SC CW"/>
<route id="r1" edges="SC CE"/>
<vehicle id="leader" type="slow" route="r0" depart="0"/>
<vehicle id="follower" type="fast" route="r1" depart="1"/>
<vehicle id="leader" type="slow" route="r0" depart="0" departPos="-10"/>
<vehicle id="follower" type="fast" route="r1" depart="1" departPos="-10"/>
</routes>
6 changes: 3 additions & 3 deletions tests/sumo/junction_model/internal_lanes/diverging_siblings/tripinfos.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 11:21:48 2018 by SUMO Version v0_32_0+0634-29c4da1
<!-- generated on Thu Mar 1 14:24:05 2018 by SUMO Version v0_32_0+0644-e3d532b
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 @@ -31,6 +31,6 @@ SPDX-License-Identifier: EPL-2.0
-->

<tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
<tripinfo id="follower" depart="6.00" departLane="SC_0" departPos="5.10" departSpeed="0.00" departDelay="5.00" arrival="83.00" arrivalLane="CE_0" arrivalPos="75.85" arrivalSpeed="13.35" duration="77.00" routeLength="183.06" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="63.30" rerouteNo="0" devices="tripinfo_follower" vType="fast" speedFactor="1.00" vaporized=""/>
<tripinfo id="leader" depart="0.00" departLane="SC_0" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="126.00" arrivalLane="CW_0" arrivalPos="80.05" arrivalSpeed="1.43" duration="126.00" routeLength="189.23" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="31.37" rerouteNo="0" devices="tripinfo_leader" vType="slow" speedFactor="1.00" vaporized=""/>
<tripinfo id="follower" depart="4.00" departLane="SC_0" departPos="66.75" departSpeed="0.00" departDelay="3.00" arrival="23.00" arrivalLane="CE_0" arrivalPos="75.85" arrivalSpeed="13.89" duration="19.00" routeLength="121.41" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="10.22" rerouteNo="0" devices="tripinfo_follower" vType="fast" speedFactor="1.00" vaporized=""/>
<tripinfo id="leader" depart="0.00" departLane="SC_0" departPos="66.75" departSpeed="0.00" departDelay="0.00" arrival="64.00" arrivalLane="CW_0" arrivalPos="80.05" arrivalSpeed="2.00" duration="64.00" routeLength="127.58" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_leader" vType="slow" speedFactor="1.00" vaporized=""/>
</tripinfos>
8 changes: 4 additions & 4 deletions tests/sumo/junction_model/internal_lanes/parallel_siblings/input_routes.rou.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<routes>
<vType id="slow" maxSpeed="2"/>
<vType id="fast"/>
<vType id="slow" sigma="0" maxSpeed="2"/>
<vType id="fast" sigma="0"/>
<route id="r0" edges="SC CN"/>
<vehicle id="leader" type="slow" route="r0" depart="0" arrivalLane="0"/>
<vehicle id="follower" type="fast" route="r0" depart="1" arrivalLane="1"/>
<vehicle id="leader" type="slow" route="r0" depart="0" departPos="-10" arrivalLane="0"/>
<vehicle id="follower" type="fast" route="r0" depart="1" departPos="-10" arrivalLane="1"/>
</routes>
6 changes: 3 additions & 3 deletions tests/sumo/junction_model/internal_lanes/parallel_siblings/tripinfos.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 11:21:48 2018 by SUMO Version v0_32_0+0634-29c4da1
<!-- generated on Thu Mar 1 13:00:58 2018 by SUMO Version v0_32_0+0635-8a87e73
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 @@ -31,6 +31,6 @@ SPDX-License-Identifier: EPL-2.0
-->

<tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
<tripinfo id="follower" depart="6.00" departLane="SC_0" departPos="5.10" departSpeed="0.00" departDelay="5.00" arrival="88.00" arrivalLane="CN_1" arrivalPos="76.75" arrivalSpeed="13.29" duration="82.00" routeLength="194.91" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="67.07" rerouteNo="0" devices="tripinfo_follower" vType="fast" speedFactor="1.00" vaporized=""/>
<tripinfo id="leader" depart="0.00" departLane="SC_0" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="126.00" arrivalLane="CN_0" arrivalPos="76.75" arrivalSpeed="1.88" duration="126.00" routeLength="194.91" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="28.13" rerouteNo="0" devices="tripinfo_leader" vType="slow" speedFactor="1.00" vaporized=""/>
<tripinfo id="follower" depart="4.00" departLane="SC_0" departPos="66.75" departSpeed="0.00" departDelay="3.00" arrival="37.00" arrivalLane="CN_1" arrivalPos="76.75" arrivalSpeed="13.89" duration="33.00" routeLength="133.26" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="23.06" rerouteNo="0" devices="tripinfo_follower" vType="fast" speedFactor="1.00" vaporized=""/>
<tripinfo id="leader" depart="0.00" departLane="SC_0" departPos="66.75" departSpeed="0.00" departDelay="0.00" arrival="67.00" arrivalLane="CN_0" arrivalPos="76.75" arrivalSpeed="2.00" duration="67.00" routeLength="133.26" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_leader" vType="slow" speedFactor="1.00" vaporized=""/>
</tripinfos>
10 changes: 7 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 Oct 26 17:01:59 2017 by SUMO Version dev-SVN-r26746
<!-- generated on Thu Mar 1 14:23:41 2018 by SUMO Version v0_32_0+0644-e3d532b
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 All @@ -14,6 +14,10 @@ SPDX-License-Identifier: EPL-2.0
<additional-files value="input_additional.add.xml"/>
</input>

<output>
<write-license value="true"/>
</output>

<time>
<begin value="0"/>
<end value="1000"/>
Expand Down Expand Up @@ -15920,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.75" 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.87" 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 @@ -15936,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.30" 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.18" 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

0 comments on commit 19a5c90

Please sign in to comment.