Skip to content

Commit

Permalink
added tests refs #21, #16096
Browse files Browse the repository at this point in the history
  • Loading branch information
namdre committed Jan 29, 2025
1 parent 6001a86 commit 7bde1ef
Show file tree
Hide file tree
Showing 15 changed files with 376 additions and 0 deletions.
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?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">
<vType id="car" sigma="0" speedDev="0"/>
<trip id="leader" type="car" depart="0" from="WC" to="CE" departSpeed="desired" departPos="13"/>
<trip id="ego" type="car" depart="0" from="WC" to="CE" departSpeed="desired" insertionChecks="collision followerGap junction stop arrivalSpeed oncomingTrain speedLimit pedestrian"/>
</routes>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
--no-step-log --net-file=net3.net.xml -r=input_routes.rou.xml
--vehroute-output vehroutes.xml
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2025-01-29 09:17:49 by Eclipse SUMO sumo Version v1_21_0+2078-8b936f8ac65
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
This file may also be made available under the following Secondary
Licenses when the conditions for such availability set forth in the Eclipse
Public License 2.0 are satisfied: GNU General Public License, version 2
or later which is available at
https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
<input>
<net-file value="net3.net.xml"/>
<route-files value="input_routes.rou.xml"/>
</input>
<output>
<write-license value="true"/>
<vehroute-output value="vehroutes.xml"/>
</output>
<processing>
<default.speeddev value="0"/>
</processing>
<report>
<xml-validation value="never"/>
<no-step-log value="true"/>
</report>
</sumoConfiguration>
-->

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<vehicle id="leader" type="car" depart="0.00" departPos="13.00" departSpeed="13.89" speedFactor="1.0000" arrival="14.00">
<route edges="WC CE"/>
</vehicle>

<vehicle id="ego" type="car" depart="0.00" departSpeed="13.89" speedFactor="1.0000" insertionChecks="collision followerGap junction stop arrivalSpeed oncomingTrain speedLimit pedestrian all" arrival="15.00">
<route edges="WC CE"/>
</vehicle>

</routes>
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2025-01-29 09:17:14 by Eclipse SUMO sumo Version v1_21_0+2078-8b936f8ac65
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
This file may also be made available under the following Secondary
Licenses when the conditions for such availability set forth in the Eclipse
Public License 2.0 are satisfied: GNU General Public License, version 2
or later which is available at
https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
<input>
<net-file value="net3.net.xml"/>
<route-files value="input_routes.rou.xml"/>
</input>
<output>
<write-license value="true"/>
<vehroute-output value="vehroutes.xml"/>
</output>
<processing>
<default.speeddev value="0"/>
</processing>
<report>
<xml-validation value="never"/>
<no-step-log value="true"/>
</report>
<mesoscopic>
<mesosim value="true"/>
</mesoscopic>
</sumoConfiguration>
-->

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<vehicle id="leader" type="car" depart="0.00" departPos="0.00" departSpeed="13.89" speedFactor="1.0000" arrival="13.00">
<route edges="WC CE"/>
</vehicle>

<vehicle id="ego" type="car" depart="0.00" departSpeed="13.89" speedFactor="1.0000" insertionChecks="collision followerGap junction stop arrivalSpeed oncomingTrain speedLimit pedestrian all" arrival="14.00">
<route edges="WC CE"/>
</vehicle>

</routes>
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?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">
<vType id="car" sigma="0" speedDev="0"/>
<route id="r0" edges="E0"/>
<vehicle id="00" route="r0" depart="0" departPos="00" departSpeed="desired" insertionChecks="none"/>
<vehicle id="01" route="r0" depart="0" departPos="10" departSpeed="desired" insertionChecks="none"/>
<vehicle id="02" route="r0" depart="0" departPos="20" departSpeed="desired" insertionChecks="none"/>
<vehicle id="03" route="r0" depart="0" departPos="30" departSpeed="desired" insertionChecks="none"/>
<vehicle id="04" route="r0" depart="0" departPos="40" departSpeed="desired" insertionChecks="none"/>
<vehicle id="05" route="r0" depart="0" departPos="50" departSpeed="desired" insertionChecks="none"/>
<vehicle id="06" route="r0" depart="0" departPos="60" departSpeed="desired" insertionChecks="none"/>
<vehicle id="07" route="r0" depart="0" departPos="70" departSpeed="desired" insertionChecks="none"/>
<vehicle id="08" route="r0" depart="0" departPos="80" departSpeed="desired" insertionChecks="none"/>
<vehicle id="09" route="r0" depart="0" departPos="90" departSpeed="desired" insertionChecks="none"/>
</routes>
40 changes: 40 additions & 0 deletions tests/sumo/spec/departure/insertionChecks/none/net.net.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2025-01-29 09:18:34 by Eclipse SUMO netedit Version v1_21_0+2078-8b936f8ac65
<neteditConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/neteditConfiguration.xsd">
<input>
<sumo-net-file value="/scr1/sumo/tests/sumo/spec/departure/insertionChecks/none/net.net.xml"/>
</input>
<output>
<output-file value="/scr1/sumo/tests/sumo/spec/departure/insertionChecks/none/net.net.xml"/>
</output>
<processing>
<offset.disable-normalization value="true"/>
</processing>
<junctions>
<no-turnarounds value="true"/>
</junctions>
<netedit>
<new-network value="false"/>
</netedit>
</neteditConfiguration>
-->

