[Lme4-commits] r1526 - branches/roxygen/tests

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

Author: dmbates
Date: 2012-01-26 22:56:06 +0100 (Thu, 26 Jan 2012)
New Revision: 1526

Modified:
   branches/roxygen/tests/vcov-etc.R
Log:
Use Matrix::diag explicitly.


Modified: branches/roxygen/tests/vcov-etc.R
===================================================================
--- branches/roxygen/tests/vcov-etc.R	2012-01-26 21:55:34 UTC (rev 1525)
+++ branches/roxygen/tests/vcov-etc.R	2012-01-26 21:56:06 UTC (rev 1526)
@@ -23,16 +23,17 @@
 	  all.equal(V.d <- vcov(fm1),
 		    V.s <- vcov(fm1.s)#, tol = 1e-9
 	  ),
-	  all.equal(diag(V.d), unname(se1.d)^2, tol= 1e-12)
+	  all.equal(Matrix::diag(V.d), unname(se1.d)^2, tol= 1e-12)
 	  ,
 	  all.equal(unname(se1.d),
-                    c(0.576012259837672, rep.int(0.518683836068417,3)),
+                    c(0.576011960125099, rep.int(0.518683987372292,3L)),
                     tol = 1.e-8)
           )
 
 ### -------------------------- a "large" example -------------------------
 str(InstEval)
 
+if (FALSE) {                            # sparse X is not currently implemented
 ## this works
 system.time(
 fm7 <- lmer(y ~ d + service + studage + lectage + (1|s),
@@ -65,4 +66,5 @@
 qqmath(rr,strip=FALSE)$d
 dotplot(rr,strip=FALSE)$`dept:service`
 }
+}
 cat('Time elapsed: ', proc.time(),'\n') # for ``statistical reasons''