Skip to content

Commit

Permalink
patching expected meso results refs #21
Browse files Browse the repository at this point in the history
  • Loading branch information
@namdre
namdre committed Apr 30, 2024
1 parent 608ae39 commit 624920f
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 18 deletions.
3 changes: 3 additions & 0 deletions tests/sumo/extended/stops/parkingArea_onRoad/access/errors.sumo.meso
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Warning: parkingArea 'ParkAreaA'on lane 'a_0' forbids access because vehicle 'foreigner' does not provide any valid badge.
Warning: Vehicle 'resident' has multiple stops on segment 'a:2', time=54.63 (stop-output will be merged).
Warning: Vehicle 'guest' has multiple stops on segment 'a:2', time=59.63 (stop-output will be merged).
15 changes: 7 additions & 8 deletions tests/sumo/extended/stops/parkingArea_onRoad/access/stopinfos.sumo.meso
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-04-11 18:35:16 by Eclipse SUMO sumo Version v1_19_0+1793-abaea7a63af
<!-- generated on 2024-04-30 17:33:27 by Eclipse SUMO sumo Version v1_19_0+2010-608ae39c7a0
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
Expand All @@ -26,6 +26,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
</output>
<processing>
<ignore-route-errors value="true"/>
<default.speeddev value="0"/>
</processing>
Expand All @@ -43,11 +44,9 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-->

<stops xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/stopinfo_file.xsd">
<stopinfo id="flow1.0" type="DEFAULT_VEHTYPE" edge="a" pos="203.21" parking="1" started="14.63" ended="222.00" parkingArea="ParkAreaA" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="flow1.1" type="DEFAULT_VEHTYPE" edge="a" pos="203.21" parking="1" started="19.63" ended="227.00" parkingArea="ParkAreaA" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="flow1.2" type="DEFAULT_VEHTYPE" edge="a" pos="203.21" parking="1" started="24.63" ended="232.00" parkingArea="ParkAreaA" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="flow1.3" type="DEFAULT_VEHTYPE" edge="a" pos="203.21" parking="1" started="29.63" ended="237.00" parkingArea="ParkAreaA" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="flow1.4" type="DEFAULT_VEHTYPE" edge="a" pos="203.21" parking="1" started="34.63" ended="242.00" parkingArea="ParkAreaA" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="flow1.5" type="DEFAULT_VEHTYPE" edge="a" pos="203.21" parking="1" started="39.63" ended="247.00" parkingArea="ParkAreaA" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="flow1.6" type="DEFAULT_VEHTYPE" edge="a" pos="203.21" parking="1" started="44.63" ended="252.00" parkingArea="ParkAreaA" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="resident" type="resident" edge="a" pos="203.21" parking="1" started="14.63" ended="62.00" parkingArea="ParkAreaA" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="resident" type="resident" edge="a" pos="203.21" parking="1" started="14.63" ended="62.00" parkingArea="ParkAreaB" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="foreigner" type="foreigner" edge="a" pos="203.21" parking="1" started="15.46" ended="63.00" parkingArea="ParkAreaB" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="guest" type="foreigner" edge="a" pos="203.21" parking="1" started="19.63" ended="67.00" parkingArea="ParkAreaA" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="guest" type="foreigner" edge="a" pos="203.21" parking="1" started="19.63" ended="67.00" parkingArea="ParkAreaB" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
</stops>
15 changes: 5 additions & 10 deletions tests/sumo/extended/stops/parkingArea_onRoad/access/tripinfos.sumo.meso
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2022-02-11 11:28:50 by Eclipse SUMO sumo Version v1_12_0+0490-00f3a0f
<!-- generated on 2024-04-30 17:33:27 by Eclipse SUMO sumo Version v1_19_0+2010-608ae39c7a0
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
Expand All @@ -26,13 +26,12 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
</output>
<processing>
<ignore-route-errors value="true"/>
<default.speeddev value="0"/>
<pedestrian.model value="nonInteracting"/>
</processing>
<report>
<xml-validation value="never"/>
<xml-validation.routes value="never"/>
<duration-log.disable value="true"/>
<no-step-log value="true"/>
</report>
Expand All @@ -45,11 +44,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-->

<tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
<tripinfo id="flow1.0" depart="0.00" departLane="" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="222.00" arrivalLane="" arrivalPos="304.81" arrivalSpeed="0.49" duration="222.00" routeLength="304.81" waitingTime="0.00" waitingCount="0" stopTime="200.00" timeLoss="200.00" rerouteNo="0" devices="tripinfo_flow1.0" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
<tripinfo id="flow1.1" depart="5.00" departLane="" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="227.00" arrivalLane="" arrivalPos="304.81" arrivalSpeed="0.49" duration="222.00" routeLength="304.81" waitingTime="0.00" waitingCount="0" stopTime="200.00" timeLoss="200.00" rerouteNo="0" devices="tripinfo_flow1.1" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
<tripinfo id="flow1.2" depart="10.00" departLane="" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="232.00" arrivalLane="" arrivalPos="304.81" arrivalSpeed="0.49" duration="222.00" routeLength="304.81" waitingTime="0.00" waitingCount="0" stopTime="200.00" timeLoss="200.00" rerouteNo="0" devices="tripinfo_flow1.2" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
<tripinfo id="flow1.3" depart="15.00" departLane="" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="237.00" arrivalLane="" arrivalPos="304.81" arrivalSpeed="0.49" duration="222.00" routeLength="304.81" waitingTime="0.00" waitingCount="0" stopTime="200.00" timeLoss="200.00" rerouteNo="0" devices="tripinfo_flow1.3" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
<tripinfo id="flow1.4" depart="20.00" departLane="" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="242.00" arrivalLane="" arrivalPos="304.81" arrivalSpeed="0.49" duration="222.00" routeLength="304.81" waitingTime="0.00" waitingCount="0" stopTime="200.00" timeLoss="200.00" rerouteNo="0" devices="tripinfo_flow1.4" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
<tripinfo id="flow1.5" depart="25.00" departLane="" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="247.00" arrivalLane="" arrivalPos="304.81" arrivalSpeed="0.49" duration="222.00" routeLength="304.81" waitingTime="0.00" waitingCount="0" stopTime="200.00" timeLoss="200.00" rerouteNo="0" devices="tripinfo_flow1.5" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
<tripinfo id="flow1.6" depart="30.00" departLane="" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="252.00" arrivalLane="" arrivalPos="304.81" arrivalSpeed="0.49" duration="222.00" routeLength="304.81" waitingTime="0.00" waitingCount="0" stopTime="200.00" timeLoss="200.00" rerouteNo="0" devices="tripinfo_flow1.6" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
<tripinfo id="resident" depart="0.00" departLane="" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="62.00" arrivalLane="" arrivalPos="304.81" arrivalSpeed="2.15" duration="62.00" routeLength="304.81" waitingTime="0.00" waitingCount="0" stopTime="40.00" timeLoss="40.00" rerouteNo="0" devices="tripinfo_resident" vType="resident" speedFactor="1.00" vaporized=""/>
<tripinfo id="foreigner" depart="0.00" departLane="" departPos="0.00" departSpeed="12.47" departDelay="0.00" arrival="63.00" arrivalLane="" arrivalPos="304.81" arrivalSpeed="2.15" duration="63.00" routeLength="304.81" waitingTime="0.00" waitingCount="0" stopTime="20.00" timeLoss="40.83" rerouteNo="0" devices="tripinfo_foreigner" vType="foreigner" speedFactor="1.00" vaporized=""/>
<tripinfo id="guest" depart="5.00" departLane="" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="67.00" arrivalLane="" arrivalPos="304.81" arrivalSpeed="2.15" duration="62.00" routeLength="304.81" waitingTime="0.00" waitingCount="0" stopTime="40.00" timeLoss="40.00" rerouteNo="0" devices="tripinfo_guest" vType="foreigner" speedFactor="1.00" vaporized=""/>
</tripinfos>

0 comments on commit 624920f

Please sign in to comment.