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

Before starting the driving portion of a trip, check if it'll cross a

Browse Source 
zone with a cap that's been exceeded. If so, abort the trip.

This is 90% plumbing... need to rethink how pieces of the simulation are
passed around.
This commit is contained in:
Dustin Carlino 2020-08-20 14:09:24 -07:00
parent 2bfb5d5ac4
commit 21ab1d7d6f
6 changed files with 133 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sim/src/cap.rs
View File

@ -1,6 +1,6 @@
use crate::CarID;
use crate::{CarID, VehicleType};
use geom::{Duration, Time};
use map_model::{LaneID, Map, PathConstraints};
use map_model::{LaneID, Map, Path, PathConstraints, PathStep};
use serde::{Deserialize, Serialize};
use std::collections::{BTreeMap, BTreeSet};
@ -49,6 +49,9 @@ impl CapSimState {
}
pub fn car_entering_lane(&mut self, now: Time, car: CarID, lane: LaneID) {
if car.1 != VehicleType::Car {
return;
}
let zone = if let Some(idx) = self.lane_to_zone.get(&lane) {
&mut self.zones[*idx]
} else {
@ -61,4 +64,24 @@ 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 {
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];
if zone.entered_in_last_hour.len() >= zone.cap {
return false;
}
}
}
}
true
}
}

7
sim/src/mechanics/driving.rs
View File

