Skip to content

Commit

Permalink
patching expected results refs #21, #15822
Browse files Browse the repository at this point in the history
  • Loading branch information
@namdre
namdre committed Dec 1, 2024
1 parent 198b526 commit f807130
Show file tree
Hide file tree
Showing 15 changed files with 370 additions and 370 deletions.
44 changes: 22 additions & 22 deletions tests/sumo/rail/interlocking/railsignalvehs.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-10-16 14:27:09 by Eclipse SUMO sumo Version v1_20_0+0696-f5985653822
<!-- generated on 2024-12-01 21:10:49 by Eclipse SUMO sumo Version v1_21_0+1087-eb0d227282f
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,7 +11,7 @@ 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"/>
Expand Down Expand Up @@ -42,74 +42,74 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<no-step-log value="true"/>
</report>
</configuration>
</sumoConfiguration>
-->

<railsignal-vehicle-output>
<railSignal id="gneJ1">
<link linkIndex="0" from="gneE2_0" to=":gneJ1_0_0">
<driveWay id="gneJ1.1">
<entry id="ICE0" time="16564.00" reason="1"/>
<entry id="ICE0" time="16564.00" reason="junction"/>
</driveWay>
</link>
<link linkIndex="1" from="gneE0_0" to=":gneJ1_1_0">
<driveWay id="gneJ1.0">
<entry id="RB1" time="16147.00" reason="1"/>
<exit id="RB1" time="16403.00" reason="1"/>
<entry id="RB1" time="16147.00" reason="junction"/>
<exit id="RB1" time="16403.00" reason="junction"/>
</driveWay>
</link>
</railSignal>
<railSignal id="gneJ2">
<link linkIndex="0" from="-gneE3_0" to=":gneJ2_0_0">
<driveWay id="gneJ2.1">
<entry id="ICE0" time="16365.00" reason="1"/>
<exit id="ICE0" time="16597.00" reason="1"/>
<entry id="ICE0" time="16365.00" reason="junction"/>
<exit id="ICE0" time="16597.00" reason="junction"/>
</driveWay>
</link>
<link linkIndex="1" from="gneE1_0" to=":gneJ2_1_0">
<driveWay id="gneJ2.0">
<entry id="RB1" time="16393.00" reason="1"/>
<exit id="RB1" time="16474.00" reason="1"/>
<entry id="RB1" time="16393.00" reason="junction"/>
<exit id="RB1" time="16474.00" reason="junction"/>
</driveWay>
</link>
</railSignal>
<railSignal id="gneJ3">
<link linkIndex="0" from="-gneE4_0" to=":gneJ3_0_0">
<driveWay id="gneJ3.1">
<entry id="ICE0" time="16313.00" reason="1"/>
<exit id="ICE0" time="16391.00" reason="1"/>
<entry id="ICE0" time="16313.00" reason="junction"/>
<exit id="ICE0" time="16391.00" reason="junction"/>
</driveWay>
</link>
<link linkIndex="1" from="-gneE4_0" to=":gneJ3_1_0"/>
<link linkIndex="2" from="-gneE7_0" to=":gneJ3_2_0">
<driveWay id="gneJ3.2">
<entry id="RB2" time="16336.00" reason="1"/>
<exit id="RB2" time="16379.00" reason="9"/>
<entry id="RB2" time="16336.00" reason="junction"/>
<exit id="RB2" time="16379.00" reason="arrived"/>
</driveWay>
</link>
<link linkIndex="3" from="gneE3_0" to=":gneJ3_3_0">
<driveWay id="gneJ3.0">
<entry id="RB1" time="16472.00" reason="1"/>
<exit id="RB1" time="16516.00" reason="9"/>
<entry id="RB1" time="16472.00" reason="junction"/>
<exit id="RB1" time="16516.00" reason="arrived"/>
</driveWay>
</link>
</railSignal>
<departJunction id="gneJ5">
<driveWay id="gneJ5.d0">
<entry id="ICE0" time="16250.00" reason="0"/>
<exit id="ICE0" time="16327.00" reason="1"/>
<entry id="ICE0" time="16250.00" reason="departed"/>
<exit id="ICE0" time="16327.00" reason="junction"/>
</driveWay>
</departJunction>
<departJunction id="gneJ10">
<driveWay id="gneJ10.d0">
<entry id="RB2" time="16250.00" reason="0"/>
<exit id="RB2" time="16340.00" reason="1"/>
<entry id="RB2" time="16250.00" reason="departed"/>
<exit id="RB2" time="16340.00" reason="junction"/>
</driveWay>
</departJunction>
<departJunction id="gneJ7">
<driveWay id="gneJ7.d0">
<entry id="RB1" time="16000.00" reason="0"/>
<exit id="RB1" time="16150.00" reason="1"/>
<entry id="RB1" time="16000.00" reason="departed"/>
<exit id="RB1" time="16150.00" reason="junction"/>
</driveWay>
</departJunction>
</railsignal-vehicle-output>
102 changes: 51 additions & 51 deletions tests/sumo/rail/overlapping_driveways/railsignalvehs.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-10-16 09:01:29 by Eclipse SUMO sumo Version v1_20_0+0684-f016839ee01
<!-- generated on 2024-12-01 21:10:49 by Eclipse SUMO sumo Version v1_21_0+1087-eb0d227282f
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,7 +11,7 @@ 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"/>
Expand All @@ -35,90 +35,90 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<no-step-log value="true"/>
</report>
</configuration>
</sumoConfiguration>
-->

