a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-12-24 23:15:24 +03:00
Code Issues Projects Releases Wiki Activity

Fix critical dynamic blockage math bug. Stops some crashes in some cases, including the tests -- which run again. Manually verified the turn goldenfile diff in the UI and regenerated prebaked data. #392

Browse Source
This commit is contained in:
Dustin Carlino 2021-06-21 20:37:11 -07:00
parent 8db88d0890
commit 69152f00ad
5 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
data/MANIFEST.json
View File

@ -4006,14 +4006,14 @@
"compressed_size_bytes": 25368091
},
"data/system/us/seattle/prebaked_results/arboretum/weekday.bin": {
"checksum": "ba26c21f392fa9e14cff250c8b89d491",
"uncompressed_size_bytes": 26224722,
"compressed_size_bytes": 9664855
"checksum": "2d0ff039412f3bb2fd5c86407ce3222c",
"uncompressed_size_bytes": 26224614,
"compressed_size_bytes": 9664793
},
"data/system/us/seattle/prebaked_results/lakeslice/weekday.bin": {
"checksum": "96f3c25f7b0c591f8daabe7631dbb3a6",
"uncompressed_size_bytes": 84619607,
"compressed_size_bytes": 32729687
"checksum": "888d32ff58d292a33dec572b90f47d5c",
"uncompressed_size_bytes": 84586382,
"compressed_size_bytes": 32712186
},
"data/system/us/seattle/prebaked_results/montlake/car vs bike contention.bin": {
"checksum": "a18549e88113a01b42c3bf72e740f672",
@ -4021,9 +4021,9 @@
"compressed_size_bytes": 1894
},
"data/system/us/seattle/prebaked_results/montlake/weekday.bin": {
"checksum": "2f462c8b59c738d4a16ce416f7b0fd13",
"checksum": "48772daef27a87f4f3b6507e25f86554",
"uncompressed_size_bytes": 10861730,
"compressed_size_bytes": 3825998
"compressed_size_bytes": 3825986
},
"data/system/us/seattle/prebaked_results/qa/weekday.bin": {
"checksum": "59c37f87dc12499aa2756e57c9143c4d",
@ -4031,9 +4031,9 @@
"compressed_size_bytes": 3913154
},
"data/system/us/seattle/prebaked_results/rainier_valley/weekday.bin": {
"checksum": "d3df029fcbb8b8f1cf997636728b9540",
"checksum": "e475115d36c0e7540e43fad32bc72753",
"uncompressed_size_bytes": 20375760,
"compressed_size_bytes": 7244505
"compressed_size_bytes": 7244493
},
"data/system/us/seattle/prebaked_results/wallingford/weekday.bin": {
"checksum": "edcdd10a24f8c002ec564a91cf88360e",

2
sim/src/mechanics/queue.rs
View File

@ -265,7 +265,7 @@ impl Queue {
// causes anything following the lane-changing vehicle to be able to go a
// little faster.
front: bound,
back: bound + vehicle_len,
back: bound - vehicle_len,
},
};

10
tests/goldenfiles/divided_highway_split.txt
View File

