version 0.8.5.1

DESCRIPTION

@@ -1,24 +1,27 @@
 Package: mclogit
 Type: Package
-Title: Mixed Conditional Logit Models
-Version: 0.6.1
-Date: 2018-09-26
+Title: Multinomial Logit Models, with or without Random Effects or
+        Overdispersion
+Version: 0.8.5.1
+Date: 2020-06-27
 Author: Martin Elff
 Maintainer: Martin Elff <mclogit@elff.eu>
-Description: Specification and estimation of conditional logit models of binary
-    responses and multinomial counts is provided, with or without
-    random effects. The current implementation of the estimator for random
-    effects variances uses a Laplace approximation (or PQL) approach and thus should
-    be used only if groups sizes are large.
+Description: Provides estimators for multinomial logit models in their
+    conditional logit and baseline logit variants, with or without random effects,
+    with or without overdispersion. 
+    Random effects models are estimated using the PQL technique (based on a Laplace approximation)
+    or the MQL technique (based on a Solomon-Cox approximation). Estimates should be treated
+    with caution if the group sizes are small.
 License: GPL-2
 Depends: stats, Matrix
 Imports: memisc, methods
+Suggests: MASS, nnet
 LazyLoad: Yes
 URL:
         http://www.elff.eu/software/mclogit/,http://github.com/melff/mclogit/
 BugReports: http://github.com/melff/mclogit/issues
-RoxygenNote: 5.0.1
+RoxygenNote: 7.1.0
 NeedsCompilation: no
-Packaged: 2018-09-26 18:19:17 UTC; elff
+Packaged: 2020-06-28 19:23:01 UTC; elff
 Repository: CRAN
-Date/Publication: 2018-09-27 07:40:07 UTC
+Date/Publication: 2020-07-01 16:40:07 UTC

MD5

@@ -1,23 +1,28 @@
-fae68d8a3c92b17b2462ec5bab4199f6 *DESCRIPTION
-8e2f6305165fc3d69a294d09227ba690 *NAMESPACE
+17afe8ac573c522861b4839d631665b1 *DESCRIPTION
+4571d2fcfee83a95a2da51a09be7689e *NAMESPACE
 5f46b25a049e81e86774e78cd294ff89 *R/AIC-mclogit.R
-fda85116896df5934a2ce2b9e3118dee *R/anova-mclogit.R
+a094e3ab8cf76cb83c81915e3199f5b3 *R/anova-mclogit.R
+6b3ff7bb0a6aa03542732e50a57a3936 *R/blockMatrices.R
 825e92e98bee4d5cba8ebbb5bad2f448 *R/getSummary-mblogit.R
-174a746177e5e0ffa74047959c4b59ba *R/getSummary-mclogit.R
-8443552bb939bf83bafc6255125dd6a9 *R/mblogit.R
-e59d1445b41da59347a1d181b9e44025 *R/mclogit-fit.R
-603980cedf43896f5747f90b613b6905 *R/mclogit.R
+172c1ad095181d15a3ac6267422d4e49 *R/getSummary-mclogit.R
+2326ed8abc8fe61028d6e72f58302dfe *R/mblogit.R
+2153774153109c8588f8743d3ca54bfe *R/mclogit-dispersion.R
+97c2d4ce949e3e1fe6ea6f79318e7770 *R/mclogit-fit.R
+73665a63241f8c02229a95bdad41e5cc *R/mclogit.R
+17ad276f4954104fe102a31abb666dce *R/mmclogit-fitPQLMQL.R
 202e8dd6dd5ee19a281df6277484e46c *R/zzz.R
-4a0280d8a6f4bb996c56bfa893b42a05 *data/Transport.rda
-a744f9521c5061a78d8a098e638ab46d *data/electors.rda
+fe1625a190f8a0e4ebec50342fcd3510 *data/Transport.rda
+8f626af2a1cc35f0632fec28e604d404 *data/electors.rda
 de4c63b49c62998527d72c185ceab0d3 *demo/00Index
 6ba2e10f92f3743f465cda6cc059f5a1 *demo/mclogit.test.R
