Skip to content

Commit

Permalink
added test refs #4612
Browse files Browse the repository at this point in the history
  • Loading branch information
namdre committed Sep 18, 2018
1 parent 016c09d commit c0912c9
Show file tree
Hide file tree
Showing 8 changed files with 380 additions and 0 deletions.
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on Tue 18 Sep 2018 03:19:40 PM CEST by Eclipse SUMO netedit Version 5345f89a38
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
<input>
<sumo-net-file value="/home/drone/EURECOM/Projects/GITLAB/PTW-virtual-lane/highway/small.net.xml"/>
</input>
<output>
<output-file value="/home/drone/Downloads/Jakob/parking/small.net.xml"/>
</output>
<processing>
<offset.disable-normalization value="true"/>
<lefthand value="false"/>
</processing>
<junctions>
<no-turnarounds value="true"/>
<junctions.corner-detail value="5"/>
<junctions.limit-turn-speed value="5.5"/>
<rectangular-lane-cut value="false"/>
</junctions>
<pedestrian>
<walkingareas value="false"/>
</pedestrian>
</configuration>
-->

<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
<parkingArea id="parkingArea_gneE24_0_0" lane="gneE24_0" friendlyPos="1" roadsideCapacity="10" startPos="20.00" endPos="25.00"/>
<!-- <parkingArea id="parkingArea_gneE25_0_2" lane="gneE25_0" friendlyPos="1" roadsideCapacity="10" startPos="20.00" endPos="80.00"/> -->
<parkingArea id="parkingArea_gneE27_0_1" lane="gneE27_0" friendlyPos="1" roadsideCapacity="10" startPos="40.00" endPos="45.00"/>
<parkingArea id="parkingArea_gneE28_0_3" lane="gneE28_0" friendlyPos="1" roadsideCapacity="10" startPos="40.00" endPos="45.00"/>

<rerouter id="gneE27_0_1" edges="gneE27">
<interval begin="0.0" end="86400">
<!-- in order of distance -->
<parkingAreaReroute id="parkingArea_gneE28_0_3" visible="true"/>
<!-- <parkingAreaReroute id="parkingArea_gneE25_0_2" visible="true"/> -->
<parkingAreaReroute id="parkingArea_gneE27_0_1" visible="true"/>
</interval>
</rerouter>
<rerouter id="gneE24_0_0" edges="gneE24">
<interval begin="0.0" end="86400">
<!-- in order of distance -->
<parkingAreaReroute id="parkingArea_gneE28_0_3" visible="true"/>
<!-- <parkingAreaReroute id="parkingArea_gneE25_0_2" visible="true"/> -->
<parkingAreaReroute id="parkingArea_gneE27_0_1" visible="true"/>
<parkingAreaReroute id="parkingArea_gneE24_0_0" visible="true"/>
</interval>
</rerouter>
</additional>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<flow id="passenger" from="gneE30" to="gneE28" begin="0.0" end="750" number="20">
<stop parkingArea="parkingArea_gneE27_0_1" duration="3600"/>
</flow>
</routes>
118 changes: 118 additions & 0 deletions tests/sumo/extended/rerouter/parking/skip_too_close/net.net.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on Tue 18 Sep 2018 05:13:38 PM CEST by Eclipse SUMO netedit Version 5345f89a38
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
<input>
<sumo-net-file value="example.net.xml"/>
</input>
<output>
<output-file value="example.net.xml"/>
</output>
<processing>
<offset.disable-normalization value="true"/>
<lefthand value="false"/>
</processing>
<junctions>
<no-turnarounds value="true"/>
<junctions.corner-detail value="5"/>
<junctions.limit-turn-speed value="5.5"/>
<rectangular-lane-cut value="false"/>
</junctions>
<pedestrian>
<walkingareas value="false"/>
</pedestrian>
</configuration>
-->

<net version="1.0" junctionCornerDetail="5" limitTurnSpeed="5.50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">

<location netOffset="0.00,0.00" convBoundary="-300.00,-300.00,200.00,0.00" origBoundary="-10000000000.00,-10000000000.00,10000000000.00,10000000000.00" projParameter="!"/>

