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 committed Dec 19, 2024
1 parent 1d89ee0 commit c731a1b
Show file tree
Hide file tree
Showing 4 changed files with 348 additions and 0 deletions.
125 changes: 125 additions & 0 deletions tests/sumo/rail/siding/siding_oneSide/railsignalblocks.sumo.meso
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-12-19 22:35:29 by Eclipse SUMO sumo Version v1_21_0+1518-1d89ee09e67
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
http://www.eclipse.org/legal/epl-v20.html
This file may also be made available under the following Secondary
Licenses when the conditions for such availability set forth in the Eclipse
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
<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"/>
<route-files value="input_routes.rou.xml"/>
</input>
<output>
<write-license value="true"/>
<tripinfo-output value="tripinfos.xml"/>
<railsignal-block-output value="railsignal_blocks.xml"/>
</output>
<processing>
<time-to-teleport.railsignal-deadlock value="200"/>
<default.speeddev value="0"/>
</processing>
<report>
<xml-validation value="never"/>
<duration-log.disable value="true"/>
<no-step-log value="true"/>
</report>
<mesoscopic>
<mesosim value="true"/>
<meso-junction-control value="true"/>
</mesoscopic>
</sumoConfiguration>
-->

<railsignal-block-output>
<railSignal id="A">
<link linkIndex="0" from="a_0" to="b_0">
<driveWay id="A.0" vehicle="t2" edges="b c d e f g">
<forward lanes="b_0 c_0 d_0 e_0 f_0"/>
<bidi lanes="-b_0 -c_0 -d_0 -e_0 -f_0 -g_0"/>
<flank lanes=""/>
<conflictLinks signals="C2_0"/>
<foes driveWays="A.0 C2.0.0 F.1.0 G.d0"/>
</driveWay>
<subDriveWay id="A.0.0" vehicle="" edges="b">
<forward lanes="b_0"/>
</subDriveWay>
</link>
</railSignal>
<railSignal id="C2">
<link linkIndex="0" from="-d2_0" to="-c2_0">
<driveWay id="C2.0" vehicle="t3" edges="-c2 -b -a">
<forward lanes="-c2_0 -b_0 -a_0"/>
<bidi lanes="c2_0 b_0 a_0"/>
<flank lanes=""/>
<conflictLinks signals=""/>
<foes driveWays="A.0.0 C2.0 J0.d0"/>
</driveWay>
<subDriveWay id="C2.0.0" vehicle="" edges="-c2 -b">
<forward lanes="-c2_0 -b_0"/>
</subDriveWay>
</link>
</railSignal>
<railSignal id="F">
<link linkIndex="0" from="-g_0" to="-f_0">
<driveWay id="F.1" vehicle="t3" edges="-f -e2 -d2 -c2 -b -a">
<forward lanes="-f_0 -e2_0 -d2_0"/>
<bidi lanes="f_0 e2_0 d2_0 c2_0"
deadlockCheck="b_0 a_0"/>
<flank lanes=""/>
<conflictLinks signals="A_0"/>
<foes driveWays="A.0 F.1 J0.d0"/>
<sidings foe="J0.d0">
<siding start="-e2" end="-d2" length="234.07"/>
</sidings>
</driveWay>
<subDriveWay id="F.1.0" vehicle="" edges="-f">
<forward lanes="-f_0"/>
</subDriveWay>
</link>
<link linkIndex="1" from="f_0" to="g_0">
<driveWay id="F.0" vehicle="t2" edges="g">
<forward lanes="g_0"/>
<bidi lanes="-g_0"/>
<flank lanes=""/>
<conflictLinks signals=""/>
<foes driveWays="F.0 G.d0"/>
</driveWay>
</link>
</railSignal>
<departJunction id="G">
<driveWay id="G.d0" vehicle="t3" edges="-g -f -e2 -d2 -c2 -b -a">
<forward lanes="-g_0"/>
<bidi lanes="g_0 f_0 e2_0 d2_0 c2_0"
deadlockCheck="b_0 a_0"/>
<flank lanes=""/>
<conflictLinks signals="A_0"/>
<foes driveWays="A.0 F.0 G.d0 J0.d0"/>
<sidings foe="J0.d0">
<siding start="-e2" end="-d2" length="234.07"/>
</sidings>
</driveWay>
</departJunction>
<departJunction id="J0">
<driveWay id="J0.d0" vehicle="t2" edges="a b c d e f g">
<forward lanes="a_0"/>
<bidi lanes="-a_0 -b_0 -c_0 -d_0 -e_0"
deadlockCheck="-f_0 -g_0"/>
<flank lanes=""/>
<conflictLinks signals="C2_0 F_0"/>
<foes driveWays="C2.0 G.d0 J0.d0"/>
</driveWay>
</departJunction>
</railsignal-block-output>
49 changes: 49 additions & 0 deletions tests/sumo/rail/siding/siding_oneSide/tripinfos.sumo.meso
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-12-19 22:35:29 by Eclipse SUMO sumo Version v1_21_0+1518-1d89ee09e67
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
http://www.eclipse.org/legal/epl-v20.html
This file may also be made available under the following Secondary
Licenses when the conditions for such availability set forth in the Eclipse
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
<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"/>
<route-files value="input_routes.rou.xml"/>
</input>
<output>
<write-license value="true"/>
<tripinfo-output value="tripinfos.xml"/>
<railsignal-block-output value="railsignal_blocks.xml"/>
</output>
<processing>
<time-to-teleport.railsignal-deadlock value="200"/>
<default.speeddev value="0"/>
</processing>
<report>
<xml-validation value="never"/>
<duration-log.disable value="true"/>
<no-step-log value="true"/>
</report>
<mesoscopic>
<mesosim value="true"/>
<meso-junction-control value="true"/>
</mesoscopic>
</sumoConfiguration>
-->

<tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
<tripinfo id="t2" depart="0.00" departLane="a_0" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="51.00" arrivalLane="g_0" arrivalPos="100.00" arrivalSpeed="13.89" duration="51.00" routeLength="684.96" waitingTime="1.00" waitingCount="0" stopTime="0.00" timeLoss="1.00" rerouteNo="1" devices="tripinfo_t2 routing_t2" vType="train" speedFactor="1.00" vaporized=""/>
<tripinfo id="t3" depart="0.00" departLane="-g_0" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="56.00" arrivalLane="-a_0" arrivalPos="100.00" arrivalSpeed="13.89" duration="56.00" routeLength="765.15" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="1" devices="tripinfo_t3 routing_t3" vType="train" speedFactor="1.00" vaporized=""/>
</tripinfos>
125 changes: 125 additions & 0 deletions tests/sumo/rail/siding/siding_oneSide_slow/railsignalblocks.sumo.meso
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-12-19 22:35:29 by Eclipse SUMO sumo Version v1_21_0+1518-1d89ee09e67
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
http://www.eclipse.org/legal/epl-v20.html
This file may also be made available under the following Secondary
Licenses when the conditions for such availability set forth in the Eclipse
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
<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"/>
<route-files value="input_routes.rou.xml"/>
</input>
<output>
<write-license value="true"/>
<tripinfo-output value="tripinfos.xml"/>
<railsignal-block-output value="railsignal_blocks.xml"/>
</output>
<processing>
<time-to-teleport.railsignal-deadlock value="200"/>
<default.speeddev value="0"/>
</processing>
<report>
<xml-validation value="never"/>
<duration-log.disable value="true"/>
<no-step-log value="true"/>
</report>
<mesoscopic>
<mesosim value="true"/>
<meso-junction-control value="true"/>
</mesoscopic>
</sumoConfiguration>
-->

