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 b1353d4..baabf02 100644 (file)
--- a/libcds/src/static_sequence/static_sequence_wvtree.cpp
+++ b/libcds/src/static_sequence/static_sequence_wvtree.cpp
@@ -1,4 +1,4 @@
-/* static_sequence_wvtree.h
+/* static_sequence_wvtree.cpp
  * Copyright (C) 2008, Francisco Claude, all rights reserved.
  *
  * static_sequence_wvtree definition
@@ -25,30 +25,56 @@ static_sequence_wvtree::static_sequence_wvtree(uint * symbols, uint n, wt_coder
   for(uint i=0;i<n;i++) 
     symbols[i] = am->map(symbols[i]);
   this->am = am;
+       am->use();
   this->c=c;
+       c->use();
        root = new wt_node_internal(symbols, n, 0, c, bmb);
   for(uint i=0;i<n;i++) 
     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() {
        delete root;
-  delete am;
-  delete c; 
+       am->unuse();
+  c->unuse(); 
 }
 
 uint static_sequence_wvtree::rank(uint symbol, uint pos) {
        return root->rank(am->map(symbol), pos, 0, c);
 }
 
+uint static_sequence_wvtree::rankLessThan(uint &symbol, uint pos) {
+    uint s = am->map(symbol);
+    std::cout << "lessthan..." << std::endl;
+    uint r = root->rankLessThan(s, pos, 0, c);
+    symbol = am->unmap(s);
+    return r;
+}
+
+
 uint static_sequence_wvtree::count(uint s) {
   return root->rank(am->map(s), len-1, 0, c);
 }
 
 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) {
@@ -81,7 +107,9 @@ static_sequence_wvtree * static_sequence_wvtree::load(FILE *fp) {
   static_sequence_wvtree * ret = new static_sequence_wvtree();
   if(fread(&ret->n,sizeof(uint),1,fp)!=1) return NULL;
   ret->c = wt_coder::load(fp);
+       ret->c->use();
   ret->am = alphabet_mapper::load(fp);
+       ret->am->use();
   ret->root = wt_node::load(fp);
   return ret;
 }