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

slightly improve traffic signal runtime: Priority > Yield

Browse Source
This commit is contained in:
Dustin Carlino 2019-05-13 15:38:45 -07:00
parent 9252dbd14b
commit 75d1cdd3b9
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,7 +162,7 @@ impl IntersectionSimState {
self.state[&id] self.state[&id]
.accepted .accepted
.iter() .iter()
.any(|req| cycle.get_priority(req.turn) < TurnPriority::Yield) .any(|req| cycle.get_priority(req.turn) == TurnPriority::Banned)
} else { } else {
false false
} }
@ -212,8 +212,6 @@ impl State {
return false; return false;
} }
// TODO Actually make TurnPriority::Stop turns pause briefly.
for (r, t) in &self.waiting { for (r, t) in &self.waiting {
// If there's a higher rank turn waiting, don't allow // If there's a higher rank turn waiting, don't allow
if sign.turns[&r.turn] > our_priority { if sign.turns[&r.turn] > our_priority {
@ -224,6 +222,9 @@ impl State {
} }
} }
// TODO Make sure we can optimistically finish this turn before an approaching
// higher-priority vehicle wants to begin.
true true
} }
@ -238,7 +239,7 @@ impl State {
// For now, just maintain safety when agents over-run. // For now, just maintain safety when agents over-run.
for req in &self.accepted { for req in &self.accepted {
if cycle.get_priority(req.turn) < TurnPriority::Yield { if cycle.get_priority(req.turn) == TurnPriority::Banned {
/*println!( /*println!(
"{:?} is still doing {} after the cycle is over", "{:?} is still doing {} after the cycle is over",
req.agent, req.turn req.agent, req.turn
@ -248,7 +249,7 @@ impl State {
} }
// Can't go at all this cycle. // Can't go at all this cycle.
if cycle.get_priority(new_req.turn) < TurnPriority::Yield { if cycle.get_priority(new_req.turn) == TurnPriority::Banned {
return false; return false;
} }
@ -257,8 +258,18 @@ impl State {
return false; return false;
} }
// TODO If there's a choice between a Priority and Yield request, choose Priority. Need // A yield loses to a conflicting Priority turn.
// batched requests to know -- that'll come later, once the walking sim is integrated. if cycle.get_priority(new_req.turn) == TurnPriority::Yield {
if self.waiting.keys().any(|r| {
map.get_t(new_req.turn).conflicts_with(map.get_t(r.turn))
&& cycle.get_priority(r.turn) == TurnPriority::Priority
}) {
return false;
}
}
// TODO Make sure we can optimistically finish this turn before an approaching
// higher-priority vehicle wants to begin.
// TODO Don't accept the agent if they won't finish the turn in time. If the turn and // TODO Don't accept the agent if they won't finish the turn in time. If the turn and
// target lane were clear, we could calculate the time, but it gets hard. For now, allow // target lane were clear, we could calculate the time, but it gets hard. For now, allow