<edge id=":gneJ25_0" function="internal">
<lane id=":gneJ25_0_0" index="0" speed="13.89" length="0.10" shape="-98.87,-101.13 -98.87,-101.13"/>
<lane id=":gneJ25_0_1" index="1" speed="13.89" length="0.10" shape="-101.13,-98.87 -101.13,-98.87"/>
</edge>
<edge id=":gneJ26_0" function="internal">
<lane id=":gneJ26_0_0" index="0" speed="4.20" length="1.26" shape="0.19,-2.07 0.44,-1.86 0.71,-1.72 1.01,-1.63 1.33,-1.60"/>
</edge>
<edge id=":gneJ26_1" function="internal">
<lane id=":gneJ26_1_0" index="0" speed="6.63" length="3.77" shape="-2.07,0.19 -1.33,0.81 -0.52,1.25 0.37,1.51 1.33,1.60"/>
</edge>
<edge id=":gneJ27_0" function="internal">
<lane id=":gneJ27_0_0" index="0" speed="4.20" length="1.26" shape="98.67,-1.60 98.99,-1.63 99.29,-1.72 99.56,-1.86 99.81,-2.07"/>
</edge>
<edge id=":gneJ27_1" function="internal">
<lane id=":gneJ27_1_0" index="0" speed="6.63" length="3.77" shape="98.67,1.60 99.63,1.51 100.52,1.25 101.33,0.81 102.07,0.19"/>
</edge>
<edge id=":gneJ28_0" function="internal">
<lane id=":gneJ28_0_0" index="0" speed="4.20" length="1.26" shape="197.93,-100.19 198.14,-100.44 198.28,-100.71 198.37,-101.01 198.40,-101.33"/>
</edge>
<edge id=":gneJ28_1" function="internal">
<lane id=":gneJ28_1_0" index="0" speed="6.63" length="3.77" shape="200.19,-97.93 200.81,-98.67 201.25,-99.48 201.51,-100.37 201.60,-101.33"/>
</edge>

<edge id="gneE24" from="gneJ25" to="gneJ26" priority="-1" spreadType="center">
<lane id="gneE24_0" index="0" speed="13.89" length="140.10" shape="-98.87,-101.13 0.19,-2.07"/>
<lane id="gneE24_1" index="1" speed="13.89" length="140.10" shape="-101.13,-98.87 -2.07,0.19"/>
</edge>
<edge id="gneE25" from="gneJ27" to="gneJ28" priority="-1" spreadType="center">
<lane id="gneE25_0" index="0" speed="13.89" length="138.77" shape="99.81,-2.07 197.93,-100.19"/>
<lane id="gneE25_1" index="1" speed="13.89" length="138.77" shape="102.07,0.19 200.19,-97.93"/>
</edge>
<edge id="gneE27" from="gneJ26" to="gneJ27" priority="-1" spreadType="center">
<lane id="gneE27_0" index="0" speed="13.89" length="97.35" shape="1.33,-1.60 98.67,-1.60"/>
<lane id="gneE27_1" index="1" speed="13.89" length="97.35" shape="1.33,1.60 98.67,1.60"/>
</edge>
<edge id="gneE28" from="gneJ28" to="gneJ29" priority="-1" spreadType="center">
<lane id="gneE28_0" index="0" speed="13.89" length="198.67" shape="198.40,-101.33 198.40,-300.00"/>
<lane id="gneE28_1" index="1" speed="13.89" length="198.67" shape="201.60,-101.33 201.60,-300.00"/>
</edge>
<edge id="gneE30" from="gneJ33" to="gneJ25" priority="-1" spreadType="center">
<lane id="gneE30_0" index="0" speed="13.89" length="282.84" shape="-298.87,-301.13 -98.87,-101.13"/>
<lane id="gneE30_1" index="1" speed="13.89" length="282.84" shape="-301.13,-298.87 -101.13,-98.87"/>
</edge>