<railsignal-vehicle-output>
<railSignal id="J0">
<link linkIndex="0" from="E6_0" to=":J0_0_0">
<driveWay id="J0.0">
<entry id="v_0" time="20.00" reason="1"/>
<exit id="v_0" time="40.00" reason="1"/>
<entry id="v_1" time="48.00" reason="1"/>
<exit id="v_1" time="68.00" reason="1"/>
<entry id="v_2" time="76.00" reason="1"/>
<exit id="v_2" time="96.00" reason="1"/>
<entry id="v_3" time="104.00" reason="1"/>
<exit id="v_3" time="124.00" reason="1"/>
<entry id="v_0" time="20.00" reason="junction"/>
<exit id="v_0" time="40.00" reason="junction"/>
<entry id="v_1" time="48.00" reason="junction"/>
<exit id="v_1" time="68.00" reason="junction"/>
<entry id="v_2" time="76.00" reason="junction"/>
<exit id="v_2" time="96.00" reason="junction"/>
<entry id="v_3" time="104.00" reason="junction"/>
<exit id="v_3" time="124.00" reason="junction"/>
</driveWay>
</link>
</railSignal>
<railSignal id="J1">
<link linkIndex="0" from="E0_0" to=":J1_0_0">
<driveWay id="J1.0">
<entry id="v_0" time="35.00" reason="1"/>
<exit id="v_0" time="57.00" reason="1"/>
<entry id="v_2" time="91.00" reason="1"/>
<exit id="v_2" time="152.00" reason="1"/>
<entry id="v_0" time="35.00" reason="junction"/>
<exit id="v_0" time="57.00" reason="junction"/>
<entry id="v_2" time="91.00" reason="junction"/>
<exit id="v_2" time="152.00" reason="junction"/>
</driveWay>
<subDriveWay id="J1.0.0">
<entry id="v_0" time="35.00" reason="1"/>
<exit id="v_0" time="49.00" reason="1"/>
<entry id="v_1" time="63.00" reason="1"/>
<exit id="v_1" time="77.00" reason="1"/>
<entry id="v_2" time="91.00" reason="1"/>
<exit id="v_2" time="105.00" reason="1"/>
<entry id="v_3" time="119.00" reason="1"/>
<exit id="v_3" time="133.00" reason="1"/>
<entry id="v_0" time="35.00" reason="junction"/>
<exit id="v_0" time="49.00" reason="junction"/>
<entry id="v_1" time="63.00" reason="junction"/>
<exit id="v_1" time="77.00" reason="junction"/>
<entry id="v_2" time="91.00" reason="junction"/>
<exit id="v_2" time="105.00" reason="junction"/>
<entry id="v_3" time="119.00" reason="junction"/>
<exit id="v_3" time="133.00" reason="junction"/>
</subDriveWay>
<driveWay id="J1.1">
<entry id="v_1" time="63.00" reason="1"/>
<exit id="v_1" time="85.00" reason="1"/>
<entry id="v_3" time="119.00" reason="1"/>
<exit id="v_3" time="180.00" reason="1"/>
<entry id="v_1" time="63.00" reason="junction"/>
<exit id="v_1" time="85.00" reason="junction"/>
<entry id="v_3" time="119.00" reason="junction"/>
<exit id="v_3" time="180.00" reason="junction"/>
</driveWay>
<subDriveWay id="J1.1.0">
<entry id="v_0" time="35.00" reason="1"/>
<exit id="v_0" time="49.00" reason="1"/>
<entry id="v_1" time="63.00" reason="1"/>
<exit id="v_1" time="77.00" reason="1"/>
<entry id="v_2" time="91.00" reason="1"/>
<exit id="v_2" time="105.00" reason="1"/>
<entry id="v_3" time="119.00" reason="1"/>
<exit id="v_3" time="133.00" reason="1"/>
<entry id="v_0" time="35.00" reason="junction"/>
<exit id="v_0" time="49.00" reason="junction"/>
<entry id="v_1" time="63.00" reason="junction"/>
<exit id="v_1" time="77.00" reason="junction"/>
<entry id="v_2" time="91.00" reason="junction"/>
<exit id="v_2" time="105.00" reason="junction"/>
<entry id="v_3" time="119.00" reason="junction"/>
<exit id="v_3" time="133.00" reason="junction"/>
</subDriveWay>
</link>
</railSignal>
<railSignal id="J3">
<link linkIndex="0" from="E2_0" to=":J3_0_0">
<driveWay id="J3.0">
<entry id="v_0" time="53.00" reason="1"/>
<exit id="v_0" time="132.00" reason="9"/>
<entry id="v_2" time="135.00" reason="1"/>
<exit id="v_2" time="239.00" reason="9"/>
<entry id="v_0" time="53.00" reason="junction"/>
<exit id="v_0" time="132.00" reason="arrived"/>
<entry id="v_2" time="135.00" reason="junction"/>
<exit id="v_2" time="239.00" reason="arrived"/>
</driveWay>
</link>
</railSignal>
<railSignal id="J5">
<link linkIndex="0" from="E4_0" to=":J5_0_0">
<driveWay id="J5.0">
<entry id="v_1" time="81.00" reason="1"/>
<exit id="v_1" time="160.00" reason="9"/>
<entry id="v_3" time="163.00" reason="1"/>
<exit id="v_3" time="267.00" reason="9"/>
<entry id="v_1" time="81.00" reason="junction"/>
<exit id="v_1" time="160.00" reason="arrived"/>
<entry id="v_3" time="163.00" reason="junction"/>
<exit id="v_3" time="267.00" reason="arrived"/>
</driveWay>
</link>
</railSignal>
<departJunction id="J7">
<driveWay id="J7.d0">
<entry id="v_0" time="0.00" reason="0"/>
<exit id="v_0" time="28.00" reason="1"/>
<entry id="v_1" time="28.00" reason="0"/>
<exit id="v_1" time="56.00" reason="1"/>
<entry id="v_2" time="56.00" reason="0"/>
<exit id="v_2" time="84.00" reason="1"/>
<entry id="v_3" time="84.00" reason="0"/>
<exit id="v_3" time="112.00" reason="1"/>
<entry id="v_0" time="0.00" reason="departed"/>
<exit id="v_0" time="28.00" reason="junction"/>
<entry id="v_1" time="28.00" reason="departed"/>
<exit id="v_1" time="56.00" reason="junction"/>
<entry id="v_2" time="56.00" reason="departed"/>
<exit id="v_2" time="84.00" reason="junction"/>
<entry id="v_3" time="84.00" reason="departed"/>
<exit id="v_3" time="112.00" reason="junction"/>
</driveWay>
</departJunction>
</railsignal-vehicle-output>
38 changes: 19 additions & 19 deletions tests/sumo/rail/rail_signal/constraints/bidi/railsignalvehs.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-10-16 14:27:09 by Eclipse SUMO sumo Version v1_20_0+0696-f5985653822
<!-- generated on 2024-12-01 21:10:48 by Eclipse SUMO sumo Version v1_21_0+1087-eb0d227282f
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,7 +11,7 @@ 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"/>
Expand All @@ -37,28 +37,28 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<no-step-log value="true"/>
</report>
</configuration>
</sumoConfiguration>
-->

