Skip to content

Commit

Permalink
patching meso results refs #21
Browse files Browse the repository at this point in the history
  • Loading branch information
@namdre
namdre committed Dec 2, 2024
1 parent e43546b commit 097fa89
Show file tree
Hide file tree
Showing 15 changed files with 253 additions and 253 deletions.
50 changes: 25 additions & 25 deletions tests/sumo/rail/interlocking/railsignalvehs.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 2024-11-01 10:31:59 by Eclipse SUMO sumo Version v1_21_0+0544-8c77a935d25
<!-- generated on 2024-12-02 08:17:28 by Eclipse SUMO sumo Version v1_21_0+1093-f807130dc4a
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 @@ -54,72 +54,72 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<railSignal id="gneJ1">
<link linkIndex="0" from="gneE2_0" to="-gneE0_0">
<driveWay id="gneJ1.1">
<entry id="ICE0" time="16458.00" reason="1"/>
<exit id="ICE0" time="16499.00" reason="9"/>
<entry id="ICE0" time="16458.00" reason="junction"/>
<exit id="ICE0" time="16499.00" reason="arrived"/>
</driveWay>
</link>
<link linkIndex="1" from="gneE0_0" to="gneE1_0">
<driveWay id="gneJ1.0">
<entry id="RB1" time="16086.00" reason="1"/>
<exit id="RB1" time="16285.00" reason="1"/>
<entry id="RB1" time="16086.00" reason="junction"/>
<exit id="RB1" time="16285.00" reason="junction"/>
</driveWay>
</link>
</railSignal>
<railSignal id="gneJ2">
<link linkIndex="0" from="-gneE3_0" to="gneE2_0">
<driveWay id="gneJ2.1">
<entry id="ICE0" time="16284.00" reason="1"/>
<exit id="ICE0" time="16458.00" reason="1"/>
<entry id="ICE0" time="16284.00" reason="junction"/>
<exit id="ICE0" time="16458.00" reason="junction"/>
</driveWay>
</link>
<link linkIndex="1" from="gneE1_0" to="gneE3_0">
<driveWay id="gneJ2.0">
<entry id="RB1" time="16285.00" reason="1"/>
<exit id="RB1" time="16322.00" reason="1"/>
<entry id="RB1" time="16285.00" reason="junction"/>
<exit id="RB1" time="16322.00" reason="junction"/>
</driveWay>
</link>
</railSignal>
<railSignal id="gneJ3">
<link linkIndex="0" from="-gneE4_0" to="-gneE3_0">
<driveWay id="gneJ3.1">
<entry id="ICE0" time="16266.00" reason="1"/>
<exit id="ICE0" time="16284.00" reason="1"/>
<entry id="ICE0" time="16266.00" reason="junction"/>
<exit id="ICE0" time="16284.00" reason="junction"/>
</driveWay>
</link>
<link linkIndex="1" from="-gneE4_0" to="gneE7_0"/>
<link linkIndex="2" from="-gneE7_0" to="gneE4_0">
<driveWay id="gneJ3.2">
<entry id="RB1" time="16322.00" reason="1"/>
<exit id="RB1" time="16355.00" reason="9"/>
<entry id="RB2" time="16356.00" reason="1"/>
<exit id="RB2" time="16381.00" reason="9"/>
<entry id="RB1" time="16322.00" reason="junction"/>
<exit id="RB1" time="16355.00" reason="arrived"/>
<entry id="RB2" time="16356.00" reason="junction"/>
<exit id="RB2" time="16381.00" reason="arrived"/>
</driveWay>
</link>
<link linkIndex="3" from="gneE3_0" to="gneE4_0">
<driveWay id="gneJ3.0">
<entry id="RB1" time="16322.00" reason="1"/>
<exit id="RB1" time="16355.00" reason="9"/>
<entry id="RB2" time="16356.00" reason="1"/>
<exit id="RB2" time="16381.00" reason="9"/>
<entry id="RB1" time="16322.00" reason="junction"/>
<exit id="RB1" time="16355.00" reason="arrived"/>
<entry id="RB2" time="16356.00" reason="junction"/>
<exit id="RB2" time="16381.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="16266.00" reason="1"/>
<entry id="ICE0" time="16250.00" reason="departed"/>
<exit id="ICE0" time="16266.00" reason="junction"/>
</driveWay>
</departJunction>
<departJunction id="gneJ10">
<driveWay id="gneJ10.d0">
<entry id="RB2" time="16250.00" reason="0"/>
<exit id="RB2" time="16356.00" reason="1"/>
<entry id="RB2" time="16250.00" reason="departed"/>
<exit id="RB2" time="16356.00" reason="junction"/>
</driveWay>
</departJunction>
<departJunction id="gneJ7">
<driveWay id="gneJ7.d0">
<entry id="RB1" time="16000.00" reason="0"/>
<exit id="RB1" time="16086.00" reason="1"/>
<entry id="RB1" time="16000.00" reason="departed"/>
<exit id="RB1" time="16086.00" reason="junction"/>
</driveWay>
</departJunction>
</railsignal-vehicle-output>
66 changes: 33 additions & 33 deletions tests/sumo/rail/overlapping_driveways/railsignalvehs.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 2024-11-01 10:31:59 by Eclipse SUMO sumo Version v1_21_0+0544-8c77a935d25
<!-- generated on 2024-12-02 08:17:28 by Eclipse SUMO sumo Version v1_21_0+1093-f807130dc4a
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 @@ -47,65 +47,65 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<railSignal id="J0">
<link linkIndex="0" from="E6_0" to="E0_0">
<driveWay id="J0.0">
<entry id="v_0" time="8.00" reason="1"/>
<exit id="v_0" time="15.00" reason="1"/>
<entry id="v_1" time="16.00" reason="1"/>
<exit id="v_1" time="23.00" reason="1"/>
<entry id="v_2" time="24.00" reason="1"/>
<exit id="v_2" time="31.00" reason="1"/>
<entry id="v_3" time="32.00" reason="1"/>
<exit id="v_3" time="39.00" reason="1"/>
<entry id="v_0" time="8.00" reason="junction"/>
<exit id="v_0" time="15.00" reason="junction"/>
<entry id="v_1" time="16.00" reason="junction"/>
<exit id="v_1" time="23.00" reason="junction"/>
<entry id="v_2" time="24.00" reason="junction"/>
<exit id="v_2" time="31.00" reason="junction"/>
<entry id="v_3" time="32.00" reason="junction"/>
<exit id="v_3" time="39.00" reason="junction"/>
</driveWay>
</link>
</railSignal>
<railSignal id="J1">
<link linkIndex="0" from="E0_0" to="E1_0">
<driveWay id="J1.0">
<entry id="v_0" time="15.00" reason="1"/>
<exit id="v_0" time="28.00" reason="1"/>
<entry id="v_2" time="31.00" reason="1"/>
<exit id="v_2" time="108.00" reason="1"/>
<entry id="v_0" time="15.00" reason="junction"/>
<exit id="v_0" time="28.00" reason="junction"/>
<entry id="v_2" time="31.00" reason="junction"/>
<exit id="v_2" time="108.00" reason="junction"/>
</driveWay>
<subDriveWay id="J1.0.0"/>
<driveWay id="J1.1">
<entry id="v_1" time="23.00" reason="1"/>
<exit id="v_1" time="36.00" reason="1"/>
<entry id="v_3" time="39.00" reason="1"/>
<exit id="v_3" time="116.00" reason="1"/>
<entry id="v_1" time="23.00" reason="junction"/>
<exit id="v_1" time="36.00" reason="junction"/>
<entry id="v_3" time="39.00" reason="junction"/>
<exit id="v_3" time="116.00" reason="junction"/>
</driveWay>
<subDriveWay id="J1.1.0"/>
</link>
</railSignal>
<railSignal id="J3">
<link linkIndex="0" from="E2_0" to="E3_0">
<driveWay id="J3.0">
<entry id="v_0" time="28.00" reason="1"/>
<exit id="v_0" time="107.00" reason="9"/>
<entry id="v_2" time="108.00" reason="1"/>
<exit id="v_2" time="187.00" reason="9"/>
<entry id="v_0" time="28.00" reason="junction"/>
<exit id="v_0" time="107.00" reason="arrived"/>
<entry id="v_2" time="108.00" reason="junction"/>
<exit id="v_2" time="187.00" reason="arrived"/>
</driveWay>
</link>
</railSignal>
<railSignal id="J5">
<link linkIndex="0" from="E4_0" to="E5_0">
<driveWay id="J5.0">
<entry id="v_1" time="36.00" reason="1"/>
<exit id="v_1" time="115.00" reason="9"/>
<entry id="v_3" time="116.00" reason="1"/>
<exit id="v_3" time="195.00" reason="9"/>
<entry id="v_1" time="36.00" reason="junction"/>
<exit id="v_1" time="115.00" reason="arrived"/>
<entry id="v_3" time="116.00" reason="junction"/>
<exit id="v_3" time="195.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="8.00" reason="1"/>
<entry id="v_1" time="8.00" reason="0"/>
<exit id="v_1" time="16.00" reason="1"/>
<entry id="v_2" time="16.00" reason="0"/>
<exit id="v_2" time="24.00" reason="1"/>
<entry id="v_3" time="24.00" reason="0"/>
<exit id="v_3" time="32.00" reason="1"/>
<entry id="v_0" time="0.00" reason="departed"/>
<exit id="v_0" time="8.00" reason="junction"/>
<entry id="v_1" time="8.00" reason="departed"/>
<exit id="v_1" time="16.00" reason="junction"/>
<entry id="v_2" time="16.00" reason="departed"/>
<exit id="v_2" time="24.00" reason="junction"/>
<entry id="v_3" time="24.00" reason="departed"/>
<exit id="v_3" time="32.00" reason="junction"/>
</driveWay>
</departJunction>
</railsignal-vehicle-output>
26 changes: 13 additions & 13 deletions tests/sumo/rail/rail_signal/constraints/bidi/railsignalvehs.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 2024-11-01 10:31:58 by Eclipse SUMO sumo Version v1_21_0+0544-8c77a935d25
<!-- generated on 2024-12-02 08:17:27 by Eclipse SUMO sumo Version v1_21_0+1093-f807130dc4a
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 @@ -50,17 +50,17 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<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="38.00" reason="1"/>
<exit id="t0" time="74.00" reason="1"/>
<entry id="t0" time="38.00" reason="junction"/>
<exit id="t0" time="74.00" reason="junction"/>
</driveWay>
<subDriveWay id="A.0.0"/>
</link>
</railSignal>
<railSignal id="D">
<link linkIndex="0" from="-b2_0" to="-a2_0">
<driveWay id="D.0">
<entry id="t1" time="97.00" reason="1"/>
<exit id="t1" time="131.00" reason="9"/>
<entry id="t1" time="97.00" reason="junction"/>
<exit id="t1" time="131.00" reason="arrived"/>
</driveWay>
</link>
<link linkIndex="1" from="a2_0" to="b2_0"/>
Expand All @@ -69,31 +69,31 @@ 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="74.00" reason="1"/>
<exit id="t0" time="168.00" reason="9"/>
<entry id="t0" time="74.00" reason="junction"/>
<exit id="t0" time="168.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="58.00" reason="1"/>
<exit id="t1" time="97.00" reason="1"/>
<entry id="t1" time="58.00" reason="junction"/>
<exit id="t1" time="97.00" reason="junction"/>
</driveWay>
<subDriveWay id="J1.0.0"/>
</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="58.00" reason="1"/>
<entry id="t1" time="20.00" reason="departed"/>
<exit id="t1" time="58.00" reason="junction"/>
</driveWay>
</departJunction>
<departJunction id="gneJ1">
<driveWay id="gneJ1.d0">
<entry id="t0" time="0.00" reason="0"/>
<exit id="t0" time="38.00" reason="1"/>
<entry id="t0" time="0.00" reason="departed"/>
<exit id="t0" time="38.00" reason="junction"/>
</driveWay>
</departJunction>
</railsignal-vehicle-output>
14 changes: 7 additions & 7 deletions tests/sumo/rail/rail_signal/indirect_guard_route_conflict/railsignalvehs.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 2024-11-01 10:31:58 by Eclipse SUMO sumo Version v1_21_0+0544-8c77a935d25
<!-- generated on 2024-12-02 08:17:27 by Eclipse SUMO sumo Version v1_21_0+1093-f807130dc4a
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 @@ -48,8 +48,8 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<railSignal id="B.A">
<link linkIndex="0" from="T12_0_0" to="T13_0_0">
<driveWay id="B.A.0">
<entry id="rail2" time="8.00" reason="1"/>
<exit id="rail2" time="35.00" reason="1"/>
<entry id="rail2" time="8.00" reason="junction"/>
<exit id="rail2" time="35.00" reason="junction"/>
</driveWay>
<subDriveWay id="B.A.0.0"/>
</link>
Expand All @@ -63,8 +63,8 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<railSignal id="B.N2">
<link linkIndex="0" from="T15_0_0" to="T16_0_0">
<driveWay id="B.N2.0">
<entry id="rail2" time="35.00" reason="1"/>
<exit id="rail2" time="51.00" reason="9"/>
<entry id="rail2" time="35.00" reason="junction"/>
<exit id="rail2" time="51.00" reason="arrived"/>
</driveWay>
</link>
</railSignal>
Expand All @@ -74,8 +74,8 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<railSignal id="B.P2">
<link linkIndex="0" from="T15_1_0" to="T14_1_0">
<driveWay id="B.P2.0">
<entry id="rail1" time="6.00" reason="1"/>
<exit id="rail1" time="48.00" reason="9"/>
<entry id="rail1" time="6.00" reason="junction"/>
<exit id="rail1" time="48.00" reason="arrived"/>
</driveWay>
<subDriveWay id="B.P2.0.0"/>
</link>
Expand Down
26 changes: 13 additions & 13 deletions tests/sumo/rail/rail_signal/large_step_size/railsignalvehs.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 2024-11-01 10:31:58 by Eclipse SUMO sumo Version v1_21_0+0544-8c77a935d25
<!-- generated on 2024-12-02 08:17:27 by Eclipse SUMO sumo Version v1_21_0+1093-f807130dc4a
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 @@ -54,30 +54,30 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<railSignal id="gneJ1">
<link linkIndex="0" from="gneE0_0" to="gneE1_0">
<driveWay id="gneJ1.0">
<entry id="rail1" time="0.00" reason="0"/>
<entry id="rail2" time="21.00" reason="0"/>
<exit id="rail1" time="39.00" reason="1"/>
<exit id="rail2" time="96.00" reason="1"/>
<entry id="rail1" time="0.00" reason="departed"/>
<entry id="rail2" time="21.00" reason="departed"/>
<exit id="rail1" time="39.00" reason="junction"/>
<exit id="rail2" time="96.00" reason="junction"/>
</driveWay>
</link>
</railSignal>
<railSignal id="gneJ3">
<link linkIndex="0" from="gneE2_0" to="gneE3_0">
<driveWay id="gneJ3.0">
<entry id="rail1" time="39.00" reason="1"/>
<exit id="rail1" time="93.00" reason="1"/>
<entry id="rail2" time="96.00" reason="1"/>
<exit id="rail2" time="126.00" reason="1"/>
<entry id="rail1" time="39.00" reason="junction"/>
<exit id="rail1" time="93.00" reason="junction"/>
<entry id="rail2" time="96.00" reason="junction"/>
<exit id="rail2" time="126.00" reason="junction"/>
</driveWay>
</link>
</railSignal>
<railSignal id="gneJ5">
<link linkIndex="0" from="gneE4_0" to="gneE5_0">
<driveWay id="gneJ5.0">
<entry id="rail1" time="93.00" reason="1"/>
<exit id="rail1" time="123.00" reason="9"/>
<entry id="rail2" time="126.00" reason="1"/>
<exit id="rail2" time="135.00" reason="9"/>
<entry id="rail1" time="93.00" reason="junction"/>
<exit id="rail1" time="123.00" reason="arrived"/>
<entry id="rail2" time="126.00" reason="junction"/>
<exit id="rail2" time="135.00" reason="arrived"/>
</driveWay>
</link>
</railSignal>
Expand Down
Loading

0 comments on commit 097fa89

Please sign in to comment.