From be9eac796feff0b28fcc94a30c608408893b24ed Mon Sep 17 00:00:00 2001 From: Derek Croote Date: Thu, 13 Jul 2023 20:52:45 -0700 Subject: [PATCH] fix: pretty print with suffix xclip or yclip Co-authored-by: slyo --- src/alignment.rs | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/src/alignment.rs b/src/alignment.rs index 9b0c4f4..666b18d 100644 --- a/src/alignment.rs +++ b/src/alignment.rs @@ -259,7 +259,7 @@ impl Alignment { y_pretty.push('-'); } AlignmentOperation::Xclip(len) => { - for k in x.iter().take(len) { + for k in x.iter().skip(x_i).take(len) { x_pretty.push_str(&format!("{}", String::from_utf8_lossy(&[*k]))); x_i += 1; @@ -269,7 +269,7 @@ impl Alignment { } } AlignmentOperation::Yclip(len) => { - for k in y.iter().take(len) { + for k in y.iter().skip(y_i).take(len) { y_pretty.push_str(&format!("{}", String::from_utf8_lossy(&[*k]))); y_i += 1; @@ -537,4 +537,21 @@ mod tests { ] ) } + + #[test] + fn test_pretty_suffix_xclip_or_yclip() { + let alignment = Alignment { + score: -7, + ystart: 1, + xstart: 0, + yend: 4, + xend: 3, + ylen: 4, + xlen: 4, + operations: vec![Yclip(1), Match, Match, Match, Xclip(1)], + mode: AlignmentMode::Custom, + }; + let pretty = concat!(" TCGC\n ||| \nATCG \n\n\n"); + assert_eq!(alignment.pretty(b"TCGC", b"ATCG", 100), pretty); + } }