<junction id="gneJ25" type="priority" x="-100.00" y="-100.00" incLanes="gneE30_0 gneE30_1" intLanes=":gneJ25_0_0 :gneJ25_0_1" shape="-102.26,-97.74 -97.74,-102.26 -102.26,-97.74">
<request index="0" response="00" foes="00" cont="0"/>
<request index="1" response="00" foes="00" cont="0"/>
</junction>
<junction id="gneJ26" type="priority" x="0.00" y="0.00" incLanes="gneE24_0 gneE24_1" intLanes=":gneJ26_0_0 :gneJ26_1_0" shape="1.33,3.20 1.33,-3.20 -3.20,1.33 -1.86,2.37 -1.13,2.73 -0.36,2.99 0.46,3.15">
<request index="0" response="00" foes="00" cont="0"/>
<request index="1" response="00" foes="00" cont="0"/>
</junction>
<junction id="gneJ27" type="priority" x="100.00" y="0.00" incLanes="gneE27_0 gneE27_1" intLanes=":gneJ27_0_0 :gneJ27_1_0" shape="103.20,1.33 98.67,-3.20 98.67,3.20 100.36,2.99 101.13,2.73 101.86,2.37 102.55,1.90">
<request index="0" response="00" foes="00" cont="0"/>
<request index="1" response="00" foes="00" cont="0"/>
</junction>
<junction id="gneJ28" type="priority" x="200.00" y="-100.00" incLanes="gneE25_0 gneE25_1" intLanes=":gneJ28_0_0 :gneJ28_1_0" shape="203.20,-101.33 196.80,-101.33 201.33,-96.80 202.37,-98.14 202.73,-98.87 202.99,-99.64 203.15,-100.46">
<request index="0" response="00" foes="00" cont="0"/>
<request index="1" response="00" foes="00" cont="0"/>
</junction>
<junction id="gneJ29" type="dead_end" x="200.00" y="-300.00" incLanes="gneE28_0 gneE28_1" intLanes="" shape="196.80,-300.00 203.20,-300.00"/>
<junction id="gneJ33" type="dead_end" x="-300.00" y="-300.00" incLanes="" intLanes="" shape="-302.26,-297.74 -297.74,-302.26"/>

<connection from="gneE24" to="gneE27" fromLane="0" toLane="0" via=":gneJ26_0_0" dir="r" state="M"/>
<connection from="gneE24" to="gneE27" fromLane="1" toLane="1" via=":gneJ26_1_0" dir="r" state="M"/>
<connection from="gneE25" to="gneE28" fromLane="0" toLane="0" via=":gneJ28_0_0" dir="r" state="M"/>
<connection from="gneE25" to="gneE28" fromLane="1" toLane="1" via=":gneJ28_1_0" dir="r" state="M"/>
<connection from="gneE27" to="gneE25" fromLane="0" toLane="0" via=":gneJ27_0_0" dir="r" state="M"/>
<connection from="gneE27" to="gneE25" fromLane="1" toLane="1" via=":gneJ27_1_0" dir="r" state="M"/>
<connection from="gneE30" to="gneE24" fromLane="0" toLane="0" via=":gneJ25_0_0" dir="s" state="M"/>
<connection from="gneE30" to="gneE24" fromLane="1" toLane="1" via=":gneJ25_0_1" dir="s" state="M"/>

<connection from=":gneJ25_0" to="gneE24" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":gneJ25_0" to="gneE24" fromLane="1" toLane="1" dir="s" state="M"/>
<connection from=":gneJ26_0" to="gneE27" fromLane="0" toLane="0" dir="r" state="M"/>
<connection from=":gneJ26_1" to="gneE27" fromLane="0" toLane="1" dir="r" state="M"/>
<connection from=":gneJ27_0" to="gneE25" fromLane="0" toLane="0" dir="r" state="M"/>
<connection from=":gneJ27_1" to="gneE25" fromLane="0" toLane="1" dir="r" state="M"/>
<connection from=":gneJ28_0" to="gneE28" fromLane="0" toLane="0" dir="r" state="M"/>
<connection from=":gneJ28_1" to="gneE28" fromLane="0" toLane="1" dir="r" state="M"/>

</net>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--no-step-log --no-duration-log -n net.net.xml --route-files=input_routes.rou.xml --additional-files=input_additional.add.xml --vehroutes=vehroutes.xml
Empty file.
196 changes: 196 additions & 0 deletions tests/sumo/extended/rerouter/parking/skip_too_close/vehroutes.sumo
Original file line number Diff line number Diff line change
@@ -0,0 +1,196 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on Tue Sep 18 21:40:01 2018 by Eclipse SUMO Version v1_0_1+0016-016c09d
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
http://www.eclipse.org/legal/epl-v20.html
SPDX-License-Identifier: EPL-2.0
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
<input>
<net-file value="net.net.xml"/>
<route-files value="input_routes.rou.xml"/>
<additional-files value="input_additional.add.xml"/>
</input>
<output>
<write-license value="true"/>
<vehroute-output value="vehroutes.xml"/>
</output>
<processing>
<default.speeddev value="0"/>
</processing>
<report>
<xml-validation value="never"/>
<duration-log.disable value="true"/>
<no-step-log value="true"/>
</report>
</configuration>
-->

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<vehicle id="passenger.0" depart="0.00" arrival="3684.00">
<routeDistribution>
<route replacedOnEdge="" reason="device.rerouting" replacedAtTime="0.00" probability="0" edges="gneE30 gneE27 gneE28"/>
<route edges="gneE30 gneE24 gneE27 gneE25 gneE28"/>
</routeDistribution>
<stop parkingArea="parkingArea_gneE27_0_1" duration="3600.00"/>
</vehicle>

