Skip to content

Commit cbcc61d

Browse files
namdrenamdre
committed
patching expected results refs #21, #9812 
1 parent 1ccf1f7 commit cbcc61d

File tree

9 files changed

+179
-12
lines changed

9 files changed

+179
-12
lines changed

‎tests/sumo/devices/taxi/bugs/ticket9812_taxi_vclasses/errors.sumo‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Warning: No connection between stop 'ts_0' and stop 'ts_1' found.
2-
Error: No connection found between trainStop 'ts_0' and trainStop 'ts_1' for person 'p_0'.
3-
Quitting (on error).
1+
Warning: Could not add taxi stop, time=t_0, error=pickup p_0 (0)
2+
Warning: Could not add taxi stop, time=t_0, error=dropOff p_0 (0)
3+
Warning: Vehicle 't_0' aborted waiting for a person that will never come.

‎tests/sumo/devices/taxi/bugs/ticket9812_taxi_vclasses/errors.sumo.meso‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Warning: No connection between stop 'ts_0' and stop 'ts_1' found.
2-
Error: No connection found between trainStop 'ts_0' and trainStop 'ts_1' for person 'p_0'.
3-
Quitting (on error).
1+
Warning: Could not add taxi stop, time=t_0, error=pickup p_0 (0)
2+
Warning: Could not add taxi stop, time=t_0, error=dropOff p_0 (0)
3+
Warning: Vehicle 't_0' aborted waiting for a person that will never come.

‎tests/sumo/devices/taxi/bugs/ticket9812_taxi_vclasses/exitcode.sumo‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎tests/sumo/devices/taxi/bugs/ticket9812_taxi_vclasses/railsignalvehs.sumo‎

Lines changed: 52 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<!-- generated on 2026-04-14T01:02:19.746801+01:00 by Eclipse SUMO sumo v1_26_0+1122-09074a15319
3+
<!-- generated on 2026-04-14T01:09:36.188480+01:00 by Eclipse SUMO sumo v1_26_0+1123-334e341037c
44
<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
55
66
<input>
@@ -35,4 +35,55 @@
3535
-->
3636

3737
<railsignal-vehicle-output>
38+
<railSignal id="J2">
39+
<link linkIndex="0" from="-E2_0" to=":J2_0_0"/>
40+
<link linkIndex="1" from="E1_0" to=":J2_1_0">
41+
<driveWay id="J2.0">
42+
<entry id="t_0" time="59.00" reason="junction"/>
43+
<exit id="t_0" time="123.00" reason="parking"/>
44+
</driveWay>
45+
</link>
46+
</railSignal>
47+
<railSignal id="J6">
48+
<link linkIndex="0" from="E5_0" to=":J6_0_0">
49+
<driveWay id="J6.0">
50+
<entry id="t_0" time="115.00" reason="junction"/>
51+
<exit id="t_0" time="123.00" reason="parking"/>
52+
</driveWay>
53+
</link>
54+
<link linkIndex="1" from="-E6_0" to=":J6_1_0"/>
55+
</railSignal>
56+
<departJunction id="J8">
57+
<driveWay id="J8.d0">
58+
<entry id="t_0" time="0.00" reason="departed"/>
59+
<exit id="t_0" time="1.00" reason="reroute"/>
60+
</driveWay>
61+
<subDriveWay id="J8.d0.0">
62+
<entry id="t_0" time="0.00" reason="departed"/>
63+
<exit id="t_0" time="39.00" reason="junction"/>
64+
</subDriveWay>
65+
<driveWay id="J8.d1">
66+
<entry id="t_0" time="0.00" reason="reroute"/>
67+
<exit id="t_0" time="1.00" reason="reroute"/>
68+
</driveWay>
69+
<driveWay id="J8.d2">
70+
<entry id="t_0" time="0.00" reason="reroute"/>
71+
<exit id="t_0" time="52.00" reason="parking"/>
72+
</driveWay>
73+
<subDriveWay id="J8.d2.0"/>
74+
<subDriveWay id="J8.d2.1"/>
75+
</departJunction>
76+
<departJunction id="J1">
77+
<driveWay id="J1.d0"/>
78+
<driveWay id="J1.d1">
79+
<entry id="t_0" time="52.00" reason="parking"/>
80+
<exit id="t_0" time="64.00" reason="junction"/>
81+
</driveWay>
82+
</departJunction>
83+
<departJunction id="J6">
84+
<driveWay id="J6.d0">
85+
<entry id="t_0" time="183.00" reason="parking"/>
86+
<exit id="t_0" time="184.00" reason="parking"/>
87+
</driveWay>
88+
</departJunction>
3889
</railsignal-vehicle-output>

