SCM

SCM Repository

[matrix] Diff of /pkg/R/lmer.R
ViewVC logotype

Diff of /pkg/R/lmer.R

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 798, Mon Jul 4 15:28:48 2005 UTC revision 799, Tue Jul 5 00:37:34 2005 UTC
# Line 59  Line 59 
59    
60  ## Control parameters for lmer  ## Control parameters for lmer
61  lmerControl <-  lmerControl <-
62    function(maxIter = 50,    function(maxIter = 200,
63             msMaxIter = 200,             msMaxIter = 200,
64             tolerance = sqrt((.Machine$double.eps)),             tolerance = sqrt((.Machine$double.eps)),
65             niterEM = 15,             niterEM = 15,
# Line 215  Line 215 
215                nAGQ <- 1                nAGQ <- 1
216                if (method == "AGQ") {    # determine nAGQ at PQL estimates                if (method == "AGQ") {    # determine nAGQ at PQL estimates
217                    dev11 <- devAGQ(PQLpars, 11)                    dev11 <- devAGQ(PQLpars, 11)
218                      ## FIXME: Should this be an absolute or a relative tolerance?
219                    devTol <- sqrt(.Machine$double.eps) * abs(dev11)                    devTol <- sqrt(.Machine$double.eps) * abs(dev11)
220                    for (nAGQ in c(11, 9, 7, 5, 3))                    for (nAGQ in c(9, 7, 5, 3, 1))
221                        if (abs(dev11 - devAGQ(PQLpars, nAGQ - 2)) > devTol) break                        if (abs(dev11 - devAGQ(PQLpars, nAGQ - 2)) > devTol) break
222                      nAGQ <- nAGQ + 2
223                      if (gVerb)
224                          cat(paste("Using", nAGQ, "quadrature points per column\n"))
225                }                }
226                obj <- function(pars)                obj <- function(pars)
227                    .Call("glmer_devAGQ", pars, GSpt, nAGQ, PACKAGE = "Matrix")                    .Call("glmer_devAGQ", pars, GSpt, nAGQ, PACKAGE = "Matrix")

Legend:
Removed from v.798  
changed lines
  Added in v.799

root@r-forge.r-project.org
ViewVC Help
Powered by ViewVC 1.0.0  
Thanks to:
Vienna University of Economics and Business Powered By FusionForge