#628

easystats · Sep 2, 2022 · 9c7143d · 9c7143d
1 parent ec1828a
commit 9c7143d
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 45 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -1043,12 +1043,15 @@ S3method(link_function,logitor)
 S3method(link_function,lqm)
 S3method(link_function,lqmm)
 S3method(link_function,lrm)
+S3method(link_function,mblogit)
+S3method(link_function,mclogit)
 S3method(link_function,merModList)
 S3method(link_function,mipo)
 S3method(link_function,mira)
 S3method(link_function,mixed)
 S3method(link_function,mixor)
 S3method(link_function,mlogit)
+S3method(link_function,mmclogit)
 S3method(link_function,model_fit)
 S3method(link_function,multinom)
 S3method(link_function,mvord)
@@ -1153,12 +1156,15 @@ S3method(link_inverse,logitor)
 S3method(link_inverse,lqm)
 S3method(link_inverse,lqmm)
 S3method(link_inverse,lrm)
+S3method(link_inverse,mblogit)
+S3method(link_inverse,mclogit)
 S3method(link_inverse,merModList)
 S3method(link_inverse,mipo)
 S3method(link_inverse,mira)
 S3method(link_inverse,mixed)
 S3method(link_inverse,mixor)
 S3method(link_inverse,mlogit)
+S3method(link_inverse,mmclogit)
 S3method(link_inverse,model_fit)
 S3method(link_inverse,multinom)
 S3method(link_inverse,mvord)
@@ -1277,6 +1283,7 @@ S3method(model_info,lqmm)
 S3method(model_info,lrm)
 S3method(model_info,marginaleffects)
 S3method(model_info,maxLik)
+S3method(model_info,mblogit)
 S3method(model_info,mclogit)
 S3method(model_info,mcmc)
 S3method(model_info,merModList)

