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.
Patching netdit expected results. Refs eclipse-sumo#3045
- Loading branch information
1 parent
a8453c5
commit 88c9c50
Showing
16 changed files
with
251 additions
and
168 deletions.
There are no files selected for viewing
4 changes: 2 additions & 2 deletions
4
...it/demandelements/container/create/default_stop/default_stop_containerstop/routes.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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <!-- generated on 2023-11-07 11:53:34 by Eclipse SUMO netedit Version 1.19.0 | ||
| <!-- generated on 2023-11-16 08:36:24 by Eclipse SUMO netedit Version v1_19_0+0186-4470c33a83d | ||
| --> | ||
|
|
||
| <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd"> | ||
| <!-- Vehicles, persons and containers (sorted by depart) --> | ||
| <container id="c_0" depart="0.00"> | ||
| <stop duration="60.00"/> | ||
| <stop fromContainerStop="containerStopA" duration="60.00"/> | ||
| </container> | ||
| </routes> |
4 changes: 2 additions & 2 deletions
4
tests/netedit/demandelements/container/create/default_stop/default_stop_lane/routes.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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <!-- generated on 2023-11-07 11:56:32 by Eclipse SUMO netedit Version 1.19.0 | ||
| <!-- generated on 2023-11-16 08:36:24 by Eclipse SUMO netedit Version v1_19_0+0186-4470c33a83d | ||
| --> | ||
|
|
||
| <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd"> | ||
| <!-- Vehicles, persons and containers (sorted by depart) --> | ||
| <container id="c_0" depart="0.00"> | ||
| <stop duration="60.00"/> | ||
| <stop edge="Edge0" endPos="26.09" duration="60.00"/> | ||
| </container> | ||
| </routes> |
4 changes: 2 additions & 2 deletions
4
...emandelements/containerflow/create/default_stop/default_stop_containerstop/routes.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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <!-- generated on 2023-11-07 14:04:29 by Eclipse SUMO netedit Version v1_19_0+0012-7f242da7bd0 | ||
| <!-- generated on 2023-11-16 08:36:33 by Eclipse SUMO netedit Version v1_19_0+0186-4470c33a83d | ||
| --> | ||
|
|
||
| <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd"> | ||
| <!-- Vehicles, persons and containers (sorted by depart) --> | ||
| <containerFlow id="cf_0" begin="0.00" end="3600.00" containersPerHour="1800"> | ||
| <stop duration="60.00"/> | ||
| <stop fromContainerStop="containerStopA" duration="60.00"/> | ||
| </containerFlow> | ||
| </routes> |
4 changes: 2 additions & 2 deletions
4
...netedit/demandelements/containerflow/create/default_stop/default_stop_lane/routes.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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <!-- generated on 2023-11-07 14:03:01 by Eclipse SUMO netedit Version v1_19_0+0012-7f242da7bd0 | ||
| <!-- generated on 2023-11-16 08:36:33 by Eclipse SUMO netedit Version v1_19_0+0186-4470c33a83d | ||
| --> | ||
|
|
||
| <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd"> | ||
| <!-- Vehicles, persons and containers (sorted by depart) --> | ||
| <containerFlow id="cf_0" begin="0.00" end="3600.00" containersPerHour="1800"> | ||
| <stop duration="60.00"/> | ||
| <stop edge="Edge0" endPos="26.09" duration="60.00"/> | ||
| </containerFlow> | ||
| </routes> |
2 changes: 0 additions & 2 deletions
2
tests/netedit/demandelements/containerflow/create/period/log.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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +0,0 @@ | ||
| Warning: Double edges aren't allowed | ||
| Warning: Only two from-to elements are allowed | ||
7 changes: 5 additions & 2 deletions
7
tests/netedit/demandelements/containerflow/create/period/routes.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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,17 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <!-- generated on 2023-11-07 14:07:25 by Eclipse SUMO netedit Version v1_19_0+0012-7f242da7bd0 | ||
| <!-- generated on 2023-11-16 08:39:07 by Eclipse SUMO netedit Version v1_19_0+0186-4470c33a83d | ||
| --> | ||
|
|
||
| <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd"> | ||
| <!-- Vehicles, persons and containers (sorted by depart) --> | ||
| <containerFlow id="cf_0" begin="0.00" end="3600.00" period="2.00"> | ||
| <tranship from="Edge0" containerStop="containerStopA"/> | ||
| </containerFlow> | ||
| <containerFlow id="cf_1" begin="0.00" end="3600.00" period="22.00"> | ||
| <containerFlow id="cf_1" begin="0.00" end="3600.00" period="20.50"> | ||
| <tranship from="Edge0" to="Edge2"/> | ||
| </containerFlow> | ||
| <containerFlow id="cf_2" begin="0.00" end="3600.00" period="22.00"> | ||
| <tranship from="Edge0" to="Edge2"/> | ||
| </containerFlow> | ||
| </routes> |
27 changes: 24 additions & 3 deletions
27
...s/netedit/demandelements/containerplan/stops/stop_edge/create/default/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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,31 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <!-- generated on 2022-10-11 14:02:18 by Eclipse SUMO netedit Version v1_14_1+1589-5bfaa410f84 | ||
| <!-- generated on 2023-11-16 08:50:50 by Eclipse SUMO netedit Version v1_19_0+0186-4470c33a83d | ||
| --> | ||
|
|
||
| <additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd"> | ||
| <!-- StoppingPlaces --> | ||
| <containerStop id="containerStopA" lane="Edge2_0" startPos="20.00" endPos="30.00"/> | ||
| <containerStop id="containerStopB" lane="Edge2_0" startPos="35.00" endPos="45.00"/> | ||
| <busStop id="busStopA" lane="Edge2_1" startPos="29.80" endPos="39.80"/> | ||
| <busStop id="busStopB" name="i" lane="EdgeCenter1_1" startPos="17.50" endPos="22.50"/> | ||
| <trainStop id="trainStopA" lane="Edge3_1" startPos="9.80" endPos="19.80"/> | ||
| <trainStop id="trainStopB" name="m" lane="EdgeCenter1_1" startPos="11.50" endPos="16.50"/> | ||
| <containerStop id="containerStopA" lane="Edge2_1" startPos="9.80" endPos="19.80"/> | ||
| <containerStop id="containerStopB" lane="EdgeCenter1_1" startPos="5.50" endPos="10.50"/> | ||
| <chargingStation id="chargingStationA" lane="Edge2_1" startPos="20.80" endPos="28.80"/> | ||
| <chargingStation id="chargingStationB" lane="EdgeCenter0_1" startPos="2.30" endPos="7.30"/> | ||
| <parkingArea id="parkingAreaA" lane="Edge3_1" startPos="29.80" endPos="39.80"/> | ||
| <parkingArea id="parkingAreaB" lane="EdgeCenter0_1" startPos="14.30" endPos="19.30"/> | ||
| <!-- 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> |
Oops, something went wrong.