From a15ef623b4a3f75281ca765aa1b85e0fbf54b1f4 Mon Sep 17 00:00:00 2001 From: dabreegster Date: Sat, 19 Mar 2022 15:48:48 +0000 Subject: [PATCH] deploy: 9fda4b931d4272b5a21e5c9bfbc69b6afe00dc98 --- rustdoc/ltn/filters/auto/enum.Heuristic.html | 2 +- rustdoc/ltn/filters/auto/fn.brute_force.html | 2 +- rustdoc/ltn/filters/auto/fn.greedy.html | 2 +- .../ltn/filters/auto/fn.only_one_border.html | 2 +- rustdoc/ltn/filters/auto/fn.split_cells.html | 2 +- .../filters/auto/fn.try_to_filter_road.html | 2 +- rustdoc/ltn/filters/auto/index.html | 2 +- .../built_info/constant.BUILT_TIME_UTC.html | 2 +- rustdoc/src/ltn/connectivity.rs.html | 4 ++-- rustdoc/src/ltn/filters/auto.rs.html | 20 +++++++++++++++---- rustdoc/src/ltn/lib.rs.html | 2 +- .../out/built.rs.html | 2 +- 12 files changed, 28 insertions(+), 16 deletions(-) diff --git a/rustdoc/ltn/filters/auto/enum.Heuristic.html b/rustdoc/ltn/filters/auto/enum.Heuristic.html index e692f620fb..5375528cd8 100644 --- a/rustdoc/ltn/filters/auto/enum.Heuristic.html +++ b/rustdoc/ltn/filters/auto/enum.Heuristic.html @@ -14,7 +14,7 @@ step by the least resulting rat runs.

SplitCells

Find one filter that splits a cell, maximizing the number of streets in each new cell.

OnlyOneBorder

Per cell, close all borders except for one. This doesn’t affect connectivity, but prevents all rat-runs.

-

Implementations

Trait Implementations

Returns a copy of the value. Read more

+

Implementations

Trait Implementations

Returns a copy of the value. Read more

Performs copy-assignment from source. Read more

Formats the value using the given formatter. Read more

This method tests for self and other values to be equal, and is used diff --git a/rustdoc/ltn/filters/auto/fn.brute_force.html b/rustdoc/ltn/filters/auto/fn.brute_force.html index df89a8e855..27ba67a322 100644 --- a/rustdoc/ltn/filters/auto/fn.brute_force.html +++ b/rustdoc/ltn/filters/auto/fn.brute_force.html @@ -1,4 +1,4 @@ brute_force in ltn::filters::auto - Rust

Function ltn::filters::auto::brute_force[−][src]

fn brute_force(
    ctx: &EventCtx<'_>, 
    app: &mut SimpleApp<Session>, 
    neighborhood: &Neighborhood, 
    timer: &mut Timer<'_>
)
+

Other items in
ltn::filters::auto

Function ltn::filters::auto::brute_force[−][src]

fn brute_force(
    ctx: &EventCtx<'_>, 
    app: &mut SimpleApp<Session>, 
    neighborhood: &Neighborhood, 
    timer: &mut Timer<'_>
)
\ No newline at end of file diff --git a/rustdoc/ltn/filters/auto/fn.greedy.html b/rustdoc/ltn/filters/auto/fn.greedy.html index fee45f0f9c..d048f0fff8 100644 --- a/rustdoc/ltn/filters/auto/fn.greedy.html +++ b/rustdoc/ltn/filters/auto/fn.greedy.html @@ -1,4 +1,4 @@ greedy in ltn::filters::auto - Rust

Function ltn::filters::auto::greedy[−][src]

fn greedy(
    ctx: &EventCtx<'_>, 
    app: &mut SimpleApp<Session>, 
    neighborhood: &Neighborhood, 
    timer: &mut Timer<'_>
)
+

Other items in
ltn::filters::auto

Function ltn::filters::auto::greedy[−][src]

