Skip to content

Commit

Permalink
More modifications
Browse files Browse the repository at this point in the history
  • Loading branch information
Oddant1 committed Aug 22, 2024
1 parent 3f50d17 commit 88bd9a4
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 17 deletions.
13 changes: 6 additions & 7 deletions q2_boots/_alpha.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,14 @@ def alpha_collection(ctx, table, sampling_depth, metric, n,

def alpha(ctx, table, sampling_depth, metric, n, replacement, phylogeny=None,
average_method='median'):

alpha_collection_action = ctx.get_action("boots", "alpha_collection")
alpha_average_action = ctx.get_action('boots', 'alpha_average')
sample_data = alpha_collection_action(table=table,
sampling_depth=sampling_depth,
phylogeny=phylogeny,
metric=metric,
n=n,
replacement=replacement)
sample_data, = alpha_collection_action(table=table,
sampling_depth=sampling_depth,
phylogeny=phylogeny,
metric=metric,
n=n,
replacement=replacement)

result, = alpha_average_action(sample_data, average_method)
return result
Expand Down
20 changes: 10 additions & 10 deletions q2_boots/_beta.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,16 @@ def beta(ctx, table, metric, sampling_depth, n, replacement,
variance_adjusted=_METRIC_MOD_DEFAULTS['variance_adjusted']):
beta_collection_action = ctx.get_action('boots', 'beta_collection')
beta_average_action = ctx.get_action('boots', 'beta_average')
dms = beta_collection_action(table=table,
phylogeny=phylogeny,
metric=metric,
sampling_depth=sampling_depth,
n=n,
pseudocount=pseudocount,
replacement=replacement,
variance_adjusted=variance_adjusted,
alpha=alpha,
bypass_tips=bypass_tips)
dms, = beta_collection_action(table=table,
phylogeny=phylogeny,
metric=metric,
sampling_depth=sampling_depth,
n=n,
pseudocount=pseudocount,
replacement=replacement,
variance_adjusted=variance_adjusted,
alpha=alpha,
bypass_tips=bypass_tips)

result, = beta_average_action(dms, average_method)
return result
Expand Down

0 comments on commit 88bd9a4

Please sign in to comment.