From c8072e52e550e9739ed42cec939a685ec829c3eb Mon Sep 17 00:00:00 2001 From: dabreegster Date: Sat, 15 Jan 2022 18:12:08 +0000 Subject: [PATCH] deploy: 6b79201d217b4be54bb02ea4622bfa30a606afa6 --- rustdoc/game/ltn/fn.floodfill.html | 2 +- rustdoc/game/ltn/index.html | 2 +- .../built_info/constant.BUILT_TIME_UTC.html | 2 +- rustdoc/src/game/ltn/auto.rs.html | 4 ++-- rustdoc/src/game/ltn/mod.rs.html | 18 ++++++++++++------ .../map_gui-14a1fb6b31708ee5/out/built.rs.html | 2 +- 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/rustdoc/game/ltn/fn.floodfill.html b/rustdoc/game/ltn/fn.floodfill.html index 48a327fe66..194d75c337 100644 --- a/rustdoc/game/ltn/fn.floodfill.html +++ b/rustdoc/game/ltn/fn.floodfill.html @@ -1,3 +1,3 @@ floodfill in game::ltn - Rust -

Function game::ltn::floodfill[−][src]

fn floodfill(
    map: &Map, 
    start: RoadID, 
    perimeter: &Perimeter, 
    neighborhood_borders: &BTreeSet<IntersectionID>, 
    modal_filters: &ModalFilters
) -> Cell
+

Function game::ltn::floodfill[−][src]

fn floodfill(
    map: &Map, 
    start: RoadID, 
    perimeter: &Perimeter, 
    neighborhood_borders: &BTreeSet<IntersectionID>, 
    modal_filters: &ModalFilters
) -> Cell
\ No newline at end of file diff --git a/rustdoc/game/ltn/index.html b/rustdoc/game/ltn/index.html index e5066897a4..958659c1e1 100644 --- a/rustdoc/game/ltn/index.html +++ b/rustdoc/game/ltn/index.html @@ -1,5 +1,5 @@ game::ltn - Rust -

Module game::ltn[−][src]

Re-exports

+

Module game::ltn[−][src]

Re-exports

pub use browse::BrowseNeighborhoods;
pub use filters::DiagonalFilter;
pub use filters::ModalFilters;
pub use partition::NeighborhoodID;
pub use partition::Partitioning;

Modules

auto

Experiments to make a neighborhood be low-traffic by automatically placing filters to prevent all rat runs.

browse
connectivity
draw_cells
export
filters
partition
pathfinding
per_neighborhood
rat_run_viewer
rat_runs
select_boundary

Structs

diff --git a/rustdoc/map_gui/tools/title_screen/built_info/constant.BUILT_TIME_UTC.html b/rustdoc/map_gui/tools/title_screen/built_info/constant.BUILT_TIME_UTC.html index 07cd6cb8e6..80c904f483 100644 --- a/rustdoc/map_gui/tools/title_screen/built_info/constant.BUILT_TIME_UTC.html +++ b/rustdoc/map_gui/tools/title_screen/built_info/constant.BUILT_TIME_UTC.html @@ -1,4 +1,4 @@ BUILT_TIME_UTC in map_gui::tools::title_screen::built_info - Rust -

Constant map_gui::tools::title_screen::built_info::BUILT_TIME_UTC[−][src]

pub const BUILT_TIME_UTC: &str = r"Sat, 15 Jan 2022 17:59:41 +0000";
Expand description

The build time in RFC2822, UTC.

+

Constant map_gui::tools::title_screen::built_info::BUILT_TIME_UTC[−][src]

pub const BUILT_TIME_UTC: &str = r"Sat, 15 Jan 2022 18:10:55 +0000";
Expand description

The build time in RFC2822, UTC.

\ No newline at end of file diff --git a/rustdoc/src/game/ltn/auto.rs.html b/rustdoc/src/game/ltn/auto.rs.html index 88686e0a54..23e639ed72 100644 --- a/rustdoc/src/game/ltn/auto.rs.html +++ b/rustdoc/src/game/ltn/auto.rs.html @@ -317,14 +317,14 @@ .modal_filters .roads .insert(road.id, 0.1 * road.length()); + break; } else if road.dst_i == *i { app.session .modal_filters .roads .insert(road.id, 0.9 * road.length()); + break; } - // Sometimes a cell has multiple roads connecing to the same border, so don't - // stop looking even once we add one filter } } } diff --git a/rustdoc/src/game/ltn/mod.rs.html b/rustdoc/src/game/ltn/mod.rs.html index 134fbb714d..b936270724 100644 --- a/rustdoc/src/game/ltn/mod.rs.html +++ b/rustdoc/src/game/ltn/mod.rs.html @@ -331,6 +331,9 @@ 330 331 332 +333 +334 +335 
use std::collections::{BTreeMap, BTreeSet};
 
 use maplit::btreeset;
@@ -603,14 +606,17 @@
             },
         );
         for i in [current.src_i, current.dst_i] {
+            // It's possible for one border intersection to have two roads in the interior of the
+            // neighborhood. Don't consider a turn between those roads through this intersection as
+            // counting as connectivity -- we're right at the boundary road, so it's like leaving
+            // and re-entering the neighborhood.
+            if neighborhood_borders.contains(&i) {
+                cell_borders.insert(i);
+                continue;
+            }
+
             for next in &map.get_i(i).roads {
                 let next_road = map.get_r(*next);
-                if !perimeter.interior.contains(next) {
-                    if neighborhood_borders.contains(&i) {
-                        cell_borders.insert(i);
-                    }
-                    continue;
-                }
                 if let Some(filter) = modal_filters.intersections.get(&i) {
                     if !filter.allows_turn(current.id, *next) {
                         continue;
diff --git a/rustdoc/src/map_gui/home/runner/work/abstreet/abstreet/target/debug/build/map_gui-14a1fb6b31708ee5/out/built.rs.html b/rustdoc/src/map_gui/home/runner/work/abstreet/abstreet/target/debug/build/map_gui-14a1fb6b31708ee5/out/built.rs.html
index 11c8665ad6..21929fa91f 100644
--- a/rustdoc/src/map_gui/home/runner/work/abstreet/abstreet/target/debug/build/map_gui-14a1fb6b31708ee5/out/built.rs.html
+++ b/rustdoc/src/map_gui/home/runner/work/abstreet/abstreet/target/debug/build/map_gui-14a1fb6b31708ee5/out/built.rs.html
@@ -175,7 +175,7 @@
 pub const RUSTDOC_VERSION: &str = r"rustdoc 1.58.0 (02072b482 2022-01-11)";
 #[doc=r#"The build time in RFC2822, UTC."#]
 #[allow(dead_code)]
-pub const BUILT_TIME_UTC: &str = r"Sat, 15 Jan 2022 17:59:41 +0000";
+pub const BUILT_TIME_UTC: &str = r"Sat, 15 Jan 2022 18:10:55 +0000";
 #[doc=r#"The target architecture, given by `CARGO_CFG_TARGET_ARCH`."#]
 #[allow(dead_code)]
 pub const CFG_TARGET_ARCH: &str = r"x86_64";