Skip to content

Commit 367e338

Browse files
authored
Update to use JoinInfo type. (#539)
1 parent a9a3662 commit 367e338

File tree

3 files changed

+36
-34
lines changed

3 files changed

+36
-34
lines changed

Cargo.lock

+29-29
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

enclone_tail/src/group.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ use enclone_build::version_string;
2525
use enclone_core::barcode_fate::BarcodeFate;
2626
use enclone_core::combine_group_pics::combine_group_pics;
2727
use enclone_core::defs::{ColInfo, EncloneControl, ExactClonotype, GexInfo};
28+
use enclone_core::enclone_structs::JoinInfo;
2829
use enclone_core::mammalian_fixed_len::mammalian_fixed_len_peer_groups;
2930
use enclone_core::set_speakers::set_speakers;
3031
use enclone_help::help_utils::font_face_in_css;
@@ -54,7 +55,7 @@ pub fn group_and_print_clonotypes(
5455
exact_clonotypes: &Vec<ExactClonotype>,
5556
ctl: &EncloneControl,
5657
out_datas: &mut Vec<Vec<HashMap<String, String>>>,
57-
join_info: &Vec<(usize, usize, bool, Vec<u8>)>,
58+
join_info: &Vec<JoinInfo>,
5859
gex_info: &GexInfo,
5960
vdj_cells: &Vec<Vec<String>>,
6061
fate: &Vec<HashMap<String, BarcodeFate>>,
@@ -68,8 +69,8 @@ pub fn group_and_print_clonotypes(
6869

6970
let mut to_join_info = vec![Vec::<usize>::new(); exact_clonotypes.len()];
7071
for i in 0..join_info.len() {
71-
to_join_info[join_info[i].0].push(i);
72-
to_join_info[join_info[i].1].push(i);
72+
to_join_info[join_info[i].index1].push(i);
73+
to_join_info[join_info[i].index2].push(i);
7374
}
7475

7576
// Set up for parseable output.
@@ -436,7 +437,7 @@ pub fn group_and_print_clonotypes(
436437
}
437438
unique_sort(&mut ji);
438439
for i in 0..ji.len() {
439-
fwriteln!(glog, "{}", strme(&join_info[ji[i]].3));
440+
fwriteln!(glog, "{}", strme(&join_info[ji[i]].log));
440441
}
441442

442443
// Implement ALIGN<n> and JALIGN<n>.

enclone_tail/src/tail.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ use crate::group::group_and_print_clonotypes;
66
use enclone_core::barcode_fate::BarcodeFate;
77
use enclone_core::defs::{ColInfo, EncloneControl, ExactClonotype, GexInfo};
88

9+
use enclone_core::enclone_structs::JoinInfo;
910
use enclone_proto::types::DonorReferenceItem;
1011
use io_utils::fwrite;
1112
use ndarray::s;
@@ -32,7 +33,7 @@ pub fn tail_code(
3233
exact_clonotypes: &Vec<ExactClonotype>,
3334
ctl: &EncloneControl,
3435
out_datas: &mut Vec<Vec<HashMap<String, String>>>,
35-
join_info: &Vec<(usize, usize, bool, Vec<u8>)>,
36+
join_info: &Vec<JoinInfo>,
3637
gex_info: &GexInfo,
3738
vdj_cells: &Vec<Vec<String>>,
3839
fate: &Vec<HashMap<String, BarcodeFate>>,

0 commit comments

Comments
 (0)