version 0.6.7

cran · Oct 24, 2018 · b90f852 · b90f852
1 parent 04946d9
commit b90f852
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 16 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+v0.6.7
+
+- Fixed matrix dimensions in gprofiler if evcodes = T
+
 v0.6.6
 
 - Change BugReports link to http://biit.cs.ut.ee/gprofiler/contact.cgi

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,5 +1,5 @@
 Package: gProfileR
-Version: 0.6.6
+Version: 0.6.7
 License: GPL (>= 2)
 Description: Functional enrichment analysis, gene identifier conversion and
     mapping homologous genes across related organisms via the 'g:Profiler' toolkit
@@ -14,6 +14,6 @@ Imports: RCurl, plyr, utils
 Collate: 'gProfileR.R'
 RoxygenNote: 6.0.1
 NeedsCompilation: no
-Packaged: 2018-04-20 08:44:58 UTC; inkuzmin
+Packaged: 2018-10-24 14:52:53 UTC; inkuzmin
 Repository: CRAN
-Date/Publication: 2018-04-20 13:19:06 UTC
+Date/Publication: 2018-10-24 17:00:02 UTC
diff --git a/MD5 b/MD5
@@ -1,7 +1,7 @@
-bcf39132a69dbf03e04b0d0ac05544b2 *ChangeLog
-70824e439b4231fcc2957f4a71932256 *DESCRIPTION
+4a2bc7f15bb464eb222b62991e853f4f *ChangeLog
+1fc4e29a0d17ba17e1f7b0bb195d6763 *DESCRIPTION
 ab2aabc8cbe758a68abe45946d2faa93 *NAMESPACE
-8be886e1126b0c36c74a489009d0b19b *R/gProfileR.R
+cd90d60f6e4c301a92728fc99efc418b *R/gProfileR.R
 e8501f4222aab2ddf42a8a2b977653cf *man/gconvert.Rd
 5a306e1a9a1fe4e9503f0b2a1dd80772 *man/get_base_url.Rd
 45cffd2a6aa68acde8a46430203ba041 *man/get_tls_version.Rd

diff --git a/R/gProfileR.R b/R/gProfileR.R
@@ -260,25 +260,27 @@ gprofiler <- function(
 	if (length(empty_lines)>0) {
 		split_query <- split_query[-empty_lines]
 	}
+
+	col_names <- c(
+	  "query.number", "significant", "p.value",
+	  "term.size", "query.size", "overlap.size",
+	  "precision", "recall", "term.id",
+	  "domain", "subgraph.number", "term.name",
+	  "relative.depth", "intersection"
+	)
+	if (evcodes)
+	  col_names <- append(col_names, "evidence.codes")
+
 
 	if(length(split_query) > 0) {
 		conn <- textConnection(paste(split_query, collapse = "\n"))
 		split_query <- utils::read.table(conn, sep = "\t", quote = "", stringsAsFactors = F)
 		close(conn)
 	}
 	else {
-		split_query <- as.data.frame(matrix(NA, 0, 14))
+		split_query <- as.data.frame(matrix(NA, 0, length(col_names)))
 	}
 
-	col_names <- c(
-		"query.number", "significant", "p.value",
-		"term.size", "query.size", "overlap.size",
-		"precision", "recall", "term.id",
-		"domain", "subgraph.number", "term.name",
-		"relative.depth", "intersection"
-	)
-	if (evcodes)
-		col_names <- append(col_names, "evidence.codes")
 
 	rownames(split_query) <- NULL
 	colnames(split_query) <- col_names