Skip to content

Commit

Permalink
patching expected results refs #14324, #21
Browse files Browse the repository at this point in the history
  • Loading branch information
@namdre
namdre committed Feb 14, 2024
1 parent 731cbe6 commit a6574a7
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 16 deletions.
15 changes: 13 additions & 2 deletions tests/duarouter/trips/stops/jump_duplicate_stop/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 2024-02-14 13:07:46 by Eclipse SUMO duarouter Version v1_19_0+0814-b3a3d13
<!-- generated on 2024-02-14 13:15:36 by Eclipse SUMO duarouter Version v1_19_0+0815-30708ad
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 @@ -32,4 +32,15 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
</configuration>
-->

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd"/>
<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<vehicle id="v0" depart="0.00">
<routeDistribution last="0">
<route cost="53.23" probability="1.00000000" edges="E0 E1 E2 E3 E4 E5"/>
</routeDistribution>
<stop busStop="bs_0" duration="5.00"/>
<stop busStop="bs_0" duration="5.00"/>
<stop busStop="bs_1" duration="5.00" jump="10.00"/>
<stop busStop="bs_2" duration="5.00"/>
<stop busStop="bs_3" duration="5.00"/>
</vehicle>
</routes>
4 changes: 0 additions & 4 deletions tests/duarouter/trips/stops/jump_duplicate_stop/errors.duarouter
View file
Original file line number Diff line number Diff line change
@@ -1,4 +0,0 @@
Error: No connection between edge 'E2' and edge 'E3' found.
Error: Mandatory edge 'E3' not reachable by vehicle 'v0'.
Error: The vehicle 'v0' has no valid route.
Quitting (on error).
1 change: 0 additions & 1 deletion tests/duarouter/trips/stops/jump_duplicate_stop/exitcode.duarouter
View file

This file was deleted.

8 changes: 1 addition & 7 deletions tests/duarouter/trips/stops/jump_duplicate_stop/output.duarouter
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
collectJumps veh=v0 mandatory=E0 stopEdge=E0 jump=-1
collectJumps veh=v0 mandatory=E2 stopEdge=E0 jump=-1
collectJumps veh=v0 mandatory=E3 stopEdge=E0 jump=-1
collectJumps veh=v0 mandatory=E5 stopEdge=E0 jump=-1
hasJumps mIndex=0 jumpStarts=0
hasJumps mIndex=0 jumpStarts=0
hasJumps mIndex=1 jumpStarts=0
Success.
13 changes: 11 additions & 2 deletions tests/duarouter/trips/stops/jump_duplicate_stop/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 2024-02-14 13:07:46 by Eclipse SUMO duarouter Version v1_19_0+0814-b3a3d13
<!-- generated on 2024-02-14 13:15:36 by Eclipse SUMO duarouter Version v1_19_0+0815-30708ad
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 @@ -32,4 +32,13 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
</configuration>
-->

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd"/>
<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<vehicle id="v0" depart="0.00">
<route edges="E0 E1 E2 E3 E4 E5"/>
<stop busStop="bs_0" duration="5.00"/>
<stop busStop="bs_0" duration="5.00"/>
<stop busStop="bs_1" duration="5.00" jump="10.00"/>
<stop busStop="bs_2" duration="5.00"/>
<stop busStop="bs_3" duration="5.00"/>
</vehicle>
</routes>

0 comments on commit a6574a7

Please sign in to comment.