Update to use JoinInfo type. (#539)

10XGenomics · Mar 22, 2024 · 367e338 · 367e338
1 parent a9a3662
commit 367e338
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 34 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/enclone_tail/src/group.rs b/enclone_tail/src/group.rs
@@ -25,6 +25,7 @@ use enclone_build::version_string;
 use enclone_core::barcode_fate::BarcodeFate;
 use enclone_core::combine_group_pics::combine_group_pics;
 use enclone_core::defs::{ColInfo, EncloneControl, ExactClonotype, GexInfo};
+use enclone_core::enclone_structs::JoinInfo;
 use enclone_core::mammalian_fixed_len::mammalian_fixed_len_peer_groups;
 use enclone_core::set_speakers::set_speakers;
 use enclone_help::help_utils::font_face_in_css;
@@ -54,7 +55,7 @@ pub fn group_and_print_clonotypes(
     exact_clonotypes: &Vec<ExactClonotype>,
     ctl: &EncloneControl,
     out_datas: &mut Vec<Vec<HashMap<String, String>>>,
-    join_info: &Vec<(usize, usize, bool, Vec<u8>)>,
+    join_info: &Vec<JoinInfo>,
     gex_info: &GexInfo,
     vdj_cells: &Vec<Vec<String>>,
     fate: &Vec<HashMap<String, BarcodeFate>>,
@@ -68,8 +69,8 @@ pub fn group_and_print_clonotypes(
 
     let mut to_join_info = vec![Vec::<usize>::new(); exact_clonotypes.len()];
     for i in 0..join_info.len() {
-        to_join_info[join_info[i].0].push(i);
-        to_join_info[join_info[i].1].push(i);
+        to_join_info[join_info[i].index1].push(i);
+        to_join_info[join_info[i].index2].push(i);
     }
 
     // Set up for parseable output.
@@ -436,7 +437,7 @@ pub fn group_and_print_clonotypes(
             }
             unique_sort(&mut ji);
             for i in 0..ji.len() {
-                fwriteln!(glog, "{}", strme(&join_info[ji[i]].3));
+                fwriteln!(glog, "{}", strme(&join_info[ji[i]].log));
             }
 
             // Implement ALIGN<n> and JALIGN<n>.

diff --git a/enclone_tail/src/tail.rs b/enclone_tail/src/tail.rs
@@ -6,6 +6,7 @@ use crate::group::group_and_print_clonotypes;
 use enclone_core::barcode_fate::BarcodeFate;
 use enclone_core::defs::{ColInfo, EncloneControl, ExactClonotype, GexInfo};
 
+use enclone_core::enclone_structs::JoinInfo;
 use enclone_proto::types::DonorReferenceItem;
 use io_utils::fwrite;
 use ndarray::s;
@@ -32,7 +33,7 @@ pub fn tail_code(
     exact_clonotypes: &Vec<ExactClonotype>,
     ctl: &EncloneControl,
     out_datas: &mut Vec<Vec<HashMap<String, String>>>,
-    join_info: &Vec<(usize, usize, bool, Vec<u8>)>,
+    join_info: &Vec<JoinInfo>,
     gex_info: &GexInfo,
     vdj_cells: &Vec<Vec<String>>,
     fate: &Vec<HashMap<String, BarcodeFate>>,