Skip to content

Commit ac7974f

Browse files
authored
Merge pull request #219 from hadley/dplyr-1.0.0
Fixes for dplyr 1.0.0
2 parents 4ebc2ac + d5f948a commit ac7974f

36 files changed

Lines changed: 799 additions & 722 deletions

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Suggests:
4949
shinystan (>= 2.3.0),
5050
testthat (>= 2.0.0),
5151
vdiffr
52-
RoxygenNote: 7.0.2
52+
RoxygenNote: 7.1.0
5353
VignetteBuilder: knitr
5454
Encoding: UTF-8
5555
Roxygen: list(markdown = TRUE)

R/mcmc-intervals.R

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ mcmc_areas <- function(x,
382382
scale_fill +
383383
scale_y_discrete(
384384
limits = unique(rev(data$parameter)),
385-
expand = expand_scale(add = c(0, .1), mult = c(.1, .3))) +
385+
expand = expansion(add = c(0, .1), mult = c(.1, .3))) +
386386
xlim(x_lim) +
387387
bayesplot_theme_get() +
388388
legend_move(ifelse(color_by_rhat, "top", "none")) +
@@ -528,11 +528,12 @@ mcmc_intervals_data <- function(x,
528528
outer_width = prob_outer,
529529
inner_width = prob,
530530
point_est = point_est,
531-
ll = quantile(.data$value, probs[1]),
532-
l = quantile(.data$value, probs[2]),
531+
ll = unname(quantile(.data$value, probs[1])),
532+
l = unname(quantile(.data$value, probs[2])),
533533
m = m_func(.data$value),
534-
h = quantile(.data$value, probs[3]),
535-
hh = quantile(.data$value, probs[4]))
534+
h = unname(quantile(.data$value, probs[3])),
535+
hh = unname(quantile(.data$value, probs[4]))
536+
)
536537

537538
if (point_est == "none") {
538539
data$m <- NULL

R/ppc-intervals.R

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -298,11 +298,11 @@ label_x <- function(x) {
298298
grouped_d,
299299
outer_width = prob_outer,
300300
inner_width = prob,
301-
ll = quantile(!! val_col, prob = probs[1]),
302-
l = quantile(!! val_col, prob = probs[2]),
303-
m = quantile(!! val_col, prob = probs[3]),
304-
h = quantile(!! val_col, prob = probs[4]),
305-
hh = quantile(!! val_col, prob = probs[5])
301+
ll = unname(quantile(!! val_col, probs = probs[1])),
302+
l = unname(quantile(!! val_col, probs = probs[2])),
303+
m = unname(quantile(!! val_col, probs = probs[3])),
304+
h = unname(quantile(!! val_col, probs = probs[4])),
305+
hh = unname(quantile(!! val_col, probs = probs[5]))
306306
))
307307
}
308308

R/ppc-loo.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,11 +178,11 @@ ppc_loo_pit_overlay <- function(y,
178178
scale_color_ppc_dist(labels = c("PIT", "Unif")) +
179179
scale_x_continuous(
180180
limits = c(.1, .9),
181-
expand = expand_scale(0, 0),
181+
expand = expansion(0, 0),
182182
breaks = seq(from = .1, to = .9, by = .2)) +
183183
scale_y_continuous(
184184
limits = c(0, NA),
185-
expand = expand_scale(mult = c(0, .25))) +
185+
expand = expansion(mult = c(0, .25))) +
186186
bayesplot_theme_get() +
187187
yaxis_title(FALSE) +
188188
xaxis_title(FALSE) +

man/MCMC-intervals.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/MCMC-traces.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/figs/aesthetics/color-scheme-view-brewer-palette.svg

Lines changed: 9 additions & 9 deletions
Loading

tests/figs/aesthetics/color-scheme-view-default.svg

Lines changed: 9 additions & 9 deletions
Loading

tests/figs/aesthetics/color-scheme-view-mixed-scheme.svg

Lines changed: 9 additions & 9 deletions
Loading

tests/figs/aesthetics/color-scheme-view-scheme-specified.svg

Lines changed: 9 additions & 9 deletions
Loading

0 commit comments

Comments
 (0)