|
@@ -303,8 +303,6 @@ impl SequencesGraph {
|
|
|
let mut base = b'N';
|
|
let mut base = b'N';
|
|
|
if *max_base as f32 / n_base as f32 > 0.5 {
|
|
if *max_base as f32 / n_base as f32 > 0.5 {
|
|
|
n_atcg.iter().enumerate().for_each(|(pos, n)| if n == max_base { base = atcg[pos] });
|
|
n_atcg.iter().enumerate().for_each(|(pos, n)| if n == max_base { base = atcg[pos] });
|
|
|
- } else {
|
|
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
consensus_sequence.push(base);
|
|
consensus_sequence.push(base);
|
|
@@ -312,14 +310,9 @@ impl SequencesGraph {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
- println!("RES {:?}", String::from_utf8_lossy(&consensus_sequence));
|
|
|
|
|
- println!("last = {:?}", consensus_sequence.last().unwrap().to_owned());
|
|
|
|
|
- println!("last = {:?}", consensus_sequence.last().unwrap().to_owned() == b'N');
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
- if consensus_sequence.last().unwrap().to_owned() == b'N' {
|
|
|
|
|
- println!("NNNNNNNNNNNNNNNNNNNnn!")
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ // println!("RES {:?}", String::from_utf8_lossy(&consensus_sequence));
|
|
|
|
|
+ // println!("last = {:?}", consensus_sequence.last().unwrap().to_owned());
|
|
|
|
|
+ // println!("last = {:?}", consensus_sequence.last().unwrap().to_owned() == b'N');
|
|
|
consensus_sequence
|
|
consensus_sequence
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -365,7 +358,8 @@ impl SequencesGraph {
|
|
|
name: format!("sequence_{stretch_id}"),
|
|
name: format!("sequence_{stretch_id}"),
|
|
|
contig: cons.clone(),
|
|
contig: cons.clone(),
|
|
|
alignments: Vec::new(),
|
|
alignments: Vec::new(),
|
|
|
- sequences, sequences_names,
|
|
|
|
|
|
|
+ sequences,
|
|
|
|
|
+ sequences_names,
|
|
|
stretch,
|
|
stretch,
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -456,7 +450,7 @@ impl NeoContig {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if let (Some(qname), Some(flag), Some(rname), Some(pos), Some(cigar), Some(sequence)) = (qname, flag, rname, pos, cigar, sequence) {
|
|
if let (Some(qname), Some(flag), Some(rname), Some(pos), Some(cigar), Some(sequence)) = (qname, flag, rname, pos, cigar, sequence) {
|
|
|
- alignments.push(Sam::new(qname, flag, rname, pos, cigar, sequence, &fa));
|
|
|
|
|
|
|
+ alignments.push(Sam::new(qname, flag, rname, pos, cigar, self.contig.clone(), &fa));
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|