<vehicle id="passenger.1" depart="37.00" arrival="3721.00">
<routeDistribution>
<route replacedOnEdge="" reason="device.rerouting" replacedAtTime="37.00" probability="0" edges="gneE30 gneE27 gneE28"/>
<route edges="gneE30 gneE24 gneE27 gneE25 gneE28"/>
</routeDistribution>
<stop parkingArea="parkingArea_gneE27_0_1" duration="3600.00"/>
</vehicle>

<vehicle id="passenger.2" depart="75.00" arrival="3763.00">
<routeDistribution>
<route replacedOnEdge="" reason="device.rerouting" replacedAtTime="75.00" probability="0" edges="gneE30 gneE27 gneE28"/>
<route edges="gneE30 gneE24 gneE27 gneE25 gneE28"/>
</routeDistribution>
<stop parkingArea="parkingArea_gneE27_0_1" duration="3600.00"/>
</vehicle>

<vehicle id="passenger.3" depart="112.00" arrival="3797.00">
<routeDistribution>
<route replacedOnEdge="" reason="device.rerouting" replacedAtTime="112.00" probability="0" edges="gneE30 gneE27 gneE28"/>
<route edges="gneE30 gneE24 gneE27 gneE25 gneE28"/>
</routeDistribution>
<stop parkingArea="parkingArea_gneE27_0_1" duration="3600.00"/>
</vehicle>

<vehicle id="passenger.4" depart="150.00" arrival="3833.00">
<routeDistribution>
<route replacedOnEdge="" reason="device.rerouting" replacedAtTime="150.00" probability="0" edges="gneE30 gneE27 gneE28"/>
<route edges="gneE30 gneE24 gneE27 gneE25 gneE28"/>
</routeDistribution>
<stop parkingArea="parkingArea_gneE27_0_1" duration="3600.00"/>
</vehicle>

<vehicle id="passenger.5" depart="187.00" arrival="3870.00">
<routeDistribution>
<route replacedOnEdge="" reason="device.rerouting" replacedAtTime="187.00" probability="0" edges="gneE30 gneE27 gneE28"/>
<route edges="gneE30 gneE24 gneE27 gneE25 gneE28"/>
</routeDistribution>
<stop parkingArea="parkingArea_gneE27_0_1" duration="3600.00"/>
</vehicle>

<vehicle id="passenger.6" depart="225.00" arrival="3910.00">
<routeDistribution>
<route replacedOnEdge="" reason="device.rerouting" replacedAtTime="225.00" probability="0" edges="gneE30 gneE27 gneE28"/>
<route edges="gneE30 gneE24 gneE27 gneE25 gneE28"/>
</routeDistribution>
<stop parkingArea="parkingArea_gneE27_0_1" duration="3600.00"/>
</vehicle>

<vehicle id="passenger.7" depart="262.00" arrival="3945.00">
<routeDistribution>
<route replacedOnEdge="" reason="device.rerouting" replacedAtTime="262.00" probability="0" edges="gneE30 gneE27 gneE28"/>
<route edges="gneE30 gneE24 gneE27 gneE25 gneE28"/>
</routeDistribution>
<stop parkingArea="parkingArea_gneE27_0_1" duration="3600.00"/>
</vehicle>

<vehicle id="passenger.8" depart="300.00" arrival="3984.00">
<routeDistribution>
<route replacedOnEdge="" reason="device.rerouting" replacedAtTime="300.00" probability="0" edges="gneE30 gneE27 gneE28"/>
<route edges="gneE30 gneE24 gneE27 gneE25 gneE28"/>
</routeDistribution>
<stop parkingArea="parkingArea_gneE27_0_1" duration="3600.00"/>
</vehicle>

<vehicle id="passenger.9" depart="337.00" arrival="4021.00">
<routeDistribution>
<route replacedOnEdge="" reason="device.rerouting" replacedAtTime="337.00" probability="0" edges="gneE30 gneE27 gneE28"/>
<route edges="gneE30 gneE24 gneE27 gneE25 gneE28"/>
</routeDistribution>
<stop parkingArea="parkingArea_gneE27_0_1" duration="3600.00"/>
</vehicle>

