diff --git a/DESCRIPTION b/DESCRIPTION index ac52495..c5b0372 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -14,7 +14,7 @@ Suggests: rmarkdown, covr, testthat -Depends: +Depends: R (>= 2.10) Imports: whatbacteria diff --git a/NAMESPACE b/NAMESPACE index 84beb52..748e543 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -14,4 +14,4 @@ export(mirix_metronidazole) export(mirix_vancomycin) export(phenotype_susceptibility) export(predict_abundance) -import(mirixdb) +import(whatbacteria) diff --git a/R/abx_index.R b/R/abx_index.R index d60c766..a2b0f8b 100644 --- a/R/abx_index.R +++ b/R/abx_index.R @@ -24,8 +24,8 @@ NULL mirix_vancomycin <- function(abundance, lineage, replace_zero = 1e-4, - antibiotic_db = mirixdb::taxon_susceptibility, - phenotype_db = mirixdb::taxon_phenotypes) { + antibiotic_db = whatbacteria::taxon_susceptibility, + phenotype_db = whatbacteria::taxon_phenotypes) { susceptibility <- antibiotic_susceptibility_vancomycin( lineage, antibiotic_db, phenotype_db) mirix(abundance, susceptibility, replace_zero) @@ -36,7 +36,7 @@ mirix_vancomycin <- function(abundance, mirix_doxycycline <- function(abundance, lineage, replace_zero = 1e-4, - antibiotic_db = mirixdb::taxon_susceptibility) { + antibiotic_db = whatbacteria::taxon_susceptibility) { susceptibility <- antibiotic_susceptibility_tetracycline( lineage, antibiotic_db) mirix(abundance, susceptibility, replace_zero) @@ -47,7 +47,7 @@ mirix_doxycycline <- function(abundance, mirix_amoxicillin <- function(abundance, lineage, replace_zero = 1e-4, - antibiotic_db = mirixdb::taxon_susceptibility) { + antibiotic_db = whatbacteria::taxon_susceptibility) { susceptibility <- antibiotic_susceptibility_penicillin( lineage, antibiotic_db) mirix(abundance, susceptibility, replace_zero) @@ -58,7 +58,7 @@ mirix_amoxicillin <- function(abundance, mirix_metronidazole <- function(abundance, lineage, replace_zero = 1e-4, - phenotype_db = mirixdb::taxon_phenotypes) { + phenotype_db = whatbacteria::taxon_phenotypes) { susceptibility <- phenotype_susceptibility( lineage = lineage, phenotype = "aerobic_status", @@ -75,7 +75,7 @@ mirix_metronidazole <- function(abundance, mirix_ciprofloxacin <- function(abundance, lineage, replace_zero = 1e-4, - phenotype_db = mirixdb::taxon_phenotypes) { + phenotype_db = whatbacteria::taxon_phenotypes) { susceptibility <- phenotype_susceptibility( lineage = lineage, phenotype = "aerobic_status", @@ -92,8 +92,8 @@ mirix_ciprofloxacin <- function(abundance, mirix_gentamicin <- function(abundance, lineage, replace_zero = 1e-4, - antibiotic_db = mirixdb::taxon_susceptibility, - phenotype_db = mirixdb::taxon_phenotypes) { + antibiotic_db = whatbacteria::taxon_susceptibility, + phenotype_db = whatbacteria::taxon_phenotypes) { susceptibility <- antibiotic_susceptibility_aminoglycoside( lineage, antibiotic_db, phenotype_db) mirix(abundance, susceptibility, replace_zero) @@ -111,7 +111,7 @@ mirix_gentamicin <- function(abundance, #' 0.5 is typical. For relative abundances, a number that is slightly lower #' than the lowest relative abundance will work. #' -#' @import mirixdb +#' @import whatbacteria #' @return The MiRIx value #' @export mirix <- function (abundance, susceptibility, replace_zero = 1e-4) { diff --git a/R/susceptibility.R b/R/susceptibility.R index 529aa04..b38a100 100644 --- a/R/susceptibility.R +++ b/R/susceptibility.R @@ -13,8 +13,8 @@ NULL #' @rdname antibiotic_specific_susceptibility #' @export antibiotic_susceptibility_vancomycin <- function (lineage, - antibiotic_db = mirixdb::taxon_susceptibility, - phenotype_db = mirixdb::taxon_phenotypes) { + antibiotic_db = whatbacteria::taxon_susceptibility, + phenotype_db = whatbacteria::taxon_phenotypes) { # Gram-positive organisms are susceptible to vancomycin ph_sus <- phenotype_susceptibility( lineage = lineage, @@ -33,7 +33,7 @@ antibiotic_susceptibility_vancomycin <- function (lineage, #' @rdname antibiotic_specific_susceptibility #' @export antibiotic_susceptibility_tetracycline <- function (lineage, - antibiotic_db = mirixdb::taxon_susceptibility) { + antibiotic_db = whatbacteria::taxon_susceptibility) { intrinsic_sus <- rep("susceptible", length(lineage)) abx_sus <- antibiotic_susceptibility( lineage = lineage, @@ -45,7 +45,7 @@ antibiotic_susceptibility_tetracycline <- function (lineage, #' @rdname antibiotic_specific_susceptibility #' @export antibiotic_susceptibility_penicillin <- function(lineage, - antibiotic_db = mirixdb::taxon_susceptibility) { + antibiotic_db = whatbacteria::taxon_susceptibility) { intrinsic_sus <- rep("susceptible", length(lineage)) abx_sus <- antibiotic_susceptibility( lineage = lineage, @@ -57,13 +57,13 @@ antibiotic_susceptibility_penicillin <- function(lineage, #' @rdname antibiotic_specific_susceptibility #' @export antibiotic_susceptibility_aminoglycoside <- function (lineage, - antibiotic_db = mirixdb::taxon_susceptibility, - phenotype_db = mirixdb::taxon_phenotypes) { - gram_stain_db <- mirixdb::taxon_phenotypes[,c("taxon", "rank", "gram_stain")] + antibiotic_db = whatbacteria::taxon_susceptibility, + phenotype_db = whatbacteria::taxon_phenotypes) { + gram_stain_db <- whatbacteria::taxon_phenotypes[,c("taxon", "rank", "gram_stain")] colnames(gram_stain_db)[3] <- "value" gram_stain_phenotype <- match_annotation(lineage, gram_stain_db) - aerobic_status_db <- mirixdb::taxon_phenotypes[,c("taxon", "rank", "aerobic_status")] + aerobic_status_db <- whatbacteria::taxon_phenotypes[,c("taxon", "rank", "aerobic_status")] colnames(aerobic_status_db)[3] <- "value" aerobic_status_phenotype <- match_annotation(lineage, aerobic_status_db) diff --git a/man/antibiotic_specific_susceptibility.Rd b/man/antibiotic_specific_susceptibility.Rd index c86dc0e..05a5ae0 100644 --- a/man/antibiotic_specific_susceptibility.Rd +++ b/man/antibiotic_specific_susceptibility.Rd @@ -10,24 +10,24 @@ \usage{ antibiotic_susceptibility_vancomycin( lineage, - antibiotic_db = mirixdb::taxon_susceptibility, - phenotype_db = mirixdb::taxon_phenotypes + antibiotic_db = whatbacteria::taxon_susceptibility, + phenotype_db = whatbacteria::taxon_phenotypes ) antibiotic_susceptibility_tetracycline( lineage, - antibiotic_db = mirixdb::taxon_susceptibility + antibiotic_db = whatbacteria::taxon_susceptibility ) antibiotic_susceptibility_penicillin( lineage, - antibiotic_db = mirixdb::taxon_susceptibility + antibiotic_db = whatbacteria::taxon_susceptibility ) antibiotic_susceptibility_aminoglycoside( lineage, - antibiotic_db = mirixdb::taxon_susceptibility, - phenotype_db = mirixdb::taxon_phenotypes + antibiotic_db = whatbacteria::taxon_susceptibility, + phenotype_db = whatbacteria::taxon_phenotypes ) } \arguments{ diff --git a/man/mirix_antibiotic.Rd b/man/mirix_antibiotic.Rd index 5446f54..40f7477 100644 --- a/man/mirix_antibiotic.Rd +++ b/man/mirix_antibiotic.Rd @@ -14,44 +14,44 @@ mirix_vancomycin( abundance, lineage, replace_zero = 1e-04, - antibiotic_db = mirixdb::taxon_susceptibility, - phenotype_db = mirixdb::taxon_phenotypes + antibiotic_db = whatbacteria::taxon_susceptibility, + phenotype_db = whatbacteria::taxon_phenotypes ) mirix_doxycycline( abundance, lineage, replace_zero = 1e-04, - antibiotic_db = mirixdb::taxon_susceptibility + antibiotic_db = whatbacteria::taxon_susceptibility ) mirix_amoxicillin( abundance, lineage, replace_zero = 1e-04, - antibiotic_db = mirixdb::taxon_susceptibility + antibiotic_db = whatbacteria::taxon_susceptibility ) mirix_metronidazole( abundance, lineage, replace_zero = 1e-04, - phenotype_db = mirixdb::taxon_phenotypes + phenotype_db = whatbacteria::taxon_phenotypes ) mirix_ciprofloxacin( abundance, lineage, replace_zero = 1e-04, - phenotype_db = mirixdb::taxon_phenotypes + phenotype_db = whatbacteria::taxon_phenotypes ) mirix_gentamicin( abundance, lineage, replace_zero = 1e-04, - antibiotic_db = mirixdb::taxon_susceptibility, - phenotype_db = mirixdb::taxon_phenotypes + antibiotic_db = whatbacteria::taxon_susceptibility, + phenotype_db = whatbacteria::taxon_phenotypes ) } \arguments{