Fix issue 56

38 · Jul 22, 2022 · a99bd23 · a99bd23
1 parent ee78d82
commit a99bd23
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 22 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,4 +11,4 @@ members = [
 ]
 
 [profile.release]
-debug = false
+debug = true
diff --git a/d4-hts/src/lib.rs b/d4-hts/src/lib.rs
@@ -69,13 +69,7 @@ impl<'a, R: AlignmentReader<'a>> Iterator for DepthIter<'a, R> {
                 break;
             }
             self.heap.push(Reverse(right));
-            self.next_read = self.iter.next().map(|x| {
-                (
-                    x.as_ref().unwrap().ref_id(),
-                    x.as_ref().unwrap().ref_begin(),
-                    x.as_ref().unwrap().ref_end(),
-                )
-            });
+            self.load_next();
         }
 
         while self.heap.peek().map_or(false, |x| x.0 < self.cur_pos) {

diff --git a/d4/Cargo.toml b/d4/Cargo.toml
@@ -26,11 +26,11 @@ default-features = false
 features = ["rustls-tls", "blocking"]
 
 [dependencies.d4-framefile]
-#path = "../d4-framefile"
+path = "../d4-framefile"
 version = "0.3"
 
 [dependencies.d4-hts]
-#path = "../d4-hts"
+path = "../d4-hts"
 version = "0.3"
 optional = true
 

diff --git a/d4binding/Cargo.toml b/d4binding/Cargo.toml
@@ -12,7 +12,7 @@ d4-framefile = { path = "../d4-framefile"}
 rayon = "1.3.0"
 
 [build-dependencies]
-bindgen = "0.59.1"
+bindgen = "0.60.1"
 
 [lib]
 crate_type = ["cdylib", "staticlib"]
diff --git a/d4tools/Cargo.toml b/d4tools/Cargo.toml
@@ -13,14 +13,14 @@ seq-task = ["d4/seq-task"]
 d4-server = ["warp", "tokio", "serde_derive", "serde", "serde_json"]
 
 [dependencies]
-#d4 = { path = "../d4" }
-#d4-hts = { path = "../d4-hts" }
-#d4-framefile = { path = "../d4-framefile", features = ["mapped_io"]}
-#d4-bigwig = { path = "../d4-bigwig" }
-d4 = "0.3.7"
-d4-hts = "0.3.6"
-d4-framefile = "0.3.6"
-d4-bigwig = "0.3.6"
+d4 = { path = "../d4" }
+d4-hts = { path = "../d4-hts" }
+d4-framefile = { path = "../d4-framefile", features = ["mapped_io"]}
+d4-bigwig = { path = "../d4-bigwig" }
+#d4 = "0.3.7"
+#d4-hts = "0.3.6"
+#d4-framefile = "0.3.6"
+#d4-bigwig = "0.3.6"
 rayon = "1.3.0"
 clap = { version = "2.34.0", features = ["yaml"] }
 regex = "1.3.1"

diff --git a/d4tools/src/create/main.rs b/d4tools/src/create/main.rs
@@ -40,7 +40,7 @@ impl BamFilter {
         let exact_match = self.bam_flags.map_or(true, |expected| expected == flag);
         let inclusive_match = (self.inclusive_flag & flag) == self.inclusive_flag;
         let exclusive_match = (self.exclusive_flag & flag) == 0;
-        quality & exact_match && inclusive_match && exclusive_match
+        quality && exact_match && inclusive_match && exclusive_match
     }
 }
 

diff --git a/pyd4/Cargo.toml b/pyd4/Cargo.toml
@@ -5,8 +5,8 @@ authors = ["Hao Hou <[email protected]>"]
 edition = "2021"
 
 [dependencies]
-d4 = { version = "0.3.6" }
-#d4 = { path = "../d4" }
+#d4 = { version = "0.3.6" }
+d4 = { path = "../d4" }
 pyo3 = "0.15.0"
 rayon = "1.4.0"
 env_logger = "0.9.0"