Skip to content

Commit 8e9901b

Browse files
authored
Merge pull request #99 from teddyCodex/issue-55-rename-functions
Refactor function names in R/blastWrapper.R - fixes #55
2 parents 4c3d0b4 + 85620a1 commit 8e9901b

File tree

4 files changed

+28
-31
lines changed

4 files changed

+28
-31
lines changed

NAMESPACE

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ export(renameFA)
7979
export(rename_fasta)
8080
export(replaceQuestionMarks)
8181
export(reverseOperonSeq)
82-
export(run_deltablast)
83-
export(run_rpsblast)
82+
export(runDeltaBlast)
83+
export(runRPSBlast)
8484
export(selectLongestDuplicate)
8585
export(sendJobStatusEmail)
8686
export(shortenLineage)

R/blastWrappers.R

+20-23
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,10 @@
1717
#' @export
1818
#'
1919
#' @examples
20-
run_deltablast <- function(deltablast_path, db_search_path,
21-
db = "refseq", query, evalue = "1e-5",
22-
out, num_alignments, num_threads = 1) {
23-
24-
start <- Sys.time()
25-
20+
runDeltaBlast <- function(deltablast_path, db_search_path,
21+
db = "refseq", query, evalue = "1e-5",
22+
out, num_alignments, num_threads = 1) {
23+
start <- Sys.time()
2624

2725
system(paste0("export BLASTDB=/", db_search_path))
2826

@@ -57,22 +55,21 @@ run_deltablast <- function(deltablast_path, db_search_path,
5755
#' @export
5856
#'
5957
#' @examples
60-
run_rpsblast <- function(rpsblast_path, db_search_path,
61-
db = "refseq", query, evalue = "1e-5",
62-
out, num_threads = 1) {
63-
64-
start <- Sys.time()
65-
system(paste0("export BLASTDB=/", db_search_path))
66-
67-
system2(
68-
command = rpsblast_path,
69-
args = c(
70-
"-db", db,
71-
"-query", query,
72-
"-evalue", evalue,
73-
"-out", out,
74-
"-num_threads", num_threads
58+
runRPSBlast <- function(rpsblast_path, db_search_path,
59+
db = "refseq", query, evalue = "1e-5",
60+
out, num_threads = 1) {
61+
start <- Sys.time()
62+
system(paste0("export BLASTDB=/", db_search_path))
63+
system2(
64+
command = rpsblast_path,
65+
args = c(
66+
"-db", db,
67+
"-query", query,
68+
"-evalue", evalue,
69+
"-out", out,
70+
"-num_threads", num_threads
71+
# , "-outfmt", outfmt
72+
)
7573
)
76-
)
77-
print(Sys.time() - start)
74+
print(Sys.time() - start)
7875
}

man/run_deltablast.Rd man/runDeltaBlast.Rd

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/run_rpsblast.Rd man/runRPSBlast.Rd

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)