diff --git a/R/is_model.R b/R/is_model.R
@@ -117,7 +117,7 @@ is_regression_model <- function(x) {
     "mhurdle", "mipo", "mira", "mixed", "mixor", "MixMod", "mjoint",
     "mle", "mle2", "mlergm", "mlm", "mlma", "mlogit", "model_fit",
     "multinom", "mvmeta", "mvord", "mvr", "marginaleffects",
-    "marginaleffects.summary",
+    "marginaleffects.summary", "mblogit", "mclogit",
 
     # n --------------------
     "negbin", "negbinmfx", "negbinirr", "nlreg", "nlrq", "nls",

diff --git a/R/link_function.R b/R/link_function.R
@@ -206,6 +206,15 @@ link_function.cph <- link_function.multinom
 #' @export
 link_function.mlogit <- link_function.multinom
 
+#' @export
+link_function.mclogit <- link_function.multinom
+
+#' @export
+link_function.mblogit <- link_function.multinom
+
+#' @export
+link_function.mmclogit <- link_function.multinom
+
 #' @export
 link_function.coxph <- link_function.multinom
 

diff --git a/R/link_inverse.R b/R/link_inverse.R
@@ -237,6 +237,15 @@ link_inverse.gmnl <- function(x, ...) {
 #' @export
 link_inverse.mlogit <- link_inverse.gmnl
 
+#' @export
+link_inverse.mclogit <- link_inverse.gmnl
+
+#' @export
+link_inverse.mmclogit <- link_inverse.gmnl
+
+#' @export
+link_inverse.mblogit <- link_inverse.gmnl
+
 #' @export
 link_inverse.BBreg <- link_inverse.gmnl
 

diff --git a/R/model_info.R b/R/model_info.R
@@ -151,132 +151,146 @@ model_info.anova <- function(x, verbose = TRUE, ...) {
 
 
 #' @export
-model_info.mmclogit <- function(x, verbose = TRUE, ...) {
-  .make_family(x, verbose = verbose, ...)
+model_info.mclogit <- function(x, verbose = TRUE, ...) {
+  .make_family(
+    x,
+    family = "categorical",
+    logit.link = TRUE,
+    link.fun = "logit",
+    verbose = verbose,
+    ...
+  )
 }
 
 #' @export
-model_info.maxLik <- model_info.mmclogit
+model_info.mblogit <- model_info.mclogit
 
 #' @export
-model_info.mjoint <- model_info.mmclogit
+model_info.mmclogit <- model_info.mclogit
+
+
+#' @export
+model_info.maxLik <- function(x, verbose = TRUE, ...) {
+  .make_family(x, verbose = verbose, ...)
+}
 
 #' @export
-model_info.censReg <- model_info.mmclogit
+model_info.mjoint <- model_info.maxLik
 
 #' @export
-model_info.htest <- model_info.mmclogit
+model_info.censReg <- model_info.maxLik
 
 #' @export
-model_info.BFBayesFactor <- model_info.mmclogit
+model_info.htest <- model_info.maxLik
 
 #' @export
-model_info.lme <- model_info.mmclogit
+model_info.BFBayesFactor <- model_info.maxLik
 
 #' @export
-model_info.bayesx <- model_info.mmclogit
+model_info.lme <- model_info.maxLik
 
 #' @export
-model_info.rq <- model_info.mmclogit
+model_info.bayesx <- model_info.maxLik
 
 #' @export
-model_info.crq <- model_info.mmclogit
+model_info.rq <- model_info.maxLik
 
 #' @export
-model_info.crqs <- model_info.mmclogit
+model_info.crq <- model_info.maxLik
 
 #' @export
-model_info.nlrq <- model_info.mmclogit
+model_info.crqs <- model_info.maxLik
 
 #' @export
-model_info.rqss <- model_info.mmclogit
+model_info.nlrq <- model_info.maxLik
 
 #' @export
-model_info.mixed <- model_info.mmclogit
+model_info.rqss <- model_info.maxLik
 
 #' @export
-model_info.plm <- model_info.mmclogit
+model_info.mixed <- model_info.maxLik
 
 #' @export
-model_info.mcmc <- model_info.mmclogit
+model_info.plm <- model_info.maxLik
 
 #' @export
-model_info.bayesQR <- model_info.mmclogit
+model_info.mcmc <- model_info.maxLik
 
 #' @export
-model_info.gls <- model_info.mmclogit
+model_info.bayesQR <- model_info.maxLik
 
 #' @export
-model_info.nls <- model_info.mmclogit
+model_info.gls <- model_info.maxLik
 
 #' @export
-model_info.MANOVA <- model_info.mmclogit
+model_info.nls <- model_info.maxLik
 
 #' @export
-model_info.RM <- model_info.mmclogit
+model_info.MANOVA <- model_info.maxLik
 
 #' @export
-model_info.truncreg <- model_info.mmclogit
+model_info.RM <- model_info.maxLik
 
 #' @export
-model_info.lmRob <- model_info.mmclogit
+model_info.truncreg <- model_info.maxLik
 
 #' @export
-model_info.speedlm <- model_info.mmclogit
+model_info.lmRob <- model_info.maxLik
 
 #' @export
-model_info.lmrob <- model_info.mmclogit
+model_info.speedlm <- model_info.maxLik
 
 #' @export
-model_info.complmrob <- model_info.mmclogit
+model_info.lmrob <- model_info.maxLik
 
 #' @export
-model_info.lm_robust <- model_info.mmclogit
+model_info.complmrob <- model_info.maxLik
 
 #' @export
-model_info.iv_robust <- model_info.mmclogit
+model_info.lm_robust <- model_info.maxLik
 
 #' @export
-model_info.systemfit <- model_info.mmclogit
+model_info.iv_robust <- model_info.maxLik
 
 #' @export
-model_info.lqmm <- model_info.mmclogit
+model_info.systemfit <- model_info.maxLik
 
 #' @export
-model_info.lqm <- model_info.mmclogit
+model_info.lqmm <- model_info.maxLik
 
 #' @export
-model_info.felm <- model_info.mmclogit
+model_info.lqm <- model_info.maxLik
 
 #' @export
-model_info.feis <- model_info.mmclogit
+model_info.felm <- model_info.maxLik
 
 #' @export
-model_info.ivreg <- model_info.mmclogit
+model_info.feis <- model_info.maxLik
 
 #' @export
-model_info.ivFixed <- model_info.mmclogit
+model_info.ivreg <- model_info.maxLik
 
 #' @export
-model_info.aovlist <- model_info.mmclogit
+model_info.ivFixed <- model_info.maxLik
 
 #' @export
-model_info.rma <- model_info.mmclogit
+model_info.aovlist <- model_info.maxLik
 
 #' @export
-model_info.meta_random <- model_info.mmclogit
+model_info.rma <- model_info.maxLik
 
 #' @export
-model_info.meta_bma <- model_info.mmclogit
+model_info.meta_random <- model_info.maxLik
 
 #' @export
-model_info.meta_fixed <- model_info.mmclogit
+model_info.meta_bma <- model_info.maxLik
 
 #' @export
-model_info.metaplus <- model_info.mmclogit
+model_info.meta_fixed <- model_info.maxLik
 
 #' @export
-model_info.mclogit <- model_info.mmclogit
+model_info.metaplus <- model_info.maxLik
+
 
 #' @export
 model_info.mlm <- function(x, ...) {

diff --git a/R/utils_model_info.R b/R/utils_model_info.R
@@ -127,7 +127,7 @@
   # multinomial family --------
 
   is.multinomial <-
-    inherits(x, c("gmnl", "mlogit", "DirichletRegModel", "multinom", "brmultinom")) |
+    inherits(x, c("gmnl", "mclogit", "mblogit", "mmclogit", "mlogit", "DirichletRegModel", "multinom", "brmultinom")) |
       fitfam %in% c("cratio", "sratio", "acat", "multinom", "multinomial", "multinomial2", "dirichlet")