Skip to content

Commit

Permalink
patching expected results refs #21, #7578
Browse files Browse the repository at this point in the history
  • Loading branch information
@namdre
namdre committed Sep 27, 2024
1 parent f1f43e8 commit 4efb6f7
Show file tree
Hide file tree
Showing 8 changed files with 73 additions and 364 deletions.
6 changes: 3 additions & 3 deletions tests/sumo/rail/reversal/follower_ends_before_reversal2/railsignalblocks.sumo
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-09-25 15:10:35 by Eclipse SUMO sumo Version v1_20_0+0597-36c9673207a
<!-- generated on 2024-09-27 13:36:06 by Eclipse SUMO sumo Version v1_20_0+0613-a2eeb414018
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 @@ -191,7 +191,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
deadlockCheck="S_14072-14077_0 :14072_0_0 S_14067-14072_0 :14067_0_0 S_11347-14067_0 :11347_0_0 S_11339-11342_0 :11339_0_0 S_SectionLink_11329-11332_0 :SectionLink_11329_0_0 S_11551-11552_0 :11551_0_0 S_SectionLink_11326-11551_0 :SectionLink_11326_0_0 S_SectionLink_11322-11324_0 :SectionLink_11322_1_0 S_11514-11515_0 :11514_0_0 S_11506-11514_0"/>
<flank lanes=""/>
<conflictLinks signals="11339_0 11514_0 11551_0 14072_0 14092_0"/>
<foes driveWays="11339.0 11514.0 11551.0 14072.0 14101.0.0 14114.0 14114.1 14114.d0"/>
<foes driveWays="11339.0 11514.0 11551.0 14072.0 14092.0 14101.0.0 14114.0 14114.1 14114.d0"/>
</driveWay>
<subDriveWay id="14114.1.0" vehicle="" edges="F_14114-14111 F_SectionLink_14066-14104 F_14104-14101">
<forward lanes=":14114_1_0 F_14114-14111_0 :SectionLink_14066_2_0 F_SectionLink_14066-14104_0 :14104_1_0 F_14104-14101_0 :14101_2_0"/>
Expand All @@ -205,7 +205,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
deadlockCheck="S_14072-14077_0 :14072_0_0 S_14067-14072_0 :14067_0_0 S_11347-14067_0 :11347_0_0 S_11339-11342_0 :11339_0_0 S_SectionLink_11329-11332_0 :SectionLink_11329_0_0 S_11551-11552_0 :11551_0_0 S_SectionLink_11326-11551_0 :SectionLink_11326_0_0 S_SectionLink_11322-11324_0 :SectionLink_11322_1_0 S_11514-11515_0 :11514_0_0 S_11506-11514_0"/>
<flank lanes=""/>
<conflictLinks signals="11339_0 11514_0 11551_0 14072_0 14092_0 14114_0"/>
<foes driveWays="11339.0 11514.0 11551.0 14072.0 14101.0 J0.d1"/>
<foes driveWays="11339.0 11514.0 11551.0 14072.0 14092.0 14101.0 14114.0 14114.d0 J0.d1"/>
</driveWay>
</departJunction>
<departJunction id="14114">
Expand Down
4 changes: 2 additions & 2 deletions tests/sumo/rail/reversal/insertion_before_reversal2/railsignalblocks.sumo
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-09-25 13:36:24 by Eclipse SUMO sumo Version v1_20_0+0593-8dcc4e49145
<!-- generated on 2024-09-27 13:36:06 by Eclipse SUMO sumo Version v1_20_0+0613-a2eeb414018
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 @@ -126,7 +126,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<bidi lanes="-E0_0 :J1_0_0 -E1_0 :J2_0_0 -E2_0 :J3_0_0 -E3_0 :J4_0_0 -E4_0"/>
<flank lanes=""/>
<conflictLinks signals="J1_0 J2_0"/>
<foes driveWays="J0.d0 J0.d1 J2.0 J3.0 J4.0"/>
<foes driveWays="J0.d0 J0.d1 J1.0 J2.0 J3.0 J4.0"/>
</driveWay>
</departJunction>
</railsignal-block-output>
2 changes: 0 additions & 2 deletions tests/sumo/rail/reversal/insertion_before_reversal3/errors.sumo
View file
Original file line number Diff line number Diff line change
@@ -1,2 +0,0 @@
Warning: Teleporting vehicle 'v_0'; waited too long (yield), lane='E1_0', time=338.00.
Warning: Vehicle 'v_0' ends teleporting on edge '-E2', time=383.00.
114 changes: 9 additions & 105 deletions tests/sumo/rail/reversal/insertion_before_reversal3/railsignalblocks.sumo
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-09-27 13:35:14 by Eclipse SUMO sumo Version v1_20_0+0612-458f810bb4e
<!-- generated on 2024-09-27 13:36:06 by Eclipse SUMO sumo Version v1_20_0+0613-a2eeb414018
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 @@ -44,14 +44,14 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<bidi lanes=":J1_0_0 -E1_0 :J2_0_0 -E2_0 :J3_0_0 -E3_0 :J4_0_0 -E4_0 E4_0 :J4_1_0 E3_0 :J3_1_0 E2_0 :J2_1_0 E1_0 :J1_1_0 E0_0"/>
<flank lanes=""/>
<conflictLinks signals=""/>
<foes driveWays="J0.d0 J0.d1 J1.0 J1.1 J2.0 J2.d2 J3.0.0 J3.d3 J3.d7.0 J4.0 J4.d4 J4.d6 J5.d5"/>
<foes driveWays="J0.d0 J0.d1 J1.0 J1.1 J2.0 J3.0.0 J4.0"/>
</driveWay>
<driveWay id="J1.1" vehicle="v_1" edges="E1 E2 E3 E4">
<forward lanes=":J1_1_0 E1_0"/>
<bidi lanes=":J1_0_0 -E1_0 :J2_0_0 -E2_0 :J3_0_0 -E3_0 :J4_0_0 -E4_0"/>
<flank lanes=""/>
<conflictLinks signals="J2_0"/>
<foes driveWays="J1.0 J1.1 J2.0 J2.d2 J3.0.0 J3.d3 J3.d7.0 J4.0 J4.d4 J4.d6 J5.d5"/>
<foes driveWays="J1.0 J1.1 J2.0 J3.0.0 J4.0"/>
</driveWay>
</link>
</railSignal>
Expand All @@ -62,39 +62,27 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<bidi lanes=":J2_0_0 -E2_0 :J3_0_0 -E3_0 :J4_0_0 -E4_0 E4_0 :J4_1_0 E3_0 :J3_1_0 E2_0 :J2_1_0 E1_0 :J1_1_0 E0_0"/>
<flank lanes=""/>
<conflictLinks signals=""/>
<foes driveWays="J0.d0 J0.d1 J1.0 J1.1 J2.0 J2.1 J2.d2 J3.0.1 J3.d3 J3.d7.1 J4.0 J4.d4 J4.d6 J5.d5"/>
<foes driveWays="J0.d0 J0.d1 J1.0 J1.1 J2.0 J2.1 J3.0.1 J4.0"/>
</driveWay>
<subDriveWay id="J2.0.0" vehicle="" edges="E2 E3">
<forward lanes=":J2_1_0 E2_0 :J3_1_0 E3_0 :J4_1_0"/>
</subDriveWay>
<subDriveWay id="J2.0.1" vehicle="" edges="E2">
<forward lanes=":J2_1_0 E2_0 :J3_1_0"/>
</subDriveWay>
<subDriveWay id="J2.0.2" vehicle="" edges="E2 E3">
<forward lanes=":J2_1_0 E2_0 :J3_1_0 E3_0"/>
</subDriveWay>
<subDriveWay id="J2.0.3" vehicle="" edges="E2">
<forward lanes=":J2_1_0 E2_0"/>
</subDriveWay>
<driveWay id="J2.1" vehicle="v_1" edges="E2 E3 E4">
<forward lanes=":J2_1_0 E2_0 :J3_1_0 E3_0 :J4_1_0 E4_0"/>
<bidi lanes=":J2_0_0 -E2_0 :J3_0_0 -E3_0 :J4_0_0 -E4_0"/>
<flank lanes=""/>
<conflictLinks signals=""/>
<foes driveWays="J2.0 J2.1 J2.d2 J3.0.1 J3.d3 J3.d7.1 J4.0 J4.d4 J4.d6 J5.d5"/>
<foes driveWays="J2.0 J2.1 J3.0.1 J4.0"/>
</driveWay>
<subDriveWay id="J2.1.0" vehicle="" edges="E2 E3">
<forward lanes=":J2_1_0 E2_0 :J3_1_0 E3_0 :J4_1_0"/>
</subDriveWay>
<subDriveWay id="J2.1.1" vehicle="" edges="E2">
<forward lanes=":J2_1_0 E2_0 :J3_1_0"/>
</subDriveWay>
<subDriveWay id="J2.1.2" vehicle="" edges="E2 E3">
<forward lanes=":J2_1_0 E2_0 :J3_1_0 E3_0"/>
</subDriveWay>
<subDriveWay id="J2.1.3" vehicle="" edges="E2">
<forward lanes=":J2_1_0 E2_0"/>
</subDriveWay>
</link>
</railSignal>
<railSignal id="J3">
Expand All @@ -104,17 +92,14 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<bidi lanes=":J3_1_0 E2_0 :J2_1_0 E1_0 :J1_1_0 E0_0"/>
<flank lanes=""/>
<conflictLinks signals=""/>
<foes driveWays="J0.d0 J0.d1 J1.0 J1.1 J2.0.1 J2.1.1 J2.d2.1 J3.0 J3.d7"/>
<foes driveWays="J0.d0 J0.d1 J1.0 J1.1 J2.0.1 J2.1.1 J3.0"/>
</driveWay>
<subDriveWay id="J3.0.0" vehicle="" edges="-E2 -E1">
<forward lanes=":J3_0_0 -E2_0 :J2_0_0 -E1_0 :J1_0_0"/>
</subDriveWay>
<subDriveWay id="J3.0.1" vehicle="" edges="-E2">
<forward lanes=":J3_0_0 -E2_0 :J2_0_0"/>
</subDriveWay>
<subDriveWay id="J3.0.2" vehicle="" edges="-E2">
<forward lanes=":J3_0_0 -E2_0"/>
</subDriveWay>
</link>
</railSignal>
<railSignal id="J4">
Expand All @@ -124,105 +109,24 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<bidi lanes=":J4_1_0 E3_0 :J3_1_0 E2_0 :J2_1_0 E1_0 :J1_1_0 E0_0"/>
<flank lanes=""/>
<conflictLinks signals=""/>
<foes driveWays="J0.d0 J0.d1 J1.0 J1.1 J2.0.0 J2.1.0 J2.d2.0 J3.d3.0 J4.0 J4.d6"/>
<foes driveWays="J0.d0 J0.d1 J1.0 J1.1 J2.0.0 J2.1.0 J4.0"/>
</driveWay>
</link>
</railSignal>
<departJunction id="J3">
<driveWay id="J3.d7" vehicle="v_0" edges="-E2 -E1 -E0">
<forward lanes="-E2_0 :J2_0_0 -E1_0 :J1_0_0 -E0_0"/>
<bidi lanes="E2_0 :J2_1_0 E1_0 :J1_1_0 E0_0"/>
<flank lanes=""/>
<conflictLinks signals="J3_0"/>
<foes driveWays="J0.d0 J0.d1 J1.0 J1.1 J2.0.3 J2.1.3 J2.d2.3 J3.0 J3.d7"/>
</driveWay>
<subDriveWay id="J3.d7.0" vehicle="" edges="-E2 -E1">
<forward lanes="-E2_0 :J2_0_0 -E1_0 :J1_0_0"/>
</subDriveWay>
<subDriveWay id="J3.d7.1" vehicle="" edges="-E2">
<forward lanes="-E2_0 :J2_0_0"/>
</subDriveWay>
<subDriveWay id="J3.d7.2" vehicle="" edges="-E2">
<forward lanes="-E2_0"/>
</subDriveWay>
</departJunction>
<departJunction id="J4">
<driveWay id="J4.d6" vehicle="v_0" edges="-E3 -E2 -E1 -E0">
<forward lanes="-E3_0"/>
<bidi lanes="E3_0 :J3_1_0 E2_0 :J2_1_0 E1_0 :J1_1_0 E0_0"/>
<flank lanes=""/>
<conflictLinks signals="J4_0"/>
<foes driveWays="J0.d0 J0.d1 J1.0 J1.1 J2.0.2 J2.1.2 J2.d2.2 J3.d3.1 J4.0 J4.d6"/>
</driveWay>
</departJunction>
<departJunction id="J5">
<driveWay id="J5.d5" vehicle="v_0" edges="-E4 -E3 -E2 -E1 -E0">
<forward lanes="-E4_0"/>
<bidi lanes="E4_0 :J4_1_0 E3_0 :J3_1_0 E2_0 :J2_1_0 E1_0 :J1_1_0 E0_0"/>
<flank lanes=""/>
<conflictLinks signals=""/>
<foes driveWays="J0.d0 J0.d1 J1.0 J1.1 J2.0 J2.1 J2.d2 J3.d3 J4.d4 J5.d5"/>
</driveWay>
</departJunction>
<departJunction id="J0">
<driveWay id="J0.d0" vehicle="v_0" edges="E0 E1 E2 E3 E4 -E4 -E3 -E2 -E1 -E0">
<forward lanes="E0_0"/>
<bidi lanes="-E0_0 :J1_0_0 -E1_0 :J2_0_0 -E2_0 :J3_0_0 -E3_0 :J4_0_0 -E4_0 E4_0 :J4_1_0 E3_0 :J3_1_0 E2_0 :J2_1_0 E1_0 :J1_1_0 E0_0"/>
<flank lanes=""/>
<conflictLinks signals=""/>
<foes driveWays="J0.d0 J0.d1 J1.0 J1.1 J2.0 J2.d2 J3.0 J3.d3 J3.d7 J4.0 J4.d4 J4.d6 J5.d5"/>
<foes driveWays="J0.d0 J0.d1 J1.0 J1.1 J2.0 J3.0 J4.0"/>
</driveWay>
<driveWay id="J0.d1" vehicle="v_1" edges="E0 E1 E2 E3 E4">
<forward lanes="E0_0"/>
<bidi lanes="-E0_0 :J1_0_0 -E1_0 :J2_0_0 -E2_0 :J3_0_0 -E3_0 :J4_0_0 -E4_0"/>
<flank lanes=""/>
<conflictLinks signals="J1_0 J2_0"/>
<foes driveWays="J0.d0 J0.d1 J2.0 J2.d2 J3.0 J3.d3 J3.d7 J4.0 J4.d4 J4.d6 J5.d5"/>
</driveWay>
</departJunction>
<departJunction id="J2">
<driveWay id="J2.d2" vehicle="v_0" edges="E2 E3 E4 -E4 -E3 -E2 -E1 -E0">
<forward lanes="E2_0 :J3_1_0 E3_0 :J4_1_0 E4_0 :J5_0_0 -E4_0"/>
<bidi lanes="-E2_0 :J3_0_0 -E3_0 :J4_0_0 -E4_0 E4_0 :J4_1_0 E3_0 :J3_1_0 E2_0 :J2_1_0 E1_0 :J1_1_0 E0_0"/>
<flank lanes=""/>
<conflictLinks signals="J2_0"/>
<foes driveWays="J0.d0 J0.d1 J1.0 J1.1 J2.0 J2.1 J2.d2 J3.0.2 J3.d3 J3.d7.2 J4.0 J4.d4 J4.d6 J5.d5"/>
</driveWay>
<subDriveWay id="J2.d2.0" vehicle="" edges="E2 E3">
<forward lanes="E2_0 :J3_1_0 E3_0 :J4_1_0"/>
</subDriveWay>
<subDriveWay id="J2.d2.1" vehicle="" edges="E2">
<forward lanes="E2_0 :J3_1_0"/>
</subDriveWay>
<subDriveWay id="J2.d2.2" vehicle="" edges="E2 E3">
<forward lanes="E2_0 :J3_1_0 E3_0"/>
</subDriveWay>
<subDriveWay id="J2.d2.3" vehicle="" edges="E2">
<forward lanes="E2_0"/>
</subDriveWay>
</departJunction>
<departJunction id="J3">
<driveWay id="J3.d3" vehicle="v_0" edges="E3 E4 -E4 -E3 -E2 -E1 -E0">
<forward lanes="E3_0 :J4_1_0 E4_0 :J5_0_0 -E4_0"/>
<bidi lanes="-E3_0 :J4_0_0 -E4_0 E4_0 :J4_1_0 E3_0 :J3_1_0 E2_0 :J2_1_0 E1_0 :J1_1_0 E0_0"/>
<flank lanes=""/>
<conflictLinks signals=""/>
<foes driveWays="J0.d0 J0.d1 J1.0 J1.1 J2.0 J2.1 J2.d2 J3.d3 J4.0 J4.d4 J4.d6 J5.d5"/>
</driveWay>
<subDriveWay id="J3.d3.0" vehicle="" edges="E3">
<forward lanes="E3_0 :J4_1_0"/>
</subDriveWay>
<subDriveWay id="J3.d3.1" vehicle="" edges="E3">
<forward lanes="E3_0"/>
</subDriveWay>
</departJunction>
<departJunction id="J4">
<driveWay id="J4.d4" vehicle="v_0" edges="E4 -E4 -E3 -E2 -E1 -E0">
<forward lanes="E4_0 :J5_0_0 -E4_0"/>
<bidi lanes="-E4_0 E4_0 :J4_1_0 E3_0 :J3_1_0 E2_0 :J2_1_0 E1_0 :J1_1_0 E0_0"/>
<flank lanes=""/>
<conflictLinks signals=""/>
<foes driveWays="J0.d0 J0.d1 J1.0 J1.1 J2.0 J2.1 J2.d2 J3.d3 J4.d4 J5.d5"/>
<foes driveWays="J0.d0 J0.d1 J1.0 J2.0 J3.0 J4.0"/>
</driveWay>
</departJunction>
</railsignal-block-output>
3 changes: 0 additions & 3 deletions tests/sumo/rail/reversal/reversal_after_common_block/errors.sumo
View file
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
Warning: Teleporting vehicle 't0'; waited too long (yield), lane='e_0', time=339.00.
Warning: Vehicle 't0' skips stop on lane 'h_0' time=361.00.
Warning: Vehicle 't0' ends teleporting on edge '-e', time=386.00.
Loading

0 comments on commit 4efb6f7

Please sign in to comment.