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

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

Author: dmbates
Date: 2011-12-15 22:11:36 +0100 (Thu, 15 Dec 2011)
New Revision: 1478

Modified:
   pkg/lme4Eigen/R/lmer.R
Log:
Adopt new version of the merPredD$new function that uses S.


Modified: pkg/lme4Eigen/R/lmer.R
===================================================================
--- pkg/lme4Eigen/R/lmer.R	2011-12-15 21:10:39 UTC (rev 1477)
+++ pkg/lme4Eigen/R/lmer.R	2011-12-15 21:11:36 UTC (rev 1478)
@@ -158,9 +158,9 @@
     ## fixed-effects model matrix X - remove random parts from formula:
     form <- formula
     form[[3]] <- if(is.null(nb <- nobars(form[[3]]))) 1 else nb
-    X <- model.Matrix(form, fr, contrasts, sparse = FALSE, row.names = FALSE) ## sparseX not yet
+    X <- model.matrix(form, fr, contrasts)#, sparse = FALSE, row.names = FALSE) ## sparseX not yet
     p <- ncol(X)
-    pp <- do.call(merPredD$new, c(list(X=X), reTrms[c("Zt","theta","Lambdat","Lind")]))
+    pp <- do.call(merPredD$new, c(list(X=X, S=1L), reTrms[c("Zt","theta","Lambdat","Lind")]))
 					# response module
     resp <- mkRespMod2(fr, family=family)
 					# initial step from working response