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

Switch to 'reserving' the congestion cap when starting a trip, not when entering the road. In the initial tests, all the drivers rush for a road at once. They all pass the check initially, then violate it when they reach it. It's a little more reasonable to enforce the cap earlier, even though we can't really predict when the car will reach the zone, so the time is a little off.

Browse Source
This commit is contained in:
Dustin Carlino 2020-08-23 09:54:39 -07:00
parent 6250cb8393
commit 70dd9fcad1
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sim/src/cap.rs
View File

@ -4,6 +4,13 @@ use map_model::{LaneID, Map, Path, PathConstraints, PathStep};
use serde::{Deserialize, Serialize};
use std::collections::{BTreeMap, BTreeSet};
// TODO When do we increase the counter for a zone, and when do we enforce the check? If we check
// when the trip starts and increase when the car enters the zone, then lots of cars starting at
// the same time can exceed the cap. If we check AND reserve when the trip starts, then the cap is
// obeyed, but the "reservation" applies immediately, even if the car is far away from the zone.
// This seems more reasonable for now, but leave it as a flag until GLT clarifies.
const RESERVE_WHEN_STARTING_TRIP: bool = true;
// Note this only indexes into the zones we track here, not all of them in the map.
type ZoneIdx = usize;
@ -49,6 +56,9 @@ impl CapSimState {
}
pub fn car_entering_lane(&mut self, now: Time, car: CarID, lane: LaneID) {
if RESERVE_WHEN_STARTING_TRIP {
return;
}
if car.1 != VehicleType::Car {
return;
}
@ -65,20 +75,20 @@ impl CapSimState {
zone.entered_in_last_hour.insert(car);
}
// TODO This is only called when the trip starts. So if a bunch of drivers all spawn at the
// same time, they'll all pass the check, but wind up exceeding the cap. Should there be some
// kind of reservation instead?
pub fn allow_trip(&self, car: CarID, path: &Path) -> bool {
pub fn allow_trip(&mut self, car: CarID, path: &Path) -> bool {
if car.1 != VehicleType::Car {
return true;
}
for step in path.get_steps() {
if let PathStep::Lane(l) = step {
if let Some(idx) = self.lane_to_zone.get(l) {
let zone = &self.zones[*idx];
let zone = &mut self.zones[*idx];
if zone.entered_in_last_hour.len() >= zone.cap {
return false;
}
if RESERVE_WHEN_STARTING_TRIP {
zone.entered_in_last_hour.insert(car);
}
}
}
}