forked from eclipse-sumo/sumo
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixes eclipse-sumo#9968 & updates green rest tests to reflect functio…
…nality Signed-off-by: Max Schrader <mcschrader@crimson.ua.edu>
- Loading branch information
1 parent
21d3da5
commit 485460f
Showing
13 changed files
with
247 additions
and
794 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
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
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 @@ | ||
| Warning: At NEMA tlLogic '0', actuated phase 3 has no controlling detector | ||
| Warning: At NEMA tlLogic '0, linkIndex 7 has no controlling detector |
48 changes: 12 additions & 36 deletions
48
tests/sumo/basic/tls/NEMA/green_rest/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 |
|---|---|---|
| @@ -1,36 +1,12 @@ | ||
|
|
||
| <add> | ||
| <laneAreaDetector id="customDet1" lane="17276_0" pos="5" endPos="15" file="detector.xml" freq="600"/> | ||
| <laneAreaDetector id="customDet2" lane="17276_1" pos="5" endPos="15" file="detector.xml" freq="600"/> | ||
| <laneAreaDetector id="customDet3" lane="17276_2" pos="5" endPos="15" file="detector.xml" freq="600"/> | ||
| <laneAreaDetector id="customDet4" lane="17276_3" pos="5" endPos="15" file="detector.xml" freq="600"/> | ||
|
|
||
| <laneAreaDetector id="customDet5" lane="-16480_0" pos="5" endPos="15" file="detector.xml" freq="600"/> | ||
| <laneAreaDetector id="customDet6" lane="-16480_1" pos="5" endPos="15" file="detector.xml" freq="600"/> | ||
|
|
||
|
|
||
| <tlLogic id="2881" offset="10" programID="NEMA" type="NEMA"> | ||
| <param key="detector-length" value="20"/> | ||
| <param key="detector-length-leftTurnLane" value="10"/> | ||
| <param key="total-cycle-length" value="120"/> | ||
| <param key="ring1" value="0,4,1,2"/> | ||
| <param key="ring2" value="0,4,0,6"/> | ||
| <param key="barrierPhases" value="4,4"/> | ||
| <param key="coordinatePhases" value="2,6"/> | ||
| <param key="coordinate-mode" value="false"/> | ||
| <param key="whetherOutputState" value="true"/> | ||
| <param key="minRecall" value="2,6"/> | ||
| <param key="show-detectors" value="true"/> | ||
| <param key="17276_0" value="customDet1"/> | ||
| <param key="17276_1" value="customDet2"/> | ||
| <param key="17276_2" value="customDet3"/> | ||
| <param key="17276_3" value="customDet4"/> | ||
| <param key="-16480_0" value="customDet5"/> | ||
| <param key="-16480_0" value="customDet6"/> | ||
|
|
||
| <phase duration="99" minDur="6" maxDur="16" vehext="3" yellow="4" red="1" name="1" state="srrrrrrGGrrr"/> | ||
| <phase duration="99" minDur="10" maxDur="60" vehext="3" yellow="4" red="1" name="2" state="srrrrrrrrGGG"/> | ||
| <phase duration="99" minDur="10" maxDur="21" vehext="4" yellow="4.5" red="1.5" name="4" state="GGGGGrrrrrrr"/> | ||
| <phase duration="99" minDur="10" maxDur="60" vehext="3" yellow="4" red="1" name="6" state="srrrrGGrrrrr"/> | ||
| </tlLogic> | ||
| </add> | ||
| <additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd"> | ||
|
|
||
| <e2Detector id="Detector_1" lane="1si_1" pos="240.00" length="10.00" freq="300.00" file="detector.xml"/> | ||
| <e2Detector id="Detector_6" lane="1si_0" pos="240.00" length="10.00" freq="300.00" file="detector.xml"/> | ||
| <e2Detector id="Detector_2" lane="2si_0" pos="240.00" length="10.00" freq="300.00" file="detector.xml"/> | ||
| <e2Detector id="Detector_5" lane="2si_1" pos="240.00" length="10.00" freq="300.00" file="detector.xml"/> | ||
| <e2Detector id="Detector_4" lane="3si_0" pos="240.00" length="10.00" freq="300.00" file="detector.xml"/> | ||
| <e2Detector id="Detector_7" lane="3si_1" pos="240.00" length="10.00" freq="300.00" file="detector.xml"/> | ||
| <e2Detector id="Detector_8" lane="4si_0" pos="240.00" length="10.00" freq="300.00" file="detector.xml"/> | ||
| <e2Detector id="Detector_3" lane="4si_1" pos="240.00" length="10.00" freq="300.00" file="detector.xml"/> | ||
|
|
||
| </additional> |
Oops, something went wrong.