@ -235,7 +235,7 @@ impl DrivingSimState {
let mut car = self.cars.remove(&id).unwrap();
// Responsibility of update_car_with_distances to manage scheduling stuff!
if self.update_car_with_distances(
&mut car, &dists, idx, now, map, parking, trips, scheduler, transit, walking,
&mut car, &dists, idx, now, map, parking, trips, scheduler, transit, walking, cap,
) {
self.cars.insert(id, car);
} else {
@ -446,6 +446,7 @@ impl DrivingSimState {
scheduler: &mut Scheduler,
transit: &mut TransitSimState,
walking: &mut WalkingSimState,
cap: &CapSimState,
) -> bool {
let our_dist = dists[idx].1;
@ -474,6 +475,7 @@ impl DrivingSimState {
car.total_blocked_time,
map,
parking,
cap,
scheduler,
);
}
@ -488,6 +490,7 @@ impl DrivingSimState {
// car to the destination. There's no parking!
None,
parking,
cap,
scheduler,
map,
);
@ -538,6 +541,7 @@ impl DrivingSimState {
trips,
walking,
parking,
cap,
scheduler,
map,
) {
@ -594,6 +598,7 @@ impl DrivingSimState {
car.total_blocked_time,
map,
parking,
cap,
scheduler,
);
false

14
sim/src/mechanics/walking.rs
View File

@ -1,8 +1,8 @@
use crate::{
AgentID, AgentProperties, Command, CreatePedestrian, DistanceInterval, DrawPedCrowdInput,
DrawPedestrianInput, Event, IntersectionSimState, ParkingSimState, ParkingSpot,
PedCrowdLocation, PedestrianID, PersonID, Scheduler, SidewalkPOI, SidewalkSpot, TimeInterval,
TransitSimState, TripID, TripManager, UnzoomedAgent,
AgentID, AgentProperties, CapSimState, Command, CreatePedestrian, DistanceInterval,
DrawPedCrowdInput, DrawPedestrianInput, Event, IntersectionSimState, ParkingSimState,
ParkingSpot, PedCrowdLocation, PedestrianID, PersonID, Scheduler, SidewalkPOI, SidewalkSpot,
TimeInterval, TransitSimState, TripID, TripManager, UnzoomedAgent,
};
use abstutil::{deserialize_multimap, serialize_multimap, MultiMap};
use geom::{Distance, Duration, Line, PolyLine, Speed, Time};
@ -121,6 +121,7 @@ impl WalkingSimState {
scheduler: &mut Scheduler,
trips: &mut TripManager,
transit: &mut TransitSimState,
cap: &CapSimState,
) {
let mut ped = self.peds.get_mut(&id).unwrap();
match ped.state {
@ -148,6 +149,7 @@ impl WalkingSimState {
ped.total_blocked_time,
map,
parking,
cap,
scheduler,
);
self.peds.remove(&id);
@ -189,6 +191,7 @@ impl WalkingSimState {
ped.total_blocked_time,
map,
parking,
cap,
scheduler,
);
self.peds.remove(&id);
@ -260,6 +263,7 @@ impl WalkingSimState {
ped.total_blocked_time,
map,
parking,
cap,
scheduler,
);
self.peds.remove(&id);
@ -281,6 +285,7 @@ impl WalkingSimState {
ped.total_blocked_time,
map,
parking,
cap,
scheduler,
);
self.peds.remove(&id);
@ -295,6 +300,7 @@ impl WalkingSimState {
ped.total_blocked_time,
map,
parking,
cap,
scheduler,
);
self.peds.remove(&id);

6
sim/src/sim.rs
View File

@ -414,6 +414,7 @@ impl Sim {
maybe_req,
maybe_path,
&mut self.parking,
&self.cap,
&mut self.scheduler,
map,
);
@ -474,6 +475,7 @@ impl Sim {
trip,
Some(create_car.vehicle),
&mut self.parking,
&self.cap,
&mut self.scheduler,
map,
);
@ -505,6 +507,7 @@ impl Sim {
Duration::ZERO,
map,
&mut self.parking,
&self.cap,
&mut self.scheduler,
);
}
@ -551,6 +554,7 @@ impl Sim {
&mut self.scheduler,
&mut self.trips,
&mut self.transit,
&self.cap,
);
}
Command::UpdateIntersection(i) => {
@ -576,6 +580,7 @@ impl Sim {
trip,
map,
&mut self.parking,
&self.cap,
&mut self.scheduler,
);
}
@ -1221,6 +1226,7 @@ impl Sim {
trip,
Some(vehicle),
&mut self.parking,
&self.cap,
&mut self.scheduler,
map,
);

9
sim/src/transit.rs
View File

@ -1,6 +1,6 @@
use crate::{
CarID, Event, ParkingSimState, PedestrianID, PersonID, Router, Scheduler, TripID, TripManager,
TripPhaseType, VehicleType, WalkingSimState,
CapSimState, CarID, Event, ParkingSimState, PedestrianID, PersonID, Router, Scheduler, TripID,
TripManager, TripPhaseType, VehicleType, WalkingSimState,
};
use abstutil::{deserialize_btreemap, serialize_btreemap};
use geom::Time;
@ -174,6 +174,7 @@ impl TransitSimState {
trips: &mut TripManager,
walking: &mut WalkingSimState,
parking: &mut ParkingSimState,
cap: &CapSimState,
scheduler: &mut Scheduler,
map: &Map,
) -> bool {
@ -256,7 +257,9 @@ impl TransitSimState {
person, bus.car, stop2
);
}
trips.transit_rider_reached_border(now, person, id, map, parking, scheduler);
trips.transit_rider_reached_border(
now, person, id, map, parking, cap, scheduler,
);
}
false
}

103
sim/src/trips.rs
View File

@ -1,9 +1,9 @@
use crate::{
AgentID, AgentType, AlertLocation, CarID, Command, CreateCar, CreatePedestrian, DrivingGoal,
Event, IndividTrip, OffMapLocation, OrigPersonID, ParkedCar, ParkingSimState, ParkingSpot,
PedestrianID, PersonID, PersonSpec, Scenario, Scheduler, SidewalkPOI, SidewalkSpot, SpawnTrip,
TransitSimState, TripID, TripPhaseType, TripSpec, Vehicle, VehicleSpec, VehicleType,
WalkingSimState,
AgentID, AgentType, AlertLocation, CapSimState, CarID, Command, CreateCar, CreatePedestrian,
DrivingGoal, Event, IndividTrip, OffMapLocation, OrigPersonID, ParkedCar, ParkingSimState,
ParkingSpot, PedestrianID, PersonID, PersonSpec, Scenario, Scheduler, SidewalkPOI,
SidewalkSpot, SpawnTrip, TransitSimState, TripID, TripPhaseType, TripSpec, Vehicle,
VehicleSpec, VehicleType, WalkingSimState,
};
use abstutil::{deserialize_btreemap, serialize_btreemap, Counter};
use geom::{Duration, Speed, Time};
@ -184,6 +184,7 @@ impl TripManager {
blocked_time: Duration,
map: &Map,
parking: &mut ParkingSimState,
cap: &CapSimState,
scheduler: &mut Scheduler,
) {
let trip = &mut self.trips[self.active_trip_mode.remove(&AgentID::Car(car)).unwrap().0];
@ -213,7 +214,7 @@ impl TripManager {
let person = trip.person;
self.people[person.0].state = PersonState::Inside(b1);
self.events.push(Event::PersonEntersBuilding(person, b1));
self.person_finished_trip(now, person, parking, scheduler, map);
self.person_finished_trip(now, person, parking, cap, scheduler, map);
return;
}
_ => {}
@ -241,6 +242,7 @@ impl TripManager {
blocked_time: Duration,
map: &Map,
parking: &mut ParkingSimState,
cap: &CapSimState,
scheduler: &mut Scheduler,
) {
self.events.push(Event::PedReachedParkingSpot(ped, spot));
@ -293,10 +295,43 @@ impl TripManager {
// Move the car to the destination...
parking.remove_parked_car(parked_car.clone());
let trip = trip.id;
self.abort_trip(now, trip, Some(parked_car.vehicle), parking, scheduler, map);
self.abort_trip(
now,
trip,
Some(parked_car.vehicle),
parking,
cap,
scheduler,
map,
);
return;
};
if !cap.allow_trip(parked_car.vehicle.id, &path) {
// TODO Different ways to handle this: abort the trip, delay it an hour, route around
// the zone, switch modes...
self.events.push(Event::Alert(
AlertLocation::Person(trip.person),
format!(
"Aborting {} because it would exceed the cap through some zone",
trip.id
),
));
// Move the car to the destination...
parking.remove_parked_car(parked_car.clone());
let trip = trip.id;
self.abort_trip(
now,
trip,
Some(parked_car.vehicle),
parking,
cap,
scheduler,
map,
);
return;
}
let router = drive_to.make_router(parked_car.vehicle.id, path, map);
scheduler.push(
now,
@ -322,6 +357,7 @@ impl TripManager {
blocked_time: Duration,
map: &Map,
parking: &mut ParkingSimState,
cap: &CapSimState,
scheduler: &mut Scheduler,
) {
let trip = &mut self.trips[self
@ -352,7 +388,7 @@ impl TripManager {
),
));
let trip = trip.id;
self.abort_trip(now, trip, None, parking, scheduler, map);
self.abort_trip(now, trip, None, parking, cap, scheduler, map);
return;
};
let req = PathRequest {
@ -388,7 +424,7 @@ impl TripManager {
),
));
let trip = trip.id;
self.abort_trip(now, trip, None, parking, scheduler, map);
self.abort_trip(now, trip, None, parking, cap, scheduler, map);
}
}
@ -435,6 +471,7 @@ impl TripManager {
blocked_time: Duration,
map: &Map,
parking: &mut ParkingSimState,
cap: &CapSimState,
scheduler: &mut Scheduler,
) {
let trip = &mut self.trips[self
@ -458,7 +495,7 @@ impl TripManager {
let person = trip.person;
self.people[person.0].state = PersonState::Inside(bldg);
self.events.push(Event::PersonEntersBuilding(person, bldg));
self.person_finished_trip(now, person, parking, scheduler, map);
self.person_finished_trip(now, person, parking, cap, scheduler, map);
}
// If no route is returned, the pedestrian boarded a bus immediately.
@ -580,6 +617,7 @@ impl TripManager {
blocked_time: Duration,
map: &Map,
parking: &mut ParkingSimState,
cap: &CapSimState,
scheduler: &mut Scheduler,
) {
let trip = &mut self.trips[self
@ -616,7 +654,7 @@ impl TripManager {
));
}
self.people[person.0].state = PersonState::OffMap;
self.person_finished_trip(now, person, parking, scheduler, map);
self.person_finished_trip(now, person, parking, cap, scheduler, map);
}
pub fn transit_rider_reached_border(
@ -626,6 +664,7 @@ impl TripManager {
bus: CarID,
map: &Map,
parking: &mut ParkingSimState,
cap: &CapSimState,
scheduler: &mut Scheduler,
) {
let agent = AgentID::BusPassenger(person, bus);
@ -653,7 +692,7 @@ impl TripManager {
unreachable!()
}
self.people[person.0].state = PersonState::OffMap;
self.person_finished_trip(now, person, parking, scheduler, map);
self.person_finished_trip(now, person, parking, cap, scheduler, map);
}
pub fn car_or_bike_reached_border(
@ -664,6 +703,7 @@ impl TripManager {
blocked_time: Duration,
map: &Map,
parking: &mut ParkingSimState,
cap: &CapSimState,
scheduler: &mut Scheduler,
) {
let trip = &mut self.trips[self.active_trip_mode.remove(&AgentID::Car(car)).unwrap().0];
@ -696,7 +736,7 @@ impl TripManager {
loc.clone(),
));
}
self.person_finished_trip(now, person, parking, scheduler, map);
self.person_finished_trip(now, person, parking, cap, scheduler, map);
}
pub fn remote_trip_finished(
@ -705,6 +745,7 @@ impl TripManager {
id: TripID,
map: &Map,
parking: &mut ParkingSimState,
cap: &CapSimState,
scheduler: &mut Scheduler,
) {
let trip = &mut self.trips[id.0];
@ -727,7 +768,7 @@ impl TripManager {
self.events
.push(Event::PersonEntersRemoteBuilding(person, to));
self.people[person.0].state = PersonState::OffMap;
self.person_finished_trip(now, person, parking, scheduler, map);
self.person_finished_trip(now, person, parking, cap, scheduler, map);
}
// Different than aborting a trip. Don't warp any vehicles or change where the person is.
@ -745,6 +786,7 @@ impl TripManager {
id: TripID,
abandoned_vehicle: Option<Vehicle>,
parking: &mut ParkingSimState,
cap: &CapSimState,
scheduler: &mut Scheduler,
map: &Map,
) {
@ -819,7 +861,7 @@ impl TripManager {
}
}
self.person_finished_trip(now, person, parking, scheduler, map);
self.person_finished_trip(now, person, parking, cap, scheduler, map);
}
pub fn active_agents(&self) -> Vec<AgentID> {
@ -960,6 +1002,7 @@ impl TripManager {
now: Time,
person: PersonID,
parking: &mut ParkingSimState,
cap: &CapSimState,
scheduler: &mut Scheduler,
map: &Map,
) {
@ -978,7 +1021,7 @@ impl TripManager {
));
}
self.start_trip(
now, trip, spec, maybe_req, maybe_path, parking, scheduler, map,
now, trip, spec, maybe_req, maybe_path, parking, cap, scheduler, map,
);
}
@ -990,6 +1033,7 @@ impl TripManager {
maybe_req: Option<PathRequest>,
mut maybe_path: Option<Path>,
parking: &mut ParkingSimState,
cap: &CapSimState,
scheduler: &mut Scheduler,
map: &Map,
) {
@ -1046,6 +1090,18 @@ impl TripManager {
let req = maybe_req.unwrap();
if let Some(router) = maybe_path.map(|path| goal.make_router(vehicle.id, path, map))
{
if !cap.allow_trip(vehicle.id, router.get_path()) {
self.events.push(Event::Alert(
AlertLocation::Person(person.id),
format!(
"Aborting {} because it would exceed the cap through some zone",
trip
),
));
self.abort_trip(now, trip, Some(vehicle), parking, cap, scheduler, map);
return;
}
scheduler.push(
now,
Command::SpawnCar(
@ -1063,7 +1119,7 @@ impl TripManager {
req
),
));
self.abort_trip(now, trip, Some(vehicle), parking, scheduler, map);
self.abort_trip(now, trip, Some(vehicle), parking, cap, scheduler, map);
}
}
TripSpec::NoRoomToSpawn {
@ -1077,7 +1133,7 @@ impl TripManager {
format!("{} couldn't spawn at border {}: {}", person.id, i, error),
));
let vehicle = person.get_vehicle(use_vehicle);
self.abort_trip(now, trip, Some(vehicle), parking, scheduler, map);
self.abort_trip(now, trip, Some(vehicle), parking, cap, scheduler, map);
}
TripSpec::UsingParkedCar {
car, start_bldg, ..
@ -1122,6 +1178,7 @@ impl TripManager {
trip,
Some(parked_car.vehicle),
parking,
cap,
scheduler,
map,
);
@ -1137,7 +1194,7 @@ impl TripManager {
person.id, car, trip
),
));
self.abort_trip(now, trip, None, parking, scheduler, map);
self.abort_trip(now, trip, None, parking, cap, scheduler, map);
}
}
TripSpec::JustWalking { start, goal } => {
@ -1190,7 +1247,7 @@ impl TripManager {
AlertLocation::Person(person.id),
format!("JustWalking trip couldn't find the first path {}", req),
));
self.abort_trip(now, trip, None, parking, scheduler, map);
self.abort_trip(now, trip, None, parking, cap, scheduler, map);
}
}
TripSpec::UsingBike { start, .. } => {
@ -1218,7 +1275,7 @@ impl TripManager {
AlertLocation::Person(person.id),
format!("UsingBike trip couldn't find the first path {}", req),
));
self.abort_trip(now, trip, None, parking, scheduler, map);
self.abort_trip(now, trip, None, parking, cap, scheduler, map);
}
} else {
self.events.push(Event::Alert(
@ -1228,7 +1285,7 @@ impl TripManager {
start
),
));
self.abort_trip(now, trip, None, parking, scheduler, map);
self.abort_trip(now, trip, None, parking, cap, scheduler, map);
}
}
TripSpec::UsingTransit { start, stop1, .. } => {
@ -1282,7 +1339,7 @@ impl TripManager {
AlertLocation::Person(person.id),
format!("UsingTransit trip couldn't find the first path {}", req),
));
self.abort_trip(now, trip, None, parking, scheduler, map);
self.abort_trip(now, trip, None, parking, cap, scheduler, map);
}
}
TripSpec::Remote {