break up main annotation function into small pieces #405
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
macklin-10x
force-pushed
the
macklin/annotation-internal-types
branch
from
88b4193 to
8fb4a75
Compare
macklin-10x
force-pushed
the
macklin/break-up-annotation
branch
from
8bf9191 to
760494f
Compare
macklin-10x
force-pushed
the
macklin/annotation-internal-types
branch
from
8fb4a75 to
276a5f0
Compare
macklin-10x
force-pushed
the
macklin/break-up-annotation
branch
from
760494f to
f048159
Compare
macklin-10x
force-pushed
the
macklin/break-up-annotation
branch
from
f048159 to
16096b7
Compare
sreenathkrishnan
approved these changes
Apr 17, 2024
| ) | ||
| }; | ||
| key(a).cmp(&key(b)) | ||
| }); |
There was a problem hiding this comment.
Thank you! A lot cleaner now. This mem swap makes the changes confusing, but looks like we have it right
Comment on lines
-2521
to
-2549
| let mut to_delete: Vec<bool> = vec![false; annx.len()]; | ||
| let (mut u, mut v) = (Vec::<String>::new(), Vec::<String>::new()); | ||
| for a in &annx { | ||
| let t = a.ref_id as usize; | ||
| if !rheaders[t].contains("segment") { | ||
| let name = rheaders[t].after("|").between("|", "|"); | ||
| if rheaders[t].contains("UTR") { | ||
| u.push(name.to_string()); | ||
| } | ||
| if rheaders[t].contains("V-REGION") { | ||
| v.push(name.to_string()); | ||
| } | ||
| } | ||
| } | ||
| v.sort(); | ||
| for item in &u { | ||
| if !bin_member(&v, item) { | ||
| for j in 0..annx.len() { | ||
| let t = annx[j].ref_id as usize; | ||
| if !rheaders[t].contains("segment") { | ||
| let name = rheaders[t].after("|").between("|", "|"); | ||
| if rheaders[t].contains("UTR") && item == name { | ||
| to_delete[j] = true; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| erase_if(&mut annx, &to_delete); |
There was a problem hiding this comment.
Great to get rid of this large duplicated block
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Mechanistic refactoring of the annotation code from a single straight-shot function into a collection of smaller individual pieces. The only non-trivial changes to code were untangling the use of
std::mem::swapleft over from when the internal annotation types were tuples instead of structs.