@ -1,10 +1,10 @@
TurnID(Lane #5, Lane #11, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #11, Lane #5, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #6, Lane #11, Intersection #0) is a Crosswalk
TurnID(Lane #11, Lane #6, Intersection #0) is a Crosswalk
TurnID(Lane #6, Lane #2, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #2, Lane #6, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #3, Lane #9, Intersection #0) is a Right
TurnID(Lane #4, Lane #10, Intersection #0) is a Right
TurnID(Lane #5, Lane #11, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #6, Lane #2, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #6, Lane #11, Intersection #0) is a Crosswalk
TurnID(Lane #7, Lane #1, Intersection #0) is a Right
TurnID(Lane #8, Lane #0, Intersection #0) is a Right
TurnID(Lane #11, Lane #5, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #11, Lane #6, Intersection #0) is a Crosswalk

54
tests/goldenfiles/left_turn_and_bike_lane.txt
View File

@ -1,47 +1,47 @@
TurnID(Lane #0, Lane #5, Intersection #0) is a Crosswalk
TurnID(Lane #0, Lane #22, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #1, Lane #10, Intersection #0) is a Straight
TurnID(Lane #1, Lane #11, Intersection #0) is a Straight
TurnID(Lane #1, Lane #20, Intersection #0) is a Right
TurnID(Lane #1, Lane #21, Intersection #0) is a Right
TurnID(Lane #2, Lane #10, Intersection #0) is a Straight
TurnID(Lane #2, Lane #11, Intersection #0) is a Straight
TurnID(Lane #2, Lane #15, Intersection #0) is a Left
TurnID(Lane #2, Lane #21, Intersection #0) is a Right
TurnID(Lane #5, Lane #0, Intersection #0) is a Crosswalk
TurnID(Lane #5, Lane #13, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #6, Lane #12, Intersection #0) is a Crosswalk
TurnID(Lane #6, Lane #16, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #7, Lane #3, Intersection #0) is a Straight
TurnID(Lane #7, Lane #4, Intersection #0) is a Straight
TurnID(Lane #7, Lane #15, Intersection #0) is a Right
TurnID(Lane #8, Lane #3, Intersection #0) is a Straight
TurnID(Lane #8, Lane #4, Intersection #0) is a Straight
TurnID(Lane #9, Lane #20, Intersection #0) is a Left
TurnID(Lane #9, Lane #21, Intersection #0) is a Left
TurnID(Lane #12, Lane #6, Intersection #0) is a Crosswalk
TurnID(Lane #12, Lane #17, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #13, Lane #5, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #13, Lane #16, Intersection #0) is a Crosswalk
TurnID(Lane #14, Lane #3, Intersection #0) is a Right
TurnID(Lane #14, Lane #4, Intersection #0) is a Right
TurnID(Lane #14, Lane #10, Intersection #0) is a Left
TurnID(Lane #14, Lane #11, Intersection #0) is a Left
TurnID(Lane #14, Lane #20, Intersection #0) is a Straight
TurnID(Lane #14, Lane #21, Intersection #0) is a Straight
TurnID(Lane #16, Lane #6, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #16, Lane #13, Intersection #0) is a Crosswalk
TurnID(Lane #17, Lane #12, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #17, Lane #22, Intersection #0) is a Crosswalk
TurnID(Lane #18, Lane #3, Intersection #0) is a Left
TurnID(Lane #18, Lane #4, Intersection #0) is a Left
TurnID(Lane #18, Lane #10, Intersection #0) is a Right
TurnID(Lane #18, Lane #11, Intersection #0) is a Right
TurnID(Lane #18, Lane #15, Intersection #0) is a Straight
TurnID(Lane #19, Lane #3, Intersection #0) is a Left
TurnID(Lane #19, Lane #4, Intersection #0) is a Left
TurnID(Lane #19, Lane #15, Intersection #0) is a Straight
TurnID(Lane #13, Lane #16, Intersection #0) is a Crosswalk
TurnID(Lane #16, Lane #13, Intersection #0) is a Crosswalk
TurnID(Lane #13, Lane #5, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #5, Lane #13, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #6, Lane #12, Intersection #0) is a Crosswalk
TurnID(Lane #12, Lane #6, Intersection #0) is a Crosswalk
TurnID(Lane #6, Lane #16, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #16, Lane #6, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #17, Lane #22, Intersection #0) is a Crosswalk
TurnID(Lane #22, Lane #17, Intersection #0) is a Crosswalk
TurnID(Lane #17, Lane #12, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #12, Lane #17, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #0, Lane #5, Intersection #0) is a Crosswalk
TurnID(Lane #5, Lane #0, Intersection #0) is a Crosswalk
TurnID(Lane #0, Lane #22, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #22, Lane #0, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #1, Lane #20, Intersection #0) is a Right
TurnID(Lane #7, Lane #15, Intersection #0) is a Right
TurnID(Lane #14, Lane #3, Intersection #0) is a Right
TurnID(Lane #14, Lane #4, Intersection #0) is a Right
TurnID(Lane #19, Lane #10, Intersection #0) is a Right
TurnID(Lane #19, Lane #11, Intersection #0) is a Right
TurnID(Lane #19, Lane #15, Intersection #0) is a Straight
TurnID(Lane #22, Lane #0, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #22, Lane #17, Intersection #0) is a Crosswalk
TurnID(Lane #2, Lane #15, Intersection #0) is a Left
TurnID(Lane #9, Lane #20, Intersection #0) is a Left
TurnID(Lane #14, Lane #10, Intersection #0) is a Left
TurnID(Lane #14, Lane #11, Intersection #0) is a Left
TurnID(Lane #19, Lane #3, Intersection #0) is a Left
TurnID(Lane #19, Lane #4, Intersection #0) is a Left

44
tests/goldenfiles/multiple_left_turn_lanes.txt
View File

@ -1,25 +1,9 @@
TurnID(Lane #0, Lane #4, Intersection #0) is a Crosswalk
TurnID(Lane #0, Lane #20, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #4, Lane #0, Intersection #0) is a Crosswalk
TurnID(Lane #4, Lane #15, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #5, Lane #9, Intersection #0) is a Crosswalk
TurnID(Lane #5, Lane #16, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #6, Lane #17, Intersection #0) is a Left
TurnID(Lane #6, Lane #18, Intersection #0) is a Left
TurnID(Lane #6, Lane #19, Intersection #0) is a Left
TurnID(Lane #7, Lane #1, Intersection #0) is a Straight
TurnID(Lane #7, Lane #2, Intersection #0) is a Straight
TurnID(Lane #7, Lane #3, Intersection #0) is a Straight
TurnID(Lane #7, Lane #17, Intersection #0) is a Left
TurnID(Lane #7, Lane #18, Intersection #0) is a Left
TurnID(Lane #7, Lane #19, Intersection #0) is a Left
TurnID(Lane #8, Lane #1, Intersection #0) is a Straight
TurnID(Lane #8, Lane #2, Intersection #0) is a Straight
TurnID(Lane #8, Lane #3, Intersection #0) is a Straight
TurnID(Lane #9, Lane #5, Intersection #0) is a Crosswalk
TurnID(Lane #9, Lane #10, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #10, Lane #9, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #10, Lane #15, Intersection #0) is a Crosswalk
TurnID(Lane #11, Lane #17, Intersection #0) is a Straight
TurnID(Lane #11, Lane #18, Intersection #0) is a Straight
TurnID(Lane #11, Lane #19, Intersection #0) is a Straight
@ -29,12 +13,28 @@ TurnID(Lane #12, Lane #19, Intersection #0) is a Straight
TurnID(Lane #13, Lane #17, Intersection #0) is a Straight
TurnID(Lane #13, Lane #18, Intersection #0) is a Straight
TurnID(Lane #13, Lane #19, Intersection #0) is a Straight
TurnID(Lane #15, Lane #10, Intersection #0) is a Crosswalk
TurnID(Lane #10, Lane #15, Intersection #0) is a Crosswalk
TurnID(Lane #15, Lane #4, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #4, Lane #15, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #9, Lane #5, Intersection #0) is a Crosswalk
TurnID(Lane #5, Lane #9, Intersection #0) is a Crosswalk
TurnID(Lane #9, Lane #10, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #10, Lane #9, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #16, Lane #20, Intersection #0) is a Crosswalk
TurnID(Lane #20, Lane #16, Intersection #0) is a Crosswalk
TurnID(Lane #16, Lane #5, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #5, Lane #16, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #0, Lane #4, Intersection #0) is a Crosswalk
TurnID(Lane #4, Lane #0, Intersection #0) is a Crosswalk
TurnID(Lane #0, Lane #20, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #20, Lane #0, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #14, Lane #1, Intersection #0) is a Right
TurnID(Lane #14, Lane #2, Intersection #0) is a Right
TurnID(Lane #14, Lane #3, Intersection #0) is a Right
TurnID(Lane #15, Lane #4, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #15, Lane #10, Intersection #0) is a Crosswalk
TurnID(Lane #16, Lane #5, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #16, Lane #20, Intersection #0) is a Crosswalk
TurnID(Lane #20, Lane #0, Intersection #0) is a SharedSidewalkCorner
TurnID(Lane #20, Lane #16, Intersection #0) is a Crosswalk
TurnID(Lane #6, Lane #17, Intersection #0) is a Left
TurnID(Lane #6, Lane #18, Intersection #0) is a Left
TurnID(Lane #6, Lane #19, Intersection #0) is a Left
TurnID(Lane #7, Lane #17, Intersection #0) is a Left
TurnID(Lane #7, Lane #18, Intersection #0) is a Left
TurnID(Lane #7, Lane #19, Intersection #0) is a Left