Skip to content

Commit

Permalink
patching expected results refs #21, #15983
Browse files Browse the repository at this point in the history
  • Loading branch information
@namdre
namdre committed Jan 8, 2025
1 parent d6df85c commit 1edbf15
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 18 deletions.
38 changes: 24 additions & 14 deletions tests/duarouter/alternatives/style2_input/with_taz_used2/alts.duarouter
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 2025-01-08 14:41:01 by Eclipse SUMO duarouter Version v1_21_0+1735-742e398ba02
<!-- generated on 2025-01-08 14:41:40 by Eclipse SUMO duarouter Version v1_21_0+1736-53ee2e6a794
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 Down Expand Up @@ -37,53 +37,63 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<vType id="0" length="3.00" minGap="2.00" maxSpeed="70.00" color="yellow" accel="2.6" decel="4.5" sigma="0.5"/>
<vehicle id="0" type="0" depart="0.00" color="black" fromTaz="1" toTaz="2">
<routeDistribution last="0">
<route cost="125.90" probability="1.00000000" edges="beg middle end rend"/>
<routeDistribution last="1">
<route cost="125.90" probability="0.73358691" edges="beg middle end rend"/>
<route cost="89.93" probability="0.26641309" edges="middle end"/>
</routeDistribution>
</vehicle>
<vehicle id="1" type="0" depart="0.00" color="black" fromTaz="1" toTaz="2">
<routeDistribution last="0">
<route cost="125.90" probability="1.00000000" edges="beg middle end rend"/>
<route cost="125.90" probability="0.73358691" edges="beg middle end rend"/>
<route cost="89.93" probability="0.26641309" edges="middle end"/>
</routeDistribution>
</vehicle>
<vehicle id="2" type="0" depart="0.00" color="black" fromTaz="1" toTaz="2">
<routeDistribution last="0">
<route cost="125.90" probability="1.00000000" edges="beg middle end rend"/>
<route cost="125.90" probability="0.73358691" edges="beg middle end rend"/>
<route cost="89.93" probability="0.26641309" edges="middle end"/>
</routeDistribution>
</vehicle>
<vehicle id="3" type="0" depart="0.00" color="black" fromTaz="1" toTaz="2">
<routeDistribution last="0">
<route cost="125.90" probability="1.00000000" edges="beg middle end rend"/>
<route cost="125.90" probability="0.73358691" edges="beg middle end rend"/>
<route cost="89.93" probability="0.26641309" edges="middle end"/>
</routeDistribution>
</vehicle>
<vehicle id="4" type="0" depart="0.00" color="black" fromTaz="1" toTaz="2">
<routeDistribution last="0">
<route cost="125.90" probability="1.00000000" edges="beg middle end rend"/>
<route cost="125.90" probability="0.73358691" edges="beg middle end rend"/>
<route cost="89.93" probability="0.26641309" edges="middle end"/>
</routeDistribution>
</vehicle>
<vehicle id="5" type="0" depart="0.00" color="black" fromTaz="1" toTaz="2">
<routeDistribution last="0">
<route cost="125.90" probability="1.00000000" edges="beg middle end rend"/>
<route cost="125.90" probability="0.73358691" edges="beg middle end rend"/>
<route cost="89.93" probability="0.26641309" edges="middle end"/>
</routeDistribution>
</vehicle>
<vehicle id="6" type="0" depart="0.00" color="black" fromTaz="1" toTaz="2">
<routeDistribution last="0">
<route cost="125.90" probability="1.00000000" edges="beg middle end rend"/>
<routeDistribution last="1">
<route cost="125.90" probability="0.73358691" edges="beg middle end rend"/>
<route cost="89.93" probability="0.26641309" edges="middle end"/>
</routeDistribution>
</vehicle>
<vehicle id="7" type="0" depart="0.00" color="black" fromTaz="1" toTaz="2">
<routeDistribution last="0">
<route cost="125.90" probability="1.00000000" edges="beg middle end rend"/>
<route cost="125.90" probability="0.73358691" edges="beg middle end rend"/>
<route cost="89.93" probability="0.26641309" edges="middle end"/>
</routeDistribution>
</vehicle>
<vehicle id="8" type="0" depart="0.00" color="black" fromTaz="1" toTaz="2">
<routeDistribution last="0">
<route cost="125.90" probability="1.00000000" edges="beg middle end rend"/>
<route cost="125.90" probability="0.73358691" edges="beg middle end rend"/>
<route cost="89.93" probability="0.26641309" edges="middle end"/>
</routeDistribution>
</vehicle>
<vehicle id="9" type="0" depart="0.00" color="black" fromTaz="1" toTaz="2">
<routeDistribution last="0">
<route cost="125.90" probability="1.00000000" edges="beg middle end rend"/>
<routeDistribution last="1">
<route cost="125.90" probability="0.73358691" edges="beg middle end rend"/>
<route cost="89.93" probability="0.26641309" edges="middle end"/>
</routeDistribution>
</vehicle>
</routes>
8 changes: 4 additions & 4 deletions tests/duarouter/alternatives/style2_input/with_taz_used2/routes.duarouter
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 2025-01-08 14:41:01 by Eclipse SUMO duarouter Version v1_21_0+1735-742e398ba02
<!-- generated on 2025-01-08 14:41:40 by Eclipse SUMO duarouter Version v1_21_0+1736-53ee2e6a794
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 Down Expand Up @@ -37,7 +37,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<vType id="0" length="3.00" minGap="2.00" maxSpeed="70.00" color="yellow" accel="2.6" decel="4.5" sigma="0.5"/>
<vehicle id="0" type="0" depart="0.00" color="black" fromTaz="1" toTaz="2">
<route edges="beg middle end rend"/>
<route edges="middle end"/>
</vehicle>
<vehicle id="1" type="0" depart="0.00" color="black" fromTaz="1" toTaz="2">
<route edges="beg middle end rend"/>
Expand All @@ -55,7 +55,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<route edges="beg middle end rend"/>
</vehicle>
<vehicle id="6" type="0" depart="0.00" color="black" fromTaz="1" toTaz="2">
<route edges="beg middle end rend"/>
<route edges="middle end"/>
</vehicle>
<vehicle id="7" type="0" depart="0.00" color="black" fromTaz="1" toTaz="2">
<route edges="beg middle end rend"/>
Expand All @@ -64,6 +64,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<route edges="beg middle end rend"/>
</vehicle>
<vehicle id="9" type="0" depart="0.00" color="black" fromTaz="1" toTaz="2">
<route edges="beg middle end rend"/>
<route edges="middle end"/>
</vehicle>
</routes>

0 comments on commit 1edbf15

Please sign in to comment.