Skip to content

Commit

Permalink
Updated demand tests. Refs #13134 and #3045
Browse files Browse the repository at this point in the history
  • Loading branch information
palvarezlopez committed Jul 21, 2023
1 parent 9f98f2a commit f16c790
Show file tree
Hide file tree
Showing 32 changed files with 117 additions and 97 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<route edges="Edge0 Edge1 Edge2" color="yellow" id="route_0">
<stop busStop="busStopA" duration="70.00" until="12.00" extension="10.00" expected="perA perB" parking="1" permitted="A B" actType="walking" triggered="person" tripId="tripA" line="lineA" onDemand="false"/>
</route>
<route edges="EdgeCenter0 EdgeCenter1" color="yellow" id="route_1">
<stop busStop="busStopB" duration="60.00" until="20.00" extension="20.00" expected="conA conB" parking="0" permitted="C D" actType="singing" triggered="container" tripId="tripB" line="lineB" onDemand="true"/>
</route>
</routes>
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,10 @@
-->

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<trip id="trip" depart="0.00" from="Edge0" to="Edge2">
<trip id="tripA" depart="0.00" from="Edge0" to="Edge2">
<stop containerStop="containerStopA" duration="70.00" until="12.00" extension="10.00" expected="perA perB" parking="1" permitted="A B" actType="walking" triggered="person" tripId="tripA" line="lineA" onDemand="true"/>
</trip>
<trip id="tripB" depart="0.00" from="EdgeCenter0" to="EdgeCenter1">
<stop containerStop="containerStopB" duration="60.00" until="20.00" extension="20.00" expected="conA conB" parking="0" permitted="C D" actType="singing" triggered="container" tripId="tripB" line="lineB" onDemand="false"/>
</trip>
</routes>
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<route edges="Edge0 Edge1 Edge2" color="yellow" id="route_0">
<stop lane="Edge0_0" startPos="7.00" friendlyPos="0" posLat="10.00" endPos="17.00" duration="70.00" until="12.00" extension="10.00" expected="perA perB" parking="1" permitted="A B" actType="walking" triggered="person" tripId="tripA" line="lineA" onDemand="true"/>
<stop lane="Edge2_0" startPos="7.00" friendlyPos="1" posLat="20.00" endPos="17.00" duration="60.00" until="20.00" extension="20.00" expected="conA conB" parking="0" permitted="C D" actType="singing" triggered="container" tripId="tripB" line="lineB" onDemand="false"/>
<stop lane="Edge0_1" startPos="7.00" friendlyPos="0" posLat="10.00" endPos="17.00" duration="70.00" until="12.00" extension="10.00" expected="perA perB" parking="1" permitted="A B" actType="walking" triggered="person" tripId="tripA" line="lineA" onDemand="true"/>
</route>
<route edges="EdgeCenter0 EdgeCenter1" color="yellow" id="route_1">
<stop lane="EdgeCenter1_0" startPos="7.00" friendlyPos="1" posLat="20.00" endPos="17.00" duration="60.00" until="20.00" extension="20.00" expected="conA conB" parking="0" permitted="C D" actType="singing" triggered="container" tripId="tripB" line="lineB" onDemand="false"/>
</route>
</routes>
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@
<route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>

<flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" actType=""/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" actType=""/>
</flow>

<flow id="routeFlow_1" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" actType=";;;;"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" actType=";;;;"/>
</flow>

<flow id="routeFlow_2" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" actType="waiting"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" actType="waiting"/>
</flow>

</routes>
Original file line number Diff line number Diff line change
Expand Up @@ -41,27 +41,27 @@
<route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>

<flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" containerTriggered="dummy"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" containerTriggered="dummy"/>
</flow>

<flow id="routeFlow_1" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" containerTriggered=""/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" containerTriggered=""/>
</flow>

<flow id="routeFlow_2" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" containerTriggered="-4"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" containerTriggered="-4"/>
</flow>

<flow id="routeFlow_3" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" containerTriggered="0"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" containerTriggered="0"/>
</flow>

<flow id="routeFlow_4" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" containerTriggered="2.3"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" containerTriggered="2.3"/>
</flow>

<flow id="routeFlow_5" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" containerTriggered="true"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" containerTriggered="true"/>
</flow>

</routes>
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>

<flow id="routeFlow" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00"/>
</flow>

</routes>
Original file line number Diff line number Diff line change
Expand Up @@ -41,23 +41,23 @@
<route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>

<flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" duration="dummyDuration"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" duration="dummyDuration"/>
</flow>

<flow id="routeFlow_1" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" duration=""/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" duration=""/>
</flow>

<flow id="routeFlow_2" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" duration="-3"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" duration="-3"/>
</flow>

<flow id="routeFlow_3" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" duration="0"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" duration="0"/>
</flow>

<flow id="routeFlow_4" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" duration="2"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" duration="2"/>
</flow>

</routes>
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,19 @@
<route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>

<flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" triggered="1" expected=""/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" triggered="1" expected=""/>
</flow>

<flow id="routeFlow_1" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" triggered="1" expected=";;;;"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" triggered="1" expected=";;;;"/>
</flow>

<flow id="routeFlow_2" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" triggered="1" expected="ID1"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" triggered="1" expected="ID1"/>
</flow>

<flow id="routeFlow_3" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" triggered="1" expected="ID1 ID2"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" triggered="1" expected="ID1 ID2"/>
</flow>

</routes>
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,19 @@
<route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>

<flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" containerTriggered="1" expectedContainers=""/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" containerTriggered="1" expectedContainers=""/>
</flow>

