@@ -25,6 +25,7 @@ use enclone_build::version_string;
25
25
use enclone_core:: barcode_fate:: BarcodeFate ;
26
26
use enclone_core:: combine_group_pics:: combine_group_pics;
27
27
use enclone_core:: defs:: { ColInfo , EncloneControl , ExactClonotype , GexInfo } ;
28
+ use enclone_core:: enclone_structs:: JoinInfo ;
28
29
use enclone_core:: mammalian_fixed_len:: mammalian_fixed_len_peer_groups;
29
30
use enclone_core:: set_speakers:: set_speakers;
30
31
use enclone_help:: help_utils:: font_face_in_css;
@@ -54,7 +55,7 @@ pub fn group_and_print_clonotypes(
54
55
exact_clonotypes : & Vec < ExactClonotype > ,
55
56
ctl : & EncloneControl ,
56
57
out_datas : & mut Vec < Vec < HashMap < String , String > > > ,
57
- join_info : & Vec < ( usize , usize , bool , Vec < u8 > ) > ,
58
+ join_info : & Vec < JoinInfo > ,
58
59
gex_info : & GexInfo ,
59
60
vdj_cells : & Vec < Vec < String > > ,
60
61
fate : & Vec < HashMap < String , BarcodeFate > > ,
@@ -68,8 +69,8 @@ pub fn group_and_print_clonotypes(
68
69
69
70
let mut to_join_info = vec ! [ Vec :: <usize >:: new( ) ; exact_clonotypes. len( ) ] ;
70
71
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) ;
73
74
}
74
75
75
76
// Set up for parseable output.
@@ -436,7 +437,7 @@ pub fn group_and_print_clonotypes(
436
437
}
437
438
unique_sort ( & mut ji) ;
438
439
for i in 0 ..ji. len ( ) {
439
- fwriteln ! ( glog, "{}" , strme( & join_info[ ji[ i] ] . 3 ) ) ;
440
+ fwriteln ! ( glog, "{}" , strme( & join_info[ ji[ i] ] . log ) ) ;
440
441
}
441
442
442
443
// Implement ALIGN<n> and JALIGN<n>.
0 commit comments