Skip to content

Commit bd065a0

Browse files
committed
update pipe to newer implementation
1 parent f3743db commit bd065a0

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

mmeds/tools/R_utils.R

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ taxa_barplot <- function(features, metadata, category, ntoplot, sort="top"){
156156
features[is.na(features)] <- 0
157157

158158
if(missing(metadata)){metadata<-data.frame(SampleID=colnames(features))}
159-
if(!"SampleID" %in% colnames(metadata)){metadata <- metadata %>% rownames_to_column("SampleID")}
159+
if(!"SampleID" %in% colnames(metadata)){metadata <- metadata |> rownames_to_column("SampleID")}
160160
if(!missing(category) && !is.na(category)){
161161
if(!category %in% colnames(metadata)){message(stop(category, " not found as column in metdata"))}
162162
}
@@ -223,15 +223,15 @@ taxa_barplot <- function(features, metadata, category, ntoplot, sort="top"){
223223
suppressMessages(
224224
suppressWarnings(
225225
fplot<-
226-
features %>%
227-
as.data.frame() %>%
228-
rownames_to_column(var="Taxon") %>%
229-
gather(-Taxon, key="SampleID", value="Abundance") %>%
230-
mutate(Taxon=if_else(Taxon %in% plotfeats, Taxon, "Remainder")) %>%
231-
group_by(Taxon, SampleID) %>%
232-
summarize(Abundance=sum(Abundance)) %>%
233-
ungroup() %>%
234-
mutate(Taxon=factor(Taxon, levels=rev(c(plotfeats, "Remainder")))) %>%
226+
features |>
227+
as.data.frame() |>
228+
rownames_to_column(var="Taxon") |>
229+
gather(-Taxon, key="SampleID", value="Abundance") |>
230+
mutate(Taxon=if_else(Taxon %in% plotfeats, Taxon, "Remainder")) |>
231+
group_by(Taxon, SampleID) |>
232+
summarize(Abundance=sum(Abundance)) |>
233+
ungroup() |>
234+
mutate(Taxon=factor(Taxon, levels=rev(c(plotfeats, "Remainder")))) |>
235235
left_join(metadata)
236236
)
237237
)

mmeds/tools/run_benchdamic.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ foldchange_df <- get_fold_change(q2_data_obj, var, c(valPos, valNeg), features_v
5858

5959
subset_text <- paste(var, " %in% c('", valPos, "', '", valNeg, "')", sep="")
6060

61-
phyloseq_data_obj <- phyloseq_data_obj %>% subset_samples(
61+
phyloseq_data_obj <- phyloseq_data_obj |> subset_samples(
6262
eval(parse(text=subset_text))
6363
)
6464

65-
phyloseq_data_obj <- phyloseq_data_obj %>% transform_sample_counts(
65+
phyloseq_data_obj <- phyloseq_data_obj |> transform_sample_counts(
6666
function(x) {as.integer(x)}
6767
)
6868

0 commit comments

Comments
 (0)