[Lme4-commits] r1829 - in pkg/lme4.0: . R man

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

Author: bbolker
Date: 2013-07-04 20:22:31 +0200 (Thu, 04 Jul 2013)
New Revision: 1829

Modified:
   pkg/lme4.0/DESCRIPTION
   pkg/lme4.0/R/lmer.R
   pkg/lme4.0/man/VarCorr.Rd
   pkg/lme4.0/man/getME.Rd
Log:
VarCorr doc fix; add getME(*,"y")



Modified: pkg/lme4.0/DESCRIPTION
===================================================================
--- pkg/lme4.0/DESCRIPTION	2013-06-29 02:00:26 UTC (rev 1828)
+++ pkg/lme4.0/DESCRIPTION	2013-07-04 18:22:31 UTC (rev 1829)
@@ -1,6 +1,6 @@
 Package: lme4.0
-Version: 0.999999-2
-Date: 2013-04-09
+Version: 0.999999-3
+Date: 2013-07-04
 Title: Linear mixed-effects models using S4 classes
 Description: Fit linear and generalized linear mixed-effects models.
     This is the implementation of lme4 available on CRAN and developed up to 2011.

Modified: pkg/lme4.0/R/lmer.R
===================================================================
--- pkg/lme4.0/R/lmer.R	2013-06-29 02:00:26 UTC (rev 1828)
+++ pkg/lme4.0/R/lmer.R	2013-07-04 18:22:31 UTC (rev 1829)
@@ -2369,7 +2369,7 @@
                   "flist",
                   "RX", "RZX",
                   "beta", "theta",
-		  "REML", "n_rtrms", "is_REML"))
+		  "REML", "n_rtrms", "is_REML", "y"))
 {
     if(missing(name)) stop("'name' must not be missing")
     stopifnot(length(name <- as.character(name)) == 1,
@@ -2383,6 +2383,7 @@
 	   "L" = object at L,
 	   "RX" = object at RX,
 	   "RZX" = object at RZX,
+           "y" = object at y,
            "beta" = unname(object at fixef),
 	   "n_rtrms" = object at dims[["nt"]], ##  = #{random-effect terms in the formula}
 	   "is_REML" = as.logical(object at dims[["REML"]]),

Modified: pkg/lme4.0/man/VarCorr.Rd
===================================================================
--- pkg/lme4.0/man/VarCorr.Rd	2013-06-29 02:00:26 UTC (rev 1828)
+++ pkg/lme4.0/man/VarCorr.Rd	2013-07-04 18:22:31 UTC (rev 1829)
@@ -31,7 +31,11 @@
   deviation are also calculated.
 }
 \value{
-  an object of class \code{VarCorr}.
+  A list with each element containing the variance-covariance matrix for each random
+  effects term, and with an attribute \code{sc} giving the residual
+  standard deviation.  Each element of the list also has attributes
+  \code{stddev} (vector of standard deviations) and \code{correlation}
+  (correlation matrix).
 }
 \seealso{
   the \code{\link{lmer}} function and \code{\linkS4class{mer}} class;

Modified: pkg/lme4.0/man/getME.Rd
===================================================================
--- pkg/lme4.0/man/getME.Rd	2013-06-29 02:00:26 UTC (rev 1828)
+++ pkg/lme4.0/man/getME.Rd	2013-07-04 18:22:31 UTC (rev 1829)
@@ -48,7 +48,7 @@
 }
 \note{\code{isREML(.)} is a synonym for \code{getME(.,"is_REML")}}
 \examples{
-## shows many methds you should consider *before* getME():
+## shows many methods you should consider *before* getME():
 showMethods(class = "mer")
 
 (fm1 <- lmer(Reaction ~ Days + (Days|Subject), sleepstudy))