fn greedy(
    ctx: &EventCtx<'_>, 
    app: &mut SimpleApp<Session>, 
    neighborhood: &Neighborhood, 
    timer: &mut Timer<'_>
)
\ No newline at end of file diff --git a/rustdoc/ltn/filters/auto/fn.only_one_border.html b/rustdoc/ltn/filters/auto/fn.only_one_border.html index a039fb132e..d3124068de 100644 --- a/rustdoc/ltn/filters/auto/fn.only_one_border.html +++ b/rustdoc/ltn/filters/auto/fn.only_one_border.html @@ -1,4 +1,4 @@ only_one_border in ltn::filters::auto - Rust

Function ltn::filters::auto::only_one_border[−][src]

fn only_one_border(app: &mut SimpleApp<Session>, neighborhood: &Neighborhood)
+

Other items in
ltn::filters::auto

Function ltn::filters::auto::only_one_border[−][src]

fn only_one_border(app: &mut SimpleApp<Session>, neighborhood: &Neighborhood)
\ No newline at end of file diff --git a/rustdoc/ltn/filters/auto/fn.split_cells.html b/rustdoc/ltn/filters/auto/fn.split_cells.html index 0d85f3eabc..322c3c9c24 100644 --- a/rustdoc/ltn/filters/auto/fn.split_cells.html +++ b/rustdoc/ltn/filters/auto/fn.split_cells.html @@ -1,4 +1,4 @@ split_cells in ltn::filters::auto - Rust

Function ltn::filters::auto::split_cells[−][src]

fn split_cells(
    ctx: &EventCtx<'_>, 
    app: &mut SimpleApp<Session>, 
    neighborhood: &Neighborhood, 
    timer: &mut Timer<'_>
)
+

Other items in
ltn::filters::auto

Function ltn::filters::auto::split_cells[−][src]

fn split_cells(
    ctx: &EventCtx<'_>, 
    app: &mut SimpleApp<Session>, 
    neighborhood: &Neighborhood, 
    timer: &mut Timer<'_>
)
\ No newline at end of file diff --git a/rustdoc/ltn/filters/auto/fn.try_to_filter_road.html b/rustdoc/ltn/filters/auto/fn.try_to_filter_road.html index ed7159dac2..54e835317c 100644 --- a/rustdoc/ltn/filters/auto/fn.try_to_filter_road.html +++ b/rustdoc/ltn/filters/auto/fn.try_to_filter_road.html @@ -1,4 +1,4 @@ try_to_filter_road in ltn::filters::auto - Rust

Function ltn::filters::auto::try_to_filter_road[−][src]

fn try_to_filter_road(
    ctx: &EventCtx<'_>, 
    app: &mut SimpleApp<Session>, 
    neighborhood: &Neighborhood, 
    r: RoadID
) -> Option<Neighborhood>
+

Other items in
ltn::filters::auto

Function ltn::filters::auto::try_to_filter_road[−][src]

fn try_to_filter_road(
    ctx: &EventCtx<'_>, 
    app: &mut SimpleApp<Session>, 
    neighborhood: &Neighborhood, 
    r: RoadID
) -> Option<Neighborhood>
\ No newline at end of file diff --git a/rustdoc/ltn/filters/auto/index.html b/rustdoc/ltn/filters/auto/index.html index a0043fcc56..046a90d458 100644 --- a/rustdoc/ltn/filters/auto/index.html +++ b/rustdoc/ltn/filters/auto/index.html @@ -1,6 +1,6 @@ ltn::filters::auto - Rust

Module ltn::filters::auto[−][src]

Expand description

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

+

Module auto

Module ltn::filters::auto[−][src]

Expand description

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

Enums

Heuristic

Functions

brute_force
greedy
only_one_border
split_cells
try_to_filter_road
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 1885de393a..d5c024ce17 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,5 +1,5 @@ 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, 19 Mar 2022 15:41:46 +0000";
Expand description

The build time in RFC2822, UTC.

+

Other items in
map_gui::tools::title_screen::built_info

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

pub const BUILT_TIME_UTC: &str = r"Sat, 19 Mar 2022 15:47:30 +0000";
Expand description

The build time in RFC2822, UTC.

