varvamp 0.8__py3-none-any.whl → 0.8.2__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- varvamp/__init__.py +1 -1
- varvamp/command.py +1 -1
- varvamp/scripts/alignment.py +6 -3
- varvamp/scripts/param_estimation.py +3 -3
- {varvamp-0.8.dist-info → varvamp-0.8.2.dist-info}/METADATA +1 -1
- {varvamp-0.8.dist-info → varvamp-0.8.2.dist-info}/RECORD +9 -9
- {varvamp-0.8.dist-info → varvamp-0.8.2.dist-info}/WHEEL +0 -0
- {varvamp-0.8.dist-info → varvamp-0.8.2.dist-info}/entry_points.txt +0 -0
- {varvamp-0.8.dist-info → varvamp-0.8.2.dist-info}/top_level.txt +0 -0
varvamp/__init__.py
CHANGED
varvamp/command.py
CHANGED
|
@@ -163,7 +163,7 @@ def shared_workflow(args, log_file):
|
|
|
163
163
|
if args.mode == "qpcr" and args.n_ambig >= 1 and args.pn_ambig is None:
|
|
164
164
|
args.pn_ambig = args.n_ambig - 1
|
|
165
165
|
with open(log_file, "a") as f:
|
|
166
|
-
print(f"Automatic parameter selection set -
|
|
166
|
+
print(f"Automatic parameter selection set -pa {args.pn_ambig}.", file=f)
|
|
167
167
|
|
|
168
168
|
# check arguments
|
|
169
169
|
logging.raise_arg_errors(args, log_file)
|
varvamp/scripts/alignment.py
CHANGED
|
@@ -215,9 +215,12 @@ def process_alignment(preprocessed_alignment, threshold):
|
|
|
215
215
|
if unique_gaps:
|
|
216
216
|
gap_dic = create_gap_dictionary(unique_gaps, all_gaps)
|
|
217
217
|
gaps_to_mask = find_gaps_to_mask(gap_dic, gap_cutoff)
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
218
|
+
if gaps_to_mask:
|
|
219
|
+
alignment_cleaned = clean_gaps(
|
|
220
|
+
preprocessed_alignment, gaps_to_mask
|
|
221
|
+
)
|
|
222
|
+
else:
|
|
223
|
+
alignment_cleaned = preprocessed_alignment
|
|
221
224
|
else:
|
|
222
225
|
gaps_to_mask = []
|
|
223
226
|
alignment_cleaned = preprocessed_alignment
|
|
@@ -38,11 +38,11 @@ def calculate_distances(all_freqs, threshold):
|
|
|
38
38
|
previous_dis = 0
|
|
39
39
|
all_dis = []
|
|
40
40
|
|
|
41
|
-
for freq in all_freqs:
|
|
41
|
+
for idx, freq in enumerate(all_freqs):
|
|
42
42
|
if freq < threshold:
|
|
43
43
|
current_dis = 0
|
|
44
44
|
current_dis += 1
|
|
45
|
-
if current_dis <= previous_dis:
|
|
45
|
+
if current_dis <= previous_dis or idx == len(all_freqs)-1:
|
|
46
46
|
all_dis.append(previous_dis)
|
|
47
47
|
|
|
48
48
|
previous_dis = current_dis
|
|
@@ -85,7 +85,7 @@ def get_parameters(preprocessed_alignment, args, log_file):
|
|
|
85
85
|
[distances[x] for x in range(0, len(distances)) if sum(distances[x:x+args.n_ambig+1]) >= config.PRIMER_SIZES[0]]
|
|
86
86
|
)
|
|
87
87
|
# calculate coverage
|
|
88
|
-
coverage = covered_pos/len(preprocessed_alignment[0][1])
|
|
88
|
+
coverage = (covered_pos+1)/len(preprocessed_alignment[0][1])
|
|
89
89
|
# change the non fixed param if threshold has not been reached
|
|
90
90
|
if coverage >= 0.5:
|
|
91
91
|
# write each iteration to log
|
|
@@ -1,19 +1,19 @@
|
|
|
1
|
-
varvamp/__init__.py,sha256=
|
|
1
|
+
varvamp/__init__.py,sha256=6ftSwxs5TY7JG0KbwIz62AUA-2eblnr5J56Lkj-Otgg,107
|
|
2
2
|
varvamp/__main__.py,sha256=9R3mbX2_Q5LByPx8WLoTbvZ-G2dbRSMpDlgze0Wm5Fc,98
|
|
3
|
-
varvamp/command.py,sha256=
|
|
3
|
+
varvamp/command.py,sha256=erWMFwJpZ4OLBKmBtrcHuUkVZfvyranJq__vJMd2m4Y,16232
|
|
4
4
|
varvamp/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
5
|
-
varvamp/scripts/alignment.py,sha256=
|
|
5
|
+
varvamp/scripts/alignment.py,sha256=jNQEtjmohSVtBlzP5wUVzZzVZl012waWGxfe9n9ArzY,6974
|
|
6
6
|
varvamp/scripts/config.py,sha256=CSk2-OBTDyJoNDpHTDP8f7yHbZTF9QE-PQUULJMplZE,2290
|
|
7
7
|
varvamp/scripts/consensus.py,sha256=dp8WXQSB2of1Fi3bPtJYX4bHhGQmEvTUAO1pQ1fG-wQ,3374
|
|
8
8
|
varvamp/scripts/logging.py,sha256=l8tEpz6cnz6MjV3TwW0ofozwza-9BnReyuzJmrnc2MI,14427
|
|
9
|
-
varvamp/scripts/param_estimation.py,sha256=
|
|
9
|
+
varvamp/scripts/param_estimation.py,sha256=nOZpDtf480CQ_ckTxdIhl53qmY3kkKRhiOcSTRarMag,3690
|
|
10
10
|
varvamp/scripts/primers.py,sha256=LzNnYJhgdxZJMHQe-GfKZnR8vIWE77fPcijtfErxo-U,12939
|
|
11
11
|
varvamp/scripts/qpcr.py,sha256=-EwYXnR0dmsS_WkCVLIlr2pCXmbifOUHwG8gJCUS2FQ,11623
|
|
12
12
|
varvamp/scripts/regions.py,sha256=vLNOVicod5tup-svQYOMIooaqkkiM2gIGHBscDu3oUU,3273
|
|
13
13
|
varvamp/scripts/reporting.py,sha256=-M0BsB-QKF4x8YGljPaJAvKKniPRWlz7I4_zOHxiyBA,19760
|
|
14
14
|
varvamp/scripts/scheme.py,sha256=nkkcf5rFXAbtuidWBTMef6DM5ZZXMh9bpZ0vldhs7IM,15719
|
|
15
|
-
varvamp-0.8.dist-info/METADATA,sha256=
|
|
16
|
-
varvamp-0.8.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
|
|
17
|
-
varvamp-0.8.dist-info/entry_points.txt,sha256=puzW-basyBexZT4JVRUfUEqobvFmEyfqRQaqFjp7rB0,49
|
|
18
|
-
varvamp-0.8.dist-info/top_level.txt,sha256=11oVwE3SBUB9aTmvpvEDru95Tc5GZqQikzzFjw2eVGc,8
|
|
19
|
-
varvamp-0.8.dist-info/RECORD,,
|
|
15
|
+
varvamp-0.8.2.dist-info/METADATA,sha256=j7-hHm1heJEdN3Y_F8gixD0hqI8pRPaFU1KkwXMcDWI,4353
|
|
16
|
+
varvamp-0.8.2.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
|
|
17
|
+
varvamp-0.8.2.dist-info/entry_points.txt,sha256=puzW-basyBexZT4JVRUfUEqobvFmEyfqRQaqFjp7rB0,49
|
|
18
|
+
varvamp-0.8.2.dist-info/top_level.txt,sha256=11oVwE3SBUB9aTmvpvEDru95Tc5GZqQikzzFjw2eVGc,8
|
|
19
|
+
varvamp-0.8.2.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|