desc, news

NEWS.md

@@ -25,6 +25,9 @@
   of class `clmm` (package *ordinal*), when model had no `component` column
   (e.g., no scale or location parameters were returned).
 
+* `include_reference` now also works when factor were created "on-the-fly" inside
+  the model formula (i.e. `y ~ as.factor(x)`).
+
 # parameters 0.21.5
 
 ## Bug fixes

R/utils.R

@@ -152,8 +152,8 @@
   # extract all model terms, we now have "as.factor(term)" etc., if any
   if (!is.null(model_terms$conditional)) {
     # extract variable names from "as.factor(term)" etc.
-    factor_terms <- grep("(as\\.factor|factor)", model_terms$conditional, value = TRUE)
-    cleaned <- gsub("(as\\.factor|factor)\\((.*)\\)", "\\2", factor_terms)
+    factor_terms <- grep("(as\\.factor|factor|as\\.character)", model_terms$conditional, value = TRUE)
+    cleaned <- gsub("(as\\.factor|factor|as\\.character)\\((.*)\\)", "\\2", factor_terms)
     # convert on-the-fly factors into real factors
     if (length(cleaned)) {
       for (i in seq_along(cleaned)) {

R/utils_format.R

@@ -422,8 +422,8 @@
 
       # for on-the-fly conversion of factors, the names of the factors can
       # can also contain "factor()" or "as.factor()" - we need to remove these
-      if (any(grepl("(as\\.factor|factor)", fn))) {
-        fn_clean <- gsub("(as\\.factor|factor)\\((.*)\\)", "\\2", fn)
+      if (any(grepl("(as\\.factor|factor|as\\.character)", fn))) {
+        fn_clean <- gsub("(as\\.factor|factor|as\\.character)\\((.*)\\)", "\\2", fn)
       } else {
         fn_clean <- fn
       }