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

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

Author: dmbates
Date: 2011-11-04 20:54:50 +0100 (Fri, 04 Nov 2011)
New Revision: 1443

Modified:
   pkg/lme4Eigen/R/lmer.R
Log:
Undo last commit.  Qualifiers were not redundant.  Should have read the NEWS file.


Modified: pkg/lme4Eigen/R/lmer.R
===================================================================
--- pkg/lme4Eigen/R/lmer.R	2011-11-04 19:25:35 UTC (rev 1442)
+++ pkg/lme4Eigen/R/lmer.R	2011-11-04 19:54:50 UTC (rev 1443)
@@ -172,14 +172,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))
             }
         }
@@ -195,14 +195,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))
                 }
             }
@@ -1118,7 +1118,7 @@
     if (is.null(cnms <- x at cnms))
 	stop("VarCorr methods require reTrms, not just reModule")
     if(missing(sigma)) # "bug": fails via default 'sigma=sigma(x)'
-	sigma <- sigma(x)
+	sigma <- lme4Eigen::sigma(x)
     nc <- sapply(cnms, length)	  # no. of columns per term
     mkVarCorr(sigma, cnms=cnms, nc=nc, theta = x at theta,
 	      nms = {fl <- x at flist; names(fl)[attr(fl, "assign")]})