Skip to content

Commit

Permalink
Patching netedit expected results. Refs #3045
Browse files Browse the repository at this point in the history
  • Loading branch information
palvarezlopez committed Nov 10, 2023
1 parent 615b37e commit e1edbfa
Show file tree
Hide file tree
Showing 178 changed files with 9,245 additions and 401 deletions.
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-11-10 10:54:57 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5
<!-- generated on 2023-11-10 13:29:03 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">
<stop containerStop="containerStopA" duration="70.00" until="12.00" extension="10.00" triggered="person" parking="1" expected="perA perB" permitted="customSplit" tripId="tripA" line="lineA" split="splitA" jump="4.00" actType="walking"/>
<stop containerStop="containerStopA" duration="70.00" until="12.00" extension="10.00" triggered="person" parking="1" expected="perA perB" permitted="permitA permitB" tripId="tripA" line="lineA" split="splitA" jump="4.00" actType="walking"/>
</route>
<route id="route_1" edges="EdgeCenter0 EdgeCenter1" color="yellow">
<stop containerStop="containerStopB" duration="60.00" until="20.00" extension="20.00" triggered="container" parking="1" expected="conA conB" permitted="customSplit" tripId="tripB" line="lineB" split="splitB" onDemand="1" jump="8.40" actType="singing"/>
<stop containerStop="containerStopB" duration="60.00" until="20.00" extension="20.00" triggered="container" parking="1" expected="conA conB" permitted="permitA permitB" tripId="tripB" line="lineB" split="splitB" onDemand="1" jump="8.40" actType="singing"/>
</route>
<!-- Vehicles, persons and containers (sorted by depart) -->
<vehicle id="vehicle_0" depart="0.00" route="route_0"/>
Expand Down
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-11-10 10:51:02 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5
<!-- generated on 2023-11-10 12:55:27 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" split="stopLane"/>
<stop lane="Edge2_1" startPos="34.80" endPos="44.80" duration="60.00"/>
<stop lane="Edge2_1" startPos="34.80" endPos="44.80" duration="60.00" split="customSPlit"/>
</flow>
Expand Down
Binary file not shown.
@@ -1 +0,0 @@
Warning: Selected Stop type isn't valid.
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -0,0 +1 @@
Warning: Selected Stop type isn't valid.
@@ -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>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-11-10 10:03:15 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5
<!-- generated on 2023-11-10 13:59: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">
Expand All @@ -9,7 +9,7 @@
<stop lane="Edge2_1" startPos="34.80" endPos="44.80" posLat="10.00" 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" onDemand="1" jump="4.00" actType="walking"/>
</route>
<route id="route_1" edges="EdgeCenter0 EdgeCenter1" color="yellow">
<stop lane="EdgeCenter1_0" startPos="2.00" endPos="5.00" posLat="20.00" 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" friendlyPos="1" actType="singing"/>
<stop lane="EdgeCenter1_0" startPos="2.00" endPos="5.00" posLat="20.00" 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" jump="8.40" friendlyPos="1" actType="singing"/>
</route>
<!-- Vehicles, persons and containers (sorted by depart) -->
<vehicle id="vehicle_0" depart="0.00" route="route_0"/>
Expand Down
@@ -1 +0,0 @@
Warning: Stop at parkingarea overrides attribute 'parking' for stop at 'parkingAreaB'
@@ -1,16 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-11-09 16:41:33 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5
<!-- generated on 2023-11-10 12:37:18 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="Edge3 Edge4 Edge5" color="yellow">
<stop parkingArea="parkingAreaA" 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"/>
</route>
<route id="route_1" edges="EdgeCenter0 EdgeCenter1" color="yellow">
<stop parkingArea="parkingAreaB" 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"/>
</route>
<route id="route_0" edges="Edge3 Edge4 Edge5" color="yellow"/>
<route id="route_1" edges="EdgeCenter0 EdgeCenter1" color="yellow"/>
<!-- Vehicles, persons and containers (sorted by depart) -->
<vehicle id="vehicle_0" depart="0.00" route="route_0">
<stop parkingArea="parkingAreaA" duration="60.00" parking="1" actType=";;;;;;;;;;"/>
Expand Down
@@ -1 +0,0 @@
Warning: Stop at parkingarea overrides attribute 'parking' for stop at 'parkingAreaB'
@@ -1,16 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-11-09 16:39:39 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5
<!-- generated on 2023-11-10 12:20:48 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="Edge3 Edge4 Edge5" color="yellow">
<stop parkingArea="parkingAreaA" 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"/>
</route>
<route id="route_1" edges="EdgeCenter0 EdgeCenter1" color="yellow">
<stop parkingArea="parkingAreaB" 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"/>
</route>
<route id="route_0" edges="Edge3 Edge4 Edge5" color="yellow"/>
<route id="route_1" edges="EdgeCenter0 EdgeCenter1" color="yellow"/>
<!-- Vehicles, persons and containers (sorted by depart) -->
<vehicle id="vehicle_0" depart="0.00" route="route_0">
<stop parkingArea="parkingAreaA" duration="60.00" parking="1"/>
Expand Down
@@ -1 +0,0 @@
Warning: Stop at parkingarea overrides attribute 'parking' for stop at 'parkingAreaB'
@@ -1,21 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-11-09 16:40:21 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5
<!-- generated on 2023-11-10 12:24:06 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="Edge3 Edge4 Edge5" color="yellow">
<stop parkingArea="parkingAreaA" 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"/>
</route>
<route id="route_1" edges="EdgeCenter0 EdgeCenter1" color="yellow">
<stop parkingArea="parkingAreaB" 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"/>
</route>
<route id="route_0" edges="Edge3 Edge4 Edge5" color="yellow"/>
<route id="route_1" edges="EdgeCenter0 EdgeCenter1" color="yellow"/>
<!-- Vehicles, persons and containers (sorted by depart) -->
<vehicle id="vehicle_0" depart="0.00" route="route_0">
<stop parkingArea="parkingAreaA" parking="1"/>
<stop parkingArea="parkingAreaA" duration="60.00" parking="1"/>
<stop parkingArea="parkingAreaA" duration="0.00" parking="1"/>
<stop parkingArea="parkingAreaA" duration="22.33" parking="1"/>
</vehicle>
<vehicle id="vehicle_1" depart="0.00" route="route_1"/>
Expand Down
@@ -1 +0,0 @@
Warning: Stop at parkingarea overrides attribute 'parking' for stop at 'parkingAreaB'
@@ -1,16 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-11-09 16:40:22 by Eclipse SUMO netedit Version v1_19_0+0034-128786327d5
<!-- generated on 2023-11-10 12:28: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="Edge3 Edge4 Edge5" color="yellow">
<stop parkingArea="parkingAreaA" 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"/>
</route>
<route id="route_1" edges="EdgeCenter0 EdgeCenter1" color="yellow">
<stop parkingArea="parkingAreaB" 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"/>
</route>
<route id="route_0" edges="Edge3 Edge4 Edge5" color="yellow"/>
<route id="route_1" edges="EdgeCenter0 EdgeCenter1" color="yellow"/>
<!-- Vehicles, persons and containers (sorted by depart) -->
<vehicle id="vehicle_0" depart="0.00" route="route_0">
<stop parkingArea="parkingAreaA" extension="0.00" parking="1"/>
Expand Down

0 comments on commit e1edbfa

Please sign in to comment.