-ca56eafeea6b3baf69fc35ce0f1cd8b9 *inst/ChangeLog
-3108d598ac3ef8fec366d0563fc95d72 *inst/NEWS.Rd
+abeab02da03df6667eab7f296fcb4051 *inst/ChangeLog
+f1e22d308d70ae4b5403f5148132f255 *inst/NEWS.Rd
 c05ff442f7a2312ff8f3d6b5aa96ddeb *man/Transport.Rd
+5ef7eeb790f9d686812407395a93dda9 *man/dispersion.Rd
 6384c0365cb1b46ea7230227dd9c8392 *man/electors.Rd
-5bb2193c1f179dc06510bfd2b8a46dfe *man/getSummary-mclogit.Rd
-215c7ba13f2a1ca831b87c00adfb6e4a *man/mblogit.Rd
-c1493568f138301373475f881ff48877 *man/mclogit.Rd
-2592f185bc66478485d812cd6eaa59d6 *man/mclogit.fit.Rd
-89ef120edb709000ad26477de8194dd7 *man/mclogit_control.Rd
+63859c49419644624290e47c206e1087 *man/getSummary-mclogit.Rd
+70fd8ab2f1d80443c6d03f65cec7bba2 *man/mblogit.Rd
+7371d905f3a1ee580c5165e026204362 *man/mclogit.Rd
+e5473615d04e5ffc8f86cf2e5763b487 *man/mclogit.fit.Rd
+d5ede3a30233cb659a85d69bced029da *man/mclogit_control.Rd
+826973b468cfad32976855f741609ffb *man/simulate.Rd

NAMESPACE

@@ -1,14 +1,17 @@
 import(stats,Matrix)
-importFrom(memisc,getSummary,"%nin%")
+importFrom(memisc,getSummary,"%nin%",Sapply)
 importFrom(methods,as)
 export(
       mclogit,
       mclogit.fit,
-      mmclogit.fitPQL,
+      mmclogit.fitPQLMQL,
       mclogit.control,
+      mmclogit.control,
       getSummary.mclogit,
+      getSummary.mmclogit,
       mblogit,
-      getSummary.mblogit
+      getSummary.mblogit,
+      getSummary.mmblogit
 )
 S3method(print,mclogit)
 S3method(vcov,mclogit)
@@ -25,6 +28,11 @@ S3method(BIC,mclogit)
 S3method(nobs,mclogit)
 S3method(extractAIC,mclogit)
 S3method(anova,mclogit)
+S3method(update,mclogit)
+
+S3method(print,mmclogit)
+S3method(summary,mmclogit)
+S3method(print,summary.mmclogit)
 
 S3method(print,mblogit)
 S3method(summary,mblogit)
@@ -33,10 +41,22 @@ S3method(fitted,mblogit)
 S3method(predict,mblogit)
 S3method(weights,mblogit)
 
-S3method(print,mmclogit)
-S3method(summary,mmclogit)
-S3method(print,summary.mmclogit)
-
 S3method(print,mmblogit)
 S3method(summary,mmblogit)
 S3method(print,summary.mmblogit)
+
+
+export(dispersion)
+S3method(dispersion,mclogit)
+
+S3method(getSummary,mclogit)
+S3method(getSummary,mblogit)
+
+S3method(getSummary,mmclogit)
+S3method(getSummary,mmblogit)
+
+S3method(simulate,mclogit)
+S3method(simulate,mblogit)
+
+S3method(simulate,mmclogit)
+S3method(simulate,mmblogit)

R/anova-mclogit.R

@@ -35,7 +35,7 @@ anova.mclogitlist <- function (object, ..., dispersion = NULL, test = NULL)
   nmodels <- length(object)
   if (nmodels == 1) stop("'anova.mclogit' can only be used to compare fitted models")
 
-  resdf <- as.numeric(lapply(object, function(x) x$residual.df))
+  resdf <- as.numeric(lapply(object, function(x) x$df.residual))
   resdev <- as.numeric(lapply(object, function(x) x$deviance))
   table <- data.frame(resdf, resdev, c(NA, -diff(resdf)), c(NA, 
                                                             -diff(resdev)))