Thomas 1 год назад
Родитель
Сommit
950354d0d5
2 измененных файлов с 7 добавлено и 7 удалено
  1. 5 5
      src/lib.rs
  2. 2 2
      src/variants.rs

+ 5 - 5
src/lib.rs

@@ -169,11 +169,11 @@ mod tests {
 
 
         let mut variants = load_variants_name(name, &multi)?;
         let mut variants = load_variants_name(name, &multi)?;
         let v = variants.get_cat(&variants::VariantCategory::Constit);
         let v = variants.get_cat(&variants::VariantCategory::Constit);
-        let v = v.iter().filter(|v| 0.25 < v.vaf.unwrap() && v.vaf.unwrap() < 0.75 ).map(|v| {
-
-        }).collect::<Vec<Variant>>();
-
-        lev 
+        // let v = v.iter().filter(|v| 0.25 < v.vaf.unwrap() && v.vaf.unwrap() < 0.75 )
+        //     .map(|v| {
+        //     
+        // }).collect::<Vec<Variant>>();
+        //
 
 
         variants.write_vcf_cat("test.vcf.gz", &variants::VariantCategory::Somatic)?;
         variants.write_vcf_cat("test.vcf.gz", &variants::VariantCategory::Somatic)?;
         println!("{} variants loaded from db.", variants.len());
         println!("{} variants loaded from db.", variants.len());

+ 2 - 2
src/variants.rs

@@ -426,7 +426,7 @@ impl Variants {
         pg.finish();
         pg.finish();
         info!("{}. Executed in {}s", self.stats_vcf, elapsed.as_secs());
         info!("{}. Executed in {}s", self.stats_vcf, elapsed.as_secs());
     }
     }
-    pub fn get_cat(&mut self, cat: VariantCategory) -> Vec<Variant> {
+    pub fn get_cat(&mut self, cat: &VariantCategory) -> Vec<Variant> {
         let pg = self.mp.add(new_pg_speed(self.data.len() as u64));
         let pg = self.mp.add(new_pg_speed(self.data.len() as u64));
         pg.set_message(format!("Get cat {:?}", cat));
         pg.set_message(format!("Get cat {:?}", cat));
         self.data
         self.data
@@ -436,7 +436,7 @@ impl Variants {
                 if e.annotations
                 if e.annotations
                     .iter()
                     .iter()
                     .filter(|e| match e {
                     .filter(|e| match e {
-                        AnnotationType::VariantCategory(vc) => *vc == cat,
+                        AnnotationType::VariantCategory(vc) => vc == cat,
                         _ => false,
                         _ => false,
                     })
                     })
                     .count()
                     .count()