Skip to content
Open
Changes from 2 commits
Commits
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
18 changes: 16 additions & 2 deletions R/classicalmetaanalysiscommon.R
Original file line number Diff line number Diff line change
Expand Up @@ -865,6 +865,7 @@ ClassicalMetaAnalysisCommon <- function(jaspResults, dataset, options, ...) {
pooledEstimatesTable$addColumnInfo(name = "par", type = "string", title = "")
.maAddSubgroupColumn(pooledEstimatesTable, options)
pooledEstimatesTable$addColumnInfo(name = "est", type = "number", title = gettext("Estimate"))
.maAddSeColumn(pooledEstimatesTable, options)
.maAddCiColumn(pooledEstimatesTable, options)
.maAddPiColumn(pooledEstimatesTable, options)
if (options[["predictionIntervals"]] && .mammHasMultipleHeterogeneities(options, canAddOutput = TRUE)) {
Expand Down Expand Up @@ -1340,6 +1341,7 @@ ClassicalMetaAnalysisCommon <- function(jaspResults, dataset, options, ...) {
estimatedMarginalMeansTable$addColumnInfo(name = "value", type = "string", title = gettext("Level"))
.maAddSubgroupColumn(estimatedMarginalMeansTable, options)
estimatedMarginalMeansTable$addColumnInfo(name = "est", type = "number", title = gettext("Estimate"))
.maAddSeColumn(estimatedMarginalMeansTable, options)
.maAddCiColumn(estimatedMarginalMeansTable, options)
if (parameter == "effectSize") {
.maAddPiColumn(estimatedMarginalMeansTable, options)
Expand Down Expand Up @@ -1401,6 +1403,7 @@ ClassicalMetaAnalysisCommon <- function(jaspResults, dataset, options, ...) {
contrastsTable$addColumnInfo(name = "comparison", type = "string", title = gettext("Comparison"))
.maAddSubgroupColumn(contrastsTable, options)
contrastsTable$addColumnInfo(name = "est", type = "number", title = gettext("Estimate"))
.maAddSeColumn(contrastsTable, options)
.maAddCiColumn(contrastsTable, options)
if (parameter == "effectSize") {
.maAddPiColumn(contrastsTable, options)
Expand Down Expand Up @@ -2286,6 +2289,7 @@ ClassicalMetaAnalysisCommon <- function(jaspResults, dataset, options, ...) {
# remove non-requested columns
predictedEffect <- predictedEffect[,c(
"par", "est",
if (options[["transformEffectSize"]] == "none") "se",
if (options[["confidenceIntervals"]]) c("lCi", "uCi"),
if (options[["predictionIntervals"]]) c("lPi", "uPi")
)]
Expand Down Expand Up @@ -2939,7 +2943,8 @@ ClassicalMetaAnalysisCommon <- function(jaspResults, dataset, options, ...) {


# remove unnecessary columns
computedMarginalMeans <- computedMarginalMeans[,!colnames(computedMarginalMeans) %in% "se", drop = FALSE]
seColumnsToRemove <- if (options[["transformEffectSize"]] == "none") character(0) else "se"
computedMarginalMeans <- computedMarginalMeans[,!colnames(computedMarginalMeans) %in% seColumnsToRemove, drop = FALSE]

if (!options[["confidenceIntervals"]])
computedMarginalMeans <- computedMarginalMeans[,!colnames(computedMarginalMeans) %in% c("lCi", "uCi"), drop = FALSE]
Expand Down Expand Up @@ -3107,7 +3112,8 @@ ClassicalMetaAnalysisCommon <- function(jaspResults, dataset, options, ...) {
computedContrasts <- .maExtractAndFormatPrediction(computedContrasts)

# remove unnecessary columns
computedContrasts <- computedContrasts[,!colnames(computedContrasts) %in% "se", drop = FALSE]
seColumnsToRemove <- if (options[["transformEffectSize"]] == "none") character(0) else "se"
computedContrasts <- computedContrasts[,!colnames(computedContrasts) %in% seColumnsToRemove, drop = FALSE]

if (!options[["confidenceIntervals"]])
computedContrasts <- computedContrasts[,!colnames(computedContrasts) %in% c("lCi", "uCi"), drop = FALSE]
Expand Down Expand Up @@ -4715,6 +4721,14 @@ ClassicalMetaAnalysisCommon <- function(jaspResults, dataset, options, ...) {

return(tempTable)
}
.maAddSeColumn <- function(tempTable, options) {

if (options[["transformEffectSize"]] == "none") {
tempTable$addColumnInfo(name = "se", title = gettext("SE"), type = "number")
}

return(tempTable)
}
.maAddSubgroupColumn <- function(tempTable, options) {

if (options[["subgroup"]] != "")
Expand Down