<flow id="routeFlow_1" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" containerTriggered="1" expectedContainers=";;;;"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" containerTriggered="1" expectedContainers=";;;;"/>
</flow>

<flow id="routeFlow_2" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" containerTriggered="1" expectedContainers="ID1"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" containerTriggered="1" expectedContainers="ID1"/>
</flow>

<flow id="routeFlow_3" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" containerTriggered="1" expectedContainers="ID1 ID2"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" containerTriggered="1" expectedContainers="ID1 ID2"/>
</flow>

</routes>
Original file line number Diff line number Diff line change
Expand Up @@ -41,23 +41,23 @@
<route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>

<flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" duration="60.00" extension="dummyDuration"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" duration="60.00" extension="dummyDuration"/>
</flow>

<flow id="routeFlow_1" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" duration="60.00" extension=""/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" duration="60.00" extension=""/>
</flow>

<flow id="routeFlow_2" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" duration="60.00" extension="-4"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" duration="60.00" extension="-4"/>
</flow>

<flow id="routeFlow_3" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" duration="60.00" extension="0"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" duration="60.00" extension="0"/>
</flow>

<flow id="routeFlow_4" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" duration="60.00" extension="2.3"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" duration="60.00" extension="2.3"/>
</flow>

</routes>
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@
<route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>

<flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" line=""/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" line=""/>
</flow>

<flow id="routeFlow_1" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" line=";;;;"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" line=";;;;"/>
</flow>

<flow id="routeFlow_2" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" line="customLine"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" line="customLine"/>
</flow>

</routes>
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@
<route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>

<flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" onDemand=""/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" onDemand=""/>
</flow>

<flow id="routeFlow_1" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" onDemand="true"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" onDemand="true"/>
</flow>

</routes>
Original file line number Diff line number Diff line change
Expand Up @@ -41,27 +41,27 @@
<route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>

<flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" parking="dummy"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" parking="dummy"/>
</flow>

<flow id="routeFlow_1" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" parking=""/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" parking=""/>
</flow>

<flow id="routeFlow_2" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" parking="-4"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" parking="-4"/>
</flow>

<flow id="routeFlow_3" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" parking="0"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" parking="0"/>
</flow>

<flow id="routeFlow_4" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" parking="2.3"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" parking="2.3"/>
</flow>

<flow id="routeFlow_5" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" parking="true"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" parking="true"/>
</flow>

</routes>
Original file line number Diff line number Diff line change
Expand Up @@ -41,27 +41,27 @@
<route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>

<flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" triggered="dummy"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" triggered="dummy"/>
</flow>

<flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" triggered=""/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" triggered=""/>
</flow>

<flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" triggered="-4"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" triggered="-4"/>
</flow>

<flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" triggered="0"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" triggered="0"/>
</flow>

<flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" triggered="2.3"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" triggered="2.3"/>
</flow>

<flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" triggered="true"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" triggered="true"/>
</flow>

</routes>
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@
<route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>

<flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" tripId=""/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" tripId=""/>
</flow>

<flow id="routeFlow_1" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" tripId=";;;;"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" tripId=";;;;"/>
</flow>

<flow id="routeFlow_2" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" tripId="customTripID"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" tripId="customTripID"/>
</flow>

</routes>
10 changes: 5 additions & 5 deletions tests/netedit/demandelements/stop/lane/load/until/routes.rou.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,23 +41,23 @@
<route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/>

<flow id="routeFlow_0" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" until="dummyDuration"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" until="dummyDuration"/>
</flow>

<flow id="routeFlow_1" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" until=""/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" until=""/>
</flow>

<flow id="routeFlow_2" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" until="-4"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" until="-4"/>
</flow>

<flow id="routeFlow_3" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" until="0"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" until="0"/>
</flow>

<flow id="routeFlow_4" begin="0.00" route="route_0" end="3600.00" number="18">
<stop lane="Edge2_0" startPos="7.00" endPos="17.00" until="2.3"/>
<stop lane="Edge2_1" startPos="7.00" endPos="17.00" until="2.3"/>
</flow>

</routes>
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@
<vehicle id="vehicle_0" depart="0.00">
<route edges="Edge0 Edge1 Edge2" color="yellow"/>
<stop parkingArea="parkingAreaA" duration="70.00" until="12.00" extension="10.00" expected="perA perB" permitted="A B" actType="walking" triggered="person" tripId="tripA" line="lineA" onDemand="true"/>
</vehicle>
<vehicle id="vehicle_1" depart="0.00">
<route edges="EdgeCenter0 EdgeCenter1" color="yellow"/>
<stop parkingArea="parkingAreaB" duration="60.00" until="20.00" extension="20.00" expected="conA conB" permitted="C D" actType="singing" triggered="container" tripId="tripB" line="lineB" onDemand="false"/>
</vehicle>
</routes>
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<route edges="Edge0 Edge1 Edge2" color="yellow" id="route_0">
<stop busStop="busStopA" duration="70.00" until="12.00" extension="10.00" parking="1" permitted="A B" actType="walking" speed="10" tripId="tripA" line="lineA"/>
</route>
<route edges="EdgeCenter0 EdgeCenter1" color="yellow" id="route_1">
<stop busStop="busStopB" duration="60.00" until="20.00" extension="20.00" parking="0" permitted="C D" actType="singing" speed="22.5" tripId="tripB" line="lineB"/>
</route>
</routes>
Loading

0 comments on commit f16c790

Please sign in to comment.