-
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.
- Loading branch information
Showing
10 changed files
with
214 additions
and
0 deletions.
There are no files selected for viewing
70 changes: 70 additions & 0 deletions
70
tests/tools/net/netdiff/connection_permissions/dest.net.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,70 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <!-- generated on 2024-04-17 08:41:46 by Eclipse SUMO netedit Version v1_19_0+1861-4ee0717ac3a | ||
| <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/neteditConfiguration.xsd"> | ||
| <input> | ||
| <sumo-net-file value="/localdata1/debug/14721/small/dest.net.xml"/> | ||
| </input> | ||
| <output> | ||
| <output-file value="/localdata1/debug/14721/small/dest.net.xml"/> | ||
| </output> | ||
| <processing> | ||
| <offset.disable-normalization value="true"/> | ||
| </processing> | ||
| <junctions> | ||
| <no-turnarounds value="true"/> | ||
| </junctions> | ||
| <netedit> | ||
| <new-network value="false"/> | ||
| </netedit> | ||
| </configuration> | ||
| --> | ||
|
|
||
| <net version="1.20" junctionCornerDetail="5" limitTurnSpeed="5.50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd"> | ||
|
|
||
| <location netOffset="0.00,0.00" convBoundary="0.00,-100.00,200.00,0.00" origBoundary="10000000000.00,10000000000.00,-10000000000.00,-10000000000.00" projParameter="!"/> | ||
|
|
||
| <edge id=":J1_0" function="internal"> | ||
| <lane id=":J1_0_0" index="0" allow="bus" speed="13.89" length="0.10" shape="100.00,-1.60 100.00,-1.60"/> | ||
| </edge> | ||
| <edge id=":J4_0" function="internal"> | ||
| <lane id=":J4_0_0" index="0" speed="13.89" length="0.10" shape="100.00,-101.60 100.00,-101.60"/> | ||
| </edge> | ||
|
|
||
| <edge id="E0" from="J0" to="J1" priority="-1"> | ||
| <lane id="E0_0" index="0" speed="13.89" length="100.00" shape="0.00,-1.60 100.00,-1.60"/> | ||
| </edge> | ||
| <edge id="E1" from="J1" to="J2" priority="-1"> | ||
| <lane id="E1_0" index="0" speed="13.89" length="100.00" shape="100.00,-1.60 200.00,-1.60"/> | ||
| </edge> | ||
| <edge id="E2" from="J3" to="J4" priority="-1"> | ||
| <lane id="E2_0" index="0" speed="13.89" length="100.00" shape="0.00,-101.60 100.00,-101.60"/> | ||
| </edge> | ||
| <edge id="E3" from="J4" to="J5" priority="-1"> | ||
| <lane id="E3_0" index="0" speed="13.89" length="100.00" shape="100.00,-101.60 200.00,-101.60"/> | ||
| </edge> | ||
|
|
||
| <junction id="J0" type="dead_end" x="0.00" y="0.00" incLanes="" intLanes="" shape="0.00,0.00 0.00,-3.20"/> | ||
| <junction id="J1" type="priority" x="100.00" y="0.00" incLanes="E0_0" intLanes=":J1_0_0" shape="100.00,0.00 100.00,-3.20 100.00,0.00"> | ||
| <request index="0" response="0" foes="0" cont="0"/> | ||
| </junction> | ||
| <junction id="J2" type="dead_end" x="200.00" y="0.00" incLanes="E1_0" intLanes="" shape="200.00,-3.20 200.00,0.00"/> | ||
| <junction id="J3" type="dead_end" x="0.00" y="-100.00" incLanes="" intLanes="" shape="0.00,-100.00 0.00,-103.20"/> | ||
| <junction id="J4" type="priority" x="100.00" y="-100.00" incLanes="E2_0" intLanes=":J4_0_0" shape="100.00,-100.00 100.00,-103.20 100.00,-100.00"> | ||
| <request index="0" response="0" foes="0" cont="0"/> | ||
| </junction> | ||
| <junction id="J5" type="dead_end" x="200.00" y="-100.00" incLanes="E3_0" intLanes="" shape="200.00,-103.20 200.00,-100.00"/> | ||
|
|
||
| <connection from="E0" to="E1" fromLane="0" toLane="0" allow="bus" via=":J1_0_0" dir="s" state="M"/> | ||
| <connection from="E2" to="E3" fromLane="0" toLane="0" via=":J4_0_0" dir="s" state="M"/> | ||
|
|
||
| <connection from=":J1_0" to="E1" fromLane="0" toLane="0" dir="s" state="M"/> | ||
| <connection from=":J4_0" to="E3" fromLane="0" toLane="0" dir="s" state="M"/> | ||
|
|
||
| </net> |
16 changes: 16 additions & 0 deletions
16
tests/tools/net/netdiff/connection_permissions/diff_con.tools
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,16 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <!-- generated on 2024-04-17 09:03:16.021238 by netdiff.py v1_19_0+1861-4ee0717ac3a | ||
| <configuration> | ||
| <source value="source.net.xml"/> | ||
| <dest value="dest.net.xml"/> | ||
| <outprefix value="diff"/> | ||
| </configuration> | ||
| --> | ||
|
|
||
| <connections version="1.20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/connections_file.xsd"> | ||
| <!-- Deleted Elements --> | ||
| <!-- Created Elements --> | ||
| <!-- Changed Elements --> | ||
| <connection from="E0" fromLane="0" to="E1" toLane="0" allow="bus"/> | ||
| </connections> |
15 changes: 15 additions & 0 deletions
15
tests/tools/net/netdiff/connection_permissions/diff_edg.tools
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,15 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <!-- generated on 2024-02-29 13:55:29.444217 by netdiff.py v1_19_0+1092-a49a04372af | ||
| <configuration> | ||
| <source value="source.net.xml"/> | ||
| <dest value="dest.net.xml"/> | ||
| <outprefix value="diff"/> | ||
| </configuration> | ||
| --> | ||
|
|
||
| <edges version="1.20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/edgediff_file.xsd"> | ||
| <!-- Deleted Elements --> | ||
| <!-- Created Elements --> | ||
| <!-- Changed Elements --> | ||
| </edges> |
15 changes: 15 additions & 0 deletions
15
tests/tools/net/netdiff/connection_permissions/diff_nod.tools
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,15 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <!-- generated on 2024-02-29 13:55:29.402185 by netdiff.py v1_19_0+1092-a49a04372af | ||
| <configuration> | ||
| <source value="source.net.xml"/> | ||
| <dest value="dest.net.xml"/> | ||
| <outprefix value="diff"/> | ||
| </configuration> | ||
| --> | ||
|
|
||
| <nodes version="1.20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/nodes_file.xsd"> | ||
| <!-- Deleted Elements --> | ||
| <!-- Created Elements --> | ||
| <!-- Changed Elements --> | ||
| </nodes> |
15 changes: 15 additions & 0 deletions
15
tests/tools/net/netdiff/connection_permissions/diff_tll.tools
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,15 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <!-- generated on 2024-04-17 09:03:16.029503 by netdiff.py v1_19_0+1861-4ee0717ac3a | ||
| <configuration> | ||
| <source value="source.net.xml"/> | ||
| <dest value="dest.net.xml"/> | ||
| <outprefix value="diff"/> | ||
| </configuration> | ||
| --> | ||
|
|
||
| <tlLogics version="1.20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tllogic_file.xsd"> | ||
| <!-- Deleted Elements --> | ||
| <!-- Created Elements --> | ||
| <!-- Changed Elements --> | ||
| </tlLogics> |
Empty file.
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 @@ | ||
| source.net.xml dest.net.xml diff tools/net/netdiff.py |
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,3 @@ | ||
| Success. | ||
| Success. | ||
| Skipping diff.typ.xml due to lack of input files. |
76 changes: 76 additions & 0 deletions
76
tests/tools/net/netdiff/connection_permissions/source.net.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,76 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <!-- generated on 2024-04-17 09:02:40 by Eclipse SUMO netedit Version v1_19_0+1861-4ee0717ac3a | ||
| <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/neteditConfiguration.xsd"> | ||
| <input> | ||
| <sumo-net-file value="source.net.xml"/> | ||
| </input> | ||
| <output> | ||
| <output-file value="source.net.xml"/> | ||
| </output> | ||
| <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> | ||
| --> | ||
|
|
||
| <net version="1.20" junctionCornerDetail="5" limitTurnSpeed="5.50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd"> | ||
|
|
||
| <location netOffset="0.00,0.00" convBoundary="0.00,-100.00,200.00,0.00" origBoundary="-10000000000.00,-10000000000.00,10000000000.00,10000000000.00" projParameter="!"/> | ||
|
|
||
| <edge id=":J1_0" function="internal"> | ||
| <lane id=":J1_0_0" index="0" speed="13.89" length="0.10" shape="100.00,-1.60 100.00,-1.60"/> | ||
| </edge> | ||
| <edge id=":J4_0" function="internal"> | ||
| <lane id=":J4_0_0" index="0" allow="bicycle" speed="13.89" length="0.10" shape="100.00,-101.60 100.00,-101.60"/> | ||
| </edge> | ||
|
|
||
| <edge id="E0" from="J0" to="J1" priority="-1"> | ||
| <lane id="E0_0" index="0" speed="13.89" length="100.00" shape="0.00,-1.60 100.00,-1.60"/> | ||
| </edge> | ||
| <edge id="E1" from="J1" to="J2" priority="-1"> | ||
| <lane id="E1_0" index="0" speed="13.89" length="100.00" shape="100.00,-1.60 200.00,-1.60"/> | ||
| </edge> | ||
| <edge id="E2" from="J3" to="J4" priority="-1"> | ||
| <lane id="E2_0" index="0" speed="13.89" length="100.00" shape="0.00,-101.60 100.00,-101.60"/> | ||
| </edge> | ||
| <edge id="E3" from="J4" to="J5" priority="-1"> | ||
| <lane id="E3_0" index="0" speed="13.89" length="100.00" shape="100.00,-101.60 200.00,-101.60"/> | ||
| </edge> | ||
|
|
||
| <junction id="J0" type="dead_end" x="0.00" y="0.00" incLanes="" intLanes="" shape="0.00,0.00 0.00,-3.20"/> | ||
| <junction id="J1" type="priority" x="100.00" y="0.00" incLanes="E0_0" intLanes=":J1_0_0" shape="100.00,0.00 100.00,-3.20 100.00,0.00"> | ||
| <request index="0" response="0" foes="0" cont="0"/> | ||
| </junction> | ||
| <junction id="J2" type="dead_end" x="200.00" y="0.00" incLanes="E1_0" intLanes="" shape="200.00,-3.20 200.00,0.00"/> | ||
| <junction id="J3" type="dead_end" x="0.00" y="-100.00" incLanes="" intLanes="" shape="0.00,-100.00 0.00,-103.20"/> | ||
| <junction id="J4" type="priority" x="100.00" y="-100.00" incLanes="E2_0" intLanes=":J4_0_0" shape="100.00,-100.00 100.00,-103.20 100.00,-100.00"> | ||
| <request index="0" response="0" foes="0" cont="0"/> | ||
| </junction> | ||
| <junction id="J5" type="dead_end" x="200.00" y="-100.00" incLanes="E3_0" intLanes="" shape="200.00,-103.20 200.00,-100.00"/> | ||
|
|
||
| <connection from="E0" to="E1" fromLane="0" toLane="0" via=":J1_0_0" dir="s" state="M"/> | ||
| <connection from="E2" to="E3" fromLane="0" toLane="0" allow="bicycle" via=":J4_0_0" dir="s" state="M"/> | ||
|
|
||
| <connection from=":J1_0" to="E1" fromLane="0" toLane="0" dir="s" state="M"/> | ||
| <connection from=":J4_0" to="E3" fromLane="0" toLane="0" dir="s" state="M"/> | ||
|
|
||
| </net> |
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