Added rankLessThan

[SXSI/XMLTree.git] / libcds / src / static_sequence / static_sequence_wvtree.cpp

diff --git a/libcds/src/static_sequence/static_sequence_wvtree.cpp b/libcds/src/static_sequence/static_sequence_wvtree.cpp
index ea6a813..e86da89 100644 (file)
--- a/libcds/src/static_sequence/static_sequence_wvtree.cpp
+++ b/libcds/src/static_sequence/static_sequence_wvtree.cpp
@@ -33,6 +33,19 @@ static_sequence_wvtree::static_sequence_wvtree(uint * symbols, uint n, wt_coder
     symbols[i] = am->unmap(symbols[i]);  
 }
 
+static_sequence_wvtree::static_sequence_wvtree(uchar * symbols, uint n, wt_coder * c, static_bitsequence_builder * bmb, alphabet_mapper * am) {
+  for(uint i=0;i<n;i++) 
+    symbols[i] = (uchar)am->map((uint)symbols[i]);
+  this->am = am;
+       am->use();
+  this->c=c;
+       c->use();
+       root = new wt_node_internal(symbols, n, 0, c, bmb); 
+        symbols = 0; // Already deleted!
+//  for(uint i=0;i<n;i++) 
+//    symbols[i] = (uchar)am->unmap((uint)symbols[i]);  
+}
+
 static_sequence_wvtree::static_sequence_wvtree() {}
 
 static_sequence_wvtree::~static_sequence_wvtree() {
@@ -50,7 +63,9 @@ uint static_sequence_wvtree::count(uint s) {
 }
 
 uint static_sequence_wvtree::select(uint symbol, uint pos) {
-       return root->select(am->map(symbol), pos, 0, c)-1;
+       uint ret = root->select(am->map(symbol), pos, 0, c);
+       if(ret==((uint)-1)) return (uint)-1;
+       return ret-1;
 }
 
 uint static_sequence_wvtree::access(uint pos) {