Skip to content

Add ggridges support #518

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

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Add ggridges support #518

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4371ee8
diagonals first commit
melanielacour Mar 31, 2025
2580049
ggpairs_custom returning the right thing, now we should incorporate i…
rodmellot Mar 31, 2025
96ab3d2
already commit ?
melanielacour Mar 31, 2025
16db9b3
clean code and still working
rodmellot Mar 31, 2025
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
47 changes: 36 additions & 11 deletions R/ggpairs.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,6 @@ stop_if_high_cardinality <- function(data, columns, threshold) {
}
}



#' \pkg{ggplot2} generalized pairs plot for two columns sets of data
#'
#' Make a matrix of plots with a given data set with two different column sets
Expand Down Expand Up @@ -451,7 +449,7 @@ ggduo <- function(
# fix args
if (
!missing(mapping) && !is.list(mapping) &&
!missing(columnsX) && missing(columnsY)
!missing(columnsX) && missing(columnsY)
Copy link

@katossky katossky May 7, 2025

Choose a reason for hiding this comment

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

Try not to submit changes that are only stylistic.

) {
columnsY <- columnsX
columnsX <- mapping
Expand Down Expand Up @@ -495,7 +493,7 @@ ggduo <- function(
axisLabels <- fix_axis_label_choice(axisLabels, c("show", "none"))

# get plot type information
dataTypes <- plot_types(data, columnsX, columnsY, allowDiag = FALSE)
dataTypes <- GGally:::plot_types(data, columnsX, columnsY, allowDiag = FALSE)
Copy link

@katossky katossky May 7, 2025

Choose a reason for hiding this comment

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

Do not use GGally:: form within the GGally package.


ggduoPlots <- lapply(seq_len(nrow(dataTypes)), function(i) {
plotType <- dataTypes[i, "plotType"]
Expand Down Expand Up @@ -523,7 +521,7 @@ ggduo <- function(
plotTypesList <- types
}
args <- list(types = plotTypesList, sectionAes = sectionAes)
plot_fn <- ggmatrix_plot_list(plotType)
plot_fn <- GGally:::ggmatrix_plot_list(plotType)

plotObj <- do.call(plot_fn, args)
return(plotObj)
Expand Down Expand Up @@ -745,6 +743,7 @@ ggduo <- function(
#' pm <- ggpairs(tips, columns = c(2, 3, 5), proportions = c(1, 3, 2))
#' p_(pm)
#'

ggpairs <- function(
data,
mapping = NULL,
Expand Down Expand Up @@ -794,7 +793,7 @@ ggpairs <- function(

if (
!missing(mapping) && !is.list(mapping) &&
missing(columns)
missing(columns)
) {
columns <- mapping
mapping <- NULL
Expand All @@ -815,18 +814,26 @@ ggpairs <- function(
)
diag <- check_and_set_ggpairs_defaults(
"diag", diag,
continuous = "densityDiag", discrete = "barDiag", na = "naDiag",
continuous = "densityDiag",
discrete = "barDiag",
na = "naDiag",
isDiag = TRUE
)

for (key in c("continuous", "discrete", "na")) {
val <- diag[[key]]
if (is.character(val) && val == "ridgeDiag") {
diag[[key]] <- ggridgediag
}
}


axisLabels <- fix_axis_label_choice(axisLabels, c("show", "internal", "none"))

proportions <- ggmatrix_proportions(proportions, data, columns)

# get plot type information
dataTypes <- plot_types(data, columns, columns, allowDiag = TRUE)
dataTypes <- GGally:::plot_types(data, columns, columns, allowDiag = TRUE)

# make internal labels on the diag axis
if (identical(axisLabels, "internal")) {
dataTypes$plotType[dataTypes$posX == dataTypes$posY] <- "label"
}
Expand Down Expand Up @@ -860,7 +867,7 @@ ggpairs <- function(
args$label <- columnLabels[posX]
}

plot_fn <- ggmatrix_plot_list(plotType)
plot_fn <- GGally:::ggmatrix_plot_list(plotType)

p <- do.call(plot_fn, args)

Expand Down Expand Up @@ -1122,6 +1129,24 @@ dput_val <- function(x) {
ret
}

dynamic_cut_number <- function(x, bins = 3) {
unique_vals <- unique(x)
num_bins <- min(length(unique_vals), bins)
cut_number(x, num_bins)
}

ggridgediag <- function(data, mapping, ...) {
var_name <- rlang::as_name(mapping$x)
data <- data %>% mutate(bin = dynamic_cut_number(.data[[var_name]], bins = 3))

ggplot(data, aes(x = .data[[var_name]], y = bin)) +
geom_density_ridges(scale = 1.5, rel_min_height = 0.01, fill = "gray") +
scale_x_continuous(labels = label_number()) +
theme_minimal()
}



# diamondMatrix <- ggpairs(
# diamonds,
# columns = 8:10,
Expand Down