Skip to content

Commit

Permalink
patching expected meso results refs #21, #15503
Browse files Browse the repository at this point in the history
  • Loading branch information
@namdre
namdre committed Sep 18, 2024
1 parent 1c8526c commit 1907299
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 15 deletions.
12 changes: 7 additions & 5 deletions tests/sumo/extended/stops/looped_skip/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 2023-03-22 17:17:47 by Eclipse SUMO sumo Version v1_16_0+1570-ec89ba0
<!-- generated on 2024-09-18 17:39:42 by Eclipse SUMO sumo Version v1_20_0+2037-cac2a3bac63
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 @@ -11,10 +11,10 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
or later which is available at
https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
<input>
<net-file value="net.net.xml"/>
<net-file value="net2.net.xml"/>
<route-files value="input_routes.rou.xml"/>
</input>
Expand All @@ -24,6 +24,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
</output>
<processing>
<tls.all-off value="true"/>
<default.speeddev value="0"/>
</processing>
Expand All @@ -37,9 +38,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<mesosim value="true"/>
</mesoscopic>
</configuration>
</sumoConfiguration>
-->

<stops xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/stopinfo_file.xsd">
<stopinfo id="v0" type="DEFAULT_VEHTYPE" edge="links" pos="97.95" parking="0" started="56.42" ended="74.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="v0" type="t0" edge="CN" pos="0.00" parking="0" started="33.10" ended="45.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="v0" type="t0" edge="CN" pos="0.00" parking="0" started="91.06" ended="103.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
</stops>
2 changes: 2 additions & 0 deletions tests/sumo/extended/stops/looped_skip_noWarn/errors.sumo.meso
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Warning: Network contains internal links which are ignored. Vehicles will 'jump' across junctions and thus underestimate route lengths and travel times.
Warning: Vehicle 'v0' has multiple stops on segment 'CN:0', time=16.62 (stop-output will be merged).
11 changes: 6 additions & 5 deletions tests/sumo/extended/stops/looped_skip_noWarn/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 2023-03-22 17:17:47 by Eclipse SUMO sumo Version v1_16_0+1570-ec89ba0
<!-- generated on 2024-09-18 17:39:42 by Eclipse SUMO sumo Version v1_20_0+2037-cac2a3bac63
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 @@ -11,10 +11,10 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
or later which is available at
https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
<input>
<net-file value="net.net.xml"/>
<net-file value="net2.net.xml"/>
<route-files value="input_routes.rou.xml"/>
</input>
Expand All @@ -24,6 +24,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
</output>
<processing>
<tls.all-off value="true"/>
<default.speeddev value="0"/>
</processing>
Expand All @@ -37,9 +38,9 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<mesosim value="true"/>
</mesoscopic>
</configuration>
</sumoConfiguration>
-->

<stops xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/stopinfo_file.xsd">
<stopinfo id="v0" type="DEFAULT_VEHTYPE" edge="links" pos="97.95" parking="0" started="56.42" ended="74.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="v0" type="t0" edge="CN" pos="0.00" parking="0" started="6.62" ended="24.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
</stops>
12 changes: 7 additions & 5 deletions tests/sumo/extended/stops/looped_skip_warn/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 2023-03-22 17:17:47 by Eclipse SUMO sumo Version v1_16_0+1570-ec89ba0
<!-- generated on 2024-09-18 17:39:42 by Eclipse SUMO sumo Version v1_20_0+2037-cac2a3bac63
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 @@ -11,10 +11,10 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
or later which is available at
https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
<input>
<net-file value="net.net.xml"/>
<net-file value="net2.net.xml"/>
<route-files value="input_routes.rou.xml"/>
</input>
Expand All @@ -24,6 +24,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
</output>
<processing>
<tls.all-off value="true"/>
<default.speeddev value="0"/>
</processing>
Expand All @@ -37,9 +38,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<mesosim value="true"/>
</mesoscopic>
</configuration>
</sumoConfiguration>
-->

<stops xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/stopinfo_file.xsd">
<stopinfo id="v0" type="DEFAULT_VEHTYPE" edge="links" pos="97.95" parking="0" started="56.42" ended="74.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="v0" type="t0" edge="CN" pos="0.00" parking="0" started="33.10" ended="45.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="v0" type="t0" edge="CN" pos="0.00" parking="0" started="91.06" ended="103.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
</stops>

0 comments on commit 1907299

Please sign in to comment.