\ No newline at end of file diff --git a/rustdoc/src/ltn/connectivity.rs.html b/rustdoc/src/ltn/connectivity.rs.html index ce2f1bd965..e74b6d9bdc 100644 --- a/rustdoc/src/ltn/connectivity.rs.html +++ b/rustdoc/src/ltn/connectivity.rs.html @@ -493,7 +493,7 @@ ]), ctx.style() .btn_outline - .text("Automatically stop rat-runs") + .text("Automatically place filters") .hotkey(Key::A) .build_def(ctx), Widget::dropdown( @@ -524,7 +524,7 @@ } match self.left_panel.event(ctx) { Outcome::Clicked(x) => { - if x == "Automatically stop rat-runs" { + if x == "Automatically place filters" { match ctx.loading_screen("automatically filter a neighborhood", |ctx, timer| { app.session .heuristic diff --git a/rustdoc/src/ltn/filters/auto.rs.html b/rustdoc/src/ltn/filters/auto.rs.html index 40c4ee1ea1..e12caaad7f 100644 --- a/rustdoc/src/ltn/filters/auto.rs.html +++ b/rustdoc/src/ltn/filters/auto.rs.html @@ -226,6 +226,12 @@ 224 225 226 +227 +228 +229 +230 +231 +232 
//! Experiments to make a neighborhood be low-traffic by automatically placing filters to prevent all rat runs.
 
 use anyhow::Result;
@@ -258,10 +264,16 @@
 impl Heuristic {
     pub fn choices() -> Vec<Choice<Heuristic>> {
         vec![
-            Choice::new("greedy", Heuristic::Greedy),
-            Choice::new("brute-force", Heuristic::BruteForce),
-            Choice::new("split cells", Heuristic::SplitCells),
-            Choice::new("only one border", Heuristic::OnlyOneBorder),
+            Choice::new(
+                "filter the road with the most rat-runs (greedy)",
+                Heuristic::Greedy,
+            ),
+            Choice::new(
+                "stop the most rat-runs (brute-force)",
+                Heuristic::BruteForce,
+            ),
+            Choice::new("split large cells", Heuristic::SplitCells),
+            Choice::new("only one entrance per cell", Heuristic::OnlyOneBorder),
         ]
     }
 
diff --git a/rustdoc/src/ltn/lib.rs.html b/rustdoc/src/ltn/lib.rs.html
index 74c89dc13e..5282b30f46 100644
--- a/rustdoc/src/ltn/lib.rs.html
+++ b/rustdoc/src/ltn/lib.rs.html
@@ -270,7 +270,7 @@
             highlight_boundary_roads: false,
             draw_neighborhood_style: browse::Style::SimpleColoring,
             draw_cells_as_areas: true,
-            heuristic: filters::auto::Heuristic::OnlyOneBorder,
+            heuristic: filters::auto::Heuristic::SplitCells,
             main_road_penalty: 1.0,
 
             current_trip_name: None,
diff --git a/rustdoc/src/map_gui/home/runner/work/abstreet/abstreet/target/debug/build/map_gui-49fc0ec202264eb2/out/built.rs.html b/rustdoc/src/map_gui/home/runner/work/abstreet/abstreet/target/debug/build/map_gui-49fc0ec202264eb2/out/built.rs.html
index cbfde568c6..2e5502b1da 100644
--- a/rustdoc/src/map_gui/home/runner/work/abstreet/abstreet/target/debug/build/map_gui-49fc0ec202264eb2/out/built.rs.html
+++ b/rustdoc/src/map_gui/home/runner/work/abstreet/abstreet/target/debug/build/map_gui-49fc0ec202264eb2/out/built.rs.html
@@ -176,7 +176,7 @@
 pub const RUSTDOC_VERSION: &str = r"rustdoc 1.59.0 (9d1b2106e 2022-02-23)";
 #[doc=r#"The build time in RFC2822, UTC."#]
 #[allow(dead_code)]
-pub const BUILT_TIME_UTC: &str = r"Sat, 19 Mar 2022 15:41:46 +0000";
+pub const BUILT_TIME_UTC: &str = r"Sat, 19 Mar 2022 15:47:30 +0000";
 #[doc=r#"The target architecture, given by `CARGO_CFG_TARGET_ARCH`."#]
 #[allow(dead_code)]
 pub const CFG_TARGET_ARCH: &str = r"x86_64";