-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
- Loading branch information
Showing
13 changed files
with
288 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
tests/sumo/rail/rail_signal/constraints/deadlock_insertion3_tripId/errors.sumo
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| Warning: Teleporting vehicle 't0'; waited too long (yield), lane='a_0', time=332.00. | ||
| Warning: Vehicle 't0' ends teleporting on edge 'b', time=332.00. | ||
| Warning: Teleporting vehicle 't0'; waited too long (yield, railSignal), lane='a_0', time=232.00. | ||
| Warning: Vehicle 't0' ends teleporting on edge 'b', time=232.00. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
tests/sumo/rail/rail_signal/constraints/deadlock_insertion3_tripId_remove/deadlocks.sumo
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <!-- generated on 2024-10-15 16:46:15 by Eclipse SUMO sumo Version v1_20_0+0679-38c350fdd40 | ||
| 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 | ||
| <configuration 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"/> | ||
| <additional-files value="input_additional.add.xml,input_additional2.add.xml"/> | ||
| </input> | ||
| <output> | ||
| <write-license value="true"/> | ||
| <tripinfo-output value="tripinfos.xml"/> | ||
| <railsignal-block-output value="railsignal_blocks.xml"/> | ||
| <deadlock-output value="deadlocks.xml"/> | ||
| </output> | ||
| <processing> | ||
| <time-to-teleport.remove-constraint value="true"/> | ||
| <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> | ||
| </configuration> | ||
| --> | ||
|
|
||
| <additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd"> | ||
| <constraintDeadlock time="232.00" signals="A D" vehicles="t1 t0" tripIds="t1 123"> | ||
| <resolvedConstraint id="A"> | ||
| <predecessor tripId="123" tl="D" foes="345" active="0"/> | ||
| </resolvedConstraint> | ||
| </constraintDeadlock> | ||
| </additional> |
1 change: 1 addition & 0 deletions
1
tests/sumo/rail/rail_signal/constraints/deadlock_insertion3_tripId_remove/errors.sumo
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Warning: Deactivating constraint to resolve deadlock between vehicles t1 t0 at time 232.00. |
10 changes: 10 additions & 0 deletions
10
...o/rail/rail_signal/constraints/deadlock_insertion3_tripId_remove/input_additional.add.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd"> | ||
| <railSignalConstraints id="A"> | ||
| <predecessor tripId="123" tl="D" foes="345"/> | ||
| </railSignalConstraints> | ||
| <railSignalConstraints id="D"> | ||
| <insertionPredecessor tripId="t1" tl="A" foes="123"/> | ||
| </railSignalConstraints> | ||
| </additional> |
41 changes: 41 additions & 0 deletions
41
.../sumo/rail/rail_signal/constraints/deadlock_insertion3_tripId_remove/input_routes.rou.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <!-- generated on Fri 21 Aug 2020 02:28:17 PM CEST by Eclipse SUMO netedit Version v1_6_0+1707-2370e97800 | ||
| <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd"> | ||
| <input> | ||
| <new value="true"/> | ||
| </input> | ||
| <output> | ||
| <output-file value="/home/kobo/dlr/debug/7435/net.net.xml"/> | ||
| </output> | ||
| <processing> | ||
| <offset.disable-normalization value="true"/> | ||
| </processing> | ||
| <junctions> | ||
| <no-internal-links value="true"/> | ||
| </junctions> | ||
| <netedit> | ||
| <route-files value="/home/kobo/dlr/debug/7435/input_routes.rou.xml"/> | ||
| </netedit> | ||
| <report> | ||
| <aggregate-warnings value="5"/> | ||
| </report> | ||
| </configuration> | ||
| --> | ||
|
|
||
| <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd"> | ||
| <vType id="train" length="50.00" vClass="rail"/> | ||
| <trip id="t0" type="train" depart="0.00" from="a" to="c" departSpeed="max"> | ||
| <stop edge="a" duration="1" tripId="123"/> | ||
| </trip> | ||
| <trip id="t1" type="train" depart="20.00" from="d" to="c" departSpeed="max"> | ||
| <stop edge="d" duration="1" tripId="345"/> | ||
| </trip> | ||
| </routes> |
2 changes: 2 additions & 0 deletions
2
tests/sumo/rail/rail_signal/constraints/deadlock_insertion3_tripId_remove/options.sumo
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| --deadlock-output deadlocks.xml | ||
| --time-to-teleport.remove-constraint |
Empty file.
82 changes: 82 additions & 0 deletions
82
...sumo/rail/rail_signal/constraints/deadlock_insertion3_tripId_remove/railsignalblocks.sumo
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| <?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 | ||
| 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 | ||
| <configuration 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"/> | ||
| <additional-files value="input_additional.add.xml,input_additional2.add.xml"/> | ||
| </input> | ||
| <output> | ||
| <write-license value="true"/> | ||
| <tripinfo-output value="tripinfos.xml"/> | ||
| <railsignal-block-output value="railsignal_blocks.xml"/> | ||
| </output> | ||
| <processing> | ||
| <default.speeddev value="0"/> | ||
| </processing> | ||
| <report> | ||
| <xml-validation value="never"/> | ||
| <duration-log.disable value="true"/> | ||
| <no-step-log value="true"/> | ||
| </report> | ||
| </configuration> | ||
| --> | ||
|
|
||
| <railsignal-block-output> | ||
| <railSignal id="A"> | ||
| <link linkIndex="0" from="a_0" to="b_0"> | ||
| <driveWay id="A.0" vehicle="t0" edges="b c"> | ||
| <forward lanes="b_0 c_0"/> | ||
| <bidi lanes=""/> | ||
| <flank lanes=""/> | ||
| <conflictLinks signals="D_0"/> | ||
| <foes driveWays="A.0 D.0"/> | ||
| </driveWay> | ||
| </link> | ||
| </railSignal> | ||
| <railSignal id="D"> | ||
| <link linkIndex="0" from="d_0" to="e_0"> | ||
| <driveWay id="D.0" vehicle="t1" edges="e c"> | ||
| <forward lanes="e_0 c_0"/> | ||
| <bidi lanes=""/> | ||
| <flank lanes=""/> | ||
| <conflictLinks signals="A_0"/> | ||
| <foes driveWays="A.0 D.0"/> | ||
| </driveWay> | ||
| </link> | ||
| </railSignal> | ||
| <departJunction id="gneJ1"> | ||
| <driveWay id="gneJ1.d0" vehicle="t0" edges="a"> | ||
| <forward lanes="a_0"/> | ||
| <bidi lanes=""/> | ||
| <flank lanes=""/> | ||
| <conflictLinks signals=""/> | ||
| <foes driveWays="gneJ1.d0"/> | ||
| </driveWay> | ||
| </departJunction> | ||
| <departJunction id="gneJ5"> | ||
| <driveWay id="gneJ5.d1" vehicle="t1" edges="d"> | ||
| <forward lanes="d_0"/> | ||
| <bidi lanes=""/> | ||
| <flank lanes=""/> | ||
| <conflictLinks signals=""/> | ||
| <foes driveWays="gneJ5.d1"/> | ||
| </driveWay> | ||
| </departJunction> | ||
| </railsignal-block-output> |
47 changes: 47 additions & 0 deletions
47
tests/sumo/rail/rail_signal/constraints/deadlock_insertion3_tripId_remove/tripinfos.sumo
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <!-- generated on 2024-10-15 16:46:15 by Eclipse SUMO sumo Version v1_20_0+0679-38c350fdd40 | ||
| 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 | ||
| <configuration 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"/> | ||
| <additional-files value="input_additional.add.xml,input_additional2.add.xml"/> | ||
| </input> | ||
| <output> | ||
| <write-license value="true"/> | ||
| <tripinfo-output value="tripinfos.xml"/> | ||
| <railsignal-block-output value="railsignal_blocks.xml"/> | ||
| <deadlock-output value="deadlocks.xml"/> | ||
| </output> | ||
| <processing> | ||
| <time-to-teleport.remove-constraint value="true"/> | ||
| <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> | ||
| </configuration> | ||
| --> | ||
|
|
||
| <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd"> | ||
| <tripinfo id="t0" depart="0.00" departLane="a_0" departPos="50.10" departSpeed="13.89" departDelay="0.00" arrival="296.00" arrivalLane="c_0" arrivalPos="400.00" arrivalSpeed="13.89" duration="296.00" routeLength="849.90" waitingTime="201.00" waitingCount="1" stopTime="1.00" timeLoss="233.10" rerouteNo="1" devices="tripinfo_t0 routing_t0" vType="train" speedFactor="1.00" vaporized=""/> | ||
| <tripinfo id="t1" depart="233.00" departLane="d_0" departPos="50.10" departSpeed="13.89" departDelay="213.00" arrival="363.00" arrivalLane="c_0" arrivalPos="400.00" arrivalSpeed="13.89" duration="130.00" routeLength="891.19" waitingTime="32.00" waitingCount="1" stopTime="1.00" timeLoss="64.09" rerouteNo="1" devices="tripinfo_t1 routing_t1" vType="train" speedFactor="1.00" vaporized=""/> | ||
| </tripinfos> |
45 changes: 45 additions & 0 deletions
45
...s/sumo/rail/rail_signal/constraints/deadlock_insertion3_tripId_remove/tripinfos.sumo.meso
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <!-- generated on Mon Oct 19 14:10:14 2020 by Eclipse SUMO sumo Version v1_7_0+0644-c2b60a409c | ||
| 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 | ||
| SPDX-License-Identifier: EPL-2.0 | ||
| <configuration 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"/> | ||
| <additional-files value="input_additional.add.xml"/> | ||
| </input> | ||
| <output> | ||
| <write-license value="true"/> | ||
| <tripinfo-output value="tripinfos.xml"/> | ||
| <railsignal-block-output value="railsignal_blocks.xml"/> | ||
| </output> | ||
| <processing> | ||
| <default.speeddev value="0"/> | ||
| <pedestrian.model value="nonInteracting"/> | ||
| </processing> | ||
| <report> | ||
| <xml-validation value="never"/> | ||
| <xml-validation.routes value="never"/> | ||
| <duration-log.disable value="true"/> | ||
| <no-step-log value="true"/> | ||
| </report> | ||
| <mesoscopic> | ||
| <mesosim value="true"/> | ||
| </mesoscopic> | ||
| </configuration> | ||
| --> | ||
|
|
||
| <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd"> | ||
| <tripinfo id="t0" depart="0.00" departLane="" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="65.00" arrivalLane="" arrivalPos="400.00" arrivalSpeed="13.89" duration="65.00" routeLength="900.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="1" devices="tripinfo_t0 routing_t0" vType="train" speedFactor="1.00" vaporized=""/> | ||
| <tripinfo id="t1" depart="20.00" departLane="" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="88.00" arrivalLane="" arrivalPos="400.00" arrivalSpeed="13.89" duration="68.00" routeLength="941.29" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="1" devices="tripinfo_t1 routing_t1" vType="train" speedFactor="1.00" vaporized=""/> | ||
| </tripinfos> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters