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 771, Thu Jun 9 16:56:33 2005 UTC revision 772, Thu Jun 9 16:57:55 2005 UTC
# Line 270  Line 270 
270            }            }
271    
272            devLaplace <- function(pars) {            devLaplace <- function(pars) {
               mu <- bhat(pars)  
273                ## FIXME: This actually returns half the deviance.                ## FIXME: This actually returns half the deviance.
274                dev <- sum(eval(dev.resids))/2                bhat(pars)
275                  dev <- sum(family$dev.resids(y, mu, wts*wts))/2
276                lap <- .Call("glmer_Laplace_devComp", rdobj, PACKAGE = "Matrix")                lap <- .Call("glmer_Laplace_devComp", rdobj, PACKAGE = "Matrix")
277                if (gVerb) cat(sprintf("  %#11g %#11g\n", dev, lap))                if (gVerb) cat(sprintf("  %#11g %#11g\n", dev, lap))
278                dev - lap                dev - lap
# Line 309  Line 309 
309                }                }
310    
311                if (getOption("verbose")) {                if (getOption("verbose")) {
312                    cat(paste("optim convergence code",                    cat(paste("convergence message", optimRes$message, "\n"))
                             optimRes$convergence, "\n"))  
313                    cat("Fixed effects:\n")                    cat("Fixed effects:\n")
314                    print(optimRes$par[fixInd])                    print(optimRes$par[fixInd])
315                    cat("(box constrained) variance coefficients:\n")                    cat("(box constrained) variance coefficients:\n")

Legend:
Removed from v.771  
changed lines
  Added in v.772

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