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

Refactor some code in the lagging green traffic signal module

Browse Source
This commit is contained in:
Dustin Carlino 2021-11-12 11:46:01 -08:00
parent 29fbf74c2d
commit 4b17e4a676
1 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
map_model/src/make/traffic_signals/lagging_green.rs
View File

@ -134,10 +134,10 @@ fn multi_way_stages(i: &Intersection) -> Option<ControlTrafficSignal> {
for m in &one_way { for m in &one_way {
let mut stage = Stage::new(); let mut stage = Stage::new();
stage.protected_movements.insert(*m); stage.protected_movements.insert(*m);
for t in turns(&m.from.road, &right) { for t in movements_from(m.from.road, &right) {
stage.protected_movements.insert(t); stage.protected_movements.insert(t);
} }
for t in turns(&m.from.road, &left) { for t in movements_from(m.from.road, &left) {
stage.protected_movements.insert(t); stage.protected_movements.insert(t);
} }
add_stage(&mut ts, stage); add_stage(&mut ts, stage);
@ -151,15 +151,15 @@ fn multi_way_stages(i: &Intersection) -> Option<ControlTrafficSignal> {
stage1.protected_movements.insert(*m2); stage1.protected_movements.insert(*m2);
stage1 stage1
.protected_movements .protected_movements
.extend(turns(&m1.from.road, &right)); .extend(movements_from(m1.from.road, &right));
stage1 stage1
.protected_movements .protected_movements
.extend(turns(&m2.from.road, &right)); .extend(movements_from(m2.from.road, &right));
for t in turns(&m1.from.road, &left) { for t in movements_from(m1.from.road, &left) {
stage1.yield_movements.insert(t); stage1.yield_movements.insert(t);
stage2.protected_movements.insert(t); stage2.protected_movements.insert(t);
} }
for t in turns(&m2.from.road, &left) { for t in movements_from(m2.from.road, &left) {
stage1.yield_movements.insert(t); stage1.yield_movements.insert(t);
stage2.protected_movements.insert(t); stage2.protected_movements.insert(t);
} }
@ -183,27 +183,31 @@ fn multi_way_stages(i: &Intersection) -> Option<ControlTrafficSignal> {
let mut stage2 = Stage::new(); let mut stage2 = Stage::new();
if let Some(r2) = vec.pop() { if let Some(r2) = vec.pop() {
// dual stage, with lagging left turns // dual stage, with lagging left turns
if let Some(m) = remove_movement(&r1, &r2, &mut right) { if let Some(m) = remove_movement(r1, r2, &mut right) {
stage1.protected_movements.insert(m); stage1.protected_movements.insert(m);
} else if let Some(m) = remove_movement(&r1, &r2, &mut left) { } else if let Some(m) = remove_movement(r1, r2, &mut left) {
stage1.protected_movements.insert(m); stage1.protected_movements.insert(m);
} }
if let Some(m) = remove_movement(&r2, &r1, &mut right) { if let Some(m) = remove_movement(r2, r1, &mut right) {
stage1.protected_movements.insert(m); stage1.protected_movements.insert(m);
} else if let Some(m) = remove_movement(&r2, &r1, &mut left) { } else if let Some(m) = remove_movement(r2, r1, &mut left) {
stage1.protected_movements.insert(m); stage1.protected_movements.insert(m);
} }
// add right turns // add right turns
stage1.protected_movements.extend(turns(&r1, &right)); stage1
stage1.protected_movements.extend(turns(&r2, &right)); .protected_movements
.extend(movements_from(r1, &right));
stage1
.protected_movements
.extend(movements_from(r2, &right));
// add left turns // add left turns
for t in turns(&r1, &left) { for t in movements_from(r1, &left) {
stage1.yield_movements.insert(t); stage1.yield_movements.insert(t);
stage2.protected_movements.insert(t); stage2.protected_movements.insert(t);
} }
for t in turns(&r2, &left) { for t in movements_from(r2, &left) {
stage1.yield_movements.insert(t); stage1.yield_movements.insert(t);
stage2.protected_movements.insert(t); stage2.protected_movements.insert(t);
} }
@ -212,8 +216,10 @@ fn multi_way_stages(i: &Intersection) -> Option<ControlTrafficSignal> {
add_stage(&mut ts, stage2); add_stage(&mut ts, stage2);
} else { } else {
// single stage without lagging left turns // single stage without lagging left turns
stage1.protected_movements.extend(turns(&r1, &right)); stage1
stage1.protected_movements.extend(turns(&r1, &left)); .protected_movements
.extend(movements_from(r1, &right));
stage1.protected_movements.extend(movements_from(r1, &left));
add_stage(&mut ts, stage1); add_stage(&mut ts, stage1);
} }
} }
@ -231,29 +237,28 @@ fn add_stage(ts: &mut ControlTrafficSignal, stage: Stage) {
} }
} }
// TODO Should be named 'movements_from' or something, and stop taking &RoadID everywhere here! fn movements_from(from: RoadID, movements: &[MovementID]) -> Vec<MovementID> {
fn turns(from: &RoadID, movements: &[MovementID]) -> Vec<MovementID> {
movements movements
.iter() .iter()
.filter_map(|mvmnt| { .filter_map(|mvmnt| {
if *from == mvmnt.from.road { if from == mvmnt.from.road {
Some(*mvmnt) Some(*mvmnt)
} else { } else {
None None
} }
}) })
.collect::<Vec<_>>() .collect()
} }
fn remove_movement(from: &RoadID, to: &RoadID, turns: &mut Vec<MovementID>) -> Option<MovementID> { fn remove_movement(
let result = turns from: RoadID,
to: RoadID,
movements: &mut Vec<MovementID>,
) -> Option<MovementID> {
let idx = movements
.iter() .iter()
.find(|turn| *from == turn.from.road && *to == turn.to.road) .position(|mvmnt| mvmnt.from.road == from && mvmnt.to.road == to)?;
.copied(); Some(movements.remove(idx))
if result.is_some() {
turns.retain(|turn| *from != turn.from.road || *to != turn.to.road);
}
result
} }
fn three_way_three_stage(i: &Intersection, map: &Map) -> Option<ControlTrafficSignal> { fn three_way_three_stage(i: &Intersection, map: &Map) -> Option<ControlTrafficSignal> {