Skip to content

Commit

Permalink
fix some build errors
Browse files Browse the repository at this point in the history
  • Loading branch information
d-callan committed Feb 29, 2024
1 parent db67841 commit 7d80dd7
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
6 changes: 6 additions & 0 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,17 @@ Authors@R:
email = "annsize@upenn.edu"))
biocViews:
Imports:
boot,
data.table,
digest,
Hmisc,
microbenchmark,
S4Vectors,
SpiecEasi (>= 1.1.1),
stringi,
purrr
Remotes:
zdk123/SpiecEasi
URL: https://github.com/VEuPathDB/veupathUtils
BugReports: https://github.com/VEuPathDB/veupathUtils/issues
Description: veupathUtils contains various R helper functions intended to be useful across a variety of projects, including the plot.data and microbiomeComputations packages.
Expand Down
1 change: 0 additions & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -148,4 +148,3 @@ importFrom(microbenchmark,microbenchmark)
importFrom(purrr,map)
importFrom(purrr,map_lgl)
importFrom(stringi,stri_detect_regex)
useDynLib(microbiomeComputations)
6 changes: 1 addition & 5 deletions R/method-correlation.R
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,7 @@ setMethod("predicateFactory", signature("character", "numeric"), function(predic
#' @param format string defining the desired format of the result. The currently supported values are 'data.table' and 'ComputeResult'.
#' @param verbose boolean indicating if timed logging is desired
#' @return data.frame with correlation coefficients or a ComputeResult object
#' @import veupathUtils
#' @import data.table
#' @useDynLib microbiomeComputations
#' @export
setGeneric("correlation",
function(data1, data2, method, format = c('ComputeResult', 'data.table'), verbose = c(TRUE, FALSE), ...) standardGeneric("correlation"),
Expand Down Expand Up @@ -261,7 +259,6 @@ buildCorrelationComputeResult <- function(corrResult, data1, data2 = NULL, metho
#' @param format string defining the desired format of the result. The currently supported values are 'data.table' and 'ComputeResult'.
#' @param verbose boolean indicating if timed logging is desired
#' @return ComputeResult object
#' @import veupathUtils
#' @export
setGeneric("selfCorrelation",
function(data, method = c('spearman','pearson','sparcc'), format = c('ComputeResult', 'data.table'), verbose = c(TRUE, FALSE), ...) standardGeneric("selfCorrelation"),
Expand All @@ -271,14 +268,13 @@ setGeneric("selfCorrelation",
#' Self Correlation
#'
#' This function returns correlation coefficients for variables in one data.table against itself.
#' This is essentially an alias to the microbiomeComputations::correlation function.
#' This is essentially an alias to the veupathUtils::correlation function.
#'
#' @param data a data.table
#' @param method string defining the type of correlation to run. The currently supported values are 'spearman', 'pearson' and 'sparcc'
#' @param format string defining the desired format of the result. The currently supported values are 'data.table' and 'ComputeResult'.
#' @param verbose boolean indicating if timed logging is desired
#' @return ComputeResult object
#' @import veupathUtils
#' @export
setMethod("selfCorrelation", signature("data.table"),
function(data, method = c('spearman','pearson','sparcc'), format = c('ComputeResult', 'data.table'), verbose = c(TRUE, FALSE)) {
Expand Down
2 changes: 1 addition & 1 deletion man/selfCorrelation-data.table-method.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 7d80dd7

Please sign in to comment.