Skip to content

Commit f818d62

Browse files
namdrenamdre
committed
added test refs #21 to fix #17868 
1 parent d9cf753 commit f818d62

File tree

13 files changed

+521
-0
lines changed

13 files changed

+521
-0
lines changed

‎tests/sumo/rail/rerouter/station/testsuite.sumo‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Copy of simple
22
simple
3+
waypoints
34

45
# Copy of simple
56
2blocked

‎tests/sumo/rail/rerouter/station/waypoints/errors.sumo‎

Whitespace-only changes.

‎tests/sumo/rail/rerouter/station/waypoints/errors.sumo.meso‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Warning: Network contains internal links which are ignored. Vehicles will 'jump' across junctions and thus underestimate route lengths and travel times.

‎tests/sumo/rail/rerouter/station/waypoints/input_additional2.add.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<!-- generated on 2025-03-30 20:11:55 by Eclipse SUMO netedit Version 1.22.0
4+
-->
5+
6+
<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
7+
<!-- Other additionals -->
8+
<rerouter id="rr_0" edges="E2">
9+
<interval begin="0.00" end="3600.00">
10+
<stationReroute id="ts_5"/>
11+
<stationReroute id="ts_5b"/>
12+
<stationReroute id="ts_5c"/>
13+
</interval>
14+
</rerouter>
15+
</additional>

‎tests/sumo/rail/rerouter/station/waypoints/input_routes2.rou.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<!-- generated on 2025-03-29 13:13:30 by Eclipse SUMO netedit Version v1_22_0+1138-59136279702
4+
-->
5+
6+
<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
7+
<vehicle id="blocker" type="train" depart="0.00" route="r_main" departEdge="5" departPos="stop">
8+
<stop busStop="ts_5" until="600" duration="10"/>
9+
</vehicle>
10+
<vehicle id="v0" type="train" depart="5.00" route="r_main" departSpeed="max" departEdge="2">
11+
<stop busStop="ts_5" arrival="30" speed="40"/>
12+
</vehicle>
13+
</routes>

‎tests/sumo/rail/rerouter/station/waypoints/options.sumo‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
--vehroute-output vehroutes.xml
2+
--tripinfo-output tripinfos.xml

‎tests/sumo/rail/rerouter/station/waypoints/output.sumo‎

Whitespace-only changes.