<net version="1.20" 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="0.00,0.00,100.00,0.00" origBoundary="10000000000.00,10000000000.00,-10000000000.00,-10000000000.00" projParameter="!"/>

<edge id="E0" from="J0" to="J1" priority="-1">
<lane id="E0_0" index="0" speed="13.89" length="100.00" shape="0.00,-1.60 100.00,-1.60"/>
</edge>

<junction id="J0" type="dead_end" x="0.00" y="0.00" incLanes="" intLanes="" shape="0.00,0.00 0.00,-3.20"/>
<junction id="J1" type="dead_end" x="100.00" y="0.00" incLanes="E0_0" intLanes="" shape="100.00,-3.20 100.00,0.00"/>

</net>
3 changes: 3 additions & 0 deletions tests/sumo/spec/departure/insertionChecks/none/options.sumo
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
--no-step-log --net-file=net.net.xml -r=input_routes.rou.xml
--vehroute-output vehroutes.xml
-t
19 changes: 19 additions & 0 deletions tests/sumo/spec/departure/insertionChecks/none/output.sumo
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Loading net-file from 'net.net.xml' ... done (0ms).
Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Simulation version v1_21_0+2078-8b936f8ac65 started with time: 0.00.
Simulation ended at time: 19.00.
Reason: All vehicles have left the simulation.
Performance:
Duration: 0.00s
Vehicles:
Inserted: 10
Running: 0
Waiting: 0
Statistics (avg of 10):
RouteLength: 55.00
Speed: 6.85
Duration: 9.20
WaitingTime: 0.00
TimeLoss: 4.84
DepartDelay: 0.00
21 changes: 21 additions & 0 deletions tests/sumo/spec/departure/insertionChecks/none/output.sumo.meso
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
Loading net-file from 'net.net.xml' ... done (0ms).
Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Simulation version v1_21_0+2078-8b936f8ac65 started with time: 0.00.
Simulation ended at time: 24.00.
Reason: All vehicles have left the simulation.
Performance:
Duration: 0.00s
Real time factor: 24000
UPS: 97000.000000
Vehicles:
Inserted: 10
Running: 0
Waiting: 0
Statistics (avg of 10):
RouteLength: 100.00
Speed: 10.73
Duration: 9.70
WaitingTime: 0.00
TimeLoss: 2.01
DepartDelay: 5.50
80 changes: 80 additions & 0 deletions tests/sumo/spec/departure/insertionChecks/none/vehroutes.sumo
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2025-01-29 09:23:48 by Eclipse SUMO sumo Version v1_21_0+2078-8b936f8ac65
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
This file may also be made available under the following Secondary
Licenses when the conditions for such availability set forth in the Eclipse
Public License 2.0 are satisfied: GNU General Public License, version 2
or later which is available at
https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<sumoConfiguration 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"/>
</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.statistics value="true"/>
<no-step-log value="true"/>
</report>
</sumoConfiguration>
-->

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<vehicle id="09" depart="0.00" departPos="90.00" departSpeed="13.89" speedFactor="1.0000" insertionChecks="none" arrival="1.00">
<route edges="E0"/>
</vehicle>

<vehicle id="08" depart="0.00" departPos="80.00" departSpeed="13.89" speedFactor="1.0000" insertionChecks="none" arrival="2.00">
<route edges="E0"/>
</vehicle>

<vehicle id="07" depart="0.00" departPos="70.00" departSpeed="13.89" speedFactor="1.0000" insertionChecks="none" arrival="4.00">
<route edges="E0"/>
</vehicle>

