Fixed prediction method also for mmclogit objects

pkg/DESCRIPTION

@@ -1,8 +1,8 @@
 Package: mclogit
 Type: Package
 Title: Multinomial Logit Models, with or without Random Effects or Overdispersion
-Version: 0.8.7
-Date: 2020-12-23
+Version: 0.8.7.1
+Date: 2021-01-10
 Author: Martin Elff
 Maintainer: Martin Elff <[email protected]>
 Description: Provides estimators for multinomial logit models in their

pkg/R/mclogit.R

@@ -727,20 +727,19 @@ predict.mmclogit <- function(object, newdata=NULL,type=c("link","response"),se.f
                       contrasts.arg=object$contrasts,
                       xlev=object$xlevels
                       )
+        groups <- random$groups
+        orig.groups <- object$groups
+        olevels <- lapply(orig.groups,levels)
         groups <- mf[groups]
-        groups <- lapply(groups,as.integer)
+        groups <- Map(factor,x=groups,levels=olevels)
         nlev <- length(groups)
         if(nlev > 1){
             for(i in 2:nlev){
-                mm <- attr(all.groups[[i]],"unique")
-                mmm <- cumprod(mm)
-                groups[[i]] <- mmm[i]*groups[[i-1]]+groups[[i]]
+                groups[[i]] <- interaction(groups[c(i-1,i)])
             }
         }
-        Z <- Map(mkZ2,
-                 all.groups=all.groups,
-                 groups=groups,
-                 rX=list(Z))
+        Z <- lapply(groups,mkZ,
+                    rX=Z)
         Z <- blockMatrix(Z)
 
         random.effects <- object$random.effects

pkg/inst/ChangeLog

@@ -1,3 +1,6 @@
+2021-01-10:
+  - Fixed prediction method also for mmclogit objects
+
 2020-12-23:
   - Refactored computations
   - Fixed predictions from random-effects models where group indices are not