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

improve error for parking seeding. closes #224

Browse Source
This commit is contained in:
Dustin Carlino 2020-07-22 12:19:18 -07:00
parent 97a6598a96
commit 56a892f789
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sim/src/make/scenario.rs
View File

@ -293,15 +293,22 @@ fn seed_parked_cars(
timer.start_iter("seed parked cars", parked_cars.len()); timer.start_iter("seed parked cars", parked_cars.len());
let mut ok = true; let mut ok = true;
let total_cars = parked_cars.len();
let mut seeded = 0;
for (vehicle, b) in parked_cars { for (vehicle, b) in parked_cars {
timer.next(); timer.next();
if !ok { if !ok {
continue; continue;
} }
if let Some(spot) = find_spot_near_building(b, &mut open_spots_per_road, map, timer) { if let Some(spot) = find_spot_near_building(b, &mut open_spots_per_road, map) {
seeded += 1;
sim.seed_parked_car(vehicle, spot); sim.seed_parked_car(vehicle, spot);
} else { } else {
timer.warn("Not enough room to seed parked cars.".to_string()); timer.warn(format!(
"Not enough room to seed parked cars. Only found spots for {} of {}",
prettyprint_usize(seeded),
prettyprint_usize(total_cars)
));
ok = false; ok = false;
} }
} }
@ -314,7 +321,6 @@ fn find_spot_near_building(
b: BuildingID, b: BuildingID,
open_spots_per_road: &mut BTreeMap<RoadID, Vec<(ParkingSpot, Option<BuildingID>)>>, open_spots_per_road: &mut BTreeMap<RoadID, Vec<(ParkingSpot, Option<BuildingID>)>>,
map: &Map, map: &Map,
timer: &mut Timer,
) -> Option<ParkingSpot> { ) -> Option<ParkingSpot> {
let mut roads_queue: VecDeque<RoadID> = VecDeque::new(); let mut roads_queue: VecDeque<RoadID> = VecDeque::new();
let mut visited: HashSet<RoadID> = HashSet::new(); let mut visited: HashSet<RoadID> = HashSet::new();
@ -325,14 +331,6 @@ fn find_spot_near_building(
} }
loop { loop {
if roads_queue.is_empty() {
timer.warn(format!(
"Giving up looking for a free parking spot, searched {} roads of {}: {:?}",
visited.len(),
open_spots_per_road.len(),
visited
));
}
let r = roads_queue.pop_front()?; let r = roads_queue.pop_front()?;
if let Some(spots) = open_spots_per_road.get_mut(&r) { if let Some(spots) = open_spots_per_road.get_mut(&r) {
// Fill in all private parking first before // Fill in all private parking first before