various cleanup, version bump

courtiol · Feb 5, 2019 · 3ef5743 · 3ef5743
1 parent fbe9597
commit 3ef5743
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 16 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: broom.mixed
 Type: Package
 Title: Tidying Methods for Mixed Models
-Version: 0.2.3.9000
+Version: 0.2.4
 Authors@R: c(
     person("Ben", "Bolker", email = "[email protected]",
         role = c("aut", "cre"),

diff --git a/R/glmmTMB_tidiers.R b/R/glmmTMB_tidiers.R
@@ -87,7 +87,8 @@ tidy.glmmTMB <- function(x, effects = c("ran_pars", "fixed"),
   ##   - avoid (as.)data.frame
 
   ## R CMD check false positives
-  term <- estimate <- .id <- level <- std.error <- . <- NULL
+  condsd <- condval <- grp <- grpvar <-
+        term <- estimate <- .id <- level <- std.error <- . <- NULL
 
   drop.missing <- function(x) x[vapply(x,length,numeric(1))>0]
   ss <- stats::coef(summary(x))

diff --git a/R/lme4_tidiers.R b/R/lme4_tidiers.R
@@ -342,7 +342,7 @@ augment.merMod <- function(x, data = stats::model.frame(x), newdata, ...) {
   if (missing(newdata)) {
     newdata <- NULL
   }
-  ret <- augment_columns(x, data, newdata, se.fit = NULL, ...)
+  ret <- suppressMessages(augment_columns(x, data, newdata, se.fit = NULL, ...))
 
   # add predictions with no random effects (population means)
   predictions <- stats::predict(x, re.form = NA)
@@ -420,12 +420,12 @@ glance.merMod <- function(x, ...) {
 ##'          geom_vline(xintercept=0,lty=2)+
 ##'          geom_point()+facet_wrap(~variable,scale="free_x")
 ##'       ## emphasize extreme values
-##'       aa2 <- aa  %>% group_by(grp,level) %>%
-##'             mutate(keep=any(estimate/std.error>2))
-##'        ## Update caterpillar plot with extreme levels highlighted
-##'        ##  (highlight all groups with *either* extreme intercept *or*
-##'        ##   extreme slope)
-##'       ggplot(aa2,aes(estimate,level,xmin=lb,xmax=ub,colour=factor(keep)))+
+##'       aa2 <- group_by(aa,grp,level)
+##'       aa3 <- mutate(aa2, keep=any(estimate/std.error>2))
+##'       ## Update caterpillar plot with extreme levels highlighted
+##'       ##  (highlight all groups with *either* extreme intercept *or*
+##'       ##   extreme slope)
+##'       ggplot(aa3, aes(estimate,level,xmin=lb,xmax=ub,colour=factor(keep)))+
 ##'          geom_errorbarh(height=0)+
 ##'          geom_vline(xintercept=0,lty=2)+
 ##'          geom_point()+facet_wrap(~variable,scale="free_x")+

diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd
@@ -4,6 +4,20 @@
 \title{broom.mixed News}
 \encoding{UTF-8}
 
+\section{CHANGES IN VERSION 0.2.4}{
+  \subsection{NEW FEATURES}{
+     \itemize{
+	\item \code{gls} tidier gets confint (GH #49)
+	}
+  }
+  \subsection{BUG FIXES}{
+     \itemize{
+        \item misc fixes for \code{lme4} tidiers (confint for ran_vals, profile conf intervals fixed)
+	\item ran_vals works for \code{glmmTMB}
+     }
+   }
+}
+
 \section{CHANGES IN VERSION 0.2.3}{
   \subsection{BUG FIXES}{
     \itemize{
@@ -12,7 +26,7 @@
       \item component argument works for random effects in glmmTMB (GH #33: @strengejacke)
     }
   }
-  \subsection{NEW FIXES}{
+  \subsection{NEW FEATURES}{
     \itemize{
       \item \code{brmsfit} and \code{rstanarm} methods allow
       \code{conf.method="HPDinterval"}

diff --git a/man/augment.ranef.mer.Rd b/man/augment.ranef.mer.Rd
diff --git a/tests/testthat/test-lme4.R b/tests/testthat/test-lme4.R
@@ -203,3 +203,4 @@ if (require(lmerTest, quietly = TRUE)) {
   })
   detach("package:lmerTest")
 }
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -203,3 +203,4 @@ if (require(lmerTest, quietly = TRUE)) {
		})
		detach("package:lmerTest")
		}