<vehicle id="06" depart="0.00" departPos="60.00" departSpeed="13.89" speedFactor="1.0000" insertionChecks="none" arrival="6.00">
<route edges="E0"/>
</vehicle>

<vehicle id="05" depart="0.00" departPos="50.00" departSpeed="13.89" speedFactor="1.0000" insertionChecks="none" arrival="9.00">
<route edges="E0"/>
</vehicle>

<vehicle id="04" depart="0.00" departPos="40.00" departSpeed="13.89" speedFactor="1.0000" insertionChecks="none" arrival="10.00">
<route edges="E0"/>
</vehicle>

<vehicle id="03" depart="0.00" departPos="30.00" departSpeed="13.89" speedFactor="1.0000" insertionChecks="none" arrival="12.00">
<route edges="E0"/>
</vehicle>

<vehicle id="02" depart="0.00" departPos="20.00" departSpeed="13.89" speedFactor="1.0000" insertionChecks="none" arrival="14.00">
<route edges="E0"/>
</vehicle>

<vehicle id="01" depart="0.00" departPos="10.00" departSpeed="13.89" speedFactor="1.0000" insertionChecks="none" arrival="16.00">
<route edges="E0"/>
</vehicle>

<vehicle id="00" depart="0.00" departPos="0.00" departSpeed="13.89" speedFactor="1.0000" insertionChecks="none" arrival="18.00">
<route edges="E0"/>
</vehicle>

</routes>
84 changes: 84 additions & 0 deletions tests/sumo/spec/departure/insertionChecks/none/vehroutes.sumo.meso
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2025-01-29 09:24:24 by Eclipse SUMO sumo Version v1_21_0+2078-8b936f8ac65
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
This file may also be made available under the following Secondary
Licenses when the conditions for such availability set forth in the Eclipse
Public License 2.0 are satisfied: GNU General Public License, version 2
or later which is available at
https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<sumoConfiguration 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"/>
</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.statistics value="true"/>
<no-step-log value="true"/>
</report>
<mesoscopic>
<mesosim value="true"/>
</mesoscopic>
</sumoConfiguration>
-->

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<vehicle id="00" depart="0.00" departPos="0.00" departSpeed="13.89" speedFactor="1.0000" insertionChecks="none" arrival="8.00">
<route edges="E0"/>
</vehicle>

<vehicle id="01" depart="0.00" departPos="0.00" departSpeed="11.2765" speedFactor="1.0000" insertionChecks="none" arrival="9.00">
<route edges="E0"/>
</vehicle>

<vehicle id="02" depart="0.00" departPos="0.00" departSpeed="9.4904" speedFactor="1.0000" insertionChecks="none" arrival="11.00">
<route edges="E0"/>
</vehicle>

<vehicle id="03" depart="0.00" departPos="0.00" departSpeed="8.1927" speedFactor="1.0000" insertionChecks="none" arrival="13.00">
<route edges="E0"/>
</vehicle>

<vehicle id="04" depart="0.00" departPos="0.00" departSpeed="7.2072" speedFactor="1.0000" insertionChecks="none" arrival="14.00">
<route edges="E0"/>
</vehicle>

<vehicle id="05" depart="8.00" departPos="0.00" departSpeed="13.2556" speedFactor="1.0000" insertionChecks="none" arrival="16.00">
<route edges="E0"/>
</vehicle>

<vehicle id="06" depart="9.00" departPos="0.00" departSpeed="12.1758" speedFactor="1.0000" insertionChecks="none" arrival="18.00">
<route edges="E0"/>
</vehicle>

<vehicle id="07" depart="11.00" departPos="0.00" departSpeed="12.6871" speedFactor="1.0000" insertionChecks="none" arrival="19.00">
<route edges="E0"/>
</vehicle>

<vehicle id="08" depart="13.00" departPos="0.00" departSpeed="13.2433" speedFactor="1.0000" insertionChecks="none" arrival="21.00">
<route edges="E0"/>
</vehicle>

<vehicle id="09" depart="14.00" departPos="0.00" departSpeed="12.1655" speedFactor="1.0000" insertionChecks="none" arrival="23.00">
<route edges="E0"/>
</vehicle>

</routes>
6 changes: 6 additions & 0 deletions tests/sumo/spec/departure/insertionChecks/testsuite.sumo
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,14 @@ stop
# remove check on gap to leader
leaderGap

# remove check on gap to leader but keep all other checks
leaderGap_only

# remove check on gap to leader with option
leaderGap_option

# remove check on gap to follower
followerGap

# remove all checks
none

0 comments on commit 7bde1ef

Please sign in to comment.