Skip to content

Commit 9e68341

Browse files
committed
patching expected results. refs #21, #17644
1 parent fe82d6f commit 9e68341

File tree

4 files changed

+51
-51
lines changed

4 files changed

+51
-51
lines changed

tests/sumo/devices/taxi/groups/10persons_late_grouping/tripinfos.sumo

Lines changed: 23 additions & 23 deletions
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-02-17T14:00:40.632642+01:00 by Eclipse SUMO sumo v1_26_0+0247-62974448ee4
3+
<!-- generated on 2026-02-17T15:18:53.422848+01:00 by Eclipse SUMO sumo v1_26_0+0250-4c2647fa1e7
44
This data file and the accompanying materials
55
are made available under the terms of the Eclipse Public License v2.0
66
which accompanies this distribution, and is available at
@@ -38,37 +38,37 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
3838
-->
3939

4040
<tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
41-
<personinfo id="p.0" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="377.00" waitingTime="118.00" timeLoss="26.91" traveltime="259.00">
42-
<ride waitingTime="118.00" vehicle="trip_0" depart="118.00" arrival="377.00" arrivalPos="287.60" duration="259.00" routeLength="2271.09" timeLoss="26.91"/>
41+
<personinfo id="p.0" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="381.00" waitingTime="122.00" timeLoss="26.91" traveltime="259.00">
42+
<ride waitingTime="122.00" vehicle="trip_0" depart="122.00" arrival="381.00" arrivalPos="287.60" duration="259.00" routeLength="2271.09" timeLoss="26.91"/>
4343
</personinfo>
44-
<personinfo id="p.1" depart="5.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="776.00" waitingTime="518.00" timeLoss="25.53" traveltime="258.00">
45-
<ride waitingTime="518.00" vehicle="trip_0" depart="523.00" arrival="781.00" arrivalPos="287.60" duration="258.00" routeLength="2271.06" timeLoss="25.53"/>
44+
<personinfo id="p.1" depart="5.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="377.00" waitingTime="117.00" timeLoss="26.91" traveltime="260.00">
45+
<ride waitingTime="117.00" vehicle="trip_0" depart="122.00" arrival="382.00" arrivalPos="287.60" duration="260.00" routeLength="2271.09" timeLoss="26.91"/>
4646
</personinfo>
47-
<personinfo id="p.2" depart="10.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="772.00" waitingTime="513.00" timeLoss="25.53" traveltime="259.00">
48-
<ride waitingTime="513.00" vehicle="trip_0" depart="523.00" arrival="782.00" arrivalPos="287.60" duration="259.00" routeLength="2271.06" timeLoss="25.53"/>
47+
<personinfo id="p.2" depart="10.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="372.00" waitingTime="112.00" timeLoss="26.91" traveltime="260.00">
48+
<ride waitingTime="112.00" vehicle="trip_0" depart="122.00" arrival="382.00" arrivalPos="287.60" duration="260.00" routeLength="2271.09" timeLoss="26.91"/>
4949
</personinfo>
50-
<personinfo id="p.3" depart="15.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="767.00" waitingTime="508.00" timeLoss="25.53" traveltime="259.00">
51-
<ride waitingTime="508.00" vehicle="trip_0" depart="523.00" arrival="782.00" arrivalPos="287.60" duration="259.00" routeLength="2271.06" timeLoss="25.53"/>
50+
<personinfo id="p.3" depart="15.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="368.00" waitingTime="107.00" timeLoss="26.91" traveltime="261.00">
51+
<ride waitingTime="107.00" vehicle="trip_0" depart="122.00" arrival="383.00" arrivalPos="287.60" duration="261.00" routeLength="2271.02" timeLoss="26.91"/>
5252
</personinfo>
53-
<personinfo id="p.4" depart="20.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="763.00" waitingTime="503.00" timeLoss="25.53" traveltime="260.00">
54-
<ride waitingTime="503.00" vehicle="trip_0" depart="523.00" arrival="783.00" arrivalPos="287.60" duration="260.00" routeLength="2271.02" timeLoss="25.53"/>
53+
<personinfo id="p.4" depart="20.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="363.00" waitingTime="102.00" timeLoss="26.91" traveltime="261.00">
54+
<ride waitingTime="102.00" vehicle="trip_0" depart="122.00" arrival="383.00" arrivalPos="287.60" duration="261.00" routeLength="2271.02" timeLoss="26.91"/>
5555
</personinfo>
56-
<personinfo id="p.5" depart="25.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="758.00" waitingTime="498.00" timeLoss="25.53" traveltime="260.00">
57-
<ride waitingTime="498.00" vehicle="trip_0" depart="523.00" arrival="783.00" arrivalPos="287.60" duration="260.00" routeLength="2271.02" timeLoss="25.53"/>
56+
<personinfo id="p.5" depart="25.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="359.00" waitingTime="97.00" timeLoss="26.91" traveltime="262.00">
57+
<ride waitingTime="97.00" vehicle="trip_0" depart="122.00" arrival="384.00" arrivalPos="287.60" duration="262.00" routeLength="2271.02" timeLoss="26.91"/>
5858
</personinfo>
59-
<personinfo id="p.6" depart="30.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="754.00" waitingTime="493.00" timeLoss="25.53" traveltime="261.00">
60-
<ride waitingTime="493.00" vehicle="trip_0" depart="523.00" arrival="784.00" arrivalPos="287.60" duration="261.00" routeLength="2271.02" timeLoss="25.53"/>
59+
<personinfo id="p.6" depart="30.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="354.00" waitingTime="92.00" timeLoss="26.91" traveltime="262.00">
60+
<ride waitingTime="92.00" vehicle="trip_0" depart="122.00" arrival="384.00" arrivalPos="287.60" duration="262.00" routeLength="2271.02" timeLoss="26.91"/>
6161
</personinfo>
62-
<personinfo id="p.7" depart="35.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="749.00" waitingTime="488.00" timeLoss="25.53" traveltime="261.00">
63-
<ride waitingTime="488.00" vehicle="trip_0" depart="523.00" arrival="784.00" arrivalPos="287.60" duration="261.00" routeLength="2271.02" timeLoss="25.53"/>
62+
<personinfo id="p.7" depart="35.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="350.00" waitingTime="87.00" timeLoss="26.91" traveltime="263.00">
63+
<ride waitingTime="87.00" vehicle="trip_0" depart="122.00" arrival="385.00" arrivalPos="287.60" duration="263.00" routeLength="2271.02" timeLoss="26.91"/>
6464
</personinfo>
65-
<personinfo id="p.8" depart="40.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="745.00" waitingTime="483.00" timeLoss="25.53" traveltime="262.00">
66-
<ride waitingTime="483.00" vehicle="trip_0" depart="523.00" arrival="785.00" arrivalPos="287.60" duration="262.00" routeLength="2271.02" timeLoss="25.53"/>
65+
<personinfo id="p.8" depart="40.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="345.00" waitingTime="82.00" timeLoss="26.91" traveltime="263.00">
66+
<ride waitingTime="82.00" vehicle="trip_0" depart="122.00" arrival="385.00" arrivalPos="287.60" duration="263.00" routeLength="2271.02" timeLoss="26.91"/>
6767
</personinfo>
68-
<personinfo id="p.9" depart="45.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="740.00" waitingTime="478.00" timeLoss="25.53" traveltime="262.00">
69-
<ride waitingTime="478.00" vehicle="trip_0" depart="523.00" arrival="785.00" arrivalPos="287.60" duration="262.00" routeLength="2271.02" timeLoss="25.53"/>
68+
<personinfo id="p.9" depart="45.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="341.00" waitingTime="77.00" timeLoss="26.91" traveltime="264.00">
69+
<ride waitingTime="77.00" vehicle="trip_0" depart="122.00" arrival="386.00" arrivalPos="287.60" duration="264.00" routeLength="2271.02" timeLoss="26.91"/>
7070
</personinfo>
71-
<tripinfo id="trip_0" depart="0.00" departLane="A0B0_1" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalSpeed="-1.00" duration="788.00" routeLength="7052.14" waitingTime="8.00" waitingCount="2" stopTime="177.00" timeLoss="75.72" rerouteNo="4" devices="tripinfo_trip_0 routing_trip_0 taxi_trip_0 person_trip_0" vType="taxi_large" speedFactor="1.00" vaporized="">
72-
<taxi customers="10" occupiedDistance="4542.15" occupiedTime="403.00"/>
71+
<tripinfo id="trip_0" depart="0.00" departLane="A0B0_1" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalSpeed="-1.00" duration="388.00" routeLength="3667.32" waitingTime="3.00" waitingCount="1" stopTime="72.00" timeLoss="38.21" rerouteNo="2" devices="tripinfo_trip_0 routing_trip_0 taxi_trip_0 person_trip_0" vType="taxi_large" speedFactor="1.00" vaporized="">
72+
<taxi customers="10" occupiedDistance="2271.09" occupiedTime="202.00"/>
7373
</tripinfo>
7474
</tripinfos>

