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

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

Author: dmbates
Date: 2012-01-26 00:00:31 +0100 (Thu, 26 Jan 2012)
New Revision: 1517

Modified:
   branches/roxygen/tests/lmer-1.R
Log:
Call functions from the Matrix package explicitly.


Modified: branches/roxygen/tests/lmer-1.R
===================================================================
--- branches/roxygen/tests/lmer-1.R	2012-01-25 16:00:11 UTC (rev 1516)
+++ branches/roxygen/tests/lmer-1.R	2012-01-25 23:00:31 UTC (rev 1517)
@@ -46,7 +46,7 @@
 stopifnot(all.equal(fixef(fm1), fixef(fm2), tol = 1.e-13),
           all.equal(unname(fixef(fm1)),
                     c(251.405104848485, 10.467285959595), tol = 1e-13),
-	  all.equal(cov2cor(vcov(fm1))["(Intercept)", "Days"],
+	  all.equal(Matrix::cov2cor(vcov(fm1))["(Intercept)", "Days"],
 		    -0.13755, tol=1e-4))
 
 fm1ML <- lme4Eigen:::refitML(fm1)
@@ -236,7 +236,7 @@
 stopifnot(all.equal(sr2[nmsSumm], sr2.[nmsSumm], tol= 1e-14),
           all.equal(ranef(r2), ranef(r2.), tol= 1e-14),
           Matrix:::isDiagonal(vcov(r2.)),# ok
-          all.equal(diag(vcov(r2.)), rep.int(V2[1,1], 4), tol= 1e-13)
+          all.equal(Matrix::diag(vcov(r2.)), rep.int(V2[1,1], 4), tol= 1e-13)
           ,
 	  all(vcov(r2.)@factors$correlation == diag(4))
       )