Skip to content

Commit ff910ea

Browse files
namdrenamdre
committed
patching expected results refs #21, #17909 
1 parent f26955b commit ff910ea

14 files changed

Lines changed: 2414 additions & 2395 deletions

File tree

‎tests/complex/state/rerouting/vehroutes.complex.meso‎

Lines changed: 1372 additions & 1281 deletions
Large diffs are not rendered by default.

‎tests/complex/state/rerouting/vehroutes2.complex.meso‎

Lines changed: 674 additions & 544 deletions
Large diffs are not rendered by default.

‎tests/complex/state/save_cyclic_stops/stopinfos.complex.meso‎

Lines changed: 10 additions & 8 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 2025-07-16 08:59:28 by Eclipse SUMO sumo Version v1_23_1+1098-b5f7c6a5135
3+
<!-- generated on 2026-04-22T13:53:11.174784+01:00 by Eclipse SUMO sumo v1_26_0+1331-f26955b8843
44
<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
55
66
<input>
@@ -15,6 +15,8 @@
1515
</output>
1616
1717
<processing>
18+
<default.departspeed value="0"/>
19+
<default.departlane value="first"/>
1820
<default.speeddev value="0"/>
1921
</processing>
2022
@@ -32,11 +34,11 @@
3234

3335
<stops xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/stopinfo_file.xsd">
3436
<stopinfo id="v0" type="DEFAULT_VEHTYPE" edge="SC" pos="0.00" parking="0" started="0.00" ended="67.00" delay="7.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" blockedDuration="0.00"/>
35-
<stopinfo id="v0" type="DEFAULT_VEHTYPE" edge="CN" pos="0.00" parking="0" started="66.62" ended="127.00" delay="7.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" blockedDuration="0.00"/>
36-
<stopinfo id="v0" type="DEFAULT_VEHTYPE" edge="SC" pos="0.00" parking="0" started="139.86" ended="247.00" delay="7.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" blockedDuration="0.00"/>
37-
<stopinfo id="v0" type="DEFAULT_VEHTYPE" edge="CN" pos="0.00" parking="0" started="246.62" ended="307.00" delay="7.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" blockedDuration="0.00"/>
38-
<stopinfo id="v0" type="DEFAULT_VEHTYPE" edge="SC" pos="0.00" parking="0" started="319.86" ended="367.00" delay="7.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" blockedDuration="0.00"/>
39-
<stopinfo id="v0" type="DEFAULT_VEHTYPE" edge="CN" pos="0.00" parking="0" started="366.62" ended="427.00" delay="7.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" blockedDuration="0.00"/>
40-
<stopinfo id="v0" type="DEFAULT_VEHTYPE" edge="SC" pos="0.00" parking="0" started="439.86" ended="487.00" delay="7.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" blockedDuration="0.00"/>
41-
<stopinfo id="v0" type="DEFAULT_VEHTYPE" edge="CN" pos="0.00" parking="0" started="486.62" ended="547.00" delay="7.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" blockedDuration="0.00"/>
37+
<stopinfo id="v0" type="DEFAULT_VEHTYPE" edge="CN" pos="0.00" parking="0" started="67.78" ended="127.00" delay="7.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" blockedDuration="0.00"/>
38+
<stopinfo id="v0" type="DEFAULT_VEHTYPE" edge="SC" pos="0.00" parking="0" started="141.71" ended="247.00" delay="7.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" blockedDuration="0.00"/>
39+
<stopinfo id="v0" type="DEFAULT_VEHTYPE" edge="CN" pos="0.00" parking="0" started="247.78" ended="307.00" delay="7.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" blockedDuration="0.00"/>
40+
<stopinfo id="v0" type="DEFAULT_VEHTYPE" edge="SC" pos="0.00" parking="0" started="321.71" ended="367.00" delay="7.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" blockedDuration="0.00"/>
41+
<stopinfo id="v0" type="DEFAULT_VEHTYPE" edge="CN" pos="0.00" parking="0" started="367.78" ended="427.00" delay="7.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" blockedDuration="0.00"/>
42+
<stopinfo id="v0" type="DEFAULT_VEHTYPE" edge="SC" pos="0.00" parking="0" started="441.71" ended="487.00" delay="7.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" blockedDuration="0.00"/>
43+
<stopinfo id="v0" type="DEFAULT_VEHTYPE" edge="CN" pos="0.00" parking="0" started="487.78" ended="547.00" delay="7.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" blockedDuration="0.00"/>
4244
</stops>

