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

debug floodfill from sidewalks, now that i'm really messing with that

Browse Source 
connectivity
This commit is contained in:
Dustin Carlino 2019-10-25 14:40:52 -07:00
parent 27ddb21bc9
commit e0bb2f97e0
2 changed files with 40 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
convert_osm/src/osm_reader.rs
View File

@ -359,8 +359,8 @@ fn glue_multipolygon(
// far and try to glue it up. // far and try to glue it up.
println!( println!(
"Throwing away {} chunks from relation {}", "Throwing away {} chunks from relation {}",
rel_id, pts_per_way.len(),
pts_per_way.len() rel_id
); );
break; break;
} else { } else {

69
game/src/debug/floodfill.rs
View File

@ -3,7 +3,7 @@ use crate::game::{State, Transition};
use crate::helpers::ID; use crate::helpers::ID;
use crate::ui::UI; use crate::ui::UI;
use ezgui::{hotkey, Color, EventCtx, GfxCtx, Key, Line, ModalMenu, Text}; use ezgui::{hotkey, Color, EventCtx, GfxCtx, Key, Line, ModalMenu, Text};
use map_model::{LaneID, Map}; use map_model::{LaneID, LaneType, Map};
use petgraph::graphmap::DiGraphMap; use petgraph::graphmap::DiGraphMap;
use std::collections::HashSet; use std::collections::HashSet;
@ -15,39 +15,43 @@ pub struct Floodfiller {
impl Floodfiller { impl Floodfiller {
pub fn new(ctx: &mut EventCtx, ui: &UI, parent_menu: &mut ModalMenu) -> Option<Box<dyn State>> { pub fn new(ctx: &mut EventCtx, ui: &UI, parent_menu: &mut ModalMenu) -> Option<Box<dyn State>> {
let map = &ui.primary.map; let map = &ui.primary.map;
let (reachable_lanes, title) = if let Some(ID::Lane(l)) = ui.primary.current_selection { let (reachable_lanes, is_sidewalk, title) =
if map.get_l(l).is_driving() if let Some(ID::Lane(l)) = ui.primary.current_selection {
&& ctx if !map.get_l(l).is_parking()
.input && map.get_l(l).lane_type != LaneType::SharedLeftTurn
.contextual_action(Key::F, "floodfill from this lane") && ctx
{ .input
.contextual_action(Key::F, "floodfill from this lane")
{
(
find_reachable_from(l, map),
map.get_l(l).is_sidewalk(),
format!("Floodfiller from {}", l),
)
} else {
return None;
}
} else if parent_menu.action("show strongly-connected component roads") {
let mut graph = DiGraphMap::new();
for turn in map.all_turns().values() {
if map.is_turn_allowed(turn.id) && !turn.between_sidewalks() {
graph.add_edge(turn.id.src, turn.id.dst, 1);
}
}
let components = petgraph::algo::kosaraju_scc(&graph);
( (
find_reachable_from(l, map), components
format!("Floodfiller from {}", l), .into_iter()
.max_by_key(|c| c.len())
.unwrap()
.into_iter()
.collect(),
false,
"Strongy-connected component".to_string(),
) )
} else { } else {
return None; return None;
} };
} else if parent_menu.action("show strongly-connected component roads") {
let mut graph = DiGraphMap::new();
for turn in map.all_turns().values() {
if map.is_turn_allowed(turn.id) && !turn.between_sidewalks() {
graph.add_edge(turn.id.src, turn.id.dst, 1);
}
}
let components = petgraph::algo::kosaraju_scc(&graph);
(
components
.into_iter()
.max_by_key(|c| c.len())
.unwrap()
.into_iter()
.collect(),
"Strongy-connected component".to_string(),
)
} else {
return None;
};
let reachable_color = ui.cs.get_def("reachable lane", Color::GREEN); let reachable_color = ui.cs.get_def("reachable lane", Color::GREEN);
let unreachable_color = ui.cs.get_def("unreachable lane", Color::RED); let unreachable_color = ui.cs.get_def("unreachable lane", Color::RED);
@ -61,7 +65,10 @@ impl Floodfiller {
); );
let mut num_unreachable = 0; let mut num_unreachable = 0;
for lane in map.all_lanes() { for lane in map.all_lanes() {
if !lane.is_driving() { if lane.is_parking() || lane.lane_type == LaneType::SharedLeftTurn {
continue;
}
if is_sidewalk != lane.is_sidewalk() {
continue; continue;
} }
colorer.add( colorer.add(