Skip to content

Commit

Permalink
patching expected results refs #21, #14653
Browse files Browse the repository at this point in the history
  • Loading branch information
@namdre
namdre committed Apr 3, 2024
1 parent e25d87f commit 0f914bc
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 51 deletions.
9 changes: 0 additions & 9 deletions tests/tools/import/OSM/webWizard/errors.tools
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,13 +187,4 @@ Warning: At actuated tlLogic 'joinedS_cluster_1876468341_25665883_29219439_57472
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: Person 'ped122' is jammed on edge ':1264074482_w1', time=695.00.
Warning: Person 'ped33' aborted waiting for N5:0 at busStop '1827996417'.
Warning: Person 'ped79' aborted waiting for 100:0 at busStop '271296293'.
Warning: Person 'ped185' aborted waiting for M4:1 at busStop '1633759766'.
Warning: Person 'ped131' aborted waiting for 100:0 at busStop '271296293'.
Warning: Person 'ped143' aborted waiting for S5:1 at busStop '27411231'.
Warning: Person 'ped28' aborted waiting for RE7:0 at busStop '2603331683'.
Warning: Person 'ped75' aborted waiting for S3:0 at busStop '2603331695'.
Warning: Person 'ped151' aborted waiting for S7:1 at busStop '27411231'.
Warning: Person 'ped172' aborted waiting for N2:1 at busStop '3867910421'.
6 changes: 3 additions & 3 deletions tests/tools/import/OSM/webWizard/osmbatch.tools
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
python "$SUMO_HOME/tools/ptlines2flows.py" -n osm.net.xml.gz -b 0 -e 900 -p 600 --random-begin --seed 42 --ptstops osm_stops.add.xml --ptlines osm_ptlines.xml -o osm_pt.rou.xml --ignore-errors --vtype-prefix pt_ --stopinfos-file stopinfos.xml --routes-file vehroutes.xml --trips-file trips.trips.xml --min-stops 0 --extend-to-fringe --verbose
python "$SUMO_HOME/tools/randomTrips.py" -n osm.net.xml.gz --fringe-factor 2 --insertion-density 2 -o osm.bicycle.trips.xml -r osm.bicycle.rou.xml -b 0 -e 900 --trip-attributes "departLane=\"best\"" --fringe-start-attributes "departSpeed=\"max\"" --validate --remove-loops --vehicle-class bicycle --vclass bicycle --prefix bike --max-distance 8000
python "$SUMO_HOME/tools/randomTrips.py" -n osm.net.xml.gz --fringe-factor 5 --insertion-density 6 -o osm.passenger.trips.xml -r osm.passenger.rou.xml -b 0 -e 900 --trip-attributes "departLane=\"best\"" --fringe-start-attributes "departSpeed=\"max\"" --validate --remove-loops --vehicle-class passenger --vclass passenger --prefix veh --min-distance 300 --min-distance.fringe 10 --allow-fringe.min-length 1000 --lanes
python "$SUMO_HOME/tools/randomTrips.py" -n osm.net.xml.gz --fringe-factor 1 --insertion-density 4 -o osm.pedestrian.trips.xml -r osm.pedestrian.rou.xml -b 0 -e 900 --vehicle-class pedestrian --prefix ped --persontrips --trip-attributes "modes=\"public\"" --additional-files osm_stops.add.xml,osm_pt.rou.xml --persontrip.walk-opposite-factor 0.8
python "$SUMO_HOME/tools/randomTrips.py" -n osm.net.xml.gz --fringe-factor 2 --insertion-density 2 -o osm.bicycle.trips.xml -r osm.bicycle.rou.xml -b 0 -e 900 --trip-attributes "departLane=\"best\"" --fringe-start-attributes "departSpeed=\"max\"" --validate --remove-loops --via-edge-types highway.motorway,highway.motorway_link,highway.trunk_link,highway.primary_link,highway.secondary_link,highway.tertiary_link --vehicle-class bicycle --vclass bicycle --prefix bike --max-distance 8000
python "$SUMO_HOME/tools/randomTrips.py" -n osm.net.xml.gz --fringe-factor 5 --insertion-density 6 -o osm.passenger.trips.xml -r osm.passenger.rou.xml -b 0 -e 900 --trip-attributes "departLane=\"best\"" --fringe-start-attributes "departSpeed=\"max\"" --validate --remove-loops --via-edge-types highway.motorway,highway.motorway_link,highway.trunk_link,highway.primary_link,highway.secondary_link,highway.tertiary_link --vehicle-class passenger --vclass passenger --prefix veh --min-distance 300 --min-distance.fringe 10 --allow-fringe.min-length 1000 --lanes
python "$SUMO_HOME/tools/randomTrips.py" -n osm.net.xml.gz --fringe-factor 1 --insertion-density 4 -o osm.pedestrian.trips.xml -r osm.pedestrian.rou.xml -b 0 -e 900 --vehicle-class pedestrian --prefix ped --persontrips --trip-attributes "modes=\"public\"" --additional-files osm_stops.add.xml,osm_pt.rou.xml --persontrip.walk-opposite-factor 0.8 --duarouter-weights.tls-penalty 20
python "$SUMO_HOME/tools/randomTrips.py" -n osm.net.xml.gz --fringe-factor 40 --insertion-density 1 -o osm.ship.trips.xml -r osm.ship.rou.xml -b 0 -e 900 --vehicle-class ship --vclass ship --prefix ship --fringe-start-attributes "departSpeed=\"max\"" --validate
75 changes: 37 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 (27ms).
Parsing nodes from osm-file '/home/erdm_ja/.texttest/tmp/tools.03Apr101825.158861/tools/import/OSM/webWizard/osm_bbox.osm.xml' ... done (794ms).
Parsing relations from osm-file '/home/erdm_ja/.texttest/tmp/tools.03Apr101825.158861/tools/import/OSM/webWizard/osm_bbox.osm.xml' ... done (535ms).
Parsing edges from osm-file '/home/erdm_ja/.texttest/tmp/tools.03Apr101825.158861/tools/import/OSM/webWizard/osm_bbox.osm.xml' ... done (483ms).
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).
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.03Apr101825.158861/tools/import/OSM/webWizard/test'.
Building scenario in '/home/erdm_ja/.texttest/tmp/tools.03Apr133904.422031/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,18 +172,18 @@ Success.
Success.
Success.
Written configuration to 'osm.sumocfg'
Loading net-file from '/home/erdm_ja/.texttest/tmp/tools.03Apr101825.158861/tools/import/OSM/webWizard/test/osm.net.xml.gz' ... done (256ms).
Loading additional-files from '/home/erdm_ja/.texttest/tmp/tools.03Apr101825.158861/tools/import/OSM/webWizard/test/osm.poly.xml.gz' ... done (108ms).
Loading additional-files from '/home/erdm_ja/.texttest/tmp/tools.03Apr101825.158861/tools/import/OSM/webWizard/test/osm_stops.add.xml' ... done (8ms).
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 done.
Simulation version v1_19_0+1653-1011da01c71 started with time: 0.00.
Simulation ended at time: 2806.00
Simulation version v1_19_0+1667-091da428166 started with time: 0.00.
Simulation ended at time: 2913.00
Reason: All vehicles have left the simulation.
Performance:
Duration: 1.09s
Real time factor: 2576.68
UPS: 131392.102847
UPS-Persons: 140035.812672
Duration: 1.08s
Real time factor: 2699.72
UPS: 133034.291010
UPS-Persons: 134490.268767
Vehicles:
Inserted: 408
Running: 0
Expand All @@ -192,34 +192,33 @@ Vehicles:
Persons:
Inserted: 186
Running: 0
Jammed: 1
Statistics (avg of 340):
RouteLength: 1909.75
Speed: 6.30
Duration: 344.32
WaitingTime: 61.95
TimeLoss: 125.26
Speed: 6.26
Duration: 345.63
WaitingTime: 63.71
TimeLoss: 127.28
Bike Statistics (avg of 68):
RouteLength: 1575.79
Speed: 4.18
Duration: 382.59
WaitingTime: 50.45
TimeLoss: 89.19
Speed: 4.19
Duration: 382.79
WaitingTime: 50.63
TimeLoss: 89.36
Statistics (avg of 408):
DepartDelay: 0.45
Pedestrian Statistics (avg of 412 walks):
RouteLength: 279.61
Duration: 232.32
TimeLoss: 31.82
Ride Statistics (avg of 177 rides):
WaitingTime: 106.60
RouteLength: 808.77
Duration: 104.58
Bus: 61
Train: 104
Aborted: 12
DepartDelay: 0.40
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

