Fix handling of summary statistics in combined 'mtable' results

melff · Nov 1, 2018 · 70d0145 · 70d0145
1 parent ddbf1f1
commit 70d0145
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/pkg/R/mtable-manip.R b/pkg/R/mtable-manip.R
@@ -168,7 +168,7 @@ combine_mtables <- function(...){
     parameter.names <- unique(unlist(parameter.names))
 
     summary.stats <- lapply(args,get.summary.stats)
-    summary.stats <- unique(unlist(summary.stats))
+    summary.stats <- unlist(summary.stats,recursive=FALSE)
 
     signif.symbols <- attr(args[[1]],"signif.symbols")       
     factor.style <- attr(args[[1]],"factor.style")

diff --git a/pkg/R/mtable.R b/pkg/R/mtable.R
@@ -84,9 +84,12 @@ selectSummaryStats <- function(x,n) {
     else if(isTRUE(n)){
         cls <- class(x)
         sumstats.name <- paste0("summary.stats.",cls)
-        sumstats <- getOption(sumstats.name)
-
-        if(!length(sumstats))
+        sumstats <- lapply(sumstats.name,getOption)
+        if(length(sumstats)){
+            sumstats <- unlist(sumstats)
+            sumstats[1]
+        }
+        else
             sumstats <- getOption("summary.stats.default")
         sumstats
     }
@@ -402,7 +405,7 @@ relabel.memisc_mtable <- function(x,...,gsub=FALSE,fixed=!gsub,warn=FALSE){
 
 pt_getrow <- function(x,i){
     y <- x[i,]
-    yisn <- sapply(y,is.null)
+    isn <- sapply(y,is.null)
     if(any(isn)) return(y[!isn])
     else return(y)
 }