[Lme4-commits] r1405 - in pkg/lme4Eigen: R man

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

Author: mmaechler
Date: 2011-09-23 11:14:15 +0200 (Fri, 23 Sep 2011)
New Revision: 1405

Modified:
   pkg/lme4Eigen/R/lmer.R
   pkg/lme4Eigen/man/ranef.Rd
Log:
*must* use lme4Eigen::: inside devFun() [evaluated from C++]

Modified: pkg/lme4Eigen/R/lmer.R
===================================================================
--- pkg/lme4Eigen/R/lmer.R	2011-09-23 08:20:06 UTC (rev 1404)
+++ pkg/lme4Eigen/R/lmer.R	2011-09-23 09:14:15 UTC (rev 1405)
@@ -174,14 +174,14 @@
         parent.env(rho) <- parent.frame()
         devfun <- if (compDev) {
             function(theta)
-                .Call(glmerLaplace, pp$ptr, resp$ptr,
+                .Call(lme4Eigen:::glmerLaplace, pp$ptr, resp$ptr,
                       theta, u0, beta0, verbose, FALSE, tolPwrss)
         } else {
             function(theta) {
                 pp$u0 <- u0
                 pp$beta0 <- beta0
                 pp$theta <- theta
-                pwrssUpdate(pp, resp, verbose, tol=tolPwrss)
+                lme4Eigen:::pwrssUpdate(pp, resp, verbose, tol=tolPwrss)
                 resp$Laplace(pp$ldL2(), pp$ldRX2(), pp$sqrL(0))
             }
         }
@@ -197,14 +197,14 @@
             rho$control <- control
             devfunb <- if (compDev) {
                 function(pars)
-                    .Call(glmerLaplace, pp$ptr, resp$ptr, pars[dpars],
+                    .Call(lme4Eigen:::glmerLaplace, pp$ptr, resp$ptr, pars[dpars],
                           u0, pars[-dpars], verbose, TRUE, tolPwrss)
             } else {
                 function(pars) {
                     pp$u0 <- u0
                     pp$theta <- pars[dpars]
                     pp$beta0 <- pars[-dpars]
-                    pwrssUpdate(pp, resp, verbose, uOnly=TRUE, tol=tolPwrss)
+                    lme4Eigen:::pwrssUpdate(pp, resp, verbose, uOnly=TRUE, tol=tolPwrss)
                     resp$Laplace(pp$ldL2(), pp$ldRX2(), pp$sqrL(0))
                 }
             }
@@ -757,6 +757,7 @@
 	ans <- ans[whchL]
 
 	if (postVar) {
+            .NotYetUsed("postVar=TRUE")## FIXME
 	    vv <- .Call(reTrmsCondVar, re, sigma(object))
 	    for (i in seq_along(ans))
 		attr(ans[[i]], "postVar") <- vv[[i]]

Modified: pkg/lme4Eigen/man/ranef.Rd
===================================================================
--- pkg/lme4Eigen/man/ranef.Rd	2011-09-23 08:20:06 UTC (rev 1404)
+++ pkg/lme4Eigen/man/ranef.Rd	2011-09-23 09:14:15 UTC (rev 1405)
@@ -68,9 +68,11 @@
 fm2 <- lmer(Reaction ~ Days + (1|Subject) + (0+Days|Subject), sleepstudy)
 fm3 <- lmer(diameter ~ (1|plate) + (1|sample), Penicillin)
 ranef(fm1)
+if(FALSE) { ##-- postVar=TRUE is not yet implemented -- FIXME
 str(rr1 <- ranef(fm1, postVar = TRUE))
 dotplot(rr1,scales = list(x = list(relation = 'free')))[["Subject"]]
 str(ranef(fm2, postVar = TRUE))
+}
 op <- options(digits = 4)
 ranef(fm3, drop = TRUE)
 options(op)