obitools/obitools3
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 66 Wiki Activity

obi uniq: quick fix for bug where some sequences are not correctly

Browse Source 
dereplicated
This commit is contained in:
Celine Mercier
2020-07-03 17:36:57 +02:00
parent ccda0661ce
commit 9100e14899
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
python/obitools3/commands/uniq.pyx
View File

@ -307,7 +307,8 @@ cdef uniq_sequences(View_NUC_SEQS view, View_NUC_SEQS o_view, ProgressBar pb, di
for x in categories : for x in categories :
catl.append(i_seq[x]) catl.append(i_seq[x])
unique_id = tuple(catl) + (i_seq_col.get_line_idx(i),) unique_id = tuple(catl) + (i_seq_col[i],)
#unique_id = tuple(catl) + (i_seq_col.get_line_idx(i),)
#unique_id = tuple(i_seq[x] for x in categories) + (seq_col.get_line_idx(i),) # The line that cython can't read properly #unique_id = tuple(i_seq[x] for x in categories) + (seq_col.get_line_idx(i),) # The line that cython can't read properly
if unique_id in uniques: if unique_id in uniques:
@ -453,6 +454,7 @@ cdef uniq_sequences(View_NUC_SEQS view, View_NUC_SEQS o_view, ProgressBar pb, di
merged_dict[mkey] = {} merged_dict[mkey] = {}
for i_idx in merged_sequences: for i_idx in merged_sequences:
PyErr_CheckSignals()
pb(total_treated) pb(total_treated)
i_id = i_id_col[i_idx] i_id = i_id_col[i_idx]

2
python/obitools3/version.py
View File

@ -1,5 +1,5 @@
major = 3 major = 3
minor = 0 minor = 0
serial= '0b26a' serial= '0b26b'
version ="%d.%d.%s" % (major,minor,serial) version ="%d.%d.%s" % (major,minor,serial)