Skip to content

Commit

Permalink
patching expected pt results refs #21, refs #2202
Browse files Browse the repository at this point in the history
  • Loading branch information
@behrisch
behrisch committed Jan 13, 2019
1 parent e67949e commit 2bfd32f
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 24 deletions.
8 changes: 4 additions & 4 deletions tests/tools/public_transport/ptlines2flows/basic/flows.tools
View file
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- generated on 2019-01-04 11:54:56.813520 by $Id$
<!-- generated on 2019-01-13 15:26:30.317405 by $Id: ptlines2flows.py 0ac7855aee evamarie.wiessner@dlr.de 2018-08-09 15:02:39 +0200 $
options: -n net.net.xml -s input_additional.add.xml -l ptlines.xml -o out.flows.xml -p 600 <doubleminus>verbose
-->
<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
Expand Down Expand Up @@ -32,11 +32,11 @@
<stop busStop="3959807201" duration="30.00" until="72.0"/> <!-- Dudenstraße/Katzbachstraße -->
<stop busStop="3959807220" duration="30.00" until="140.0"/> <!-- Kolonnenbrücke -->
</route>
<route id="bus_140:1" edges="53356539#0 53356539#1 4710636#0 4710636#1 4710636#2 -391493952#2 391493952#2 111325187#0 111325187#1 111325187#2 111325187#3" >
<route id="bus_140:1" edges="53356539#0 53356539#1 4710636#0 4710636#1 4710636#2 111325187#0 111325187#1 111325187#2 111325187#3" >
<stop busStop="4032629811" duration="30.00" until="48.0"/> <!-- Katzbachstraße/Kreuzbergstraße -->
<stop busStop="4032629819" duration="30.00" until="102.0"/> <!-- Monumentenstraße -->
<stop busStop="2029039199" duration="30.00" until="167.0"/> <!-- Dudenstraße/Katzbachstraße -->
<stop busStop="2029039146" duration="30.00" until="229.0"/> <!-- Badener Ring -->
<stop busStop="2029039199" duration="30.00" until="159.0"/> <!-- Dudenstraße/Katzbachstraße -->
<stop busStop="2029039146" duration="30.00" until="221.0"/> <!-- Badener Ring -->
</route>
<flow id="bus_104:0" type="bus" route="bus_104:0" begin="0.0" end="3600.0" period="600" line="104:0" >
<param key="name" value="Buslinie 104: Neu-Westend, Brixplatz =&gt; Stralau, Tunnelstraße &quot;(test some quotes&quot;"/>
Expand Down
8 changes: 4 additions & 4 deletions tests/tools/public_transport/ptlines2flows/begin_end/flows.tools
View file
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- generated on 2019-01-04 11:54:57.402709 by $Id$
<!-- generated on 2019-01-13 15:26:30.317408 by $Id: ptlines2flows.py 0ac7855aee evamarie.wiessner@dlr.de 2018-08-09 15:02:39 +0200 $
options: -n net.net.xml -s input_additional.add.xml -l ptlines.xml -o out.flows.xml -p 600 -b 18000 -e 20000
-->
<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
Expand Down Expand Up @@ -32,11 +32,11 @@
<stop busStop="3959807201" duration="30.00" until="72.0"/> <!-- Dudenstraße/Katzbachstraße -->
<stop busStop="3959807220" duration="30.00" until="140.0"/> <!-- Kolonnenbrücke -->
</route>
<route id="bus_140:1" edges="53356539#0 53356539#1 4710636#0 4710636#1 4710636#2 -391493952#2 391493952#2 111325187#0 111325187#1 111325187#2 111325187#3" >
<route id="bus_140:1" edges="53356539#0 53356539#1 4710636#0 4710636#1 4710636#2 111325187#0 111325187#1 111325187#2 111325187#3" >
<stop busStop="4032629811" duration="30.00" until="48.0"/> <!-- Katzbachstraße/Kreuzbergstraße -->
<stop busStop="4032629819" duration="30.00" until="102.0"/> <!-- Monumentenstraße -->
<stop busStop="2029039199" duration="30.00" until="167.0"/> <!-- Dudenstraße/Katzbachstraße -->
<stop busStop="2029039146" duration="30.00" until="229.0"/> <!-- Badener Ring -->
<stop busStop="2029039199" duration="30.00" until="159.0"/> <!-- Dudenstraße/Katzbachstraße -->
<stop busStop="2029039146" duration="30.00" until="221.0"/> <!-- Badener Ring -->
</route>
<flow id="bus_104:0" type="bus" route="bus_104:0" begin="18000.0" end="20000.0" period="600" line="104:0" >
<param key="name" value="Buslinie 104: Neu-Westend, Brixplatz =&gt; Stralau, Tunnelstraße &quot;(test some quotes&quot;"/>
Expand Down
8 changes: 4 additions & 4 deletions tests/tools/public_transport/ptlines2flows/hrtime/flows.tools
View file
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- generated on 2019-01-04 11:54:59.223332 by $Id$
<!-- generated on 2019-01-13 15:26:30.364840 by $Id: ptlines2flows.py 0ac7855aee evamarie.wiessner@dlr.de 2018-08-09 15:02:39 +0200 $
options: -n net.net.xml -s input_additional.add.xml -l ptlines.xml -o out.flows.xml -p 600 <doubleminus>human-readable-time
-->
<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
Expand Down Expand Up @@ -32,11 +32,11 @@
<stop busStop="3959807201" duration="30.00" until="00:01:12"/> <!-- Dudenstraße/Katzbachstraße -->
<stop busStop="3959807220" duration="30.00" until="00:02:20"/> <!-- Kolonnenbrücke -->
</route>
<route id="bus_140:1" edges="53356539#0 53356539#1 4710636#0 4710636#1 4710636#2 -391493952#2 391493952#2 111325187#0 111325187#1 111325187#2 111325187#3" >
<route id="bus_140:1" edges="53356539#0 53356539#1 4710636#0 4710636#1 4710636#2 111325187#0 111325187#1 111325187#2 111325187#3" >
<stop busStop="4032629811" duration="30.00" until="00:00:48"/> <!-- Katzbachstraße/Kreuzbergstraße -->
<stop busStop="4032629819" duration="30.00" until="00:01:42"/> <!-- Monumentenstraße -->
<stop busStop="2029039199" duration="30.00" until="00:02:47"/> <!-- Dudenstraße/Katzbachstraße -->
<stop busStop="2029039146" duration="30.00" until="00:03:49"/> <!-- Badener Ring -->
<stop busStop="2029039199" duration="30.00" until="00:02:39"/> <!-- Dudenstraße/Katzbachstraße -->
<stop busStop="2029039146" duration="30.00" until="00:03:41"/> <!-- Badener Ring -->
</route>
<flow id="bus_104:0" type="bus" route="bus_104:0" begin="00:00:00" end="01:00:00" period="600" line="104:0" >
<param key="name" value="Buslinie 104: Neu-Westend, Brixplatz =&gt; Stralau, Tunnelstraße &quot;(test some quotes&quot;"/>
Expand Down
8 changes: 4 additions & 4 deletions tests/tools/public_transport/ptlines2flows/parking/flows.tools
View file
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- generated on 2019-01-04 11:54:58.545677 by $Id$
<!-- generated on 2019-01-13 15:26:30.327764 by $Id: ptlines2flows.py 0ac7855aee evamarie.wiessner@dlr.de 2018-08-09 15:02:39 +0200 $
options: -n net.net.xml -s input_additional.add.xml -l ptlines.xml -o out.flows.xml -p 600 <doubleminus>bus.parking
-->
<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
Expand Down Expand Up @@ -32,11 +32,11 @@
<stop busStop="3959807201" duration="30.00" until="72.0" parking="true"/> <!-- Dudenstraße/Katzbachstraße -->
<stop busStop="3959807220" duration="30.00" until="140.0" parking="true"/> <!-- Kolonnenbrücke -->
</route>
<route id="bus_140:1" edges="53356539#0 53356539#1 4710636#0 4710636#1 4710636#2 -391493952#2 391493952#2 111325187#0 111325187#1 111325187#2 111325187#3" >
<route id="bus_140:1" edges="53356539#0 53356539#1 4710636#0 4710636#1 4710636#2 111325187#0 111325187#1 111325187#2 111325187#3" >
<stop busStop="4032629811" duration="30.00" until="48.0" parking="true"/> <!-- Katzbachstraße/Kreuzbergstraße -->
<stop busStop="4032629819" duration="30.00" until="102.0" parking="true"/> <!-- Monumentenstraße -->
<stop busStop="2029039199" duration="30.00" until="167.0" parking="true"/> <!-- Dudenstraße/Katzbachstraße -->
<stop busStop="2029039146" duration="30.00" until="229.0" parking="true"/> <!-- Badener Ring -->
<stop busStop="2029039199" duration="30.00" until="159.0" parking="true"/> <!-- Dudenstraße/Katzbachstraße -->
<stop busStop="2029039146" duration="30.00" until="221.0" parking="true"/> <!-- Badener Ring -->
</route>
<flow id="bus_104:0" type="bus" route="bus_104:0" begin="0.0" end="3600.0" period="600" line="104:0" >
<param key="name" value="Buslinie 104: Neu-Westend, Brixplatz =&gt; Stralau, Tunnelstraße &quot;(test some quotes&quot;"/>
Expand Down
8 changes: 4 additions & 4 deletions tests/tools/public_transport/ptlines2flows/pt_routes_from_ptlines_file/flows.tools
View file
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- generated on 2019-01-04 11:54:57.970942 by $Id$
<!-- generated on 2019-01-13 15:26:30.321469 by $Id: ptlines2flows.py 0ac7855aee evamarie.wiessner@dlr.de 2018-08-09 15:02:39 +0200 $
options: -n net.net.xml -s input_additional.add.xml -l ptlines.xml -o out.flows.xml -p 600 <doubleminus>use-osm-routes
-->
<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
Expand Down Expand Up @@ -32,11 +32,11 @@
<stop busStop="3959807221" duration="30.00" until="69.0"/> <!-- Kolonnenbrücke -->
<stop busStop="3959807200" duration="30.00" until="137.0"/> <!-- Dudenstraße/Katzbachstraße -->
</route>
<route id="bus_140:1" edges="53356539#0 53356539#1 4710636#0 4710636#1 4710636#2 -391493952#2 391493952#2 111325187#0 111325187#1 111325187#2 111325187#3" >
<route id="bus_140:1" edges="53356539#0 53356539#1 4710636#0 4710636#1 4710636#2 111325187#0 111325187#1 111325187#2 111325187#3" >
<stop busStop="4032629811" duration="30.00" until="48.0"/> <!-- Katzbachstraße/Kreuzbergstraße -->
<stop busStop="4032629819" duration="30.00" until="102.0"/> <!-- Monumentenstraße -->
<stop busStop="2029039199" duration="30.00" until="167.0"/> <!-- Dudenstraße/Katzbachstraße -->
<stop busStop="2029039146" duration="30.00" until="229.0"/> <!-- Badener Ring -->
<stop busStop="2029039199" duration="30.00" until="159.0"/> <!-- Dudenstraße/Katzbachstraße -->
<stop busStop="2029039146" duration="30.00" until="221.0"/> <!-- Badener Ring -->
</route>
<flow id="bus_104:0" type="bus" route="bus_104:0" begin="0.0" end="3600.0" period="600" line="104:0" >
<param key="name" value="Buslinie 104: Neu-Westend, Brixplatz =&gt; Stralau, Tunnelstraße &quot;(test some quotes&quot;"/>
Expand Down
8 changes: 4 additions & 4 deletions tests/tools/public_transport/ptlines2flows/random_begin/flows.tools
View file
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- generated on 2019-01-04 11:54:58.015070 by $Id$
<!-- generated on 2019-01-13 15:26:30.321542 by $Id: ptlines2flows.py 0ac7855aee evamarie.wiessner@dlr.de 2018-08-09 15:02:39 +0200 $
options: -n net.net.xml -s input_additional.add.xml -l ptlines.xml -o out.flows.xml -p 600 <doubleminus>random-begin <doubleminus>seed 42
-->
<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
Expand Down Expand Up @@ -32,11 +32,11 @@
<stop busStop="3959807221" duration="30.00" until="36.0"/> <!-- Kolonnenbrücke -->
<stop busStop="3959807200" duration="30.00" until="102.0"/> <!-- Dudenstraße/Katzbachstraße -->
</route>
<route id="bus_140:1" edges="53356539#0 53356539#1 4710636#0 4710636#1 4710636#2 -391493952#2 391493952#2 111325187#0 111325187#1 111325187#2 111325187#3" >
<route id="bus_140:1" edges="53356539#0 53356539#1 4710636#0 4710636#1 4710636#2 111325187#0 111325187#1 111325187#2 111325187#3" >
<stop busStop="4032629811" duration="30.00" until="48.0"/> <!-- Katzbachstraße/Kreuzbergstraße -->
<stop busStop="4032629819" duration="30.00" until="100.0"/> <!-- Monumentenstraße -->
<stop busStop="2029039199" duration="30.00" until="167.0"/> <!-- Dudenstraße/Katzbachstraße -->
<stop busStop="2029039146" duration="30.00" until="229.0"/> <!-- Badener Ring -->
<stop busStop="2029039199" duration="30.00" until="164.0"/> <!-- Dudenstraße/Katzbachstraße -->
<stop busStop="2029039146" duration="30.00" until="226.0"/> <!-- Badener Ring -->
</route>
<flow id="bus_104:0" type="bus" route="bus_104:0" begin="15.0" end="3615.0" period="600" line="104:0" >
<param key="name" value="Buslinie 104: Neu-Westend, Brixplatz =&gt; Stralau, Tunnelstraße &quot;(test some quotes&quot;"/>
Expand Down

0 comments on commit 2bfd32f

Please sign in to comment.