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 1330, Fri Jul 21 08:28:18 2006 UTC revision 1331, Sat Jul 22 17:59:53 2006 UTC
# Line 348  Line 348 
348                         X, Y, method, sapply(Ztl, nrow),                         X, Y, method, sapply(Ztl, nrow),
349                         c(lapply(Ztl, rownames), list(.fixed = colnames(X))),                         c(lapply(Ztl, rownames), list(.fixed = colnames(X))),
350                         !(family$family %in% c("binomial", "poisson")),                         !(family$family %in% c("binomial", "poisson")),
351                         match.call(), family,                         match.call(), family)
                        PACKAGE = "Matrix")  
352    
353            GSpt <- .Call(glmer_init, environment())            GSpt <- .Call(glmer_init, environment())
354            if (cv$usePQL) {            if (cv$usePQL) {
# Line 599  Line 598 
598            lpred <- .Call(mer_simulate, object, nsim)            lpred <- .Call(mer_simulate, object, nsim)
599            sc <- 1            sc <- 1
600            if (object@useScale)            if (object@useScale)
601                sc <- .Call(mer_sigma, object, object@method == "REML",                sc <- .Call(mer_sigma, object, object@method == "REML")
602                            PACKAGE = "Matrix")  
603            ## add fixed-effects contribution and per-observation noise term            ## add fixed-effects contribution and per-observation noise term
604            lpred <- as.data.frame(lpred + drop(object@X %*% fixef(object)) +            lpred <- as.data.frame(lpred + drop(object@X %*% fixef(object)) +
605                                   rnorm(prod(dim(lpred)), sd = sc))                                   rnorm(prod(dim(lpred)), sd = sc))

Legend:
Removed from v.1330  
changed lines
  Added in v.1331

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