‎tests/sumo/rail/rerouter/station/waypoints/railsignalblocks.sumo‎

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<!-- generated on 2025-12-19T12:55:22.845622+01:00 by Eclipse SUMO sumo v1_25_0+0626-a41e7f54900
4+
This data file and the accompanying materials
5+
are made available under the terms of the Eclipse Public License v2.0
6+
which accompanies this distribution, and is available at
7+
http://www.eclipse.org/legal/epl-v20.html
8+
This file may also be made available under the following Secondary
9+
Licenses when the conditions for such availability set forth in the Eclipse
10+
Public License 2.0 are satisfied: GNU General Public License, version 2
11+
or later which is available at
12+
https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
13+
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
14+
<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
15+
16+
<input>
17+
<net-file value="net.net.xml"/>
18+
<route-files value="input_routes2.rou.xml"/>
19+
<additional-files value="input_additional.add.xml,input_additional2.add.xml,input_routes.rou.xml"/>
20+
</input>
21+
22+
<output>
23+
<write-license value="true"/>
24+
<tripinfo-output value="tripinfos.xml"/>
25+
<vehroute-output value="vehroutes.xml"/>
26+
<railsignal-block-output value="railsignal_blocks.xml"/>
27+
</output>
28+
29+
<processing>
30+
<time-to-teleport value="1800"/>
31+
<time-to-teleport.railsignal-deadlock value="200"/>
32+
<default.speeddev value="0"/>
33+
</processing>
34+
35+
<report>
36+
<xml-validation value="never"/>
37+
<no-step-log value="true"/>
38+
</report>
39+
40+
</sumoConfiguration>
41+
-->
42+
43+
<railsignal-block-output>
44+
<railSignal id="J1">
45+
<link linkIndex="0" from="E0_0" to=":J1_0_0"/>
46+
</railSignal>
47+
<railSignal id="J2">
48+
<link linkIndex="0" from="E1_0" to=":J2_0_0">
49+
<driveWay id="J2.0" vehicle="v0" edges="E2 E3 E4 E5 E6 E7 E8 E9">
50+
<forward lanes=":J2_0_0 E2_0"/>
51+
<bidi lanes=""/>
52+
<flank lanes=""/>
53+
<conflictLinks signals=""/>
54+
<foes driveWays="J2.0 J2.1 J2.d0 J2.d1"/>
55+
</driveWay>
56+
<driveWay id="J2.1" vehicle="v0" edges="E2 E3 E4b E5b E6b E6.1b E7 E8 E9">
57+
<forward lanes=":J2_0_0 E2_0"/>
58+
<bidi lanes=""/>
59+
<flank lanes=""/>
60+
<conflictLinks signals=""/>
61+
<foes driveWays="J2.0 J2.1 J2.d0 J2.d1"/>
62+
</driveWay>
63+
</link>
64+
</railSignal>
65+
<railSignal id="J3">
66+
<link linkIndex="0" from="E2_0" to=":J3_0_0">
67+
<driveWay id="J3.0" vehicle="v0" edges="E3 E4 E5 E6 E7 E8 E9">
68+
<forward lanes=":J3_0_0 E3_0 :J4_1_0 E4_0 :J5_0_0 E5_0"/>
69+
<bidi lanes=""/>
70+
<flank lanes=""/>
71+
<conflictLinks signals=""/>
72+
<foes driveWays="J3.0 J3.1.0 J5.d0"/>
73+
</driveWay>
74+
<subDriveWay id="J3.0.0" vehicle="" edges="E3">
75+
<forward lanes=":J3_0_0 E3_0"/>
76+
</subDriveWay>
77+
<driveWay id="J3.1" vehicle="v0" edges="E3 E4b E5b E6b E6.1b E7 E8 E9">
78+
<forward lanes=":J3_0_0 E3_0 :J4_0_0 E4b_0 :J5b_1_0 E5b_0"/>
79+
<bidi lanes=""/>
80+
<flank lanes=""/>
81+
<conflictLinks signals=""/>
82+
<foes driveWays="J3.0.0 J3.1"/>
83+
</driveWay>
84+
<subDriveWay id="J3.1.0" vehicle="" edges="E3">
85+
<forward lanes=":J3_0_0 E3_0"/>
86+
</subDriveWay>
87+
</link>
88+
</railSignal>
89+
<railSignal id="J3x">
90+
<link linkIndex="0" from="E0x_0" to=":J3x_0_0"/>
91+
</railSignal>
92+
<railSignal id="J6">
93+
<link linkIndex="0" from="E5_0" to=":J6_0_0">
94+
<driveWay id="J6.0" vehicle="blocker" edges="E6 E7 E8 E9">
95+
<forward lanes=":J6_0_0 E6_0 :J7_1_0 E7_0 :J8_1_0 E8_0 :J9_0_0 E9_0"/>
96+
<bidi lanes=""/>
97+
<flank lanes=""/>
98+
<conflictLinks signals="J6b_0"/>
99+
<foes driveWays="J6.0 J6b.0"/>
100+
</driveWay>
101+
</link>
102+
</railSignal>
103+
<railSignal id="J6b">
104+
<link linkIndex="0" from="E5b_0" to=":J6b_0_0">
105+
<driveWay id="J6b.0" vehicle="v0" edges="E6b E6.1b E7 E8 E9">
106+
<forward lanes=":J6b_0_0 E6b_0 :J7b_3_0 E6.1b_0 :J7_0_0 E7_0 :J8_1_0 E8_0 :J9_0_0 E9_0"/>
107+
<bidi lanes=""/>
108+
<flank lanes=""/>
109+
<conflictLinks signals="J6_0"/>
110+
<foes driveWays="J6.0 J6b.0"/>
111+
</driveWay>
112+
</link>
113+
</railSignal>
114+
<railSignal id="J6c">
115+
<link linkIndex="0" from="E5c_0" to=":J6c_0_0"/>
116+
</railSignal>
117+
<railSignal id="J8b">
118+
<link linkIndex="0" from="E8b_0" to=":J8b_0_0"/>
119+
</railSignal>
120+
<railSignal id="J8c">
121+
<link linkIndex="0" from="E7c_0" to=":J8c_0_0"/>
122+
</railSignal>
123+
<departJunction id="J2">
124+
<driveWay id="J2.d0" vehicle="v0" edges="E2 E3 E4 E5 E6 E7 E8 E9">
125+
<forward lanes="E2_0"/>
126+
<bidi lanes=""/>
127+
<flank lanes=""/>
128+
<conflictLinks signals="J2_0"/>
129+
<foes driveWays="J2.0 J2.1 J2.d0 J2.d1"/>
130+
</driveWay>
131+
<driveWay id="J2.d1" vehicle="v0" edges="E2 E3 E4b E5b E6b E6.1b E7 E8 E9">
132+
<forward lanes="E2_0"/>
133+
<bidi lanes=""/>
134+
<flank lanes=""/>
135+
<conflictLinks signals="J2_0"/>
136+
<foes driveWays="J2.0 J2.1 J2.d0 J2.d1"/>
137+
</driveWay>
138+
</departJunction>
139+
<departJunction id="J5">
140+
<driveWay id="J5.d0" vehicle="blocker" edges="E5 E6 E7 E8 E9">
141+
<forward lanes="E5_0"/>
142+
<bidi lanes=""/>
143+
<flank lanes=""/>
144+
<conflictLinks signals=""/>
145+
<foes driveWays="J3.0 J5.d0"/>
146+
</driveWay>
147+
</departJunction>
148+
</railsignal-block-output>

