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

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

Author: mmaechler
Date: 2011-10-01 23:11:46 +0200 (Sat, 01 Oct 2011)
New Revision: 1414

Modified:
   pkg/lme4/DESCRIPTION
   pkg/lme4/R/lmer.R
   pkg/lme4/man/getME.Rd
Log:
getME() provisional version - to *RELEASE*

Modified: pkg/lme4/DESCRIPTION
===================================================================
--- pkg/lme4/DESCRIPTION	2011-09-30 23:09:24 UTC (rev 1413)
+++ pkg/lme4/DESCRIPTION	2011-10-01 21:11:46 UTC (rev 1414)
@@ -1,6 +1,6 @@
 Package: lme4
 Version: 0.999375-42
-Date: 2011-08-..
+Date: 2011-10-02
 Title: Linear mixed-effects models using S4 classes
 Author: Douglas Bates <bates at stat.wisc.edu>,
         Martin Maechler <maechler at R-project.org> and

Modified: pkg/lme4/R/lmer.R
===================================================================
--- pkg/lme4/R/lmer.R	2011-09-30 23:09:24 UTC (rev 1413)
+++ pkg/lme4/R/lmer.R	2011-10-01 21:11:46 UTC (rev 1414)
@@ -2371,16 +2371,15 @@
 	   "Zt"= object at Zt,
 	   "Gp" = object at Gp,
 	   "L" = object at L,
-	   "Lambda"= ....,
-	   "Lambdat"= ....,
 	   "RX" = object at RX,
 	   "RZX" = object at RZX,
-           "beta" = ....,
-           "theta"= ....,
-
+           "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"]]),
 
+	   "Lambda"=, ## from object at L  ??
+	   "Lambdat"=,
+           "theta"=,
            "..foo.." =# placeholder!
            stop(gettextf("'%s' is not implemented yet",
                          sprintf("getME(*, \"%s\")", name))),

Modified: pkg/lme4/man/getME.Rd
===================================================================
--- pkg/lme4/man/getME.Rd	2011-09-30 23:09:24 UTC (rev 1413)
+++ pkg/lme4/man/getME.Rd	2011-10-01 21:11:46 UTC (rev 1414)
@@ -43,6 +43,18 @@
 (fm1 <- lmer(Reaction ~ Days + (Days|Subject), sleepstudy))
 Z <- getME(fm1, "Z")
 stopifnot(is(Z, "CsparseMatrix"),
-          c(180,36) == dim(Z))
+          c(180,36) == dim(Z),
+	  all.equal(fixef(fm1), getME(fm1, "beta"),
+		    check.attr=FALSE, tol = 0))
+
+## All that can be accessed [potentially ..]:
+(nmME <- eval(formals(getME)$name))
+
+\dontshow{
+## internal consistency check ensuring that all work:
+## "try(.)" because some are not yet implemented:
+str(parts <- sapply(nmME, function(nm) try(getME(fm1, nm)),
+                    simplify=FALSE))
+}% dont..
 }
 \keyword{utilities}