[Lme4-commits] r1680 - in pkg/lme4.0: . R inst/doc man tests

[noreply at r-forge.r-project.org]

Author: bbolker
Date: 2012-03-19 19:32:57 +0100 (Mon, 19 Mar 2012)
New Revision: 1680

Modified:
   pkg/lme4.0/NAMESPACE
   pkg/lme4.0/R/lmer.R
   pkg/lme4.0/inst/doc/Implementation.pdf
   pkg/lme4.0/man/getME.Rd
   pkg/lme4.0/tests/getME.R
Log:

   added isREML() for forward-compatibility with lme4 (request of A. Galecki)
   compacted PDF (suggestion of R CMD check)



Modified: pkg/lme4.0/NAMESPACE
===================================================================
--- pkg/lme4.0/NAMESPACE	2012-03-19 18:24:07 UTC (rev 1679)
+++ pkg/lme4.0/NAMESPACE	2012-03-19 18:32:57 UTC (rev 1680)
@@ -32,6 +32,7 @@
 export(AIC, BIC, logLik)
 ## and the rest (S3 generics; regular functions):
 export("HPDinterval", "getME",
+       "isREML",
        "glmer",
        #"gsummary", "hatTrace",
        "lmList",

Modified: pkg/lme4.0/R/lmer.R
===================================================================
--- pkg/lme4.0/R/lmer.R	2012-03-19 18:24:07 UTC (rev 1679)
+++ pkg/lme4.0/R/lmer.R	2012-03-19 18:32:57 UTC (rev 1680)
@@ -2344,6 +2344,11 @@
 ##  @dims['REML']
 ##  @dims['nt']
 
+##' @rdname getME
+##' @param x [ng]lmer() fit
+isREML <- function(object) {
+    getME(object,"is_REML")
+}
 
 ##' "Generalized Extractor" -- the version for classical lme4
 ##' @param object [ng]lmer() fit

Modified: pkg/lme4.0/inst/doc/Implementation.pdf
===================================================================
(Binary files differ)

Modified: pkg/lme4.0/man/getME.Rd
===================================================================
--- pkg/lme4.0/man/getME.Rd	2012-03-19 18:24:07 UTC (rev 1679)
+++ pkg/lme4.0/man/getME.Rd	2012-03-19 18:32:57 UTC (rev 1680)
@@ -1,5 +1,6 @@
 \name{getME}
 \alias{getME}
+\alias{isREML}
 \title{Extract or Get Generalize Components from a Fitted Mixed Effects Model}
 \description{
   Extract (or \dQuote{get}) \dQuote{components} -- in a generalized
@@ -13,6 +14,7 @@
 }
 \usage{
 getME(object, name)
+isREML(object)
 }
 \arguments{
   \item{object}{a fitted mixed-effects model of class
@@ -36,6 +38,7 @@
   \code{\link{fixef}},
   \code{\link{vcov}}, etc.
 }
+\note{\code{isREML(.)} is a synonym for \code{getME(.,"is_REML")}}
 \examples{
 ## shows many methds you should consider *before* getME():
 showMethods(class = "mer")

Modified: pkg/lme4.0/tests/getME.R
===================================================================
--- pkg/lme4.0/tests/getME.R	2012-03-19 18:24:07 UTC (rev 1679)
+++ pkg/lme4.0/tests/getME.R	2012-03-19 18:32:57 UTC (rev 1680)
@@ -44,3 +44,5 @@
 chkMEs(fm2, nmME)
 chkMEs(fm3, nmME)
 chkMEs(fm4, nmME)
+
+isREML(fm1)