Skip to content

Commit 70c7a83

Browse files
Oddant1gregcaporaso
authored andcommitted
More modifications
1 parent 5129e25 commit 70c7a83

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed

q2_boots/_alpha.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,14 @@ def alpha_collection(ctx, table, sampling_depth, metric, n,
4545

4646
def alpha(ctx, table, sampling_depth, metric, n, replacement, phylogeny=None,
4747
average_method='median'):
48-
4948
alpha_collection_action = ctx.get_action("boots", "alpha_collection")
5049
alpha_average_action = ctx.get_action('boots', 'alpha_average')
51-
sample_data = alpha_collection_action(table=table,
52-
sampling_depth=sampling_depth,
53-
phylogeny=phylogeny,
54-
metric=metric,
55-
n=n,
56-
replacement=replacement)
50+
sample_data, = alpha_collection_action(table=table,
51+
sampling_depth=sampling_depth,
52+
phylogeny=phylogeny,
53+
metric=metric,
54+
n=n,
55+
replacement=replacement)
5756

5857
result, = alpha_average_action(sample_data, average_method)
5958
return result

q2_boots/_beta.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,16 +76,16 @@ def beta(ctx, table, metric, sampling_depth, n, replacement,
7676
variance_adjusted=_METRIC_MOD_DEFAULTS['variance_adjusted']):
7777
beta_collection_action = ctx.get_action('boots', 'beta_collection')
7878
beta_average_action = ctx.get_action('boots', 'beta_average')
79-
dms = beta_collection_action(table=table,
80-
phylogeny=phylogeny,
81-
metric=metric,
82-
sampling_depth=sampling_depth,
83-
n=n,
84-
pseudocount=pseudocount,
85-
replacement=replacement,
86-
variance_adjusted=variance_adjusted,
87-
alpha=alpha,
88-
bypass_tips=bypass_tips)
79+
dms, = beta_collection_action(table=table,
80+
phylogeny=phylogeny,
81+
metric=metric,
82+
sampling_depth=sampling_depth,
83+
n=n,
84+
pseudocount=pseudocount,
85+
replacement=replacement,
86+
variance_adjusted=variance_adjusted,
87+
alpha=alpha,
88+
bypass_tips=bypass_tips)
8989

9090
result, = beta_average_action(dms, average_method)
9191
return result

0 commit comments

Comments
 (0)