Skip to content

Commit

Permalink
patching expected results refs #21, #14644
Browse files Browse the repository at this point in the history
  • Loading branch information
namdre committed Apr 2, 2024
1 parent d62985f commit 35e28c4
Show file tree
Hide file tree
Showing 28 changed files with 184 additions and 97 deletions.
6 changes: 3 additions & 3 deletions tests/tools/public_transport/ptlines2flows/basic/flows.tools
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-05-14 11:11:38.651685 by ptlines2flows.py v1_17_0+0279-4ba7adb
<!-- generated on 2024-04-03 00:58:52.433136 by ptlines2flows.py v1_19_0+1649-d62985f5c41
<configuration>
<net-file value="net.net.xml"/>
<ptlines-file value="ptlines.xml"/>
Expand All @@ -14,13 +14,13 @@
<vType id="bus" vClass="bus"/>
<vType id="tram" vClass="tram"/>
<vType id="train" vClass="rail"/>
<vType id="subway" vClass="rail_urban"/>
<vType id="subway" vClass="subway"/>
<vType id="light_rail" vClass="rail_urban"/>
<vType id="monorail" vClass="rail_urban"/>
<vType id="trolleybus" vClass="bus"/>
<vType id="minibus" vClass="bus"/>
<vType id="share_taxi" vClass="taxi"/>
<vType id="aerialway" vClass="rail_urban" length="2.5" width="2" personCapacity="4"/>
<vType id="aerialway" vClass="cable_car" length="2.5" width="2" personCapacity="4"/>
<vType id="ferry" vClass="ship"/>
<route id="bus_104:0" color="red" edges="110450334#1 110450334#2 338412122 391493949 391493947 391493950#0 391493950#1 391493952#0 391493952#1 391493952#2 391493954#0 391493954#1 391493954#2 391493954#3" >
<stop busStop="3959807221" duration="20" until="35.0"/> <!-- Kolonnenbrücke -->
Expand Down
6 changes: 3 additions & 3 deletions tests/tools/public_transport/ptlines2flows/basic/trips.tools
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-03-23 14:38:45.888565 by $Id: ptlines2flows.py v1_3_1+0313-ccb31df3eb jakob.erdmann@dlr.de 2019-09-02 13:26:32 +0200 $ v1_19_0+1490-762ea3fab21
<!-- generated on 2024-04-03 00:58:52.230656 by $Id: ptlines2flows.py v1_3_1+0313-ccb31df3eb jakob.erdmann@dlr.de 2019-09-02 13:26:32 +0200 $ v1_19_0+1649-d62985f5c41
<configuration>
<net-file value="net.net.xml"/>
<ptlines-file value="ptlines.xml"/>
Expand All @@ -14,13 +14,13 @@
<vType id="bus" vClass="bus" speedFactor="0.95"/>
<vType id="tram" vClass="tram" speedFactor="1.0"/>
<vType id="train" vClass="rail"/>
<vType id="subway" vClass="rail_urban"/>
<vType id="subway" vClass="subway"/>
<vType id="light_rail" vClass="rail_urban"/>
<vType id="monorail" vClass="rail_urban"/>
<vType id="trolleybus" vClass="bus" speedFactor="0.95"/>
<vType id="minibus" vClass="bus" speedFactor="0.95"/>
<vType id="share_taxi" vClass="taxi" speedFactor="0.95"/>
<vType id="aerialway" vClass="rail_urban" length="2.5" width="2" personCapacity="4"/>
<vType id="aerialway" vClass="cable_car" length="2.5" width="2" personCapacity="4"/>
<vType id="ferry" vClass="ship"/>
<trip id="0_bus_104:0" type="bus" depart="0" departLane="best" from="110450334#1" to="391493954#3">
<stop busStop="3959807221" duration="30"/> <!-- Kolonnenbrücke -->
Expand Down
15 changes: 11 additions & 4 deletions tests/tools/public_transport/ptlines2flows/begin_end/flows.tools
Original file line number Diff line number Diff line change
@@ -1,20 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2022-10-14 08:28:29.187453 by $Id: ptlines2flows.py v1_3_1+0313-ccb31df3eb jakob.erdmann@dlr.de 2019-09-02 13:26:32 +0200 $ v1_14_1+1719-6559bfb
options: -n net.net.xml -s input_additional.add.xml -l ptlines.xml -o out.flows.xml -p 600 -b 18000 -e 20000
<!-- generated on 2024-04-03 00:58:52.449133 by ptlines2flows.py v1_19_0+1649-d62985f5c41
<configuration>
<net-file value="net.net.xml"/>
<ptlines-file value="ptlines.xml"/>
<ptstops-file value="input_additional.add.xml"/>
<output-file value="out.flows.xml"/>
<begin value="18000.0"/>
<end value="20000.0"/>
</configuration>
-->

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<vType id="bus" vClass="bus"/>
<vType id="tram" vClass="tram"/>
<vType id="train" vClass="rail"/>
<vType id="subway" vClass="rail_urban"/>
<vType id="subway" vClass="subway"/>
<vType id="light_rail" vClass="rail_urban"/>
<vType id="monorail" vClass="rail_urban"/>
<vType id="trolleybus" vClass="bus"/>
<vType id="minibus" vClass="bus"/>
<vType id="share_taxi" vClass="taxi"/>
<vType id="aerialway" vClass="rail_urban" length="2.5" width="2" personCapacity="4"/>
<vType id="aerialway" vClass="cable_car" length="2.5" width="2" personCapacity="4"/>
<vType id="ferry" vClass="ship"/>
<route id="bus_104:0" color="red" edges="110450334#1 110450334#2 338412122 391493949 391493947 391493950#0 391493950#1 391493952#0 391493952#1 391493952#2 391493954#0 391493954#1 391493954#2 391493954#3" >
<stop busStop="3959807221" duration="20" until="35.0"/> <!-- Kolonnenbrücke -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-03-23 14:38:45.902302 by $Id: ptlines2flows.py v1_3_1+0313-ccb31df3eb jakob.erdmann@dlr.de 2019-09-02 13:26:32 +0200 $ v1_19_0+1490-762ea3fab21
<!-- generated on 2024-04-03 00:58:52.302530 by $Id: ptlines2flows.py v1_3_1+0313-ccb31df3eb jakob.erdmann@dlr.de 2019-09-02 13:26:32 +0200 $ v1_19_0+1649-d62985f5c41
<configuration>
<net-file value="net.net.xml"/>
<ptlines-file value="ptlines.xml"/>
Expand All @@ -15,13 +15,13 @@
<vType id="bus" vClass="bus" speedFactor="0.95"/>
<vType id="tram" vClass="tram" speedFactor="1.0"/>
<vType id="train" vClass="rail"/>
<vType id="subway" vClass="rail_urban"/>
<vType id="subway" vClass="subway"/>
<vType id="light_rail" vClass="rail_urban"/>
<vType id="monorail" vClass="rail_urban"/>
<vType id="trolleybus" vClass="bus" speedFactor="0.95"/>
<vType id="minibus" vClass="bus" speedFactor="0.95"/>
<vType id="share_taxi" vClass="taxi" speedFactor="0.95"/>
<vType id="aerialway" vClass="rail_urban" length="2.5" width="2" personCapacity="4"/>
<vType id="aerialway" vClass="cable_car" length="2.5" width="2" personCapacity="4"/>
<vType id="ferry" vClass="ship"/>
<trip id="0_bus_104:0" type="bus" depart="18000.0" departLane="best" from="110450334#1" to="391493954#3">
<stop busStop="3959807221" duration="30"/> <!-- Kolonnenbrücke -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2022-10-14 08:28:29.331823 by $Id: ptlines2flows.py v1_3_1+0313-ccb31df3eb jakob.erdmann@dlr.de 2019-09-02 13:26:32 +0200 $ v1_14_1+1719-6559bfb
options: -n net.net.xml -s input_additional.add.xml -l ptlines.xml -o out.flows.xml -p 600 <doubleminus>min-stops 0 <doubleminus>extend-to-fringe <doubleminus>verbose
<!-- generated on 2024-04-03 00:58:52.509139 by ptlines2flows.py v1_19_0+1649-d62985f5c41
<configuration>
<net-file value="net.net.xml"/>
<ptlines-file value="ptlines.xml"/>
<ptstops-file value="input_additional.add.xml"/>
<output-file value="out.flows.xml"/>
<min-stops value="0"/>
<extend-to-fringe value="True"/>
<verbose value="True"/>
</configuration>
-->

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<vType id="bus" vClass="bus"/>
<vType id="tram" vClass="tram"/>
<vType id="train" vClass="rail"/>
<vType id="subway" vClass="rail_urban"/>
<vType id="subway" vClass="subway"/>
<vType id="light_rail" vClass="rail_urban"/>
<vType id="monorail" vClass="rail_urban"/>
<vType id="trolleybus" vClass="bus"/>
<vType id="minibus" vClass="bus"/>
<vType id="share_taxi" vClass="taxi"/>
<vType id="aerialway" vClass="rail_urban" length="2.5" width="2" personCapacity="4"/>
<vType id="aerialway" vClass="cable_car" length="2.5" width="2" personCapacity="4"/>
<vType id="ferry" vClass="ship"/>
<route id="bus_0:0" edges="-391493954#3 -391493954#2 -391493954#1 -391493954#0 -391493952#2 -391493952#1 -391493952#0 -391493950#1 -391493950#0 -391493947 -391493949 -338412122 -110450334#2 -110450334#1" >
</route>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-03-23 14:38:46.076449 by $Id: ptlines2flows.py v1_3_1+0313-ccb31df3eb jakob.erdmann@dlr.de 2019-09-02 13:26:32 +0200 $ v1_19_0+1490-762ea3fab21
<!-- generated on 2024-04-03 00:58:52.435824 by $Id: ptlines2flows.py v1_3_1+0313-ccb31df3eb jakob.erdmann@dlr.de 2019-09-02 13:26:32 +0200 $ v1_19_0+1649-d62985f5c41
<configuration>
<net-file value="net.net.xml"/>
<ptlines-file value="ptlines.xml"/>
Expand All @@ -16,13 +16,13 @@
<vType id="bus" vClass="bus" speedFactor="0.95"/>
<vType id="tram" vClass="tram" speedFactor="1.0"/>
<vType id="train" vClass="rail"/>
<vType id="subway" vClass="rail_urban"/>
<vType id="subway" vClass="subway"/>
<vType id="light_rail" vClass="rail_urban"/>
<vType id="monorail" vClass="rail_urban"/>
<vType id="trolleybus" vClass="bus" speedFactor="0.95"/>
<vType id="minibus" vClass="bus" speedFactor="0.95"/>
<vType id="share_taxi" vClass="taxi" speedFactor="0.95"/>
<vType id="aerialway" vClass="rail_urban" length="2.5" width="2" personCapacity="4"/>
<vType id="aerialway" vClass="cable_car" length="2.5" width="2" personCapacity="4"/>
<vType id="ferry" vClass="ship"/>
<trip id="0_bus_0:0" type="bus" depart="0" departLane="best" from="-391493954#3" to="-110450334#1">
</trip>
Expand Down
14 changes: 10 additions & 4 deletions tests/tools/public_transport/ptlines2flows/few_stops/flows.tools
Original file line number Diff line number Diff line change
@@ -1,20 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2022-10-14 08:28:29.257388 by $Id: ptlines2flows.py v1_3_1+0313-ccb31df3eb jakob.erdmann@dlr.de 2019-09-02 13:26:32 +0200 $ v1_14_1+1719-6559bfb
options: -n net.net.xml -s input_additional.add.xml -l ptlines.xml -o out.flows.xml -p 600 <doubleminus>verbose
<!-- generated on 2024-04-03 00:58:52.481705 by ptlines2flows.py v1_19_0+1649-d62985f5c41
<configuration>
<net-file value="net.net.xml"/>
<ptlines-file value="ptlines.xml"/>
<ptstops-file value="input_additional.add.xml"/>
<output-file value="out.flows.xml"/>
<verbose value="True"/>
</configuration>
-->

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<vType id="bus" vClass="bus"/>
<vType id="tram" vClass="tram"/>
<vType id="train" vClass="rail"/>
<vType id="subway" vClass="rail_urban"/>
<vType id="subway" vClass="subway"/>
<vType id="light_rail" vClass="rail_urban"/>
<vType id="monorail" vClass="rail_urban"/>
<vType id="trolleybus" vClass="bus"/>
<vType id="minibus" vClass="bus"/>
<vType id="share_taxi" vClass="taxi"/>
<vType id="aerialway" vClass="rail_urban" length="2.5" width="2" personCapacity="4"/>
<vType id="aerialway" vClass="cable_car" length="2.5" width="2" personCapacity="4"/>
<vType id="ferry" vClass="ship"/>
<route id="bus_104:0" edges="-391493954#3 -391493954#2 -391493954#1 -391493954#0 -391493952#2 -391493952#1 -391493952#0 -391493950#1 -391493950#0 -391493947 -391493949 -338412122 -110450334#2 -110450334#1" >
<stop busStop="3959807201" duration="20" until="39.0"/> <!-- Dudenstraße/Katzbachstraße -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-03-23 14:38:46.109619 by $Id: ptlines2flows.py v1_3_1+0313-ccb31df3eb jakob.erdmann@dlr.de 2019-09-02 13:26:32 +0200 $ v1_19_0+1490-762ea3fab21
<!-- generated on 2024-04-03 00:58:52.409897 by $Id: ptlines2flows.py v1_3_1+0313-ccb31df3eb jakob.erdmann@dlr.de 2019-09-02 13:26:32 +0200 $ v1_19_0+1649-d62985f5c41
<configuration>
<net-file value="net.net.xml"/>
<ptlines-file value="ptlines.xml"/>
Expand All @@ -14,13 +14,13 @@
<vType id="bus" vClass="bus" speedFactor="0.95"/>
<vType id="tram" vClass="tram" speedFactor="1.0"/>
<vType id="train" vClass="rail"/>
<vType id="subway" vClass="rail_urban"/>
<vType id="subway" vClass="subway"/>
<vType id="light_rail" vClass="rail_urban"/>
<vType id="monorail" vClass="rail_urban"/>
<vType id="trolleybus" vClass="bus" speedFactor="0.95"/>
<vType id="minibus" vClass="bus" speedFactor="0.95"/>
<vType id="share_taxi" vClass="taxi" speedFactor="0.95"/>
<vType id="aerialway" vClass="rail_urban" length="2.5" width="2" personCapacity="4"/>
<vType id="aerialway" vClass="cable_car" length="2.5" width="2" personCapacity="4"/>
<vType id="ferry" vClass="ship"/>
<trip id="1_bus_104:0" type="bus" depart="0" departLane="best" from="-391493954#3" to="-110450334#1">
<stop busStop="3959807201" duration="30"/> <!-- Dudenstraße/Katzbachstraße -->
Expand Down
14 changes: 10 additions & 4 deletions tests/tools/public_transport/ptlines2flows/hrtime/flows.tools
Original file line number Diff line number Diff line change
@@ -1,20 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2022-10-14 08:28:29.320491 by $Id: ptlines2flows.py v1_3_1+0313-ccb31df3eb jakob.erdmann@dlr.de 2019-09-02 13:26:32 +0200 $ v1_14_1+1719-6559bfb
options: -n net.net.xml -s input_additional.add.xml -l ptlines.xml -o out.flows.xml -p 600 <doubleminus>human-readable-time
<!-- generated on 2024-04-03 00:58:52.452714 by ptlines2flows.py v1_19_0+1649-d62985f5c41
<configuration>
<net-file value="net.net.xml"/>
<ptlines-file value="ptlines.xml"/>
<ptstops-file value="input_additional.add.xml"/>
<output-file value="out.flows.xml"/>
<human-readable-time value="True"/>
</configuration>
-->

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<vType id="bus" vClass="bus"/>
<vType id="tram" vClass="tram"/>
<vType id="train" vClass="rail"/>
<vType id="subway" vClass="rail_urban"/>
<vType id="subway" vClass="subway"/>
<vType id="light_rail" vClass="rail_urban"/>
<vType id="monorail" vClass="rail_urban"/>
<vType id="trolleybus" vClass="bus"/>
<vType id="minibus" vClass="bus"/>
<vType id="share_taxi" vClass="taxi"/>
<vType id="aerialway" vClass="rail_urban" length="2.5" width="2" personCapacity="4"/>
<vType id="aerialway" vClass="cable_car" length="2.5" width="2" personCapacity="4"/>
<vType id="ferry" vClass="ship"/>
<route id="bus_104:0" color="red" edges="110450334#1 110450334#2 338412122 391493949 391493947 391493950#0 391493950#1 391493952#0 391493952#1 391493952#2 391493954#0 391493954#1 391493954#2 391493954#3" >
<stop busStop="3959807221" duration="20" until="00:00:35"/> <!-- Kolonnenbrücke -->
Expand Down
6 changes: 3 additions & 3 deletions tests/tools/public_transport/ptlines2flows/hrtime/trips.tools
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-03-23 14:38:45.978141 by $Id: ptlines2flows.py v1_3_1+0313-ccb31df3eb jakob.erdmann@dlr.de 2019-09-02 13:26:32 +0200 $ v1_19_0+1490-762ea3fab21
<!-- generated on 2024-04-03 00:58:52.244305 by $Id: ptlines2flows.py v1_3_1+0313-ccb31df3eb jakob.erdmann@dlr.de 2019-09-02 13:26:32 +0200 $ v1_19_0+1649-d62985f5c41
<configuration>
<net-file value="net.net.xml"/>
<ptlines-file value="ptlines.xml"/>
Expand All @@ -14,13 +14,13 @@
<vType id="bus" vClass="bus" speedFactor="0.95"/>
<vType id="tram" vClass="tram" speedFactor="1.0"/>
<vType id="train" vClass="rail"/>
<vType id="subway" vClass="rail_urban"/>
<vType id="subway" vClass="subway"/>
<vType id="light_rail" vClass="rail_urban"/>
<vType id="monorail" vClass="rail_urban"/>
<vType id="trolleybus" vClass="bus" speedFactor="0.95"/>
<vType id="minibus" vClass="bus" speedFactor="0.95"/>
<vType id="share_taxi" vClass="taxi" speedFactor="0.95"/>
<vType id="aerialway" vClass="rail_urban" length="2.5" width="2" personCapacity="4"/>
<vType id="aerialway" vClass="cable_car" length="2.5" width="2" personCapacity="4"/>
<vType id="ferry" vClass="ship"/>
<trip id="0_bus_104:0" type="bus" depart="0" departLane="best" from="110450334#1" to="391493954#3">
<stop busStop="3959807221" duration="30"/> <!-- Kolonnenbrücke -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2022-10-14 08:28:29.290103 by $Id: ptlines2flows.py v1_3_1+0313-ccb31df3eb jakob.erdmann@dlr.de 2019-09-02 13:26:32 +0200 $ v1_14_1+1719-6559bfb
options: -n net.net.xml -s input_additional.add.xml -l ptlines.xml -o out.flows.xml -p 600 <doubleminus>verbose
<!-- generated on 2024-04-03 00:58:52.514874 by ptlines2flows.py v1_19_0+1649-d62985f5c41
<configuration>
<net-file value="net.net.xml"/>
<ptlines-file value="ptlines.xml"/>
<ptstops-file value="input_additional.add.xml"/>
<output-file value="out.flows.xml"/>
<verbose value="True"/>
</configuration>
-->

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<vType id="bus" vClass="bus"/>
<vType id="tram" vClass="tram"/>
<vType id="train" vClass="rail"/>
<vType id="subway" vClass="rail_urban"/>
<vType id="subway" vClass="subway"/>
<vType id="light_rail" vClass="rail_urban"/>
<vType id="monorail" vClass="rail_urban"/>
<vType id="trolleybus" vClass="bus"/>
<vType id="minibus" vClass="bus"/>
<vType id="share_taxi" vClass="taxi"/>
<vType id="aerialway" vClass="rail_urban" length="2.5" width="2" personCapacity="4"/>
<vType id="aerialway" vClass="cable_car" length="2.5" width="2" personCapacity="4"/>
<vType id="ferry" vClass="ship"/>
<route id="bus_104:0" edges="110450334#1 110450334#2 338412122 391493949 391493947 391493950#0 391493950#1 391493952#0 391493952#1 391493952#2 391493954#0 391493954#1 391493954#2 391493954#3" >
<stop busStop="3959807221" duration="20" until="35.0"/> <!-- Kolonnenbrücke -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-03-23 14:38:46.110366 by $Id: ptlines2flows.py v1_3_1+0313-ccb31df3eb jakob.erdmann@dlr.de 2019-09-02 13:26:32 +0200 $ v1_19_0+1490-762ea3fab21
<!-- generated on 2024-04-03 00:58:52.428630 by $Id: ptlines2flows.py v1_3_1+0313-ccb31df3eb jakob.erdmann@dlr.de 2019-09-02 13:26:32 +0200 $ v1_19_0+1649-d62985f5c41
<configuration>
<net-file value="net.net.xml"/>
<ptlines-file value="ptlines.xml"/>
Expand All @@ -14,13 +14,13 @@
<vType id="bus" vClass="bus" speedFactor="0.95"/>
<vType id="tram" vClass="tram" speedFactor="1.0"/>
<vType id="train" vClass="rail"/>
<vType id="subway" vClass="rail_urban"/>
<vType id="subway" vClass="subway"/>
<vType id="light_rail" vClass="rail_urban"/>
<vType id="monorail" vClass="rail_urban"/>
<vType id="trolleybus" vClass="bus" speedFactor="0.95"/>
<vType id="minibus" vClass="bus" speedFactor="0.95"/>
<vType id="share_taxi" vClass="taxi" speedFactor="0.95"/>
<vType id="aerialway" vClass="rail_urban" length="2.5" width="2" personCapacity="4"/>
<vType id="aerialway" vClass="cable_car" length="2.5" width="2" personCapacity="4"/>
<vType id="ferry" vClass="ship"/>
<trip id="0_bus_104:0" type="bus" depart="0" departLane="best" from="110450334#1" to="391493954#3">
<stop busStop="3959807221" duration="30"/> <!-- Kolonnenbrücke -->
Expand Down

0 comments on commit 35e28c4

Please sign in to comment.