Skip to content
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

fix continuity correction #218

Merged
merged 2 commits into from
Nov 8, 2024
Merged

fix continuity correction #218

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7570a9a
Update contingencytables.R
FBartos Nov 8, 2024
dc3586a
Merge branch 'master' into fix-cont-correction
vandenman Nov 8, 2024
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
27 changes: 17 additions & 10 deletions R/contingencytables.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,9 @@ ContingencyTablesInternal <- function(jaspResults, dataset, options, ...) {
groupList <- .crossTabComputeGroups(dataset, options, analysisContainer, analysis, ready) # Compute/get Group List
res <- try(.crossTabTestsRows(analysisContainer, groupList$rows, groupList, options, ready, counts.fp))

if (ready && !.crossTabIs2x2(table(dataset[[analysis[["columns"]]]], dataset[[analysis[["rows"]]]])))
crossTabChisq$addFootnote(gettext("Continuity correction is available only for 2x2 tables."))

.crossTabSetErrorOrFill(res, crossTabChisq)
}
}
Expand Down Expand Up @@ -717,18 +720,22 @@ ContingencyTablesInternal <- function(jaspResults, dataset, options, ...) {
return(unlist(rowNames))
}

.crossTabIs2x2 <- function(counts.matrix) {
return(all(dim(counts.matrix) == 2L))
}

.crossTabMainNote <- function(options) {

if (options$countsObserved) outputType <- gettext("observed counts")
else if (options$countsExpected) outputType <- gettext("expected counts")
else if (options$percentagesRow) outputType <- gettext("row percentages")
else if (options$percentagesColumn) outputType <- gettext("column percentages")
else if (options$percentagesTotal) outputType <- gettext("total percentages")
else if (options$residualsUnstandardized) outputType <- gettext("unstandardized residuals")
else if (options$residualsPearson) outputType <- gettext("Pearson residuals")
else if (options$residualsStandardized) outputType <- gettext("standardized residuals")
if (options$countsObserved) return(gettext("Each cell displays the observed counts"))
else if (options$countsExpected) return(gettext("Each cell displays the expected counts"))
else if (options$percentagesRow) return(gettext("Each cell displays the row percentages"))
else if (options$percentagesColumn) return(gettext("Each cell displays column percentages"))
else if (options$percentagesTotal) return(gettext("Each cell displays total percentages"))
else if (options$residualsUnstandardized) return(gettext("Each cell displays unstandardized residuals"))
else if (options$residualsPearson) return(gettext("Each cell displays Pearson residuals"))
else if (options$residualsStandardized) return(gettext("Each cell displays standardized residuals"))

return(gettextf("Each cell displays the %1$s.", outputType))
stop("unreachable point in .crossTabMainNote was reached!")
}

# Group matrix
Expand Down Expand Up @@ -1080,7 +1087,7 @@ ContingencyTablesInternal <- function(jaspResults, dataset, options, ...) {

row[["type[chiSquared-cc]"]] <- gettextf("%s continuity correction", "\u03A7\u00B2")

if (ready) {
if (ready && .crossTabIs2x2(counts.matrix)) {

chi.result <- try({
chi.result <- stats::chisq.test(counts.matrix)
Expand Down
Loading