From 22dba06e62636415bb5e744f71282d43a4eb0e7b Mon Sep 17 00:00:00 2001 From: Charles Margossian Date: Mon, 4 Jan 2021 11:31:39 -0500 Subject: [PATCH 1/7] first go: points for ppc ribbon --- R/ppc-intervals.R | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/R/ppc-intervals.R b/R/ppc-intervals.R index 6c82ac4d..8db6475c 100644 --- a/R/ppc-intervals.R +++ b/R/ppc-intervals.R @@ -180,7 +180,8 @@ ppc_ribbon <- function(y, prob = 0.5, prob_outer = 0.9, alpha = 0.33, - size = 0.25) { + size = 0.25, + y_is_point = FALSE) { check_ignored_arguments(...) data <- ppc_intervals_data( @@ -197,7 +198,8 @@ ppc_ribbon <- function(y, size = size, grouped = FALSE, style = "ribbon", - x_lab = label_x(x) + x_lab = label_x(x), + y_is_point = y_is_point ) } @@ -319,7 +321,8 @@ label_x <- function(x) { size = 1, grouped = FALSE, style = c("intervals", "ribbon"), - x_lab = NULL) { + x_lab = NULL, + y_is_point = FALSE) { style <- match.arg(style) @@ -349,11 +352,20 @@ label_x <- function(x) { aes_(color = "yrep"), size = size/2 ) + - geom_blank(aes_(fill = "y")) + - geom_line( + geom_blank(aes_(fill = "y")) + + if (y_is_point) { + graph <- graph + geom_point( + mapping = aes_(y = ~ y_obs, color = "y", fill = "y"), + shape = 21, + size = 1.5 + ) + } else { + graph <- graph + geom_line( aes_(y = ~ y_obs, color = "y"), size = 0.5 ) + } } else { graph <- graph + geom_pointrange( From b1c0bfe83236871b223cd678b538cd717084c866 Mon Sep 17 00:00:00 2001 From: Charles Margossian Date: Mon, 4 Jan 2021 16:51:44 -0500 Subject: [PATCH 2/7] Add line or both options --- R/ppc-intervals.R | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/R/ppc-intervals.R b/R/ppc-intervals.R index 8db6475c..cf0e962a 100644 --- a/R/ppc-intervals.R +++ b/R/ppc-intervals.R @@ -181,7 +181,7 @@ ppc_ribbon <- function(y, prob_outer = 0.9, alpha = 0.33, size = 0.25, - y_is_point = FALSE) { + y_draw = "line") { check_ignored_arguments(...) data <- ppc_intervals_data( @@ -199,7 +199,7 @@ ppc_ribbon <- function(y, grouped = FALSE, style = "ribbon", x_lab = label_x(x), - y_is_point = y_is_point + y_draw = y_draw ) } @@ -322,7 +322,7 @@ label_x <- function(x) { grouped = FALSE, style = c("intervals", "ribbon"), x_lab = NULL, - y_is_point = FALSE) { + y_draw = "line") { style <- match.arg(style) @@ -354,13 +354,15 @@ label_x <- function(x) { ) + geom_blank(aes_(fill = "y")) - if (y_is_point) { + if (y_draw == "point" | y_draw == "both") { graph <- graph + geom_point( mapping = aes_(y = ~ y_obs, color = "y", fill = "y"), shape = 21, size = 1.5 ) - } else { + } + + if (y_draw == "line" | y_draw == "line") { graph <- graph + geom_line( aes_(y = ~ y_obs, color = "y"), size = 0.5 From c4732bbcb13964a91a4849ad50aaea5532d97a28 Mon Sep 17 00:00:00 2001 From: Charles Margossian Date: Mon, 4 Jan 2021 16:55:13 -0500 Subject: [PATCH 3/7] Fix typo --- R/ppc-intervals.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/ppc-intervals.R b/R/ppc-intervals.R index cf0e962a..4f4d1e06 100644 --- a/R/ppc-intervals.R +++ b/R/ppc-intervals.R @@ -362,7 +362,7 @@ label_x <- function(x) { ) } - if (y_draw == "line" | y_draw == "line") { + if (y_draw == "line" | y_draw == "both") { graph <- graph + geom_line( aes_(y = ~ y_obs, color = "y"), size = 0.5 From 95cb06f5c786377d933d7b959ee0fdb1705826ca Mon Sep 17 00:00:00 2001 From: Charles Margossian Date: Fri, 8 Jan 2021 12:05:59 -0500 Subject: [PATCH 4/7] Add line, both options for ribbon and group ribbon. --- R/ppc-intervals.R | 6 +- tests/figs/deps.txt | 2 +- .../ppc-intervals-default.svg | 1094 +++++++------- .../ppc-intervals-grouped-default.svg | 1302 +++++++++-------- .../ppc-intervals-grouped-x-values.svg | 1285 ++++++++-------- .../ppc-intervals-interval-width.svg | 1094 +++++++------- .../ppc-intervals-x-values.svg | 1100 +++++++------- .../ppc-ribbon-default.svg | 106 +- .../ppc-ribbon-interval-width.svg | 106 +- .../ppc-ribbon-x-values.svg | 112 +- tests/testthat/test-ppc-intervals.R | 36 + 11 files changed, 3198 insertions(+), 3045 deletions(-) diff --git a/R/ppc-intervals.R b/R/ppc-intervals.R index 4f4d1e06..e5b4d0da 100644 --- a/R/ppc-intervals.R +++ b/R/ppc-intervals.R @@ -215,7 +215,8 @@ ppc_ribbon_grouped <- function(y, prob = 0.5, prob_outer = 0.9, alpha = 0.33, - size = 0.25) { + size = 0.25, + y_draw = "line") { check_ignored_arguments(...) data <- ppc_intervals_data( @@ -236,7 +237,8 @@ ppc_ribbon_grouped <- function(y, size = size, grouped = TRUE, style = "ribbon", - x_lab = label_x(x) + x_lab = label_x(x), + y_draw = y_draw ) } diff --git a/tests/figs/deps.txt b/tests/figs/deps.txt index f4382ba7..8d7f66b6 100644 --- a/tests/figs/deps.txt +++ b/tests/figs/deps.txt @@ -1,3 +1,3 @@ - vdiffr-svg-engine: 1.0 -- vdiffr: 0.3.2.2 +- vdiffr: 0.3.3 - freetypeharfbuzz: 0.2.5 diff --git a/tests/figs/ppc-intervals-ribbon/ppc-intervals-default.svg b/tests/figs/ppc-intervals-ribbon/ppc-intervals-default.svg index cc07b319..b92febb5 100644 --- a/tests/figs/ppc-intervals-ribbon/ppc-intervals-default.svg +++ b/tests/figs/ppc-intervals-ribbon/ppc-intervals-default.svg @@ -13,554 +13,562 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - --2 --1 -0 -1 -2 -3 - - - - - - - - - - - - -0 -25 -50 -75 -100 -x - - - - - - - - - - -y -y -r -e -p -ppc_intervals (default) +-2 +-1 +0 +1 +2 +3 +0 +25 +50 +75 +100 +x + + + + + + + + + + +y +y +r +e +p +ppc_intervals (default) diff --git a/tests/figs/ppc-intervals-ribbon/ppc-intervals-grouped-default.svg b/tests/figs/ppc-intervals-ribbon/ppc-intervals-grouped-default.svg index f61857ac..762f4eb3 100644 --- a/tests/figs/ppc-intervals-ribbon/ppc-intervals-grouped-default.svg +++ b/tests/figs/ppc-intervals-ribbon/ppc-intervals-grouped-default.svg @@ -13,702 +13,734 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + -C +C - - + + -D +D - - + + -A +A - - + + -B +B - - - - - - - -50 -55 -60 -65 -70 -75 - - - - - - - -75 -80 -85 -90 -95 -100 - - - - - - - -0 -5 -10 -15 -20 -25 - - - - - - - -25 -30 -35 -40 -45 -50 - --2 --1 -0 -1 -2 -3 - - - - - - - --2 --1 -0 -1 -2 - - - - - - --2 --1 -0 -1 -2 - - - - - - --2 --1 -0 -1 -2 - - - - - -x - - - - - - - - - - -y -y -r -e -p -ppc_intervals_grouped (default) +50 +55 +60 +65 +70 +75 +75 +80 +85 +90 +95 +100 +0 +5 +10 +15 +20 +25 +25 +30 +35 +40 +45 +50 +-2 +-1 +0 +1 +2 +3 +-2 +-1 +0 +1 +2 +-2 +-1 +0 +1 +2 +-2 +-1 +0 +1 +2 +x + + + + + + + + + + +y +y +r +e +p +ppc_intervals_grouped (default) diff --git a/tests/figs/ppc-intervals-ribbon/ppc-intervals-grouped-x-values.svg b/tests/figs/ppc-intervals-ribbon/ppc-intervals-grouped-x-values.svg index 59d64967..8cf0534b 100644 --- a/tests/figs/ppc-intervals-ribbon/ppc-intervals-grouped-x-values.svg +++ b/tests/figs/ppc-intervals-ribbon/ppc-intervals-grouped-x-values.svg @@ -13,694 +13,725 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + -C +C - - + + -D +D - - + + -A +A - - + + -B +B - - - - - - --2 --1 -0 -1 -2 - - - - - --1 -0 -1 -2 - - - - - - --2 --1 -0 -1 -2 - - - - - - - --2 --1 -0 -1 -2 -3 - --2 --1 -0 -1 -2 -3 - - - - - - - --2 --1 -0 -1 -2 - - - - - - --2 --1 -0 -1 -2 - - - - - - --2 --1 -0 -1 -2 - - - - - -x - - - - - - - - - - -y -y -r -e -p -ppc_intervals_grouped (x values) +-2 +-1 +0 +1 +2 +-1 +0 +1 +2 +-2 +-1 +0 +1 +2 +-2 +-1 +0 +1 +2 +3 +-2 +-1 +0 +1 +2 +3 +-2 +-1 +0 +1 +2 +-2 +-1 +0 +1 +2 +-2 +-1 +0 +1 +2 +x + + + + + + + + + + +y +y +r +e +p +ppc_intervals_grouped (x values) diff --git a/tests/figs/ppc-intervals-ribbon/ppc-intervals-interval-width.svg b/tests/figs/ppc-intervals-ribbon/ppc-intervals-interval-width.svg index 41e967ac..64f1e2e1 100644 --- a/tests/figs/ppc-intervals-ribbon/ppc-intervals-interval-width.svg +++ b/tests/figs/ppc-intervals-ribbon/ppc-intervals-interval-width.svg @@ -13,554 +13,562 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - --2 --1 -0 -1 -2 -3 - - - - - - - - - - - - -0 -25 -50 -75 -100 -x - - - - - - - - - - -y -y -r -e -p -ppc_intervals (interval width) +-2 +-1 +0 +1 +2 +3 +0 +25 +50 +75 +100 +x + + + + + + + + + + +y +y +r +e +p +ppc_intervals (interval width) diff --git a/tests/figs/ppc-intervals-ribbon/ppc-intervals-x-values.svg b/tests/figs/ppc-intervals-ribbon/ppc-intervals-x-values.svg index 4aef44df..05d95cae 100644 --- a/tests/figs/ppc-intervals-ribbon/ppc-intervals-x-values.svg +++ b/tests/figs/ppc-intervals-ribbon/ppc-intervals-x-values.svg @@ -13,556 +13,566 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - --2 --1 -0 -1 -2 -3 - - - - - - - - - - - - - --2 --1 -0 -1 -2 -3 -x - - - - - - - - - - -y -y -r -e -p -ppc_intervals (x values) +-2 +-1 +0 +1 +2 +3 +-2 +-1 +0 +1 +2 +3 +x + + + + + + + + + + +y +y +r +e +p +ppc_intervals (x values) diff --git a/tests/figs/ppc-intervals-ribbon/ppc-ribbon-default.svg b/tests/figs/ppc-intervals-ribbon/ppc-ribbon-default.svg index cd7711d7..f02febf6 100644 --- a/tests/figs/ppc-intervals-ribbon/ppc-ribbon-default.svg +++ b/tests/figs/ppc-intervals-ribbon/ppc-ribbon-default.svg @@ -13,60 +13,68 @@ - - + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - --2 --1 -0 -1 -2 -3 - - - - - - - - - - - - -0 -25 -50 -75 -100 -x - - - - - - - - -y -y -r -e -p -ppc_ribbon (default) +-2 +-1 +0 +1 +2 +3 +0 +25 +50 +75 +100 +x + + + + + + + + +y +y +r +e +p +ppc_ribbon (default) diff --git a/tests/figs/ppc-intervals-ribbon/ppc-ribbon-interval-width.svg b/tests/figs/ppc-intervals-ribbon/ppc-ribbon-interval-width.svg index b5568087..ac0dd92c 100644 --- a/tests/figs/ppc-intervals-ribbon/ppc-ribbon-interval-width.svg +++ b/tests/figs/ppc-intervals-ribbon/ppc-ribbon-interval-width.svg @@ -13,60 +13,68 @@ - - + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - --2 --1 -0 -1 -2 -3 - - - - - - - - - - - - -0 -25 -50 -75 -100 -x - - - - - - - - -y -y -r -e -p -ppc_ribbon (interval width) +-2 +-1 +0 +1 +2 +3 +0 +25 +50 +75 +100 +x + + + + + + + + +y +y +r +e +p +ppc_ribbon (interval width) diff --git a/tests/figs/ppc-intervals-ribbon/ppc-ribbon-x-values.svg b/tests/figs/ppc-intervals-ribbon/ppc-ribbon-x-values.svg index 3d6518e6..df054d25 100644 --- a/tests/figs/ppc-intervals-ribbon/ppc-ribbon-x-values.svg +++ b/tests/figs/ppc-intervals-ribbon/ppc-ribbon-x-values.svg @@ -13,62 +13,72 @@ - - + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - --2 --1 -0 -1 -2 -3 - - - - - - - - - - - - - --2 --1 -0 -1 -2 -3 -x - - - - - - - - -y -y -r -e -p -ppc_ribbon (x values) +-2 +-1 +0 +1 +2 +3 +-2 +-1 +0 +1 +2 +3 +x + + + + + + + + +y +y +r +e +p +ppc_ribbon (x values) diff --git a/tests/testthat/test-ppc-intervals.R b/tests/testthat/test-ppc-intervals.R index 2ee7b670..fd9b516f 100644 --- a/tests/testthat/test-ppc-intervals.R +++ b/tests/testthat/test-ppc-intervals.R @@ -126,4 +126,40 @@ test_that("ppc_ribbon renders correctly", { p_50 <- ppc_ribbon(vdiff_y, vdiff_yrep, prob = 0.5) vdiffr::expect_doppelganger("ppc_ribbon (interval width)", p_50) + + p_line <- ppc_ribbon(vdiff_y, vdiff_yrep, y_draw = "line") + vdiffr::expect_doppelganger("ppc_intervals (y_draw = line)", p_line) + + p_point <- ppc_ribbon(vdiff_y, vdiff_yrep, y_draw = "point") + vdiffr::expect_doppelganger("ppc_intervals (y_draw = point)", p_point) + + p_both <- ppc_ribbon(vdiff_y, vdiff_yrep, y_draw = "both") + vdiffr::expect_doppelganger("ppc_intervals (y_draw = both)", p_both) +}) + +test_that("ppc_ribbon_grouped renders correctly", { + testthat::skip_on_cran() + testthat::skip_if_not_installed("vdiffr") + + p_base <- ppc_ribbon_grouped(vdiff_y, vdiff_yrep, group = vdiff_group) + vdiffr::expect_doppelganger("ppc_ribbon_grouped (default)", p_base) + + p_line <- ppc_ribbon_grouped(vdiff_y, vdiff_yrep, group = vdiff_group, + y_draw = "line") + vdiffr::expect_doppelganger("ppc_ribbon_grouped (y_draw = line)", p_line) + + p_point <- ppc_ribbon_grouped(vdiff_y, vdiff_yrep, group = vdiff_group, + y_draw = "point") + vdiffr::expect_doppelganger("ppc_ribbon_grouped (y_draw = point)", p_point) + + p_both <- ppc_ribbon_grouped(vdiff_y, vdiff_yrep, group = vdiff_group, + y_draw = "both") + vdiffr::expect_doppelganger("ppc_ribbon_grouped (y_draw = both)", p_both) + + p_x <- ppc_ribbon_grouped( + y = vdiff_y, + yrep = vdiff_yrep, + x = vdiff_y, + group = vdiff_group) + vdiffr::expect_doppelganger("ppc_ribbon_grouped (x values)", p_x) }) From 9713da1ca0f4f916358f9958e4c60d5b3d53e995 Mon Sep 17 00:00:00 2001 From: jgabry Date: Tue, 19 Jan 2021 13:17:00 -0700 Subject: [PATCH 5/7] add doc for y_draw --- R/ppc-intervals.R | 25 ++++++++++++++----------- man/PPC-intervals.Rd | 8 ++++++-- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/R/ppc-intervals.R b/R/ppc-intervals.R index e5b4d0da..902ffcc0 100644 --- a/R/ppc-intervals.R +++ b/R/ppc-intervals.R @@ -173,6 +173,8 @@ ppc_intervals_grouped <- function(y, #' @rdname PPC-intervals #' @export +#' @param y_draw For ribbon plots only, a string specifying how to draw `y. Can +#' be `"line"` (the default), `"points"`, or `"both"`. ppc_ribbon <- function(y, yrep, x = NULL, @@ -181,7 +183,7 @@ ppc_ribbon <- function(y, prob_outer = 0.9, alpha = 0.33, size = 0.25, - y_draw = "line") { + y_draw = c("line", "points", "both")) { check_ignored_arguments(...) data <- ppc_intervals_data( @@ -216,7 +218,7 @@ ppc_ribbon_grouped <- function(y, prob_outer = 0.9, alpha = 0.33, size = 0.25, - y_draw = "line") { + y_draw = c("line", "points", "both")) { check_ignored_arguments(...) data <- ppc_intervals_data( @@ -324,9 +326,10 @@ label_x <- function(x) { grouped = FALSE, style = c("intervals", "ribbon"), x_lab = NULL, - y_draw = "line") { + y_draw = c("line", "points", "both")) { style <- match.arg(style) + y_draw <- match.arg(y_draw) graph <- ggplot( data = data, @@ -356,19 +359,19 @@ label_x <- function(x) { ) + geom_blank(aes_(fill = "y")) - if (y_draw == "point" | y_draw == "both") { + if (y_draw == "line" || y_draw == "both") { + graph <- graph + geom_line( + aes_(y = ~ y_obs, color = "y"), + size = 0.5 + ) + } + + if (y_draw == "points" || y_draw == "both") { graph <- graph + geom_point( mapping = aes_(y = ~ y_obs, color = "y", fill = "y"), shape = 21, size = 1.5 ) - } - - if (y_draw == "line" | y_draw == "both") { - graph <- graph + geom_line( - aes_(y = ~ y_obs, color = "y"), - size = 0.5 - ) } } else { graph <- graph + diff --git a/man/PPC-intervals.Rd b/man/PPC-intervals.Rd index f402f850..738502f2 100644 --- a/man/PPC-intervals.Rd +++ b/man/PPC-intervals.Rd @@ -42,7 +42,8 @@ ppc_ribbon( prob = 0.5, prob_outer = 0.9, alpha = 0.33, - size = 0.25 + size = 0.25, + y_draw = c("line", "points", "both") ) ppc_ribbon_grouped( @@ -55,7 +56,8 @@ ppc_ribbon_grouped( prob = 0.5, prob_outer = 0.9, alpha = 0.33, - size = 0.25 + size = 0.25, + y_draw = c("line", "points", "both") ) ppc_intervals_data( @@ -109,6 +111,8 @@ passed to \code{\link[ggplot2:facet_wrap]{ggplot2::facet_wrap()}} to control fac \item{alpha, size, fatten}{Arguments passed to geoms. For ribbon plots \code{alpha} and \code{size} are passed to \code{\link[ggplot2:geom_ribbon]{ggplot2::geom_ribbon()}}. For interval plots \code{size} and \code{fatten} are passed to \code{\link[ggplot2:geom_linerange]{ggplot2::geom_pointrange()}}.} + +\item{y_draw}{For ribbon plots only, a string specifying how to draw \verb{y. Can be }"line"\verb{(the default),}"points"\verb{, or }"both"`.} } \value{ The plotting functions return a ggplot object that can be further From fca4eab0b759ea988973609db91ec2970076f819 Mon Sep 17 00:00:00 2001 From: jgabry Date: Tue, 19 Jan 2021 13:17:12 -0700 Subject: [PATCH 6/7] update visual test svgs --- .../ppc-intervals-default.svg | 1094 +++++++------- .../ppc-intervals-grouped-default.svg | 1302 ++++++++--------- .../ppc-intervals-grouped-x-values.svg | 1285 ++++++++-------- .../ppc-intervals-interval-width.svg | 1094 +++++++------- .../ppc-intervals-x-values.svg | 1100 +++++++------- .../ppc-intervals-y-draw-both.svg | 174 +++ .../ppc-intervals-y-draw-line.svg | 72 + .../ppc-intervals-y-draw-point.svg | 171 +++ .../ppc-ribbon-default.svg | 106 +- .../ppc-ribbon-grouped-default.svg | 244 +++ .../ppc-ribbon-grouped-x-values.svg | 236 +++ .../ppc-ribbon-grouped-y-draw-both.svg | 346 +++++ .../ppc-ribbon-grouped-y-draw-line.svg | 244 +++ .../ppc-ribbon-grouped-y-draw-point.svg | 340 +++++ .../ppc-ribbon-interval-width.svg | 106 +- .../ppc-ribbon-x-values.svg | 112 +- 16 files changed, 4869 insertions(+), 3157 deletions(-) create mode 100644 tests/figs/ppc-intervals-ribbon/ppc-intervals-y-draw-both.svg create mode 100644 tests/figs/ppc-intervals-ribbon/ppc-intervals-y-draw-line.svg create mode 100644 tests/figs/ppc-intervals-ribbon/ppc-intervals-y-draw-point.svg create mode 100644 tests/figs/ppc-intervals-ribbon/ppc-ribbon-grouped-default.svg create mode 100644 tests/figs/ppc-intervals-ribbon/ppc-ribbon-grouped-x-values.svg create mode 100644 tests/figs/ppc-intervals-ribbon/ppc-ribbon-grouped-y-draw-both.svg create mode 100644 tests/figs/ppc-intervals-ribbon/ppc-ribbon-grouped-y-draw-line.svg create mode 100644 tests/figs/ppc-intervals-ribbon/ppc-ribbon-grouped-y-draw-point.svg diff --git a/tests/figs/ppc-intervals-ribbon/ppc-intervals-default.svg b/tests/figs/ppc-intervals-ribbon/ppc-intervals-default.svg index b92febb5..cc07b319 100644 --- a/tests/figs/ppc-intervals-ribbon/ppc-intervals-default.svg +++ b/tests/figs/ppc-intervals-ribbon/ppc-intervals-default.svg @@ -13,562 +13,554 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --2 --1 -0 -1 -2 -3 -0 -25 -50 -75 -100 -x - - - - - - - - - - -y -y -r -e -p -ppc_intervals (default) + +-2 +-1 +0 +1 +2 +3 + + + + + + + + + + + + +0 +25 +50 +75 +100 +x + + + + + + + + + + +y +y +r +e +p +ppc_intervals (default) diff --git a/tests/figs/ppc-intervals-ribbon/ppc-intervals-grouped-default.svg b/tests/figs/ppc-intervals-ribbon/ppc-intervals-grouped-default.svg index 762f4eb3..f61857ac 100644 --- a/tests/figs/ppc-intervals-ribbon/ppc-intervals-grouped-default.svg +++ b/tests/figs/ppc-intervals-ribbon/ppc-intervals-grouped-default.svg @@ -13,734 +13,702 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + -C +C - - + + -D +D - - + + -A +A - - + + -B +B -50 -55 -60 -65 -70 -75 -75 -80 -85 -90 -95 -100 -0 -5 -10 -15 -20 -25 -25 -30 -35 -40 -45 -50 --2 --1 -0 -1 -2 -3 --2 --1 -0 -1 -2 --2 --1 -0 -1 -2 --2 --1 -0 -1 -2 -x - - - - - - - - - - -y -y -r -e -p -ppc_intervals_grouped (default) + + + + + + + +50 +55 +60 +65 +70 +75 + + + + + + + +75 +80 +85 +90 +95 +100 + + + + + + + +0 +5 +10 +15 +20 +25 + + + + + + + +25 +30 +35 +40 +45 +50 + +-2 +-1 +0 +1 +2 +3 + + + + + + + +-2 +-1 +0 +1 +2 + + + + + + +-2 +-1 +0 +1 +2 + + + + + + +-2 +-1 +0 +1 +2 + + + + + +x + + + + + + + + + + +y +y +r +e +p +ppc_intervals_grouped (default) diff --git a/tests/figs/ppc-intervals-ribbon/ppc-intervals-grouped-x-values.svg b/tests/figs/ppc-intervals-ribbon/ppc-intervals-grouped-x-values.svg index 8cf0534b..59d64967 100644 --- a/tests/figs/ppc-intervals-ribbon/ppc-intervals-grouped-x-values.svg +++ b/tests/figs/ppc-intervals-ribbon/ppc-intervals-grouped-x-values.svg @@ -13,725 +13,694 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + -C +C - - + + -D +D - - + + -A +A - - + + -B +B --2 --1 -0 -1 -2 --1 -0 -1 -2 --2 --1 -0 -1 -2 --2 --1 -0 -1 -2 -3 --2 --1 -0 -1 -2 -3 --2 --1 -0 -1 -2 --2 --1 -0 -1 -2 --2 --1 -0 -1 -2 -x - - - - - - - - - - -y -y -r -e -p -ppc_intervals_grouped (x values) + + + + + + +-2 +-1 +0 +1 +2 + + + + + +-1 +0 +1 +2 + + + + + + +-2 +-1 +0 +1 +2 + + + + + + + +-2 +-1 +0 +1 +2 +3 + +-2 +-1 +0 +1 +2 +3 + + + + + + + +-2 +-1 +0 +1 +2 + + + + + + +-2 +-1 +0 +1 +2 + + + + + + +-2 +-1 +0 +1 +2 + + + + + +x + + + + + + + + + + +y +y +r +e +p +ppc_intervals_grouped (x values) diff --git a/tests/figs/ppc-intervals-ribbon/ppc-intervals-interval-width.svg b/tests/figs/ppc-intervals-ribbon/ppc-intervals-interval-width.svg index 64f1e2e1..41e967ac 100644 --- a/tests/figs/ppc-intervals-ribbon/ppc-intervals-interval-width.svg +++ b/tests/figs/ppc-intervals-ribbon/ppc-intervals-interval-width.svg @@ -13,562 +13,554 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --2 --1 -0 -1 -2 -3 -0 -25 -50 -75 -100 -x - - - - - - - - - - -y -y -r -e -p -ppc_intervals (interval width) + +-2 +-1 +0 +1 +2 +3 + + + + + + + + + + + + +0 +25 +50 +75 +100 +x + + + + + + + + + + +y +y +r +e +p +ppc_intervals (interval width) diff --git a/tests/figs/ppc-intervals-ribbon/ppc-intervals-x-values.svg b/tests/figs/ppc-intervals-ribbon/ppc-intervals-x-values.svg index 05d95cae..4aef44df 100644 --- a/tests/figs/ppc-intervals-ribbon/ppc-intervals-x-values.svg +++ b/tests/figs/ppc-intervals-ribbon/ppc-intervals-x-values.svg @@ -13,566 +13,556 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --2 --1 -0 -1 -2 -3 --2 --1 -0 -1 -2 -3 -x - - - - - - - - - - -y -y -r -e -p -ppc_intervals (x values) + +-2 +-1 +0 +1 +2 +3 + + + + + + + + + + + + + +-2 +-1 +0 +1 +2 +3 +x + + + + + + + + + + +y +y +r +e +p +ppc_intervals (x values) diff --git a/tests/figs/ppc-intervals-ribbon/ppc-intervals-y-draw-both.svg b/tests/figs/ppc-intervals-ribbon/ppc-intervals-y-draw-both.svg new file mode 100644 index 00000000..0165ceb1 --- /dev/null +++ b/tests/figs/ppc-intervals-ribbon/ppc-intervals-y-draw-both.svg @@ -0,0 +1,174 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +-2 +-1 +0 +1 +2 +3 + + + + + + + + + + + + +0 +25 +50 +75 +100 +x + + + + + + + + + + +y +y +r +e +p +ppc_intervals (y_draw = both) + diff --git a/tests/figs/ppc-intervals-ribbon/ppc-intervals-y-draw-line.svg b/tests/figs/ppc-intervals-ribbon/ppc-intervals-y-draw-line.svg new file mode 100644 index 00000000..5e49aa1b --- /dev/null +++ b/tests/figs/ppc-intervals-ribbon/ppc-intervals-y-draw-line.svg @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +-2 +-1 +0 +1 +2 +3 + + + + + + + + + + + + +0 +25 +50 +75 +100 +x + + + + + + + + +y +y +r +e +p +ppc_intervals (y_draw = line) + diff --git a/tests/figs/ppc-intervals-ribbon/ppc-intervals-y-draw-point.svg b/tests/figs/ppc-intervals-ribbon/ppc-intervals-y-draw-point.svg new file mode 100644 index 00000000..dae88c44 --- /dev/null +++ b/tests/figs/ppc-intervals-ribbon/ppc-intervals-y-draw-point.svg @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +-2 +-1 +0 +1 +2 +3 + + + + + + + + + + + + +0 +25 +50 +75 +100 +x + + + + + + + + +y +y +r +e +p +ppc_intervals (y_draw = point) + diff --git a/tests/figs/ppc-intervals-ribbon/ppc-ribbon-default.svg b/tests/figs/ppc-intervals-ribbon/ppc-ribbon-default.svg index f02febf6..cd7711d7 100644 --- a/tests/figs/ppc-intervals-ribbon/ppc-ribbon-default.svg +++ b/tests/figs/ppc-intervals-ribbon/ppc-ribbon-default.svg @@ -13,68 +13,60 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + --2 --1 -0 -1 -2 -3 -0 -25 -50 -75 -100 -x - - - - - - - - -y -y -r -e -p -ppc_ribbon (default) + +-2 +-1 +0 +1 +2 +3 + + + + + + + + + + + + +0 +25 +50 +75 +100 +x + + + + + + + + +y +y +r +e +p +ppc_ribbon (default) diff --git a/tests/figs/ppc-intervals-ribbon/ppc-ribbon-grouped-default.svg b/tests/figs/ppc-intervals-ribbon/ppc-ribbon-grouped-default.svg new file mode 100644 index 00000000..a5b32dde --- /dev/null +++ b/tests/figs/ppc-intervals-ribbon/ppc-ribbon-grouped-default.svg @@ -0,0 +1,244 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +C + + + + + + + + + + +D + + + + + + + + + + +A + + + + + + + + + + +B + + + + + + + + + + + + +50 +55 +60 +65 +70 +75 + + + + + + + +75 +80 +85 +90 +95 +100 + + + + + + + +0 +5 +10 +15 +20 +25 + + + + + + + +25 +30 +35 +40 +45 +50 + +-2 +-1 +0 +1 +2 +3 + + + + + + + +-2 +-1 +0 +1 +2 + + + + + + +-2 +-1 +0 +1 +2 + + + + + + +-2 +-1 +0 +1 +2 + + + + + +x + + + + + + + + +y +y +r +e +p +ppc_ribbon_grouped (default) + diff --git a/tests/figs/ppc-intervals-ribbon/ppc-ribbon-grouped-x-values.svg b/tests/figs/ppc-intervals-ribbon/ppc-ribbon-grouped-x-values.svg new file mode 100644 index 00000000..7bf73dd2 --- /dev/null +++ b/tests/figs/ppc-intervals-ribbon/ppc-ribbon-grouped-x-values.svg @@ -0,0 +1,236 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +C + + + + + + + + + + +D + + + + + + + + + + +A + + + + + + + + + + +B + + + + + + + + + + + +-2 +-1 +0 +1 +2 + + + + + +-1 +0 +1 +2 + + + + + + +-2 +-1 +0 +1 +2 + + + + + + + +-2 +-1 +0 +1 +2 +3 + +-2 +-1 +0 +1 +2 +3 + + + + + + + +-2 +-1 +0 +1 +2 + + + + + + +-2 +-1 +0 +1 +2 + + + + + + +-2 +-1 +0 +1 +2 + + + + + +x + + + + + + + + +y +y +r +e +p +ppc_ribbon_grouped (x values) + diff --git a/tests/figs/ppc-intervals-ribbon/ppc-ribbon-grouped-y-draw-both.svg b/tests/figs/ppc-intervals-ribbon/ppc-ribbon-grouped-y-draw-both.svg new file mode 100644 index 00000000..c143866b --- /dev/null +++ b/tests/figs/ppc-intervals-ribbon/ppc-ribbon-grouped-y-draw-both.svg @@ -0,0 +1,346 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +C + + + + + + + + + + +D + + + + + + + + + + +A + + + + + + + + + + +B + + + + + + + + + + + + +50 +55 +60 +65 +70 +75 + + + + + + + +75 +80 +85 +90 +95 +100 + + + + + + + +0 +5 +10 +15 +20 +25 + + + + + + + +25 +30 +35 +40 +45 +50 + +-2 +-1 +0 +1 +2 +3 + + + + + + + +-2 +-1 +0 +1 +2 + + + + + + +-2 +-1 +0 +1 +2 + + + + + + +-2 +-1 +0 +1 +2 + + + + + +x + + + + + + + + + + +y +y +r +e +p +ppc_ribbon_grouped (y_draw = both) + diff --git a/tests/figs/ppc-intervals-ribbon/ppc-ribbon-grouped-y-draw-line.svg b/tests/figs/ppc-intervals-ribbon/ppc-ribbon-grouped-y-draw-line.svg new file mode 100644 index 00000000..a111e3cb --- /dev/null +++ b/tests/figs/ppc-intervals-ribbon/ppc-ribbon-grouped-y-draw-line.svg @@ -0,0 +1,244 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +C + + + + + + + + + + +D + + + + + + + + + + +A + + + + + + + + + + +B + + + + + + + + + + + + +50 +55 +60 +65 +70 +75 + + + + + + + +75 +80 +85 +90 +95 +100 + + + + + + + +0 +5 +10 +15 +20 +25 + + + + + + + +25 +30 +35 +40 +45 +50 + +-2 +-1 +0 +1 +2 +3 + + + + + + + +-2 +-1 +0 +1 +2 + + + + + + +-2 +-1 +0 +1 +2 + + + + + + +-2 +-1 +0 +1 +2 + + + + + +x + + + + + + + + +y +y +r +e +p +ppc_ribbon_grouped (y_draw = line) + diff --git a/tests/figs/ppc-intervals-ribbon/ppc-ribbon-grouped-y-draw-point.svg b/tests/figs/ppc-intervals-ribbon/ppc-ribbon-grouped-y-draw-point.svg new file mode 100644 index 00000000..1c3ba2e7 --- /dev/null +++ b/tests/figs/ppc-intervals-ribbon/ppc-ribbon-grouped-y-draw-point.svg @@ -0,0 +1,340 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +C + + + + + + + + + + +D + + + + + + + + + + +A + + + + + + + + + + +B + + + + + + + + + + + + +50 +55 +60 +65 +70 +75 + + + + + + + +75 +80 +85 +90 +95 +100 + + + + + + + +0 +5 +10 +15 +20 +25 + + + + + + + +25 +30 +35 +40 +45 +50 + +-2 +-1 +0 +1 +2 +3 + + + + + + + +-2 +-1 +0 +1 +2 + + + + + + +-2 +-1 +0 +1 +2 + + + + + + +-2 +-1 +0 +1 +2 + + + + + +x + + + + + + + + +y +y +r +e +p +ppc_ribbon_grouped (y_draw = point) + diff --git a/tests/figs/ppc-intervals-ribbon/ppc-ribbon-interval-width.svg b/tests/figs/ppc-intervals-ribbon/ppc-ribbon-interval-width.svg index ac0dd92c..b5568087 100644 --- a/tests/figs/ppc-intervals-ribbon/ppc-ribbon-interval-width.svg +++ b/tests/figs/ppc-intervals-ribbon/ppc-ribbon-interval-width.svg @@ -13,68 +13,60 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + --2 --1 -0 -1 -2 -3 -0 -25 -50 -75 -100 -x - - - - - - - - -y -y -r -e -p -ppc_ribbon (interval width) + +-2 +-1 +0 +1 +2 +3 + + + + + + + + + + + + +0 +25 +50 +75 +100 +x + + + + + + + + +y +y +r +e +p +ppc_ribbon (interval width) diff --git a/tests/figs/ppc-intervals-ribbon/ppc-ribbon-x-values.svg b/tests/figs/ppc-intervals-ribbon/ppc-ribbon-x-values.svg index df054d25..3d6518e6 100644 --- a/tests/figs/ppc-intervals-ribbon/ppc-ribbon-x-values.svg +++ b/tests/figs/ppc-intervals-ribbon/ppc-ribbon-x-values.svg @@ -13,72 +13,62 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + --2 --1 -0 -1 -2 -3 --2 --1 -0 -1 -2 -3 -x - - - - - - - - -y -y -r -e -p -ppc_ribbon (x values) + +-2 +-1 +0 +1 +2 +3 + + + + + + + + + + + + + +-2 +-1 +0 +1 +2 +3 +x + + + + + + + + +y +y +r +e +p +ppc_ribbon (x values) From 31699020c2aac33a9fa9b2fb3b3740b488eb5be4 Mon Sep 17 00:00:00 2001 From: jgabry Date: Wed, 20 Jan 2021 09:54:22 -0700 Subject: [PATCH 7/7] fix typo in doc --- R/ppc-intervals.R | 2 +- man/PPC-intervals.Rd | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/R/ppc-intervals.R b/R/ppc-intervals.R index 902ffcc0..5571af06 100644 --- a/R/ppc-intervals.R +++ b/R/ppc-intervals.R @@ -173,7 +173,7 @@ ppc_intervals_grouped <- function(y, #' @rdname PPC-intervals #' @export -#' @param y_draw For ribbon plots only, a string specifying how to draw `y. Can +#' @param y_draw For ribbon plots only, a string specifying how to draw `y`. Can #' be `"line"` (the default), `"points"`, or `"both"`. ppc_ribbon <- function(y, yrep, diff --git a/man/PPC-intervals.Rd b/man/PPC-intervals.Rd index 738502f2..0c58809a 100644 --- a/man/PPC-intervals.Rd +++ b/man/PPC-intervals.Rd @@ -112,7 +112,8 @@ passed to \code{\link[ggplot2:facet_wrap]{ggplot2::facet_wrap()}} to control fac and \code{size} are passed to \code{\link[ggplot2:geom_ribbon]{ggplot2::geom_ribbon()}}. For interval plots \code{size} and \code{fatten} are passed to \code{\link[ggplot2:geom_linerange]{ggplot2::geom_pointrange()}}.} -\item{y_draw}{For ribbon plots only, a string specifying how to draw \verb{y. Can be }"line"\verb{(the default),}"points"\verb{, or }"both"`.} +\item{y_draw}{For ribbon plots only, a string specifying how to draw \code{y}. Can +be \code{"line"} (the default), \code{"points"}, or \code{"both"}.} } \value{ The plotting functions return a ggplot object that can be further