src/MSA/Concatenation.jl
changed.
Other files ignored by Codecov
62 | 62 | annotfile |
|
63 | 63 | end |
|
64 | 64 | ||
65 | - | function _get_seqname_mapping(concatenated_seqnames) |
|
65 | + | function _get_seqname_mapping(concatenated_seqnames, msas...) |
|
66 | 66 | mapping = Dict{Tuple{Int, String}, String}() |
|
67 | - | for concatenated_seqname in concatenated_seqnames |
|
68 | - | for (i, seqname) in enumerate(split(concatenated_seqname, "_&_")) |
|
69 | - | mapping[(i, seqname)] = concatenated_seqname |
|
67 | + | seq_names = hcat([sequencenames(msa) for msa in msas]...) |
|
68 | + | nseq, nmsa = size(seq_names) |
|
69 | + | @assert nseq == length(concatenated_seqnames) |
|
70 | + | for i in 1:nseq |
|
71 | + | for j in 1:nmsa |
|
72 | + | mapping[(j, seq_names[i, j])] = concatenated_seqnames[i] |
|
70 | 73 | end |
|
71 | 74 | end |
|
72 | 75 | mapping |
156 | 159 | colnames = _concatenated_col_names(msa...) |
|
157 | 160 | setnames!(concatenated_msa, seqnames, 1) |
|
158 | 161 | setnames!(concatenated_msa, colnames, 2) |
|
159 | - | seqname_mapping = _get_seqname_mapping(seqnames) |
|
162 | + | seqname_mapping = _get_seqname_mapping(seqnames, msa...) |
|
160 | 163 | seq_lengths = _get_seq_lengths(msa...) |
|
161 | 164 | old_annot = annotations.([msa...]) |
|
162 | 165 | new_annot = Annotations( |
Files | Coverage |
---|---|
src | 89.29% |
Project Totals (53 files) | 89.29% |