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

refactoring TripManager

Browse Source
This commit is contained in:
Dustin Carlino 2019-03-01 22:36:13 -08:00
parent 0f71ee5210
commit bcb0268f7a
1 changed files with 48 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
sim/src/trips.rs
View File

@ -68,37 +68,13 @@ impl TripManager {
Some(TripLeg::Drive(id, DrivingGoal::ParkNear(_))) => assert_eq!(car, id),
_ => unreachable!(),
};
let (ped, walk_to) = match trip.legs[0] {
TripLeg::Walk(ped, ref to) => (ped, to.clone()),
_ => unreachable!(),
};
let start = SidewalkSpot::parking_spot(spot, map, parking);
let path = if let Some(p) = Pathfinder::shortest_distance(
map,
PathRequest {
start: start.sidewalk_pos,
end: walk_to.sidewalk_pos,
can_use_bus_lanes: false,
can_use_bike_lanes: false,
},
) {
p
} else {
println!("Aborting a trip because no path for the walking portion!");
return;
};
scheduler.enqueue_command(Command::SpawnPed(
trip.spawn_ped(
time,
CreatePedestrian {
id: ped,
start,
goal: walk_to,
path,
trip: trip.id,
},
));
SidewalkSpot::parking_spot(spot, map, parking),
map,
scheduler,
);
}
pub fn ped_reached_parking_spot(
@ -231,36 +207,8 @@ impl TripManager {
Some(TripLeg::Bike(vehicle, DrivingGoal::ParkNear(_))) => assert_eq!(vehicle.id, bike),
_ => unreachable!(),
};
let (ped, walk_to) = match trip.legs[0] {
TripLeg::Walk(ped, ref to) => (ped, to.clone()),
_ => unreachable!(),
};
let path = if let Some(p) = Pathfinder::shortest_distance(
map,
PathRequest {
start: bike_rack.sidewalk_pos,
end: walk_to.sidewalk_pos,
can_use_bus_lanes: false,
can_use_bike_lanes: false,
},
) {
p
} else {
println!("Aborting a trip because no path for the walking portion!");
return;
};
scheduler.enqueue_command(Command::SpawnPed(
time,
CreatePedestrian {
id: ped,
start: bike_rack,
goal: walk_to,
path,
trip: trip.id,
},
));
trip.spawn_ped(time, bike_rack, map, scheduler);
}
pub fn ped_reached_building(
@ -294,20 +242,26 @@ impl TripManager {
transit: &mut TransitSimState,
) -> bool {
self.events.push(Event::PedReachedBusStop(ped, stop));
let trip = &self.trips[self.active_trip_mode[&AgentID::Pedestrian(ped)].0];
let trip = &mut self.trips[self.active_trip_mode[&AgentID::Pedestrian(ped)].0];
assert_eq!(
trip.legs[0],
TripLeg::Walk(ped, SidewalkSpot::bus_stop(stop, map))
);
match trip.legs[1] {
TripLeg::RideBus(_, route, stop2) => {
transit.ped_waiting_for_bus(ped, stop, route, stop2)
if transit.ped_waiting_for_bus(ped, stop, route, stop2) {
trip.legs.pop_front();
true
} else {
false
}
}
_ => unreachable!(),
}
}
pub fn ped_boarded_bus(&mut self, ped: PedestrianID, walking: &mut WalkingSimState) {
// TODO Make sure canonical pt is the bus while the ped is riding it
let trip = &mut self.trips[self.active_trip_mode[&AgentID::Pedestrian(ped)].0];
trip.legs.pop_front();
walking.ped_boarded_bus(ped);
@ -330,37 +284,7 @@ impl TripManager {
_ => unreachable!(),
};
// TODO This is the same as bike_reached_end... refactor.
let (ped, walk_to) = match trip.legs[0] {
TripLeg::Walk(ped, ref to) => (ped, to.clone()),
_ => unreachable!(),
};
let path = if let Some(p) = Pathfinder::shortest_distance(
map,
PathRequest {
start: start.sidewalk_pos,
end: walk_to.sidewalk_pos,
can_use_bus_lanes: false,
can_use_bike_lanes: false,
},
) {
p
} else {
println!("Aborting a trip because no path for the walking portion!");
return;
};
scheduler.enqueue_command(Command::SpawnPed(
time,
CreatePedestrian {
id: ped,
start,
goal: walk_to,
path,
trip: trip.id,
},
));
trip.spawn_ped(time, start, map, scheduler);
}
pub fn ped_reached_border(
@ -461,6 +385,39 @@ impl Trip {
_ => false,
}
}
fn spawn_ped(&self, time: Duration, start: SidewalkSpot, map: &Map, scheduler: &mut Scheduler) {
let (ped, walk_to) = match self.legs[0] {
TripLeg::Walk(ped, ref to) => (ped, to.clone()),
_ => unreachable!(),
};
let path = if let Some(p) = Pathfinder::shortest_distance(
map,
PathRequest {
start: start.sidewalk_pos,
end: walk_to.sidewalk_pos,
can_use_bus_lanes: false,
can_use_bike_lanes: false,
},
) {
p
} else {
println!("Aborting a trip because no path for the walking portion!");
return;
};
scheduler.enqueue_command(Command::SpawnPed(
time,
CreatePedestrian {
id: ped,
start,
goal: walk_to,
path,
trip: self.id,
},
));
}
}
// These don't specify where the leg starts, since it might be unknown -- like when we drive and