‎tests/sumo/devices/taxi/bugs/ticket9812_taxi_vclasses/railsignalvehs.sumo.meso‎

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<!-- generated on 2026-04-14T01:02:35.786824+01:00 by Eclipse SUMO sumo v1_26_0+1122-09074a15319
3+
<!-- generated on 2026-04-14T01:10:04.121984+01:00 by Eclipse SUMO sumo v1_26_0+1123-334e341037c
44
<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
55
66
<input>
@@ -39,4 +39,39 @@
3939
-->
4040

4141
<railsignal-vehicle-output>
42+
<railSignal id="J2">
43+
<link linkIndex="0" from="-E2_0" to=":J2_0_0"/>
44+
<link linkIndex="1" from="E1_0" to=":J2_1_0">
45+
<driveWay id="J2.0"/>
46+
</link>
47+
</railSignal>
48+
<railSignal id="J6">
49+
<link linkIndex="0" from="E5_0" to=":J6_0_0">
50+
<driveWay id="J6.0"/>
51+
</link>
52+
<link linkIndex="1" from="-E6_0" to=":J6_1_0"/>
53+
</railSignal>
54+
<departJunction id="J8">
55+
<driveWay id="J8.d0">
56+
<entry id="t_0" time="0.00" reason="departed"/>
57+
<exit id="t_0" time="1.00" reason="reroute"/>
58+
</driveWay>
59+
<subDriveWay id="J8.d0.0">
60+
<entry id="t_0" time="0.00" reason="departed"/>
61+
<exit id="t_0" time="25.00" reason="junction"/>
62+
</subDriveWay>
63+
<driveWay id="J8.d1">
64+
<entry id="t_0" time="0.00" reason="reroute"/>
65+
<exit id="t_0" time="1.00" reason="reroute"/>
66+
</driveWay>
67+
<driveWay id="J8.d2">
68+
<entry id="t_0" time="0.00" reason="reroute"/>
69+
<exit id="t_0" time="40.00" reason="junction"/>
70+
</driveWay>
71+
<subDriveWay id="J8.d2.0"/>
72+
<subDriveWay id="J8.d2.1"/>
73+
</departJunction>
74+
<departJunction id="J1">
75+
<driveWay id="J1.d0"/>
76+
</departJunction>
4277
</railsignal-vehicle-output>

‎tests/sumo/devices/taxi/bugs/ticket9812_taxi_vclasses/tripinfos.sumo‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<!-- generated on 2026-04-14T01:02:19.746666+01:00 by Eclipse SUMO sumo v1_26_0+1122-09074a15319
3+
<!-- generated on 2026-04-14T01:09:36.188206+01:00 by Eclipse SUMO sumo v1_26_0+1123-334e341037c
44
<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
55
66
<input>
@@ -35,4 +35,8 @@
3535
-->
3636

3737
<tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
38+
<personinfo id="p_0" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.06" duration="182.00" waitingTime="53.00" timeLoss="10.37" traveltime="129.00">
39+
<stop duration="0.00" arrival="0.00" arrivalPos="50.87" actType="waiting"/>
40+
<ride waitingTime="53.00" vehicle="t_0" depart="53.00" arrival="182.00" arrivalPos="43.68" duration="129.00" routeLength="486.91" timeLoss="10.37"/>
41+
</personinfo>
3842
</tripinfos>

‎tests/sumo/devices/taxi/bugs/ticket9812_taxi_vclasses/tripinfos.sumo.meso‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<!-- generated on 2026-04-14T01:02:35.786686+01:00 by Eclipse SUMO sumo v1_26_0+1122-09074a15319
3+
<!-- generated on 2026-04-14T01:10:04.121587+01:00 by Eclipse SUMO sumo v1_26_0+1123-334e341037c
44
<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
55
66
<input>
@@ -39,4 +39,8 @@
3939
-->
4040

4141
<tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
42+
<personinfo id="p_0" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.06" duration="69.00" waitingTime="32.00" timeLoss="0.00" traveltime="37.00">
43+
<stop duration="0.00" arrival="0.00" arrivalPos="50.87" actType="waiting"/>
44+
<ride waitingTime="32.00" vehicle="t_0" depart="32.00" arrival="69.00" arrivalPos="0.00" duration="37.00" routeLength="987.20" timeLoss="0.00"/>
45+
</personinfo>
4246
</tripinfos>

