[Lme4-commits] r1626 - in pkg/lme4Eigen: R man

[noreply at r-forge.r-project.org]

Author: mmaechler
Date: 2012-02-28 15:12:53 +0100 (Tue, 28 Feb 2012)
New Revision: 1626

Modified:
   pkg/lme4Eigen/R/lmer.R
   pkg/lme4Eigen/R/nbinom.R
   pkg/lme4Eigen/man/getME.Rd
Log:
moved part of example(getME) to tests/

Modified: pkg/lme4Eigen/R/lmer.R
===================================================================
--- pkg/lme4Eigen/R/lmer.R	2012-02-28 14:11:57 UTC (rev 1625)
+++ pkg/lme4Eigen/R/lmer.R	2012-02-28 14:12:53 UTC (rev 1626)
@@ -1614,12 +1614,6 @@
 ##' ## All that can be accessed [potentially ..]:
 ##' (nmME <- eval(formals(getME)$name))
 ##'
-##' \dontshow{
-##' ## internal consistency check ensuring that all work:
-##' ## "try(.)" because some are not yet implemented:
-##' str(parts <- sapply(nmME, function(nm) try(getME(fm1, nm)),
-##'                     simplify=FALSE))
-##' }% dont..
 ##' @export
 getME <- function(object,
 		  name = c("X", "Z","Zt", "u",
@@ -1653,7 +1647,7 @@
 
            "Gp" = object at Gp,
            "flist" = object at flist,
-           "beta" = structure(object at beta, names = dimnames(PR$X)[[2]]),
+	   "beta" = structure(object at beta, names = dimnames(PR$X)[[2]]),
            "theta"= {
                tt <- object at theta
                nc <- c(unlist(mapply(function(g,e) {
@@ -1675,7 +1669,7 @@
            ## Yes, assuming that you want the number of random-effects
            ## terms in the formula.  Multiple terms with the same
            ## grouping factors are allowed.
-           
+
            "devcomp" = dc,
            "offset" = rsp$offset,
 	   "..foo.." =# placeholder!

Modified: pkg/lme4Eigen/R/nbinom.R
===================================================================
--- pkg/lme4Eigen/R/nbinom.R	2012-02-28 14:11:57 UTC (rev 1625)
+++ pkg/lme4Eigen/R/nbinom.R	2012-02-28 14:12:53 UTC (rev 1626)
@@ -2,7 +2,7 @@
 ##' @importFrom MASS theta.ml
 
 ## should be getME(object,"NBdisp") ?
-getNBdisp <- function(object) { 
+getNBdisp <- function(object) {
   get(".Theta",envir=environment(object at resp$family$aic))
 }
 
@@ -57,7 +57,7 @@
   w <- object at resp$weights
   control <- list(maxit=20,trace=0)
   th <- theta.ml(Y, mu, sum(w), w, limit = control$maxit,
-                     trace = control$trace > 2)
+                 trace = control$trace > 2)
 }
 
 ## wrapper for glmer stuff

Modified: pkg/lme4Eigen/man/getME.Rd
===================================================================
--- pkg/lme4Eigen/man/getME.Rd	2012-02-28 14:11:57 UTC (rev 1625)
+++ pkg/lme4Eigen/man/getME.Rd	2012-02-28 14:12:53 UTC (rev 1626)
@@ -70,13 +70,6 @@
 ## All that can be accessed [potentially ..]:
 (nmME <- eval(formals(getME)$name))
 
-\dontshow{
-## internal consistency check ensuring that all work:
-## "try(.)" because some are not yet implemented:
-str(parts <- sapply(nmME, function(nm) try(getME(fm1, nm)),
-                    simplify=FALSE))
-}\% dont..
-}
 \seealso{
   \code{\link{getCall}()}, More standard methods for mer
   objects, such as \code{\link{ranef}},