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

update some lights and allow a little more box-blocking. making it to

Browse Source 
5pm on lakeslice, no regressions elsewhere. officially cutover to
nofixes version of 23rd
This commit is contained in:
Dustin Carlino 2020-04-29 17:20:33 -07:00
parent 71ab388b47
commit 2570db2501
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -2654,7 +2654,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "seattle_traffic_signals" name = "seattle_traffic_signals"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/dabreegster/seattle_traffic_signals#2d1999d546f2cd824624691bb13914a537f3422a" source = "git+https://github.com/dabreegster/seattle_traffic_signals#e10ddcdd47f63de669dcc859b60f360f65a62fd2"
dependencies = [ dependencies = [
"include_dir 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "include_dir 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",

6
data/MANIFEST.txt
View File

@ -231,19 +231,19 @@ c55340dc3995e32952b8fc624b02fd4d data/system/maps/huge_seattle.bin
2ce839572159c8819b17ca87502fd063 data/system/maps/ballard.bin 2ce839572159c8819b17ca87502fd063 data/system/maps/ballard.bin
20c561149888a0732a3c2d5ccad41f5f data/system/maps/downtown.bin 20c561149888a0732a3c2d5ccad41f5f data/system/maps/downtown.bin
1758395b40afff3606e2109c099175b5 data/system/maps/caphill.bin 1758395b40afff3606e2109c099175b5 data/system/maps/caphill.bin
d2c74c3ba79fab0cf7d59a1d1816e364 data/system/maps/lakeslice.bin b93a9dfb7d76a9138c8b8e36295860ba data/system/maps/lakeslice.bin
4961886805fc8a5576a37cffc6adc9be data/system/maps/huge_austin.bin 4961886805fc8a5576a37cffc6adc9be data/system/maps/huge_austin.bin
94d44bfd4c5e2431c7f8555943e70709 data/system/maps/downtown_atx.bin 94d44bfd4c5e2431c7f8555943e70709 data/system/maps/downtown_atx.bin
42009dd1d35c7528607824aeaed07723 data/system/maps/montlake.bin 42009dd1d35c7528607824aeaed07723 data/system/maps/montlake.bin
973a782a7d4dd1de4dc0cc7521ee9e1a data/system/maps/intl_district.bin 973a782a7d4dd1de4dc0cc7521ee9e1a data/system/maps/intl_district.bin
2857ce1b2e3b233323a04d459d533024 data/system/maps/downtown_la.bin 2857ce1b2e3b233323a04d459d533024 data/system/maps/downtown_la.bin
d1e2aed33d5b7cae360d41ee84c54f52 data/system/maps/23rd.bin fb0e2b566dc6eed25dd8952d6d325f35 data/system/maps/23rd.bin
cc45f42cb24cad1cfdbf5ed7a0cb86d4 data/system/synthetic_maps/signal_double.json cc45f42cb24cad1cfdbf5ed7a0cb86d4 data/system/synthetic_maps/signal_double.json
8b949cc34d9a27ace0bd8ecde55a9520 data/system/synthetic_maps/signal_single.json 8b949cc34d9a27ace0bd8ecde55a9520 data/system/synthetic_maps/signal_single.json
1cd7be125e1d992613ed3a41e8b25b6a data/system/synthetic_maps/signal_fan_in.json 1cd7be125e1d992613ed3a41e8b25b6a data/system/synthetic_maps/signal_fan_in.json
37a5769741b95f3f0abd57b8801463ae data/system/scenarios/ballard/weekday.bin 37a5769741b95f3f0abd57b8801463ae data/system/scenarios/ballard/weekday.bin
a7e6d63279d5d16045f1609eed2752ea data/system/scenarios/intl_district/weekday.bin a7e6d63279d5d16045f1609eed2752ea data/system/scenarios/intl_district/weekday.bin
9d33877a724facdfbd245267aec9358a data/system/scenarios/23rd/weekday.bin 1ce2fadc6afdc4a59777f2f616dc97c2 data/system/scenarios/23rd/weekday.bin
a0e0f802325ad064bc36ae0444b4d2a3 data/system/scenarios/lakeslice/weekday.bin a0e0f802325ad064bc36ae0444b4d2a3 data/system/scenarios/lakeslice/weekday.bin
0feb8fd2098c3573f0034c342d699ec3 data/system/scenarios/downtown/weekday.bin 0feb8fd2098c3573f0034c342d699ec3 data/system/scenarios/downtown/weekday.bin
1e820b8919a93baf70e6b2fb7d563fba data/system/scenarios/huge_seattle/weekday.bin 1e820b8919a93baf70e6b2fb7d563fba data/system/scenarios/huge_seattle/weekday.bin

3
sim/src/mechanics/intersection.rs
View File

@ -258,9 +258,10 @@ impl IntersectionSimState {
// TODO Disable this policy for a particular intersection where a traffic signal is // TODO Disable this policy for a particular intersection where a traffic signal is
// surrounded by a tiny lane with almost no capacity. Generalization later, make // surrounded by a tiny lane with almost no capacity. Generalization later, make
// progress for now. // progress for now.
let osm_node_id = map.get_i(turn.parent).orig_id.osm_node_id;
if !queue.try_to_reserve_entry( if !queue.try_to_reserve_entry(
car, car,
!self.dont_block_the_box || map.get_i(turn.parent).orig_id.osm_node_id == 53211694, !self.dont_block_the_box || osm_node_id == 53211694 || osm_node_id == 53211693,
) { ) {
if self.break_turn_conflict_cycles { if self.break_turn_conflict_cycles {
// TODO Should we run the detector here? // TODO Should we run the detector here?