bug fixes in getting factor levels, updated cran comments

Author: jhelvy

CRAN-SUBMISSION

@@ -53,7 +53,6 @@ dummyCode <- function(df, vars) {
 #' result$randPars
 #' head(result$X)
 recodeData <- function(data, pars, randPars) {
-  data <- as.data.frame(data) # tibbles break things
   data <- orderedFactorsToChars(data) # ordered factors cause weird names
   formula <- stats::as.formula(paste0("~ ", paste(pars, collapse = " + ")))
   X <- getDesignMatrix(formula, data)
@@ -83,6 +82,12 @@ getColumnTypes <- function(data) {
 }
 
 getFactorLevels <- function(data, pars) {
+  # Separate out interactions
+  ints <- grepl("\\*", pars)
+  if (any(ints)) {
+    pars <- pars[ints == FALSE]
+  }
+  factorLevels <- NULL
   parTypes <- getParTypes(data, pars)
   discrete <- parTypes$discrete
   if (!is.null(discrete)) {

R/encoding.R

@@ -49,6 +49,7 @@ getModelInputs <- function(
 
   # Get the design matrix, recoding parameters that are categorical
   # or have interactions
+  data <- as.data.frame(data) # tibbles break things
   factorLevels <- getFactorLevels(data, pars) # need to store for predicting
   recoded <- recodeData(data, pars, randPars)
   formula <- recoded$formula

R/modelInputs.R

@@ -8,3 +8,4 @@
 
 ## Notes
 * This is a new release.
+* The DOI <doi:10.18637/jss.v105.i10> in the CITATION and DESCRIPTION is for a new JSS publication that will be registered after publication on CRAN.

cran-comments.md

@@ -70,7 +70,8 @@ mnl_pref_dummies <- logitr(
   outcome = 'choice',
   obsID   = 'obsID',
   pars    = c(
-    'price', 'feat', 'brand_yoplait', 'brand_dannon', 'brand_weight')
+    'price', 'feat', 'brand_yoplait', 'brand_dannon', 'brand_weight'
+  )
 )
 
 summary(mnl_pref_dummies)