Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

levelpath performance #15

Merged
merged 2 commits into from
Sep 3, 2023
Merged

levelpath performance #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a0de25
trying some performance tweaks
dblodgett-usgs Sep 3, 2023
2649b97
test coverage
dblodgett-usgs Sep 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 29 additions & 33 deletions R/add_levelpaths.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,44 +125,40 @@ add_levelpaths.hy <- function(x, name_attribute, weight_attribute,

x <- arrange(x, .data$topo_sort)

topo_sort <- x$topo_sort
to_ind <- make_index_ids(x)

matcher <- pbsapply(x$id, function(id, df) {
which(x$toid == id)
}, df = x, cl = "future")

names(matcher) <- x$id
from_ind <- make_fromids(to_ind, return_list = TRUE)

x$done <- rep(FALSE, nrow(x))

outlets <- filter(x, .data$toid == get_outlet_value(x))
x$ind <- seq_len(nrow(x))
x$toind <- to_ind$to

outlet_ind <- x[which(x$toid == get_outlet_value(x)),]

while(done < nrow(x) & checker < 10000000) {
tail_topo <- outlets$topo_sort

pathids <- if(nrow(outlets) == 1) {
list(par_get_path(as.list(outlets), x, matcher, status, "lp_weight_attribute"))
pathids <- if(nrow(outlet_ind) == 1) {
list(par_get_path(as.list(outlet_ind), x, from_ind, status, "lp_weight_attribute"))
} else {
pblapply(split(outlets, seq_len(nrow(outlets))),
par_get_path,
x_in = x, matcher = matcher,
status = status, wat = "lp_weight_attribute", cl = "future")
lapply(split(outlet_ind, seq_len(nrow(outlet_ind))),
par_get_path,
x_in = x, from_ind = from_ind,
status = status, wat = "lp_weight_attribute")
}

pathids <- bind_rows(pathids)

reset <- match(pathids$id, x$id)

x$levelpath[reset] <- pathids$levelpath

n_reset <- length(reset)
x$levelpath[pathids$ind] <- pathids$levelpath

done <- done + n_reset
done <- done + nrow(pathids)

x$done[reset] <- rep(TRUE, n_reset)
x$done[pathids$ind] <- rep(TRUE, nrow(pathids))

outlets <- x[x$toid %in% pathids$id &
!x$id %in% pathids$id, ]
# grab everything that goes to the path we just followed
outlet_ind <- stats::na.omit(as.numeric(from_ind$froms[, pathids$ind]))
# remove the path we just follwed
outlet_ind <- x[outlet_ind[!outlet_ind %in% pathids$ind],]

checker <- checker + 1

Expand All @@ -175,21 +171,21 @@ add_levelpaths.hy <- function(x, name_attribute, weight_attribute,

x <- put_hyg(x, hy_g)

x <- select(x, all_of(c("id", "toid", "levelpath_outlet_id", "topo_sort", "levelpath")),
!all_of(c("done", "lp_name_attribute", "lp_weight_attribute")))
x <- select(x, all_of(c(id, toid, levelpath_outlet_id, topo_sort, levelpath)),
!all_of(c("done", "lp_name_attribute", "lp_weight_attribute", "ind", "toind")))

x <- left_join(x, select(extra, -any_of(c("levelpath_outlet_id", "topo_sort", "levelpath"))),
by = id)

return(x)
}

par_get_path <- function(outlet, x_in, matcher, status, wat) {
par_get_path <- function(outlet, x_in, from_ind, status, wat) {
out <- get_path(x = x_in,
tailid = outlet[names(outlet) == "id"][[1]],
matcher = matcher,
tailid = outlet[names(outlet) == "ind"][[1]],
from_ind = from_ind,
status = status, wat = wat)
tibble(id = out,
tibble(ind = out,
levelpath = rep(outlet[names(outlet) == "topo_sort"][[1]],
length(out)))
}
Expand All @@ -212,7 +208,7 @@ add_levelpath_outlet_ids <- function(x) {
#' @param override_factor numeric follow weight if this many times larger
#' @param status print status?
#'
get_path <- function(x, tailid, matcher, status, wat) {
get_path <- function(x, tailid, from_ind, status, wat) {

keep_going <- TRUE
tracker <- rep(NA, nrow(x))
Expand All @@ -222,7 +218,7 @@ get_path <- function(x, tailid, matcher, status, wat) {

while(keep_going) {
tryCatch({
next_tails <- x[matcher[[as.character(tailid)]], ]
next_tails <- x[stats::na.omit(from_ind$froms[,tailid]), ]

if(nrow(next_tails) > 1) {

Expand All @@ -236,13 +232,13 @@ get_path <- function(x, tailid, matcher, status, wat) {

}

if(tailid %in% tracker) stop(paste0("loop at", tailid))
# if(tailid %in% tracker) stop(paste0("loop at", tailid))

tracker[counter] <- tailid

counter <- counter + 1

tailid <- next_tails$id
tailid <- next_tails$ind

if(status && counter %% 1000 == 0) message(paste("long mainstem", counter))
}, error = function(e) {
Expand Down
1 change: 1 addition & 0 deletions README.Rmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ knitr::opts_chunk$set(
# hydroloom <img src="man/figures/logo.png" align="right" alt="" width="120" />

[![R-CMD-check](https://github.com/DOI-USGS/hydroloom/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/DOI-USGS/hydroloom/actions/workflows/R-CMD-check.yaml)
[![codecov](https://codecov.io/gh/doi-usgs/hydroloom/branch/main/graph/badge.svg)](https://app.codecov.io/gh/doi-usgs/hydroloom)

## hydroloom:

Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# hydroloom <img src="man/figures/logo.png" align="right" alt="" width="120" />

[![R-CMD-check](https://github.com/DOI-USGS/hydroloom/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/DOI-USGS/hydroloom/actions/workflows/R-CMD-check.yaml)
[![codecov](https://codecov.io/gh/doi-usgs/hydroloom/branch/main/graph/badge.svg)](https://app.codecov.io/gh/doi-usgs/hydroloom)

## hydroloom:

Expand Down
Loading