diff --git a/DESCRIPTION b/DESCRIPTION index 2c0abd96..f0101c3b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: jtools Type: Package Title: Analysis and Presentation of Social Scientific Data -Version: 2.2.3.9999 +Version: 2.3.0 Authors@R: person(c("Jacob","A."), "Long", email = "jacob.long@sc.edu", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-1582-6214")) Description: This is a collection of tools for more efficiently understanding @@ -47,7 +47,7 @@ Enhances: brms, quantreg, rstanarm -RoxygenNote: 7.3.2.9000 +RoxygenNote: 7.3.2 VignetteBuilder: knitr Roxygen: list(markdown = TRUE) Depends: diff --git a/NAMESPACE b/NAMESPACE index f87b8415..7c466cb6 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -84,7 +84,6 @@ S3method(summ,rq) S3method(summ,svyglm) S3method(tidy,summ) S3method(tidy,summ.merMod) -S3method(tidy,summary.glht) export("%just%") export("%just%<-") export("%nin%") @@ -169,7 +168,6 @@ importFrom(stats,binomial) importFrom(stats,coef) importFrom(stats,coefficients) importFrom(stats,complete.cases) -importFrom(stats,confint) importFrom(stats,contr.treatment) importFrom(stats,cooks.distance) importFrom(stats,cor) @@ -217,7 +215,6 @@ importFrom(stats,vcov) importFrom(stats,weighted.mean) importFrom(stats,weights) importFrom(tibble,as_tibble) -importFrom(tibble,tibble) importFrom(utils,.S3methods) importFrom(utils,getFromNamespace) importFrom(utils,getS3method) diff --git a/NEWS.md b/NEWS.md index 6987b354..7ebe8f6c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# jtools 2.2.3.9999 +# jtools 2.3.0 Bug fixes: * `predict_merMod()` was miscalculating predictions under a specific set of diff --git a/R/internal.R b/R/internal.R index fb5940dd..171cb99e 100644 --- a/R/internal.R +++ b/R/internal.R @@ -418,24 +418,6 @@ predict_rob <- function(model, .vcov = vcov(model), newdata = NULL, } -#' @importFrom tibble tibble as_tibble -#' @importFrom stats confint -#' @export -tidy.summary.glht <- function(x, conf.int = FALSE, conf.level = 0.95, ...) { - lhs_rhs <- tibble(lhs = rownames(x$linfct), rhs = x$rhs) - coef <- as_tibble(x$test[c("coefficients", "sigma", - "tstat", "pvalues")]) - names(coef) <- c("estimate", "std.error", "statistic", - "p.value") - out <- as_tibble(cbind(lhs_rhs, coef)) - if (conf.int) { - confs <- as.data.frame(confint(x, level = conf.level)$confint) - out$conf.low <- confs$lwr - out$conf.high <- confs$upr - } - out -} - #' @import broom NULL diff --git a/cran-comments.md b/cran-comments.md index 62f996a2..00a06fb4 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,5 +1,5 @@ ## Test environments -* Local macOS install, R 4.1.3 +* Local macOS install, R 4.4.1 * ubuntu-latest (via Github Actions), R-release, R-devel, oldrel-1 * macOS-latest (via Github Actions), R-release * windows-latest (via Github Actions), R-release