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 938, Tue Sep 20 10:16:53 2005 UTC revision 939, Tue Sep 20 17:23:24 2005 UTC
# Line 124  Line 124 
124            glm.fit <- eval(mf, parent.frame())            glm.fit <- eval(mf, parent.frame())
125            x <- glm.fit$x            x <- glm.fit$x
126            y <- as.double(glm.fit$y)            y <- as.double(glm.fit$y)
           lmm <- missing(family) # => linear mixed model  
127            family <- glm.fit$family            family <- glm.fit$family
128              ## check for a linear mixed model
129              lmm <- family$family == "gaussian" && family$link == "identity"
130            if (lmm) { # linear mixed model            if (lmm) { # linear mixed model
131                method <- match.arg(method)                method <- match.arg(method)
132                if (method %in% c("PQL", "Laplace", "AGQ")) {                if (method %in% c("PQL", "Laplace", "AGQ")) {
# Line 139  Line 139 
139                if (missing(method)) method <- "PQL"                if (missing(method)) method <- "PQL"
140                else {                else {
141                    method <- match.arg(method)                    method <- match.arg(method)
   
                   ## <FIXME>: only  
                   ## if( !(family == "gaussian" && link == "identity") ) {  
142                    if (method == "ML") method <- "PQL"                    if (method == "ML") method <- "PQL"
143                    if (method == "REML")                    if (method == "REML")
144                        warning('Argument method = "REML" is not meaningful ',                        warning('Argument method = "REML" is not meaningful ',
145                                'for a generalized linear mixed model.',                                'for a generalized linear mixed model.',
146                                '\nUsing method = "PQL".\n')                                '\nUsing method = "PQL".\n')
                   ## } </FIXME>  
147                }                }
148            }            }
149    

Legend:
Removed from v.938  
changed lines
  Added in v.939

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