‎tests/sumo/rail/rerouter/station/waypoints/railsignalblocks.sumo.meso‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<!-- generated on 2026-04-14T15:30:18.475815+01:00 by Eclipse SUMO sumo v1_26_0+1143-c5f67b5b172
4+
This data file and the accompanying materials
5+
are made available under the terms of the Eclipse Public License v2.0
6+
which accompanies this distribution, and is available at
7+
http://www.eclipse.org/legal/epl-v20.html
8+
This file may also be made available under the following Secondary
9+
Licenses when the conditions for such availability set forth in the Eclipse
10+
Public License 2.0 are satisfied: GNU General Public License, version 2
11+
or later which is available at
12+
https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
13+
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
14+
<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
15+
16+
<input>
17+
<net-file value="net.net.xml"/>
18+
<route-files value="input_routes2.rou.xml"/>
19+
<additional-files value="input_additional.add.xml,input_additional2.add.xml,input_routes.rou.xml"/>
20+
</input>
21+
22+
<output>
23+
<write-license value="true"/>
24+
<tripinfo-output value="tripinfos.xml"/>
25+
<vehroute-output value="vehroutes.xml"/>
26+
<railsignal-block-output value="railsignal_blocks.xml"/>
27+
</output>
28+
29+
<processing>
30+
<time-to-teleport value="1800"/>
31+
<time-to-teleport.railsignal-deadlock value="200"/>
32+
<default.departspeed value="0"/>
33+
<default.departlane value="first"/>
34+
<default.speeddev value="0"/>
35+
</processing>
36+
37+
<report>
38+
<xml-validation value="never"/>
39+
<no-step-log value="true"/>
40+
</report>
41+
42+
<mesoscopic>
43+
<mesosim value="true"/>
44+
<meso-junction-control value="true"/>
45+
</mesoscopic>
46+
47+
</sumoConfiguration>
48+
-->
49+
50+
<railsignal-block-output>
51+
<railSignal id="J1">
52+
<link linkIndex="0" from="E0_0" to=":J1_0_0"/>
53+
</railSignal>
54+
<railSignal id="J2">
55+
<link linkIndex="0" from="E1_0" to=":J2_0_0">
56+
<driveWay id="J2.0" vehicle="v0" edges="E2 E3 E4 E5 E6 E7 E8 E9">
57+
<forward lanes=":J2_0_0 E2_0"/>
58+
<bidi lanes=""/>
59+
<flank lanes=""/>
60+
<conflictLinks signals=""/>
61+
<foes driveWays="J2.0 J2.d0"/>
62+
</driveWay>
63+
</link>
64+
</railSignal>
65+
<railSignal id="J3">
66+
<link linkIndex="0" from="E2_0" to=":J3_0_0">
67+
<driveWay id="J3.0" vehicle="v0" edges="E3 E4 E5 E6 E7 E8 E9">
68+
<forward lanes=":J3_0_0 E3_0 :J4_1_0 E4_0 :J5_0_0 E5_0"/>
69+
<bidi lanes=""/>
70+
<flank lanes=""/>
71+
<conflictLinks signals=""/>
72+
<foes driveWays="J3.0 J5.d0"/>
73+
</driveWay>
74+
</link>
75+
</railSignal>
76+
<railSignal id="J3x">
77+
<link linkIndex="0" from="E0x_0" to=":J3x_0_0"/>
78+
</railSignal>
79+
<railSignal id="J6">
80+
<link linkIndex="0" from="E5_0" to=":J6_0_0">
81+
<driveWay id="J6.0" vehicle="blocker" edges="E6 E7 E8 E9">
82+
<forward lanes=":J6_0_0 E6_0 :J7_1_0 E7_0 :J8_1_0 E8_0 :J9_0_0 E9_0"/>
83+
<bidi lanes=""/>
84+
<flank lanes=""/>
85+
<conflictLinks signals=""/>
86+
<foes driveWays="J6.0"/>
87+
</driveWay>
88+
</link>
89+
</railSignal>
90+
<railSignal id="J6b">
91+
<link linkIndex="0" from="E5b_0" to=":J6b_0_0"/>
92+
</railSignal>
93+
<railSignal id="J6c">
94+
<link linkIndex="0" from="E5c_0" to=":J6c_0_0"/>
95+
</railSignal>
96+
<railSignal id="J8b">
97+
<link linkIndex="0" from="E8b_0" to=":J8b_0_0"/>
98+
</railSignal>
99+
<railSignal id="J8c">
100+
<link linkIndex="0" from="E7c_0" to=":J8c_0_0"/>
101+
</railSignal>
102+
<departJunction id="J2">
103+
<driveWay id="J2.d0" vehicle="v0" edges="E2 E3 E4 E5 E6 E7 E8 E9">
104+
<forward lanes="E2_0"/>
105+
<bidi lanes=""/>
106+
<flank lanes=""/>
107+
<conflictLinks signals="J2_0"/>
108+
<foes driveWays="J2.0 J2.d0"/>
109+
</driveWay>
110+
</departJunction>
111+
<departJunction id="J5">
112+
<driveWay id="J5.d0" vehicle="blocker" edges="E5 E6 E7 E8 E9">
113+
<forward lanes="E5_0"/>
114+
<bidi lanes=""/>
115+
<flank lanes=""/>
116+
<conflictLinks signals=""/>
117+
<foes driveWays="J3.0 J5.d0"/>
118+
</driveWay>
119+
</departJunction>
120+
</railsignal-block-output>