tests/sumo/devices/taxi/groups/10persons_late_grouping/tripinfos.sumo.meso

Lines changed: 21 additions & 21 deletions
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-02-17T14:02:13.389199+01:00 by Eclipse SUMO sumo v1_26_0+0247-62974448ee4
3+
<!-- generated on 2026-02-17T15:27:38.486691+01:00 by Eclipse SUMO sumo v1_26_0+0250-4c2647fa1e7
44
This data file and the accompanying materials
55
are made available under the terms of the Eclipse Public License v2.0
66
which accompanies this distribution, and is available at
@@ -45,34 +45,34 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
4545
<personinfo id="p.0" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="246.00" waitingTime="95.00" timeLoss="0.00" traveltime="151.00">
4646
<ride waitingTime="95.00" vehicle="trip_0" depart="95.00" arrival="246.00" arrivalPos="191.73" duration="151.00" routeLength="2082.53" timeLoss="0.00"/>
4747
</personinfo>
48-
<personinfo id="p.1" depart="5.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="533.00" waitingTime="382.00" timeLoss="0.00" traveltime="151.00">
49-
<ride waitingTime="382.00" vehicle="trip_0" depart="387.00" arrival="538.00" arrivalPos="191.73" duration="151.00" routeLength="2082.53" timeLoss="0.00"/>
48+
<personinfo id="p.1" depart="5.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="241.00" waitingTime="90.00" timeLoss="0.00" traveltime="151.00">
49+
<ride waitingTime="90.00" vehicle="trip_0" depart="95.00" arrival="246.00" arrivalPos="191.73" duration="151.00" routeLength="2082.53" timeLoss="0.00"/>
5050
</personinfo>
51-
<personinfo id="p.2" depart="10.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="528.00" waitingTime="377.00" timeLoss="0.00" traveltime="151.00">
52-
<ride waitingTime="377.00" vehicle="trip_0" depart="387.00" arrival="538.00" arrivalPos="191.73" duration="151.00" routeLength="2082.53" timeLoss="0.00"/>
51+
<personinfo id="p.2" depart="10.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="236.00" waitingTime="85.00" timeLoss="0.00" traveltime="151.00">
52+
<ride waitingTime="85.00" vehicle="trip_0" depart="95.00" arrival="246.00" arrivalPos="191.73" duration="151.00" routeLength="2082.53" timeLoss="0.00"/>
5353
</personinfo>
54-
<personinfo id="p.3" depart="15.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="523.00" waitingTime="372.00" timeLoss="0.00" traveltime="151.00">
55-
<ride waitingTime="372.00" vehicle="trip_0" depart="387.00" arrival="538.00" arrivalPos="191.73" duration="151.00" routeLength="2082.53" timeLoss="0.00"/>
54+
<personinfo id="p.3" depart="15.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="231.00" waitingTime="80.00" timeLoss="0.00" traveltime="151.00">
55+
<ride waitingTime="80.00" vehicle="trip_0" depart="95.00" arrival="246.00" arrivalPos="191.73" duration="151.00" routeLength="2082.53" timeLoss="0.00"/>
5656
</personinfo>
57-
<personinfo id="p.4" depart="20.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="518.00" waitingTime="367.00" timeLoss="0.00" traveltime="151.00">
58-
<ride waitingTime="367.00" vehicle="trip_0" depart="387.00" arrival="538.00" arrivalPos="191.73" duration="151.00" routeLength="2082.53" timeLoss="0.00"/>
57+
<personinfo id="p.4" depart="20.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="226.00" waitingTime="75.00" timeLoss="0.00" traveltime="151.00">
58+
<ride waitingTime="75.00" vehicle="trip_0" depart="95.00" arrival="246.00" arrivalPos="191.73" duration="151.00" routeLength="2082.53" timeLoss="0.00"/>
5959
</personinfo>
60-
<personinfo id="p.5" depart="25.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="513.00" waitingTime="362.00" timeLoss="0.00" traveltime="151.00">
61-
<ride waitingTime="362.00" vehicle="trip_0" depart="387.00" arrival="538.00" arrivalPos="191.73" duration="151.00" routeLength="2082.53" timeLoss="0.00"/>
60+
<personinfo id="p.5" depart="25.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="221.00" waitingTime="70.00" timeLoss="0.00" traveltime="151.00">
61+
<ride waitingTime="70.00" vehicle="trip_0" depart="95.00" arrival="246.00" arrivalPos="191.73" duration="151.00" routeLength="2082.53" timeLoss="0.00"/>
6262
</personinfo>
63-
<personinfo id="p.6" depart="30.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="508.00" waitingTime="357.00" timeLoss="0.00" traveltime="151.00">
64-
<ride waitingTime="357.00" vehicle="trip_0" depart="387.00" arrival="538.00" arrivalPos="191.73" duration="151.00" routeLength="2082.53" timeLoss="0.00"/>
63+
<personinfo id="p.6" depart="30.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="216.00" waitingTime="65.00" timeLoss="0.00" traveltime="151.00">
64+
<ride waitingTime="65.00" vehicle="trip_0" depart="95.00" arrival="246.00" arrivalPos="191.73" duration="151.00" routeLength="2082.53" timeLoss="0.00"/>
6565
</personinfo>
66-
<personinfo id="p.7" depart="35.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="503.00" waitingTime="352.00" timeLoss="0.00" traveltime="151.00">
67-
<ride waitingTime="352.00" vehicle="trip_0" depart="387.00" arrival="538.00" arrivalPos="191.73" duration="151.00" routeLength="2082.53" timeLoss="0.00"/>
66+
<personinfo id="p.7" depart="35.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="211.00" waitingTime="60.00" timeLoss="0.00" traveltime="151.00">
67+
<ride waitingTime="60.00" vehicle="trip_0" depart="95.00" arrival="246.00" arrivalPos="191.73" duration="151.00" routeLength="2082.53" timeLoss="0.00"/>
6868
</personinfo>
69-
<personinfo id="p.8" depart="40.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="498.00" waitingTime="347.00" timeLoss="0.00" traveltime="151.00">
70-
<ride waitingTime="347.00" vehicle="trip_0" depart="387.00" arrival="538.00" arrivalPos="191.73" duration="151.00" routeLength="2082.53" timeLoss="0.00"/>
69+
<personinfo id="p.8" depart="40.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="206.00" waitingTime="55.00" timeLoss="0.00" traveltime="151.00">
70+
<ride waitingTime="55.00" vehicle="trip_0" depart="95.00" arrival="246.00" arrivalPos="191.73" duration="151.00" routeLength="2082.53" timeLoss="0.00"/>
7171
</personinfo>
72-
<personinfo id="p.9" depart="45.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="493.00" waitingTime="342.00" timeLoss="0.00" traveltime="151.00">
73-
<ride waitingTime="342.00" vehicle="trip_0" depart="387.00" arrival="538.00" arrivalPos="191.73" duration="151.00" routeLength="2082.53" timeLoss="0.00"/>
72+
<personinfo id="p.9" depart="45.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="201.00" waitingTime="50.00" timeLoss="0.00" traveltime="151.00">
73+
<ride waitingTime="50.00" vehicle="trip_0" depart="95.00" arrival="246.00" arrivalPos="191.73" duration="151.00" routeLength="2082.53" timeLoss="0.00"/>
7474
</personinfo>
75-
<tripinfo id="trip_0" depart="0.00" departLane="A0B0_1" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalSpeed="-1.00" duration="599.00" routeLength="6604.53" waitingTime="0.00" waitingCount="0" stopTime="122.00" timeLoss="60.00" rerouteNo="4" devices="tripinfo_trip_0 routing_trip_0 taxi_trip_0 person_trip_0" vType="taxi_large" speedFactor="1.00" vaporized="">
76-
<taxi customers="10" occupiedDistance="4165.07" occupiedTime="301.87"/>
75+
<tripinfo id="trip_0" depart="0.00" departLane="A0B0_1" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalSpeed="-1.00" duration="307.00" routeLength="3398.13" waitingTime="0.00" waitingCount="0" stopTime="61.00" timeLoss="0.00" rerouteNo="2" devices="tripinfo_trip_0 routing_trip_0 taxi_trip_0 person_trip_0" vType="taxi_large" speedFactor="1.00" vaporized="">
76+
<taxi customers="10" occupiedDistance="2082.53" occupiedTime="150.93"/>
7777
</tripinfo>
7878
</tripinfos>