DijkstraRouter answered 7415 queries and explored 11.91 edges on average.
DijkstraRouter answered 6262 queries and explored 10.94 edges on average.
DijkstraRouter spent 0.01s answering queries (0.00ms on average).
DijkstraRouter answered 253 queries and explored 578.01 edges on average.
DijkstraRouter spent 0.03s answering queries (0.11ms on average).
DijkstraRouter answered 253 queries and explored 578.00 edges on average.
DijkstraRouter spent 0.04s answering queries (0.15ms on average).
2 changes: 1 addition & 1 deletion tests/tools/import/OSM/webWizard_missingEdges/osmbatch.tools
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
python "$SUMO_HOME/tools/ptlines2flows.py" -n osm.net.xml.gz -b 0 -e 900 -p 600 --random-begin --seed 42 --ptstops osm_stops.add.xml --ptlines osm_ptlines.xml -o osm_pt.rou.xml --ignore-errors --vtype-prefix pt_ --stopinfos-file stopinfos.xml --routes-file vehroutes.xml --trips-file trips.trips.xml --min-stops 0 --extend-to-fringe --verbose
python "$SUMO_HOME/tools/randomTrips.py" -n osm.net.xml.gz --fringe-factor 2 --insertion-density 2 -o osm.bicycle.trips.xml -r osm.bicycle.rou.xml -b 0 -e 900 --trip-attributes "departLane=\"best\"" --fringe-start-attributes "departSpeed=\"max\"" --validate --remove-loops --via-edge-types highway.motorway,highway.motorway_link,highway.trunk_link,highway.primary_link,highway.secondary_link,highway.tertiary_link --vehicle-class bicycle --vclass bicycle --prefix bike --max-distance 8000
python "$SUMO_HOME/tools/randomTrips.py" -n osm.net.xml.gz --fringe-factor 1 --insertion-density 4 -o osm.pedestrian.trips.xml -r osm.pedestrian.rou.xml -b 0 -e 900 --vehicle-class pedestrian --prefix ped --persontrips --trip-attributes "modes=\"public\"" --additional-files osm_stops.add.xml,osm_pt.rou.xml --persontrip.walk-opposite-factor 0.8
python "$SUMO_HOME/tools/randomTrips.py" -n osm.net.xml.gz --fringe-factor 1 --insertion-density 4 -o osm.pedestrian.trips.xml -r osm.pedestrian.rou.xml -b 0 -e 900 --vehicle-class pedestrian --prefix ped --persontrips --trip-attributes "modes=\"public\"" --additional-files osm_stops.add.xml,osm_pt.rou.xml --persontrip.walk-opposite-factor 0.8 --duarouter-weights.tls-penalty 20
python "$SUMO_HOME/tools/randomTrips.py" -n osm.net.xml.gz --fringe-factor 40 --insertion-density 1 -o osm.ship.trips.xml -r osm.ship.rou.xml -b 0 -e 900 --vehicle-class ship --vclass ship --prefix ship --fringe-start-attributes "departSpeed=\"max\"" --validate

0 comments on commit 0f914bc

Please sign in to comment.