Skip to content

RS-18683: Some additional fixes for Standard R Tests #82

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
chschan merged 6 commits into from
May 21, 2025
Merged

RS-18683: Some additional fixes for Standard R Tests #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
27fa514
Undo last commit
chschan May 21, 2025
8254d3e
Preserve statistic attribute in non QTables
chschan May 21, 2025
8a617c5
Fix typo
chschan May 21, 2025
e404bec
Fix heatmap
chschan May 21, 2025
c4a70fc
Undo unnecessary revert
chschan May 21, 2025
e5e08ea
Handle all attributes not just the statistic
chschan May 21, 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
20 changes: 15 additions & 5 deletions R/preparedata.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,8 +503,12 @@ PrepareData <- function(chart.type,
###########################################################################
# Finalizing the result.
###########################################################################


if (chart.type == "Heat" && inherits(data, "QTable"))
{
# Remove QTable class for heatmap to avoid problems with column binding
data.class <- class(data)
class(data) <- setdiff(data.class, "QTable")
}
if (!inherits(data, "QTable") && !is.null(attr(data, "span")))
attr(data, "span") <- NULL
if (tidy.labels)
Expand Down Expand Up @@ -1422,11 +1426,17 @@ transformTable <- function(data,
attr(data, "questions") <- rev(attr(data, "questions"))
if (!is.null(old.span))
attr(data, "span") <- list(rows = old.span$columns, columns = old.span$rows)
} else {
} else if (inherits(data, "QTable"))
{
# Attributes handled by verbs (for QTables)
data <- t(data)
if (!inherits(data, "QTable"))
attr(data, "questions") <- rev(attr(data, "questions"))

} else
{
# Handle attributes ourself
new.data <- t(data)
data <- CopyAttributes(new.data, data)
attr(data, "questions") <- rev(attr(data, "questions"))
}
}

Expand Down
3 changes: 3 additions & 0 deletions tests/testthat/test-preparedata-tidytable.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,5 +743,8 @@ test_that("Table with Spans", {
"I typically eat and drink whatever I feel like", "Male")), names = c("",
""), row.names = c(1L, 2L, 3L, 5L), class = "data.frame")))

expect_error(res <- PrepareData("Heat", input.data.table = tb2d.with.rowspan), NA)
expect_equal(class(res$data), c("matrix", "array"))

remove(ALLOW.QTABLE.CLASS, envir = .GlobalEnv)
})
Loading