Skip to content

Commit

Permalink
patching expected results refs #21, #14692
Browse files Browse the repository at this point in the history
  • Loading branch information
@namdre
namdre committed Apr 10, 2024
1 parent a6e70e9 commit f7a8355
Show file tree
Hide file tree
Showing 6 changed files with 86 additions and 90 deletions.
1 change: 1 addition & 0 deletions tests/sumo/bugs/10xxx/ticket10637/errors.sumo
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Warning: At actuated tlLogic 'Rudolfplatz', linkIndex 37 has no controlling detector.
1 change: 0 additions & 1 deletion tests/sumo/extended/bidiEdge/multilane/errors.sumo
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
Warning: Edge '-218797686#0s' and bidi edge '218797686#0s' have no matching bidi lanes
Warning: Missing green phase in tlLogic 'joinedS_3366619456_cluster_1652675105_1704693841_2169462573_3366620150_#7more', program '0' for tl-index 6.
Warning: At actuated tlLogic 'joinedS_3366619456_cluster_1652675105_1704693841_2169462573_3366620150_#7more', actuated phase 2 has no controlling detector.
1 change: 0 additions & 1 deletion tests/sumo/tls/actuated/right_turn_crossing_usable/errors.sumo
View file
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
Warning: At actuated tlLogic 'C', actuated phase 5 has no controlling detector.
34 changes: 15 additions & 19 deletions tests/tools/import/OSM/webWizard/errors.tools
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,15 +130,13 @@ Warning: Unequal lengths of bidi lane ':1633759847_1_0' and lane ':1633759847_2_
Warning: Unequal lengths of bidi lane ':30731492_0_0' and lane ':30731492_3_0' (17.32 != 17.16).
Warning: Unequal lengths of bidi lane ':311264846_3_0' and lane ':311264846_0_0' (13.48 != 9.46).
Warning: Unequal lengths of bidi lane ':4213903960_0_0' and lane ':4213903960_7_0' (9.74 != 5.31).
Warning: At actuated tlLogic 'GS_25662542', linkIndex 13 has no controlling detector.
Warning: At actuated tlLogic 'GS_25662542', linkIndex 14 has no controlling detector.
Warning: At actuated tlLogic 'GS_25662542', linkIndex 15 has no controlling detector.
Warning: At actuated tlLogic 'cluster_160503146_27411250_5372980361_5727160044_#1more', actuated phase 4 has no controlling detector.
Warning: At actuated tlLogic 'cluster_1673527224_1673527227_21487161_303436603_#9more', linkIndex 8 has no controlling detector.
Warning: At actuated tlLogic 'cluster_1673527224_1673527227_21487161_303436603_#9more', linkIndex 9 has no controlling detector.
Warning: At actuated tlLogic 'cluster_21432801_2938442114_295705005_3139140896_#6more', actuated phase 6 has no controlling detector.
Warning: At actuated tlLogic 'cluster_1673527224_1673527227_21487161_303436603_#9more', linkIndex 10 has no controlling detector.
Warning: At actuated tlLogic 'cluster_1673527224_1673527227_21487161_303436603_#9more', linkIndex 30 has no controlling detector.
Warning: At actuated tlLogic 'joinedS_1840326421_cluster_1828018077_1828018093_1828018094_1828018095_#5more', linkIndex 2 has no controlling detector.
Warning: busStop '30731700' on lane '167272531#9_0' is too short for vehicle '21_tram_12:1'.
Warning: 24 total messages of type: At actuated tlLogic '%', linkIndex % has no controlling detector.
Warning: 18 total messages of type: At actuated tlLogic '%', linkIndex % has no controlling detector.
Warning: 18 total messages of type: Unequal lengths of bidi lane '%' and lane '%' (% != %).
Warning: Unequal lengths of bidi lane ':1633112625_2_0' and lane ':1633112625_1_0' (17.11 != 16.87).
Warning: Unequal lengths of bidi lane ':1633759847_1_0' and lane ':1633759847_2_0' (18.18 != 18.04).
Expand All @@ -158,14 +156,10 @@ Warning: Unequal lengths of bidi lane ':cluster_1668685163_262478055_3253177076_
Warning: Unequal lengths of bidi lane ':cluster_25664673_4590472030_4590472039_4590472040_4_0' and lane ':cluster_25664673_4590472030_4590472039_4590472040_3_0' (30.14 != 30.13).
Warning: Unequal lengths of bidi lane ':cluster_30731510_588181257_588181258_588181259_1_0' and lane ':cluster_30731510_588181257_588181258_588181259_6_0' (33.10 != 28.85).
Warning: Unequal lengths of bidi lane ':cluster_30731510_588181257_588181258_588181259_2_0' and lane ':cluster_30731510_588181257_588181258_588181259_5_0' (33.14 != 29.02).
Warning: At actuated tlLogic 'GS_25662542', linkIndex 13 has no controlling detector.
Warning: At actuated tlLogic 'GS_25662542', linkIndex 14 has no controlling detector.
Warning: At actuated tlLogic 'GS_25662542', linkIndex 15 has no controlling detector.
Warning: At actuated tlLogic 'cluster_160503146_27411250_5372980361_5727160044_#1more', actuated phase 4 has no controlling detector.
Warning: At actuated tlLogic 'cluster_1673527224_1673527227_21487161_303436603_#9more', linkIndex 8 has no controlling detector.
Warning: At actuated tlLogic 'cluster_1673527224_1673527227_21487161_303436603_#9more', linkIndex 9 has no controlling detector.
Warning: At actuated tlLogic 'cluster_1673527224_1673527227_21487161_303436603_#9more', linkIndex 10 has no controlling detector.
Warning: At actuated tlLogic 'cluster_21432801_2938442114_295705005_3139140896_#6more', actuated phase 6 has no controlling detector.
Warning: At actuated tlLogic 'cluster_1673527224_1673527227_21487161_303436603_#9more', linkIndex 30 has no controlling detector.
Warning: At actuated tlLogic 'joinedS_1840326421_cluster_1828018077_1828018093_1828018094_1828018095_#5more', linkIndex 2 has no controlling detector.
Warning: At actuated tlLogic 'joinedS_1840326421_cluster_1828018077_1828018093_1828018094_1828018095_#5more', linkIndex 8 has no controlling detector.
Warning: At actuated tlLogic 'joinedS_1840326421_cluster_1828018077_1828018093_1828018094_1828018095_#5more', linkIndex 9 has no controlling detector.
Expand All @@ -174,17 +168,19 @@ Warning: At actuated tlLogic 'joinedS_1840326421_cluster_1828018077_1828018093_1
Warning: At actuated tlLogic 'joinedS_1840326421_cluster_1828018077_1828018093_1828018094_1828018095_#5more', linkIndex 32 has no controlling detector.
Warning: At actuated tlLogic 'joinedS_1840326421_cluster_1828018077_1828018093_1828018094_1828018095_#5more', linkIndex 33 has no controlling detector.
Warning: At actuated tlLogic 'joinedS_1840326421_cluster_1828018077_1828018093_1828018094_1828018095_#5more', linkIndex 34 has no controlling detector.
Warning: At actuated tlLogic 'joinedS_2480337678_4566145597_cluster_21487209_3831343134_cluster_4566145593_4566145594_5747234975_768074054', linkIndex 6 has no controlling detector.
Warning: At actuated tlLogic 'joinedS_2480337678_4566145597_cluster_21487209_3831343134_cluster_4566145593_4566145594_5747234975_768074054', linkIndex 7 has no controlling detector.
Warning: At actuated tlLogic 'joinedS_2480337678_4566145597_cluster_21487209_3831343134_cluster_4566145593_4566145594_5747234975_768074054', linkIndex 8 has no controlling detector.
Warning: At actuated tlLogic 'joinedS_2480337678_4566145597_cluster_21487209_3831343134_cluster_4566145593_4566145594_5747234975_768074054', linkIndex 9 has no controlling detector.
Warning: At actuated tlLogic 'joinedS_2480337678_4566145597_cluster_21487209_3831343134_cluster_4566145593_4566145594_5747234975_768074054', linkIndex 10 has no controlling detector.
Warning: At actuated tlLogic 'joinedS_2480337678_4566145597_cluster_21487209_3831343134_cluster_4566145593_4566145594_5747234975_768074054', linkIndex 11 has no controlling detector.
Warning: At actuated tlLogic 'joinedS_2480337678_4566145597_cluster_21487209_3831343134_cluster_4566145593_4566145594_5747234975_768074054', linkIndex 12 has no controlling detector.
Warning: At actuated tlLogic 'joinedS_2480337678_4566145597_cluster_21487209_3831343134_cluster_4566145593_4566145594_5747234975_768074054', linkIndex 13 has no controlling detector.
Warning: At actuated tlLogic 'joinedS_cluster_1876468341_25665883_29219439_5747234980_#4more_cluster_262469634_29219441_961875301_961875308_#2more', linkIndex 5 has no controlling detector.
Warning: At actuated tlLogic 'joinedS_cluster_1876468341_25665883_29219439_5747234980_#4more_cluster_262469634_29219441_961875301_961875308_#2more', linkIndex 6 has no controlling detector.
Warning: At actuated tlLogic 'joinedS_cluster_1876468341_25665883_29219439_5747234980_#4more_cluster_262469634_29219441_961875301_961875308_#2more', linkIndex 16 has no controlling detector.
Warning: At actuated tlLogic 'joinedS_cluster_1876468341_25665883_29219439_5747234980_#4more_cluster_262469634_29219441_961875301_961875308_#2more', linkIndex 24 has no controlling detector.
Warning: At actuated tlLogic 'joinedS_cluster_1876468341_25665883_29219439_5747234980_#4more_cluster_262469634_29219441_961875301_961875308_#2more', linkIndex 32 has no controlling detector.
Warning: At actuated tlLogic 'joinedS_cluster_1876468341_25665883_29219439_5747234980_#4more_cluster_262469634_29219441_961875301_961875308_#2more', linkIndex 33 has no controlling detector.
Warning: busStop '30731700' on lane '167272531#9_0' is too short for vehicle 'pt_tram_12:1.0'.
Warning: Teleporting vehicle 'pt_tram_M2:0.1'; frontal collision with vehicle 'pt_tram_M2:3.0', lane='148458500#0_0', gap=-1.00, time=476.00 stage=move.
Warning: Vehicle 'pt_tram_M2:0.1' ends teleporting on edge '148458500#1', time=480.00.
Warning: Teleporting vehicle 'bike45'; waited too long (wrong lane), lane='24992428_1', time=1013.00.
Warning: Vehicle 'bike45' ends teleporting on edge '606078065', time=1013.00.
Warning: Teleporting vehicle 'bike55'; waited too long (wrong lane), lane='24992428_1', time=1014.00.
Warning: Vehicle 'bike55' ends teleporting on edge '81112790#1', time=1014.00.
Warning: Person 'ped155' is jammed on edge ':cluster_611334710_611335401_w0', time=1167.00.
Warning: Person 'ped185' aborted waiting for M4:1 at busStop '1633759766'.
Warning: Person 'ped81' aborted waiting for S3:0 at busStop '2603331695'.
77 changes: 39 additions & 38 deletions tests/tools/import/OSM/webWizard/output.tools
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Success.
Written configuration to 'osm.polycfg'
Parsing network projection from 'osm.net.xml.gz' ... done (7ms).
Parsing nodes from osm-file '/home/erdm_ja/.texttest/tmp/tools.03Apr133904.422031/tools/import/OSM/webWizard/osm_bbox.osm.xml' ... done (269ms).
Parsing relations from osm-file '/home/erdm_ja/.texttest/tmp/tools.03Apr133904.422031/tools/import/OSM/webWizard/osm_bbox.osm.xml' ... done (168ms).
Parsing edges from osm-file '/home/erdm_ja/.texttest/tmp/tools.03Apr133904.422031/tools/import/OSM/webWizard/osm_bbox.osm.xml' ... done (184ms).
Parsing nodes from osm-file '/home/erdm_ja/.texttest/tmp/tools.10Apr172720.3592776/tools/import/OSM/webWizard/osm_bbox.osm.xml' ... done (254ms).
Parsing relations from osm-file '/home/erdm_ja/.texttest/tmp/tools.10Apr172720.3592776/tools/import/OSM/webWizard/osm_bbox.osm.xml' ... done (173ms).
Parsing edges from osm-file '/home/erdm_ja/.texttest/tmp/tools.10Apr172720.3592776/tools/import/OSM/webWizard/osm_bbox.osm.xml' ... done (189ms).
Assembled polygon from relation '3619' (name:Altes Museum)
Assembled polygon from relation '6647' (name:Humboldt-Universität zu Berlin)
Assembled polygon from relation '23745' (name:Altes Stadthaus)
Expand Down Expand Up @@ -141,7 +141,7 @@ Assembled polygon from relation '8249214' (name:Hof V)
Assembled polygon from relation '8249215' (name:)
Assembled polygon from relation '8249216' (name:)
Success.
Building scenario in '/home/erdm_ja/.texttest/tmp/tools.03Apr133904.422031/tools/import/OSM/webWizard/test'.
Building scenario in '/home/erdm_ja/.texttest/tmp/tools.10Apr172720.3592776/tools/import/OSM/webWizard/test'.
generating trips...
Skipping line '2194813' because it only drives at night
Skipping line '2194814' because it only drives at night
Expand Down Expand Up @@ -172,53 +172,54 @@ Success.
Success.
Success.
Written configuration to 'osm.sumocfg'
Loading net-file from '/home/erdm_ja/.texttest/tmp/tools.03Apr133904.422031/tools/import/OSM/webWizard/test/osm.net.xml.gz' ... done (245ms).
Loading additional-files from '/home/erdm_ja/.texttest/tmp/tools.03Apr133904.422031/tools/import/OSM/webWizard/test/osm.poly.xml.gz' ... done (102ms).
Loading additional-files from '/home/erdm_ja/.texttest/tmp/tools.03Apr133904.422031/tools/import/OSM/webWizard/test/osm_stops.add.xml' ... done (8ms).
Loading net-file from '/home/erdm_ja/.texttest/tmp/tools.10Apr172720.3592776/tools/import/OSM/webWizard/test/osm.net.xml.gz' ... done (300ms).
Loading additional-files from '/home/erdm_ja/.texttest/tmp/tools.10Apr172720.3592776/tools/import/OSM/webWizard/test/osm.poly.xml.gz' ... done (108ms).
Loading additional-files from '/home/erdm_ja/.texttest/tmp/tools.10Apr172720.3592776/tools/import/OSM/webWizard/test/osm_stops.add.xml' ... done (8ms).
Loading done.
Simulation version v1_19_0+1667-091da428166 started with time: 0.00.
Simulation ended at time: 2913.00
Simulation version v1_19_0+1758-4e21544a219 started with time: 0.00.
Simulation ended at time: 2820.00
Reason: All vehicles have left the simulation.
Performance:
Duration: 1.08s
Real time factor: 2699.72
UPS: 133034.291010
UPS-Persons: 134490.268767
Duration: 1.20s
Real time factor: 2355.89
UPS: 120243.107769
UPS-Persons: 122344.193818
Vehicles:
Inserted: 408
Running: 0
Waiting: 0
Teleports: 1 (Collisions: 1)
Teleports: 3 (Collisions: 1, Wrong Lane: 2)
Persons:
Inserted: 186
Running: 0
Jammed: 1
Statistics (avg of 340):
RouteLength: 1909.75
Speed: 6.26
Duration: 345.63
WaitingTime: 63.71
TimeLoss: 127.28
RouteLength: 1909.78
Speed: 6.27
Duration: 345.09
WaitingTime: 63.56
TimeLoss: 127.01
Bike Statistics (avg of 68):
RouteLength: 1575.79
Speed: 4.19
Duration: 382.79
WaitingTime: 50.63
TimeLoss: 89.36
RouteLength: 1574.96
Speed: 4.14
Duration: 391.18
WaitingTime: 59.69
TimeLoss: 97.95
Statistics (avg of 408):
DepartDelay: 0.40
DepartDelay: 0.44
Pedestrian Statistics (avg of 455 walks):
RouteLength: 254.53
Duration: 210.22
TimeLoss: 27.11
Ride Statistics (avg of 182 rides):
WaitingTime: 123.78
RouteLength: 896.63
Duration: 117.93
Bus: 69
Train: 112
Aborted: 1
RouteLength: 254.87
Duration: 210.09
TimeLoss: 26.74
Ride Statistics (avg of 181 rides):
WaitingTime: 126.04
RouteLength: 888.93
Duration: 115.46
Bus: 67
Train: 111
Aborted: 3

DijkstraRouter answered 6262 queries and explored 10.94 edges on average.
DijkstraRouter answered 6103 queries and explored 10.41 edges on average.
DijkstraRouter spent 0.01s answering queries (0.00ms on average).
DijkstraRouter answered 253 queries and explored 578.00 edges on average.
DijkstraRouter spent 0.04s answering queries (0.15ms on average).
DijkstraRouter answered 253 queries and explored 578.03 edges on average.
DijkstraRouter spent 0.07s answering queries (0.26ms on average).

0 comments on commit f7a8355

Please sign in to comment.