Make codebook work with factors that have empty levels

melff · Jul 30, 2020 · bb60f2c · bb60f2c
1 parent bf6cc50
commit bb60f2c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/pkg/DESCRIPTION b/pkg/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: memisc
 Type: Package
 Title: Management of Survey Data and Presentation of Analysis Results
-Version: 0.99.26
-Date: 2020-07-28
+Version: 0.99.26.1
+Date: 2020-07-30
 Author: Martin Elff (with contributions from Christopher N. Lawrence, Dave Atkins, Jason W. Morgan, Achim Zeileis)
 Maintainer: Martin Elff <memisc@elff.eu>
 Description: An infrastructure for the management of survey data including

diff --git a/pkg/R/codebook-methods.R b/pkg/R/codebook-methods.R
@@ -196,7 +196,13 @@ setMethod("codebookEntry","ANY",function(x,weights,unweighted=TRUE,...){
   )
 })
 
-
+rwnexp <- function(mat,nms){
+  res <- array(0,c(length(nms),ncol(mat)),
+               dimnames=list(nms,colnames(mat)))
+  rn <- rownames(mat)
+  res[rn,] <- mat
+  return(res)
+}
 
 codebookTable_factor <- function(x,weights=NULL,...){
 
@@ -205,7 +211,9 @@ codebookTable_factor <- function(x,weights=NULL,...){
 
   isna <- is.na(x)
   counts <- rowsum(weights[!isna],x[!isna])
-
+  lev <- levels(x)
+  counts <- rwnexp(counts,lev)
+
   NAs <- sum(weights*isna)
 
   tab <- cbind(counts,100*counts/sum(counts))

diff --git a/pkg/inst/ChangeLog b/pkg/inst/ChangeLog
@@ -1,3 +1,7 @@
+2020-07-30:
+   - Bugfix: Make codebook work with factors that have empty levels (i.e. no
+     observations for certain levels).
+
 2020-07-28:
    - Added 'mtable' support for 'clmm' objects (package "ordinal"") and improved
      support for 'merMod' objects (package "lme4").