Skip to content

subplot(): avoid Reduce() when merging lists #1498

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

Merged
merged 3 commits into from
Jul 15, 2019
Merged

subplot(): avoid Reduce() when merging lists #1498

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb2caca
reduce Reduce() for merging lists
alyst Mar 18, 2019
db622ad
ensure_one(): reduce noise if attrs are NULL
alyst Mar 18, 2019
51a8099
Merge branch 'master' into avoid_reduce
cpsievert Apr 4, 2019
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
23 changes: 14 additions & 9 deletions R/subplots.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ subplot <- function(..., nrows = 1, widths = NULL, heights = NULL, margin = 0.02
}

p <- list(
data = Reduce(c, traces),
data = unlist(traces, recursive = FALSE),
layout = Reduce(modify_list, c(xAxes, rev(yAxes)))
)

Expand All @@ -275,9 +275,10 @@ subplot <- function(..., nrows = 1, widths = NULL, heights = NULL, margin = 0.02
annotations <- Map(reposition, annotations, split(domainInfo, seq_along(plots)))
shapes <- Map(reposition, shapes, split(domainInfo, seq_along(plots)))
images <- Map(reposition, images, split(domainInfo, seq_along(plots)))
p$layout$annotations <- Reduce(c, annotations)
p$layout$shapes <- Reduce(c, shapes)
p$layout$images <- Reduce(c, images)
p$layout$annotations <- unlist(annotations, recursive = FALSE)
p$layout$shapes <- unlist(shapes, recursive = FALSE)
p$layout$images <- unlist(images, recursive = FALSE)

# merge non-axis layout stuff
layouts <- lapply(layouts, function(x) {
x[!grepl("^[x-y]axis|^geo|^mapbox|annotations|shapes|images", names(x))] %||% list()
Expand All @@ -290,8 +291,8 @@ subplot <- function(..., nrows = 1, widths = NULL, heights = NULL, margin = 0.02
}
layouts <- layouts[which_layout]
}
p$attrs <- Reduce(c, lapply(plots, "[[", "attrs"))
p$layout <- modify_list(p$layout, Reduce(modify_list, layouts))
p$attrs <- unlist(lapply(plots, "[[", "attrs"), recursive = FALSE)
p$layout <- Reduce(modify_list, layouts, p$layout)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there are a lot of layouts then do.call(modify_list, c(list(p$layout), layouts)) might be better (or something like that with judicious quote() calls added--@wch can give you details if you choose to go the do.call route). If there aren't a lot of layouts then this is fine with me.

p$source <- ensure_one(plots, "source")
p$config <- ensure_one(plots, "config")
p$highlight <- ensure_one(plots, "highlight")
Expand Down Expand Up @@ -338,14 +339,18 @@ dots2plots <- function(...) {
# helper function that warns if more than one plot-level attribute
# has been specified in a list of plots (and returning that attribute)
ensure_one <- function(plots, attr) {
attrs <- lapply(plots, "[", attr)
attrs <- Filter(Negate(is.null), lapply(plots, "[[", attr))
if (length(attrs) == 0) {
warning("No ", attr, " found", call. = FALSE)
return (NULL)
}
for (i in seq_along(attrs)) {
if (!identical(attrs[[1]], attrs[[i]])) {
warning("Can only have one: ", attr, call. = FALSE)
break
}
}
attrs[[length(attrs)]][[1]]
attrs[[length(attrs)]]
}


Expand Down Expand Up @@ -399,7 +404,7 @@ get_domains <- function(nplots = 1, nrows = 1, margins = 0.01,

list2df <- function(x, nms) {
#stopifnot(length(unique(sapply(x, length))) == 1)
m <- if (length(x) == 1) t(x[[1]]) else Reduce(rbind, x)
m <- if (length(x) == 1) t(x[[1]]) else do.call(rbind, x)
row.names(m) <- NULL
df <- data.frame(m)
if (!missing(nms)) setNames(df, nms) else df
Expand Down