tests/sumo/devices/taxi/groups/2persons_differentDepart/tripinfos.sumo

Lines changed: 5 additions & 5 deletions
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-01-22T16:25:34.766330+01:00 by Eclipse SUMO sumo v1_25_0+1143-5cfd67bbee0
3+
<!-- generated on 2026-02-17T15:27:59.757763+01:00 by Eclipse SUMO sumo v1_26_0+0250-4c2647fa1e7
44
This data file and the accompanying materials
55
are made available under the terms of the Eclipse Public License v2.0
66
which accompanies this distribution, and is available at
@@ -41,11 +41,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
4141
<personinfo id="p0" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="231.00" waitingTime="48.00" timeLoss="15.54" traveltime="183.00">
4242
<ride waitingTime="48.00" vehicle="trip_0" depart="48.00" arrival="231.00" arrivalPos="287.60" duration="183.00" routeLength="1370.28" timeLoss="15.54"/>
4343
</personinfo>
44-
<personinfo id="p1" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="448.00" waitingTime="226.00" timeLoss="13.82" traveltime="182.00">
44+
<personinfo id="p1" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="232.00" waitingTime="8.00" timeLoss="15.54" traveltime="184.00">
4545
<stop duration="40.00" arrival="40.00" arrivalPos="0.00" actType="waiting"/>
46-
<ride waitingTime="226.00" vehicle="trip_0" depart="266.00" arrival="448.00" arrivalPos="287.60" duration="182.00" routeLength="1370.22" timeLoss="13.82"/>
46+
<ride waitingTime="8.00" vehicle="trip_0" depart="48.00" arrival="232.00" arrivalPos="287.60" duration="184.00" routeLength="1370.28" timeLoss="15.54"/>
4747
</personinfo>
48-
<tripinfo id="trip_0" depart="0.00" departLane="A0B0_1" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalSpeed="-1.00" duration="451.00" routeLength="3450.58" waitingTime="9.00" waitingCount="3" stopTime="135.00" timeLoss="40.94" rerouteNo="5" devices="tripinfo_trip_0 routing_trip_0 taxi_trip_0 person_trip_0" vType="taxi" speedFactor="1.00" vaporized="">
49-
<taxi customers="2" occupiedDistance="2740.50" occupiedTime="251.00"/>
48+
<tripinfo id="trip_0" depart="0.00" departLane="A0B0_1" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalSpeed="-1.00" duration="234.00" routeLength="1866.54" waitingTime="4.00" waitingCount="2" stopTime="64.00" timeLoss="22.84" rerouteNo="3" devices="tripinfo_trip_0 routing_trip_0 taxi_trip_0 person_trip_0" vType="taxi" speedFactor="1.00" vaporized="">
49+
<taxi customers="2" occupiedDistance="1370.28" occupiedTime="126.00"/>
5050
</tripinfo>
5151
</tripinfos>

0 commit comments

Comments
 (0)