Working on debugging errors. Most currently comming from integration …

…of class EList in parallel indexing updates.
BenLangmead · cfe07362beeb3e102d4f2e72163e25fd1fc24584 · aidanreilly8 committed Feb 7, 2017 · Feb 7, 2017 · cfe0736
1 parent c661077
commit cfe07362beeb3e102d4f2e72163e25fd1fc24584
Unified Split

Showing with 101 additions and 216 deletions.

+2 −2 binary_sa_search.h

+69 −174 blockwise_sa.h

+6 −12 diff_sample.h

+2 −1 ebwt_build.cpp

+20 −25 multikey_qsort.h

+2 −2 zbox.h
diff --git a/binary_sa_search.h b/binary_sa_search.h
@@ -27,7 +27,7 @@
 template<typename TStr, typename TSufElt> inline
 TIndexOffU binarySASearch(const TStr& host,
 			TIndexOffU qry,
-			  const std::vector<TSufElt>& sa)
+            const String<TSufElt>& sa)
 {
 	TIndexOffU lLcp = 0, rLcp = 0; // greatest observed LCPs on left and right
 	TIndexOffU l = 0, r = (TIndexOffU)length(sa)+1; // binary-search window
@@ -38,7 +38,7 @@ TIndexOffU binarySASearch(const TStr& host,
 		if(m == l) {
 			// Binary-search window has closed: we have an answer
 			if(m > 0 && sa[m-1] == qry) return std::numeric_limits<TIndexOffU>::max(); // qry matches
-			assert_leq(m, sa.size());
+			assert_leq(m, length(sa));
 			return m; // Return index of right-hand suffix
 		}
 		assert_gt(m, 0);