[Lme4-commits] r1407 - pkg/lme4Eigen/R

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

Author: dmbates
Date: 2011-09-27 20:25:56 +0200 (Tue, 27 Sep 2011)
New Revision: 1407

Modified:
   pkg/lme4Eigen/R/lmer.R
Log:
More components/slots/etc. available in getME()


Modified: pkg/lme4Eigen/R/lmer.R
===================================================================
--- pkg/lme4Eigen/R/lmer.R	2011-09-27 17:35:30 UTC (rev 1406)
+++ pkg/lme4Eigen/R/lmer.R	2011-09-27 18:25:56 UTC (rev 1407)
@@ -977,26 +977,28 @@
     name <- match.arg(name)
     rsp <- object at resp
     PR <- object at pp
+    cmp <- object at devcomp $ cmp
+    dims <- object at devcomp $ dims
     switch(name,
 	   "X" = PR$X, ## ok ? - check -- use model.matrix() method instead?
 	   "Z" = t(PR$Zt),
 	   "Zt"= PR$Zt,
-           "u" = PR$ u0 + PR$ delu(),
-           ## "Gp"
+           "u" = object at u,
 	   "L"= PR$ L(),
 	   "Lambda"= t(PR$ Lambdat),
 	   "Lambdat"= PR$ Lambdat,
-	   "RX" = PR $ RX,
-	   "RZX" = PR $ RZX,
+	   "RX" = PR $ RX(),   ## FIXME - add the column names and row names, either in the C++ or the R method
+	   "RZX" = PR $ RZX(), ## FIXME - add column names
 
-           "beta" = object at beta,
+           "Gp" = object at Gp,
+           "flist" = object at flist,
+           "beta" = object at beta, ## FIXME - add names
            "theta"= object at theta, ## *OR*  PR $ theta  --- which one ??
 
-	   "REML" = rsp $ REML,
-	   "is_REML" = as.logical(rsp $ REML),# correct ??
+	   "REML" = dims["REML"],
+	   "is_REML" = isREML(object),
 
-	   "n_rtrms" =, ## FIXME length(PR$flist), ##  = #{random-effect terms in the formula}
-	   "Gp"= ,  # FIXME
+	   "n_rtrms" = length(object at flist),  ## should this be length(object at cnms) instead?
 	   "..foo.." =# placeholder!
 	   stop(gettextf("'%s' is not implemented yet",
 			 sprintf("getME(*, \"%s\")", name))),