Skip to content

Commit

Permalink
patching expected results, ref #21, #14422
Browse files Browse the repository at this point in the history
  • Loading branch information
@rummel123
rummel123 committed Mar 1, 2024
1 parent ea9a912 commit abb5b85
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 38 deletions.
23 changes: 9 additions & 14 deletions tests/tools/import/MATSim/activity/routes.tools
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-02-29 10:35:20.081122 by matsim_importPlans.py v1_19_0+1082-b5e7202dbad
<!-- generated on 2024-03-01 11:39:02.991629 by matsim_importPlans.py v1_19_0+1095-b06fb687685
options: <doubleminus>plan-file matsim_plans.xml -o out.rou.xml
-->

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<vType id="car" vClass="passenger"/>
<vType id="bicycle" vClass="bicycle"/>

<trip id="100300_0" depart="triggered" fromLonLat="12.338531971825324,51.32269992163245" toLonLat="12.345381247289957,51.33019827321066"/>
<trip id="100300_1" depart="triggered" fromLonLat="12.345381247289957,51.33019827321066" toLonLat="12.351808020775046,51.33387254359802"/>
<trip id="100300_2" depart="triggered" fromLonLat="12.351808020775046,51.33387254359802" toLonLat="12.345381247289957,51.33019827321066"/>
<trip id="100300_3" depart="triggered" fromLonLat="12.345381247289957,51.33019827321066" toLonLat="12.371472066438269,51.34700028645829"/>
<trip id="100300_4" depart="triggered" fromLonLat="12.371472066438269,51.34700028645829" toLonLat="12.38180805562922,51.34009850507165"/>
<person id="100300" depart="0:0:0">
<stop lon="12.338531971825324" lat="51.32269992163245" until="07:01:00" actType="home_25200"/>
<ride lines="100300_0" toLonLat="12.345381247289957,51.33019827321066"/>
<stop lon="12.345381247289957" lat="51.33019827321066" duration="00:02:45" actType="leisure_600"/>
<ride lines="100300_1" toLonLat="12.351808020775046,51.33387254359802"/>
<stop lon="12.338531971825326" lat="51.32269992163245" until="07:01:00" actType="home_25200"/>
<ride lines="pt" toLonLat="12.345381247289955,51.33019827321066"/>
<stop lon="12.345381247289955" lat="51.33019827321066" until="07:05:45" actType="leisure_600"/>
<ride lines="pt" toLonLat="12.351808020775046,51.33387254359802"/>
<stop lon="12.351808020775046" lat="51.33387254359802" until="08:13:59" actType="other_3600"/>
<ride lines="100300_2" toLonLat="12.345381247289957,51.33019827321066"/>
<stop lon="12.345381247289957" lat="51.33019827321066" duration="00:06:35" actType="leisure_600"/>
<ride lines="100300_3" toLonLat="12.371472066438269,51.34700028645829"/>
<ride lines="pt" toLonLat="12.345381247289955,51.33019827321066"/>
<stop lon="12.345381247289955" lat="51.33019827321066" until="08:29:00" actType="leisure_600"/>
<ride lines="pt" toLonLat="12.371472066438269,51.34700028645829"/>
<stop lon="12.371472066438269" lat="51.34700028645829" until="12:07:00" actType="leisure_12000"/>
<ride lines="100300_4" toLonLat="12.38180805562922,51.34009850507165"/>
<ride lines="pt" toLonLat="12.38180805562922,51.34009850507165"/>
<stop lon="12.38180805562922" lat="51.34009850507165" until="14:00:00" actType="leisure_6000"/>
</person>
</routes>
20 changes: 10 additions & 10 deletions tests/tools/import/MATSim/coordinates/routes.tools
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-02-27 17:42:51.474891 by matsim_importPlans.py v1_19_0+1057-c5d8ddd
<!-- generated on 2024-03-01 11:39:02.989629 by matsim_importPlans.py v1_19_0+1095-b06fb687685
options: <doubleminus>plan-file matsim_plans.xml -o out.rou.xml
-->

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<vType id="car" vClass="passenger"/>
<vType id="bicycle" vClass="bicycle"/>