‎tests/sumo/rail/rerouter/station/waypoints/tripinfos.sumo‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<!-- generated on 2026-04-14T15:29:58.594244+01:00 by Eclipse SUMO sumo v1_26_0+1143-c5f67b5b172
4+
This data file and the accompanying materials
5+
are made available under the terms of the Eclipse Public License v2.0
6+
which accompanies this distribution, and is available at
7+
http://www.eclipse.org/legal/epl-v20.html
8+
This file may also be made available under the following Secondary
9+
Licenses when the conditions for such availability set forth in the Eclipse
10+
Public License 2.0 are satisfied: GNU General Public License, version 2
11+
or later which is available at
12+
https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
13+
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
14+
<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
15+
16+
<input>
17+
<net-file value="net.net.xml"/>
18+
<route-files value="input_routes2.rou.xml"/>
19+
<additional-files value="input_additional.add.xml,input_additional2.add.xml,input_routes.rou.xml"/>
20+
</input>
21+
22+
<output>
23+
<write-license value="true"/>
24+
<tripinfo-output value="tripinfos.xml"/>
25+
<vehroute-output value="vehroutes.xml"/>
26+
<railsignal-block-output value="railsignal_blocks.xml"/>
27+
</output>
28+
29+
<processing>
30+
<time-to-teleport value="1800"/>
31+
<time-to-teleport.railsignal-deadlock value="200"/>
32+
<default.departspeed value="0"/>
33+
<default.departlane value="first"/>
34+
<default.speeddev value="0"/>
35+
</processing>
36+
37+
<report>
38+
<xml-validation value="never"/>
39+
<no-step-log value="true"/>
40+
</report>
41+
42+
</sumoConfiguration>
43+
-->
44+
45+
<tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
46+
<tripinfo id="v0" depart="5.00" departLane="E2_0" departPos="50.10" departSpeed="44.44" departDelay="0.00" arrival="74.00" arrivalLane="E9_0" arrivalPos="100.00" arrivalSpeed="18.70" duration="69.00" routeLength="1689.86" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="12.31" rerouteNo="1" devices="vehroute_v0 tripinfo_v0" vType="train" speedFactor="1.00" vaporized=""/>
47+
<tripinfo id="blocker" depart="0.00" departLane="E5_0" departPos="99.00" departSpeed="0.00" departDelay="0.00" arrival="656.00" arrivalLane="E9_0" arrivalPos="100.00" arrivalSpeed="14.25" duration="656.00" routeLength="401.21" waitingTime="0.00" waitingCount="0" stopTime="599.00" timeLoss="0.00" rerouteNo="0" devices="vehroute_blocker tripinfo_blocker" vType="train" speedFactor="1.00" vaporized=""/>
48+
</tripinfos>

0 commit comments

Comments
 (0)
⚡