-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #182 from poissonconsulting/main
- Loading branch information
Showing
8 changed files
with
80 additions
and
108 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,88 +1,40 @@ | ||
| label_comma <- function(x, digits = 3, big.mark = ",") { | ||
| x <- signif(x, digits = digits) | ||
| y <- as.character(x) | ||
| bol <- !is.na(x) & as.numeric(x) >= 1000 | ||
| y[bol] <- stringr::str_replace_all(y[bol], "(\\d{1,1})(\\d{3,3}(?<=\\.|$))", paste0("\\1", big.mark, "\\2")) | ||
| y | ||
| } | ||
|
|
||
| plot_distributions <- function(x, ylab, xlab, text_size) { | ||
| gp <- ssdtools::ssd_plot_cdf(x, | ||
| ylab = ylab, xlab = xlab, | ||
| delta = Inf, average = NA | ||
| delta = Inf, average = NA, theme_classic = TRUE, text_size = text_size | ||
| ) | ||
| gp <- | ||
| gp + | ||
| ggplot2::theme_classic() + | ||
| ggplot2::theme( | ||
| axis.text = ggplot2::element_text(size = text_size), | ||
| axis.title = ggplot2::element_text(size = text_size), | ||
| legend.title = ggplot2::element_text(size = text_size), | ||
| legend.text = ggplot2::element_text(size = text_size) | ||
| ) | ||
| gp | ||
| } | ||
|
|
||
| bold_conc <- function(conc, breaks) { | ||
| ifelse(breaks == conc, "bold", "plain") | ||
| } | ||
|
|
||
| gp_xbreaks <- function(gp){ | ||
| gp_xbreaks <- function(gp) { | ||
| breaks <- ggplot2::ggplot_build(gp)$layout$panel_params[[1]]$x$breaks | ||
| as.numeric(stats::na.omit(breaks)) | ||
| sort(signif(as.numeric(stats::na.omit(breaks)), 3)) | ||
| } | ||
|
|
||
| plot_predictions <- function(x, pred, conc, label, colour, shape, percent, | ||
| label_adjust, xaxis, yaxis, title, xmin, xmax, palette, | ||
| legend_colour, legend_shape, xbreaks, trans, text_size, | ||
| legend_colour, legend_shape, xbreaks = NULL, trans, text_size, | ||
| label_size, conc_value, big.mark) { | ||
| proportion <- percent / 100 | ||
| if (!length(proportion)) { | ||
| proportion <- NULL | ||
| } | ||
|
|
||
| gp <- ssdtools::ssd_plot(x, pred, | ||
| left = conc, label = label, xbreaks = xbreaks, size = label_size, | ||
| color = colour, shape = shape, hc = proportion, ci = FALSE, | ||
| shift_x = label_adjust %>% as.numeric(), | ||
| xlab = xaxis, ylab = yaxis, trans = trans | ||
| xlimits <- c(xmin, xmax) | ||
| if (is.na(xmin) & is.na(xmax)) { | ||
| xlimits <- NULL | ||
| } | ||
|
|
||
| gp <- ssdtools::ssd_plot(x, | ||
| pred = pred, | ||
| left = conc, label = label, shape = shape, color = colour, | ||
| label_size = label_size, xlab = xaxis, ylab = yaxis, | ||
| ci = FALSE, hc = proportion, shift_x = as.numeric(label_adjust), | ||
| big.mark = big.mark, trans = trans, xlimits = xlimits, | ||
| xbreaks = xbreaks, text_size = text_size, theme_classic = TRUE | ||
| ) + | ||
| ggplot2::scale_x_continuous( | ||
| name = xaxis, breaks = xbreaks, | ||
| limits = c(xmin, xmax), | ||
| labels = function(lab) { | ||
| do.call( | ||
| expression, | ||
| lapply(lab, function(x) { | ||
| mark <- label_comma(x, big.mark = big.mark) | ||
| if (!is.na(x) & x == conc_value) { | ||
| y <- paste0("\n", mark) | ||
| } else { | ||
| y <- mark | ||
| } | ||
| y | ||
| }) | ||
| ) | ||
| } | ||
| ) + | ||
| ggplot2::scale_color_brewer(palette = palette, name = legend_colour) + | ||
| ggplot2::scale_shape(name = legend_shape) | ||
|
|
||
| # get breaks again for bold face as limits convert some to NA | ||
| actual_breaks <- gp_xbreaks(gp) | ||
|
|
||
| gp <- | ||
| gp + | ||
| ggplot2::ggtitle(title) + | ||
| ggplot2::theme_classic() + | ||
| ggplot2::theme( | ||
| axis.text = ggplot2::element_text(color = "black", size = text_size), | ||
| axis.text.x = ggplot2::element_text(face = bold_conc(conc_value, actual_breaks)), | ||
| axis.title = ggplot2::element_text(size = text_size), | ||
| legend.text = ggplot2::element_text(size = text_size), | ||
| legend.title = ggplot2::element_text(size = text_size), | ||
| ) | ||
|
|
||
|
|
||
| gp | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.