<trip id="0_0" depart="triggered" fromLonLat="12.441623766883094,51.30168303457315" toLonLat="12.322710508594813,51.31372681762787"/>
<trip id="0_1" depart="triggered" fromLonLat="12.322710508594813,51.31372681762787" toLonLat="12.441623766883094,51.30168303457315" type="car"/>
<trip id="0_0" depart="triggered" fromLonLat="12.441623766883094,51.301683034573145" toLonLat="12.322710508594813,51.31372681762787"/>
<trip id="0_1" depart="triggered" fromLonLat="12.322710508594813,51.31372681762787" toLonLat="12.441623766883094,51.301683034573145" type="car"/>
<person id="0" depart="0:0:0">
<stop lon="12.441623766883094" lat="51.30168303457315" until="07:33:00" actType="home"/>
<stop lon="12.441623766883094" lat="51.301683034573145" until="07:33:00" actType="home"/>
<ride lines="0_0" toLonLat="12.322710508594813,51.31372681762787"/>
<stop lon="12.322710508594813" lat="51.31372681762787" until="13:27:00" actType="work"/>
<ride lines="0_1" toLonLat="12.441623766883094,51.30168303457315"/>
<stop lon="12.441623766883094" lat="51.30168303457315" until="24:0:0" actType="home"/>
<ride lines="0_1" toLonLat="12.441623766883094,51.301683034573145"/>
<stop lon="12.441623766883094" lat="51.301683034573145" until="15:05:00" actType="home"/>
</person>
<trip id="freight_0_0" depart="triggered" fromLonLat="12.74672784602896,51.36549012982353" toLonLat="12.650802871087379,51.14080387506128"/>
<trip id="freight_0_0" depart="triggered" fromLonLat="12.74672784602896,51.365490129823534" toLonLat="12.650802871087379,51.14080387506129"/>
<person id="freight_0" depart="0:0:0">
<stop lon="12.74672784602896" lat="51.36549012982353" until="05:00:00" actType="freight_start"/>
<ride lines="freight_0_0" toLonLat="12.650802871087379,51.14080387506128"/>
<stop lon="12.650802871087379" lat="51.14080387506128" until="24:0:0" actType="freight_end"/>
<stop lon="12.74672784602896" lat="51.365490129823534" until="05:00:00" actType="freight_start"/>
<ride lines="freight_0_0" toLonLat="12.650802871087379,51.14080387506129"/>
<stop lon="12.650802871087379" lat="51.14080387506129" until="24:0:0" actType="freight_end"/>
</person>
</routes>
18 changes: 9 additions & 9 deletions tests/tools/import/MATSim/coordinates_preferred/routes.tools
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-02-29 10:48:49.809418 by matsim_importPlans.py v1_19_0+1086-c3e234239f4
<!-- generated on 2024-03-01 11:39:02.996631 by matsim_importPlans.py v1_19_0+1095-b06fb687685
options: <doubleminus>prefer-coordinate <doubleminus>plan-file matsim_plans.xml -o out.rou.xml
-->

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<vType id="car" vClass="passenger"/>
<vType id="bicycle" vClass="bicycle"/>

<trip id="0_0" depart="triggered" fromLonLat="12.441623766883094,51.30168303457315" toLonLat="12.322710508594813,51.31372681762787"/>
<trip id="0_0" depart="triggered" fromLonLat="12.441623766883094,51.301683034573145" toLonLat="12.322710508594813,51.31372681762787"/>
<vehicle id="0_1" depart="triggered" type="car">
<route edges="13758 14271 14269 14273 14468 14267 14465"/>
</vehicle>
<person id="0" depart="0:0:0">
<stop lon="12.441623766883094" lat="51.30168303457315" until="07:33:00" actType="home"/>
<stop lon="12.441623766883094" lat="51.301683034573145" until="07:33:00" actType="home"/>
<ride lines="0_0" toLonLat="12.322710508594813,51.31372681762787"/>
<stop lon="12.322710508594813" lat="51.31372681762787" until="08:00:00" actType="work"/>
<ride lines="0_1" toLonLat="12.441623766883094,51.30168303457315"/>
<stop lon="12.441623766883094" lat="51.30168303457315" until="24:0:0" actType="home"/>
<ride lines="0_1" toLonLat="12.441623766883094,51.301683034573145"/>
<stop lon="12.441623766883094" lat="51.301683034573145" until="15:05:00" actType="home"/>
</person>
<trip id="freight_0_0" depart="triggered" fromLonLat="12.74672784602896,51.36549012982353" toLonLat="12.650802871087379,51.14080387506128"/>
<trip id="freight_0_0" depart="triggered" fromLonLat="12.74672784602896,51.365490129823534" toLonLat="12.650802871087379,51.14080387506129"/>
<person id="freight_0" depart="0:0:0">
<stop lon="12.74672784602896" lat="51.36549012982353" until="05:00:00" actType="freight_start"/>
<ride lines="freight_0_0" toLonLat="12.650802871087379,51.14080387506128"/>
<stop lon="12.650802871087379" lat="51.14080387506128" until="24:0:0" actType="freight_end"/>
<stop lon="12.74672784602896" lat="51.365490129823534" until="05:00:00" actType="freight_start"/>
<ride lines="freight_0_0" toLonLat="12.650802871087379,51.14080387506129"/>
<stop lon="12.650802871087379" lat="51.14080387506129" until="24:0:0" actType="freight_end"/>
</person>
</routes>
3 changes: 1 addition & 2 deletions tests/tools/import/MATSim/import_person_plans/routes.tools
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-02-27 17:41:10.878496 by matsim_importPlans.py v1_19_0+1057-c5d8ddd
<!-- generated on 2024-03-01 11:39:02.937632 by matsim_importPlans.py v1_19_0+1095-b06fb687685
options: <doubleminus>plan-file matsim_plans.xml -o out.rou.xml
-->

