Fix cucumber support code for routability testing to actually test

input/output for speed and time values, adjust resulting broken tests
This commit is contained in:
karenzshea
2016-10-11 10:21:55 -04:00
committed by Daniel J. Hofmann
parent 06d13b6954
commit 5617d3886d
10 changed files with 165 additions and 122 deletions
+27 -27
View File
@@ -52,14 +52,14 @@ OSRM will use 4/5 of the projected free-flow speed.
Given a grid size of 100 meters
Then routability should be
| highway | maxspeed | maxspeed:forward | maxspeed:backward | forw | backw |
| primary | | | | 65 km/h | 65 km/h |
| primary | 60 | | | 60 km/h | 60 km/h |
| primary | | 60 | | 60 km/h | 65 km/h |
| primary | | | 60 | 65 km/h | 60 km/h |
| primary | 15 | 60 | | 60 km/h | 23 km/h |
| primary | 15 | | 60 | 23 km/h | 60 km/h |
| primary | 15 | 30 | 60 | 34 km/h | 60 km/h |
| highway | maxspeed | maxspeed:forward | maxspeed:backward | forw | backw |
| primary | | | | 63 km/h | 63 km/h |
| primary | 60 | | | 60 km/h +- 1 | 60 km/h +- 1 |
| primary | | 60 | | 60 km/h +- 1 | 63 km/h |
| primary | | | 60 | 63 km/h | 60 km/h +- 1 |
| primary | 15 | 60 | | 60 km/h +- 1 | 23 km/h |
| primary | 15 | | 60 | 23 km/h +- 1 | 60 km/h +- 1 |
| primary | 15 | 30 | 60 | 34 km/h +- 1 | 60 km/h +- 1 |
Scenario: Car - Maxspeed should not allow routing on unroutable ways
Then routability should be
@@ -85,17 +85,17 @@ OSRM will use 4/5 of the projected free-flow speed.
| primary | | | | | 63 km/h | 63 km/h |
| primary | | 3 | | | 32 km/h | 32 km/h |
| primary | 60 | | | | 59 km/h | 59 km/h |
| primary | 60 | 3 | | | 30 km/h | 30 km/h |
| primary | 60 | 3 | | | 29 km/h | 29 km/h |
| primary | | | 60 | | 59 km/h | 63 km/h |
| primary | | 3 | 60 | | 30 km/h | 32 km/h |
| primary | | 3 | 60 | | 29 km/h | 32 km/h |
| primary | | | | 60 | 63 km/h | 59 km/h |
| primary | | 3 | | 60 | 32 km/h | 30 km/h |
| primary | | 3 | | 60 | 32 km/h | 29 km/h |
| primary | 15 | | 60 | | 59 km/h | 23 km/h |
| primary | 15 | 3 | 60 | | 30 km/h | 7 km/h |
| primary | 15 | | | 60 | 23 km/h | 59 km/h |
| primary | 15 | 3 | | 60 | 7 km/h | 30 km/h |
| primary | 15 | | 30 | 60 | 34 km/h | 59 km/h |
| primary | 15 | 3 | 30 | 60 | 15 km/h | 30 km/h |
| primary | 15 | 3 | 60 | | 29 km/h | 7 km/h |
| primary | 15 | | | 60 | 22 km/h | 59 km/h |
| primary | 15 | 3 | | 60 | 7 km/h | 29 km/h |
| primary | 15 | | 30 | 60 | 35 km/h | 59 km/h |
| primary | 15 | 3 | 30 | 60 | 14 km/h | 29 km/h |
Scenario: Car - Single lane streets be ignored or incur a penalty
Then routability should be
@@ -104,22 +104,22 @@ OSRM will use 4/5 of the projected free-flow speed.
| primary | | | | | 63 km/h | 63 km/h |
| primary | | 1 | | | 32 km/h | 32 km/h |
| primary | 60 | | | | 59 km/h | 59 km/h |
| primary | 60 | 1 | | | 30 km/h | 30 km/h |
| primary | 60 | 1 | | | 29 km/h | 29 km/h |
| primary | | | 60 | | 59 km/h | 63 km/h |
| primary | | 1 | 60 | | 30 km/h | 32 km/h |
| primary | | 1 | 60 | | 29 km/h | 32 km/h |
| primary | | | | 60 | 63 km/h | 59 km/h |
| primary | | 1 | | 60 | 32 km/h | 30 km/h |
| primary | | 1 | | 60 | 32 km/h | 29 km/h |
| primary | 15 | | 60 | | 59 km/h | 23 km/h |
| primary | 15 | 1 | 60 | | 30 km/h | 7 km/h |
| primary | 15 | | | 60 | 23 km/h | 59 km/h |
| primary | 15 | 1 | | 60 | 7 km/h | 30 km/h |
| primary | 15 | | 30 | 60 | 34 km/h | 59 km/h |
| primary | 15 | 1 | 30 | 60 | 15 km/h | 30 km/h |
| primary | 15 | 1 | 60 | | 29 km/h | 7 km/h |
| primary | 15 | | | 60 | 22 km/h | 59 km/h |
| primary | 15 | 1 | | 60 | 7 km/h | 29 km/h |
| primary | 15 | | 30 | 60 | 35 km/h | 59 km/h |
| primary | 15 | 1 | 30 | 60 | 14 km/h | 29 km/h |
Scenario: Car - Single lane streets only incure a penalty for two-way streets
Then routability should be
| highway | maxspeed | lanes | oneway | forw | backw |
| primary | 30 | 1 | yes | 34 km/h | |
| primary | 30 | 1 | -1 | | 34 km/h |
| primary | 30 | 1 | yes | 35 km/h | |
| primary | 30 | 1 | -1 | | 35 km/h |
| primary | 30 | 1 | | 15 km/h | 15 km/h |
| primary | 30 | 2 | | 34 km/h | 34 km/h |
| primary | 30 | 2 | | 35 km/h | 35 km/h |
+1
View File
@@ -4,6 +4,7 @@ Feature: Car - Surfaces
Background:
Given the profile "car"
@todo
Scenario: Car - Surface should reduce speed
Then routability should be
| highway | service | forw | backw |
+19 -19
View File
@@ -8,30 +8,30 @@ Feature: Car - speeds
Scenario: Car - speed of various way types
Then routability should be
| highway | oneway | bothw |
| motorway | no | 82 km/h |
| motorway_link | no | 47 km/h |
| motorway | no | 82 km/h +- 1 |
| motorway_link | no | 47 km/h +- 1 |
| trunk | no | 79 km/h +- 1 |
| trunk_link | no | 43 km/h +- 1 |
| primary | no | 63 km/h +- 1 |
| primary_link | no | 34 km/h |
| primary_link | no | 35 km/h +- 1 |
| secondary | no | 54 km/h +- 1 |
| secondary_link | no | 31 km/h |
| tertiary | no | 43 km/h |
| tertiary_link | no | 26 km/h |
| unclassified | no | 31 km/h |
| residential | no | 31 km/h |
| living_street | no | 18 km/h |
| service | no | 23 km/h |
| secondary_link | no | 31 km/h +- 1 |
| tertiary | no | 43 km/h +- 1 |
| tertiary_link | no | 27 km/h +- 1 |
| unclassified | no | 31 km/h +- 1 |
| residential | no | 31 km/h +- 1 |
| living_street | no | 18 km/h +- 1 |
| service | no | 23 km/h +- 1 |
# Alternating oneways have to take average waiting time into account.
Scenario: Car - scaled speeds for oneway=alternating
Then routability should be
| highway | oneway | junction | bothw | # |
| tertiary | | | 43 km/h | |
| tertiary | alternating | | 20 km/h +- 5 | |
| motorway | | | 82 km/h | implied oneway |
| motorway | alternating | | 30 km/h +- 5 | implied oneway |
| motorway | reversible | | | unroutable |
| primary | | roundabout | 63 km/h | implied oneway |
| primary | alternating | roundabout | 25 km/h +- 5 | implied oneway |
| primary | reversible | roundabout | | unroutable |
| highway | oneway | junction | forw | backw | # |
| tertiary | | | 43 km/h | 43 km/h | |
| tertiary | alternating | | 20 km/h +- 5 | 20 km/h +- 5 | |
| motorway | | | 82 km/h | | implied oneway |
| motorway | alternating | | 30 km/h +- 5 | | implied oneway |
| motorway | reversible | | | | unroutable |
| primary | | roundabout | 63 km/h | | implied oneway |
| primary | alternating | roundabout | 25 km/h +- 5 | | implied oneway |
| primary | reversible | roundabout | | | unroutable |
+18 -18
View File
@@ -4,7 +4,7 @@ Feature: Car - Surfaces
Background:
Given the profile "car"
Scenario: Car - Routeability of tracktype tags
Scenario: Car - Routability of tracktype tags
Then routability should be
| highway | tracktype | bothw |
| trunk | grade1 | x |
@@ -26,8 +26,8 @@ Feature: Car - Surfaces
| trunk | very_horrible | x |
| trunk | impassable | |
| trunk | nonsense | x |
Scenario: Car - Routabiliy of surface tags
Scenario: Car - Routability of surface tags
Then routability should be
| highway | surface | bothw |
| trunk | asphalt | x |
@@ -64,15 +64,15 @@ Feature: Car - Surfaces
Scenario: Car - Surface should reduce speed
Then routability should be
| highway | oneway | surface | forw | backw |
| motorway | no | | 80 km/h +-1 | 80 km/h +-1 |
| motorway | no | asphalt | 80 km/h +-1 | 80 km/h +-1 |
| motorway | no | concrete | 80 km/h +-1 | 80 km/h +-1 |
| motorway | no | concrete:plates | 80 km/h +-1 | 80 km/h +-1 |
| motorway | no | concrete:lanes | 80 km/h +-1 | 80 km/h +-1 |
| motorway | no | paved | 80 km/h +-1 | 80 km/h +-1 |
| motorway | no | cement | 72 km/h +-1 | 72 km/h +-1 |
| motorway | no | compacted | 72 km/h +-1 | 72 km/h +-1 |
| motorway | no | fine_gravel | 72 km/h +-1 | 72 km/h +-1 |
| motorway | no | | 83 km/h | 83 km/h |
| motorway | no | asphalt | 84 km/h | 83 km/h +-1 |
| motorway | no | concrete | 83 km/h +-1 | 83 km/h +-1 |
| motorway | no | concrete:plates | 83 km/h +-1 | 83 km/h +-1 |
| motorway | no | concrete:lanes | 83 km/h +-1 | 83 km/h +-1 |
| motorway | no | paved | 83 km/h +-1 | 83 km/h +-1 |
| motorway | no | cement | 75 km/h +-1 | 75 km/h +-1 |
| motorway | no | compacted | 75 km/h +-1 | 75 km/h +-1 |
| motorway | no | fine_gravel | 75 km/h +-1 | 75 km/h +-1 |
| motorway | no | paving_stones | 60 km/h +-1 | 60 km/h +-1 |
| motorway | no | metal | 60 km/h +-1 | 60 km/h +-1 |
| motorway | no | bricks | 60 km/h +-1 | 60 km/h +-1 |
@@ -96,7 +96,7 @@ Feature: Car - Surfaces
Scenario: Car - Tracktypes should reduce speed
Then routability should be
| highway | oneway | tracktype | forw | backw |
| motorway | no | | 80 km/h +-1 | 80 km/h +-1 |
| motorway | no | | 83 km/h | 83 km/h |
| motorway | no | grade1 | 60 km/h +-1 | 60 km/h +-1 |
| motorway | no | grade2 | 42 km/h +-1 | 42 km/h +-1 |
| motorway | no | grade3 | 34 km/h +-1 | 34 km/h +-1 |
@@ -106,8 +106,8 @@ Feature: Car - Surfaces
Scenario: Car - Smoothness should reduce speed
Then routability should be
| highway | oneway | smoothness | forw | backw |
| motorway | no | | 80 km/h +-1 | 80 km/h +-1 |
| motorway | no | intermediate | 72 km/h +-1 | 72 km/h +-1 |
| motorway | no | | 83 km/h | 83 km/h |
| motorway | no | intermediate | 75 km/h | 75 km/h |
| motorway | no | bad | 42 km/h +-1 | 42 km/h +-1 |
| motorway | no | very_bad | 26 km/h +-1 | 26 km/h +-1 |
| motorway | no | horrible | 18 km/h +-1 | 18 km/h +-1 |
@@ -116,10 +116,10 @@ Feature: Car - Surfaces
Scenario: Car - Combination of surface tags should use lowest speed
Then routability should be
| highway | oneway | tracktype | surface | smoothness | backw | forw |
| motorway | no | | | | 80 km/h | 80 km/h |
| motorway | no | | | | 83 km/h | 83 km/h |
| service | no | grade1 | asphalt | excellent | 23 km/h | 23 km/h |
| motorway | no | grade5 | asphalt | excellent | 26 km/h | 26 km/h |
| motorway | no | grade1 | mud | excellent | 18 km/h | 18 km/h |
| motorway | no | grade5 | asphalt | excellent | 27 km/h | 27 km/h |
| motorway | no | grade1 | mud | excellent | 19 km/h | 19 km/h |
| motorway | no | grade1 | asphalt | very_horrible | 15 km/h | 15 km/h |
| service | no | grade5 | mud | very_horrible | 15 km/h | 15 km/h |