[Lme4-commits] r1663 - pkg/lme4/R
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Thu Mar 15 22:23:34 CET 2012
Author: bbolker
Date: 2012-03-15 22:23:34 +0100 (Thu, 15 Mar 2012)
New Revision: 1663
Modified:
pkg/lme4/R/profile.R
Log:
fixed incomplete stuff (added stub errors)
Modified: pkg/lme4/R/profile.R
===================================================================
--- pkg/lme4/R/profile.R 2012-03-15 21:07:38 UTC (rev 1662)
+++ pkg/lme4/R/profile.R 2012-03-15 21:23:34 UTC (rev 1663)
@@ -314,6 +314,7 @@
pp$ldL2() + (resp$wrss() + pp$sqrL(1))/sigsq + n * log(2 * pi * sigsq)
}
} else {
+ stop("GLMM/NLMM profiling under development")
d0 <- mkdev(fm)
ans <- function(pars)
{
@@ -325,11 +326,11 @@
## .Call(lmer_Deviance, pp$ptr(), resp$ptr(), pars[-np]/sigma)
## convert from sdcor vector back to 'unscaled theta'
thpars <- Sv_to_Cv(pars,n=sapply(fm at cnms,length))
- d0(thpars,
+ stop("STUB!")
sigsq <- sigma^2
pp$ldL2() + (resp$wrss() + pp$sqrL(1))/sigsq + n * log(2 * pi * sigsq)
}
-
+ }
attr(ans, "optimum") <- opt # w/ names()
attr(ans, "basedev") <- basedev
attr(ans, "thopt") <- pp$theta
More information about the Lme4-commits
mailing list