Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Patching netedit expected results. Refs #3045
- Loading branch information
1 parent
7a4c998
commit 712183f
Showing
88 changed files
with
2,744 additions
and
795 deletions.
There are no files selected for viewing
26 changes: 26 additions & 0 deletions
26
tests/netedit/demandelements/route/create_consecutive/repeat/additionals.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,26 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <!-- generated on 2023-11-15 09:14:11 by Eclipse SUMO netedit Version v1_19_0+0149-ecd9c79c4fd | ||
| --> | ||
|
|
||
| <additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd"> | ||
| <!-- StoppingPlaces --> | ||
| <busStop id="busStopA" lane="Edge2_1" startPos="29.80" endPos="39.80"/> | ||
| <trainStop id="trainStopA" lane="Edge3_1" startPos="9.80" endPos="19.80"/> | ||
| <containerStop id="containerStopA" lane="Edge2_1" startPos="9.80" endPos="19.80"/> | ||
| <chargingStation id="chargingStationA" lane="Edge2_1" startPos="20.80" endPos="28.80"/> | ||
| <parkingArea id="parkingAreaA" lane="Edge3_1" startPos="29.80" endPos="39.80"/> | ||
| <!-- TAZs --> | ||
| <taz id="taz_green" shape="18.00,20.00 18.00,16.00 0.00,16.00 0.00,20.00 18.00,20.00" fill="1" color="green"> | ||
| <tazSource id="Edge2" weight="1.00"/> | ||
| <tazSink id="Edge2" weight="1.00"/> | ||
| <tazSource id="Edge3" weight="1.00"/> | ||
| <tazSink id="Edge3" weight="1.00"/> | ||
| </taz> | ||
| <taz id="taz_red" shape="36.00,20.00 36.00,16.00 54.00,16.00 54.00,20.00 36.00,20.00" fill="1" color="red"> | ||
| <tazSource id="Edge0" weight="1.00"/> | ||
| <tazSink id="Edge0" weight="1.00"/> | ||
| <tazSource id="Edge5" weight="1.00"/> | ||
| <tazSink id="Edge5" weight="1.00"/> | ||
| </taz> | ||
| </additional> |
7 changes: 1 addition & 6 deletions
7
tests/netedit/demandelements/route/create_consecutive/repeat/additionals.netedit
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
2 changes: 0 additions & 2 deletions
2
tests/netedit/demandelements/route/create_consecutive/repeat/errors.neteditcheckoutput
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 +0,0 @@ | ||
| Error: Disconnected route 'r_0' when repeating. Last edge 'Edge2' is not connected to first edge 'Edge0'. | ||
| Quitting (on error). | ||
1 change: 0 additions & 1 deletion
1
tests/netedit/demandelements/route/create_consecutive/repeat/exitcode.neteditcheckoutput
This file was deleted.
Oops, something went wrong.
56 changes: 56 additions & 0 deletions
56
tests/netedit/demandelements/route/create_consecutive/repeat/net.con.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,56 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <!-- generated on 2023-11-15 09:24:22 by Eclipse SUMO netedit Version v1_19_0+0149-ecd9c79c4fd | ||
| <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/neteditConfiguration.xsd"> | ||
| <input> | ||
| <sumo-net-file value="D:\SUMO\tests\netedit\demandelements\route\create_consecutive\repeat\net.net.xml"/> | ||
| </input> | ||
| <processing> | ||
| <geometry.min-radius.fix.railways value="false"/> | ||
| <geometry.max-grade.fix value="false"/> | ||
| <offset.disable-normalization value="true"/> | ||
| <lefthand value="0"/> | ||
| </processing> | ||
| <junctions> | ||
| <no-turnarounds value="true"/> | ||
| <junctions.corner-detail value="5"/> | ||
| <junctions.limit-turn-speed value="5.50"/> | ||
| <rectangular-lane-cut value="0"/> | ||
| </junctions> | ||
| <pedestrian> | ||
| <walkingareas value="0"/> | ||
| </pedestrian> | ||
| </configuration> | ||
| --> | ||
|
|
||
| <connections version="1.16" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/connections_file.xsd"> | ||
| <connection from="Edge0" to="Edge1" fromLane="0" toLane="0"/> | ||
| <connection from="Edge0" to="Edge1" fromLane="1" toLane="1"/> | ||
|
|
||
| <connection from="Edge1" to="Edge2" fromLane="0" toLane="0"/> | ||
| <connection from="Edge1" to="Edge2" fromLane="1" toLane="1"/> | ||
|
|
||
| <connection from="Edge2" to="EdgeRepeat0" fromLane="0" toLane="0"/> | ||
| <connection from="Edge2" to="EdgeRepeat0" fromLane="1" toLane="1"/> | ||
|
|
||
| <connection from="Edge3" to="Edge4" fromLane="0" toLane="0"/> | ||
| <connection from="Edge3" to="Edge4" fromLane="1" toLane="1"/> | ||
|
|
||
| <connection from="Edge4" to="Edge5" fromLane="0" toLane="0"/> | ||
| <connection from="Edge4" to="Edge5" fromLane="1" toLane="1"/> | ||
|
|
||
| <connection from="Edge5" to="EdgeRepeat1" fromLane="0" toLane="0"/> | ||
| <connection from="Edge5" to="EdgeRepeat1" fromLane="1" toLane="1"/> | ||
|
|
||
| <connection from="EdgeRepeat0" to="Edge0" fromLane="0" toLane="0"/> | ||
| <connection from="EdgeRepeat0" to="Edge0" fromLane="1" toLane="1"/> | ||
|
|
||
| <connection from="EdgeRepeat1" to="Edge3" fromLane="0" toLane="0"/> | ||
| <connection from="EdgeRepeat1" to="Edge3" fromLane="1" toLane="1" keepClear="0"/> | ||
|
|
||
| </connections> |
64 changes: 64 additions & 0 deletions
64
tests/netedit/demandelements/route/create_consecutive/repeat/net.edg.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,64 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <!-- generated on 2023-11-15 09:24:22 by Eclipse SUMO netedit Version v1_19_0+0149-ecd9c79c4fd | ||
| <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/neteditConfiguration.xsd"> | ||
| <input> | ||
| <sumo-net-file value="D:\SUMO\tests\netedit\demandelements\route\create_consecutive\repeat\net.net.xml"/> | ||
| </input> | ||
| <processing> | ||
| <geometry.min-radius.fix.railways value="false"/> | ||
| <geometry.max-grade.fix value="false"/> | ||
| <offset.disable-normalization value="true"/> | ||
| <lefthand value="0"/> | ||
| </processing> | ||
| <junctions> | ||
| <no-turnarounds value="true"/> | ||
| <junctions.corner-detail value="5"/> | ||
| <junctions.limit-turn-speed value="5.50"/> | ||
| <rectangular-lane-cut value="0"/> | ||
| </junctions> | ||
| <pedestrian> | ||
| <walkingareas value="0"/> | ||
| </pedestrian> | ||
| </configuration> | ||
| --> | ||
|
|
||
| <edges version="1.16" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/edges_file.xsd"> | ||
| <edge id="Edge0" from="Junction0" to="Junction1" priority="-1" numLanes="2" speed="13.89"> | ||
| <lane index="0" allow="pedestrian bicycle" width="2.00"/> | ||
| <lane index="1" disallow="pedestrian"/> | ||
| </edge> | ||
| <edge id="Edge1" from="Junction1" to="Junction2" priority="-1" numLanes="2" speed="13.89"> | ||
| <lane index="0" allow="pedestrian bicycle" width="2.00"/> | ||
| <lane index="1" disallow="pedestrian"/> | ||
| </edge> | ||
| <edge id="Edge2" from="Junction2" to="Junction3" priority="-1" numLanes="2" speed="13.89"> | ||
| <lane index="0" allow="pedestrian bicycle" width="2.00"/> | ||
| <lane index="1" disallow="pedestrian"/> | ||
| </edge> | ||
| <edge id="Edge3" from="Junction3" to="Junction2" priority="-1" numLanes="2" speed="13.89"> | ||
| <lane index="0" allow="pedestrian bicycle" width="2.00"/> | ||
| <lane index="1" disallow="pedestrian"/> | ||
| </edge> | ||
| <edge id="Edge4" from="Junction2" to="Junction1" priority="-1" numLanes="2" speed="13.89"> | ||
| <lane index="0" allow="pedestrian bicycle" width="2.00"/> | ||
| <lane index="1" disallow="pedestrian"/> | ||
| </edge> | ||
| <edge id="Edge5" from="Junction1" to="Junction0" priority="-1" numLanes="2" speed="13.89"> | ||
| <lane index="0" allow="pedestrian bicycle" width="2.00"/> | ||
| <lane index="1" disallow="pedestrian"/> | ||
| </edge> | ||
| <edge id="EdgeRepeat0" from="Junction3" to="Junction0" priority="-1" numLanes="2" speed="13.89"> | ||
| <lane index="0" allow="pedestrian bicycle" width="2.00"/> | ||
| <lane index="1" disallow="pedestrian"/> | ||
| </edge> | ||
| <edge id="EdgeRepeat1" from="Junction0" to="Junction3" priority="-1" numLanes="2" speed="13.89"> | ||
| <lane index="0" allow="pedestrian bicycle" width="2.00"/> | ||
| <lane index="1" disallow="pedestrian"/> | ||
| </edge> | ||
| </edges> |
Oops, something went wrong.