<railsignal-vehicle-output>
<railSignal id="A">
<link linkIndex="0" from="-b_0" to="-a_0"/>
<link linkIndex="1" from="a_0" to="b_0">
<driveWay id="A.0">
<entry id="t0" time="124.00" reason="1"/>
<exit id="t0" time="188.00" reason="1"/>
<entry id="t0" time="124.00" reason="junction"/>
<exit id="t0" time="188.00" reason="junction"/>
</driveWay>
<subDriveWay id="A.0.0">
<entry id="t0" time="124.00" reason="1"/>
<exit id="t0" time="185.00" reason="1"/>
<entry id="t0" time="124.00" reason="junction"/>
<exit id="t0" time="185.00" reason="junction"/>
</subDriveWay>
</link>
</railSignal>
<railSignal id="D">
<link linkIndex="0" from="-b2_0" to="-a2_0">
<driveWay id="D.0">
<entry id="t1" time="122.00" reason="1"/>
<exit id="t1" time="178.00" reason="9"/>
<entry id="t1" time="122.00" reason="junction"/>
<exit id="t1" time="178.00" reason="arrived"/>
</driveWay>
</link>
<link linkIndex="1" from="a2_0" to="b2_0"/>
Expand All @@ -67,34 +67,34 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<link linkIndex="0" from="-f_0" to="-e_0"/>
<link linkIndex="1" from="e_0" to="f_0">
<driveWay id="J0.0">
<entry id="t0" time="185.00" reason="1"/>
<exit id="t0" time="240.00" reason="9"/>
<entry id="t0" time="185.00" reason="junction"/>
<exit id="t0" time="240.00" reason="arrived"/>
</driveWay>
</link>
</railSignal>
<railSignal id="J1">
<link linkIndex="0" from="-f2_0" to="-e2_0">
<driveWay id="J1.0">
<entry id="t1" time="72.00" reason="1"/>
<exit id="t1" time="126.00" reason="1"/>
<entry id="t1" time="72.00" reason="junction"/>
<exit id="t1" time="126.00" reason="junction"/>
</driveWay>
<subDriveWay id="J1.0.0">
<entry id="t1" time="72.00" reason="1"/>
<exit id="t1" time="121.00" reason="1"/>
<entry id="t1" time="72.00" reason="junction"/>
<exit id="t1" time="121.00" reason="junction"/>
</subDriveWay>
</link>
<link linkIndex="1" from="e2_0" to="f2_0"/>
</railSignal>
<departJunction id="J2">
<driveWay id="J2.d0">
<entry id="t1" time="20.00" reason="0"/>
<exit id="t1" time="80.00" reason="1"/>
<entry id="t1" time="20.00" reason="departed"/>
<exit id="t1" time="80.00" reason="junction"/>
</driveWay>
</departJunction>
<departJunction id="gneJ1">
<driveWay id="gneJ1.d0">
<entry id="t0" time="0.00" reason="0"/>
<exit id="t0" time="141.00" reason="1"/>
<entry id="t0" time="0.00" reason="departed"/>
<exit id="t0" time="141.00" reason="junction"/>
</driveWay>
</departJunction>
</railsignal-vehicle-output>
Loading

0 comments on commit f807130

Please sign in to comment.