<railsignal-block-output>
<railSignal id="A">
<link linkIndex="0" from="a_0" to="b_0">
<driveWay id="A.0" vehicle="t2" edges="b c d e f g">
<forward lanes="b_0 c_0 d_0 e_0 f_0"/>
<bidi lanes="-b_0 -c_0 -d_0 -e_0 -f_0 -g_0"/>
<flank lanes=""/>
<conflictLinks signals="C2_0"/>
<foes driveWays="A.0 C2.0.0 F.1.0 G.d0"/>
</driveWay>
<subDriveWay id="A.0.0" vehicle="" edges="b">
<forward lanes="b_0"/>
</subDriveWay>
</link>
</railSignal>
<railSignal id="C2">
<link linkIndex="0" from="-d2_0" to="-c2_0">
<driveWay id="C2.0" vehicle="t3" edges="-c2 -b -a">
<forward lanes="-c2_0 -b_0 -a_0"/>
<bidi lanes="c2_0 b_0 a_0"/>
<flank lanes=""/>
<conflictLinks signals=""/>
<foes driveWays="A.0.0 C2.0 J0.d0"/>
</driveWay>
<subDriveWay id="C2.0.0" vehicle="" edges="-c2 -b">
<forward lanes="-c2_0 -b_0"/>
</subDriveWay>
</link>
</railSignal>
<railSignal id="F">
<link linkIndex="0" from="-g_0" to="-f_0">
<driveWay id="F.1" vehicle="t3" edges="-f -e2 -d2 -c2 -b -a">
<forward lanes="-f_0 -e2_0 -d2_0"/>
<bidi lanes="f_0 e2_0 d2_0 c2_0"
deadlockCheck="b_0 a_0"/>
<flank lanes=""/>
<conflictLinks signals="A_0"/>
<foes driveWays="A.0 F.1 J0.d0"/>
<sidings foe="J0.d0">
<siding start="-e2" end="-d2" length="234.07"/>
</sidings>
</driveWay>
<subDriveWay id="F.1.0" vehicle="" edges="-f">
<forward lanes="-f_0"/>
</subDriveWay>
</link>
<link linkIndex="1" from="f_0" to="g_0">
<driveWay id="F.0" vehicle="t2" edges="g">
<forward lanes="g_0"/>
<bidi lanes="-g_0"/>
<flank lanes=""/>
<conflictLinks signals=""/>
<foes driveWays="F.0 G.d0"/>
</driveWay>
</link>
</railSignal>
<departJunction id="G">
<driveWay id="G.d0" vehicle="t3" edges="-g -f -e2 -d2 -c2 -b -a">
<forward lanes="-g_0"/>
<bidi lanes="g_0 f_0 e2_0 d2_0 c2_0"
deadlockCheck="b_0 a_0"/>
<flank lanes=""/>
<conflictLinks signals="A_0"/>
<foes driveWays="A.0 F.0 G.d0 J0.d0"/>
<sidings foe="J0.d0">
<siding start="-e2" end="-d2" length="234.07"/>
</sidings>
</driveWay>
</departJunction>
<departJunction id="J0">
<driveWay id="J0.d0" vehicle="t2" edges="a b c d e f g">
<forward lanes="a_0"/>
<bidi lanes="-a_0 -b_0 -c_0 -d_0 -e_0"
deadlockCheck="-f_0 -g_0"/>
<flank lanes=""/>
<conflictLinks signals="C2_0 F_0"/>
<foes driveWays="C2.0 G.d0 J0.d0"/>
</driveWay>
</departJunction>
</railsignal-block-output>
49 changes: 49 additions & 0 deletions tests/sumo/rail/siding/siding_oneSide_slow/tripinfos.sumo.meso
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-12-19 22:35:29 by Eclipse SUMO sumo Version v1_21_0+1518-1d89ee09e67
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
http://www.eclipse.org/legal/epl-v20.html
This file may also be made available under the following Secondary
Licenses when the conditions for such availability set forth in the Eclipse
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
<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"/>
<route-files value="input_routes.rou.xml"/>
</input>
<output>
<write-license value="true"/>
<tripinfo-output value="tripinfos.xml"/>
<railsignal-block-output value="railsignal_blocks.xml"/>
</output>
<processing>
<time-to-teleport.railsignal-deadlock value="200"/>
<default.speeddev value="0"/>
</processing>
<report>
<xml-validation value="never"/>
<duration-log.disable value="true"/>
<no-step-log value="true"/>
</report>
<mesoscopic>
<mesosim value="true"/>
<meso-junction-control value="true"/>
</mesoscopic>
</sumoConfiguration>
-->

<tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
<tripinfo id="t2" depart="0.00" departLane="a_0" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="51.00" arrivalLane="g_0" arrivalPos="100.00" arrivalSpeed="13.89" duration="51.00" routeLength="684.96" waitingTime="1.00" waitingCount="0" stopTime="0.00" timeLoss="1.00" rerouteNo="1" devices="tripinfo_t2 routing_t2" vType="train" speedFactor="1.00" vaporized=""/>
<tripinfo id="t3" depart="0.00" departLane="-g_0" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="56.00" arrivalLane="-a_0" arrivalPos="100.00" arrivalSpeed="13.89" duration="56.00" routeLength="765.15" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="1" devices="tripinfo_t3 routing_t3" vType="train" speedFactor="1.00" vaporized=""/>
</tripinfos>

0 comments on commit c731a1b

Please sign in to comment.