diff --git a/NAMESPACE b/NAMESPACE index 929598f2..0267ef49 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -78,7 +78,6 @@ S3method(simSeq,pml) S3method(subset,phyDat) S3method(summary,SOWH) S3method(summary,clanistics) -S3method(tidy,modelTest) S3method(unique,dist) S3method(unique,phyDat) S3method(unique,splits) @@ -240,7 +239,6 @@ export(sprdist) export(superTree) export(supgma) export(threshStateC) -export(tidy) export(transferBootstrap) export(treedist) export(upgma) @@ -267,7 +265,6 @@ importFrom(cli,cli_progress_bar) importFrom(cli,cli_progress_done) importFrom(cli,cli_progress_update) importFrom(generics,glance) -importFrom(generics,tidy) importFrom(grDevices,adjustcolor) importFrom(grDevices,col2rgb) importFrom(grDevices,hcl.colors) diff --git a/R/modelTest.R b/R/modelTest.R index 603eb252..6b8bb3f3 100644 --- a/R/modelTest.R +++ b/R/modelTest.R @@ -258,26 +258,26 @@ modelTest <- function(object, tree = NULL, model = NULL, G = TRUE, I = TRUE, } -#' @importFrom generics tidy -#' @export -generics::tidy +## @importFrom generics tidy +## @export +#generics::tidy -#' @export -tidy.modelTest <- function(x, ...) { - env <- attr(x, "env") - l <- nrow(x) - k <- rep(1L, l) - shape <- rep(NA_real_, l) - inv <- rep(0, l) - for (i in seq_len(l)) { - tmp <- get(x$Model[i], env) - if (!is.null(tmp[["k"]])) k[i] <- tmp[["k"]] - if (!is.null(tmp[["shape"]])) shape[i] <- tmp[["shape"]] - if (!is.null(tmp[["inv"]])) inv[i] <- tmp[["inv"]] - } - data.frame(Model = x$Model, k = k, shape = shape, inv = inv) -} +## @export +#tidy.modelTest <- function(x, ...) { +# env <- attr(x, "env") +# l <- nrow(x) +# k <- rep(1L, l) +# shape <- rep(NA_real_, l) +# inv <- rep(0, l) +# for (i in seq_len(l)) { +# tmp <- get(x$Model[i], env) +# if (!is.null(tmp[["k"]])) k[i] <- tmp[["k"]] +# if (!is.null(tmp[["shape"]])) shape[i] <- tmp[["shape"]] +# if (!is.null(tmp[["inv"]])) inv[i] <- tmp[["inv"]] +# } +# data.frame(Model = x$Model, k = k, shape = shape, inv = inv) +#} #' @rdname pml diff --git a/man/reexports.Rd b/man/reexports.Rd index 26359da4..3454ae39 100644 --- a/man/reexports.Rd +++ b/man/reexports.Rd @@ -1,10 +1,9 @@ % Generated by roxygen2: do not edit by hand -% Please edit documentation in R/baseFreq.R, R/modelTest.R +% Please edit documentation in R/baseFreq.R \docType{import} \name{reexports} \alias{reexports} \alias{glance} -\alias{tidy} \title{Objects exported from other packages} \keyword{internal} \description{ @@ -12,6 +11,6 @@ These objects are imported from other packages. Follow the links below to see their documentation. \describe{ - \item{generics}{\code{\link[generics]{glance}}, \code{\link[generics]{tidy}}} + \item{generics}{\code{\link[generics]{glance}}} }}