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

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

Author: dmbates
Date: 2011-10-18 19:46:53 +0200 (Tue, 18 Oct 2011)
New Revision: 1425

Modified:
   pkg/lme4Eigen/R/lmer.R
Log:
Getter and setter for REML field in lmerResp should be reml, not REML.


Modified: pkg/lme4Eigen/R/lmer.R
===================================================================
--- pkg/lme4Eigen/R/lmer.R	2011-10-17 21:30:15 UTC (rev 1424)
+++ pkg/lme4Eigen/R/lmer.R	2011-10-18 17:46:53 UTC (rev 1425)
@@ -49,7 +49,7 @@
 	stop(gettextf("rank of X = %d < ncol(X) = %d", qrX$rank, p))
     pp <- do.call(merPredD$new, c(list(X=X), reTrms[c("Zt","theta","Lambdat","Lind")]))
     resp <- mkRespMod2(fr)
-    if (REML) resp$REML <- p
+    if (REML) resp$reml <- p
 
     devfun <- mkdevfun(pp, resp)
     if (devFunOnly) return(devfun)
@@ -71,7 +71,7 @@
 
     dims <- c(N=n, n=n, nmp=n-p, nth=length(pp$theta), p=p, q=nrow(reTrms$Zt),
 	      nAGQ=NA_integer_, useSc=1L, reTrms=length(reTrms$cnms),
-	      spFe=0L, REML=resp$REML, GLMM=0L, NLMM=0L)
+	      spFe=0L, REML=resp$reml, GLMM=0L, NLMM=0L)
     cmp <- c(ldL2=pp$ldL2(), ldRX2=pp$ldRX2(), wrss=wrss,
 	      ussq=sqrLenU, pwrss=pwrss,
 	     drsum=NA, dev=if(REML)NA else opt$fval, REML=if(REML)opt$fval else NA,