Expand Down Expand Up @@ -65,7 +65,6 @@
<vehicle id="100311_0" depart="triggered" type="car">
<route edges="15445 15895 16086 16096 16094 16082 16083 14979 14982 15941 14983 9986 6388 6385 6704 6228 6212 6210 6206 1052 1166 1153 6154 5548 5516 5517 5474 5436 5402 5400 5351 5346 5288 5286 28509 5284 4242 4249 4164 28295 4168 4159 28280 28699 28298 521 28701 918 28697 926 28703 3983 28706 28247 3976 4022 3965 3924 28261 3922 7075 3832 3833 28232 3739 3738 3724 3720 3714 3054 3051 3050 3028 3041 3046 3016 28639 3000 3007 2910 2908 2897 2896 2904 6763 6723 7736 8446 8448 8387 8386 7956 8384 7944 7933 7936 6732 875 870 866 796 799 800"/>
</vehicle>
<trip id="100311_1" depart="triggered" from="800" to="15445"/>
<person id="100311" depart="00:00:00">
<param key="age" value="48"/>
<param key="carAvail" value="always"/>
Expand Down
6 changes: 3 additions & 3 deletions tests/tools/import/MATSim/vehicles_only/routes.tools
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2022-07-07 11:08:06.914713 by matsim_importPlans.py v1_13_0+1343-240e5d48340
options: <doubleminus>plan-file matsim_plans.xml -o out.rou.xml <doubleminus>vehicles-only-->
<!-- generated on 2024-03-01 11:39:02.940631 by matsim_importPlans.py v1_19_0+1095-b06fb687685
options: <doubleminus>plan-file matsim_plans.xml -o out.rou.xml <doubleminus>vehicles-only
-->

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<vType id="car" vClass="passenger"/>
Expand All @@ -28,7 +29,6 @@
<vehicle id="100311_0" depart="08:00:00" type="car">
<route edges="15445 15895 16086 16096 16094 16082 16083 14979 14982 15941 14983 9986 6388 6385 6704 6228 6212 6210 6206 1052 1166 1153 6154 5548 5516 5517 5474 5436 5402 5400 5351 5346 5288 5286 28509 5284 4242 4249 4164 28295 4168 4159 28280 28699 28298 521 28701 918 28697 926 28703 3983 28706 28247 3976 4022 3965 3924 28261 3922 7075 3832 3833 28232 3739 3738 3724 3720 3714 3054 3051 3050 3028 3041 3046 3016 28639 3000 3007 2910 2908 2897 2896 2904 6763 6723 7736 8446 8448 8387 8386 7956 8384 7944 7933 7936 6732 875 870 866 796 799 800"/>
</vehicle>
<trip id="100311_1" depart="16:42:00" from="800" to="15445"/>
<vehicle id="100009_0" depart="08:00:00" type="car">
<route edges="13758 14271 14269 14273 14468 14267 14465"/>
</vehicle>
Expand Down

0 comments on commit abb5b85

Please sign in to comment.