‎tests/complex/state/save_cyclic_stops/stopinfos2.complex.meso‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<!-- generated on 2026-04-22T13:53:11.310606+01:00 by Eclipse SUMO sumo v1_26_0+1331-f26955b8843
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+
<load-state value="state.xml"/>
9+
</input>
10+
11+
<output>
12+
<stop-output value="stopinfos2.xml"/>
13+
</output>
14+
15+
<processing>
16+
<default.departspeed value="0"/>
17+
<default.departlane value="first"/>
18+
<default.speeddev value="0"/>
19+
</processing>
20+
21+
<report>
22+
<duration-log.disable value="true"/>
23+
<no-step-log value="true"/>
24+
</report>
25+
26+
<mesoscopic>
27+
<mesosim value="true"/>
28+
</mesoscopic>
29+
30+
</sumoConfiguration>
31+
-->
32+
33+
<stops xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/stopinfo_file.xsd">
34+
<stopinfo id="v0" type="DEFAULT_VEHTYPE" edge="CN" pos="0.00" parking="0" started="367.78" ended="427.00" delay="7.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" blockedDuration="0.00"/>
35+
<stopinfo id="v0" type="DEFAULT_VEHTYPE" edge="SC" pos="0.00" parking="0" started="441.71" ended="487.00" delay="7.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" blockedDuration="0.00"/>
36+
<stopinfo id="v0" type="DEFAULT_VEHTYPE" edge="CN" pos="0.00" parking="0" started="487.78" ended="547.00" delay="7.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" blockedDuration="0.00"/>
37+
</stops>

‎tests/complex/state/save_routeDistribution2/tripinfo.complex.meso‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,32 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<!-- generated on Mon Oct 12 21:52:42 2020 by Eclipse SUMO sumo Version v1_7_0+0591-54c0d1ca00
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-
SPDX-License-Identifier: EPL-2.0
9-
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
3+
<!-- generated on 2026-04-22T13:53:11.403297+01:00 by Eclipse SUMO sumo v1_26_0+1331-f26955b8843
4+
<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
105
116
<input>
127
<net-file value="net.net.xml"/>
138
<route-files value="input_routes.rou.xml"/>
149
</input>
1510
1611
<output>
17-
<write-license value="true"/>
18-
<tripinfo-output value="tripinfos.xml"/>
19-
<save-state.times value="20"/>
12+
<tripinfo-output value="tripinfo.xml"/>
13+
<save-state.times value="30"/>
2014
<save-state.files value="state.xml"/>
2115
</output>
2216
17+
<time>
18+
<end value="31"/>
19+
</time>
20+
2321
<processing>
22+
<default.departspeed value="0"/>
23+
<default.departlane value="first"/>
2424
<default.speeddev value="0"/>
25-
<pedestrian.model value="nonInteracting"/>
2625
</processing>
2726
2827
<report>
2928
<verbose value="true"/>
30-
<xml-validation value="never"/>
31-
<xml-validation.routes value="never"/>
29+
<log value="log.txt"/>
3230
<duration-log.disable value="true"/>
3331
<no-step-log value="true"/>
3432
</report>
@@ -37,10 +35,9 @@ SPDX-License-Identifier: EPL-2.0
3735
<mesosim value="true"/>
3836
</mesoscopic>
3937
40-
</configuration>
38+
</sumoConfiguration>
4139
-->
4240

4341
<tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
44-
<tripinfo id="v0" depart="0.00" departLane="" departPos="0.00" departSpeed="1.00" departDelay="0.00" arrival="22.00" arrivalLane="" arrivalPos="200.00" arrivalSpeed="13.89" duration="22.00" routeLength="207.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_v0" vType="t0" speedFactor="1.00" vaporized=""/>
45-
<tripinfo id="v1" depart="7.00" departLane="" departPos="0.00" departSpeed="0.81" departDelay="4.00" arrival="38.00" arrivalLane="" arrivalPos="100.00" arrivalSpeed="13.89" duration="31.00" routeLength="307.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="1.63" rerouteNo="0" devices="tripinfo_v1" vType="t0" speedFactor="1.00" vaporized=""/>
42+
<tripinfo id="v0" depart="0.00" departLane="beg_0" departPos="0.00" departSpeed="1.00" departDelay="0.00" arrival="22.00" arrivalLane="middle_0" arrivalPos="200.00" arrivalSpeed="13.89" duration="22.00" routeLength="207.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_v0" vType="t0" speedFactor="1.00" vaporized=""/>
4643
</tripinfos>

0 commit comments

Comments
 (0)