<vehicle id="passenger.10" depart="375.00" arrival="4061.00">
<routeDistribution>
<route replacedOnEdge="" reason="device.rerouting" replacedAtTime="375.00" probability="0" edges="gneE30 gneE27 gneE28"/>
<route edges="gneE30 gneE24 gneE27 gneE25 gneE28"/>
</routeDistribution>
<stop parkingArea="parkingArea_gneE28_0_3" duration="3600.00"/>
</vehicle>

<vehicle id="passenger.11" depart="412.00" arrival="4098.00">
<routeDistribution>
<route replacedOnEdge="" reason="device.rerouting" replacedAtTime="412.00" probability="0" edges="gneE30 gneE27 gneE28"/>
<route edges="gneE30 gneE24 gneE27 gneE25 gneE28"/>
</routeDistribution>
<stop parkingArea="parkingArea_gneE28_0_3" duration="3600.00"/>
</vehicle>

<vehicle id="passenger.12" depart="450.00" arrival="4135.00">
<routeDistribution>
<route replacedOnEdge="" reason="device.rerouting" replacedAtTime="450.00" probability="0" edges="gneE30 gneE27 gneE28"/>
<route edges="gneE30 gneE24 gneE27 gneE25 gneE28"/>
</routeDistribution>
<stop parkingArea="parkingArea_gneE28_0_3" duration="3600.00"/>
</vehicle>

<vehicle id="passenger.13" depart="487.00" arrival="4173.00">
<routeDistribution>
<route replacedOnEdge="" reason="device.rerouting" replacedAtTime="487.00" probability="0" edges="gneE30 gneE27 gneE28"/>
<route edges="gneE30 gneE24 gneE27 gneE25 gneE28"/>
</routeDistribution>
<stop parkingArea="parkingArea_gneE28_0_3" duration="3600.00"/>
</vehicle>

<vehicle id="passenger.14" depart="525.00" arrival="4209.00">
<routeDistribution>
<route replacedOnEdge="" reason="device.rerouting" replacedAtTime="525.00" probability="0" edges="gneE30 gneE27 gneE28"/>
<route edges="gneE30 gneE24 gneE27 gneE25 gneE28"/>
</routeDistribution>
<stop parkingArea="parkingArea_gneE28_0_3" duration="3600.00"/>
</vehicle>

<vehicle id="passenger.15" depart="562.00" arrival="4248.00">
<routeDistribution>
<route replacedOnEdge="" reason="device.rerouting" replacedAtTime="562.00" probability="0" edges="gneE30 gneE27 gneE28"/>
<route edges="gneE30 gneE24 gneE27 gneE25 gneE28"/>
</routeDistribution>
<stop parkingArea="parkingArea_gneE28_0_3" duration="3600.00"/>
</vehicle>

<vehicle id="passenger.16" depart="600.00" arrival="4283.00">
<routeDistribution>
<route replacedOnEdge="" reason="device.rerouting" replacedAtTime="600.00" probability="0" edges="gneE30 gneE27 gneE28"/>
<route edges="gneE30 gneE24 gneE27 gneE25 gneE28"/>
</routeDistribution>
<stop parkingArea="parkingArea_gneE28_0_3" duration="3600.00"/>
</vehicle>

<vehicle id="passenger.17" depart="637.00" arrival="4322.00">
<routeDistribution>
<route replacedOnEdge="" reason="device.rerouting" replacedAtTime="637.00" probability="0" edges="gneE30 gneE27 gneE28"/>
<route edges="gneE30 gneE24 gneE27 gneE25 gneE28"/>
</routeDistribution>
<stop parkingArea="parkingArea_gneE28_0_3" duration="3600.00"/>
</vehicle>

<vehicle id="passenger.18" depart="675.00" arrival="4362.00">
<routeDistribution>
<route replacedOnEdge="" reason="device.rerouting" replacedAtTime="675.00" probability="0" edges="gneE30 gneE27 gneE28"/>
<route edges="gneE30 gneE24 gneE27 gneE25 gneE28"/>
</routeDistribution>
<stop parkingArea="parkingArea_gneE28_0_3" duration="3600.00"/>
</vehicle>

<vehicle id="passenger.19" depart="712.00" arrival="4396.00">
<routeDistribution>
<route replacedOnEdge="" reason="device.rerouting" replacedAtTime="712.00" probability="0" edges="gneE30 gneE27 gneE28"/>
<route edges="gneE30 gneE24 gneE27 gneE25 gneE28"/>
</routeDistribution>
<stop parkingArea="parkingArea_gneE28_0_3" duration="3600.00"/>
</vehicle>

</routes>

0 comments on commit c0912c9

Please sign in to comment.