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
615b37e
commit e1edbfa
Showing
178 changed files
with
9,245 additions
and
401 deletions.
There are no files selected for viewing
4 changes: 2 additions & 2 deletions
4
tests/netedit/demandelements/stop/chargingstation/create/extension/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,13 +1,13 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
|
||
<!-- generated on 2023-11-10 10:48:08 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5 | ||
<!-- generated on 2023-11-10 12:28:05 by Eclipse SUMO netedit Version v1_19_0+0072-041d30c218b | ||
--> | ||
|
||
<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) --> | ||
<flow id="flow" begin="0.00" from="Edge0" to="Edge2" end="36.00" number="18"> | ||
<stop chargingStation="chargingStationA" extension="0.00"/> | ||
<stop chargingStation="chargingStationA" extension="0.00"/> | ||
<stop chargingStation="chargingStationA" extension="0.00"/> | ||
<stop chargingStation="chargingStationA" extension="22.33"/> | ||
</flow> | ||
</routes> |
4 changes: 2 additions & 2 deletions
4
tests/netedit/demandelements/stop/chargingstation/inspect/parking/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-09 15:58:32 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5 | ||
<!-- generated on 2023-11-10 13:08:20 by Eclipse SUMO netedit Version v1_19_0+0072-041d30c218b | ||
--> | ||
|
||
<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) --> | ||
<flow id="flow" begin="0.00" from="Edge0" to="Edge2" end="36.00" number="18"> | ||
<stop chargingStation="chargingStationA" duration="60.00"/> | ||
<stop chargingStation="chargingStationA" duration="60.00" parking="1"/> | ||
</flow> | ||
</routes> |
6 changes: 3 additions & 3 deletions
6
tests/netedit/demandelements/stop/chargingstation/inspect_selection/parking/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,14 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
|
||
<!-- generated on 2023-11-10 11:02:24 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5 | ||
<!-- generated on 2023-11-10 13:34:59 by Eclipse SUMO netedit Version v1_19_0+0072-041d30c218b | ||
--> | ||
|
||
<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) --> | ||
<flow id="flow_0" begin="0.00" from="Edge0" to="Edge2" end="36.00" number="18"> | ||
<stop chargingStation="chargingStationA" duration="70.00" until="12.00" extension="10.00" triggered="person" expected="perA perB" permitted="A B" tripId="tripA" line="lineA" split="splitA" jump="4.00" actType="walking"/> | ||
<stop chargingStation="chargingStationA" duration="70.00" until="12.00" extension="10.00" triggered="person" parking="1" expected="perA perB" permitted="A B" tripId="tripA" line="lineA" split="splitA" jump="4.00" actType="walking"/> | ||
</flow> | ||
<flow id="flow_1" begin="0.00" from="EdgeCenter0" to="EdgeCenter1" end="36.00" number="18"> | ||
<stop chargingStation="chargingStationB" duration="60.00" until="20.00" extension="20.00" triggered="container" expected="conA conB" permitted="C D" tripId="tripB" line="lineB" split="splitB" onDemand="1" jump="8.40" actType="singing"/> | ||
<stop chargingStation="chargingStationB" duration="60.00" until="20.00" extension="20.00" triggered="container" parking="1" expected="conA conB" permitted="C D" tripId="tripB" line="lineB" split="splitB" onDemand="1" jump="8.40" actType="singing"/> | ||
</flow> | ||
</routes> |
3 changes: 2 additions & 1 deletion
3
tests/netedit/demandelements/stop/containerstop/create/jump/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,12 +1,13 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
|
||
<!-- generated on 2023-11-10 10:50:08 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5 | ||
<!-- generated on 2023-11-10 12:45:47 by Eclipse SUMO netedit Version v1_19_0+0072-041d30c218b | ||
--> | ||
|
||
<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) --> | ||
<trip id="trip" depart="0.00" from="Edge0" to="Edge2"> | ||
<stop containerStop="containerStopA" duration="60.00"/> | ||
<stop containerStop="containerStopA" duration="60.00" jump="0.00"/> | ||
<stop containerStop="containerStopA" duration="60.00" jump="22.33"/> | ||
</trip> | ||
</routes> |
4 changes: 2 additions & 2 deletions
4
tests/netedit/demandelements/stop/containerstop/create/permitted/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,12 +1,12 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
|
||
<!-- generated on 2023-11-10 10:49:06 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5 | ||
<!-- generated on 2023-11-10 12:35:14 by Eclipse SUMO netedit Version v1_19_0+0072-041d30c218b | ||
--> | ||
|
||
<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) --> | ||
<trip id="trip" depart="0.00" from="Edge0" to="Edge2"> | ||
<stop containerStop="containerStopA" duration="60.00"/> | ||
<stop containerStop="containerStopA" duration="60.00"/> | ||
<stop containerStop="containerStopA" duration="60.00" permitted="ID1 ID2 ID3"/> | ||
</trip> | ||
</routes> |
6 changes: 3 additions & 3 deletions
6
tests/netedit/demandelements/stop/containerstop/inspect_selection/permitted/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
3 changes: 1 addition & 2 deletions
3
tests/netedit/demandelements/stop/lane/create/split/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
Binary file added
BIN
+83.6 KB
tests/netedit/demandelements/stop/lane/inspect/endpos/errorScreenshot.netedit
Binary file not shown.
1 change: 0 additions & 1 deletion
1
tests/netedit/demandelements/stop/lane/inspect/extension/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 +0,0 @@ | ||
Warning: Selected Stop type isn't valid. | ||
6 changes: 4 additions & 2 deletions
6
tests/netedit/demandelements/stop/lane/inspect/extension/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,13 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
|
||
<!-- generated on 2023-11-10 10:53:15 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5 | ||
<!-- generated on 2023-11-10 13:12:36 by Eclipse SUMO netedit Version v1_19_0+0072-041d30c218b | ||
--> | ||
|
||
<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd"> | ||
<!-- Routes --> | ||
<route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/> | ||
<!-- Vehicles, persons and containers (sorted by depart) --> | ||
<flow id="routeFlow" begin="0.00" route="route_0" end="3600.00" number="18"/> | ||
<flow id="routeFlow" begin="0.00" route="route_0" end="3600.00" number="18"> | ||
<stop lane="Edge2_1" startPos="34.80" endPos="44.80" extension="3.50"/> | ||
</flow> | ||
</routes> |
4 changes: 2 additions & 2 deletions
4
tests/netedit/demandelements/stop/lane/inspect/jump/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,13 +1,13 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
|
||
<!-- generated on 2023-11-10 10:55:38 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5 | ||
<!-- generated on 2023-11-10 13:30:52 by Eclipse SUMO netedit Version v1_19_0+0072-041d30c218b | ||
--> | ||
|
||
<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd"> | ||
<!-- Routes --> | ||
<route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/> | ||
<!-- Vehicles, persons and containers (sorted by depart) --> | ||
<flow id="routeFlow" begin="0.00" route="route_0" end="3600.00" number="18"> | ||
<stop lane="Edge2_1" startPos="34.80" endPos="44.80" duration="60.00" jump="0.00"/> | ||
<stop lane="Edge2_1" startPos="34.80" endPos="44.80" duration="60.00" jump="3.50"/> | ||
</flow> | ||
</routes> |
4 changes: 2 additions & 2 deletions
4
tests/netedit/demandelements/stop/lane/inspect/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,13 +1,13 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
|
||
<!-- generated on 2023-11-10 10:50:49 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5 | ||
<!-- generated on 2023-11-10 12:58:44 by Eclipse SUMO netedit Version v1_19_0+0072-041d30c218b | ||
--> | ||
|
||
<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd"> | ||
<!-- Routes --> | ||
<route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/> | ||
<!-- Vehicles, persons and containers (sorted by depart) --> | ||
<flow id="routeFlow" begin="0.00" route="route_0" end="3600.00" number="18"> | ||
<stop lane="Edge2_0" startPos="34.80" endPos="44.80" duration="60.00"/> | ||
<stop lane="Edge0_1" startPos="34.80" endPos="44.80" duration="60.00"/> | ||
</flow> | ||
</routes> |
4 changes: 2 additions & 2 deletions
4
tests/netedit/demandelements/stop/lane/inspect/triggered_join/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,13 +1,13 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
|
||
<!-- generated on 2023-11-10 10:53:37 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5 | ||
<!-- generated on 2023-11-10 13:18:08 by Eclipse SUMO netedit Version v1_19_0+0072-041d30c218b | ||
--> | ||
|
||
<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd"> | ||
<!-- Routes --> | ||
<route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/> | ||
<!-- Vehicles, persons and containers (sorted by depart) --> | ||
<flow id="routeFlow" begin="0.00" route="route_0" end="3600.00" number="18"> | ||
<stop lane="Edge2_1" startPos="34.80" endPos="44.80" duration="60.00" permitted="customJoin"/> | ||
<stop lane="Edge2_1" startPos="34.80" endPos="44.80" duration="60.00" triggered="join" join="customJoin"/> | ||
</flow> | ||
</routes> |
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: Selected Stop type isn't valid. |
6 changes: 2 additions & 4 deletions
6
tests/netedit/demandelements/stop/lane/inspect/tripid/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,13 +1,11 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
|
||
<!-- generated on 2023-11-09 15:59:40 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5 | ||
<!-- generated on 2023-11-10 13:25:11 by Eclipse SUMO netedit Version v1_19_0+0072-041d30c218b | ||
--> | ||
|
||
<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd"> | ||
<!-- Routes --> | ||
<route id="route_0" edges="Edge0 Edge1 Edge2" color="yellow"/> | ||
<!-- Vehicles, persons and containers (sorted by depart) --> | ||
<flow id="routeFlow" begin="0.00" route="route_0" end="3600.00" number="18"> | ||
<stop lane="Edge2_1" startPos="34.80" endPos="44.80" duration="60.00" tripId="customID"/> | ||
</flow> | ||
<flow id="routeFlow" begin="0.00" route="route_0" end="3600.00" number="18"/> | ||
</routes> |
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
1 change: 0 additions & 1 deletion
1
tests/netedit/demandelements/stop/parkingarea/create/acttype/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 +0,0 @@ | ||
Warning: Stop at parkingarea overrides attribute 'parking' for stop at 'parkingAreaB' | ||
10 changes: 3 additions & 7 deletions
10
tests/netedit/demandelements/stop/parkingarea/create/acttype/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
1 change: 0 additions & 1 deletion
1
tests/netedit/demandelements/stop/parkingarea/create/default/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 +0,0 @@ | ||
Warning: Stop at parkingarea overrides attribute 'parking' for stop at 'parkingAreaB' | ||
10 changes: 3 additions & 7 deletions
10
tests/netedit/demandelements/stop/parkingarea/create/default/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
1 change: 0 additions & 1 deletion
1
tests/netedit/demandelements/stop/parkingarea/create/duration/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 +0,0 @@ | ||
Warning: Stop at parkingarea overrides attribute 'parking' for stop at 'parkingAreaB' | ||
11 changes: 3 additions & 8 deletions
11
tests/netedit/demandelements/stop/parkingarea/create/duration/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
1 change: 0 additions & 1 deletion
1
tests/netedit/demandelements/stop/parkingarea/create/extension/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 +0,0 @@ | ||
Warning: Stop at parkingarea overrides attribute 'parking' for stop at 'parkingAreaB' | ||
10 changes: 3 additions & 7 deletions
10
tests/netedit/demandelements/stop/parkingarea/create/extension/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
Oops, something went wrong.