Merge pull request #12 from YuLab-SMU/master

merge from yulab to me
huerqiang · Sep 20, 2022 · 9b81252 · 9b81252
2 parents 4675b50 + 0c8cc89
commit 9b81252
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 59 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: DOSE
 Type: Package
 Title: Disease Ontology Semantic and Enrichment analysis
-Version: 3.23.2
+Version: 3.23.2.001
 Authors@R: c( person(given = "Guangchuang", family = "Yu",        email = "[email protected]",   role = c("aut", "cre")),
               person(given = "Li-Gen",      family = "Wang",      email = "[email protected]",   role = "ctb"),
               person(given = "Vladislav",   family = "Petyuk",    email = "[email protected]",          role = "ctb"),

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,8 @@
+# DOSE 3.23.2.001
+
++ move `inst/extdata/parse-obo.R` to `HDO.db` package (2022-08-29, Mon) 
++ rename `qvalues` to `qvalue` in `gseaResult` object (2022-08-29, Mon)
+
 # DOSE 3.23.2
 
 + Support `GSON` object in `GSEA_internal()` (2022-06-08, Wed)

diff --git a/R/gsea.R b/R/gsea.R
@@ -79,7 +79,7 @@ GSEA_fgsea <- function(geneList,
         NES = tmp_res$NES,
         pvalue = tmp_res$pval,
         p.adjust = p.adj,
-        qvalues = qvalues,
+        qvalue = qvalues,
         stringsAsFactors = FALSE
     )
 
@@ -304,7 +304,7 @@ GSEA_DOSE <- function(geneList,
         NES = NES,
         pvalue = pvals,
         p.adjust = p.adj,
-        qvalues = qvalues,
+        qvalue = qvalues,
         stringsAsFactors = FALSE
     )
 

diff --git a/inst/extdata/parse-obo.R b/inst/extdata/parse-obo.R