‎tests/sumo/devices/taxi/bugs/ticket9812_taxi_vclasses/vehroutes.sumo‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<!-- generated on 2026-04-14T01:02:19.746887+01:00 by Eclipse SUMO sumo v1_26_0+1122-09074a15319
3+
<!-- generated on 2026-04-14T01:09:36.188636+01:00 by Eclipse SUMO sumo v1_26_0+1123-334e341037c
44
<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
55
66
<input>
@@ -35,4 +35,20 @@
3535
-->
3636

3737
<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
38+
<person id="p_0" depart="0.00" arrival="182.00">
39+
<stop trainStop="ts_0" duration="0.00"/>
40+
<ride from="E1" to="E6" trainStop="ts_1" lines="taxi"/>
41+
</person>
42+
43+
<vehicle id="t_0" type="railtaxi" depart="0.00" departSpeed="0.00" speedFactor="1.0000">
44+
<routeDistribution>
45+
<route replacedOnEdge="-E8" reason="taxi:prepare_dispatch" replacedAtTime="0.00" probability="0" edges="-E8 -E7 -E7.50 E7 E70 E0"/>
46+
<route replacedOnEdge="-E8" reason="taxi:dispatch" replacedAtTime="0.00" probability="0" edges="-E8 E1 E6"/>
47+
<route edges="-E8 -E7 -E7.50 E7 E70 E0 E1 E2 E3 E4 E5 E6"/>
48+
</routeDistribution>
49+
<stop busStop="ts_0" permitted="p_0" actType="pickup p_0 (0)"/>
50+
<stop busStop="ts_1" actType="dropOff p_0 (0)"/>
51+
<param key="has.taxi.device" value="true"/>
52+
</vehicle>
53+
3854
</routes>

‎tests/sumo/devices/taxi/bugs/ticket9812_taxi_vclasses/vehroutes.sumo.meso‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<!-- generated on 2026-04-14T01:10:04.122147+01:00 by Eclipse SUMO sumo v1_26_0+1123-334e341037c
4+
<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
5+
6+
<input>
7+
<net-file value="net.net.xml"/>
8+
<route-files value="input_routes.rou.xml"/>
9+
<additional-files value="input_additional.add.xml"/>
10+
</input>
11+
12+
<output>
13+
<tripinfo-output value="tripinfos.xml"/>
14+
<vehroute-output value="vehroutes.xml"/>
15+
<vehroute-output.write-unfinished value="true"/>
16+
<railsignal-vehicle-output value="railsignal_vehicles.xml"/>
17+
</output>
18+
19+
<routing>
20+
<persontrip.transfer.taxi-walk value="ptStops"/>
21+
<persontrip.transfer.walk-taxi value="ptStops"/>
22+
</routing>
23+
24+
<report>
25+
<duration-log.disable value="true"/>
26+
<no-step-log value="true"/>
27+
</report>
28+
29+
<taxi_device>
30+
<device.taxi.dispatch-period value="30"/>
31+
<device.taxi.vclasses value="rail"/>
32+
</taxi_device>
33+
34+
<mesoscopic>
35+
<mesosim value="true"/>
36+
</mesoscopic>
37+
38+
</sumoConfiguration>
39+
-->
40+
41+
<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
42+
<person id="p_0" depart="0.00" arrival="69.00">
43+
<stop trainStop="ts_0" duration="0.00"/>
44+
<ride from="E1" to="E6" trainStop="ts_1" lines="taxi"/>
45+
</person>
46+
47+
<vehicle id="t_0" type="railtaxi" depart="0.00" departSpeed="13.89" speedFactor="1.0000">
48+
<routeDistribution>
49+
<route replacedOnEdge="-E8" reason="taxi:prepare_dispatch" replacedAtTime="0.00" probability="0" edges="-E8 -E7 -E7.50 E7 E70 E0"/>
50+
<route replacedOnEdge="-E8" reason="taxi:dispatch" replacedAtTime="0.00" probability="0" edges="-E8 E1 E6"/>
51+
<route edges="-E8 -E7 -E7.50 E7 E70 E0 E1 E2 E3 E4 E5 E6"/>
52+
</routeDistribution>
53+
<stop busStop="ts_0" permitted="p_0" actType="pickup p_0 (0)"/>
54+
<stop busStop="ts_1" actType="dropOff p_0 (0)"/>
55+
<param key="has.taxi.device" value="true"/>
56+
</vehicle>
57+
58+
</routes>

0 commit comments

Comments
 (0)
⚡