Skip to content

Commit 9e757df

Browse files
committed
updated testing and passing checks
1 parent f60bc7c commit 9e757df

File tree

86 files changed

+96
-343
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+96
-343
lines changed

.Rbuildignore

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@
44
^\.Rproj\.user$
55
^\.travis\.yml$
66
^\.push_gh_pages\.sh$
7-
tests.R
8-
test_data_gen.R
9-
test_data.RData
10-
test_table_data.rds
11-
test_combine_filter.rda
127
^\.github\workflows\.yml$
138
^\.github$
149
^executable_related$
@@ -27,3 +22,4 @@ test_combine_filter.rda
2722
^doc$
2823
^docs$
2924
^_pkgdown\.yml$
25+
^examples_test_data$

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: categoryCompare2
2-
Version: 0.100.25
2+
Version: 0.100.26
33
Title: Meta-Analysis of High-Throughput Experiments Using Feature
44
Annotations
55
Authors@R: c(
@@ -18,7 +18,7 @@ Depends: R (>= 3.5.0)
1818
Suggests: knitr, markdown, estrogen, org.Hs.eg.db, hgu95av2.db, limma,
1919
affy, genefilter, testthat (>= 3.0.0), visNetwork, Cairo,
2020
DiagrammeR, KEGGREST, docopt (>= 0.7.0), RCy3, hgu95av2cdf,
21-
rmarkdown, fgsea
21+
rmarkdown, fgsea, data.table, withr
2222
Imports: Biobase, methods, AnnotationDbi, colorspace, graph, igraph,
2323
jsonlite, base64enc, dplyr, purrr, rlang, GO.db, stats
2424
LazyLoad: yes

R/gsea.R

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ setClass("gsea_features",
1818
#' @param min_features the minimum number of features for an annotation (default = 15)
1919
#' @param max_features the maximum number of features for an annotation (default = 500)
2020
#' @param return_type what type of object should be returned? ("cc2" or "fgsea")
21+
#' @param ... other `fgsea` options
2122
#'
2223
#' @details The runtime is dependent on the maximum size of the provided annotation,
2324
#' so the authors of `fgsea` recommend a maximum size of 500. In addition, to calculate
@@ -82,6 +83,9 @@ gsea_feature_enrichment = function(gsea_features,
8283
#' @return data.table
8384
enriched_to_fgsea = function(in_enriched)
8485
{
86+
if (!requireNamespace("data.table", quietly = TRUE)) {
87+
stop("data.table must be installed!")
88+
}
8589
ranks = in_enriched@ranks
8690
results = data.table::as.data.table(in_enriched@statistics@statistic_data)
8791
rename_list = c(pval = "p", padj = "padjust", log2err = "log2err", ES = "es", NES = "nes", size = "size", leadingEdge = "leading_edge")

docs/404.html

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/LICENSE-text.html

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/articles/command_line_interface.html

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/articles/index.html

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/articles/v2_guide.html

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/articles/v2_visnetwork_guide.html

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/authors.html

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)