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

fix bus router; it was starting with the wrong stop

Browse Source
This commit is contained in:
Dustin Carlino 2018-08-29 12:39:44 -07:00
parent 464b61e158
commit b51eb51716
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sim/src/driving.rs
View File

@ -495,6 +495,7 @@ impl DrivingSimState {
if let Some(car) = self.cars.get_mut(&id) {
println!("{}", abstutil::to_json(car));
println!("{}", abstutil::to_json(self.routers[&id]));
car.debug = !car.debug;
self.debug = Some(id);
} else {

31
sim/src/router.rs
View File

@ -36,9 +36,10 @@ impl Router {
}
pub fn make_router_for_bus(first_path: VecDeque<LaneID>, stops: Vec<BusStop>) -> Router {
assert_eq!(*first_path.back().unwrap(), stops[1].driving_lane);
Router {
path: first_path,
goal: Goal::CycleThroughStops(stops, None),
goal: Goal::CycleThroughStops(rotate_stops(&stops), None),
}
}
@ -78,24 +79,27 @@ impl Router {
if view.dist_along == stops[0].dist_along {
if let Some(wait) = wait_until.clone() {
if time == wait {
if view.debug {
if view.debug || true {
println!(
"{} finished waiting at bus stop, going to next stop",
view.id
"{} finished waiting at bus stop, going to next stop {:?}",
view.id, stops[1]
);
}
let mut cycled_stops: Vec<BusStop> = stops[1..].to_vec();
cycled_stops.push(stops[0].clone());
let new_stops = rotate_stops(stops);
stops.clear();
stops.extend(cycled_stops);
stops.extend(new_stops);
*wait_until = None;
}
} else {
if view.debug {
println!("{} reached bus stop, now waiting", view.id);
}
assert_eq!(view.on.as_lane(), stops[0].driving_lane);
// TODO const
*wait_until = Some(time + 10.0 * si::S);
if view.debug || true {
println!(
"{} reached {:?}, now waiting until {:?}",
view.id, stops[0], wait_until
);
}
return Some(Action::Continue(0.0 * si::MPS2, Vec::new()));
}
}
@ -189,3 +193,10 @@ fn find_parking_spot(
.find_parking_lane(driving_lane)
.and_then(|l| parking_sim.get_first_free_spot(l, dist_along))
}
// TODO double-ended list can do this natively
fn rotate_stops(stops: &Vec<BusStop>) -> Vec<BusStop> {
let mut cycled_stops: Vec<BusStop> = stops[1..].to_vec();
cycled_stops.push(stops[0].clone());
cycled_stops
}