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

Update fast_paths to current master, faster preparation

Browse Source
This commit is contained in:
easbar 2021-09-13 09:14:27 +02:00 committed by Dustin Carlino
parent 3125b9fdb2
commit 0a7670d874
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -974,7 +974,7 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
[[package]] [[package]]
name = "fast_paths" name = "fast_paths"
version = "0.3.0-SNAPSHOT" version = "0.3.0-SNAPSHOT"
source = "git+https://github.com/easbar/fast_paths?branch=settled_nodes_limit#6bcda87e38c930e1068dff0e8f609e5cbd43e03e" source = "git+https://github.com/easbar/fast_paths?rev=9a954e02f01ed16939d3c4a2dc9dd3fb4f6c03ee#9a954e02f01ed16939d3c4a2dc9dd3fb4f6c03ee"
dependencies = [ dependencies = [
"log", "log",
"priority-queue", "priority-queue",

2
map_model/Cargo.toml
View File

@ -9,7 +9,7 @@ abstio = { path = "../abstio" }
abstutil = { path = "../abstutil" } abstutil = { path = "../abstutil" }
anyhow = "1.0.38" anyhow = "1.0.38"
enumset = { version = "1.0.3", features=["serde"] } enumset = { version = "1.0.3", features=["serde"] }
fast_paths = { git = "https://github.com/easbar/fast_paths", branch = "settled_nodes_limit" } fast_paths = { git = "https://github.com/easbar/fast_paths", rev = "9a954e02f01ed16939d3c4a2dc9dd3fb4f6c03ee"}
geom = { path = "../geom" } geom = { path = "../geom" }
kml = { path = "../kml" } kml = { path = "../kml" }
log = "0.4.14" log = "0.4.14"

13
map_model/src/pathfind/engine.rs
View File

@ -157,13 +157,22 @@ impl<'a> CreateEngine<'a> {
); );
PathfindEngine::CH { PathfindEngine::CH {
graph: fast_paths::prepare(&input_graph), graph: fast_paths::prepare_with_params(
&input_graph,
// see discussion about fast_paths parameters here: https://github.com/easbar/fast_paths/pull/37
&fast_paths::Params::new(0.01, 100, 10, 100),
),
path_calc: ThreadLocal::new(), path_calc: ThreadLocal::new(),
} }
} }
CreateEngine::CHSeedingNodeOrdering(prev_graph) => { CreateEngine::CHSeedingNodeOrdering(prev_graph) => {
let node_ordering = prev_graph.get_node_ordering(); let node_ordering = prev_graph.get_node_ordering();
let graph = fast_paths::prepare_with_order(&input_graph, &node_ordering).unwrap(); let graph = fast_paths::prepare_with_order_with_params(
&input_graph,
&node_ordering,
&fast_paths::ParamsWithOrder::new(100),
)
.unwrap();
PathfindEngine::CH { PathfindEngine::CH {
graph, graph,
path_calc: ThreadLocal::new(), path_calc: ThreadLocal::new(),