Fix troublet column order for extra columns

wheaton5 · Nov 24, 2022 · f91f05d · f91f05d
1 parent bbc8bbd
commit f91f05d
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/troublet/src/main.rs b/troublet/src/main.rs
@@ -34,7 +34,7 @@ fn call_doublets(params: &Params, mut cluster_allele_counts: FnvHashMap<(usize,u
         soup_allele_fractions: Vec<f64>, cell_allele_counts: Vec<Vec<(usize, u64, u64)>>, 
         cluster_losses: Vec<(String, Vec<f64>)>, total_locus_counts: HashMap<usize, usize>) { // good god i should use more structs
     let num_clusters = cluster_losses[0].1.len();
-    print!("barcode\tstatus\tassignment\tlsinglet_posterior\tdoublet_posterior\tlog_prob_singleton\tlog_prob_doublet\t");
+    print!("barcode\tstatus\tassignment\tsinglet_posterior\tdoublet_posterior\tlog_prob_singleton\tlog_prob_doublet\t");
     for cluster in 0..num_clusters {
         print!("cluster{}",cluster);
         if cluster == num_clusters - 1 {println!();}
@@ -169,15 +169,15 @@ fn call_doublets(params: &Params, mut cluster_allele_counts: FnvHashMap<(usize,u
             let mut assignment: Vec<String> = Vec::new(); assignment.push(cell_barcode.to_string());
             if best_singleton_log_prob > best_doublet_log_prob {
                 if singlet_posterior > params.singlet_threshold {
-                    assignment.push(format!("singlet\t{}\t{}\t{}\t{}\t{}", singlet_posterior, doublet_posterior, best_singlet, best_singleton_log_prob, best_doublet_log_prob));
+                    assignment.push(format!("singlet\t{}\t{}\t{}\t{}\t{}", best_singlet, singlet_posterior, doublet_posterior, best_singleton_log_prob, best_doublet_log_prob));
                     //print!("{}\tsinglet\t{}\t{}\t{}\t", cell_barcode, best_singlet, best_singleton_log_prob, best_doublet_log_prob);
                 } else {
                     //if !all_removed.contains(&cell) {
                     //    all_removed.insert(cell);
                     //    new_removed.push(cell);
                     //    eprintln!("removing {} as unassigned", cell_barcode);
                     //}
-                    assignment.push(format!("unassigned\t{}\t{}\t{}\t{}\t{}", singlet_posterior, doublet_posterior, best_singlet, best_singleton_log_prob, best_doublet_log_prob)); 
+                    assignment.push(format!("unassigned\t{}\t{}\t{}\t{}\t{}", best_singlet, singlet_posterior, doublet_posterior, best_singleton_log_prob, best_doublet_log_prob)); 
                     //print!("{}\tunassigned\t{}\t{}\t{}\t", cell_barcode, best_singlet, best_singleton_log_prob, best_doublet_log_prob);
                 }
             } else {
@@ -189,15 +189,15 @@ fn call_doublets(params: &Params, mut cluster_allele_counts: FnvHashMap<(usize,u
                         eprintln!("removing {} as doublet", cell_barcode);
                     }
 
-                    assignment.push(format!("doublet\t{}/{}\t{}\t{}\t{}\t{}", singlet_posterior, doublet_posterior, best_doublet1, best_doublet2,best_singleton_log_prob, best_doublet_log_prob));
+                    assignment.push(format!("doublet\t{}/{}\t{}\t{}\t{}\t{}", best_doublet1, singlet_posterior, doublet_posterior, best_doublet2,best_singleton_log_prob, best_doublet_log_prob));
                     //print!("{}\tdoublet\t{}/{}\t{}\t{}\t", cell_barcode, best_doublet1, best_doublet2, best_singleton_log_prob, best_doublet_log_prob);
                 } else {
                     //if !all_removed.contains(&cell) {
                     //    all_removed.insert(cell);
                     //    new_removed.push(cell);
                     //    eprintln!("removing {} as unassigned doublet", cell_barcode);
                    // }
-                    assignment.push(format!("unassigned\t{}/{}\t{}\t{}\t{}\t{}", singlet_posterior, doublet_posterior, best_doublet1, best_doublet2, best_singleton_log_prob, best_doublet_log_prob));
+                    assignment.push(format!("unassigned\t{}/{}\t{}\t{}\t{}\t{}", best_doublet1, singlet_posterior, doublet_posterior, best_doublet2, best_singleton_log_prob, best_doublet_log_prob));
                     //print!("{}\tunassigned\t{}/{}\t{}\t{}\t", cell_barcode, best_doublet1, best_doublet2, best_singleton_log_prob, best_doublet_log_prob); 
                 }
             }